4.9.2 Release

Closes https://github.com/ViaVersion/ViaBackwards/issues/679

.editorconfig

@@ -0,0 +1,13 @@
+[*]
+charset = utf-8
+indent_size = 4
+indent_style = space
+insert_final_newline = false
+tab_width = 4
+
+[*.java]
+ij_java_class_count_to_use_import_on_demand = 999999
+ij_java_names_count_to_use_import_on_demand = 999999
+ij_java_imports_layout = *,|,$*
+ij_java_generate_final_locals = true
+ij_java_generate_final_parameters = true

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: kennytv
+patreon: kennytv

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -21,11 +21,11 @@ body:
     attributes:
       label: Console Error
       description: |
-        If you encounter warnings/errors in your console, **paste them with https://paste.gg/ and put the paste link here**.
+        If you encounter warnings/errors in your console, **paste them with https://mclo.gs/ and put the paste link here**.
         If the error is small/less than 10 lines, you may put it directly into this field.
       value: |
         ```
-        Put the paste.gg link or text here.
+        Put the mclo.gs link or text here.
         ```
       placeholder: Please do not remove the grave accents; simply replace the line of text in the middle.
     validations:

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,5 +1,6 @@
 name: Feature Request
 description: Suggest a feature to be added
+labels: [Feature Request]
 
 body:
   - type: textarea
@@ -34,4 +35,4 @@ body:
       description: |
         Does the feature apply to any specific version or environment?
     validations:
-      required: false
+      required: false

.github/workflows/gradle.yml

@@ -1,25 +1,23 @@
-# This workflow will build a Java project with Gradle
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
-
 name: Java CI with Gradle
 
 on: [push, pull_request]
 
 jobs:
   build:
+    if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v2
+    - name: Checkout Repository
+      uses: actions/checkout@v4
+    - name: Validate Gradle Wrapper
+      uses: gradle/wrapper-validation-action@v1
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
       with:
-        distribution: 'adopt'
-        java-version: 11
+        distribution: 'temurin'
+        java-version: 17
+        check-latest: true
     - name: Build with Gradle
       run: ./gradlew build
-    - uses: actions/upload-artifact@v2
-      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@v4
+        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

.gitignore

@@ -18,6 +18,8 @@ hs_err_pid*
 
 # Ignore IDEA directory
 .idea/*
+!.idea/copyright/*
+!.idea/scopes/*
 
 # Include the project's dictionary
 !.idea/dictionaries/

.idea/copyright/profiles_settings.xml

@@ -0,0 +1,10 @@
+<component name="CopyrightManager">
+  <settings>
+    <module2copyright>
+      <element module="ViaBackwards" copyright="viabackwards-gpl" />
+    </module2copyright>
+    <LanguageOptions name="__TEMPLATE__">
+      <option name="addBlankAfter" value="false" />
+    </LanguageOptions>
+  </settings>
+</component>

.idea/copyright/viabackwards_gpl.xml

@@ -0,0 +1,6 @@
+<component name="CopyrightManager">
+  <copyright>
+    <option name="notice" value="This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards&#10;Copyright (C) 2016-&amp;#36;today.year ViaVersion and contributors&#10;&#10;This program is free software: you can redistribute it and/or modify&#10;it under the terms of the GNU General Public License as published by&#10;the Free Software Foundation, either version 3 of the License, or&#10;(at your option) any later version.&#10;&#10;This program is distributed in the hope that it will be useful,&#10;but WITHOUT ANY WARRANTY; without even the implied warranty of&#10;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the&#10;GNU General Public License for more details.&#10;&#10;You should have received a copy of the GNU General Public License&#10;along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;." />
+    <option name="myName" value="viabackwards-gpl" />
+  </copyright>
+</component>

.idea/scopes/ViaBackwards.xml

@@ -0,0 +1,3 @@
+<component name="DependencyValidationManager">
+  <scope name="ViaBackwards" pattern="com.viaversion.viabackwards..*" />
+</component>

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/O2KAFFL.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("gradle.plugin.com.github.johnrengelman", "shadow", "7.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.base-conventions.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 tasks {
     // Variable replacements
     processResources {
-        filesMatching(listOf("plugin.yml", "mcmod.info", "fabric.mod.json", "bungee.yml")) {
+        filesMatching(listOf("plugin.yml", "META-INF/sponge_plugins.json", "fabric.mod.json", "bungee.yml")) {
             expand("version" to project.version, "description" to project.description, "url" to "https://github.com/ViaVersion/ViaBackwards")
         }
     }

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

@@ -1,10 +0,0 @@
-plugins {
-    id("vb.shadow-conventions")
-}
-
-tasks {
-    shadowJar {
-        archiveFileName.set("ViaBackwards-${project.name.substringAfter("viabackwards-").capitalize()}-${project.version}.jar")
-        destinationDirectory.set(rootProject.layout.buildDirectory.dir("libs"))
-    }
-}

build.gradle.kts

@@ -5,11 +5,13 @@ plugins {
 
 allprojects {
     group = "com.viaversion"
-    version = "4.1.0"
-    description = "Allow older clients to join newer server versions."
+    version = property("projectVersion") as String // from gradle.properties
+    description = "Allows older Minecraft client versions to connect to 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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 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
@@ -22,44 +22,42 @@ import com.viaversion.viabackwards.api.ViaBackwardsPlatform;
 import com.viaversion.viabackwards.listener.FireDamageListener;
 import com.viaversion.viabackwards.listener.FireExtinguishListener;
 import com.viaversion.viabackwards.listener.LecternInteractListener;
-import com.viaversion.viaversion.ViaVersionPlugin;
+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 {
 
-    @Override
-    public void onLoad() {
-        if (!ViaVersionPlugin.getInstance().isLateBind()) {
-            init();
-        }
+    public BukkitPlugin() {
+        Via.getManager().addEnableListener(() -> init(new File(getDataFolder(), "config.yml")));
     }
 
     @Override
     public void onEnable() {
-        if (ViaVersionPlugin.getInstance().isLateBind()) {
-            init();
+        if (Via.getManager().getInjector().lateProtocolVersionSetting()) {
+            // Enable in the next tick
+            Via.getPlatform().runSync(this::enable);
+        } else {
+            enable();
         }
     }
 
-    private void init() {
-        init(getDataFolder());
-        Via.getPlatform().runSync(this::onServerLoaded);
-    }
-
-    private void onServerLoaded() {
-        BukkitViaLoader loader = (BukkitViaLoader) Via.getManager().getLoader();
+    private void enable() {
         int protocolVersion = Via.getAPI().getServerVersion().highestSupportedVersion();
+        if (protocolVersion >= ProtocolVersion.v1_17.getVersion()) {
+            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();
         }
     }
 

bukkit/src/main/java/com/viaversion/viabackwards/listener/FireDamageListener.java

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

bukkit/src/main/java/com/viaversion/viabackwards/listener/FireExtinguishListener.java

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

bukkit/src/main/java/com/viaversion/viabackwards/listener/LecternInteractListener.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 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
@@ -53,6 +53,7 @@ public class LecternInteractListener extends ViaBukkitListener {
         // Open a book with the text of the lectern's writable book
         ItemStack newBook = new ItemStack(Material.WRITTEN_BOOK);
         BookMeta newBookMeta = (BookMeta) newBook.getItemMeta();
+        //noinspection deprecation
         newBookMeta.setPages(meta.getPages());
         newBookMeta.setAuthor("an upsidedown person");
         newBookMeta.setTitle("buk");

bukkit/src/main/java/com/viaversion/viabackwards/listener/PlayerItemDropListener.java

@@ -0,0 +1,48 @@
+
+/*
+ * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
+ * Copyright (C) 2016-2024 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.listener;
+
+import com.viaversion.viabackwards.BukkitPlugin;
+import com.viaversion.viabackwards.protocol.protocol1_13to1_13_1.Protocol1_13To1_13_1;
+import com.viaversion.viaversion.bukkit.listeners.ViaBukkitListener;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.player.PlayerDropItemEvent;
+import org.bukkit.inventory.ItemStack;
+
+public class PlayerItemDropListener extends ViaBukkitListener {
+
+    public PlayerItemDropListener(final BukkitPlugin plugin) {
+        super(plugin, Protocol1_13To1_13_1.class); // Starts with 1.13 clients on 1.17 servers
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onItemDrop(final PlayerDropItemEvent event) {
+        final Player player = event.getPlayer();
+        if (!isOnPipe(player)) {
+            return;
+        }
+
+        // Resent the item in the hand
+        final int slot = player.getInventory().getHeldItemSlot();
+        final ItemStack item = player.getInventory().getItem(slot);
+        player.getInventory().setItem(slot, item);
+    }
+}

bukkit/src/main/resources/plugin.yml

@@ -1,8 +1,9 @@
 name: ViaBackwards
 version: ${version}
-description: Allow older Minecraft versions to connect to a newer server version.
+description: ${description}
 main: com.viaversion.viabackwards.BukkitPlugin
 api-version: 1.13
+folia-supported: true
 
 authors: [Matsv, kennytv, Gerrygames, creeper123123321, ForceUpdate1]
 website: ${url}

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 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
@@ -22,13 +22,16 @@ import com.viaversion.viabackwards.api.ViaBackwardsPlatform;
 import com.viaversion.viaversion.api.Via;
 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")));
     }
 
+
     @Override
     public void disable() {
     }

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * 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
@@ -15,20 +15,18 @@
  * 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.utils;
 
-package com.viaversion.viabackwards.api.exceptions;
+public final class VersionInfo {
 
-import java.io.IOException;
+    public static final String VERSION = "{{ version }}";
+    private static final String IMPLEMENTATION_VERSION = "{{ impl_version }}";
 
-public class RemovedValueException extends IOException {
+    public static String getVersion() {
+        return VERSION;
+    }
 
-    /**
-     * May be cached since it is never actually printed, only checked.
-     */
-    public static final RemovedValueException EX = new RemovedValueException() {
-        @Override
-        public Throwable fillInStackTrace() {
-            return this;
-        }
-    };
+    public static String getImplementationVersion() {
+        return IMPLEMENTATION_VERSION;
+    }
 }

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 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
@@ -22,13 +22,13 @@ import com.google.common.base.Preconditions;
 import com.viaversion.viabackwards.api.ViaBackwardsConfig;
 import com.viaversion.viabackwards.api.ViaBackwardsPlatform;
 
-public class ViaBackwards {
+public final class ViaBackwards {
 
     private static ViaBackwardsPlatform platform;
     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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,6 @@
 package com.viaversion.viabackwards;
 
 import com.viaversion.viaversion.util.Config;
-
 import java.io.File;
 import java.net.URL;
 import java.util.Collections;
@@ -39,8 +38,8 @@ public class ViaBackwardsConfig extends Config implements com.viaversion.viaback
     }
 
     @Override
-    public void reloadConfig() {
-        super.reloadConfig();
+    public void reload() {
+        super.reload();
         loadFields();
     }
 

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 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
@@ -26,14 +26,14 @@ import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-public abstract class BackwardsProtocol<C1 extends ClientboundPacketType, C2 extends ClientboundPacketType, S1 extends ServerboundPacketType, S2 extends ServerboundPacketType>
-        extends AbstractProtocol<C1, C2, S1, S2> {
+public abstract class BackwardsProtocol<CU extends ClientboundPacketType, CM extends ClientboundPacketType, SM extends ServerboundPacketType, SU extends ServerboundPacketType>
+    extends AbstractProtocol<CU, CM, SM, SU> {
 
     protected BackwardsProtocol() {
     }
 
-    protected BackwardsProtocol(@Nullable Class<C1> oldClientboundPacketEnum, @Nullable Class<C2> clientboundPacketEnum,
-                                @Nullable Class<S1> oldServerboundPacketEnum, @Nullable Class<S2> serverboundPacketEnum) {
+    protected BackwardsProtocol(@Nullable Class<CU> oldClientboundPacketEnum, @Nullable Class<CM> clientboundPacketEnum,
+                                @Nullable Class<SM> oldServerboundPacketEnum, @Nullable Class<SU> serverboundPacketEnum) {
         super(oldClientboundPacketEnum, clientboundPacketEnum, oldServerboundPacketEnum, serverboundPacketEnum);
     }
 
@@ -44,6 +44,16 @@ public abstract class BackwardsProtocol<C1 extends ClientboundPacketType, C2 ext
         Via.getManager().getProtocolManager().addMappingLoaderFuture(getClass(), protocolClass, runnable);
     }
 
+    @Override
+    protected void registerPackets() {
+        super.registerPackets();
+
+        final BackwardsMappings mappingData = getMappingData();
+        if (mappingData != null && mappingData.getViaVersionProtocolClass() != null) {
+            executeAsyncAfterLoaded(mappingData.getViaVersionProtocolClass(), this::loadMappingData);
+        }
+    }
+
     @Override
     public boolean hasMappingDataToLoad() {
         // Manually load them later, since they depend on VV's mappings
@@ -55,7 +65,7 @@ public abstract class BackwardsProtocol<C1 extends ClientboundPacketType, C2 ext
         return null;
     }
 
-    public @Nullable TranslatableRewriter getTranslatableRewriter() {
+    public @Nullable TranslatableRewriter<CU> getTranslatableRewriter() {
         return null;
     }
 }

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,7 +17,9 @@
  */
 package com.viaversion.viabackwards.api;
 
-public interface ViaBackwardsConfig {
+import com.viaversion.viaversion.api.configuration.Config;
+
+public interface ViaBackwardsConfig extends Config {
 
     /**
      * Mimics name and level of a custom enchant through the item's lore.
@@ -40,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();
 
     /**
@@ -49,5 +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();
 }

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 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
@@ -45,37 +45,54 @@ import com.viaversion.viabackwards.protocol.protocol1_16_4to1_17.Protocol1_16_4T
 import com.viaversion.viabackwards.protocol.protocol1_16to1_16_1.Protocol1_16To1_16_1;
 import com.viaversion.viabackwards.protocol.protocol1_17_1to1_18.Protocol1_17_1To1_18;
 import com.viaversion.viabackwards.protocol.protocol1_17to1_17_1.Protocol1_17To1_17_1;
+import com.viaversion.viabackwards.protocol.protocol1_18_2to1_19.Protocol1_18_2To1_19;
+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.1.0";
-    String IMPL_VERSION = "$IMPL_VERSION";
+    String MINIMUM_VV_VERSION = "4.9.3";
 
     /**
      * 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);
 
-        if (isOutdated()) return;
+        if (isOutdated()) {
+            disable();
+            return;
+        }
 
-        Via.getManager().getSubPlatforms().add(IMPL_VERSION);
+        Via.getManager().getSubPlatforms().add(VersionInfo.getImplementationVersion());
 
         getLogger().info("Loading translations...");
         TranslatableRewriter.loadTranslatables();
 
-        ProtocolManager protocolManager = Via.getManager().getProtocolManager();
+        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);
@@ -107,7 +124,18 @@ public interface ViaBackwardsPlatform {
 
         protocolManager.registerProtocol(new Protocol1_16_4To1_17(), ProtocolVersion.v1_16_4, ProtocolVersion.v1_17);
         protocolManager.registerProtocol(new Protocol1_17To1_17_1(), ProtocolVersion.v1_17, ProtocolVersion.v1_17_1);
+
         protocolManager.registerProtocol(new Protocol1_17_1To1_18(), ProtocolVersion.v1_17_1, ProtocolVersion.v1_18);
+        protocolManager.registerProtocol(new Protocol1_18To1_18_2(), ProtocolVersion.v1_18, ProtocolVersion.v1_18_2);
+
+        protocolManager.registerProtocol(new Protocol1_18_2To1_19(), ProtocolVersion.v1_18_2, ProtocolVersion.v1_19);
+        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);
     }
 
     /**
@@ -126,11 +154,8 @@ public interface ViaBackwardsPlatform {
             getLogger().severe("LINK: https://ci.viaversion.com/");
             getLogger().severe("VIABACKWARDS WILL NOW DISABLE");
             getLogger().severe("================================");
-
-            disable();
             return true;
         }
-
         return false;
     }
 

common/src/main/java/com/viaversion/viabackwards/api/data/BackwardsMappings.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,112 +21,104 @@ import com.google.common.base.Preconditions;
 import com.viaversion.viabackwards.ViaBackwards;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viaversion.api.Via;
+import com.viaversion.viaversion.api.data.BiMappings;
+import com.viaversion.viaversion.api.data.MappingData;
 import com.viaversion.viaversion.api.data.MappingDataBase;
 import com.viaversion.viaversion.api.data.Mappings;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap;
-import com.viaversion.viaversion.libs.gson.JsonObject;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
+import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap;
+import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
+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.util.Key;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 public class BackwardsMappings extends MappingDataBase {
 
-    private final Class<? extends Protocol> vvProtocolClass;
-    private Int2ObjectMap<MappedItem> backwardsItemMappings;
+    private final Class<? extends Protocol<?, ?, ?, ?>> vvProtocolClass;
+    protected Int2ObjectMap<MappedItem> backwardsItemMappings;
     private Map<String, String> backwardsSoundMappings;
     private Map<String, String> entityNames;
 
-    public BackwardsMappings(String oldVersion, String newVersion, @Nullable Class<? extends Protocol> vvProtocolClass) {
-        this(oldVersion, newVersion, vvProtocolClass, false);
+    public BackwardsMappings(final String unmappedVersion, final String mappedVersion) {
+        this(unmappedVersion, mappedVersion, null);
     }
 
-    public BackwardsMappings(String oldVersion, String newVersion, @Nullable Class<? extends Protocol> vvProtocolClass, boolean hasDiffFile) {
-        super(oldVersion, newVersion, hasDiffFile);
+    public BackwardsMappings(final String unmappedVersion, final String mappedVersion, @Nullable final Class<? extends Protocol<?, ?, ?, ?>> vvProtocolClass) {
+        super(unmappedVersion, mappedVersion);
         Preconditions.checkArgument(vvProtocolClass == null || !vvProtocolClass.isAssignableFrom(BackwardsProtocol.class));
         this.vvProtocolClass = vvProtocolClass;
-        // Just re-use ViaVersion's item id map
-        loadItems = false;
     }
 
     @Override
-    protected void loadExtras(JsonObject oldMappings, JsonObject newMappings, @Nullable JsonObject diffMappings) {
-        if (diffMappings != null) {
-            JsonObject diffItems = diffMappings.getAsJsonObject("items");
-            if (diffItems != null) {
-                backwardsItemMappings = VBMappingDataLoader.loadItemMappings(oldMappings.getAsJsonObject("items"),
-                        newMappings.getAsJsonObject("items"), diffItems, shouldWarnOnMissing("items"));
-            }
+    protected void loadExtras(final CompoundTag data) {
+        final CompoundTag itemNames = data.get("itemnames");
+        if (itemNames != null) {
+            Preconditions.checkNotNull(itemMappings);
+            backwardsItemMappings = new Int2ObjectOpenHashMap<>(itemNames.size());
 
-            JsonObject diffSounds = diffMappings.getAsJsonObject("sounds");
-            if (diffSounds != null) {
-                backwardsSoundMappings = VBMappingDataLoader.objectToNamespacedMap(diffSounds);
-            }
+            final CompoundTag extraItemData = data.get("itemdata");
+            for (final Map.Entry<String, Tag> entry : itemNames.entrySet()) {
+                final StringTag name = (StringTag) entry.getValue();
+                final int id = Integer.parseInt(entry.getKey());
+                Integer customModelData = null;
+                if (extraItemData != null && extraItemData.contains(entry.getKey())) {
+                    final CompoundTag entryTag = extraItemData.get(entry.getKey());
+                    final NumberTag customModelDataTag = entryTag.get("custom_model_data");
+                    customModelData = customModelDataTag != null ? customModelDataTag.asInt() : null;
+                }
 
-            JsonObject diffEntityNames = diffMappings.getAsJsonObject("entitynames");
-            if (diffEntityNames != null) {
-                entityNames = VBMappingDataLoader.objectToMap(diffEntityNames);
+                backwardsItemMappings.put(id, new MappedItem(getNewItemId(id), name.getValue(), customModelData));
             }
         }
 
-        // Just re-use ViaVersion's item id map
-        if (vvProtocolClass != null) {
-            itemMappings = Via.getManager().getProtocolManager().getProtocol(vvProtocolClass).getMappingData().getItemMappings().inverse();
+        final CompoundTag entityNames = data.get("entitynames");
+        if (entityNames != null) {
+            this.entityNames = new HashMap<>(entityNames.size());
+            for (final Map.Entry<String, Tag> entry : entityNames.entrySet()) {
+                final StringTag mappedTag = (StringTag) entry.getValue();
+                this.entityNames.put(entry.getKey(), mappedTag.getValue());
+            }
         }
 
-        loadVBExtras(oldMappings, newMappings);
+        final CompoundTag soundNames = data.get("soundnames");
+        if (soundNames != null) {
+            backwardsSoundMappings = new HashMap<>(soundNames.size());
+            for (final Map.Entry<String, Tag> entry : soundNames.entrySet()) {
+                final StringTag mappedTag = (StringTag) entry.getValue();
+                backwardsSoundMappings.put(entry.getKey(), mappedTag.getValue());
+            }
+        }
     }
 
     @Override
-    protected @Nullable Mappings loadFromArray(JsonObject oldMappings, JsonObject newMappings, @Nullable JsonObject diffMappings, String key) {
-        if (!oldMappings.has(key) || !newMappings.has(key)) return null;
-
-        JsonObject diff = diffMappings != null ? diffMappings.getAsJsonObject(key) : null;
-        return VBMappings.vbBuilder().unmapped(oldMappings.getAsJsonArray(key)).mapped(newMappings.getAsJsonArray(key))
-                .diffMappings(diff).warnOnMissing(shouldWarnOnMissing(key)).build();
-    }
-
-    @Override
-    protected @Nullable Mappings loadFromObject(JsonObject oldMappings, JsonObject newMappings, @Nullable JsonObject diffMappings, String key) {
-        if (!oldMappings.has(key) || !newMappings.has(key)) return null;
-
-        JsonObject diff = diffMappings != null ? diffMappings.getAsJsonObject(key) : null;
-        return VBMappings.vbBuilder().unmapped(oldMappings.getAsJsonObject(key)).mapped(newMappings.getAsJsonObject(key))
-                .diffMappings(diff).warnOnMissing(shouldWarnOnMissing(key)).build();
-    }
-
-    @Override
-    protected JsonObject loadDiffFile() {
-        return VBMappingDataLoader.loadFromDataDir("mapping-" + newVersion + "to" + oldVersion + ".json");
-    }
-
-    /**
-     * To be overridden.
-     */
-    protected void loadVBExtras(JsonObject oldMappings, JsonObject newMappings) {
-    }
-
-    protected boolean shouldWarnOnMissing(String key) {
-        return !key.equals("blocks") && !key.equals("statistics");
-    }
-
-    @Override
-    protected Logger getLogger() {
-        return ViaBackwards.getPlatform().getLogger();
+    protected @Nullable BiMappings loadBiMappings(final CompoundTag data, final String key) {
+        if (key.equals("items") && vvProtocolClass != null) {
+            final Mappings mappings = super.loadMappings(data, key);
+            final MappingData mappingData = Via.getManager().getProtocolManager().getProtocol(vvProtocolClass).getMappingData();
+            if (mappingData != null && mappingData.getItemMappings() != null) {
+                return ItemMappings.of(mappings, mappingData.getItemMappings());
+            }
+        }
+        return super.loadBiMappings(data, key);
     }
 
     /**
      * @see #getMappedItem(int) for custom backwards mappings
      */
     @Override
-    public int getNewItemId(int id) {
+    public int getNewItemId(final int id) {
         // Don't warn on missing here
-        return this.itemMappings.get(id);
+        return this.itemMappings.getNewId(id);
     }
 
     @Override
-    public int getNewBlockId(int id) {
+    public int getNewBlockId(final int id) {
         // Don't warn on missing here
         return this.blockMappings.getNewId(id);
     }
@@ -134,26 +126,26 @@ public class BackwardsMappings extends MappingDataBase {
     @Override
     public int getOldItemId(final int id) {
         // Warn on missing
-        return checkValidity(id, this.itemMappings.inverse().get(id), "item");
+        return checkValidity(id, this.itemMappings.inverse().getNewId(id), "item");
     }
 
-    public @Nullable MappedItem getMappedItem(int id) {
+    public @Nullable MappedItem getMappedItem(final int id) {
         return backwardsItemMappings != null ? backwardsItemMappings.get(id) : null;
     }
 
-    public @Nullable String getMappedNamedSound(String id) {
+    public @Nullable String getMappedNamedSound(final String id) {
         if (backwardsSoundMappings == null) {
             return null;
         }
-
-        if (id.indexOf(':') == -1) {
-            id = "minecraft:" + id;
-        }
-
-        return backwardsSoundMappings.get(id);
+        return backwardsSoundMappings.get(Key.stripMinecraftNamespace(id));
     }
 
-    public @Nullable String mappedEntityName(String entityName) {
+    public @Nullable String mappedEntityName(final String entityName) {
+        if (entityNames == null) {
+            ViaBackwards.getPlatform().getLogger().severe("No entity mappings found when requesting them for " + entityName);
+            new Exception().printStackTrace();
+            return null;
+        }
         return entityNames.get(entityName);
     }
 
@@ -164,4 +156,18 @@ public class BackwardsMappings extends MappingDataBase {
     public @Nullable Map<String, String> getBackwardsSoundMappings() {
         return backwardsSoundMappings;
     }
+
+    public @Nullable Class<? extends Protocol<?, ?, ?, ?>> getViaVersionProtocolClass() {
+        return vvProtocolClass;
+    }
+
+    @Override
+    protected Logger getLogger() {
+        return ViaBackwards.getPlatform().getLogger();
+    }
+
+    @Override
+    protected @Nullable CompoundTag readNBTFile(final String name) {
+        return VBMappingDataLoader.loadNBTFromDir(name);
+    }
 }

common/src/main/java/com/viaversion/viabackwards/api/data/ItemMappings.java

@@ -0,0 +1,38 @@
+/*
+ * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
+ * Copyright (C) 2016-2024 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.viaversion.viabackwards.api.data;
+
+import com.viaversion.viaversion.api.data.BiMappingsBase;
+import com.viaversion.viaversion.api.data.Mappings;
+
+public final class ItemMappings extends BiMappingsBase {
+
+    private ItemMappings(final Mappings mappings, final Mappings inverse) {
+        super(mappings, inverse);
+    }
+
+    public static ItemMappings of(final Mappings mappings, final Mappings inverse) {
+        return new ItemMappings(mappings, inverse);
+    }
+
+    @Override
+    public void setNewId(final int id, final int mappedId) {
+        // Only set one-way
+        mappings.setNewId(id, mappedId);
+    }
+}

common/src/main/java/com/viaversion/viabackwards/api/data/MappedItem.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,16 +17,23 @@
  */
 package com.viaversion.viabackwards.api.data;
 
-import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter;
+import com.viaversion.viaversion.util.ComponentUtil;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 public class MappedItem {
 
     private final int id;
     private final String jsonName;
+    private final Integer customModelData;
 
-    public MappedItem(int id, String name) {
+    public MappedItem(final int id, final String name) {
+        this(id, name, null);
+    }
+
+    public MappedItem(final int id, final String name, @Nullable final Integer customModelData) {
         this.id = id;
-        this.jsonName = ChatRewriter.legacyTextToJsonString("§f" + name);
+        this.jsonName = ComponentUtil.legacyToJsonString("§f" + name, true);
+        this.customModelData = customModelData;
     }
 
     public int getId() {
@@ -36,4 +43,8 @@ public class MappedItem {
     public String getJsonName() {
         return jsonName;
     }
+
+    public @Nullable Integer customModelData() {
+        return customModelData;
+    }
 }

common/src/main/java/com/viaversion/viabackwards/api/data/MappedLegacyBlockItem.java

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

common/src/main/java/com/viaversion/viabackwards/api/data/VBMappingDataLoader.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,157 +18,109 @@
 package com.viaversion.viabackwards.api.data;
 
 import com.viaversion.viabackwards.ViaBackwards;
-import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.MappingDataLoader;
-import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap;
-import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap;
-import com.viaversion.viaversion.libs.fastutil.objects.Object2IntMap;
-import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.libs.gson.JsonIOException;
 import com.viaversion.viaversion.libs.gson.JsonObject;
-import com.viaversion.viaversion.libs.gson.JsonPrimitive;
 import com.viaversion.viaversion.libs.gson.JsonSyntaxException;
+import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
+import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag;
+import com.viaversion.viaversion.libs.opennbt.tag.io.NBTIO;
+import com.viaversion.viaversion.libs.opennbt.tag.io.TagReader;
 import com.viaversion.viaversion.util.GsonUtil;
-
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.HashMap;
 import java.util.Map;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 public final class VBMappingDataLoader {
 
-    public static JsonObject loadFromDataDir(String name) {
-        File file = new File(ViaBackwards.getPlatform().getDataFolder(), name);
-        if (!file.exists()) return loadData(name);
+    private static final TagReader<CompoundTag> TAG_READER = NBTIO.reader(CompoundTag.class).named();
+
+    public static @Nullable CompoundTag loadNBT(final String name) {
+        final InputStream resource = getResource(name);
+        if (resource == null) {
+            return null;
+        }
+
+        try (final InputStream stream = resource) {
+            return TAG_READER.read(stream);
+        } catch (final IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Returns nbt data from the plugin folder or packed assets.
+     * If a file with the same name exists in the plugin folder, the data of the original packed tag will be merged with the file's tag.
+     *
+     * @param name name of the file
+     * @return nbt data from the plugin folder or packed assets
+     */
+    public static @Nullable CompoundTag loadNBTFromDir(final String name) {
+        final CompoundTag packedData = loadNBT(name);
+
+        final File file = new File(ViaBackwards.getPlatform().getDataFolder(), name);
+        if (!file.exists()) {
+            return packedData;
+        }
+
+        ViaBackwards.getPlatform().getLogger().info("Loading " + name + " from plugin folder");
+        try {
+            final CompoundTag fileData = TAG_READER.read(file.toPath(), false);
+            return mergeTags(packedData, fileData);
+        } catch (final IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static CompoundTag mergeTags(final CompoundTag original, final CompoundTag extra) {
+        for (final Map.Entry<String, Tag> entry : extra.entrySet()) {
+            if (entry.getValue() instanceof CompoundTag) {
+                // For compound tags, don't replace the entire tag
+                final CompoundTag originalEntry = original.get(entry.getKey());
+                if (originalEntry != null) {
+                    mergeTags(originalEntry, (CompoundTag) entry.getValue());
+                    continue;
+                }
+            }
+
+            original.put(entry.getKey(), entry.getValue());
+        }
+        return original;
+    }
+
+    public static JsonObject loadData(final String name) {
+        try (final InputStream stream = getResource(name)) {
+            if (stream == null) return null;
+            return GsonUtil.getGson().fromJson(new InputStreamReader(stream), JsonObject.class);
+        } catch (final IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static JsonObject loadFromDataDir(final String name) {
+        final File file = new File(ViaBackwards.getPlatform().getDataFolder(), name);
+        if (!file.exists()) {
+            return loadData(name);
+        }
 
         // Load the file from the platform's directory if present
-        try (FileReader reader = new FileReader(file)) {
+        try (final FileReader reader = new FileReader(file)) {
             return GsonUtil.getGson().fromJson(reader, JsonObject.class);
-        } catch (JsonSyntaxException e) {
+        } catch (final JsonSyntaxException e) {
             ViaBackwards.getPlatform().getLogger().warning(name + " is badly formatted!");
             e.printStackTrace();
             ViaBackwards.getPlatform().getLogger().warning("Falling back to resource's file!");
             return loadData(name);
-        } catch (IOException | JsonIOException e) {
+        } catch (final IOException | JsonIOException e) {
             e.printStackTrace();
         }
         return null;
     }
 
-    public static JsonObject loadData(String name) {
-        InputStream stream = VBMappingDataLoader.class.getClassLoader().getResourceAsStream("assets/viabackwards/data/" + name);
-        try (InputStreamReader reader = new InputStreamReader(stream)) {
-            return GsonUtil.getGson().fromJson(reader, JsonObject.class);
-        } catch (IOException e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public static void mapIdentifiers(int[] output, JsonObject oldIdentifiers, JsonObject newIdentifiers, JsonObject diffIdentifiers, boolean warnOnMissing) {
-        Object2IntMap<String> newIdentifierMap = MappingDataLoader.indexedObjectToMap(newIdentifiers);
-        for (Map.Entry<String, JsonElement> entry : oldIdentifiers.entrySet()) {
-            String key = entry.getValue().getAsString();
-            int mappedId = newIdentifierMap.getInt(key);
-            if (mappedId == -1) {
-                if (diffIdentifiers != null) {
-                    // Search in diff mappings
-                    JsonPrimitive diffValueJson = diffIdentifiers.getAsJsonPrimitive(key);
-                    String diffValue = diffValueJson != null ? diffValueJson.getAsString() : null;
-
-                    int dataIndex;
-                    if (diffValue == null && (dataIndex = key.indexOf('[')) != -1
-                            && (diffValueJson = diffIdentifiers.getAsJsonPrimitive(key.substring(0, dataIndex))) != null) {
-                        // Check for wildcard mappings
-                        diffValue = diffValueJson.getAsString();
-
-                        // Keep original properties if value ends with [
-                        if (diffValue.endsWith("[")) {
-                            diffValue += key.substring(dataIndex + 1);
-                        }
-                    }
-
-                    if (diffValue != null) {
-                        mappedId = newIdentifierMap.getInt(diffValue);
-                    }
-                }
-
-                if (mappedId == -1) {
-                    // Nothing found :(
-                    if (warnOnMissing && !Via.getConfig().isSuppressConversionWarnings() || Via.getManager().isDebug()) {
-                        ViaBackwards.getPlatform().getLogger().warning("No key for " + entry.getValue() + " :( ");
-                    }
-                    continue;
-                }
-            }
-
-            output[Integer.parseInt(entry.getKey())] = mappedId;
-        }
-    }
-
-    public static Map<String, String> objectToNamespacedMap(JsonObject object) {
-        Map<String, String> mappings = new HashMap<>(object.size());
-        for (Map.Entry<String, JsonElement> entry : object.entrySet()) {
-            String key = entry.getKey();
-            if (key.indexOf(':') == -1) {
-                key = "minecraft:" + key;
-            }
-            String value = entry.getValue().getAsString();
-            if (value.indexOf(':') == -1) {
-                value = "minecraft:" + value;
-            }
-            mappings.put(key, value);
-        }
-        return mappings;
-    }
-
-    public static Map<String, String> objectToMap(JsonObject object) {
-        Map<String, String> mappings = new HashMap<>(object.size());
-        for (Map.Entry<String, JsonElement> entry : object.entrySet()) {
-            mappings.put(entry.getKey(), entry.getValue().getAsString());
-        }
-        return mappings;
-    }
-
-    public static Int2ObjectMap<MappedItem> loadItemMappings(JsonObject oldMapping, JsonObject newMapping, JsonObject diffMapping, boolean warnOnMissing) {
-        Int2ObjectMap<MappedItem> itemMapping = new Int2ObjectOpenHashMap<>(diffMapping.size(), 0.99F);
-        Object2IntMap<String> newIdenfierMap = MappingDataLoader.indexedObjectToMap(newMapping);
-        Object2IntMap<String> oldIdenfierMap = MappingDataLoader.indexedObjectToMap(oldMapping);
-        for (Map.Entry<String, JsonElement> entry : diffMapping.entrySet()) {
-            JsonObject object = entry.getValue().getAsJsonObject();
-            String mappedIdName = object.getAsJsonPrimitive("id").getAsString();
-            int mappedId = newIdenfierMap.getInt(mappedIdName);
-            if (mappedId == -1) {
-                if (!Via.getConfig().isSuppressConversionWarnings() || Via.getManager().isDebug()) {
-                    ViaBackwards.getPlatform().getLogger().warning("No key for " + mappedIdName + " :( ");
-                }
-                continue;
-            }
-
-            int oldId = oldIdenfierMap.getInt(entry.getKey());
-            if (oldId == -1) {
-                if (!Via.getConfig().isSuppressConversionWarnings() || Via.getManager().isDebug()) {
-                    ViaBackwards.getPlatform().getLogger().warning("No old entry for " + mappedIdName + " :( ");
-                }
-                continue;
-            }
-
-            String name = object.getAsJsonPrimitive("name").getAsString();
-            itemMapping.put(oldId, new MappedItem(mappedId, name));
-        }
-
-        // Look for missing keys
-        if (warnOnMissing && !Via.getConfig().isSuppressConversionWarnings()) {
-            for (Object2IntMap.Entry<String> entry : oldIdenfierMap.object2IntEntrySet()) {
-                if (!newIdenfierMap.containsKey(entry.getKey()) && !itemMapping.containsKey(entry.getIntValue())) {
-                    ViaBackwards.getPlatform().getLogger().warning("No item mapping for " + entry.getKey() + " :( ");
-                }
-            }
-        }
-
-        return itemMapping;
+    public static @Nullable InputStream getResource(final String name) {
+        return VBMappingDataLoader.class.getClassLoader().getResourceAsStream("assets/viabackwards/data/" + name);
     }
 }

common/src/main/java/com/viaversion/viabackwards/api/data/VBMappings.java

@@ -1,64 +0,0 @@
-/*
- * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.viaversion.viabackwards.api.data;
-
-import com.viaversion.viaversion.api.data.IntArrayMappings;
-import com.viaversion.viaversion.api.data.MappingDataLoader;
-import com.viaversion.viaversion.api.data.Mappings;
-
-import java.util.Arrays;
-
-public final class VBMappings extends IntArrayMappings {
-
-    private VBMappings(final int[] oldToNew, final int mappedIds) {
-        super(oldToNew, mappedIds);
-    }
-
-    public static Mappings.Builder<VBMappings> vbBuilder() {
-        return new Builder(VBMappings::new);
-    }
-
-    public static final class Builder extends Mappings.Builder<VBMappings> {
-
-        private Builder(final MappingsSupplier<VBMappings> supplier) {
-            super(supplier);
-        }
-
-        @Override
-        public VBMappings build() {
-            final int size = this.size != -1 ? this.size : size(unmapped);
-            final int mappedSize = this.mappedSize != -1 ? this.mappedSize : size(mapped);
-            final int[] mappings = new int[size];
-            Arrays.fill(mappings, -1);
-            // Do conversion if one is an array and the other an object, otherwise directly map
-            if (unmapped.isJsonArray()) {
-                if (mapped.isJsonObject()) {
-                    VBMappingDataLoader.mapIdentifiers(mappings, toJsonObject(unmapped.getAsJsonArray()), mapped.getAsJsonObject(), diffMappings, warnOnMissing);
-                } else {
-                    // Use the normal loader
-                    MappingDataLoader.mapIdentifiers(mappings, unmapped.getAsJsonArray(), mapped.getAsJsonArray(), diffMappings, warnOnMissing);
-                }
-            } else if (mapped.isJsonArray()) {
-                VBMappingDataLoader.mapIdentifiers(mappings, unmapped.getAsJsonObject(), toJsonObject(mapped.getAsJsonArray()), diffMappings, warnOnMissing);
-            } else {
-                VBMappingDataLoader.mapIdentifiers(mappings, unmapped.getAsJsonObject(), mapped.getAsJsonObject(), diffMappings, warnOnMissing);
-            }
-            return supplier.supply(mappings, mappedSize);
-        }
-    }
-}

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,20 +18,19 @@
 
 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.protocols.protocol1_13to1_12_2.ChatRewriter;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
+import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag;
+import com.viaversion.viaversion.util.ComponentUtil;
 import java.util.Locale;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 public class EntityData {
     private final BackwardsProtocol<?, ?, ?, ?> protocol;
     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) {
@@ -46,12 +45,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;
     }
 
@@ -71,17 +75,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 ComponentUtil.legacyToJson(name);
+        } else if (componentType == ComponentType.TAG) {
+            return new StringTag(name);
+        }
+        return name;
     }
 
     public int replacementId() {
@@ -103,11 +112,11 @@ public class EntityData {
     @Override
     public String toString() {
         return "EntityData{" +
-                "id=" + id +
-                ", mobName='" + key + '\'' +
-                ", replacementId=" + replacementId +
-                ", defaultMeta=" + defaultMeta +
-                '}';
+            "id=" + id +
+            ", mobName='" + key + '\'' +
+            ", replacementId=" + replacementId +
+            ", defaultMeta=" + defaultMeta +
+            '}';
     }
 
     @FunctionalInterface
@@ -116,9 +125,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/entities/storage/EntityObjectData.java

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

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,18 +24,17 @@ import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.data.entity.StoredEntityData;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.type.Type;
-
 import java.util.function.Supplier;
 
 public class EntityPositionHandler {
 
     public static final double RELATIVE_MOVE_FACTOR = 32 * 128;
-    private final EntityRewriterBase entityRewriter;
+    private final EntityRewriterBase<?, ?> entityRewriter;
     private final Class<? extends EntityPositionStorage> storageClass;
     private final Supplier<? extends EntityPositionStorage> storageSupplier;
     private boolean warnedForMissingEntity;
 
-    public EntityPositionHandler(EntityRewriterBase entityRewriter,
+    public EntityPositionHandler(EntityRewriterBase<?, ?> entityRewriter,
                                  Class<? extends EntityPositionStorage> storageClass, Supplier<? extends EntityPositionStorage> storageSupplier) {
         this.entityRewriter = entityRewriter;
         this.storageClass = storageClass;
@@ -44,7 +43,7 @@ public class EntityPositionHandler {
 
     public void cacheEntityPosition(PacketWrapper wrapper, boolean create, boolean relative) throws Exception {
         cacheEntityPosition(wrapper,
-                wrapper.get(Type.DOUBLE, 0), wrapper.get(Type.DOUBLE, 1), wrapper.get(Type.DOUBLE, 2), create, relative);
+            wrapper.get(Type.DOUBLE, 0), wrapper.get(Type.DOUBLE, 1), wrapper.get(Type.DOUBLE, 2), create, relative);
     }
 
     public void cacheEntityPosition(PacketWrapper wrapper, double x, double y, double z, boolean create, boolean relative) throws Exception {

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

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

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

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

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,9 +19,8 @@
 package com.viaversion.viabackwards.api.entities.storage;
 
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.List;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 public final class WrappedMetadata {
     private final List<Metadata> metadataList;

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,11 +21,9 @@ import com.viaversion.viaversion.api.minecraft.item.Item;
 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.ShortTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag;
-import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter;
-
+import com.viaversion.viaversion.util.ComponentUtil;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -38,15 +36,15 @@ import java.util.Map;
 public class EnchantmentRewriter {
 
     private final Map<String, String> enchantmentMappings = new HashMap<>();
-    private final ItemRewriter itemRewriter;
+    private final ItemRewriter<?, ?, ?> itemRewriter;
     private final boolean jsonFormat;
 
-    public EnchantmentRewriter(ItemRewriter itemRewriter, boolean jsonFormat) {
+    public EnchantmentRewriter(ItemRewriter<?, ?, ?> itemRewriter, boolean jsonFormat) {
         this.itemRewriter = itemRewriter;
         this.jsonFormat = jsonFormat;
     }
 
-    public EnchantmentRewriter(ItemRewriter itemRewriter) {
+    public EnchantmentRewriter(ItemRewriter<?, ?, ?> itemRewriter) {
         this(itemRewriter, true);
     }
 
@@ -58,10 +56,10 @@ public class EnchantmentRewriter {
         CompoundTag tag = item.tag();
         if (tag == null) return;
 
-        if (tag.get("Enchantments") instanceof ListTag) {
+        if (tag.getListTag("Enchantments") != null) {
             rewriteEnchantmentsToClient(tag, false);
         }
-        if (tag.get("StoredEnchantments") instanceof ListTag) {
+        if (tag.getListTag("StoredEnchantments") != null) {
             rewriteEnchantmentsToClient(tag, true);
         }
     }
@@ -80,17 +78,16 @@ public class EnchantmentRewriter {
 
     public void rewriteEnchantmentsToClient(CompoundTag tag, boolean storedEnchant) {
         String key = storedEnchant ? "StoredEnchantments" : "Enchantments";
-        ListTag enchantments = tag.get(key);
+        ListTag enchantments = tag.getListTag(key);
         List<Tag> loreToAdd = new ArrayList<>();
         boolean changed = false;
 
         Iterator<Tag> iterator = enchantments.iterator();
         while (iterator.hasNext()) {
             CompoundTag enchantmentEntry = (CompoundTag) iterator.next();
-            Tag idTag = enchantmentEntry.get("id");
-            if (!(idTag instanceof StringTag)) continue;
+            StringTag idTag = enchantmentEntry.getStringTag("id");
 
-            String enchantmentId = ((StringTag) idTag).getValue();
+            String enchantmentId = idTag.getValue();
             String remappedName = enchantmentMappings.get(enchantmentId);
             if (remappedName != null) {
                 if (!changed) {
@@ -101,10 +98,11 @@ public class EnchantmentRewriter {
 
                 iterator.remove();
 
-                int level = ((NumberTag) enchantmentEntry.get("lvl")).asInt();
+                NumberTag levelTag = enchantmentEntry.getNumberTag("lvl");
+                int level = levelTag != null ? levelTag.asInt() : 1;
                 String loreValue = remappedName + " " + getRomanNumber(level);
                 if (jsonFormat) {
-                    loreValue = ChatRewriter.legacyTextToJsonString(loreValue);
+                    loreValue = ComponentUtil.legacyToJsonString(loreValue);
                 }
 
                 loreToAdd.add(new StringTag(loreValue));
@@ -113,19 +111,19 @@ public class EnchantmentRewriter {
 
         if (!loreToAdd.isEmpty()) {
             // Add dummy enchant for the glow effect if there are no actual enchantments left
-            if (!storedEnchant && enchantments.size() == 0) {
+            if (!storedEnchant && enchantments.isEmpty()) {
                 CompoundTag dummyEnchantment = new CompoundTag();
-                dummyEnchantment.put("id", new StringTag());
-                dummyEnchantment.put("lvl", new ShortTag((short) 0));
+                dummyEnchantment.putString("id", "");
+                dummyEnchantment.putShort("lvl", (short) 0);
                 enchantments.add(dummyEnchantment);
             }
 
-            CompoundTag display = tag.get("display");
+            CompoundTag display = tag.getCompoundTag("display");
             if (display == null) {
                 tag.put("display", display = new CompoundTag());
             }
 
-            ListTag loreTag = display.get("Lore");
+            ListTag loreTag = display.getListTag("Lore");
             if (loreTag == null) {
                 display.put("Lore", loreTag = new ListTag(StringTag.class));
             } else {

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,16 +18,17 @@
 package com.viaversion.viabackwards.api.rewriters;
 
 import com.viaversion.viabackwards.api.BackwardsProtocol;
+import com.viaversion.viaversion.api.data.entity.EntityTracker;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
 import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
-import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.version.Types1_14;
 
-public abstract class EntityRewriter<T extends BackwardsProtocol> extends EntityRewriterBase<T> {
+public abstract class EntityRewriter<C extends ClientboundPacketType, T extends BackwardsProtocol<C, ?, ?, ?>> extends EntityRewriterBase<C, T> {
 
     protected EntityRewriter(T protocol) {
         this(protocol, Types1_14.META_TYPES.optionalComponentType, Types1_14.META_TYPES.booleanType);
@@ -38,10 +39,10 @@ public abstract class EntityRewriter<T extends BackwardsProtocol> extends Entity
     }
 
     @Override
-    public void registerTrackerWithData(ClientboundPacketType packetType, EntityType fallingBlockType) {
-        protocol.registerClientbound(packetType, new PacketRemapper() {
+    public void registerTrackerWithData(C packetType, EntityType fallingBlockType) {
+        protocol.registerClientbound(packetType, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT); // 0 - Entity id
                 map(Type.UUID); // 1 - Entity UUID
                 map(Type.VAR_INT); // 2 - Entity Type
@@ -56,10 +57,30 @@ public abstract class EntityRewriter<T extends BackwardsProtocol> extends Entity
         });
     }
 
+    @Override
+    public void registerTrackerWithData1_19(C packetType, EntityType fallingBlockType) {
+        protocol.registerClientbound(packetType, new PacketHandlers() {
+            @Override
+            public void register() {
+                map(Type.VAR_INT); // Entity id
+                map(Type.UUID); // Entity UUID
+                map(Type.VAR_INT); // Entity type
+                map(Type.DOUBLE); // X
+                map(Type.DOUBLE); // Y
+                map(Type.DOUBLE); // Z
+                map(Type.BYTE); // Pitch
+                map(Type.BYTE); // Yaw
+                map(Type.BYTE); // Head yaw
+                map(Type.VAR_INT); // Data
+                handler(getSpawnTrackerWithDataHandler1_19(fallingBlockType));
+            }
+        });
+    }
+
     public PacketHandler getSpawnTrackerWithDataHandler(EntityType fallingBlockType) {
         return wrapper -> {
             // Check against the UNMAPPED entity type
-            EntityType entityType = setOldEntityId(wrapper);
+            EntityType entityType = trackAndMapEntity(wrapper);
             if (entityType == fallingBlockType) {
                 int blockState = wrapper.get(Type.INT, 0);
                 wrapper.set(Type.INT, 0, protocol.getMappingData().getNewBlockStateId(blockState));
@@ -67,19 +88,57 @@ public abstract class EntityRewriter<T extends BackwardsProtocol> extends Entity
         };
     }
 
-    public void registerSpawnTracker(ClientboundPacketType packetType) {
-        protocol.registerClientbound(packetType, new PacketRemapper() {
+    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) {
+                int blockState = wrapper.get(Type.VAR_INT, 2);
+                wrapper.set(Type.VAR_INT, 2, protocol.getMappingData().getNewBlockStateId(blockState));
+            }
+        };
+    }
+
+    public void registerSpawnTracker(C packetType) {
+        protocol.registerClientbound(packetType, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT); // 0 - Entity ID
                 map(Type.UUID); // 1 - Entity UUID
                 map(Type.VAR_INT); // 2 - Entity Type
-                handler(wrapper -> setOldEntityId(wrapper));
+                handler(wrapper -> trackAndMapEntity(wrapper));
             }
         });
     }
 
-    private EntityType setOldEntityId(PacketWrapper wrapper) throws Exception {
+    /**
+     * Returns a handler to track the current world and uncache entity data on world changes.
+     *
+     * @return handler to track the current world
+     */
+    public PacketHandler worldTrackerHandlerByKey() {
+        return wrapper -> {
+            EntityTracker tracker = tracker(wrapper.user());
+            String world = wrapper.get(Type.STRING, 1);
+            if (tracker.currentWorld() != null && !tracker.currentWorld().equals(world)) {
+                tracker.clearEntities();
+                tracker.trackClientEntity();
+            }
+            tracker.setCurrentWorld(world);
+        };
+    }
+
+    /**
+     * Sets the mapped entity id and returns the unmapped entity type.
+     *
+     * @param wrapper packet wrapper
+     * @return unmapped (!) entity type
+     */
+    protected EntityType trackAndMapEntity(PacketWrapper wrapper) throws Exception {
         int typeId = wrapper.get(Type.VAR_INT, 1);
         EntityType entityType = typeFromId(typeId);
         tracker(wrapper.user()).addEntity(wrapper.get(Type.VAR_INT, 0), entityType);

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 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
@@ -23,22 +23,23 @@ import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.entities.storage.EntityData;
 import com.viaversion.viabackwards.api.entities.storage.WrappedMetadata;
 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;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.libs.fastutil.ints.Int2IntOpenHashMap;
 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 org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.List;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * Entity rewriter base class.
@@ -46,13 +47,12 @@ import java.util.List;
  * @see com.viaversion.viabackwards.api.rewriters.EntityRewriter
  * @see LegacyEntityRewriter
  */
-public abstract class EntityRewriterBase<T extends BackwardsProtocol> extends EntityRewriter<T> {
+public abstract class EntityRewriterBase<C extends ClientboundPacketType, T extends BackwardsProtocol<C, ?, ?, ?>> extends EntityRewriter<C, T> {
     private final Int2ObjectMap<EntityData> entityDataMappings = new Int2ObjectOpenHashMap<>();
     private final MetaType displayNameMetaType;
     private final MetaType displayVisibilityMetaType;
     private final int displayNameIndex;
     private final int displayVisibilityIndex;
-    protected boolean allowNullEntityType;
 
     EntityRewriterBase(T protocol, MetaType displayNameMetaType, int displayNameIndex,
                        MetaType displayVisibilityMetaType, int displayVisibilityIndex) {
@@ -65,38 +65,50 @@ public abstract class EntityRewriterBase<T extends BackwardsProtocol> extends En
 
     @Override
     public void handleMetadata(int entityId, List<Metadata> metadataList, UserConnection connection) {
-        EntityType type = tracker(connection).entityType(entityId);
-        if (type == null && !allowNullEntityType) {
-            return;
-        }
+        final TrackedEntity entity = tracker(connection).entity(entityId);
+        final boolean initialMetadata = !(entity != null && entity.hasSentMetadata());
 
         super.handleMetadata(entityId, metadataList, connection);
 
-        if (type == null) {
+        if (entity == null) {
             return; // Don't handle untracked entities - basically always the fault of a plugin sending virtual entities through concurrency-unsafe handling
         }
 
-        EntityData entityData = entityDataForType(type);
-
         // Set the mapped entity name if there is no custom name set already
-        Metadata meta = getMeta(displayNameIndex, metadataList);
-        if (meta != null && entityData != null && entityData.mobName() != null
-                && (meta.getValue() == null || meta.getValue().toString().isEmpty())
-                && meta.metaType().typeId() == displayNameMetaType.typeId()) {
-            meta.setValue(entityData.mobName());
-            if (ViaBackwards.getConfig().alwaysShowOriginalMobName()) {
-                removeMeta(displayVisibilityIndex, metadataList);
-                metadataList.add(new Metadata(displayVisibilityIndex, displayVisibilityMetaType, true));
+        final EntityData entityData = entityDataForType(entity.entityType());
+        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, displayNameObject));
+                    addDisplayVisibilityMeta(metadataList);
+                } else if (displayName.getValue() == null || displayName.getValue().toString().isEmpty()) {
+                    // Overwrite the existing null/empty display name
+                    displayName.setValue(displayNameObject);
+                    addDisplayVisibilityMeta(metadataList);
+                }
+            } else if (displayName != null && (displayName.getValue() == null || displayName.getValue().toString().isEmpty())) {
+                // Overwrite null/empty display name
+                displayName.setValue(displayNameObject);
+                addDisplayVisibilityMeta(metadataList);
             }
         }
 
         // Add any other extra meta for mapped entities
-        //TODO only do this once for a first meta packet?
-        if (entityData != null && entityData.hasBaseMeta()) {
+        if (entityData != null && entityData.hasBaseMeta() && initialMetadata) {
             entityData.defaultMeta().createMeta(new WrappedMetadata(metadataList));
         }
     }
 
+    private void addDisplayVisibilityMeta(List<Metadata> metadataList) {
+        if (ViaBackwards.getConfig().alwaysShowOriginalMobName()) {
+            removeMeta(displayVisibilityIndex, metadataList);
+            metadataList.add(new Metadata(displayVisibilityIndex, displayVisibilityMetaType, true));
+        }
+    }
+
     protected @Nullable Metadata getMeta(int metaIndex, List<Metadata> metadataList) {
         for (Metadata metadata : metadataList) {
             if (metadata.id() == metaIndex) {
@@ -132,7 +144,7 @@ public abstract class EntityRewriterBase<T extends BackwardsProtocol> extends En
      * @see #mapEntityType(EntityType, EntityType) for id only rewriting
      */
     protected EntityData mapEntityTypeWithData(EntityType type, EntityType mappedType) {
-        Preconditions.checkArgument(type.getClass() == mappedType.getClass());
+        Preconditions.checkArgument(type.getClass() == mappedType.getClass(), "Both entity types need to be of the same class");
 
         // Already rewrite the id here
         int mappedReplacementId = newEntityId(mappedType.getId());
@@ -152,30 +164,42 @@ public abstract class EntityRewriterBase<T extends BackwardsProtocol> extends En
     @Override
     public <E extends Enum<E> & EntityType> void mapTypes(EntityType[] oldTypes, Class<E> newTypeClass) {
         if (typeMappings == null) {
-            typeMappings = new Int2IntOpenHashMap(oldTypes.length, 0.99F);
-            typeMappings.defaultReturnValue(-1);
+            typeMappings = Int2IntMapMappings.of();
         }
         for (EntityType oldType : oldTypes) {
             try {
                 E newType = Enum.valueOf(newTypeClass, oldType.name());
-                typeMappings.put(oldType.getId(), newType.getId());
+                typeMappings.setNewId(oldType.getId(), newType.getId());
             } catch (IllegalArgumentException ignored) {
                 // Don't warn
             }
         }
     }
 
-    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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,33 +20,39 @@ package com.viaversion.viabackwards.api.rewriters;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.data.MappedItem;
 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.protocol.remapper.PacketHandlers;
+import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.libs.gson.JsonElement;
 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.StringTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-public abstract class ItemRewriter<T extends BackwardsProtocol> extends ItemRewriterBase<T> {
+public class ItemRewriter<C extends ClientboundPacketType, S extends ServerboundPacketType,
+    T extends BackwardsProtocol<C, ?, ?, S>> extends ItemRewriterBase<C, S, T> {
 
-    private final TranslatableRewriter translatableRewriter;
-
-    protected ItemRewriter(T protocol, @Nullable TranslatableRewriter translatableRewriter) {
-        super(protocol, true);
-        this.translatableRewriter = translatableRewriter;
+    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) return null;
+        if (item == null) {
+            return null;
+        }
 
-        CompoundTag display = item.tag() != null ? item.tag().get("display") : null;
-        if (translatableRewriter != null && display != null) {
+        CompoundTag display = item.tag() != null ? item.tag().getCompoundTag("display") : null;
+        if (protocol.getTranslatableRewriter() != null && display != null) {
             // Handle name and lore components
-            StringTag name = display.get("Name");
+            StringTag name = display.getStringTag("Name");
             if (name != null) {
-                String newValue = translatableRewriter.processText(name.getValue()).toString();
+                String newValue = protocol.getTranslatableRewriter().processText(name.getValue()).toString();
                 if (!newValue.equals(name.getValue())) {
                     saveStringTag(display, name, "Name");
                 }
@@ -54,14 +60,16 @@ public abstract class ItemRewriter<T extends BackwardsProtocol> extends ItemRewr
                 name.setValue(newValue);
             }
 
-            ListTag lore = display.get("Lore");
+            ListTag lore = display.getListTag("Lore");
             if (lore != null) {
                 boolean changed = false;
                 for (Tag loreEntryTag : lore) {
-                    if (!(loreEntryTag instanceof StringTag)) continue;
+                    if (!(loreEntryTag instanceof StringTag)) {
+                        continue;
+                    }
 
                     StringTag loreEntry = (StringTag) loreEntryTag;
-                    String newValue = translatableRewriter.processText(loreEntry.getValue()).toString();
+                    String newValue = protocol.getTranslatableRewriter().processText(loreEntry.getValue()).toString();
                     if (!changed && !newValue.equals(loreEntry.getValue())) {
                         // Backup original lore before doing any modifications
                         changed = true;
@@ -73,7 +81,7 @@ public abstract class ItemRewriter<T extends BackwardsProtocol> extends ItemRewr
             }
         }
 
-        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);
@@ -84,9 +92,14 @@ public abstract class ItemRewriter<T extends BackwardsProtocol> extends ItemRewr
         }
 
         // Save original id, set remapped id
-        item.tag().put(nbtTagName + "|id", new IntTag(item.identifier()));
+        item.tag().putInt(nbtTagName + "|id", item.identifier());
         item.setIdentifier(data.getId());
 
+        // Add custom model data
+        if (data.customModelData() != null && !item.tag().contains("CustomModelData")) {
+            item.tag().putInt("CustomModelData", data.customModelData());
+        }
+
         // Set custom name - only done if there is no original one
         if (display == null) {
             item.tag().put("display", display = new CompoundTag());
@@ -104,11 +117,103 @@ public abstract class ItemRewriter<T extends BackwardsProtocol> extends ItemRewr
 
         super.handleItemToServer(item);
         if (item.tag() != null) {
-            IntTag originalId = item.tag().remove(nbtTagName + "|id");
-            if (originalId != null) {
-                item.setIdentifier(originalId.asInt());
+            Tag originalId = item.tag().remove(nbtTagName + "|id");
+            if (originalId instanceof IntTag) {
+                item.setIdentifier(((NumberTag) originalId).asInt());
             }
         }
         return item;
     }
+
+    @Override
+    public void registerAdvancements(C packetType) {
+        protocol.registerClientbound(packetType, new PacketHandlers() {
+            @Override
+            public void register() {
+                handler(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 JsonElement title = wrapper.passthrough(Type.COMPONENT);
+                            final JsonElement description = wrapper.passthrough(Type.COMPONENT);
+                            final TranslatableRewriter<C> translatableRewriter = protocol.getTranslatableRewriter();
+                            if (translatableRewriter != null) {
+                                translatableRewriter.processText(title);
+                                translatableRewriter.processText(description);
+                            }
+
+                            handleItemToClient(wrapper.passthrough(getItemType())); // 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
+
+                        final int arrayLength = wrapper.passthrough(Type.VAR_INT);
+                        for (int array = 0; array < arrayLength; array++) {
+                            wrapper.passthrough(Type.STRING_ARRAY); // String array
+                        }
+                    }
+                });
+            }
+        });
+    }
+
+    @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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,6 +19,9 @@ package com.viaversion.viabackwards.api.rewriters;
 
 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;
@@ -26,17 +29,19 @@ import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag;
 import com.viaversion.viaversion.rewriter.ItemRewriter;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-public abstract class ItemRewriterBase<T extends BackwardsProtocol> extends ItemRewriter<T> {
+public abstract class ItemRewriterBase<C extends ClientboundPacketType, S extends ServerboundPacketType,
+    T extends BackwardsProtocol<C, ?, ?, S>> extends ItemRewriter<C, S, T> {
 
     protected final String nbtTagName;
     protected final boolean jsonNameFormat;
 
-    protected ItemRewriterBase(T protocol, boolean jsonNameFormat) {
-        super(protocol);
+    protected ItemRewriterBase(T protocol, Type<Item> itemType, Type<Item[]> itemArrayType, boolean jsonNameFormat) {
+        super(protocol, itemType, itemArrayType);
         this.jsonNameFormat = jsonNameFormat;
         nbtTagName = "VB|" + protocol.getClass().getSimpleName();
     }
 
+    @Override
     public @Nullable Item handleItemToServer(@Nullable Item item) {
         if (item == null) return null;
         super.handleItemToServer(item);
@@ -53,7 +58,7 @@ public abstract class ItemRewriterBase<T extends BackwardsProtocol> extends Item
         // Multiple places might try to backup data
         String backupName = nbtTagName + "|o" + name;
         if (!displayTag.contains(backupName)) {
-            displayTag.put(backupName, new StringTag(original.getValue()));
+            displayTag.putString(backupName, original.getValue());
         }
     }
 
@@ -64,7 +69,7 @@ public abstract class ItemRewriterBase<T extends BackwardsProtocol> extends Item
             // Clone all tag entries
             ListTag listTag = new ListTag();
             for (Tag tag : original.getValue()) {
-                listTag.add(tag.clone());
+                listTag.add(tag.copy());
             }
 
             displayTag.put(backupName, listTag);
@@ -74,7 +79,7 @@ public abstract class ItemRewriterBase<T extends BackwardsProtocol> extends Item
     protected void restoreDisplayTag(Item item) {
         if (item.tag() == null) return;
 
-        CompoundTag display = item.tag().get("display");
+        CompoundTag display = item.tag().getCompoundTag("display");
         if (display != null) {
             // Remove custom name / restore original name
             if (display.remove(nbtTagName + "|customName") != null) {
@@ -89,16 +94,16 @@ public abstract class ItemRewriterBase<T extends BackwardsProtocol> extends Item
     }
 
     protected void restoreStringTag(CompoundTag tag, String tagName) {
-        StringTag original = tag.remove(nbtTagName + "|o" + tagName);
-        if (original != null) {
-            tag.put(tagName, new StringTag(original.getValue()));
+        Tag original = tag.remove(nbtTagName + "|o" + tagName);
+        if (original instanceof StringTag) {
+            tag.putString(tagName, ((StringTag) original).getValue());
         }
     }
 
     protected void restoreListTag(CompoundTag tag, String tagName) {
-        ListTag original = tag.remove(nbtTagName + "|o" + tagName);
-        if (original != null) {
-            tag.put(tagName, new ListTag(original.getValue()));
+        Tag original = tag.remove(nbtTagName + "|o" + tagName);
+        if (original instanceof ListTag) {
+            tag.put(tagName, new ListTag(((ListTag) original).getValue()));
         }
     }
 

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 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
@@ -25,7 +25,12 @@ import com.viaversion.viabackwards.protocol.protocol1_11_1to1_12.data.BlockColor
 import com.viaversion.viabackwards.utils.Block;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
+import com.viaversion.viaversion.api.minecraft.chunks.DataPalette;
+import com.viaversion.viaversion.api.minecraft.chunks.PaletteType;
 import com.viaversion.viaversion.api.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.fastutil.ints.Int2ObjectMap;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap;
 import com.viaversion.viaversion.libs.gson.JsonElement;
@@ -33,20 +38,18 @@ import com.viaversion.viaversion.libs.gson.JsonObject;
 import com.viaversion.viaversion.libs.gson.JsonPrimitive;
 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.NumberTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag;
-import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
+import com.viaversion.viaversion.util.ComponentUtil;
 import java.util.HashMap;
 import java.util.Map;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
-public abstract class LegacyBlockItemRewriter<T extends BackwardsProtocol> extends ItemRewriterBase<T> {
+public abstract class LegacyBlockItemRewriter<C extends ClientboundPacketType, S extends ServerboundPacketType,
+    T extends BackwardsProtocol<C, ?, ?, S>> extends ItemRewriterBase<C, S, T> {
 
     private static final Map<String, Int2ObjectMap<MappedLegacyBlockItem>> LEGACY_MAPPINGS = new HashMap<>();
-    protected final Int2ObjectMap<MappedLegacyBlockItem> replacementData;
+    protected final Int2ObjectMap<MappedLegacyBlockItem> replacementData; // Raw id -> mapped data
 
     static {
         JsonObject jsonObject = VBMappingDataLoader.loadFromDataDir("legacy-mappings.json");
@@ -54,40 +57,55 @@ public abstract class LegacyBlockItemRewriter<T extends BackwardsProtocol> exten
             Int2ObjectMap<MappedLegacyBlockItem> mappings = new Int2ObjectOpenHashMap<>(8);
             LEGACY_MAPPINGS.put(entry.getKey(), mappings);
             for (Map.Entry<String, JsonElement> dataEntry : entry.getValue().getAsJsonObject().entrySet()) {
-                JsonObject object = dataEntry.getValue().getAsJsonObject();
-                int id = object.getAsJsonPrimitive("id").getAsInt();
-                JsonPrimitive jsonData = object.getAsJsonPrimitive("data");
-                short data = jsonData != null ? jsonData.getAsShort() : 0;
-                String name = object.getAsJsonPrimitive("name").getAsString();
-                JsonPrimitive blockField = object.getAsJsonPrimitive("block");
-                boolean block = blockField != null && blockField.getAsBoolean();
+                addMapping(dataEntry.getKey(), dataEntry.getValue().getAsJsonObject(), mappings);
+            }
+        }
+    }
 
-                if (dataEntry.getKey().indexOf('-') != -1) {
-                    // Range of ids
-                    String[] split = dataEntry.getKey().split("-", 2);
-                    int from = Integer.parseInt(split[0]);
-                    int to = Integer.parseInt(split[1]);
+    private static void addMapping(String key, JsonObject object, Int2ObjectMap<MappedLegacyBlockItem> mappings) {
+        int id = object.getAsJsonPrimitive("id").getAsInt();
+        JsonPrimitive jsonData = object.getAsJsonPrimitive("data");
+        short data = jsonData != null ? jsonData.getAsShort() : 0;
+        String name = object.getAsJsonPrimitive("name").getAsString();
+        JsonPrimitive blockField = object.getAsJsonPrimitive("block");
+        boolean block = blockField != null && blockField.getAsBoolean();
 
-                    // Special block color handling
-                    if (name.contains("%color%")) {
-                        for (int i = from; i <= to; i++) {
-                            mappings.put(i, new MappedLegacyBlockItem(id, data, name.replace("%color%", BlockColors.get(i - from)), block));
-                        }
-                    } else {
-                        MappedLegacyBlockItem mappedBlockItem = new MappedLegacyBlockItem(id, data, name, block);
-                        for (int i = from; i <= to; i++) {
-                            mappings.put(i, mappedBlockItem);
-                        }
-                    }
-                } else {
-                    mappings.put(Integer.parseInt(dataEntry.getKey()), new MappedLegacyBlockItem(id, data, name, block));
-                }
+        if (key.indexOf('-') == -1) {
+            int unmappedId;
+            int dataSeparatorIndex = key.indexOf(':');
+            if (dataSeparatorIndex != -1) {
+                // Include data
+                short unmappedData = Short.parseShort(key.substring(dataSeparatorIndex + 1));
+                unmappedId = Integer.parseInt(key.substring(0, dataSeparatorIndex));
+                unmappedId = (unmappedId << 4) | (unmappedData & 15);
+            } else {
+                unmappedId = Integer.parseInt(key) << 4;
+            }
+
+            mappings.put(unmappedId, new MappedLegacyBlockItem(id, data, name, block));
+            return;
+        }
+
+        // Range of ids
+        String[] split = key.split("-", 2);
+        int from = Integer.parseInt(split[0]);
+        int to = Integer.parseInt(split[1]);
+
+        // Special block color handling
+        if (name.contains("%color%")) {
+            for (int i = from; i <= to; i++) {
+                mappings.put(i << 4, new MappedLegacyBlockItem(id, data, name.replace("%color%", BlockColors.get(i - from)), block));
+            }
+        } else {
+            MappedLegacyBlockItem mappedBlockItem = new MappedLegacyBlockItem(id, data, name, block);
+            for (int i = from; i <= to; i++) {
+                mappings.put(i << 4, mappedBlockItem);
             }
         }
     }
 
     protected LegacyBlockItemRewriter(T protocol) {
-        super(protocol, false);
+        super(protocol, Type.ITEM1_8, Type.ITEM1_8_SHORT_ARRAY, false);
         replacementData = LEGACY_MAPPINGS.get(protocol.getClass().getSimpleName().split("To")[1].replace("_", "."));
     }
 
@@ -95,7 +113,7 @@ public abstract class LegacyBlockItemRewriter<T extends BackwardsProtocol> exten
     public @Nullable Item handleItemToClient(@Nullable Item item) {
         if (item == null) return null;
 
-        MappedLegacyBlockItem data = replacementData.get(item.identifier());
+        MappedLegacyBlockItem data = getMappedBlockItem(item.identifier(), item.data());
         if (data == null) {
             // Just rewrite the id
             return super.handleItemToClient(item);
@@ -114,21 +132,22 @@ public abstract class LegacyBlockItemRewriter<T extends BackwardsProtocol> exten
                 item.setTag(new CompoundTag());
             }
 
-            CompoundTag display = item.tag().get("display");
+            CompoundTag display = item.tag().getCompoundTag("display");
             if (display == null) {
                 item.tag().put("display", display = new CompoundTag());
             }
 
-            StringTag nameTag = display.get("Name");
+            StringTag nameTag = display.getStringTag("Name");
             if (nameTag == null) {
-                display.put("Name", nameTag = new StringTag(data.getName()));
+                nameTag = new StringTag(data.getName());
+                display.put("Name", nameTag);
                 display.put(nbtTagName + "|customName", new ByteTag());
             }
 
             // Handle colors
             String value = nameTag.getValue();
             if (value.contains("%vb_color%")) {
-                display.put("Name", new StringTag(value.replace("%vb_color%", BlockColors.get(originalData))));
+                display.putString("Name", value.replace("%vb_color%", BlockColors.get(originalData)));
             }
         }
         return item;
@@ -145,7 +164,7 @@ public abstract class LegacyBlockItemRewriter<T extends BackwardsProtocol> exten
     }
 
     public @Nullable Block handleBlock(int blockId, int data) {
-        MappedLegacyBlockItem settings = replacementData.get(blockId);
+        MappedLegacyBlockItem settings = getMappedBlockItem(blockId, data);
         if (settings == null || !settings.isBlock()) return null;
 
         Block block = settings.getBlock();
@@ -156,21 +175,30 @@ public abstract class LegacyBlockItemRewriter<T extends BackwardsProtocol> exten
         return block;
     }
 
+    private @Nullable MappedLegacyBlockItem getMappedBlockItem(int id, int data) {
+        MappedLegacyBlockItem mapping = replacementData.get((id << 4) | (data & 15));
+        return mapping != null || data == 0 ? mapping : replacementData.get(id << 4);
+    }
+
+    private @Nullable MappedLegacyBlockItem getMappedBlockItem(int rawId) {
+        MappedLegacyBlockItem mapping = replacementData.get(rawId);
+        return mapping != null ? mapping : replacementData.get(rawId & ~15);
+    }
+
     protected void handleChunk(Chunk chunk) {
         // Map Block Entities
         Map<Pos, CompoundTag> tags = new HashMap<>();
         for (CompoundTag tag : chunk.getBlockEntities()) {
-            Tag xTag;
-            Tag yTag;
-            Tag zTag;
-            if ((xTag = tag.get("x")) == null || (yTag = tag.get("y")) == null || (zTag = tag.get("z")) == null) {
+            NumberTag xTag;
+            NumberTag yTag;
+            NumberTag zTag;
+            if ((xTag = tag.getNumberTag("x")) == null
+                || (yTag = tag.getNumberTag("y")) == null
+                || (zTag = tag.getNumberTag("z")) == null) {
                 continue;
             }
 
-            Pos pos = new Pos(
-                    ((NumberTag) xTag).asInt() & 0xF,
-                    ((NumberTag) yTag).asInt(),
-                    ((NumberTag) zTag).asInt() & 0xF);
+            Pos pos = new Pos(xTag.asInt() & 0xF, yTag.asInt(), zTag.asInt() & 0xF);
             tags.put(pos, tag);
 
             // Handle given Block Entities
@@ -179,10 +207,9 @@ public abstract class LegacyBlockItemRewriter<T extends BackwardsProtocol> exten
             ChunkSection section = chunk.getSections()[pos.getY() >> 4];
             if (section == null) continue;
 
-            int block = section.getFlatBlock(pos.getX(), pos.getY() & 0xF, pos.getZ());
-            int btype = block >> 4;
+            int block = section.palette(PaletteType.BLOCKS).idAt(pos.getX(), pos.getY() & 0xF, pos.getZ());
 
-            MappedLegacyBlockItem settings = replacementData.get(btype);
+            MappedLegacyBlockItem settings = getMappedBlockItem(block);
             if (settings != null && settings.hasBlockEntityHandler()) {
                 settings.getBlockEntityHandler().handleOrNewCompoundTag(block, tag);
             }
@@ -190,25 +217,28 @@ public abstract class LegacyBlockItemRewriter<T extends BackwardsProtocol> exten
 
         for (int i = 0; i < chunk.getSections().length; i++) {
             ChunkSection section = chunk.getSections()[i];
-            if (section == null) continue;
+            if (section == null) {
+                continue;
+            }
 
             boolean hasBlockEntityHandler = false;
 
             // Map blocks
-            for (int j = 0; j < section.getPaletteSize(); j++) {
-                int block = section.getPaletteEntry(j);
+            DataPalette palette = section.palette(PaletteType.BLOCKS);
+            for (int j = 0; j < palette.size(); j++) {
+                int block = palette.idByIndex(j);
                 int btype = block >> 4;
                 int meta = block & 0xF;
 
                 Block b = handleBlock(btype, meta);
                 if (b != null) {
-                    section.setPaletteEntry(j, (b.getId() << 4) | (b.getData() & 0xF));
+                    palette.setIdByIndex(j, (b.getId() << 4) | (b.getData() & 0xF));
                 }
 
                 // We already know that is has a handler
                 if (hasBlockEntityHandler) continue;
 
-                MappedLegacyBlockItem settings = replacementData.get(btype);
+                MappedLegacyBlockItem settings = getMappedBlockItem(block);
                 if (settings != null && settings.hasBlockEntityHandler()) {
                     hasBlockEntityHandler = true;
                 }
@@ -220,11 +250,9 @@ public abstract class LegacyBlockItemRewriter<T extends BackwardsProtocol> exten
             for (int x = 0; x < 16; x++) {
                 for (int y = 0; y < 16; y++) {
                     for (int z = 0; z < 16; z++) {
-                        int block = section.getFlatBlock(x, y, z);
-                        int btype = block >> 4;
-                        int meta = block & 15;
+                        int block = palette.idAt(x, y, z);
 
-                        MappedLegacyBlockItem settings = replacementData.get(btype);
+                        MappedLegacyBlockItem settings = getMappedBlockItem(block);
                         if (settings == null || !settings.hasBlockEntityHandler()) continue;
 
                         Pos pos = new Pos(x, (y + (i << 4)), z);
@@ -233,9 +261,9 @@ public abstract class LegacyBlockItemRewriter<T extends BackwardsProtocol> exten
                         if (tags.containsKey(pos)) continue;
 
                         CompoundTag tag = new CompoundTag();
-                        tag.put("x", new IntTag(x + (chunk.getX() << 4)));
-                        tag.put("y", new IntTag(y + (i << 4)));
-                        tag.put("z", new IntTag(z + (chunk.getZ() << 4)));
+                        tag.putInt("x", x + (chunk.getX() << 4));
+                        tag.putInt("y", y + (i << 4));
+                        tag.putInt("z", z + (chunk.getZ() << 4));
 
                         settings.getBlockEntityHandler().handleOrNewCompoundTag(block, tag);
                         chunk.getBlockEntities().add(tag);
@@ -247,9 +275,10 @@ public abstract class LegacyBlockItemRewriter<T extends BackwardsProtocol> exten
 
     protected CompoundTag getNamedTag(String text) {
         CompoundTag tag = new CompoundTag();
-        tag.put("display", new CompoundTag());
+        CompoundTag displayTag = new CompoundTag();
+        tag.put("display", displayTag);
         text = "§r" + text;
-        ((CompoundTag) tag.get("display")).put("Name", new StringTag(jsonNameFormat ? ChatRewriter.legacyTextToJsonString(text) : text));
+        displayTag.putString("Name", jsonNameFormat ? ComponentUtil.legacyToJsonString(text) : text);
         return tag;
     }
 

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 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
@@ -22,10 +22,8 @@ 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 java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -49,18 +47,24 @@ public class LegacyEnchantmentRewriter {
 
     public void rewriteEnchantmentsToClient(CompoundTag tag, boolean storedEnchant) {
         String key = storedEnchant ? "StoredEnchantments" : "ench";
-        ListTag enchantments = tag.get(key);
+        ListTag enchantments = tag.getListTag(key);
         ListTag remappedEnchantments = new ListTag(CompoundTag.class);
         List<Tag> lore = new ArrayList<>();
-        for (Tag enchantmentEntry : enchantments.clone()) {
-            Tag idTag = ((CompoundTag) enchantmentEntry).get("id");
+        for (Tag enchantmentEntry : enchantments.copy()) {
+            if (!(enchantmentEntry instanceof CompoundTag)) {
+                continue;
+            }
+
+            CompoundTag entryTag = (CompoundTag) enchantmentEntry;
+            NumberTag idTag = entryTag.getNumberTag("id");
             if (idTag == null) continue;
 
-            short newId = ((NumberTag) idTag).asShort();
+            short newId = idTag.asShort();
             String enchantmentName = enchantmentMappings.get(newId);
             if (enchantmentName != null) {
                 enchantments.remove(enchantmentEntry);
-                short level = ((NumberTag) ((CompoundTag) enchantmentEntry).get("lvl")).asShort();
+                NumberTag levelTag = entryTag.getNumberTag("lvl");
+                short level = levelTag != null ? levelTag.asShort() : 1;
                 if (hideLevelForEnchants != null && hideLevelForEnchants.contains(newId)) {
                     lore.add(new StringTag(enchantmentName));
                 } else {
@@ -70,33 +74,32 @@ public class LegacyEnchantmentRewriter {
             }
         }
         if (!lore.isEmpty()) {
-            if (!storedEnchant && enchantments.size() == 0) {
+            if (!storedEnchant && enchantments.isEmpty()) {
                 CompoundTag dummyEnchantment = new CompoundTag();
-                dummyEnchantment.put("id", new ShortTag((short) 0));
-                dummyEnchantment.put("lvl", new ShortTag((short) 0));
+                dummyEnchantment.putShort("id", (short) 0);
+                dummyEnchantment.putShort("lvl", (short) 0);
                 enchantments.add(dummyEnchantment);
 
                 tag.put(nbtTagName + "|dummyEnchant", new ByteTag());
 
-                IntTag hideFlags = tag.get("HideFlags");
+                NumberTag hideFlags = tag.getNumberTag("HideFlags");
                 if (hideFlags == null) {
                     hideFlags = new IntTag();
                 } else {
-                    tag.put(nbtTagName + "|oldHideFlags", new IntTag(hideFlags.asByte()));
+                    tag.putInt(nbtTagName + "|oldHideFlags", hideFlags.asByte());
                 }
 
                 int flags = hideFlags.asByte() | 1;
-                hideFlags.setValue(flags);
-                tag.put("HideFlags", hideFlags);
+                tag.putInt("HideFlags", flags);
             }
 
             tag.put(nbtTagName + "|" + key, remappedEnchantments);
 
-            CompoundTag display = tag.get("display");
+            CompoundTag display = tag.getCompoundTag("display");
             if (display == null) {
                 tag.put("display", display = new CompoundTag());
             }
-            ListTag loreTag = display.get("Lore");
+            ListTag loreTag = display.getListTag("Lore");
             if (loreTag == null) {
                 display.put("Lore", loreTag = new ListTag(StringTag.class));
             }
@@ -109,38 +112,45 @@ public class LegacyEnchantmentRewriter {
     public void rewriteEnchantmentsToServer(CompoundTag tag, boolean storedEnchant) {
         String key = storedEnchant ? "StoredEnchantments" : "ench";
         ListTag remappedEnchantments = tag.remove(nbtTagName + "|" + key);
-        ListTag enchantments = tag.get(key);
+        ListTag enchantments = tag.getListTag(key);
         if (enchantments == null) {
             enchantments = new ListTag(CompoundTag.class);
         }
 
         if (!storedEnchant && tag.remove(nbtTagName + "|dummyEnchant") != null) {
-            for (Tag enchantment : enchantments.clone()) {
-                short id = ((NumberTag) ((CompoundTag) enchantment).get("id")).asShort();
-                short level = ((NumberTag) ((CompoundTag) enchantment).get("lvl")).asShort();
+            for (Tag enchantment : enchantments.copy()) {
+                if (!(enchantment instanceof CompoundTag)) {
+                    continue;
+                }
+
+                CompoundTag entryTag = (CompoundTag) enchantment;
+                NumberTag idTag = entryTag.getNumberTag("id");
+                NumberTag levelTag = entryTag.getNumberTag("lvl");
+                short id = idTag != null ? idTag.asShort() : 0;
+                short level = levelTag != null ? levelTag.asShort() : 0;
                 if (id == 0 && level == 0) {
                     enchantments.remove(enchantment);
                 }
             }
 
-            IntTag hideFlags = tag.remove(nbtTagName + "|oldHideFlags");
-            if (hideFlags != null) {
-                tag.put("HideFlags", new IntTag(hideFlags.asByte()));
+            Tag hideFlags = tag.remove(nbtTagName + "|oldHideFlags");
+            if (hideFlags instanceof IntTag) {
+                tag.putInt("HideFlags", ((IntTag) hideFlags).asByte());
             } else {
                 tag.remove("HideFlags");
             }
         }
 
-        CompoundTag display = tag.get("display");
+        CompoundTag display = tag.getCompoundTag("display");
         // A few null checks just to be safe, though they shouldn't actually be
-        ListTag lore = display != null ? display.get("Lore") : null;
-        for (Tag enchantment : remappedEnchantments.clone()) {
+        ListTag lore = display != null ? display.getListTag("Lore") : null;
+        for (Tag enchantment : remappedEnchantments.copy()) {
             enchantments.add(enchantment);
-            if (lore != null && lore.size() != 0) {
+            if (lore != null && !lore.isEmpty()) {
                 lore.remove(lore.get(0));
             }
         }
-        if (lore != null && lore.size() == 0) {
+        if (lore != null && lore.isEmpty()) {
             display.remove("Lore");
             if (display.isEmpty()) {
                 tag.remove("display");

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 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
@@ -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;
@@ -30,17 +31,15 @@ import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_9;
 import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
-import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+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 org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
-public abstract class LegacyEntityRewriter<T extends BackwardsProtocol> extends EntityRewriterBase<T> {
+public abstract class LegacyEntityRewriter<C extends ClientboundPacketType, T extends BackwardsProtocol<C, ?, ?, ?>> extends EntityRewriterBase<C, T> {
     private final Map<ObjectType, EntityData> objectTypes = new HashMap<>();
 
     protected LegacyEntityRewriter(T protocol) {
@@ -61,10 +60,10 @@ public abstract class LegacyEntityRewriter<T extends BackwardsProtocol> extends
         return objectTypes.get(type);
     }
 
-    protected void registerRespawn(ClientboundPacketType packetType) {
-        protocol.registerClientbound(packetType, new PacketRemapper() {
+    protected void registerRespawn(C packetType) {
+        protocol.registerClientbound(packetType, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.INT);
                 handler(wrapper -> {
                     ClientWorld clientWorld = wrapper.user().get(ClientWorld.class);
@@ -74,10 +73,10 @@ public abstract class LegacyEntityRewriter<T extends BackwardsProtocol> extends
         });
     }
 
-    protected void registerJoinGame(ClientboundPacketType packetType, EntityType playerType) {
-        protocol.registerClientbound(packetType, new PacketRemapper() {
+    protected void registerJoinGame(C packetType, EntityType playerType) {
+        protocol.registerClientbound(packetType, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.INT); // 0 - Entity ID
                 map(Type.UNSIGNED_BYTE); // 1 - Gamemode
                 map(Type.INT); // 2 - Dimension
@@ -91,10 +90,10 @@ public abstract class LegacyEntityRewriter<T extends BackwardsProtocol> extends
     }
 
     @Override
-    public void registerMetadataRewriter(ClientboundPacketType packetType, Type<List<Metadata>> oldMetaType, Type<List<Metadata>> newMetaType) {
-        protocol.registerClientbound(packetType, new PacketRemapper() {
+    public void registerMetadataRewriter(C packetType, Type<List<Metadata>> oldMetaType, Type<List<Metadata>> newMetaType) {
+        protocol.registerClientbound(packetType, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT); // 0 - Entity ID
                 if (oldMetaType != null) {
                     map(oldMetaType, newMetaType);
@@ -110,7 +109,7 @@ public abstract class LegacyEntityRewriter<T extends BackwardsProtocol> extends
     }
 
     @Override
-    public void registerMetadataRewriter(ClientboundPacketType packetType, Type<List<Metadata>> metaType) {
+    public void registerMetadataRewriter(C packetType, Type<List<Metadata>> metaType) {
         registerMetadataRewriter(packetType, null, metaType);
     }
 

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@ import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap;
 
 @Deprecated
-public abstract class LegacySoundRewriter<T extends BackwardsProtocol> extends RewriterBase<T> {
+public abstract class LegacySoundRewriter<T extends BackwardsProtocol<?, ?, ?, ?>> extends RewriterBase<T> {
     protected final Int2ObjectMap<SoundData> soundRewrites = new Int2ObjectOpenHashMap<>(64);
 
     protected LegacySoundRewriter(T protocol) {

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,9 +37,7 @@ public final class MapColorRewriter {
                 wrapper.passthrough(Type.BYTE); // X
                 wrapper.passthrough(Type.BYTE); // Z
                 wrapper.passthrough(Type.BYTE); // Direction
-                if (wrapper.passthrough(Type.BOOLEAN)) {
-                    wrapper.passthrough(Type.COMPONENT); // Display Name
-                }
+                wrapper.passthrough(Type.OPTIONAL_COMPONENT); // Display Name
             }
 
             short columns = wrapper.passthrough(Type.UNSIGNED_BYTE);

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,32 +20,32 @@ package com.viaversion.viabackwards.api.rewriters;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
-import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
 
-public class SoundRewriter extends com.viaversion.viaversion.rewriter.SoundRewriter {
+public class SoundRewriter<C extends ClientboundPacketType> extends com.viaversion.viaversion.rewriter.SoundRewriter<C> {
 
-    private final BackwardsProtocol protocol;
+    private final BackwardsProtocol<C, ?, ?, ?> protocol;
 
-    public SoundRewriter(BackwardsProtocol protocol) {
+    public SoundRewriter(BackwardsProtocol<C, ?, ?, ?> protocol) {
         super(protocol);
         this.protocol = protocol;
     }
 
-    public void registerNamedSound(ClientboundPacketType packetType) {
-        protocol.registerClientbound(packetType, new PacketRemapper() {
+    public void registerNamedSound(C packetType) {
+        protocol.registerClientbound(packetType, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.STRING); // Sound identifier
                 handler(getNamedSoundHandler());
             }
         });
     }
 
-    public void registerStopSound(ClientboundPacketType packetType) {
-        protocol.registerClientbound(packetType, new PacketRemapper() {
+    public void registerStopSound(C packetType) {
+        protocol.registerClientbound(packetType, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 handler(getStopSoundHandler());
             }
         });
@@ -55,7 +55,10 @@ public class SoundRewriter extends com.viaversion.viaversion.rewriter.SoundRewri
         return wrapper -> {
             String soundId = wrapper.get(Type.STRING, 0);
             String mappedId = protocol.getMappingData().getMappedNamedSound(soundId);
-            if (mappedId == null) return;
+            if (mappedId == null) {
+                return;
+            }
+
             if (!mappedId.isEmpty()) {
                 wrapper.set(Type.STRING, 0, mappedId);
             } else {
@@ -89,4 +92,40 @@ public class SoundRewriter extends com.viaversion.viaversion.rewriter.SoundRewri
             }
         };
     }
+
+    @Override
+    public void register1_19_3Sound(C packetType) {
+        protocol.registerClientbound(packetType, get1_19_3SoundHandler());
+    }
+
+    public PacketHandler get1_19_3SoundHandler() {
+        return wrapper -> {
+            final int soundId = wrapper.read(Type.VAR_INT);
+            if (soundId != 0) {
+                final int mappedId = idRewriter.rewrite(soundId - 1); // Normalize the id
+                if (mappedId == -1) {
+                    wrapper.cancel();
+                    return;
+                }
+
+                wrapper.write(Type.VAR_INT, mappedId + 1);
+                return;
+            }
+
+            // Is followed by the resource loation
+            wrapper.write(Type.VAR_INT, 0);
+
+            String soundIdentifier = wrapper.read(Type.STRING);
+            final String mappedIdentifier = protocol.getMappingData().getMappedNamedSound(soundIdentifier);
+            if (mappedIdentifier != null) {
+                if (mappedIdentifier.isEmpty()) {
+                    wrapper.cancel();
+                    return;
+                }
+
+                soundIdentifier = mappedIdentifier;
+            }
+            wrapper.write(Type.STRING, soundIdentifier);
+        };
+    }
 }

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,124 +21,53 @@ 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.PacketRemapper;
-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;
-
 import java.util.HashMap;
 import java.util.Map;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
-public class TranslatableRewriter extends ComponentRewriter {
+public class TranslatableRewriter<C extends ClientboundPacketType> extends ComponentRewriter<C> {
 
     private static final Map<String, Map<String, String>> TRANSLATABLES = new HashMap<>();
-    protected final Map<String, String> newTranslatables;
+    private final Map<String, String> translatables;
 
     public static void loadTranslatables() {
-        JsonObject jsonObject = VBMappingDataLoader.loadData("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 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 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, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                handler(wrapper -> processText(wrapper.passthrough(Type.COMPONENT)));
-            }
-        });
-    }
-
-    public void registerDisconnect(ClientboundPacketType packetType) {
-        protocol.registerClientbound(packetType, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                handler(wrapper -> processText(wrapper.passthrough(Type.COMPONENT)));
-            }
-        });
-    }
-
-    public void registerChatMessage(ClientboundPacketType packetType) {
-        protocol.registerClientbound(packetType, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                handler(wrapper -> processText(wrapper.passthrough(Type.COMPONENT)));
-            }
-        });
-    }
-
-    public void registerLegacyOpenWindow(ClientboundPacketType packetType) {
-        protocol.registerClientbound(packetType, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                map(Type.UNSIGNED_BYTE); // Id
-                map(Type.STRING); // Window Type
-                handler(wrapper -> processText(wrapper.passthrough(Type.COMPONENT)));
-            }
-        });
-    }
-
-    public void registerOpenWindow(ClientboundPacketType packetType) {
-        protocol.registerClientbound(packetType, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                map(Type.VAR_INT); // Id
-                map(Type.VAR_INT); // Window Type
-                handler(wrapper -> processText(wrapper.passthrough(Type.COMPONENT)));
-            }
-        });
-    }
-
-    public void registerTabList(ClientboundPacketType packetType) {
-        protocol.registerClientbound(packetType, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                handler(wrapper -> {
-                    processText(wrapper.passthrough(Type.COMPONENT));
-                    processText(wrapper.passthrough(Type.COMPONENT));
-                });
-            }
-        });
-    }
-
-    public void registerCombatKill(ClientboundPacketType packetType) {
-        protocol.registerClientbound(packetType, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                map(Type.VAR_INT);
-                map(Type.INT);
-                handler(wrapper -> processText(wrapper.passthrough(Type.COMPONENT)));
-            }
-        });
-    }
-
     @Override
-    protected void handleTranslate(JsonObject root, String translate) {
-        String newTranslate = newTranslatables.get(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 translatables.get(translationKey);
+    }
 }

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

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

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 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
@@ -26,15 +26,15 @@ 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> {
 
-    public static final BackwardsMappings MAPPINGS = new BackwardsMappings("1.11", "1.10", null, true);
+    public static final BackwardsMappings MAPPINGS = new BackwardsMappings("1.11", "1.10");
     private final EntityPackets1_11 entityPackets = new EntityPackets1_11(this); // Required for the item rewriter
     private BlockItemPackets1_11 blockItemPackets;
 
@@ -48,7 +48,7 @@ public class Protocol1_10To1_11 extends BackwardsProtocol<ClientboundPackets1_9_
         entityPackets.register();
         new PlayerPackets1_11().register(this);
 
-        SoundRewriter soundRewriter = new SoundRewriter(this);
+        SoundRewriter<ClientboundPackets1_9_3> soundRewriter = new SoundRewriter<>(this);
         soundRewriter.registerNamedSound(ClientboundPackets1_9_3.NAMED_SOUND);
         soundRewriter.registerSound(ClientboundPackets1_9_3.SOUND);
     }
@@ -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, true));
+        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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 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
@@ -28,28 +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.PacketRemapper;
+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;
 
-public class BlockItemPackets1_11 extends LegacyBlockItemRewriter<Protocol1_10To1_11> {
+public class BlockItemPackets1_11 extends LegacyBlockItemRewriter<ClientboundPackets1_9_3, ServerboundPackets1_9_3, Protocol1_10To1_11> {
 
     private LegacyEnchantmentRewriter enchantmentRewriter;
 
@@ -59,282 +54,244 @@ public class BlockItemPackets1_11 extends LegacyBlockItemRewriter<Protocol1_10To
 
     @Override
     protected void registerPackets() {
-        protocol.registerClientbound(ClientboundPackets1_9_3.SET_SLOT, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_9_3.SET_SLOT, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            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() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        if (isLlama(wrapper.user())) {
-                            Optional<ChestedHorseStorage> horse = getChestedHorse(wrapper.user());
-                            if (!horse.isPresent())
-                                return;
-                            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)));
-                        }
+                handler(wrapper -> {
+                    if (isLlama(wrapper.user())) {
+                        Optional<ChestedHorseStorage> horse = getChestedHorse(wrapper.user());
+                        if (!horse.isPresent())
+                            return;
+                        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.ITEM1_8, 0, getNewItem(storage, currentSlot, wrapper.get(Type.ITEM1_8, 0)));
                     }
                 });
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_9_3.WINDOW_ITEMS, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_9_3.WINDOW_ITEMS, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            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(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        Item[] stacks = wrapper.get(Type.ITEM_ARRAY, 0);
-                        for (int i = 0; i < stacks.length; i++)
-                            stacks[i] = handleItemToClient(stacks[i]);
+                handler(wrapper -> {
+                    Item[] stacks = wrapper.get(Type.ITEM1_8_SHORT_ARRAY, 0);
+                    for (int i = 0; i < stacks.length; i++)
+                        stacks[i] = handleItemToClient(stacks[i]);
 
-                        if (isLlama(wrapper.user())) {
-                            Optional<ChestedHorseStorage> horse = getChestedHorse(wrapper.user());
-                            if (!horse.isPresent())
-                                return;
-                            ChestedHorseStorage storage = horse.get();
-                            stacks = Arrays.copyOf(stacks, !storage.isChested() ? 38 : 53);
+                    if (isLlama(wrapper.user())) {
+                        Optional<ChestedHorseStorage> horse = getChestedHorse(wrapper.user());
+                        if (!horse.isPresent())
+                            return;
+                        ChestedHorseStorage storage = horse.get();
+                        stacks = Arrays.copyOf(stacks, !storage.isChested() ? 38 : 53);
 
-                            for (int i = stacks.length - 1; i >= 0; i--) {
-                                stacks[getNewSlotId(storage, i)] = stacks[i];
-                                stacks[i] = getNewItem(storage, i, stacks[i]);
-                            }
-                            wrapper.set(Type.ITEM_ARRAY, 0, stacks);
+                        for (int i = stacks.length - 1; i >= 0; i--) {
+                            stacks[getNewSlotId(storage, i)] = stacks[i];
+                            stacks[i] = getNewItem(storage, i, stacks[i]);
                         }
+                        wrapper.set(Type.ITEM1_8_SHORT_ARRAY, 0, stacks);
                     }
                 });
             }
         });
 
-        registerEntityEquipment(ClientboundPackets1_9_3.ENTITY_EQUIPMENT, Type.ITEM);
+        registerEntityEquipment(ClientboundPackets1_9_3.ENTITY_EQUIPMENT);
 
-        // Plugin message Packet -> Trading
-        protocol.registerClientbound(ClientboundPackets1_9_3.PLUGIN_MESSAGE, new PacketRemapper() {
+        // Plugin message -> Trading
+        protocol.registerClientbound(ClientboundPackets1_9_3.PLUGIN_MESSAGE, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.STRING); // 0 - Channel
 
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        if (wrapper.get(Type.STRING, 0).equalsIgnoreCase("MC|TrList")) {
-                            wrapper.passthrough(Type.INT); // Passthrough Window ID
+                handler(wrapper -> {
+                    if (wrapper.get(Type.STRING, 0).equals("MC|TrList")) {
+                        wrapper.passthrough(Type.INT); // Passthrough Window ID
 
-                            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
+                        int size = wrapper.passthrough(Type.UNSIGNED_BYTE);
+                        for (int i = 0; i < size; i++) {
+                            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.passthrough(Type.BOOLEAN); // Trade disabled
-                                wrapper.passthrough(Type.INT); // Number of tools uses
-                                wrapper.passthrough(Type.INT); // Maximum number of trade uses
+                            boolean secondItem = wrapper.passthrough(Type.BOOLEAN); // Has second item
+                            if (secondItem) {
+                                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
+                            wrapper.passthrough(Type.INT); // Maximum number of trade uses
                         }
                     }
                 });
             }
         });
 
-        protocol.registerServerbound(ServerboundPackets1_9_3.CLICK_WINDOW, new PacketRemapper() {
+        protocol.registerServerbound(ServerboundPackets1_9_3.CLICK_WINDOW, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.UNSIGNED_BYTE); // 0 - Window ID
                 map(Type.SHORT); // 1 - Slot
                 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(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        if (isLlama(wrapper.user())) {
-                            Optional<ChestedHorseStorage> horse = getChestedHorse(wrapper.user());
-                            if (!horse.isPresent())
-                                return;
-                            ChestedHorseStorage storage = horse.get();
-                            int clickSlot = wrapper.get(Type.SHORT, 0);
-                            int correctSlot = getOldSlotId(storage, clickSlot);
+                handler(wrapper -> {
+                    if (isLlama(wrapper.user())) {
+                        Optional<ChestedHorseStorage> horse = getChestedHorse(wrapper.user());
+                        if (!horse.isPresent())
+                            return;
+                        ChestedHorseStorage storage = horse.get();
+                        int clickSlot = wrapper.get(Type.SHORT, 0);
+                        int correctSlot = getOldSlotId(storage, clickSlot);
 
-                            wrapper.set(Type.SHORT, 0, ((Integer) correctSlot).shortValue());
-                        }
+                        wrapper.set(Type.SHORT, 0, ((Integer) correctSlot).shortValue());
                     }
                 });
             }
         });
 
-        registerCreativeInvAction(ServerboundPackets1_9_3.CREATIVE_INVENTORY_ACTION, Type.ITEM);
+        registerCreativeInvAction(ServerboundPackets1_9_3.CREATIVE_INVENTORY_ACTION);
 
-        protocol.registerClientbound(ClientboundPackets1_9_3.CHUNK_DATA, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        ClientWorld clientWorld = wrapper.user().get(ClientWorld.class);
+        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.
-                        Chunk chunk = wrapper.passthrough(type);
+            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);
+            handleChunk(chunk);
 
-                        // only patch it for signs for now
-                        for (CompoundTag tag : chunk.getBlockEntities()) {
-                            Tag idTag = tag.get("id");
-                            if (!(idTag instanceof StringTag)) continue;
+            // only patch it for signs for now
+            for (CompoundTag tag : chunk.getBlockEntities()) {
+                StringTag idTag = tag.getStringTag("id");
+                if (idTag == null) continue;
 
-                            String id = (String) idTag.getValue();
-                            if (id.equals("minecraft:sign")) {
-                                ((StringTag) idTag).setValue("Sign");
-                            }
-                        }
-                    }
-                });
+                String id = idTag.getValue();
+                if (id.equals("minecraft:sign")) {
+                    idTag.setValue("Sign");
+                }
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_9_3.BLOCK_CHANGE, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_9_3.BLOCK_CHANGE, new PacketHandlers() {
             @Override
-            public void registerMap() {
-                map(Type.POSITION); // 0 - Block Position
+            public void register() {
+                map(Type.POSITION1_8); // 0 - Block Position
                 map(Type.VAR_INT); // 1 - Block
 
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        int idx = wrapper.get(Type.VAR_INT, 0);
-                        wrapper.set(Type.VAR_INT, 0, handleBlockID(idx));
-                    }
+                handler(wrapper -> {
+                    int idx = wrapper.get(Type.VAR_INT, 0);
+                    wrapper.set(Type.VAR_INT, 0, handleBlockID(idx));
                 });
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_9_3.MULTI_BLOCK_CHANGE, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_9_3.MULTI_BLOCK_CHANGE, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.INT); // 0 - Chunk X
                 map(Type.INT); // 1 - Chunk Z
                 map(Type.BLOCK_CHANGE_RECORD_ARRAY);
 
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        for (BlockChangeRecord record : wrapper.get(Type.BLOCK_CHANGE_RECORD_ARRAY, 0)) {
-                            record.setBlockId(handleBlockID(record.getBlockId()));
-                        }
+                handler(wrapper -> {
+                    for (BlockChangeRecord record : wrapper.get(Type.BLOCK_CHANGE_RECORD_ARRAY, 0)) {
+                        record.setBlockId(handleBlockID(record.getBlockId()));
                     }
                 });
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_9_3.BLOCK_ENTITY_DATA, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_9_3.BLOCK_ENTITY_DATA, new PacketHandlers() {
             @Override
-            public void registerMap() {
-                map(Type.POSITION); // 0 - Position
+            public void register() {
+                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(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        // Remove on shulkerbox decleration
-                        if (wrapper.get(Type.UNSIGNED_BYTE, 0) == 10) {
-                            wrapper.cancel();
-                        }
-                        // Handler Spawners
-                        if (wrapper.get(Type.UNSIGNED_BYTE, 0) == 1) {
-                            CompoundTag tag = wrapper.get(Type.NBT, 0);
-                            EntityIdRewriter.toClientSpawner(tag, true);
-                        }
+                handler(wrapper -> {
+                    // Remove on shulkerbox decleration
+                    if (wrapper.get(Type.UNSIGNED_BYTE, 0) == 10) {
+                        wrapper.cancel();
+                    }
+                    // Handler Spawners
+                    if (wrapper.get(Type.UNSIGNED_BYTE, 0) == 1) {
+                        CompoundTag tag = wrapper.get(Type.NAMED_COMPOUND_TAG, 0);
+                        EntityIdRewriter.toClientSpawner(tag, true);
                     }
                 });
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_9_3.OPEN_WINDOW, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_9_3.OPEN_WINDOW, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.UNSIGNED_BYTE); // 0 - Window ID
                 map(Type.STRING); // 1 - Window Type
                 map(Type.COMPONENT); // 2 - Title
                 map(Type.UNSIGNED_BYTE); // 3 - Slots
 
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        int entityId = -1;
-                        // Passthrough Entity ID
-                        if (wrapper.get(Type.STRING, 0).equals("EntityHorse")) {
-                            entityId = wrapper.passthrough(Type.INT);
-                        }
+                handler(wrapper -> {
+                    int entityId = -1;
+                    // Passthrough Entity ID
+                    if (wrapper.get(Type.STRING, 0).equals("EntityHorse")) {
+                        entityId = wrapper.passthrough(Type.INT);
+                    }
 
-                        // Track Inventory
-                        String inventory = wrapper.get(Type.STRING, 0);
-                        WindowTracker windowTracker = wrapper.user().get(WindowTracker.class);
-                        windowTracker.setInventory(inventory);
-                        windowTracker.setEntityId(entityId);
+                    // Track Inventory
+                    String inventory = wrapper.get(Type.STRING, 0);
+                    WindowTracker windowTracker = wrapper.user().get(WindowTracker.class);
+                    windowTracker.setInventory(inventory);
+                    windowTracker.setEntityId(entityId);
 
-                        // Change llama slotcount to the donkey one
-                        if (isLlama(wrapper.user())) {
-                            wrapper.set(Type.UNSIGNED_BYTE, 1, (short) 17);
-                        }
+                    // Change llama slotcount to the donkey one
+                    if (isLlama(wrapper.user())) {
+                        wrapper.set(Type.UNSIGNED_BYTE, 1, (short) 17);
                     }
                 });
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_9_3.CLOSE_WINDOW, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_9_3.CLOSE_WINDOW, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 // Inventory tracking
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        WindowTracker windowTracker = wrapper.user().get(WindowTracker.class);
-                        windowTracker.setInventory(null);
-                        windowTracker.setEntityId(-1);
-                    }
+                handler(wrapper -> {
+                    WindowTracker windowTracker = wrapper.user().get(WindowTracker.class);
+                    windowTracker.setInventory(null);
+                    windowTracker.setEntityId(-1);
                 });
             }
         });
 
 
-        protocol.registerServerbound(ServerboundPackets1_9_3.CLOSE_WINDOW, new PacketRemapper() {
+        protocol.registerServerbound(ServerboundPackets1_9_3.CLOSE_WINDOW, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 // Inventory tracking
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        WindowTracker windowTracker = wrapper.user().get(WindowTracker.class);
-                        windowTracker.setInventory(null);
-                        windowTracker.setEntityId(-1);
-                    }
+                handler(wrapper -> {
+                    WindowTracker windowTracker = wrapper.user().get(WindowTracker.class);
+                    windowTracker.setInventory(null);
+                    windowTracker.setEntityId(-1);
                 });
             }
         });
 
         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()));
         });
     }
@@ -342,7 +299,7 @@ public class BlockItemPackets1_11 extends LegacyBlockItemRewriter<Protocol1_10To
     @Override
     protected void registerRewrites() {
         // Handle spawner block entity (map to itself with custom handler)
-        MappedLegacyBlockItem data = replacementData.computeIfAbsent(52, s -> new MappedLegacyBlockItem(52, (short) -1, null, false));
+        MappedLegacyBlockItem data = replacementData.computeIfAbsent(52 << 4, s -> new MappedLegacyBlockItem(52, (short) -1, null, false));
         data.setBlockEntityHandler((b, tag) -> {
             EntityIdRewriter.toClientSpawner(tag, true);
             return tag;
@@ -366,10 +323,10 @@ public class BlockItemPackets1_11 extends LegacyBlockItemRewriter<Protocol1_10To
         // Rewrite spawn eggs (id checks are done in the method itself)
         EntityIdRewriter.toClientItem(item, true);
 
-        if (tag.get("ench") instanceof ListTag) {
+        if (tag.getListTag("ench") != null) {
             enchantmentRewriter.rewriteEnchantmentsToClient(tag, false);
         }
-        if (tag.get("StoredEnchantments") instanceof ListTag) {
+        if (tag.getListTag("StoredEnchantments") != null) {
             enchantmentRewriter.rewriteEnchantmentsToClient(tag, true);
         }
         return item;
@@ -386,10 +343,10 @@ public class BlockItemPackets1_11 extends LegacyBlockItemRewriter<Protocol1_10To
         // Rewrite spawn eggs (id checks are done in the method itself)
         EntityIdRewriter.toServerItem(item, true);
 
-        if (tag.contains(nbtTagName + "|ench")) {
+        if (tag.getListTag(nbtTagName + "|ench") != null) {
             enchantmentRewriter.rewriteEnchantmentsToServer(tag, false);
         }
-        if (tag.contains(nbtTagName + "|StoredEnchantments")) {
+        if (tag.getListTag(nbtTagName + "|StoredEnchantments") != null) {
             enchantmentRewriter.rewriteEnchantmentsToServer(tag, true);
         }
         return item;
@@ -400,7 +357,7 @@ public class BlockItemPackets1_11 extends LegacyBlockItemRewriter<Protocol1_10To
         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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 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
@@ -26,22 +26,19 @@ 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.EntityType;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_11;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_12;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 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.PacketHandler;
-import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.version.Types1_9;
 import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3;
-
 import java.util.List;
 import java.util.Optional;
 
-public class EntityPackets1_11 extends LegacyEntityRewriter<Protocol1_10To1_11> {
+public class EntityPackets1_11 extends LegacyEntityRewriter<ClientboundPackets1_9_3, Protocol1_10To1_11> {
 
     public EntityPackets1_11(Protocol1_10To1_11 protocol) {
         super(protocol);
@@ -49,11 +46,11 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<Protocol1_10To1_11>
 
     @Override
     protected void registerPackets() {
-        protocol.registerClientbound(ClientboundPackets1_9_3.EFFECT, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_9_3.EFFECT, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            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);
@@ -72,9 +69,9 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<Protocol1_10To1_11>
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_9_3.SPAWN_ENTITY, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_9_3.SPAWN_ENTITY, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT); // 0 - Entity id
                 map(Type.UUID); // 1 - UUID
                 map(Type.BYTE); // 2 - Type
@@ -87,35 +84,32 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<Protocol1_10To1_11>
 
                 // 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(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        Optional<Entity1_12Types.ObjectType> type = Entity1_12Types.ObjectType.findById(wrapper.get(Type.BYTE, 0));
-                        if (type.isPresent() && type.get() == Entity1_12Types.ObjectType.FALLING_BLOCK) {
-                            int objectData = wrapper.get(Type.INT, 0);
-                            int objType = objectData & 4095;
-                            int data = objectData >> 12 & 15;
+                handler(wrapper -> {
+                    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;
 
-                            Block block = protocol.getItemRewriter().handleBlock(objType, data);
-                            if (block == null)
-                                return;
+                        Block block = protocol.getItemRewriter().handleBlock(objType, data);
+                        if (block == null)
+                            return;
 
-                            wrapper.set(Type.INT, 0, block.getId() | block.getData() << 12);
-                        }
+                        wrapper.set(Type.INT, 0, block.getId() | block.getData() << 12);
                     }
                 });
             }
         });
 
-        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 PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_9_3.SPAWN_MOB, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT); // 0 - Entity id
                 map(Type.UUID); // 1 - UUID
                 map(Type.VAR_INT, Type.UNSIGNED_BYTE); // 2 - Entity Type
@@ -157,13 +151,13 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<Protocol1_10To1_11>
             }
         });
 
-        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 PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_9_3.SPAWN_PLAYER, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT); // 0 - Entity ID
                 map(Type.UUID); // 1 - Player UUID
                 map(Type.DOUBLE); // 2 - X
@@ -173,7 +167,7 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<Protocol1_10To1_11>
                 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);
@@ -187,23 +181,20 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<Protocol1_10To1_11>
         registerRemoveEntities(ClientboundPackets1_9_3.DESTROY_ENTITIES);
         registerMetadataRewriter(ClientboundPackets1_9_3.ENTITY_METADATA, Types1_9.METADATA_LIST);
 
-        protocol.registerClientbound(ClientboundPackets1_9_3.ENTITY_STATUS, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_9_3.ENTITY_STATUS, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.INT); // 0 - Entity ID
                 map(Type.BYTE); // 1 - Entity Status
 
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        byte b = wrapper.get(Type.BYTE, 0);
+                handler(wrapper -> {
+                    byte b = wrapper.get(Type.BYTE, 0);
 
-                        if (b == 35) {
-                            wrapper.clearPacket();
-                            wrapper.setId(0x1E); // Change Game State
-                            wrapper.write(Type.UNSIGNED_BYTE, (short) 10); // Play Elder Guardian animation
-                            wrapper.write(Type.FLOAT, 0F);
-                        }
+                    if (b == 35) {
+                        wrapper.clearPacket();
+                        wrapper.setPacketType(ClientboundPackets1_9_3.GAME_EVENT);
+                        wrapper.write(Type.UNSIGNED_BYTE, (short) 10); // Play Elder Guardian animation
+                        wrapper.write(Type.FLOAT, 0F);
                     }
                 });
             }
@@ -213,37 +204,37 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<Protocol1_10To1_11>
     @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).plainName().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().type(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;
             }
 
@@ -251,12 +242,12 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<Protocol1_10To1_11>
         });
 
         // Handle skeleton swing
-        filter().filterFamily(Entity1_11Types.EntityType.ABSTRACT_SKELETON).index(12).toIndex(13);
+        filter().type(EntityTypes1_11.EntityType.ABSTRACT_SKELETON).index(12).toIndex(13);
 
         /*
             ZOMBIE CHANGES
          */
-        filter().filterFamily(Entity1_11Types.EntityType.ZOMBIE).handler((event, meta) -> {
+        filter().type(EntityTypes1_11.EntityType.ZOMBIE).handler((event, meta) -> {
             switch (meta.id()) {
                 case 13:
                     event.cancel();
@@ -276,18 +267,18 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<Protocol1_10To1_11>
         });
 
         // 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);
         });
@@ -297,7 +288,7 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<Protocol1_10To1_11>
          */
 
         // Handle horse flags
-        filter().filterFamily(Entity1_11Types.EntityType.ABSTRACT_HORSE).index(13).handler((event, meta) -> {
+        filter().type(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()) {
@@ -307,7 +298,7 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<Protocol1_10To1_11>
         });
 
         // Create chested horse storage
-        filter().filterFamily(Entity1_11Types.EntityType.CHESTED_HORSE).handler((event, meta) -> {
+        filter().type(EntityTypes1_11.EntityType.CHESTED_HORSE).handler((event, meta) -> {
             StoredEntityData data = storedEntityData(event);
             if (!data.has(ChestedHorseStorage.class)) {
                 data.put(new ChestedHorseStorage());
@@ -315,10 +306,10 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<Protocol1_10To1_11>
         });
 
         // 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().type(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();
@@ -327,7 +318,7 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<Protocol1_10To1_11>
         });
 
         // 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);
 
@@ -350,17 +341,17 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<Protocol1_10To1_11>
         });
 
         // Handle Horse (Correct owner)
-        filter().filterFamily(Entity1_11Types.EntityType.ABSTRACT_HORSE).index(14).toIndex(16);
+        filter().type(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);
     }
 
     /*
@@ -402,11 +393,11 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<Protocol1_10To1_11>
 
     @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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,28 +20,27 @@ package com.viaversion.viabackwards.protocol.protocol1_10to1_11.packets;
 
 import com.viaversion.viabackwards.protocol.protocol1_10to1_11.Protocol1_10To1_11;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
-import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer;
 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.libs.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
-import com.viaversion.viaversion.libs.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 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.util.ComponentUtil;
 
 public class PlayerPackets1_11 {
     private static final ValueTransformer<Short, Float> TO_NEW_FLOAT = new ValueTransformer<Short, Float>(Type.FLOAT) {
         @Override
         public Float transform(PacketWrapper wrapper, Short inputValue) throws Exception {
-            return inputValue / 15f;
+            return inputValue / 16f;
         }
     };
 
     public void register(Protocol1_10To1_11 protocol) {
-        protocol.registerClientbound(ClientboundPackets1_9_3.TITLE, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_9_3.TITLE, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT); // 0 - Action
 
                 handler(wrapper -> {
@@ -51,10 +50,10 @@ public class PlayerPackets1_11 {
                         JsonElement message = wrapper.read(Type.COMPONENT);
 
                         wrapper.clearPacket();
-                        wrapper.setId(ClientboundPackets1_9_3.CHAT_MESSAGE.ordinal());
+                        wrapper.setPacketType(ClientboundPackets1_9_3.CHAT_MESSAGE);
 
-                        // https://bugs.mojang.com/browse/MC-119145to
-                        String legacy = LegacyComponentSerializer.legacySection().serialize(GsonComponentSerializer.gson().deserialize(message.toString()));
+                        // https://bugs.mojang.com/browse/MC-119145
+                        String legacy = ComponentUtil.jsonToLegacy(message);
                         message = new JsonObject();
                         message.getAsJsonObject().addProperty("text", legacy);
 
@@ -67,9 +66,9 @@ public class PlayerPackets1_11 {
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_9_3.COLLECT_ITEM, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_9_3.COLLECT_ITEM, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT); // 0 - Collected entity id
                 map(Type.VAR_INT); // 1 - Collector entity id
 
@@ -78,10 +77,10 @@ public class PlayerPackets1_11 {
         });
 
 
-        protocol.registerServerbound(ServerboundPackets1_9_3.PLAYER_BLOCK_PLACEMENT, new PacketRemapper() {
+        protocol.registerServerbound(ServerboundPackets1_9_3.PLAYER_BLOCK_PLACEMENT, new PacketHandlers() {
             @Override
-            public void registerMap() {
-                map(Type.POSITION); // 0 - Location
+            public void register() {
+                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_10to1_11/storage/ChestedHorseStorage.java

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

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/storage/WindowTracker.java

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

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 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
@@ -26,8 +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.protocol.remapper.PacketRemapper;
+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;
@@ -35,17 +35,11 @@ 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> {
 
-    private static final BackwardsMappings MAPPINGS = new BackwardsMappings("1.12", "1.11", null, true) {
-        @Override
-        protected boolean shouldWarnOnMissing(final String key) {
-            return super.shouldWarnOnMissing(key) && !key.equals("sounds");
-        }
-    };
+    private static final BackwardsMappings MAPPINGS = new BackwardsMappings("1.12", "1.11");
     private final EntityPackets1_12 entityPackets = new EntityPackets1_12(this);
     private final BlockItemPackets1_12 blockItemPackets = new BlockItemPackets1_12(this);
 
@@ -60,16 +54,11 @@ public class Protocol1_11_1To1_12 extends BackwardsProtocol<ClientboundPackets1_
         new SoundPackets1_12(this).register();
         new ChatPackets1_12(this).register();
 
-        registerClientbound(ClientboundPackets1_12.TITLE, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                handler(wrapper -> {
-                    int action = wrapper.passthrough(Type.VAR_INT);
-                    if (action >= 0 && action <= 2) {
-                        JsonElement component = wrapper.read(Type.COMPONENT);
-                        wrapper.write(Type.COMPONENT, Protocol1_9To1_8.fixJson(component.toString()));
-                    }
-                });
+        registerClientbound(ClientboundPackets1_12.TITLE, wrapper -> {
+            int action = wrapper.passthrough(Type.VAR_INT);
+            if (action >= 0 && action <= 2) {
+                JsonElement component = wrapper.read(Type.COMPONENT);
+                wrapper.write(Type.COMPONENT, Protocol1_9To1_8.fixJson(component.toString()));
             }
         });
 
@@ -82,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, true));
+        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/AdvancementTranslations.java

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

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 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
@@ -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,17 +75,15 @@ 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();
 
         for (String s : array) {
             builder.append(s.substring(0, 1).toUpperCase())
-                    .append(s.substring(1))
-                    .append(" ");
+                .append(s.substring(1))
+                .append(" ");
         }
 
         return builder.toString();

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 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
@@ -22,27 +22,25 @@ 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.PacketHandler;
-import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+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 org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.Iterator;
 import java.util.Map;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
-public class BlockItemPackets1_12 extends LegacyBlockItemRewriter<Protocol1_11_1To1_12> {
+public class BlockItemPackets1_12 extends LegacyBlockItemRewriter<ClientboundPackets1_12, ServerboundPackets1_9_3, Protocol1_11_1To1_12> {
 
     public BlockItemPackets1_12(Protocol1_11_1To1_12 protocol) {
         super(protocol);
@@ -50,206 +48,174 @@ public class BlockItemPackets1_12 extends LegacyBlockItemRewriter<Protocol1_11_1
 
     @Override
     protected void registerPackets() {
-        protocol.registerClientbound(ClientboundPackets1_12.MAP_DATA, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_12.MAP_DATA, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT);
                 map(Type.BYTE);
                 map(Type.BOOLEAN);
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        int count = wrapper.passthrough(Type.VAR_INT);
-                        for (int i = 0; i < count * 3; i++) {
-                            wrapper.passthrough(Type.BYTE);
-                        }
+                handler(wrapper -> {
+                    int count = wrapper.passthrough(Type.VAR_INT);
+                    for (int i = 0; i < count * 3; i++) {
+                        wrapper.passthrough(Type.BYTE);
                     }
                 });
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        short columns = wrapper.passthrough(Type.UNSIGNED_BYTE);
-                        if (columns <= 0) return;
+                handler(wrapper -> {
+                    short columns = wrapper.passthrough(Type.UNSIGNED_BYTE);
+                    if (columns <= 0) return;
 
-                        short rows = wrapper.passthrough(Type.UNSIGNED_BYTE);
-                        wrapper.passthrough(Type.UNSIGNED_BYTE); // X
-                        wrapper.passthrough(Type.UNSIGNED_BYTE); // Z
-                        byte[] data = wrapper.read(Type.BYTE_ARRAY_PRIMITIVE);
-                        for (int i = 0; i < data.length; i++) {
-                            short color = (short) (data[i] & 0xFF);
-                            if (color > 143) {
-                                color = (short) MapColorMapping.getNearestOldColor(color);
-                                data[i] = (byte) color;
-                            }
+                    wrapper.passthrough(Type.UNSIGNED_BYTE); // Rows
+                    wrapper.passthrough(Type.UNSIGNED_BYTE); // X
+                    wrapper.passthrough(Type.UNSIGNED_BYTE); // Z
+                    byte[] data = wrapper.read(Type.BYTE_ARRAY_PRIMITIVE);
+                    for (int i = 0; i < data.length; i++) {
+                        short color = (short) (data[i] & 0xFF);
+                        if (color > 143) {
+                            color = (short) MapColorMapping.getNearestOldColor(color);
+                            data[i] = (byte) color;
                         }
-                        wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, data);
                     }
+                    wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, data);
                 });
             }
         });
 
-        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);
+        registerWindowItems(ClientboundPackets1_12.WINDOW_ITEMS);
+        registerEntityEquipment(ClientboundPackets1_12.ENTITY_EQUIPMENT);
 
         // Plugin message Packet -> Trading
-        protocol.registerClientbound(ClientboundPackets1_12.PLUGIN_MESSAGE, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_12.PLUGIN_MESSAGE, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.STRING); // 0 - Channel
 
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        if (wrapper.get(Type.STRING, 0).equalsIgnoreCase("MC|TrList")) {
-                            wrapper.passthrough(Type.INT); // Passthrough Window ID
+                handler(wrapper -> {
+                    if (wrapper.get(Type.STRING, 0).equals("MC|TrList")) {
+                        wrapper.passthrough(Type.INT); // Passthrough Window ID
 
-                            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
+                        int size = wrapper.passthrough(Type.UNSIGNED_BYTE);
+                        for (int i = 0; i < size; i++) {
+                            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
+                            boolean secondItem = wrapper.passthrough(Type.BOOLEAN); // Has second item
+                            if (secondItem)
+                                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
-                                wrapper.passthrough(Type.INT); // Maximum number of trade uses
-                            }
+                            wrapper.passthrough(Type.BOOLEAN); // Trade disabled
+                            wrapper.passthrough(Type.INT); // Number of tools uses
+                            wrapper.passthrough(Type.INT); // Maximum number of trade uses
                         }
                     }
                 });
             }
         });
 
-        protocol.registerServerbound(ServerboundPackets1_9_3.CLICK_WINDOW, new PacketRemapper() {
+        protocol.registerServerbound(ServerboundPackets1_9_3.CLICK_WINDOW, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.UNSIGNED_BYTE); // 0 - Window ID
                 map(Type.SHORT); // 1 - Slot
                 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(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        if (wrapper.get(Type.VAR_INT, 0) == 1) { // Shift click
-                            // https://github.com/ViaVersion/ViaVersion/pull/754
-                            // 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)
+                handler(wrapper -> {
+                    if (wrapper.get(Type.VAR_INT, 0) == 1) { // Shift click
+                        // https://github.com/ViaVersion/ViaVersion/pull/754
+                        // 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.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);
-                            confirm.write(Type.UNSIGNED_BYTE, wrapper.get(Type.UNSIGNED_BYTE, 0));
-                            confirm.write(Type.SHORT, wrapper.get(Type.SHORT, 1));
-                            confirm.write(Type.BOOLEAN, false); // Success - not used
+                        // Apologize (may happen in some cases, maybe if inventory is full?)
+                        PacketWrapper confirm = wrapper.create(ServerboundPackets1_12.WINDOW_CONFIRMATION);
+                        confirm.write(Type.UNSIGNED_BYTE, wrapper.get(Type.UNSIGNED_BYTE, 0));
+                        confirm.write(Type.SHORT, wrapper.get(Type.SHORT, 1));
+                        confirm.write(Type.BOOLEAN, false); // Success - not used
 
-                            wrapper.sendToServer(Protocol1_11_1To1_12.class);
-                            wrapper.cancel();
-                            confirm.sendToServer(Protocol1_11_1To1_12.class);
-                            return;
+                        wrapper.sendToServer(Protocol1_11_1To1_12.class);
+                        wrapper.cancel();
+                        confirm.sendToServer(Protocol1_11_1To1_12.class);
+                        return;
 
-                        }
-                        Item item = wrapper.get(Type.ITEM, 0);
-                        handleItemToServer(item);
                     }
+                    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);
 
-        protocol.registerClientbound(ClientboundPackets1_12.CHUNK_DATA, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        ClientWorld clientWorld = wrapper.user().get(ClientWorld.class);
+        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.
-                        Chunk chunk = wrapper.passthrough(type);
+            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);
-                    }
-                });
-            }
+            handleChunk(chunk);
         });
 
-        protocol.registerClientbound(ClientboundPackets1_12.BLOCK_CHANGE, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_12.BLOCK_CHANGE, new PacketHandlers() {
             @Override
-            public void registerMap() {
-                map(Type.POSITION); // 0 - Block Position
+            public void register() {
+                map(Type.POSITION1_8); // 0 - Block Position
                 map(Type.VAR_INT); // 1 - Block
 
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        int idx = wrapper.get(Type.VAR_INT, 0);
-                        wrapper.set(Type.VAR_INT, 0, handleBlockID(idx));
-                    }
+                handler(wrapper -> {
+                    int idx = wrapper.get(Type.VAR_INT, 0);
+                    wrapper.set(Type.VAR_INT, 0, handleBlockID(idx));
                 });
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_12.MULTI_BLOCK_CHANGE, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_12.MULTI_BLOCK_CHANGE, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.INT); // 0 - Chunk X
                 map(Type.INT); // 1 - Chunk Z
                 map(Type.BLOCK_CHANGE_RECORD_ARRAY);
 
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        for (BlockChangeRecord record : wrapper.get(Type.BLOCK_CHANGE_RECORD_ARRAY, 0)) {
-                            record.setBlockId(handleBlockID(record.getBlockId()));
-                        }
+                handler(wrapper -> {
+                    for (BlockChangeRecord record : wrapper.get(Type.BLOCK_CHANGE_RECORD_ARRAY, 0)) {
+                        record.setBlockId(handleBlockID(record.getBlockId()));
                     }
                 });
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_12.BLOCK_ENTITY_DATA, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_12.BLOCK_ENTITY_DATA, new PacketHandlers() {
             @Override
-            public void registerMap() {
-                map(Type.POSITION); // 0 - Position
+            public void register() {
+                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(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        // Remove bed color
-                        if (wrapper.get(Type.UNSIGNED_BYTE, 0) == 11)
-                            wrapper.cancel();
-                    }
+                handler(wrapper -> {
+                    // Remove bed color
+                    if (wrapper.get(Type.UNSIGNED_BYTE, 0) == 11)
+                        wrapper.cancel();
                 });
             }
         });
 
         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()));
         });
 
-        protocol.registerServerbound(ServerboundPackets1_9_3.CLIENT_STATUS, new PacketRemapper() {
+        protocol.registerServerbound(ServerboundPackets1_9_3.CLIENT_STATUS, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT); // Action ID
 
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        // Open Inventory
-                        if (wrapper.get(Type.VAR_INT, 0) == 2) {
-                            wrapper.cancel();
-                        }
+                handler(wrapper -> {
+                    // Open Inventory
+                    if (wrapper.get(Type.VAR_INT, 0) == 2) {
+                        wrapper.cancel();
                     }
                 });
             }
@@ -310,7 +276,7 @@ public class BlockItemPackets1_12 extends LegacyBlockItemRewriter<Protocol1_11_1
         // Restore the removed long array tags
         for (Map.Entry<String, Tag> entry : backupTag) {
             if (entry.getValue() instanceof CompoundTag) {
-                CompoundTag nestedTag = compoundTag.get(entry.getKey());
+                CompoundTag nestedTag = compoundTag.getCompoundTag(entry.getKey());
                 handleNbtToServer(nestedTag, (CompoundTag) entry.getValue());
             } else {
                 compoundTag.put(entry.getKey(), fromIntArrayTag((IntArrayTag) entry.getValue()));

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

@@ -1,65 +0,0 @@
-/*
- * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 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_11_1to1_12.packets;
-
-import com.viaversion.viaversion.api.connection.UserConnection;
-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;
-
-public class ChatItemRewriter {
-
-    public static void toClient(JsonElement element, UserConnection user) {
-        if (element instanceof JsonObject) {
-            JsonObject obj = (JsonObject) element;
-            if (obj.has("hoverEvent")) {
-                if (obj.get("hoverEvent") instanceof JsonObject) {
-                    JsonObject hoverEvent = (JsonObject) obj.get("hoverEvent");
-                    if (hoverEvent.has("action") && hoverEvent.has("value")) {
-                        String type = hoverEvent.get("action").getAsString();
-                        if (type.equals("show_item") || type.equals("show_entity")) {
-                            JsonElement value = hoverEvent.get("value");
-
-                            if (value.isJsonArray()) {
-                                JsonArray newArray = new JsonArray();
-
-                                int index = 0;
-                                for (JsonElement valueElement : value.getAsJsonArray()) {
-                                    if (valueElement.isJsonPrimitive() && valueElement.getAsJsonPrimitive().isString()) {
-                                        String newValue = index + ":" + valueElement.getAsString();
-                                        newArray.add(new JsonPrimitive(newValue));
-                                    }
-                                }
-
-                                hoverEvent.add("value", newArray);
-                            }
-                        }
-                    }
-                }
-            } else if (obj.has("extra")) {
-                toClient(obj.get("extra"), user);
-            }
-        } else if (element instanceof JsonArray) {
-            JsonArray array = (JsonArray) element;
-            for (JsonElement value : array) {
-                toClient(value, user);
-            }
-        }
-    }
-}

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,6 @@ package com.viaversion.viabackwards.protocol.protocol1_11_1to1_12.packets;
 
 import com.viaversion.viabackwards.protocol.protocol1_11_1to1_12.Protocol1_11_1To1_12;
 import com.viaversion.viabackwards.protocol.protocol1_11_1to1_12.data.AdvancementTranslations;
-import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.rewriter.RewriterBase;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.libs.gson.JsonElement;
@@ -30,7 +29,24 @@ import com.viaversion.viaversion.rewriter.ComponentRewriter;
 
 public class ChatPackets1_12 extends RewriterBase<Protocol1_11_1To1_12> {
 
-    private final ComponentRewriter componentRewriter = new ComponentRewriter() {
+    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);
@@ -46,14 +62,9 @@ public class ChatPackets1_12 extends RewriterBase<Protocol1_11_1To1_12> {
 
     @Override
     protected void registerPackets() {
-        protocol.registerClientbound(ClientboundPackets1_12.CHAT_MESSAGE, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                handler(wrapper -> {
-                    JsonElement element = wrapper.passthrough(Type.COMPONENT);
-                    componentRewriter.processText(element);
-                });
-            }
+        protocol.registerClientbound(ClientboundPackets1_12.CHAT_MESSAGE, wrapper -> {
+            JsonElement element = wrapper.passthrough(Type.COMPONENT);
+            COMPONENT_REWRITER.processText(element);
         });
     }
 }

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,21 +24,21 @@ 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.EntityType;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_12;
 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.PacketHandler;
-import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+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;
 import java.util.Optional;
 
-public class EntityPackets1_12 extends LegacyEntityRewriter<Protocol1_11_1To1_12> {
+public class EntityPackets1_12 extends LegacyEntityRewriter<ClientboundPackets1_12, Protocol1_11_1To1_12> {
 
     public EntityPackets1_12(Protocol1_11_1To1_12 protocol) {
         super(protocol);
@@ -46,9 +46,9 @@ public class EntityPackets1_12 extends LegacyEntityRewriter<Protocol1_11_1To1_12
 
     @Override
     protected void registerPackets() {
-        protocol.registerClientbound(ClientboundPackets1_12.SPAWN_ENTITY, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_12.SPAWN_ENTITY, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT); // 0 - Entity id
                 map(Type.UUID); // 1 - UUID
                 map(Type.BYTE); // 2 - Type
@@ -61,36 +61,33 @@ public class EntityPackets1_12 extends LegacyEntityRewriter<Protocol1_11_1To1_12
 
                 // 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(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        Optional<Entity1_12Types.ObjectType> type = Entity1_12Types.ObjectType.findById(wrapper.get(Type.BYTE, 0));
-                        if (type.isPresent() && type.get() == Entity1_12Types.ObjectType.FALLING_BLOCK) {
-                            int objectData = wrapper.get(Type.INT, 0);
-                            int objType = objectData & 4095;
-                            int data = objectData >> 12 & 15;
+                handler(wrapper -> {
+                    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;
 
-                            Block block = protocol.getItemRewriter().handleBlock(objType, data);
-                            if (block == null) {
-                                return;
-                            }
-
-                            wrapper.set(Type.INT, 0, block.getId() | block.getData() << 12);
+                        Block block = protocol.getItemRewriter().handleBlock(objType, data);
+                        if (block == null) {
+                            return;
                         }
+
+                        wrapper.set(Type.INT, 0, block.getId() | block.getData() << 12);
                     }
                 });
             }
         });
 
-        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 PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_12.SPAWN_MOB, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT); // 0 - Entity id
                 map(Type.UUID); // 1 - UUID
                 map(Type.VAR_INT); // 2 - Entity Type
@@ -113,11 +110,11 @@ public class EntityPackets1_12 extends LegacyEntityRewriter<Protocol1_11_1To1_12
             }
         });
 
-        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 PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_12.SPAWN_PLAYER, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT); // 0 - Entity ID
                 map(Type.UUID); // 1 - Player UUID
                 map(Type.DOUBLE); // 2 - X
@@ -127,41 +124,35 @@ public class EntityPackets1_12 extends LegacyEntityRewriter<Protocol1_11_1To1_12
                 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));
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_12.JOIN_GAME, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_12.JOIN_GAME, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.INT); // 0 - Entity ID
                 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));
 
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        ShoulderTracker tracker = wrapper.user().get(ShoulderTracker.class);
-                        tracker.setEntityId(wrapper.get(Type.INT, 0));
-                    }
+                handler(wrapper -> {
+                    ShoulderTracker tracker = wrapper.user().get(ShoulderTracker.class);
+                    tracker.setEntityId(wrapper.get(Type.INT, 0));
                 });
 
                 // Send fake inventory achievement
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper packetWrapper) throws Exception {
-                        PacketWrapper wrapper = PacketWrapper.create(0x07, null, packetWrapper.user());
+                handler(packetWrapper -> {
+                    PacketWrapper wrapper = PacketWrapper.create(ClientboundPackets1_9_3.STATISTICS, packetWrapper.user());
 
-                        wrapper.write(Type.VAR_INT, 1);
-                        wrapper.write(Type.STRING, "achievement.openInventory");
-                        wrapper.write(Type.VAR_INT, 1);
+                    wrapper.write(Type.VAR_INT, 1);
+                    wrapper.write(Type.STRING, "achievement.openInventory");
+                    wrapper.write(Type.VAR_INT, 1);
 
-                        wrapper.scheduleSend(Protocol1_11_1To1_12.class);
-                    }
+                    wrapper.scheduleSend(Protocol1_11_1To1_12.class);
                 });
             }
         });
@@ -170,9 +161,9 @@ public class EntityPackets1_12 extends LegacyEntityRewriter<Protocol1_11_1To1_12
         registerRemoveEntities(ClientboundPackets1_12.DESTROY_ENTITIES);
         registerMetadataRewriter(ClientboundPackets1_12.ENTITY_METADATA, Types1_12.METADATA_LIST);
 
-        protocol.registerClientbound(ClientboundPackets1_12.ENTITY_PROPERTIES, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_12.ENTITY_PROPERTIES, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT);
                 map(Type.INT);
                 handler(wrapper -> {
@@ -212,14 +203,20 @@ public class EntityPackets1_12 extends LegacyEntityRewriter<Protocol1_11_1To1_12
 
     @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().type(EntityTypes1_12.EntityType.EVOCATION_ILLAGER).cancel(12);
+        filter().type(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) {
@@ -230,15 +227,15 @@ public class EntityPackets1_12 extends LegacyEntityRewriter<Protocol1_11_1To1_12
         });
 
         // Create Parrot storage
-        filter().filterFamily(Entity1_12Types.EntityType.PARROT).handler((event, meta) -> {
+        filter().type(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;
@@ -262,19 +259,19 @@ public class EntityPackets1_12 extends LegacyEntityRewriter<Protocol1_11_1To1_12
                 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);
 
             if (tag.isEmpty() && tracker.getLeftShoulder() != null) {
                 tracker.setLeftShoulder(null);
                 tracker.update();
-            } else if (tag.contains("id") && event.entityId() == tracker.getEntityId()) {
-                String id = (String) tag.get("id").getValue();
+            } else if (tag.getStringTag("id") != null && event.entityId() == tracker.getEntityId()) {
+                String id = tag.getStringTag("id").getValue();
                 if (tracker.getLeftShoulder() == null || !tracker.getLeftShoulder().equals(id)) {
                     tracker.setLeftShoulder(id);
                     tracker.update();
@@ -285,15 +282,15 @@ public class EntityPackets1_12 extends LegacyEntityRewriter<Protocol1_11_1To1_12
         });
 
         // 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);
 
             if (tag.isEmpty() && tracker.getRightShoulder() != null) {
                 tracker.setRightShoulder(null);
                 tracker.update();
-            } else if (tag.contains("id") && event.entityId() == tracker.getEntityId()) {
-                String id = (String) tag.get("id").getValue();
+            } else if (tag.getStringTag("id") != null && event.entityId() == tracker.getEntityId()) {
+                String id = tag.getStringTag("id").getValue();
                 if (tracker.getRightShoulder() == null || !tracker.getRightShoulder().equals(id)) {
                     tracker.setRightShoulder(id);
                     tracker.update();
@@ -306,11 +303,11 @@ public class EntityPackets1_12 extends LegacyEntityRewriter<Protocol1_11_1To1_12
 
     @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_11_1to1_12/packets/SoundPackets1_12.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,9 +20,7 @@ package com.viaversion.viabackwards.protocol.protocol1_11_1to1_12.packets;
 
 import com.viaversion.viabackwards.api.rewriters.LegacySoundRewriter;
 import com.viaversion.viabackwards.protocol.protocol1_11_1to1_12.Protocol1_11_1To1_12;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
-import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
-import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.ClientboundPackets1_12;
 
@@ -34,9 +32,9 @@ public class SoundPackets1_12 extends LegacySoundRewriter<Protocol1_11_1To1_12>
 
     @Override
     protected void registerPackets() {
-        protocol.registerClientbound(ClientboundPackets1_12.NAMED_SOUND, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_12.NAMED_SOUND, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.STRING); // 0 - Sound name
                 map(Type.VAR_INT); // 1 - Sound Category
                 map(Type.INT); // 2 - x
@@ -47,9 +45,9 @@ public class SoundPackets1_12 extends LegacySoundRewriter<Protocol1_11_1To1_12>
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_12.SOUND, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_12.SOUND, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT); // 0 - Sound name
                 map(Type.VAR_INT); // 1 - Sound Category
                 map(Type.INT); // 2 - x
@@ -58,21 +56,18 @@ public class SoundPackets1_12 extends LegacySoundRewriter<Protocol1_11_1To1_12>
                 map(Type.FLOAT); // 5 - Volume
                 map(Type.FLOAT); // 6 - Pitch
 
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        int oldId = wrapper.get(Type.VAR_INT, 0);
-                        int newId = handleSounds(oldId);
-                        if (newId == -1) {
-                            wrapper.cancel();
-                            return;
-                        }
-
-                        if (hasPitch(oldId)) {
-                            wrapper.set(Type.FLOAT, 1, handlePitch(oldId));
-                        }
-                        wrapper.set(Type.VAR_INT, 0, newId);
+                handler(wrapper -> {
+                    int oldId = wrapper.get(Type.VAR_INT, 0);
+                    int newId = handleSounds(oldId);
+                    if (newId == -1) {
+                        wrapper.cancel();
+                        return;
                     }
+
+                    if (hasPitch(oldId)) {
+                        wrapper.set(Type.FLOAT, 1, handlePitch(oldId));
+                    }
+                    wrapper.set(Type.VAR_INT, 0, newId);
                 });
             }
         });

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 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
@@ -22,17 +22,16 @@ 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.rewriter.ItemRewriter;
+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> {
 
     private final EntityPackets1_11_1 entityPackets = new EntityPackets1_11_1(this);
-    private final ItemRewriter itemRewriter = new ItemPackets1_11_1(this);
+    private final ItemPackets1_11_1 itemRewriter = new ItemPackets1_11_1(this);
 
     public Protocol1_11To1_11_1() {
         super(ClientboundPackets1_9_3.class, ClientboundPackets1_9_3.class, ServerboundPackets1_9_3.class, ServerboundPackets1_9_3.class);
@@ -48,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
@@ -60,7 +59,7 @@ public class Protocol1_11To1_11_1 extends BackwardsProtocol<ClientboundPackets1_
     }
 
     @Override
-    public ItemRewriter getItemRewriter() {
+    public ItemPackets1_11_1 getItemRewriter() {
         return itemRewriter;
     }
 }

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,14 +20,14 @@ 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.EntityType;
-import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_11;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.version.Types1_9;
 import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3;
 
-public class EntityPackets1_11_1 extends LegacyEntityRewriter<Protocol1_11To1_11_1> {
+public class EntityPackets1_11_1 extends LegacyEntityRewriter<ClientboundPackets1_9_3, Protocol1_11To1_11_1> {
 
     public EntityPackets1_11_1(Protocol1_11To1_11_1 protocol) {
         super(protocol);
@@ -35,9 +35,9 @@ public class EntityPackets1_11_1 extends LegacyEntityRewriter<Protocol1_11To1_11
 
     @Override
     protected void registerPackets() {
-        protocol.registerClientbound(ClientboundPackets1_9_3.SPAWN_ENTITY, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_9_3.SPAWN_ENTITY, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT); // 0 - Entity id
                 map(Type.UUID); // 1 - UUID
                 map(Type.BYTE); // 2 - Type
@@ -50,16 +50,16 @@ public class EntityPackets1_11_1 extends LegacyEntityRewriter<Protocol1_11To1_11
 
                 // 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 PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_9_3.SPAWN_MOB, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT); // 0 - Entity id
                 map(Type.UUID); // 1 - UUID
                 map(Type.VAR_INT); // 2 - Entity Type
@@ -82,13 +82,13 @@ public class EntityPackets1_11_1 extends LegacyEntityRewriter<Protocol1_11To1_11
             }
         });
 
-        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 PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_9_3.SPAWN_PLAYER, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT); // 0 - Entity ID
                 map(Type.UUID); // 1 - Player UUID
                 map(Type.DOUBLE); // 2 - X
@@ -98,7 +98,7 @@ public class EntityPackets1_11_1 extends LegacyEntityRewriter<Protocol1_11To1_11
                 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<Protocol1_11To1_11
     @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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 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
@@ -22,16 +22,13 @@ import com.viaversion.viabackwards.api.rewriters.LegacyBlockItemRewriter;
 import com.viaversion.viabackwards.api.rewriters.LegacyEnchantmentRewriter;
 import com.viaversion.viabackwards.protocol.protocol1_11to1_11_1.Protocol1_11To1_11_1;
 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.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 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.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3;
 import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3;
 
-public class ItemPackets1_11_1 extends LegacyBlockItemRewriter<Protocol1_11To1_11_1> {
+public class ItemPackets1_11_1 extends LegacyBlockItemRewriter<ClientboundPackets1_9_3, ServerboundPackets1_9_3, Protocol1_11To1_11_1> {
 
     private LegacyEnchantmentRewriter enchantmentRewriter;
 
@@ -41,48 +38,45 @@ public class ItemPackets1_11_1 extends LegacyBlockItemRewriter<Protocol1_11To1_1
 
     @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);
+        registerWindowItems(ClientboundPackets1_9_3.WINDOW_ITEMS);
+        registerEntityEquipment(ClientboundPackets1_9_3.ENTITY_EQUIPMENT);
 
         // Plugin message Packet -> Trading
-        protocol.registerClientbound(ClientboundPackets1_9_3.PLUGIN_MESSAGE, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_9_3.PLUGIN_MESSAGE, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.STRING); // 0 - Channel
 
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        if (wrapper.get(Type.STRING, 0).equalsIgnoreCase("MC|TrList")) {
-                            wrapper.passthrough(Type.INT); // Passthrough Window ID
+                handler(wrapper -> {
+                    if (wrapper.get(Type.STRING, 0).equals("MC|TrList")) {
+                        wrapper.passthrough(Type.INT); // Passthrough Window ID
 
-                            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
+                        int size = wrapper.passthrough(Type.UNSIGNED_BYTE);
+                        for (int i = 0; i < size; i++) {
+                            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.passthrough(Type.BOOLEAN); // Trade disabled
-                                wrapper.passthrough(Type.INT); // Number of tools uses
-                                wrapper.passthrough(Type.INT); // Maximum number of trade uses
+                            boolean secondItem = wrapper.passthrough(Type.BOOLEAN); // Has second item
+                            if (secondItem) {
+                                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
+                            wrapper.passthrough(Type.INT); // Maximum number of trade uses
                         }
                     }
                 });
             }
         });
 
-        registerClickWindow(ServerboundPackets1_9_3.CLICK_WINDOW, Type.ITEM);
-        registerCreativeInvAction(ServerboundPackets1_9_3.CREATIVE_INVENTORY_ACTION, Type.ITEM);
+        registerClickWindow(ServerboundPackets1_9_3.CLICK_WINDOW);
+        registerCreativeInvAction(ServerboundPackets1_9_3.CREATIVE_INVENTORY_ACTION);
 
         // 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()));
             }
         });
@@ -102,10 +96,10 @@ public class ItemPackets1_11_1 extends LegacyBlockItemRewriter<Protocol1_11To1_1
         CompoundTag tag = item.tag();
         if (tag == null) return item;
 
-        if (tag.get("ench") instanceof ListTag) {
+        if (tag.getListTag("ench") != null) {
             enchantmentRewriter.rewriteEnchantmentsToClient(tag, false);
         }
-        if (tag.get("StoredEnchantments") instanceof ListTag) {
+        if (tag.getListTag("StoredEnchantments") != null) {
             enchantmentRewriter.rewriteEnchantmentsToClient(tag, true);
         }
         return item;
@@ -119,10 +113,10 @@ public class ItemPackets1_11_1 extends LegacyBlockItemRewriter<Protocol1_11To1_1
         CompoundTag tag = item.tag();
         if (tag == null) return item;
 
-        if (tag.contains(nbtTagName + "|ench")) {
+        if (tag.getListTag(nbtTagName + "|ench") != null) {
             enchantmentRewriter.rewriteEnchantmentsToServer(tag, false);
         }
-        if (tag.contains(nbtTagName + "|StoredEnchantments")) {
+        if (tag.getListTag(nbtTagName + "|StoredEnchantments") != null) {
             enchantmentRewriter.rewriteEnchantmentsToServer(tag, true);
         }
         return item;

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_1to1_12_2/KeepAliveTracker.java

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

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_1to1_12_2/Protocol1_12_1To1_12_2.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,9 +20,7 @@ package com.viaversion.viabackwards.protocol.protocol1_12_1to1_12_2;
 
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
-import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
-import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1;
 import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ServerboundPackets1_12_1;
@@ -35,36 +33,30 @@ public class Protocol1_12_1To1_12_2 extends BackwardsProtocol<ClientboundPackets
 
     @Override
     protected void registerPackets() {
-        registerClientbound(ClientboundPackets1_12_1.KEEP_ALIVE, new PacketRemapper() {
+        registerClientbound(ClientboundPackets1_12_1.KEEP_ALIVE, new PacketHandlers() {
             @Override
-            public void registerMap() {
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper packetWrapper) throws Exception {
-                        Long keepAlive = packetWrapper.read(Type.LONG);
-                        packetWrapper.user().get(KeepAliveTracker.class).setKeepAlive(keepAlive);
-                        packetWrapper.write(Type.VAR_INT, keepAlive.hashCode());
-                    }
+            public void register() {
+                handler(packetWrapper -> {
+                    Long keepAlive = packetWrapper.read(Type.LONG);
+                    packetWrapper.user().get(KeepAliveTracker.class).setKeepAlive(keepAlive);
+                    packetWrapper.write(Type.VAR_INT, keepAlive.hashCode());
                 });
             }
         });
 
-        registerServerbound(ServerboundPackets1_12_1.KEEP_ALIVE, new PacketRemapper() {
+        registerServerbound(ServerboundPackets1_12_1.KEEP_ALIVE, new PacketHandlers() {
             @Override
-            public void registerMap() {
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper packetWrapper) throws Exception {
-                        int keepAlive = packetWrapper.read(Type.VAR_INT);
-                        long realKeepAlive = packetWrapper.user().get(KeepAliveTracker.class).getKeepAlive();
-                        if (keepAlive != Long.hashCode(realKeepAlive)) {
-                            packetWrapper.cancel(); // Wrong data, cancel packet
-                            return;
-                        }
-                        packetWrapper.write(Type.LONG, realKeepAlive);
-                        // Reset KeepAliveTracker (to prevent sending same valid value in a row causing a timeout)
-                        packetWrapper.user().get(KeepAliveTracker.class).setKeepAlive(Integer.MAX_VALUE);
+            public void register() {
+                handler(packetWrapper -> {
+                    int keepAlive = packetWrapper.read(Type.VAR_INT);
+                    long realKeepAlive = packetWrapper.user().get(KeepAliveTracker.class).getKeepAlive();
+                    if (keepAlive != Long.hashCode(realKeepAlive)) {
+                        packetWrapper.cancel(); // Wrong data, cancel packet
+                        return;
                     }
+                    packetWrapper.write(Type.LONG, realKeepAlive);
+                    // Reset KeepAliveTracker (to prevent sending same valid value in a row causing a timeout)
+                    packetWrapper.user().get(KeepAliveTracker.class).setKeepAlive(Integer.MAX_VALUE);
                 });
             }
         });

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 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
@@ -29,26 +29,49 @@ import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.packets.PlayerP
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.packets.SoundPackets1_13;
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.providers.BackwardsBlockEntityProvider;
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.storage.BackwardsBlockStorage;
+import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.storage.NoteBlockStorage;
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.storage.PlayerPositionStorage1_13;
 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.rewriter.EntityRewriter;
+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.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.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 com.viaversion.viaversion.util.ComponentUtil;
+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 EntityRewriter entityRewriter = new EntityPackets1_13(this);
+    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);
@@ -62,20 +85,11 @@ public class Protocol1_12_2To1_13 extends BackwardsProtocol<ClientboundPackets1_
             Via.getManager().getProviders().register(BackwardsBlockEntityProvider.class, new BackwardsBlockEntityProvider());
         });
 
-        TranslatableRewriter translatableRewriter = new TranslatableRewriter(this) {
-            @Override
-            protected void handleTranslate(JsonObject root, String translate) {
-                String newTranslate = newTranslatables.get(translate);
-                if (newTranslate != null || (newTranslate = getMappingData().getTranslateMappings().get(translate)) != null) {
-                    root.addProperty("translate", newTranslate);
-                }
-            }
-        };
         translatableRewriter.registerPing();
         translatableRewriter.registerBossBar(ClientboundPackets1_13.BOSSBAR);
-        translatableRewriter.registerChatMessage(ClientboundPackets1_13.CHAT_MESSAGE);
+        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);
@@ -100,10 +114,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());
@@ -111,6 +125,8 @@ public class Protocol1_12_2To1_13 extends BackwardsProtocol<ClientboundPackets1_
         if (ViaBackwards.getConfig().isFix1_13FacePlayer() && !user.has(PlayerPositionStorage1_13.class)) {
             user.put(new PlayerPositionStorage1_13());
         }
+
+        user.put(new NoteBlockStorage());
     }
 
     @Override
@@ -119,7 +135,7 @@ public class Protocol1_12_2To1_13 extends BackwardsProtocol<ClientboundPackets1_
     }
 
     @Override
-    public EntityRewriter getEntityRewriter() {
+    public EntityPackets1_13 getEntityRewriter() {
         return entityRewriter;
     }
 
@@ -127,4 +143,31 @@ 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);
+        return ComponentUtil.jsonToLegacy(value);
+    }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/BannerHandler.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,10 +20,9 @@ package com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.block_entity_h
 
 import com.viaversion.viabackwards.ViaBackwards;
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.providers.BackwardsBlockEntityProvider.BackwardsBlockEntityHandler;
-import com.viaversion.viaversion.api.connection.UserConnection;
 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.Tag;
 
 public class BannerHandler implements BackwardsBlockEntityHandler {
@@ -34,28 +33,29 @@ public class BannerHandler implements BackwardsBlockEntityHandler {
     private static final int BANNER_STOP = 7109;
 
     @Override
-    public CompoundTag transform(UserConnection user, int blockId, CompoundTag tag) {
+    public CompoundTag transform(int blockId, CompoundTag tag) {
         // Normal banners
         if (blockId >= BANNER_START && blockId <= BANNER_STOP) {
             int color = (blockId - BANNER_START) >> 4;
-            tag.put("Base", new IntTag((15 - color)));
+            tag.putInt("Base", 15 - color);
         }
         // Wall banners
         else if (blockId >= WALL_BANNER_START && blockId <= WALL_BANNER_STOP) {
             int color = (blockId - WALL_BANNER_START) >> 2;
-            tag.put("Base", new IntTag((15 - color)));
+            tag.putInt("Base", 15 - color);
         } else {
             ViaBackwards.getPlatform().getLogger().warning("Why does this block have the banner block entity? :(" + tag);
         }
 
         // Invert colors
-        Tag patternsTag = tag.get("Patterns");
-        if (patternsTag instanceof ListTag) {
-            for (Tag pattern : (ListTag) patternsTag) {
+        ListTag patternsTag = tag.getListTag("Patterns");
+        if (patternsTag != null) {
+            for (Tag pattern : patternsTag) {
                 if (!(pattern instanceof CompoundTag)) continue;
 
-                IntTag c = ((CompoundTag) pattern).get("Color");
-                c.setValue(15 - c.asInt()); // Invert color id
+                CompoundTag patternTag = (CompoundTag) pattern;
+                NumberTag colorTag = patternTag.getNumberTag("Color");
+                patternTag.putInt("Color", 15 - colorTag.asInt()); // Invert color id
             }
         }
 

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/BedHandler.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,18 +19,16 @@
 package com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.block_entity_handlers;
 
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.providers.BackwardsBlockEntityProvider;
-import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.IntTag;
 
 public class BedHandler implements BackwardsBlockEntityProvider.BackwardsBlockEntityHandler {
 
     @Override
-    public CompoundTag transform(UserConnection user, int blockId, CompoundTag tag) {
+    public CompoundTag transform(int blockId, CompoundTag tag) {
         int offset = blockId - 748;
         int color = offset >> 4;
 
-        tag.put("color", new IntTag(color));
+        tag.putInt("color", color);
 
         return tag;
     }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/FlowerPotHandler.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,12 +19,9 @@
 package com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.block_entity_handlers;
 
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.providers.BackwardsBlockEntityProvider;
-import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap;
 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.util.Pair;
 
 public class FlowerPotHandler implements BackwardsBlockEntityProvider.BackwardsBlockEntityHandler {
@@ -72,11 +69,11 @@ public class FlowerPotHandler implements BackwardsBlockEntityProvider.BackwardsB
 
     // TODO THIS IS NEVER CALLED BECAUSE ITS NO LONGER A BLOCK ENTITY :(
     @Override
-    public CompoundTag transform(UserConnection user, int blockId, CompoundTag tag) {
+    public CompoundTag transform(int blockId, CompoundTag tag) {
         Pair<String, Byte> item = getOrDefault(blockId);
 
-        tag.put("Item", new StringTag(item.getKey()));
-        tag.put("Data", new IntTag(item.getValue()));
+        tag.putString("Item", item.key());
+        tag.putInt("Data", item.value());
 
         return tag;
     }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/PistonHandler.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,49 +20,42 @@ package com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.block_entity_h
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.Protocol1_12_2To1_13;
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.providers.BackwardsBlockEntityProvider;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.data.MappingDataLoader;
-import com.viaversion.viaversion.libs.gson.JsonElement;
-import com.viaversion.viaversion.libs.gson.JsonObject;
+import com.viaversion.viaversion.libs.fastutil.objects.Object2IntMap;
+import com.viaversion.viaversion.libs.fastutil.objects.Object2IntOpenHashMap;
 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.protocols.protocol1_13to1_12_2.blockconnections.ConnectionData;
-
-import java.lang.reflect.Field;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.StringJoiner;
 
 public class PistonHandler implements BackwardsBlockEntityProvider.BackwardsBlockEntityHandler {
 
-    private final Map<String, Integer> pistonIds = new HashMap<>();
+    private final Object2IntMap<String> pistonIds = new Object2IntOpenHashMap<>();
 
     public PistonHandler() {
+        pistonIds.defaultReturnValue(-1);
         if (Via.getConfig().isServersideBlockConnections()) {
-            Map<String, Integer> keyToId;
-            try {
-                Field field = ConnectionData.class.getDeclaredField("keyToId");
-                field.setAccessible(true);
-                keyToId = (Map<String, Integer>) field.get(null);
-            } catch (IllegalAccessException | NoSuchFieldException e) {
-                e.printStackTrace();
-                return;
-            }
-
+            Map<String, Integer> keyToId = ConnectionData.getKeyToId();
             for (Map.Entry<String, Integer> entry : keyToId.entrySet()) {
-                if (!entry.getKey().contains("piston")) continue;
+                if (!entry.getKey().contains("piston")) {
+                    continue;
+                }
 
                 addEntries(entry.getKey(), entry.getValue());
             }
         } else {
-            JsonObject mappings = MappingDataLoader.getMappingsCache().get("mapping-1.13.json").getAsJsonObject("blockstates");
-            for (Map.Entry<String, JsonElement> blockState : mappings.entrySet()) {
-                String key = blockState.getValue().getAsString();
-                if (!key.contains("piston")) continue;
+            ListTag blockStates = MappingDataLoader.loadNBT("blockstates-1.13.nbt").get("blockstates");
+            for (int id = 0; id < blockStates.size(); id++) {
+                StringTag state = blockStates.get(id);
+                String key = state.getValue();
+                if (!key.contains("piston")) {
+                    continue;
+                }
 
-                addEntries(key, Integer.parseInt(blockState.getKey()));
+                addEntries(key, id);
             }
         }
     }
@@ -83,30 +76,30 @@ public class PistonHandler implements BackwardsBlockEntityProvider.BackwardsBloc
     }
 
     @Override
-    public CompoundTag transform(UserConnection user, int blockId, CompoundTag tag) {
-        CompoundTag blockState = tag.get("blockState");
+    public CompoundTag transform(int blockId, CompoundTag tag) {
+        CompoundTag blockState = tag.getCompoundTag("blockState");
         if (blockState == null) return tag;
 
         String dataFromTag = getDataFromTag(blockState);
         if (dataFromTag == null) return tag;
 
-        Integer id = pistonIds.get(dataFromTag);
-        if (id == null) {
+        int id = pistonIds.getInt(dataFromTag);
+        if (id == -1) {
             //TODO see why this could be null and if this is bad
             return tag;
         }
 
-        tag.put("blockId", new IntTag(id >> 4));
-        tag.put("blockData", new IntTag(id & 15));
+        tag.putInt("blockId", id >> 4);
+        tag.putInt("blockData", id & 15);
         return tag;
     }
 
     // The type hasn't actually been updated in the blockstorage, so we need to construct it
     private String getDataFromTag(CompoundTag tag) {
-        StringTag name = tag.get("Name");
+        StringTag name = tag.getStringTag("Name");
         if (name == null) return null;
 
-        CompoundTag properties = tag.get("Properties");
+        CompoundTag properties = tag.getCompoundTag("Properties");
         if (properties == null) return name.getValue();
 
         StringJoiner joiner = new StringJoiner(",", name.getValue() + "[", "]");

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/SkullHandler.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,21 +19,19 @@
 package com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.block_entity_handlers;
 
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.providers.BackwardsBlockEntityProvider.BackwardsBlockEntityHandler;
-import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.ByteTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
 
 public class SkullHandler implements BackwardsBlockEntityHandler {
     private static final int SKULL_START = 5447;
 
     @Override
-    public CompoundTag transform(UserConnection user, int blockId, CompoundTag tag) {
+    public CompoundTag transform(int blockId, CompoundTag tag) {
         int diff = blockId - SKULL_START;
         int pos = diff % 20;
         byte type = (byte) Math.floor(diff / 20f);
 
         // Set type
-        tag.put("SkullType", new ByteTag(type));
+        tag.putByte("SkullType", type);
 
         // Remove wall skulls
         if (pos < 4) {
@@ -41,7 +39,7 @@ public class SkullHandler implements BackwardsBlockEntityHandler {
         }
 
         // Add rotation for normal skulls
-        tag.put("Rot", new ByteTag((byte) ((pos - 4) & 255)));
+        tag.putByte("Rot", (byte) ((pos - 4) & 255));
 
         return tag;
     }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/SpawnerHandler.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,22 +20,18 @@ package com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.block_entity_h
 
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.data.EntityNameRewrites;
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.providers.BackwardsBlockEntityProvider;
-import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag;
 
 public class SpawnerHandler implements BackwardsBlockEntityProvider.BackwardsBlockEntityHandler {
 
     @Override
-    public CompoundTag transform(UserConnection user, int blockId, CompoundTag tag) {
-        Tag dataTag = tag.get("SpawnData");
-        if (dataTag instanceof CompoundTag) {
-            CompoundTag data = (CompoundTag) dataTag;
-            Tag idTag = data.get("id");
-            if (idTag instanceof StringTag) {
-                StringTag s = (StringTag) idTag;
-                s.setValue(EntityNameRewrites.rewrite(s.getValue()));
+    public CompoundTag transform(int blockId, CompoundTag tag) {
+        CompoundTag dataTag = tag.getCompoundTag("SpawnData");
+        if (dataTag != null) {
+            StringTag idTag = dataTag.getStringTag("id");
+            if (idTag != null) {
+                idTag.setValue(EntityNameRewrites.rewrite(idTag.getValue()));
             }
         }
         return tag;

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,39 +18,26 @@
 
 package com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.data;
 
-import com.viaversion.viabackwards.ViaBackwards;
-import com.viaversion.viabackwards.api.data.VBMappings;
-import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.IntArrayMappings;
-import com.viaversion.viaversion.api.data.MappingDataLoader;
-import com.viaversion.viaversion.api.data.Mappings;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap;
-import com.viaversion.viaversion.libs.fastutil.objects.Object2IntMap;
-import com.viaversion.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.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.StatisticMappings;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
 public class BackwardsMappings extends com.viaversion.viabackwards.api.data.BackwardsMappings {
     private final Int2ObjectMap<String> statisticMappings = new Int2ObjectOpenHashMap<>();
     private final Map<String, String> translateMappings = new HashMap<>();
-    private Mappings enchantmentMappings;
 
     public BackwardsMappings() {
-        super("1.13", "1.12", Protocol1_13To1_12_2.class, true);
+        super("1.13", "1.12", Protocol1_13To1_12_2.class);
     }
 
     @Override
-    public void loadVBExtras(JsonObject oldMappings, JsonObject newMappings) {
-        enchantmentMappings = VBMappings.vbBuilder().warnOnMissing(false)
-                .unmapped(oldMappings.getAsJsonObject("enchantments")).mapped(newMappings.getAsJsonObject("enchantments")).build();
+    public void loadExtras(final CompoundTag data) {
+        super.loadExtras(data);
+
         for (Map.Entry<String, Integer> entry : StatisticMappings.CUSTOM_STATS.entrySet()) {
             statisticMappings.put(entry.getValue().intValue(), entry.getKey());
         }
@@ -59,57 +46,21 @@ public class BackwardsMappings extends com.viaversion.viabackwards.api.data.Back
         }
     }
 
-    // Has lots of compat layers, so we can't use the default Via method
-    private static void mapIdentifiers(int[] output, JsonObject newIdentifiers, JsonObject oldIdentifiers, JsonObject mapping) {
-        Object2IntMap<String> newIdentifierMap = MappingDataLoader.indexedObjectToMap(oldIdentifiers);
-        for (Map.Entry<String, JsonElement> entry : newIdentifiers.entrySet()) {
-            String key = entry.getValue().getAsString();
-            int value = newIdentifierMap.getInt(key);
-            short hardId = -1;
-            if (value == -1) {
-                JsonPrimitive replacement = mapping.getAsJsonPrimitive(key);
-                int propertyIndex;
-                if (replacement == null && (propertyIndex = key.indexOf('[')) != -1) {
-                    replacement = mapping.getAsJsonPrimitive(key.substring(0, propertyIndex));
-                }
-                if (replacement != null) {
-                    if (replacement.getAsString().startsWith("id:")) {
-                        String id = replacement.getAsString().replace("id:", "");
-                        hardId = Short.parseShort(id);
-                        value = newIdentifierMap.getInt(oldIdentifiers.getAsJsonPrimitive(id).getAsString());
-                    } else {
-                        value = newIdentifierMap.getInt(replacement.getAsString());
-                    }
-                }
-                if (value == -1) {
-                    if (!Via.getConfig().isSuppressConversionWarnings() || Via.getManager().isDebug()) {
-                        if (replacement != null) {
-                            ViaBackwards.getPlatform().getLogger().warning("No key for " + entry.getValue() + "/" + replacement.getAsString() + " :( ");
-                        } else {
-                            ViaBackwards.getPlatform().getLogger().warning("No key for " + entry.getValue() + " :( ");
-                        }
-                    }
-                    continue;
-                }
-            }
-            output[Integer.parseInt(entry.getKey())] = hardId != -1 ? hardId : (short) value;
-        }
-    }
-
-    @Override
-    protected @Nullable Mappings loadFromObject(JsonObject oldMappings, JsonObject newMappings, @Nullable JsonObject diffMappings, String key) {
-        if (key.equals("blockstates")) {
-            int[] oldToNew = new int[8582];
-            Arrays.fill(oldToNew, -1);
-            mapIdentifiers(oldToNew, oldMappings.getAsJsonObject("blockstates"), newMappings.getAsJsonObject("blocks"), diffMappings.getAsJsonObject("blockstates"));
-            return IntArrayMappings.of(oldToNew, -1);
-        } else {
-            return super.loadFromObject(oldMappings, newMappings, diffMappings, key);
-        }
-    }
-
     @Override
     public int getNewBlockStateId(int id) {
+        // Comparator funkyness: https://github.com/ViaVersion/ViaBackwards/issues/524
+        if (id >= 5635 && id <= 5650) {
+            if (id < 5639) {
+                id += 4;
+            } else if (id < 5643) {
+                id -= 4;
+            } else if (id < 5647) {
+                id += 4;
+            } else {
+                id -= 4;
+            }
+        }
+
         int mappedId = super.getNewBlockStateId(id);
 
         // https://github.com/ViaVersion/ViaBackwards/issues/290
@@ -133,11 +84,6 @@ public class BackwardsMappings extends com.viaversion.viabackwards.api.data.Back
         return mappedId;
     }
 
-    @Override
-    protected boolean shouldWarnOnMissing(String key) {
-        return super.shouldWarnOnMissing(key) && !key.equals("items");
-    }
-
     public Int2ObjectMap<String> getStatisticMappings() {
         return statisticMappings;
     }
@@ -145,8 +91,4 @@ public class BackwardsMappings extends com.viaversion.viabackwards.api.data.Back
     public Map<String, String> getTranslateMappings() {
         return translateMappings;
     }
-
-    public Mappings getEnchantmentMappings() {
-        return enchantmentMappings;
-    }
 }

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
 
 package com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.data;
 
+import com.viaversion.viaversion.util.Key;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -42,15 +43,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/EntityTypeMapping.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,6 @@ package com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.data;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2IntMap;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2IntOpenHashMap;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.EntityTypeRewriter;
-
 import java.lang.reflect.Field;
 
 public class EntityTypeMapping {

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 package com.viaversion.viabackwards.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;
@@ -38,9 +38,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/PaintingMapping.java

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

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,11 +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 {
@@ -37,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());
             }
 
@@ -56,94 +55,94 @@ public class ParticleMapping {
         };
 
         particles = new ParticleData[]{
-                rewrite(16), // (0->16)  minecraft:ambient_entity_effect -> mobSpellAmbient
-                rewrite(20), // (1->20)  minecraft:angry_villager -> angryVillager
-                rewrite(35), // (2->35)  minecraft:barrier -> barrier
-                rewrite(37, blockHandler),
-                // (3->37)  minecraft:block -> blockcrack
-                rewrite(4),  // (4->4)   minecraft:bubble -> bubble
-                rewrite(29), // (5->29)  minecraft:cloud -> cloud
-                rewrite(9),  // (6->9)   minecraft:crit -> crit
-                rewrite(44), // (7->44)  minecraft:damage_indicator -> damageIndicator‌
-                rewrite(42), // (8->42)  minecraft:dragon_breath -> dragonbreath
-                rewrite(19), // (9->19)  minecraft:dripping_lava -> dripLava
-                rewrite(18), // (10->18) minecraft:dripping_water -> dripWater
-                rewrite(30, new ParticleHandler() {
-                    @Override
-                    public int[] rewrite(Protocol1_12_2To1_13 protocol, PacketWrapper wrapper) throws Exception {
-                        float r = wrapper.read(Type.FLOAT);
-                        float g = wrapper.read(Type.FLOAT);
-                        float b = wrapper.read(Type.FLOAT);
-                        float scale = wrapper.read(Type.FLOAT);
+            rewrite(16), // (0->16)  minecraft:ambient_entity_effect -> mobSpellAmbient
+            rewrite(20), // (1->20)  minecraft:angry_villager -> angryVillager
+            rewrite(35), // (2->35)  minecraft:barrier -> barrier
+            rewrite(37, blockHandler),
+            // (3->37)  minecraft:block -> blockcrack
+            rewrite(4),  // (4->4)   minecraft:bubble -> bubble
+            rewrite(29), // (5->29)  minecraft:cloud -> cloud
+            rewrite(9),  // (6->9)   minecraft:crit -> crit
+            rewrite(44), // (7->44)  minecraft:damage_indicator -> damageIndicator‌
+            rewrite(42), // (8->42)  minecraft:dragon_breath -> dragonbreath
+            rewrite(19), // (9->19)  minecraft:dripping_lava -> dripLava
+            rewrite(18), // (10->18) minecraft:dripping_water -> dripWater
+            rewrite(30, new ParticleHandler() {
+                @Override
+                public int[] rewrite(Protocol1_12_2To1_13 protocol, PacketWrapper wrapper) throws Exception {
+                    float r = wrapper.read(Type.FLOAT);
+                    float g = wrapper.read(Type.FLOAT);
+                    float b = wrapper.read(Type.FLOAT);
+                    float scale = wrapper.read(Type.FLOAT);
 
-                        wrapper.set(Type.FLOAT, 3, r); // 5 - Offset X index=3
-                        wrapper.set(Type.FLOAT, 4, g); // 6 - Offset Y index=4
-                        wrapper.set(Type.FLOAT, 5, b); // 7 - Offset Z index=5
-                        wrapper.set(Type.FLOAT, 6, scale); // 8 - Particle Data index=6
-                        wrapper.set(Type.INT, 1, 0); // 9 - Particle Count index=1 enable rgb particle
+                    wrapper.set(Type.FLOAT, 3, r); // 5 - Offset X index=3
+                    wrapper.set(Type.FLOAT, 4, g); // 6 - Offset Y index=4
+                    wrapper.set(Type.FLOAT, 5, b); // 7 - Offset Z index=5
+                    wrapper.set(Type.FLOAT, 6, scale); // 8 - Particle Data index=6
+                    wrapper.set(Type.INT, 1, 0); // 9 - Particle Count index=1 enable rgb particle
 
-                        return null;
-                    }
+                    return null;
+                }
 
-                    @Override
-                    public int[] rewrite(Protocol1_12_2To1_13 protocol, List<Particle.ParticleData> data) {
-                        return null;
-                    }
-                }),         // (11->30) minecraft:dust -> reddust
-                rewrite(13), // (12->13) minecraft:effect -> spell
-                rewrite(41), // (13->41) minecraft:elder_guardian -> mobappearance
-                rewrite(10), // (14->10) minecraft:enchanted_hit -> magicCrit‌
-                rewrite(25), // (15->25) minecraft:enchant -> enchantmenttable
-                rewrite(43), // (16->43) minecraft:end_rod -> endRod
-                rewrite(15), // (17->15) minecraft:entity_effect -> mobSpell
-                rewrite(2),  // (18->2)  minecraft:explosion_emitter -> hugeexplosion
-                rewrite(1),  // (19->1)  minecraft:explosion -> largeexplode
-                rewrite(46, blockHandler),
-                // (20->46) minecraft:falling_dust -> fallingdust
-                rewrite(3),  // (21->3)  minecraft:firework -> fireworksSpark
-                rewrite(6),  // (22->6)  minecraft:fishing -> wake
-                rewrite(26), // (23->26) minecraft:flame -> flame
-                rewrite(21), // (24->21) minecraft:happy_villager -> happyVillager
-                rewrite(34), // (25->34) minecraft:heart -> heart
-                rewrite(14), // (26->14) minecraft:instant_effect -> instantSpell
-                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));
-                    }
+                @Override
+                public int[] rewrite(Protocol1_12_2To1_13 protocol, List<Particle.ParticleData<?>> data) {
+                    return null;
+                }
+            }),         // (11->30) minecraft:dust -> reddust
+            rewrite(13), // (12->13) minecraft:effect -> spell
+            rewrite(41), // (13->41) minecraft:elder_guardian -> mobappearance
+            rewrite(10), // (14->10) minecraft:enchanted_hit -> magicCrit‌
+            rewrite(25), // (15->25) minecraft:enchant -> enchantmenttable
+            rewrite(43), // (16->43) minecraft:end_rod -> endRod
+            rewrite(15), // (17->15) minecraft:entity_effect -> mobSpell
+            rewrite(2),  // (18->2)  minecraft:explosion_emitter -> hugeexplosion
+            rewrite(1),  // (19->1)  minecraft:explosion -> largeexplode
+            rewrite(46, blockHandler),
+            // (20->46) minecraft:falling_dust -> fallingdust
+            rewrite(3),  // (21->3)  minecraft:firework -> fireworksSpark
+            rewrite(6),  // (22->6)  minecraft:fishing -> wake
+            rewrite(26), // (23->26) minecraft:flame -> flame
+            rewrite(21), // (24->21) minecraft:happy_villager -> happyVillager
+            rewrite(34), // (25->34) minecraft:heart -> heart
+            rewrite(14), // (26->14) minecraft:instant_effect -> instantSpell
+            rewrite(36, new ParticleHandler() {
+                @Override
+                public int[] rewrite(Protocol1_12_2To1_13 protocol, PacketWrapper wrapper) throws Exception {
+                    return rewrite(protocol, wrapper.read(Type.ITEM1_13));
+                }
 
-                    @Override
-                    public int[] rewrite(Protocol1_12_2To1_13 protocol, List<Particle.ParticleData> data) {
-                        return rewrite(protocol, (Item) data.get(0).getValue());
-                    }
+                @Override
+                public int[] rewrite(Protocol1_12_2To1_13 protocol, List<Particle.ParticleData<?>> data) {
+                    return rewrite(protocol, (Item) data.get(0).getValue());
+                }
 
-                    private int[] rewrite(Protocol1_12_2To1_13 protocol, Item newItem) {
-                        Item item = protocol.getItemRewriter().handleItemToClient(newItem);
-                        return new int[]{item.identifier(), item.data()};
-                    }
-                }),          // (27->36) minecraft:item -> iconcrack
-                rewrite(33), // (28->33) minecraft:item_slime -> slime
-                rewrite(31), // (29->31) minecraft:item_snowball -> snowballpoof
-                rewrite(12), // (30->12) minecraft:large_smoke -> largesmoke
-                rewrite(27), // (31->27) minecraft:lava -> lava
-                rewrite(22), // (32->22) minecraft:mycelium -> townaura
-                rewrite(23), // (33->23) minecraft:note -> note
-                rewrite(0),  // (34->0)  minecraft:poof -> explode
-                rewrite(24), // (35->24) minecraft:portal -> portal
-                rewrite(39), // (36->39) minecraft:rain -> droplet
-                rewrite(11), // (37->11) minecraft:smoke -> smoke
-                rewrite(48), // (38->48) minecraft:spit -> spit
-                rewrite(12), // (39->-1) minecraft:squid_ink -> squid_ink -> large_smoke
-                rewrite(45), // (40->45) minecraft:sweep_attack -> sweepAttack‌
-                rewrite(47), // (41->47) minecraft:totem_of_undying -> totem
-                rewrite(7),  // (42->7)  minecraft:underwater -> suspended‌
-                rewrite(5),  // (43->5)  minecraft:splash -> splash
-                rewrite(17), // (44->17) minecraft:witch -> witchMagic
-                rewrite(4),  // (45->4)  minecraft:bubble_pop -> bubble
-                rewrite(4),  // (46->4)  minecraft:current_down -> bubble
-                rewrite(4),  // (47->4)  minecraft:bubble_column_up -> bubble
-                rewrite(18), // (48->-1) minecraft:nautilus -> nautilus -> dripWater
-                rewrite(18), // (49->18) minecraft:dolphin -> dripWater
+                private int[] rewrite(Protocol1_12_2To1_13 protocol, Item newItem) {
+                    Item item = protocol.getItemRewriter().handleItemToClient(newItem);
+                    return new int[]{item.identifier(), item.data()};
+                }
+            }),          // (27->36) minecraft:item -> iconcrack
+            rewrite(33), // (28->33) minecraft:item_slime -> slime
+            rewrite(31), // (29->31) minecraft:item_snowball -> snowballpoof
+            rewrite(12), // (30->12) minecraft:large_smoke -> largesmoke
+            rewrite(27), // (31->27) minecraft:lava -> lava
+            rewrite(22), // (32->22) minecraft:mycelium -> townaura
+            rewrite(23), // (33->23) minecraft:note -> note
+            rewrite(0),  // (34->0)  minecraft:poof -> explode
+            rewrite(24), // (35->24) minecraft:portal -> portal
+            rewrite(39), // (36->39) minecraft:rain -> droplet
+            rewrite(11), // (37->11) minecraft:smoke -> smoke
+            rewrite(48), // (38->48) minecraft:spit -> spit
+            rewrite(12), // (39->-1) minecraft:squid_ink -> squid_ink -> large_smoke
+            rewrite(45), // (40->45) minecraft:sweep_attack -> sweepAttack‌
+            rewrite(47), // (41->47) minecraft:totem_of_undying -> totem
+            rewrite(7),  // (42->7)  minecraft:underwater -> suspended‌
+            rewrite(5),  // (43->5)  minecraft:splash -> splash
+            rewrite(17), // (44->17) minecraft:witch -> witchMagic
+            rewrite(4),  // (45->4)  minecraft:bubble_pop -> bubble
+            rewrite(4),  // (46->4)  minecraft:current_down -> bubble
+            rewrite(4),  // (47->4)  minecraft:bubble_column_up -> bubble
+            rewrite(18), // (48->-1) minecraft:nautilus -> nautilus -> dripWater
+            rewrite(18), // (49->18) minecraft:dolphin -> dripWater
         };
     }
 
@@ -163,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;
@@ -188,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/EntityPackets1_13.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 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
@@ -25,27 +25,26 @@ import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.data.EntityType
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.data.PaintingMapping;
 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.NoteBlockStorage;
 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.PacketHandler;
-import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+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;
 
-public class EntityPackets1_13 extends LegacyEntityRewriter<Protocol1_12_2To1_13> {
+public class EntityPackets1_13 extends LegacyEntityRewriter<ClientboundPackets1_13, Protocol1_12_2To1_13> {
 
     public EntityPackets1_13(Protocol1_12_2To1_13 protocol) {
         super(protocol);
@@ -53,38 +52,30 @@ public class EntityPackets1_13 extends LegacyEntityRewriter<Protocol1_12_2To1_13
 
     @Override
     protected void registerPackets() {
-        protocol.registerClientbound(ClientboundPackets1_13.PLAYER_POSITION, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_13.PLAYER_POSITION, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.DOUBLE);
                 map(Type.DOUBLE);
                 map(Type.DOUBLE);
                 map(Type.FLOAT);
                 map(Type.FLOAT);
                 map(Type.BYTE);
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        if (!ViaBackwards.getConfig().isFix1_13FacePlayer()) return;
+                handler(wrapper -> {
+                    if (!ViaBackwards.getConfig().isFix1_13FacePlayer()) return;
 
-                        PlayerPositionStorage1_13 playerStorage = wrapper.user().get(PlayerPositionStorage1_13.class);
-                        byte bitField = wrapper.get(Type.BYTE, 0);
-                        playerStorage.setX(toSet(bitField, 0, playerStorage.getX(), wrapper.get(Type.DOUBLE, 0)));
-                        playerStorage.setY(toSet(bitField, 1, playerStorage.getY(), wrapper.get(Type.DOUBLE, 1)));
-                        playerStorage.setZ(toSet(bitField, 2, playerStorage.getZ(), wrapper.get(Type.DOUBLE, 2)));
-                    }
-
-                    private double toSet(int field, int bitIndex, double origin, double packetValue) {
-                        // If bit is set, coordinate is relative
-                        return (field & (1 << bitIndex)) != 0 ? origin + packetValue : packetValue;
-                    }
+                    PlayerPositionStorage1_13 playerStorage = wrapper.user().get(PlayerPositionStorage1_13.class);
+                    byte bitField = wrapper.get(Type.BYTE, 0);
+                    playerStorage.setX(toSet(bitField, 0, playerStorage.getX(), wrapper.get(Type.DOUBLE, 0)));
+                    playerStorage.setY(toSet(bitField, 1, playerStorage.getY(), wrapper.get(Type.DOUBLE, 1)));
+                    playerStorage.setZ(toSet(bitField, 2, playerStorage.getZ(), wrapper.get(Type.DOUBLE, 2)));
                 });
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_13.SPAWN_ENTITY, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_13.SPAWN_ENTITY, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT);
                 map(Type.UUID);
                 map(Type.BYTE);
@@ -97,46 +88,43 @@ public class EntityPackets1_13 extends LegacyEntityRewriter<Protocol1_12_2To1_13
 
                 handler(getObjectTrackerHandler());
 
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        Optional<Entity1_13Types.ObjectType> optionalType = Entity1_13Types.ObjectType.findById(wrapper.get(Type.BYTE, 0));
-                        if (!optionalType.isPresent()) return;
+                handler(wrapper -> {
+                    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) {
-                            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) {
-                            int data = wrapper.get(Type.INT, 0);
-                            switch (data) {
-                                case 3:
-                                    data = 0;
-                                    break;
-                                case 4:
-                                    data = 1;
-                                    break;
-                                case 5:
-                                    data = 3;
-                                    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());
+                    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 == EntityTypes1_13.ObjectType.ITEM_FRAME) {
+                        int data = wrapper.get(Type.INT, 0);
+                        switch (data) {
+                            case 3:
+                                data = 0;
+                                break;
+                            case 4:
+                                data = 1;
+                                break;
+                            case 5:
+                                data = 3;
+                                break;
                         }
+                        wrapper.set(Type.INT, 0, data);
+                    } 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 PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_13.SPAWN_MOB, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT);
                 map(Type.UUID);
                 map(Type.VAR_INT);
@@ -151,21 +139,18 @@ public class EntityPackets1_13 extends LegacyEntityRewriter<Protocol1_12_2To1_13
                 map(Type.SHORT);
                 map(Types1_13.METADATA_LIST, Types1_12.METADATA_LIST);
 
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        int type = wrapper.get(Type.VAR_INT, 1);
-                        EntityType entityType = Entity1_13Types.getTypeFromId(type, false);
-                        tracker(wrapper.user()).addEntity(wrapper.get(Type.VAR_INT, 0), entityType);
+                handler(wrapper -> {
+                    int type = wrapper.get(Type.VAR_INT, 1);
+                    EntityType entityType = EntityTypes1_13.getTypeFromId(type, false);
+                    tracker(wrapper.user()).addEntity(wrapper.get(Type.VAR_INT, 0), entityType);
 
-                        int oldId = EntityTypeMapping.getOldId(type);
-                        if (oldId == -1) {
-                            if (!hasData(entityType)) {
-                                ViaBackwards.getPlatform().getLogger().warning("Could not find 1.12 entity type for 1.13 entity type " + type + "/" + entityType);
-                            }
-                        } else {
-                            wrapper.set(Type.VAR_INT, 1, oldId);
+                    int oldId = EntityTypeMapping.getOldId(type);
+                    if (oldId == -1) {
+                        if (!hasData(entityType)) {
+                            ViaBackwards.getPlatform().getLogger().warning("Could not find 1.12 entity type for 1.13 entity type " + type + "/" + entityType);
                         }
+                    } else {
+                        wrapper.set(Type.VAR_INT, 1, oldId);
                     }
                 });
 
@@ -174,9 +159,9 @@ public class EntityPackets1_13 extends LegacyEntityRewriter<Protocol1_12_2To1_13
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_13.SPAWN_PLAYER, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_13.SPAWN_PLAYER, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT);
                 map(Type.UUID);
                 map(Type.DOUBLE);
@@ -186,37 +171,37 @@ public class EntityPackets1_13 extends LegacyEntityRewriter<Protocol1_12_2To1_13
                 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));
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_13.SPAWN_PAINTING, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_13.SPAWN_PAINTING, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT);
                 map(Type.UUID);
 
-                handler(getTrackerHandler(Entity1_13Types.EntityType.PAINTING, Type.VAR_INT));
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        int motive = wrapper.read(Type.VAR_INT);
-                        String title = PaintingMapping.getStringId(motive);
-                        wrapper.write(Type.STRING, title);
-                    }
+                handler(getTrackerHandler(EntityTypes1_13.EntityType.PAINTING, Type.VAR_INT));
+                handler(wrapper -> {
+                    int motive = wrapper.read(Type.VAR_INT);
+                    String title = PaintingMapping.getStringId(motive);
+                    wrapper.write(Type.STRING, title);
                 });
             }
         });
 
-        registerJoinGame(ClientboundPackets1_13.JOIN_GAME, Entity1_13Types.EntityType.PLAYER);
+        registerJoinGame(ClientboundPackets1_13.JOIN_GAME, EntityTypes1_13.EntityType.PLAYER);
 
-        protocol.registerClientbound(ClientboundPackets1_13.RESPAWN, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_13.RESPAWN, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.INT); // 0 - Dimension ID
 
                 handler(getDimensionHandler(0));
-                handler(wrapper -> wrapper.user().get(BackwardsBlockStorage.class).clear());
+                handler(wrapper -> {
+                    wrapper.user().get(BackwardsBlockStorage.class).clear();
+                    wrapper.user().get(NoteBlockStorage.class).clear();
+                });
             }
         });
 
@@ -224,48 +209,40 @@ public class EntityPackets1_13 extends LegacyEntityRewriter<Protocol1_12_2To1_13
         registerMetadataRewriter(ClientboundPackets1_13.ENTITY_METADATA, Types1_13.METADATA_LIST, Types1_12.METADATA_LIST);
 
         // Face Player (new packet)
-        protocol.registerClientbound(ClientboundPackets1_13.FACE_PLAYER, null, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        wrapper.cancel();
+        protocol.registerClientbound(ClientboundPackets1_13.FACE_PLAYER, null, wrapper -> {
+            wrapper.cancel();
 
-                        if (!ViaBackwards.getConfig().isFix1_13FacePlayer()) return;
+            if (!ViaBackwards.getConfig().isFix1_13FacePlayer()) return;
 
-                        // We will just accept a possible, very minor mismatch between server and client position,
-                        // and will take the server's one in both cases, else we would have to cache all entities' positions.
-                        final int anchor = wrapper.read(Type.VAR_INT); // feet/eyes enum
-                        final double x = wrapper.read(Type.DOUBLE);
-                        final double y = wrapper.read(Type.DOUBLE);
-                        final double z = wrapper.read(Type.DOUBLE);
+            // We will just accept a possible, very minor mismatch between server and client position,
+            // and will take the server's one in both cases, else we would have to cache all entities' positions.
+            final int anchor = wrapper.read(Type.VAR_INT); // feet/eyes enum
+            final double x = wrapper.read(Type.DOUBLE);
+            final double y = wrapper.read(Type.DOUBLE);
+            final double z = wrapper.read(Type.DOUBLE);
 
-                        PlayerPositionStorage1_13 positionStorage = wrapper.user().get(PlayerPositionStorage1_13.class);
+            PlayerPositionStorage1_13 positionStorage = wrapper.user().get(PlayerPositionStorage1_13.class);
 
-                        // Send teleport packet to client
-                        PacketWrapper positionAndLook = wrapper.create(ClientboundPackets1_12_1.PLAYER_POSITION);
-                        positionAndLook.write(Type.DOUBLE, 0D);
-                        positionAndLook.write(Type.DOUBLE, 0D);
-                        positionAndLook.write(Type.DOUBLE, 0D);
+            // Send teleport packet to client
+            PacketWrapper positionAndLook = wrapper.create(ClientboundPackets1_12_1.PLAYER_POSITION);
+            positionAndLook.write(Type.DOUBLE, 0D);
+            positionAndLook.write(Type.DOUBLE, 0D);
+            positionAndLook.write(Type.DOUBLE, 0D);
 
-                        //TODO properly cache and calculate head position?
-                        EntityPositionHandler.writeFacingDegrees(positionAndLook, positionStorage.getX(),
-                                anchor == 1 ? positionStorage.getY() + 1.62 : positionStorage.getY(),
-                                positionStorage.getZ(), x, y, z);
+            //TODO properly cache and calculate head position?
+            EntityPositionHandler.writeFacingDegrees(positionAndLook, positionStorage.getX(),
+                anchor == 1 ? positionStorage.getY() + 1.62 : positionStorage.getY(),
+                positionStorage.getZ(), x, y, z);
 
-                        positionAndLook.write(Type.BYTE, (byte) 7); // bitfield, 0=absolute, 1=relative - x,y,z relative, yaw,pitch absolute
-                        positionAndLook.write(Type.VAR_INT, -1);
-                        positionAndLook.send(Protocol1_12_2To1_13.class);
-                    }
-                });
-            }
+            positionAndLook.write(Type.BYTE, (byte) 7); // bitfield, 0=absolute, 1=relative - x,y,z relative, yaw,pitch absolute
+            positionAndLook.write(Type.VAR_INT, -1);
+            positionAndLook.send(Protocol1_12_2To1_13.class);
         });
 
         if (ViaBackwards.getConfig().isFix1_13FacePlayer()) {
-            PacketRemapper movementRemapper = new PacketRemapper() {
+            PacketHandlers movementRemapper = new PacketHandlers() {
                 @Override
-                public void registerMap() {
+                public void register() {
                     map(Type.DOUBLE);
                     map(Type.DOUBLE);
                     map(Type.DOUBLE);
@@ -281,94 +258,79 @@ public class EntityPackets1_13 extends LegacyEntityRewriter<Protocol1_12_2To1_13
     @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().type(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().type(EntityTypes1_13.EntityType.ABSTRACT_FISHES).cancel(12);
+        filter().type(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());
@@ -396,16 +358,21 @@ public class EntityPackets1_13 extends LegacyEntityRewriter<Protocol1_12_2To1_13
 
     @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
     public int newEntityId(final int newId) {
         return EntityTypeMapping.getOldId(newId);
     }
+
+    private static double toSet(int field, int bitIndex, double origin, double packetValue) {
+        // If bit is set, coordinate is relative
+        return (field & (1 << bitIndex)) != 0 ? origin + packetValue : packetValue;
+    }
 }

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,11 +17,9 @@
  */
 package com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.packets;
 
-import com.viaversion.viabackwards.ViaBackwards;
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.Protocol1_12_2To1_13;
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.data.NamedSoundMapping;
-import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.rewriter.RewriterBase;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1;
@@ -36,56 +34,45 @@ public class SoundPackets1_13 extends RewriterBase<Protocol1_12_2To1_13> {
 
     @Override
     protected void registerPackets() {
-        protocol.registerClientbound(ClientboundPackets1_13.NAMED_SOUND, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                map(Type.STRING);
-                handler(wrapper -> {
-                    String newSound = wrapper.get(Type.STRING, 0);
-                    String oldSound = NamedSoundMapping.getOldId(newSound);
-                    if (oldSound != null || (oldSound = protocol.getMappingData().getMappedNamedSound(newSound)) != null) {
-                        wrapper.set(Type.STRING, 0, oldSound);
-                    } else if (!Via.getConfig().isSuppressConversionWarnings()) {
-                        ViaBackwards.getPlatform().getLogger().warning("Unknown named sound in 1.13->1.12 protocol: " + newSound);
-                    }
-                });
+        protocol.registerClientbound(ClientboundPackets1_13.NAMED_SOUND, wrapper -> {
+            String sound = wrapper.read(Type.STRING);
+            String mappedSound = NamedSoundMapping.getOldId(sound);
+            if (mappedSound != null || (mappedSound = protocol.getMappingData().getMappedNamedSound(sound)) != null) {
+                wrapper.write(Type.STRING, mappedSound);
+            } else {
+                wrapper.write(Type.STRING, sound);
             }
         });
 
         // Stop Sound -> Plugin Message
-        protocol.registerClientbound(ClientboundPackets1_13.STOP_SOUND, ClientboundPackets1_12_1.PLUGIN_MESSAGE, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                handler(wrapper -> {
-                    wrapper.write(Type.STRING, "MC|StopSound");
-                    byte flags = wrapper.read(Type.BYTE);
-                    String source;
-                    if ((flags & 0x01) != 0) {
-                        source = SOUND_SOURCES[wrapper.read(Type.VAR_INT)];
-                    } else {
-                        source = "";
-                    }
-
-                    String sound;
-                    if ((flags & 0x02) != 0) {
-                        String newSound = wrapper.read(Type.STRING);
-                        sound = protocol.getMappingData().getMappedNamedSound(newSound);
-                        if (sound == null) {
-                            sound = "";
-                        }
-                    } else {
-                        sound = "";
-                    }
-
-                    wrapper.write(Type.STRING, source);
-                    wrapper.write(Type.STRING, sound);
-                });
+        protocol.registerClientbound(ClientboundPackets1_13.STOP_SOUND, ClientboundPackets1_12_1.PLUGIN_MESSAGE, wrapper -> {
+            wrapper.write(Type.STRING, "MC|StopSound");
+            byte flags = wrapper.read(Type.BYTE);
+            String source;
+            if ((flags & 0x01) != 0) {
+                source = SOUND_SOURCES[wrapper.read(Type.VAR_INT)];
+            } else {
+                source = "";
             }
+
+            String sound;
+            if ((flags & 0x02) != 0) {
+                String newSound = wrapper.read(Type.STRING);
+                sound = protocol.getMappingData().getMappedNamedSound(newSound);
+                if (sound == null) {
+                    sound = "";
+                }
+            } else {
+                sound = "";
+            }
+
+            wrapper.write(Type.STRING, source);
+            wrapper.write(Type.STRING, sound);
         });
 
-        protocol.registerClientbound(ClientboundPackets1_13.SOUND, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_13.SOUND, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT);
                 handler(wrapper -> {
                     int newSound = wrapper.get(Type.VAR_INT, 0);

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/providers/BackwardsBlockEntityProvider.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,6 @@
 
 package com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.providers;
 
-import com.viaversion.viabackwards.ViaBackwards;
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.block_entity_handlers.BannerHandler;
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.block_entity_handlers.BedHandler;
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.block_entity_handlers.FlowerPotHandler;
@@ -26,14 +25,11 @@ import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.block_entity_ha
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.block_entity_handlers.SkullHandler;
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.block_entity_handlers.SpawnerHandler;
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.storage.BackwardsBlockStorage;
-import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.api.platform.providers.Provider;
 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 java.util.HashMap;
 import java.util.Map;
 
@@ -67,25 +63,24 @@ public class BackwardsBlockEntityProvider implements Provider {
      * @param tag      The block entity tag
      */
     public CompoundTag transform(UserConnection user, Position position, CompoundTag tag) throws Exception {
-        String id = (String) tag.get("id").getValue();
+        final StringTag idTag = tag.getStringTag("id");
+        if (idTag == null) {
+            return tag;
+        }
+
+        String id = idTag.getValue();
         BackwardsBlockEntityHandler handler = handlers.get(id);
         if (handler == null) {
-            if (Via.getManager().isDebug()) {
-                ViaBackwards.getPlatform().getLogger().warning("Unhandled BlockEntity " + id + " full tag: " + tag);
-            }
             return tag;
         }
 
         BackwardsBlockStorage storage = user.get(BackwardsBlockStorage.class);
         Integer blockId = storage.get(position);
         if (blockId == null) {
-            if (Via.getManager().isDebug()) {
-                ViaBackwards.getPlatform().getLogger().warning("Handled BlockEntity does not have a stored block :( " + id + " full tag: " + tag);
-            }
             return tag;
         }
 
-        return handler.transform(user, blockId, tag);
+        return handler.transform(blockId, tag);
     }
 
     /**
@@ -97,15 +92,17 @@ public class BackwardsBlockEntityProvider implements Provider {
      */
     public CompoundTag transform(UserConnection user, Position position, String id) throws Exception {
         CompoundTag tag = new CompoundTag();
-        tag.put("id", new StringTag(id));
-        tag.put("x", new IntTag(Math.toIntExact(position.getX())));
-        tag.put("y", new IntTag(Math.toIntExact(position.getY())));
-        tag.put("z", new IntTag(Math.toIntExact(position.getZ())));
+        tag.putString("id", id);
+        tag.putInt("x", Math.toIntExact(position.x()));
+        tag.putInt("y", Math.toIntExact(position.y()));
+        tag.putInt("z", Math.toIntExact(position.z()));
 
         return this.transform(user, position, tag);
     }
 
+    @FunctionalInterface
     public interface BackwardsBlockEntityHandler {
-        CompoundTag transform(UserConnection user, int blockId, CompoundTag tag);
+
+        CompoundTag transform(int blockId, CompoundTag tag);
     }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/storage/BackwardsBlockStorage.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 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
@@ -22,9 +22,9 @@ import com.viaversion.viaversion.api.connection.StorableObject;
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.libs.fastutil.ints.IntOpenHashSet;
 import com.viaversion.viaversion.libs.fastutil.ints.IntSet;
-
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 public class BackwardsBlockStorage implements StorableObject {
     // This BlockStorage is very exclusive (;
@@ -78,11 +78,7 @@ public class BackwardsBlockStorage implements StorableObject {
         blocks.put(position, block);
     }
 
-    public boolean isWelcome(int block) {
-        return WHITELIST.contains(block);
-    }
-
-    public Integer get(Position position) {
+    public @Nullable Integer get(Position position) {
         return blocks.get(position);
     }
 

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/storage/NoteBlockStorage.java

@@ -0,0 +1,50 @@
+/*
+ * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
+ * Copyright (C) 2016-2024 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_12_2to1_13.storage;
+
+import com.viaversion.viaversion.api.connection.StorableObject;
+import com.viaversion.viaversion.api.minecraft.Position;
+import com.viaversion.viaversion.libs.fastutil.objects.Object2IntMap;
+import com.viaversion.viaversion.libs.fastutil.objects.Object2IntOpenHashMap;
+import com.viaversion.viaversion.util.Pair;
+
+public class NoteBlockStorage implements StorableObject {
+
+    private static final int MAX_NOTE_ID = 24;
+
+    private final Object2IntMap<Position> noteBlockUpdates = new Object2IntOpenHashMap<>();
+
+    public void storeNoteBlockUpdate(final Position position, final int blockStateId) {
+        noteBlockUpdates.put(position, blockStateId);
+    }
+
+    public Pair<Integer, Integer> getNoteBlockUpdate(final Position position) {
+        if (!noteBlockUpdates.containsKey(position)) {
+            return null;
+        }
+        int relativeBlockState = noteBlockUpdates.removeInt(position) - 249;
+        relativeBlockState = relativeBlockState / 2; // Get rid of powered state
+
+        return new Pair<>(relativeBlockState / MAX_NOTE_ID + 1, relativeBlockState % MAX_NOTE_ID + 1);
+    }
+
+    public void clear() {
+        noteBlockUpdates.clear();
+    }
+
+}

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/storage/PlayerPositionStorage1_13.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,4 @@ package com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.storage;
 import com.viaversion.viabackwards.api.entities.storage.PlayerPositionStorage;
 
 public class PlayerPositionStorage1_13 extends PlayerPositionStorage {
-
-    public PlayerPositionStorage1_13() {
-    }
 }