4.7.0 Release

Fixes #548

.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,24 @@
-# 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
+    - uses: actions/checkout@v3
+    - uses: gradle/wrapper-validation-action@v1
     - name: Set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: 11
     - name: Build with Gradle
       run: ./gradlew build
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: artifact
         path: build/libs

.idea/copyright/viabackwards_gpl.xml

@@ -1,6 +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-2022 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="notice" value="This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards&#10;Copyright (C) &amp;#36;originalComment.match(&quot;Copyright \(C\) (\d+)&quot;, 1, &quot;-&quot;)&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>

README.md

@@ -11,7 +11,7 @@ Supported Versions
 **Green** = ViaVersion\
 **Purple** = ViaBackwards addition
 
-![supported_versions](https://i.imgur.com/O2KAFFL.png)
+![supported_versions](https://i.imgur.com/KpLsMHj.png)
 
 Releases / Dev Builds
 -

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.2")
+    implementation("com.github.johnrengelman", "shadow", "8.1.1")
 }

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

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

build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 
 allprojects {
     group = "com.viaversion"
-    version = "4.2.1"
+    version = "4.7.0"
     description = "Allow older clients to join newer server versions."
 }
 

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-2022 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
@@ -22,44 +22,40 @@ 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;
 
 public class BukkitPlugin extends JavaPlugin implements ViaBackwardsPlatform {
 
-    @Override
-    public void onLoad() {
-        if (!ViaVersionPlugin.getInstance().isLateBind()) {
-            init();
-        }
+    public BukkitPlugin() {
+        Via.getManager().addEnableListener(() -> init(getDataFolder()));
     }
 
     @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-2022 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

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-2022 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

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-2022 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

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-2023 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.viaversion.viabackwards.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

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

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-2022 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
@@ -20,6 +20,7 @@ package com.viaversion.viabackwards;
 
 import com.viaversion.viabackwards.api.ViaBackwardsPlatform;
 import com.viaversion.viaversion.api.Via;
+import com.viaversion.viaversion.api.data.MappingDataLoader;
 import net.md_5.bungee.api.plugin.Plugin;
 
 public class BungeePlugin extends Plugin implements ViaBackwardsPlatform {
@@ -29,6 +30,7 @@ public class BungeePlugin extends Plugin implements ViaBackwardsPlatform {
         Via.getManager().addEnableListener(() -> this.init(getDataFolder()));
     }
 
+
     @Override
     public void disable() {
     }

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-2022 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
@@ -22,7 +22,7 @@ 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;

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

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2022 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
@@ -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-2022 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
@@ -17,6 +17,8 @@
  */
 package com.viaversion.viabackwards.api;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
+
 public interface ViaBackwardsConfig {
 
     /**
@@ -50,4 +52,6 @@ public interface ViaBackwardsConfig {
     boolean alwaysShowOriginalMobName();
 
     boolean handlePingsAsInvAcknowledgements();
+
+    @Nullable String chatTypeFormat(String translationKey);
 }

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-2022 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
@@ -45,19 +45,23 @@ 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_9_4to1_10.Protocol1_9_4To1_10;
 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.logging.Logger;
 
 public interface ViaBackwardsPlatform {
 
-    String MINIMUM_VV_VERSION = "4.2.0";
+    String MINIMUM_VV_VERSION = "4.7.0";
     String IMPL_VERSION = "$IMPL_VERSION";
 
     /**
@@ -69,14 +73,18 @@ public interface ViaBackwardsPlatform {
 
         ViaBackwards.init(this, config);
 
-        if (isOutdated()) return;
+        if (isOutdated()) {
+            disable();
+            return;
+        }
 
         Via.getManager().getSubPlatforms().add(IMPL_VERSION);
 
         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_9_4To1_10(), ProtocolVersion.v1_9_3, ProtocolVersion.v1_10);
 
         protocolManager.registerProtocol(new Protocol1_10To1_11(), ProtocolVersion.v1_10, ProtocolVersion.v1_11);
@@ -111,6 +119,13 @@ public interface ViaBackwardsPlatform {
 
         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);
     }
 
     /**
@@ -129,11 +144,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-2022 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
@@ -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) 2023 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.viaversion.viabackwards.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-2022 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
@@ -18,15 +18,22 @@
 package com.viaversion.viabackwards.api.data;
 
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter;
+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 = ChatRewriter.legacyTextToJsonString("§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-2022 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

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-2022 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
@@ -18,157 +18,106 @@
 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.NBTIO;
+import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
+import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag;
 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);
+    public static @Nullable CompoundTag loadNBT(final String name) {
+        final InputStream resource = getResource(name);
+        if (resource == null) {
+            return null;
+        }
+
+        try (final InputStream stream = resource) {
+            return NBTIO.readTag(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 = NBTIO.readFile(file, false, 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-2022 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-2022 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
@@ -22,9 +22,8 @@ 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 java.util.Locale;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 public class EntityData {
     private final BackwardsProtocol<?, ?, ?, ?> protocol;

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-2022 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

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-2022 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
@@ -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;

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-2022 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

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-2022 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

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-2022 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
@@ -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/exceptions/RemovedValueException.java

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

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-2022 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
@@ -25,7 +25,6 @@ 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 java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -38,15 +37,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);
     }
 

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-2022 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
@@ -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,53 @@ 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 -> {
+            // 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-2022 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
@@ -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.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,7 +47,7 @@ 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;
@@ -64,34 +65,49 @@ public abstract class EntityRewriterBase<T extends BackwardsProtocol> extends En
 
     @Override
     public void handleMetadata(int entityId, List<Metadata> metadataList, UserConnection connection) {
+        final TrackedEntity entity = tracker(connection).entity(entityId);
+        final boolean initialMetadata = !(entity != null && entity.hasSentMetadata());
+
         super.handleMetadata(entityId, metadataList, connection);
 
-        EntityType type = tracker(connection).entityType(entityId);
-        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());
+        if (entityData != null && entityData.mobName() != null) {
+            final Metadata displayName = getMeta(displayNameIndex, metadataList);
+            if (initialMetadata) {
+                if (displayName == null) {
+                    // Add it as new metadata
+                    metadataList.add(new Metadata(displayNameIndex, displayNameMetaType, entityData.mobName()));
+                    addDisplayVisibilityMeta(metadataList);
+                } else if (displayName.getValue() == null || displayName.getValue().toString().isEmpty()) {
+                    // Overwrite the existing null/empty display name
+                    displayName.setValue(entityData.mobName());
+                    addDisplayVisibilityMeta(metadataList);
+                }
+            } else if (displayName != null && (displayName.getValue() == null || displayName.getValue().toString().isEmpty())) {
+                // Overwrite null/empty display name
+                displayName.setValue(entityData.mobName());
+                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) {
@@ -127,7 +143,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());
@@ -147,30 +163,41 @@ 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-2022 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
@@ -21,7 +21,8 @@ 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.remapper.PacketRemapper;
+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;
@@ -32,41 +33,48 @@ 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> {
 
-    protected ItemRewriter(T protocol) {
+    public ItemRewriter(T protocol) {
         super(protocol, 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 (protocol.getTranslatableRewriter() != null && display != null) {
             // Handle name and lore components
-            StringTag name = display.get("Name");
-            if (name != null) {
-                String newValue = protocol.getTranslatableRewriter().processText(name.getValue()).toString();
+            Tag name = display.get("Name");
+            if (name instanceof StringTag) {
+                StringTag nameStringTag = (StringTag) name;
+                String newValue = protocol.getTranslatableRewriter().processText(nameStringTag.getValue()).toString();
                 if (!newValue.equals(name.getValue())) {
-                    saveStringTag(display, name, "Name");
+                    saveStringTag(display, nameStringTag, "Name");
                 }
 
-                name.setValue(newValue);
+                nameStringTag.setValue(newValue);
             }
 
-            ListTag lore = display.get("Lore");
-            if (lore != null) {
+            Tag lore = display.get("Lore");
+            if (lore instanceof ListTag) {
+                ListTag loreListTag = (ListTag) lore;
                 boolean changed = false;
-                for (Tag loreEntryTag : lore) {
-                    if (!(loreEntryTag instanceof StringTag)) continue;
+                for (Tag loreEntryTag : loreListTag) {
+                    if (!(loreEntryTag instanceof StringTag)) {
+                        continue;
+                    }
 
                     StringTag loreEntry = (StringTag) loreEntryTag;
                     String newValue = protocol.getTranslatableRewriter().processText(loreEntry.getValue()).toString();
                     if (!changed && !newValue.equals(loreEntry.getValue())) {
                         // Backup original lore before doing any modifications
                         changed = true;
-                        saveListTag(display, lore, "Lore");
+                        saveListTag(display, loreListTag, "Lore");
                     }
 
                     loreEntry.setValue(newValue);
@@ -88,6 +96,11 @@ public abstract class ItemRewriter<T extends BackwardsProtocol> extends ItemRewr
         item.tag().put(nbtTagName + "|id", new IntTag(item.identifier()));
         item.setIdentifier(data.getId());
 
+        // Add custom model data
+        if (data.customModelData() != null && !item.tag().contains("CustomModelData")) {
+            item.tag().put("CustomModelData", new IntTag(data.customModelData()));
+        }
+
         // Set custom name - only done if there is no original one
         if (display == null) {
             item.tag().put("display", display = new CompoundTag());
@@ -114,10 +127,10 @@ public abstract class ItemRewriter<T extends BackwardsProtocol> extends ItemRewr
     }
 
     @Override
-    public void registerAdvancements(ClientboundPacketType packetType, Type<Item> type) {
-        protocol.registerClientbound(packetType, new PacketRemapper() {
+    public void registerAdvancements(C packetType, Type<Item> type) {
+        protocol.registerClientbound(packetType, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 handler(wrapper -> {
                     wrapper.passthrough(Type.BOOLEAN); // Reset/clear
                     final int size = wrapper.passthrough(Type.VAR_INT); // Mapping size
@@ -133,7 +146,7 @@ public abstract class ItemRewriter<T extends BackwardsProtocol> extends ItemRewr
                         if (wrapper.passthrough(Type.BOOLEAN)) {
                             final JsonElement title = wrapper.passthrough(Type.COMPONENT);
                             final JsonElement description = wrapper.passthrough(Type.COMPONENT);
-                            final TranslatableRewriter translatableRewriter = protocol.getTranslatableRewriter();
+                            final TranslatableRewriter<C> translatableRewriter = protocol.getTranslatableRewriter();
                             if (translatableRewriter != null) {
                                 translatableRewriter.processText(title);
                                 translatableRewriter.processText(description);

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-2022 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
@@ -19,6 +19,8 @@ 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.libs.opennbt.tag.builtin.CompoundTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag;
@@ -26,7 +28,8 @@ 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;
@@ -37,6 +40,7 @@ public abstract class ItemRewriterBase<T extends BackwardsProtocol> extends Item
         nbtTagName = "VB|" + protocol.getClass().getSimpleName();
     }
 
+    @Override
     public @Nullable Item handleItemToServer(@Nullable Item item) {
         if (item == null) return null;
         super.handleItemToServer(item);

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-2022 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
@@ -25,7 +25,11 @@ 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.libs.fastutil.ints.Int2ObjectMap;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap;
 import com.viaversion.viaversion.libs.gson.JsonElement;
@@ -38,12 +42,12 @@ 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 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;
@@ -179,7 +183,7 @@ 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 block = section.palette(PaletteType.BLOCKS).idAt(pos.getX(), pos.getY() & 0xF, pos.getZ());
             int btype = block >> 4;
 
             MappedLegacyBlockItem settings = replacementData.get(btype);
@@ -190,19 +194,22 @@ 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
@@ -220,7 +227,7 @@ 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 block = palette.idAt(x, y, z);
                         int btype = block >> 4;
                         int meta = block & 15;
 

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-2022 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
@@ -25,7 +25,6 @@ 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;

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-2022 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
@@ -30,17 +30,16 @@ 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-2022 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
@@ -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-2022 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

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-2022 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
@@ -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-2022 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
@@ -22,22 +22,22 @@ 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.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.libs.gson.JsonObject;
 import com.viaversion.viaversion.rewriter.ComponentRewriter;
-
 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> newTranslatables;
 
     public static void loadTranslatables() {
-        JsonObject jsonObject = VBMappingDataLoader.loadData("translation-mappings.json");
+        JsonObject jsonObject = VBMappingDataLoader.loadFromDataDir("translation-mappings.json");
         for (Map.Entry<String, JsonElement> entry : jsonObject.entrySet()) {
             Map<String, String> versionMappings = new HashMap<>();
             TRANSLATABLES.put(entry.getKey(), versionMappings);
@@ -47,11 +47,11 @@ public class TranslatableRewriter extends ComponentRewriter {
         }
     }
 
-    public TranslatableRewriter(BackwardsProtocol protocol) {
+    public TranslatableRewriter(BackwardsProtocol<C, ?, ?, ?> protocol) {
         this(protocol, protocol.getClass().getSimpleName().split("To")[1].replace("_", "."));
     }
 
-    public TranslatableRewriter(BackwardsProtocol protocol, String sectionIdentifier) {
+    public TranslatableRewriter(BackwardsProtocol<C, ?, ?, ?> protocol, String sectionIdentifier) {
         super(protocol);
         final Map<String, String> newTranslatables = TRANSLATABLES.get(sectionIdentifier);
         if (newTranslatables == null) {
@@ -63,36 +63,17 @@ public class TranslatableRewriter extends ComponentRewriter {
     }
 
     public void registerPing() {
-        protocol.registerClientbound(State.LOGIN, 0x00, 0x00, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                handler(wrapper -> processText(wrapper.passthrough(Type.COMPONENT)));
-            }
-        });
+        protocol.registerClientbound(State.LOGIN, 0x00, 0x00, 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 registerDisconnect(C packetType) {
+        protocol.registerClientbound(packetType, wrapper -> processText(wrapper.passthrough(Type.COMPONENT)));
     }
 
-    public void registerChatMessage(ClientboundPacketType packetType) {
-        protocol.registerClientbound(packetType, new PacketRemapper() {
+    public void registerLegacyOpenWindow(C packetType) {
+        protocol.registerClientbound(packetType, new PacketHandlers() {
             @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() {
+            public void register() {
                 map(Type.UNSIGNED_BYTE); // Id
                 map(Type.STRING); // Window Type
                 handler(wrapper -> processText(wrapper.passthrough(Type.COMPONENT)));
@@ -100,10 +81,10 @@ public class TranslatableRewriter extends ComponentRewriter {
         });
     }
 
-    public void registerOpenWindow(ClientboundPacketType packetType) {
-        protocol.registerClientbound(packetType, new PacketRemapper() {
+    public void registerOpenWindow(C packetType) {
+        protocol.registerClientbound(packetType, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT); // Id
                 map(Type.VAR_INT); // Window Type
                 handler(wrapper -> processText(wrapper.passthrough(Type.COMPONENT)));
@@ -111,22 +92,17 @@ public class TranslatableRewriter extends ComponentRewriter {
         });
     }
 
-    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 registerTabList(C packetType) {
+        protocol.registerClientbound(packetType, wrapper -> {
+            processText(wrapper.passthrough(Type.COMPONENT));
+            processText(wrapper.passthrough(Type.COMPONENT));
         });
     }
 
-    public void registerCombatKill(ClientboundPacketType packetType) {
-        protocol.registerClientbound(packetType, new PacketRemapper() {
+    public void registerCombatKill(C packetType) {
+        protocol.registerClientbound(packetType, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT);
                 map(Type.INT);
                 handler(wrapper -> processText(wrapper.passthrough(Type.COMPONENT)));
@@ -134,11 +110,25 @@ public class TranslatableRewriter extends ComponentRewriter {
         });
     }
 
+    public void registerCombatKill1_20(C packetType) {
+        protocol.registerClientbound(packetType, new PacketHandlers() {
+            @Override
+            public void register() {
+                map(Type.VAR_INT); // Duration
+                handler(wrapper -> processText(wrapper.passthrough(Type.COMPONENT)));
+            }
+        });
+    }
+
     @Override
     protected void handleTranslate(JsonObject root, String translate) {
-        String newTranslate = newTranslatables.get(translate);
+        String newTranslate = mappedTranslationKey(translate);
         if (newTranslate != null) {
             root.addProperty("translate", newTranslate);
         }
     }
+
+    public @Nullable String mappedTranslationKey(final String translationKey) {
+        return newTranslatables.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-2022 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

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-2022 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
@@ -34,7 +34,7 @@ import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.Client
 
 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);
     }
@@ -60,7 +60,7 @@ public class Protocol1_10To1_11 extends BackwardsProtocol<ClientboundPackets1_9_
             user.put(new ClientWorld(user));
         }
 
-        user.addEntityTracker(this.getClass(), new EntityTrackerBase(user, Entity1_11Types.EntityType.PLAYER, true));
+        user.addEntityTracker(this.getClass(), new EntityTrackerBase(user, Entity1_11Types.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-2022 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
@@ -34,7 +34,7 @@ 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.libs.opennbt.tag.builtin.CompoundTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag;
@@ -45,11 +45,10 @@ import com.viaversion.viaversion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1
 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,9 +58,9 @@ 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
@@ -86,32 +85,29 @@ public class BlockItemPackets1_11 extends LegacyBlockItemRewriter<Protocol1_10To
             }
         });
 
-        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
 
-                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.ITEM_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.ITEM_ARRAY, 0, stacks);
                     }
                 });
             }
@@ -120,40 +116,37 @@ public class BlockItemPackets1_11 extends LegacyBlockItemRewriter<Protocol1_10To
         registerEntityEquipment(ClientboundPackets1_9_3.ENTITY_EQUIPMENT, Type.ITEM);
 
         // 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).equalsIgnoreCase("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.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // Input Item
+                            wrapper.write(Type.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // 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.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
                         }
                     }
                 });
             }
         });
 
-        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
@@ -164,19 +157,16 @@ public class BlockItemPackets1_11 extends LegacyBlockItemRewriter<Protocol1_10To
                 handler(itemToServerHandler(Type.ITEM));
 
                 // 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());
                     }
                 });
             }
@@ -184,151 +174,125 @@ public class BlockItemPackets1_11 extends LegacyBlockItemRewriter<Protocol1_10To
 
         registerCreativeInvAction(ServerboundPackets1_9_3.CREATIVE_INVENTORY_ACTION, Type.ITEM);
 
-        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);
+            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);
 
-                        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()) {
+                Tag idTag = tag.get("id");
+                if (!(idTag instanceof StringTag)) continue;
 
-                            String id = (String) idTag.getValue();
-                            if (id.equals("minecraft:sign")) {
-                                ((StringTag) idTag).setValue("Sign");
-                            }
-                        }
-                    }
-                });
+                String id = (String) idTag.getValue();
+                if (id.equals("minecraft:sign")) {
+                    ((StringTag) 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() {
+            public void register() {
                 map(Type.POSITION); // 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() {
+            public void register() {
                 map(Type.POSITION); // 0 - Position
                 map(Type.UNSIGNED_BYTE); // 1 - Action
                 map(Type.NBT); // 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.NBT, 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);
                 });
             }
         });

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-2022 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
@@ -31,17 +31,14 @@ import com.viaversion.viaversion.api.minecraft.entities.Entity1_12Types;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_9;
-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,9 +46,9 @@ 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.INT);
@@ -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
@@ -90,21 +87,18 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<Protocol1_10To1_11>
                 handler(getObjectRewriter(id -> Entity1_11Types.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<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;
 
-                            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);
                     }
                 });
             }
@@ -113,9 +107,9 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<Protocol1_10To1_11>
         registerTracker(ClientboundPackets1_9_3.SPAWN_EXPERIENCE_ORB, Entity1_11Types.EntityType.EXPERIENCE_ORB);
         registerTracker(ClientboundPackets1_9_3.SPAWN_GLOBAL_ENTITY, Entity1_11Types.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
@@ -161,9 +155,9 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<Protocol1_10To1_11>
         registerJoinGame(ClientboundPackets1_9_3.JOIN_GAME, Entity1_11Types.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
@@ -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);
                     }
                 });
             }

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-2022 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
@@ -20,7 +20,7 @@ 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;
@@ -34,14 +34,14 @@ 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,7 +51,7 @@ 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()));
@@ -67,9 +67,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,9 +78,9 @@ 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() {
+            public void register() {
                 map(Type.POSITION); // 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-2022 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

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-2022 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

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-2022 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
@@ -27,7 +27,6 @@ import com.viaversion.viabackwards.protocol.protocol1_11_1to1_12.packets.EntityP
 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.type.Type;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 import com.viaversion.viaversion.libs.gson.JsonElement;
@@ -40,12 +39,7 @@ 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()));
             }
         });
 
@@ -85,7 +74,7 @@ public class Protocol1_11_1To1_12 extends BackwardsProtocol<ClientboundPackets1_
             user.put(new ClientWorld(user));
         }
 
-        user.addEntityTracker(this.getClass(), new EntityTrackerBase(user, Entity1_12Types.EntityType.PLAYER, true));
+        user.addEntityTracker(this.getClass(), new EntityTrackerBase(user, Entity1_12Types.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-2022 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

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-2022 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

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-2022 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

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-2022 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

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-2022 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

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-2022 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
@@ -25,8 +25,7 @@ import com.viaversion.viaversion.api.minecraft.BlockChangeRecord;
 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.libs.opennbt.tag.builtin.CompoundTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.IntArrayTag;
@@ -37,12 +36,11 @@ import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.ServerboundPacke
 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,40 +48,34 @@ 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);
                 });
             }
         });
@@ -93,39 +85,36 @@ public class BlockItemPackets1_12 extends LegacyBlockItemRewriter<Protocol1_11_1
         registerEntityEquipment(ClientboundPackets1_12.ENTITY_EQUIPMENT, Type.ITEM);
 
         // 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).equalsIgnoreCase("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.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // Input Item
+                            wrapper.write(Type.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // 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.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
-                            }
+                            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
@@ -133,102 +122,82 @@ public class BlockItemPackets1_12 extends LegacyBlockItemRewriter<Protocol1_11_1
                 map(Type.VAR_INT); // 4 - Mode
                 map(Type.ITEM); // 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.ITEM, 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.ITEM, 0);
+                    handleItemToServer(item);
                 });
             }
         });
 
         registerCreativeInvAction(ServerboundPackets1_9_3.CREATIVE_INVENTORY_ACTION, Type.ITEM);
 
-        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);
+            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);
 
-                        handleChunk(chunk);
-                    }
-                });
-            }
+            handleChunk(chunk);
         });
 
-        protocol.registerClientbound(ClientboundPackets1_12.BLOCK_CHANGE, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_12.BLOCK_CHANGE, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.POSITION); // 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() {
+            public void register() {
                 map(Type.POSITION); // 0 - Position
                 map(Type.UNSIGNED_BYTE); // 1 - Action
                 map(Type.NBT); // 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();
                 });
             }
         });
@@ -238,18 +207,15 @@ public class BlockItemPackets1_12 extends LegacyBlockItemRewriter<Protocol1_11_1
                 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();
                     }
                 });
             }

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-2022 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-2022 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
@@ -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>() {
+        @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-2022 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
@@ -28,17 +28,18 @@ import com.viaversion.viaversion.api.minecraft.entities.Entity1_12Types;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_12;
+import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_9;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
-import com.viaversion.viaversion.api.protocol.remapper.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 +47,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
@@ -64,22 +65,19 @@ public class EntityPackets1_12 extends LegacyEntityRewriter<Protocol1_11_1To1_12
                 handler(getObjectRewriter(id -> Entity1_12Types.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<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;
 
-                            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);
                     }
                 });
             }
@@ -88,9 +86,9 @@ public class EntityPackets1_12 extends LegacyEntityRewriter<Protocol1_11_1To1_12
         registerTracker(ClientboundPackets1_12.SPAWN_EXPERIENCE_ORB, Entity1_12Types.EntityType.EXPERIENCE_ORB);
         registerTracker(ClientboundPackets1_12.SPAWN_GLOBAL_ENTITY, Entity1_12Types.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
@@ -115,9 +113,9 @@ public class EntityPackets1_12 extends LegacyEntityRewriter<Protocol1_11_1To1_12
 
         registerTracker(ClientboundPackets1_12.SPAWN_PAINTING, Entity1_12Types.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
@@ -131,9 +129,9 @@ public class EntityPackets1_12 extends LegacyEntityRewriter<Protocol1_11_1To1_12
             }
         });
 
-        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
@@ -142,26 +140,20 @@ public class EntityPackets1_12 extends LegacyEntityRewriter<Protocol1_11_1To1_12
 
                 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 +162,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 -> {
@@ -215,6 +207,12 @@ public class EntityPackets1_12 extends LegacyEntityRewriter<Protocol1_11_1To1_12
         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();
 
+        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);

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-2022 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
@@ -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-2022 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
@@ -23,7 +23,6 @@ import com.viaversion.viabackwards.protocol.protocol1_11to1_11_1.packets.EntityP
 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.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;
@@ -32,7 +31,7 @@ import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.Client
 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);
@@ -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-2022 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
@@ -22,12 +22,12 @@ 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.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
@@ -57,9 +57,9 @@ public class EntityPackets1_11_1 extends LegacyEntityRewriter<Protocol1_11To1_11
         registerTracker(ClientboundPackets1_9_3.SPAWN_EXPERIENCE_ORB, Entity1_11Types.EntityType.EXPERIENCE_ORB);
         registerTracker(ClientboundPackets1_9_3.SPAWN_GLOBAL_ENTITY, Entity1_11Types.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
@@ -86,9 +86,9 @@ public class EntityPackets1_11_1 extends LegacyEntityRewriter<Protocol1_11To1_11
         registerJoinGame(ClientboundPackets1_9_3.JOIN_GAME, Entity1_11Types.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

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-2022 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
@@ -22,16 +22,14 @@ 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;
 
@@ -46,31 +44,28 @@ public class ItemPackets1_11_1 extends LegacyBlockItemRewriter<Protocol1_11To1_1
         registerEntityEquipment(ClientboundPackets1_9_3.ENTITY_EQUIPMENT, Type.ITEM);
 
         // 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).equalsIgnoreCase("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.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // Input Item
+                            wrapper.write(Type.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // 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.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
                         }
                     }
                 });

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-2022 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

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-2022 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
@@ -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-2022 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
@@ -34,21 +34,44 @@ import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.storage.TabComp
 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.data.entity.EntityTrackerBase;
+import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.libs.gson.JsonObject;
+import com.viaversion.viaversion.libs.gson.JsonParser;
+import com.viaversion.viaversion.libs.kyori.adventure.text.Component;
+import com.viaversion.viaversion.libs.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1;
 import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ServerboundPackets1_12_1;
+import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ServerboundPackets1_13;
 import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
+import 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) {
+        @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) {
+        @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,18 +85,9 @@ 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.registerCombatEvent(ClientboundPackets1_13.COMBAT_EVENT);
@@ -119,7 +133,7 @@ public class Protocol1_12_2To1_13 extends BackwardsProtocol<ClientboundPackets1_
     }
 
     @Override
-    public EntityRewriter getEntityRewriter() {
+    public EntityPackets1_13 getEntityRewriter() {
         return entityRewriter;
     }
 
@@ -127,4 +141,39 @@ public class Protocol1_12_2To1_13 extends BackwardsProtocol<ClientboundPackets1_
     public BlockItemPackets1_13 getItemRewriter() {
         return blockItemPackets;
     }
+
+    // Don't override the parent method
+    public TranslatableRewriter<ClientboundPackets1_13> translatableRewriter() {
+        return translatableRewriter;
+    }
+
+    public String jsonToLegacy(String value) {
+        if (value.isEmpty()) {
+            return "";
+        }
+
+        try {
+            return jsonToLegacy(JsonParser.parseString(value));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "";
+    }
+
+    public String jsonToLegacy(@Nullable JsonElement value) {
+        if (value == null || value.isJsonNull()) {
+            return "";
+        }
+
+        translatableToLegacyRewriter.processText(value);
+
+        try {
+            Component component = ChatRewriter.HOVER_GSON_SERIALIZER.deserializeFromTree(value);
+            return LegacyComponentSerializer.legacySection().serialize(component);
+        } catch (Exception e) {
+            ViaBackwards.getPlatform().getLogger().warning("Error converting json text to legacy: " + value);
+            e.printStackTrace();
+        }
+        return "";
+    }
 }

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

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

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-2022 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

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-2022 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
@@ -75,8 +75,8 @@ public class FlowerPotHandler implements BackwardsBlockEntityProvider.BackwardsB
     public CompoundTag transform(UserConnection user, 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.put("Item", new StringTag(item.key()));
+        tag.put("Data", new IntTag(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-2022 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
@@ -22,15 +22,12 @@ import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.providers.Backw
 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.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;
@@ -41,28 +38,24 @@ public class PistonHandler implements BackwardsBlockEntityProvider.BackwardsBloc
 
     public PistonHandler() {
         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);
             }
         }
     }

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-2022 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

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-2022 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

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-2022 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
@@ -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-2022 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

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-2022 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
@@ -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-2022 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
@@ -18,7 +18,6 @@
 package com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.data;
 
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.NamedSoundRewriter;
-
 import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;

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-2022 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

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-2022 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
@@ -23,7 +23,6 @@ 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 {

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2022 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
@@ -31,10 +31,11 @@ import com.viaversion.viaversion.api.minecraft.BlockChangeRecord;
 import com.viaversion.viaversion.api.minecraft.Position;
 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.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.conversion.ConverterRegistry;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.ByteTag;
@@ -45,6 +46,7 @@ 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_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;
@@ -54,7 +56,7 @@ import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.SpawnEggRew
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.types.Chunk1_13Type;
 import com.viaversion.viaversion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1_9_3_4Type;
 import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
-
+import com.viaversion.viaversion.util.Key;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -62,7 +64,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 
-public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewriters.ItemRewriter<Protocol1_12_2To1_13> {
+public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewriters.ItemRewriter<ClientboundPackets1_13, ServerboundPackets1_12_1, Protocol1_12_2To1_13> {
 
     private final Map<String, String> enchantmentMappings = new HashMap<>();
     private final String extraNbtTag;
@@ -88,179 +90,153 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit
 
     @Override
     protected void registerPackets() {
-        protocol.registerClientbound(ClientboundPackets1_13.COOLDOWN, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        int itemId = wrapper.read(Type.VAR_INT);
-                        int oldId = protocol.getMappingData().getItemMappings().get(itemId);
-                        if (oldId != -1) {
-                            Optional<String> eggEntityId = SpawnEggRewriter.getEntityId(oldId);
-                            if (eggEntityId.isPresent()) {
-                                itemId = 383 << 16;
-                            } else {
-                                itemId = (oldId >> 4) << 16 | oldId & 0xF;
-                            }
-                        }
-                        wrapper.write(Type.VAR_INT, itemId);
-                    }
-                });
+        protocol.registerClientbound(ClientboundPackets1_13.COOLDOWN, wrapper -> {
+            int itemId = wrapper.read(Type.VAR_INT);
+            int oldId = protocol.getMappingData().getItemMappings().getNewId(itemId);
+            if (oldId == -1) {
+                wrapper.cancel();
+                return;
             }
+
+            if (SpawnEggRewriter.getEntityId(oldId).isPresent()) {
+                wrapper.write(Type.VAR_INT, 383 << 4);
+                return;
+            }
+
+            wrapper.write(Type.VAR_INT, oldId >> 4);
         });
 
-        protocol.registerClientbound(ClientboundPackets1_13.BLOCK_ACTION, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_13.BLOCK_ACTION, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.POSITION); // Location
                 map(Type.UNSIGNED_BYTE); // Action Id
                 map(Type.UNSIGNED_BYTE); // Action param
                 map(Type.VAR_INT); // Block Id - /!\ NOT BLOCK STATE ID
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        int blockId = wrapper.get(Type.VAR_INT, 0);
+                handler(wrapper -> {
+                    int blockId = wrapper.get(Type.VAR_INT, 0);
 
-                        if (blockId == 73)
-                            blockId = 25;
-                        else if (blockId == 99)
-                            blockId = 33;
-                        else if (blockId == 92)
-                            blockId = 29;
-                        else if (blockId == 142)
-                            blockId = 54;
-                        else if (blockId == 305)
-                            blockId = 146;
-                        else if (blockId == 249)
-                            blockId = 130;
-                        else if (blockId == 257)
-                            blockId = 138;
-                        else if (blockId == 140)
-                            blockId = 52;
-                        else if (blockId == 472)
-                            blockId = 209;
-                        else if (blockId >= 483 && blockId <= 498)
-                            blockId = blockId - 483 + 219;
+                    if (blockId == 73)
+                        blockId = 25;
+                    else if (blockId == 99)
+                        blockId = 33;
+                    else if (blockId == 92)
+                        blockId = 29;
+                    else if (blockId == 142)
+                        blockId = 54;
+                    else if (blockId == 305)
+                        blockId = 146;
+                    else if (blockId == 249)
+                        blockId = 130;
+                    else if (blockId == 257)
+                        blockId = 138;
+                    else if (blockId == 140)
+                        blockId = 52;
+                    else if (blockId == 472)
+                        blockId = 209;
+                    else if (blockId >= 483 && blockId <= 498)
+                        blockId = blockId - 483 + 219;
 
-                        wrapper.set(Type.VAR_INT, 0, blockId);
-                    }
+                    wrapper.set(Type.VAR_INT, 0, blockId);
                 });
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_13.BLOCK_ENTITY_DATA, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_13.BLOCK_ENTITY_DATA, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.POSITION); // 0 - Position
                 map(Type.UNSIGNED_BYTE); // 1 - Action
                 map(Type.NBT); // 2 - NBT Data
 
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        BackwardsBlockEntityProvider provider = Via.getManager().getProviders().get(BackwardsBlockEntityProvider.class);
+                handler(wrapper -> {
+                    BackwardsBlockEntityProvider provider = Via.getManager().getProviders().get(BackwardsBlockEntityProvider.class);
 
-                        // TODO conduit handling
-                        if (wrapper.get(Type.UNSIGNED_BYTE, 0) == 5) {
-                            wrapper.cancel();
-                        }
-
-                        wrapper.set(Type.NBT, 0,
-                                provider.transform(
-                                        wrapper.user(),
-                                        wrapper.get(Type.POSITION, 0),
-                                        wrapper.get(Type.NBT, 0)
-                                ));
+                    // TODO conduit handling
+                    if (wrapper.get(Type.UNSIGNED_BYTE, 0) == 5) {
+                        wrapper.cancel();
                     }
+
+                    wrapper.set(Type.NBT, 0,
+                            provider.transform(
+                                    wrapper.user(),
+                                    wrapper.get(Type.POSITION, 0),
+                                    wrapper.get(Type.NBT, 0)
+                            ));
                 });
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_13.UNLOAD_CHUNK, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        int chunkMinX = wrapper.passthrough(Type.INT) << 4;
-                        int chunkMinZ = wrapper.passthrough(Type.INT) << 4;
-                        int chunkMaxX = chunkMinX + 15;
-                        int chunkMaxZ = chunkMinZ + 15;
-                        BackwardsBlockStorage blockStorage = wrapper.user().get(BackwardsBlockStorage.class);
-                        blockStorage.getBlocks().entrySet().removeIf(entry -> {
-                            Position position = entry.getKey();
-                            return position.getX() >= chunkMinX && position.getZ() >= chunkMinZ
-                                    && position.getX() <= chunkMaxX && position.getZ() <= chunkMaxZ;
-                        });
-                    }
-                });
-            }
+        protocol.registerClientbound(ClientboundPackets1_13.UNLOAD_CHUNK, wrapper -> {
+            int chunkMinX = wrapper.passthrough(Type.INT) << 4;
+            int chunkMinZ = wrapper.passthrough(Type.INT) << 4;
+            int chunkMaxX = chunkMinX + 15;
+            int chunkMaxZ = chunkMinZ + 15;
+            BackwardsBlockStorage blockStorage = wrapper.user().get(BackwardsBlockStorage.class);
+            blockStorage.getBlocks().entrySet().removeIf(entry -> {
+                Position position = entry.getKey();
+                return position.x() >= chunkMinX && position.z() >= chunkMinZ
+                        && position.x() <= chunkMaxX && position.z() <= chunkMaxZ;
+            });
         });
 
         // Block Change
-        protocol.registerClientbound(ClientboundPackets1_13.BLOCK_CHANGE, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_13.BLOCK_CHANGE, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.POSITION); // 0 - Position
 
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        int blockState = wrapper.read(Type.VAR_INT);
-                        Position position = wrapper.get(Type.POSITION, 0);
+                handler(wrapper -> {
+                    int blockState = wrapper.read(Type.VAR_INT);
+                    Position position = wrapper.get(Type.POSITION, 0);
 
-                        // Store blocks
-                        BackwardsBlockStorage storage = wrapper.user().get(BackwardsBlockStorage.class);
-                        storage.checkAndStore(position, blockState);
+                    // Store blocks
+                    BackwardsBlockStorage storage = wrapper.user().get(BackwardsBlockStorage.class);
+                    storage.checkAndStore(position, blockState);
 
-                        wrapper.write(Type.VAR_INT, protocol.getMappingData().getNewBlockStateId(blockState));
+                    wrapper.write(Type.VAR_INT, protocol.getMappingData().getNewBlockStateId(blockState));
 
-                        // Flower pot special treatment
-                        flowerPotSpecialTreatment(wrapper.user(), blockState, position);
-                    }
+                    // Flower pot special treatment
+                    flowerPotSpecialTreatment(wrapper.user(), blockState, position);
                 });
             }
         });
 
         // Multi Block Change
-        protocol.registerClientbound(ClientboundPackets1_13.MULTI_BLOCK_CHANGE, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_13.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 {
-                        BackwardsBlockStorage storage = wrapper.user().get(BackwardsBlockStorage.class);
+                handler(wrapper -> {
+                    BackwardsBlockStorage storage = wrapper.user().get(BackwardsBlockStorage.class);
 
-                        for (BlockChangeRecord record : wrapper.get(Type.BLOCK_CHANGE_RECORD_ARRAY, 0)) {
-                            int chunkX = wrapper.get(Type.INT, 0);
-                            int chunkZ = wrapper.get(Type.INT, 1);
-                            int block = record.getBlockId();
-                            Position position = new Position(
-                                    record.getSectionX() + (chunkX * 16),
-                                    record.getY(),
-                                    record.getSectionZ() + (chunkZ * 16));
+                    for (BlockChangeRecord record : wrapper.get(Type.BLOCK_CHANGE_RECORD_ARRAY, 0)) {
+                        int chunkX = wrapper.get(Type.INT, 0);
+                        int chunkZ = wrapper.get(Type.INT, 1);
+                        int block = record.getBlockId();
+                        Position position = new Position(
+                                record.getSectionX() + (chunkX * 16),
+                                record.getY(),
+                                record.getSectionZ() + (chunkZ * 16));
 
-                            // Store if needed
-                            storage.checkAndStore(position, block);
+                        // Store if needed
+                        storage.checkAndStore(position, block);
 
-                            // Flower pot special treatment
-                            flowerPotSpecialTreatment(wrapper.user(), block, position);
+                        // Flower pot special treatment
+                        flowerPotSpecialTreatment(wrapper.user(), block, position);
 
-                            // Change to old id
-                            record.setBlockId(protocol.getMappingData().getNewBlockStateId(block));
-                        }
+                        // Change to old id
+                        record.setBlockId(protocol.getMappingData().getNewBlockStateId(block));
                     }
                 });
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_13.WINDOW_ITEMS, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_13.WINDOW_ITEMS, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.UNSIGNED_BYTE);
                 map(Type.FLAT_ITEM_ARRAY, Type.ITEM_ARRAY);
 
@@ -268,9 +244,9 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_13.SET_SLOT, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_13.SET_SLOT, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.UNSIGNED_BYTE);
                 map(Type.SHORT);
                 map(Type.FLAT_ITEM, Type.ITEM);
@@ -279,183 +255,170 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_13.CHUNK_DATA, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                handler(wrapper -> {
-                    ClientWorld clientWorld = wrapper.user().get(ClientWorld.class);
+        protocol.registerClientbound(ClientboundPackets1_13.CHUNK_DATA, wrapper -> {
+            ClientWorld clientWorld = wrapper.user().get(ClientWorld.class);
 
-                    Chunk1_9_3_4Type type_old = new Chunk1_9_3_4Type(clientWorld);
-                    Chunk1_13Type type = new Chunk1_13Type(clientWorld);
-                    Chunk chunk = wrapper.read(type);
+            Chunk1_9_3_4Type type_old = new Chunk1_9_3_4Type(clientWorld);
+            Chunk1_13Type type = new Chunk1_13Type(clientWorld);
+            Chunk chunk = wrapper.read(type);
 
-                    // Handle Block Entities before block rewrite
-                    BackwardsBlockEntityProvider provider = Via.getManager().getProviders().get(BackwardsBlockEntityProvider.class);
-                    BackwardsBlockStorage storage = wrapper.user().get(BackwardsBlockStorage.class);
-                    for (CompoundTag tag : chunk.getBlockEntities()) {
-                        Tag idTag = tag.get("id");
-                        if (idTag == null) continue;
+            // Handle Block Entities before block rewrite
+            BackwardsBlockEntityProvider provider = Via.getManager().getProviders().get(BackwardsBlockEntityProvider.class);
+            BackwardsBlockStorage storage = wrapper.user().get(BackwardsBlockStorage.class);
+            for (CompoundTag tag : chunk.getBlockEntities()) {
+                Tag idTag = tag.get("id");
+                if (idTag == null) continue;
 
-                        String id = (String) idTag.getValue();
+                String id = (String) idTag.getValue();
 
-                        // Ignore if we don't handle it
-                        if (!provider.isHandled(id)) continue;
+                // Ignore if we don't handle it
+                if (!provider.isHandled(id)) continue;
 
-                        int sectionIndex = ((NumberTag) tag.get("y")).asInt() >> 4;
-                        if (sectionIndex < 0 || sectionIndex > 15) {
-                            // 1.17 chunks
-                            continue;
-                        }
+                int sectionIndex = ((NumberTag) tag.get("y")).asInt() >> 4;
+                if (sectionIndex < 0 || sectionIndex > 15) {
+                    // 1.17 chunks
+                    continue;
+                }
 
-                        ChunkSection section = chunk.getSections()[sectionIndex];
+                ChunkSection section = chunk.getSections()[sectionIndex];
 
-                        int x = ((NumberTag) tag.get("x")).asInt();
-                        int y = ((NumberTag) tag.get("y")).asInt();
-                        int z = ((NumberTag) tag.get("z")).asInt();
-                        Position position = new Position(x, (short) y, z);
+                int x = ((NumberTag) tag.get("x")).asInt();
+                int y = ((NumberTag) tag.get("y")).asInt();
+                int z = ((NumberTag) tag.get("z")).asInt();
+                Position position = new Position(x, (short) y, z);
 
-                        int block = section.getFlatBlock(x & 0xF, y & 0xF, z & 0xF);
-                        storage.checkAndStore(position, block);
+                int block = section.palette(PaletteType.BLOCKS).idAt(x & 0xF, y & 0xF, z & 0xF);
+                storage.checkAndStore(position, block);
 
-                        provider.transform(wrapper.user(), position, tag);
-                    }
-
-                    // Rewrite new blocks to old blocks
-                    for (int i = 0; i < chunk.getSections().length; i++) {
-                        ChunkSection section = chunk.getSections()[i];
-                        if (section == null) {
-                            continue;
-                        }
-
-                        // Flower pots require a special treatment, they are no longer block entities :(
-                        for (int y = 0; y < 16; y++) {
-                            for (int z = 0; z < 16; z++) {
-                                for (int x = 0; x < 16; x++) {
-                                    int block = section.getFlatBlock(x, y, z);
-
-                                    // Check if the block is a flower
-                                    if (FlowerPotHandler.isFlowah(block)) {
-                                        Position pos = new Position(
-                                                (x + (chunk.getX() << 4)),
-                                                (short) (y + (i << 4)),
-                                                (z + (chunk.getZ() << 4))
-                                        );
-                                        // Store block
-                                        storage.checkAndStore(pos, block);
-
-                                        CompoundTag nbt = provider.transform(wrapper.user(), pos, "minecraft:flower_pot");
-
-                                        chunk.getBlockEntities().add(nbt);
-                                    }
-                                }
-                            }
-                        }
-
-                        for (int p = 0; p < section.getPaletteSize(); p++) {
-                            int old = section.getPaletteEntry(p);
-                            if (old != 0) {
-                                int oldId = protocol.getMappingData().getNewBlockStateId(old);
-                                section.setPaletteEntry(p, oldId);
-                            }
-                        }
-                    }
-
-
-                    if (chunk.isBiomeData()) {
-                        for (int i = 0; i < 256; i++) {
-                            int biome = chunk.getBiomeData()[i];
-                            int newId = -1;
-                            switch (biome) {
-                                case 40: // end biomes
-                                case 41:
-                                case 42:
-                                case 43:
-                                    newId = 9;
-                                    break;
-                                case 47: // deep ocean biomes
-                                case 48:
-                                case 49:
-                                    newId = 24;
-                                    break;
-                                case 50: // deep frozen... let's just pick the frozen variant
-                                    newId = 10;
-                                    break;
-                                case 44: // the other new ocean biomes
-                                case 45:
-                                case 46:
-                                    newId = 0;
-                                    break;
-                            }
-
-                            if (newId != -1) {
-                                chunk.getBiomeData()[i] = newId;
-                            }
-                        }
-                    }
-
-                    wrapper.write(type_old, chunk);
-                });
+                provider.transform(wrapper.user(), position, tag);
             }
+
+            // Rewrite new blocks to old blocks
+            for (int i = 0; i < chunk.getSections().length; i++) {
+                ChunkSection section = chunk.getSections()[i];
+                if (section == null) {
+                    continue;
+                }
+
+                DataPalette palette = section.palette(PaletteType.BLOCKS);
+                // Flower pots require a special treatment, they are no longer block entities :(
+                for (int y = 0; y < 16; y++) {
+                    for (int z = 0; z < 16; z++) {
+                        for (int x = 0; x < 16; x++) {
+                            int block = palette.idAt(x, y, z);
+
+                            // Check if the block is a flower
+                            if (FlowerPotHandler.isFlowah(block)) {
+                                Position pos = new Position(
+                                        (x + (chunk.getX() << 4)),
+                                        (short) (y + (i << 4)),
+                                        (z + (chunk.getZ() << 4))
+                                );
+                                // Store block
+                                storage.checkAndStore(pos, block);
+
+                                CompoundTag nbt = provider.transform(wrapper.user(), pos, "minecraft:flower_pot");
+
+                                chunk.getBlockEntities().add(nbt);
+                            }
+                        }
+                    }
+                }
+
+                for (int j = 0; j < palette.size(); j++) {
+                    int mappedBlockStateId = protocol.getMappingData().getNewBlockStateId(palette.idByIndex(j));
+                    palette.setIdByIndex(j, mappedBlockStateId);
+                }
+            }
+
+
+            if (chunk.isBiomeData()) {
+                for (int i = 0; i < 256; i++) {
+                    int biome = chunk.getBiomeData()[i];
+                    int newId = -1;
+                    switch (biome) {
+                        case 40: // end biomes
+                        case 41:
+                        case 42:
+                        case 43:
+                            newId = 9;
+                            break;
+                        case 47: // deep ocean biomes
+                        case 48:
+                        case 49:
+                            newId = 24;
+                            break;
+                        case 50: // deep frozen... let's just pick the frozen variant
+                            newId = 10;
+                            break;
+                        case 44: // the other new ocean biomes
+                        case 45:
+                        case 46:
+                            newId = 0;
+                            break;
+                    }
+
+                    if (newId != -1) {
+                        chunk.getBiomeData()[i] = newId;
+                    }
+                }
+            }
+
+            wrapper.write(type_old, chunk);
         });
 
-        protocol.registerClientbound(ClientboundPackets1_13.EFFECT, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_13.EFFECT, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.INT); // Effect Id
                 map(Type.POSITION); // Location
                 map(Type.INT); // Data
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        int id = wrapper.get(Type.INT, 0);
-                        int data = wrapper.get(Type.INT, 1);
-                        if (id == 1010) { // Play record
-                            wrapper.set(Type.INT, 1, protocol.getMappingData().getItemMappings().get(data) >> 4);
-                        } else if (id == 2001) { // Block break + block break sound
-                            data = protocol.getMappingData().getNewBlockStateId(data);
-                            int blockId = data >> 4;
-                            int blockData = data & 0xF;
-                            wrapper.set(Type.INT, 1, (blockId & 0xFFF) | (blockData << 12));
-                        }
+                handler(wrapper -> {
+                    int id = wrapper.get(Type.INT, 0);
+                    int data = wrapper.get(Type.INT, 1);
+                    if (id == 1010) { // Play record
+                        wrapper.set(Type.INT, 1, protocol.getMappingData().getItemMappings().getNewId(data) >> 4);
+                    } else if (id == 2001) { // Block break + block break sound
+                        data = protocol.getMappingData().getNewBlockStateId(data);
+                        int blockId = data >> 4;
+                        int blockData = data & 0xF;
+                        wrapper.set(Type.INT, 1, (blockId & 0xFFF) | (blockData << 12));
                     }
                 });
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_13.MAP_DATA, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_13.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 iconCount = wrapper.passthrough(Type.VAR_INT);
-                        for (int i = 0; i < iconCount; i++) {
-                            int type = wrapper.read(Type.VAR_INT);
-                            byte x = wrapper.read(Type.BYTE);
-                            byte z = wrapper.read(Type.BYTE);
-                            byte direction = wrapper.read(Type.BYTE);
-                            if (wrapper.read(Type.BOOLEAN)) {
-                                wrapper.read(Type.COMPONENT);
-                            }
-                            if (type > 9) {
-                                wrapper.set(Type.VAR_INT, 1, wrapper.get(Type.VAR_INT, 1) - 1);
-                                continue;
-                            }
-                            wrapper.write(Type.BYTE, (byte) ((type << 4) | (direction & 0x0F)));
-                            wrapper.write(Type.BYTE, x);
-                            wrapper.write(Type.BYTE, z);
+                handler(wrapper -> {
+                    int iconCount = wrapper.passthrough(Type.VAR_INT);
+                    for (int i = 0; i < iconCount; i++) {
+                        int type = wrapper.read(Type.VAR_INT);
+                        byte x = wrapper.read(Type.BYTE);
+                        byte z = wrapper.read(Type.BYTE);
+                        byte direction = wrapper.read(Type.BYTE);
+                        if (wrapper.read(Type.BOOLEAN)) {
+                            wrapper.read(Type.COMPONENT);
                         }
+                        if (type > 9) {
+                            wrapper.set(Type.VAR_INT, 1, wrapper.get(Type.VAR_INT, 1) - 1);
+                            continue;
+                        }
+                        wrapper.write(Type.BYTE, (byte) ((type << 4) | (direction & 0x0F)));
+                        wrapper.write(Type.BYTE, x);
+                        wrapper.write(Type.BYTE, z);
                     }
                 });
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_13.ENTITY_EQUIPMENT, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_13.ENTITY_EQUIPMENT, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT);
                 map(Type.VAR_INT);
                 map(Type.FLAT_ITEM, Type.ITEM);
@@ -464,9 +427,9 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_13.WINDOW_PROPERTY, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_13.WINDOW_PROPERTY, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.UNSIGNED_BYTE); // Window Id
                 map(Type.SHORT); // Property
                 map(Type.SHORT); // Value
@@ -482,9 +445,9 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit
         });
 
 
-        protocol.registerServerbound(ServerboundPackets1_12_1.CREATIVE_INVENTORY_ACTION, new PacketRemapper() {
+        protocol.registerServerbound(ServerboundPackets1_12_1.CREATIVE_INVENTORY_ACTION, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.SHORT);
                 map(Type.ITEM, Type.FLAT_ITEM);
 
@@ -492,9 +455,9 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit
             }
         });
 
-        protocol.registerServerbound(ServerboundPackets1_12_1.CLICK_WINDOW, new PacketRemapper() {
+        protocol.registerServerbound(ServerboundPackets1_12_1.CLICK_WINDOW, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.UNSIGNED_BYTE);
                 map(Type.SHORT);
                 map(Type.BYTE);
@@ -587,7 +550,7 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit
                 StringTag name = display.get("Name");
                 if (name != null) {
                     display.put(extraNbtTag + "|Name", new StringTag(name.getValue()));
-                    name.setValue(ChatRewriter.jsonToLegacyText(name.getValue()));
+                    name.setValue(protocol.jsonToLegacy(name.getValue()));
                 }
             }
 
@@ -654,10 +617,17 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit
         for (Tag enchantmentEntryTag : enchantments.clone()) {
             CompoundTag enchantmentEntry = (CompoundTag) enchantmentEntryTag;
             Tag idTag = enchantmentEntry.get("id");
-            if (!(idTag instanceof StringTag)) continue;
+            if (!(idTag instanceof StringTag)) {
+                continue;
+            }
 
             String newId = (String) idTag.getValue();
-            int levelValue = ((NumberTag) enchantmentEntry.get("lvl")).asInt();
+            NumberTag levelTag = enchantmentEntry.get("lvl");
+            if (levelTag == null) {
+                continue;
+            }
+
+            int levelValue = levelTag.asInt();
             short level = levelValue < Short.MAX_VALUE ? (short) levelValue : Short.MAX_VALUE;
 
             String mappedEnchantmentId = enchantmentMappings.get(newId);
@@ -665,7 +635,7 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit
                 lore.add(new StringTag(mappedEnchantmentId + " " + EnchantmentRewriter.getRomanNumber(level)));
                 noMapped.add(enchantmentEntry);
             } else if (!newId.isEmpty()) {
-                Short oldId = Protocol1_13To1_12_2.MAPPINGS.getOldEnchantmentsIds().inverse().get(newId);
+                Short oldId = Protocol1_13To1_12_2.MAPPINGS.getOldEnchantmentsIds().inverse().get(Key.stripMinecraftNamespace(newId));
                 if (oldId == null) {
                     if (!newId.startsWith("viaversion:legacy/")) {
                         // Custom enchant (?)
@@ -835,7 +805,7 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit
         item.setIdentifier(identifier);
 
         int newId = -1;
-        if (!protocol.getMappingData().getItemMappings().inverse().containsKey(rawId)) {
+        if (protocol.getMappingData().getItemMappings().inverse().getNewId(rawId) == -1) {
             if (!isDamageable(item.identifier()) && item.identifier() != 358) { // Map
                 if (tag == null) item.setTag(tag = new CompoundTag());
                 tag.put(extraNbtTag, new IntTag(originalId)); // Data will be lost, saving original id
@@ -845,7 +815,7 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit
                 newId = 362; // directly set the new id -> base/colorless shulker box
             } else if (item.identifier() == 31 && item.data() == 0) { // Shrub was removed
                 rawId = 32 << 4; // Dead Bush
-            } else if (protocol.getMappingData().getItemMappings().inverse().containsKey(rawId & ~0xF)) {
+            } else if (protocol.getMappingData().getItemMappings().inverse().getNewId(rawId & ~0xF) != -1) {
                 rawId &= ~0xF; // Remove data
             } else {
                 if (!Via.getConfig().isSuppressConversionWarnings() || Via.getManager().isDebug()) {
@@ -856,7 +826,7 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit
         }
 
         if (newId == -1) {
-            newId = protocol.getMappingData().getItemMappings().inverse().get(rawId);
+            newId = protocol.getMappingData().getItemMappings().inverse().getNewId(rawId);
         }
 
         item.setIdentifier(newId);
@@ -995,19 +965,19 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit
             CompoundTag nbt = beProvider.transform(user, position, "minecraft:flower_pot");
 
             // Remove the flowerpot
-            PacketWrapper blockUpdateRemove = PacketWrapper.create(0x0B, null, user);
+            PacketWrapper blockUpdateRemove = PacketWrapper.create(ClientboundPackets1_12_1.BLOCK_CHANGE, user);
             blockUpdateRemove.write(Type.POSITION, position);
             blockUpdateRemove.write(Type.VAR_INT, 0);
             blockUpdateRemove.scheduleSend(Protocol1_12_2To1_13.class);
 
             // Create the flowerpot
-            PacketWrapper blockCreate = PacketWrapper.create(0x0B, null, user);
+            PacketWrapper blockCreate = PacketWrapper.create(ClientboundPackets1_12_1.BLOCK_CHANGE, user);
             blockCreate.write(Type.POSITION, position);
             blockCreate.write(Type.VAR_INT, Protocol1_12_2To1_13.MAPPINGS.getNewBlockStateId(blockState));
             blockCreate.scheduleSend(Protocol1_12_2To1_13.class);
 
             // Send a block entity update
-            PacketWrapper wrapper = PacketWrapper.create(0x09, null, user);
+            PacketWrapper wrapper = PacketWrapper.create(ClientboundPackets1_12_1.BLOCK_ENTITY_DATA, user);
             wrapper.write(Type.POSITION, position);
             wrapper.write(Type.UNSIGNED_BYTE, (short) 5);
             wrapper.write(Type.NBT, nbt);

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-2022 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
@@ -32,20 +32,18 @@ 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 +51,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,35 +87,32 @@ 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<Entity1_13Types.ObjectType> optionalType = Entity1_13Types.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());
+                    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());
                     }
                 });
             }
@@ -134,9 +121,9 @@ public class EntityPackets1_13 extends LegacyEntityRewriter<Protocol1_12_2To1_13
         registerTracker(ClientboundPackets1_13.SPAWN_EXPERIENCE_ORB, Entity1_13Types.EntityType.EXPERIENCE_ORB);
         registerTracker(ClientboundPackets1_13.SPAWN_GLOBAL_ENTITY, Entity1_13Types.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 +138,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 = Entity1_13Types.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 +158,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);
@@ -190,29 +174,26 @@ public class EntityPackets1_13 extends LegacyEntityRewriter<Protocol1_12_2To1_13
             }
         });
 
-        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(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);
 
-        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));
@@ -224,48 +205,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);
@@ -304,37 +277,22 @@ public class EntityPackets1_13 extends LegacyEntityRewriter<Protocol1_12_2To1_13
         // 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));
             }
         });
 
@@ -408,4 +366,9 @@ public class EntityPackets1_13 extends LegacyEntityRewriter<Protocol1_12_2To1_13
     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-2022 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
@@ -19,7 +19,7 @@ package com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.packets;
 
 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.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;
@@ -34,55 +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() {
-                handler(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);
-                    }
-                });
+        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-2022 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
@@ -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,7 +25,6 @@ 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;
@@ -34,7 +32,6 @@ 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.libs.opennbt.tag.builtin.Tag;
-
 import java.util.HashMap;
 import java.util.Map;
 
@@ -76,18 +73,12 @@ public class BackwardsBlockEntityProvider implements Provider {
         String id = (String) 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;
         }
 
@@ -104,9 +95,9 @@ 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.put("x", new IntTag(Math.toIntExact(position.x())));
+        tag.put("y", new IntTag(Math.toIntExact(position.y())));
+        tag.put("z", new IntTag(Math.toIntExact(position.z())));
 
         return this.transform(user, position, 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-2022 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
@@ -22,7 +22,6 @@ 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;
 

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-2022 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

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2022 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
@@ -18,7 +18,6 @@
 package com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.storage;
 
 import com.viaversion.viaversion.api.connection.StorableObject;
-
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12to1_12_1/Protocol1_12To1_12_1.java

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

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2022 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
@@ -22,9 +22,7 @@ import com.viaversion.viabackwards.protocol.protocol1_13_1to1_13_2.packets.Entit
 import com.viaversion.viabackwards.protocol.protocol1_13_1to1_13_2.packets.InventoryPackets1_13_2;
 import com.viaversion.viabackwards.protocol.protocol1_13_1to1_13_2.packets.WorldPackets1_13_2;
 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.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ServerboundPackets1_13;
@@ -41,52 +39,44 @@ public class Protocol1_13_1To1_13_2 extends BackwardsProtocol<ClientboundPackets
         WorldPackets1_13_2.register(this);
         EntityPackets1_13_2.register(this);
 
-        registerServerbound(ServerboundPackets1_13.EDIT_BOOK, new PacketRemapper() {
+        registerServerbound(ServerboundPackets1_13.EDIT_BOOK, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.FLAT_ITEM, Type.FLAT_VAR_INT_ITEM);
             }
         });
 
-        registerClientbound(ClientboundPackets1_13.ADVANCEMENTS, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        wrapper.passthrough(Type.BOOLEAN); // Reset/clear
-                        int size = wrapper.passthrough(Type.VAR_INT); // Mapping size
+        registerClientbound(ClientboundPackets1_13.ADVANCEMENTS, wrapper -> {
+            wrapper.passthrough(Type.BOOLEAN); // Reset/clear
+            int size = wrapper.passthrough(Type.VAR_INT); // Mapping size
 
-                        for (int i = 0; i < size; i++) {
-                            wrapper.passthrough(Type.STRING); // Identifier
+            for (int i = 0; i < size; i++) {
+                wrapper.passthrough(Type.STRING); // Identifier
 
-                            // Parent
-                            if (wrapper.passthrough(Type.BOOLEAN))
-                                wrapper.passthrough(Type.STRING);
+                // Parent
+                if (wrapper.passthrough(Type.BOOLEAN))
+                    wrapper.passthrough(Type.STRING);
 
-                            // Display data
-                            if (wrapper.passthrough(Type.BOOLEAN)) {
-                                wrapper.passthrough(Type.COMPONENT); // Title
-                                wrapper.passthrough(Type.COMPONENT); // Description
-                                Item icon = wrapper.read(Type.FLAT_VAR_INT_ITEM);
-                                wrapper.write(Type.FLAT_ITEM, 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
-                            }
+                // Display data
+                if (wrapper.passthrough(Type.BOOLEAN)) {
+                    wrapper.passthrough(Type.COMPONENT); // Title
+                    wrapper.passthrough(Type.COMPONENT); // Description
+                    Item icon = wrapper.read(Type.FLAT_VAR_INT_ITEM);
+                    wrapper.write(Type.FLAT_ITEM, icon);
+                    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
+                wrapper.passthrough(Type.STRING_ARRAY); // Criteria
 
-                            int arrayLength = wrapper.passthrough(Type.VAR_INT);
-                            for (int array = 0; array < arrayLength; array++) {
-                                wrapper.passthrough(Type.STRING_ARRAY); // String array
-                            }
-                        }
-                    }
-                });
+                int arrayLength = wrapper.passthrough(Type.VAR_INT);
+                for (int array = 0; array < arrayLength; array++) {
+                    wrapper.passthrough(Type.STRING_ARRAY); // String array
+                }
             }
         });
     }

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2022 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
@@ -19,9 +19,7 @@ package com.viaversion.viabackwards.protocol.protocol1_13_1to1_13_2.packets;
 
 import com.viaversion.viabackwards.protocol.protocol1_13_1to1_13_2.Protocol1_13_1To1_13_2;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
-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_13;
 import com.viaversion.viaversion.api.type.types.version.Types1_13_2;
@@ -31,9 +29,9 @@ public class EntityPackets1_13_2 {
 
 
     public static void register(Protocol1_13_1To1_13_2 protocol) {
-        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); // 0 - Entity ID
                 map(Type.UUID); // 1 - Entity UUID
                 map(Type.VAR_INT); // 2 - Entity Type
@@ -48,20 +46,17 @@ public class EntityPackets1_13_2 {
                 map(Type.SHORT); // 11 - Velocity Z
                 map(Types1_13_2.METADATA_LIST, Types1_13.METADATA_LIST); // 12 - Metadata
 
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        for (Metadata metadata : wrapper.get(Types1_13.METADATA_LIST, 0)) {
-                            metadata.setMetaType(Types1_13.META_TYPES.byId(metadata.metaType().typeId()));
-                        }
+                handler(wrapper -> {
+                    for (Metadata metadata : wrapper.get(Types1_13.METADATA_LIST, 0)) {
+                        metadata.setMetaType(Types1_13.META_TYPES.byId(metadata.metaType().typeId()));
                     }
                 });
             }
         });
 
-        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); // 0 - Entity ID
                 map(Type.UUID); // 1 - Player UUID
                 map(Type.DOUBLE); // 2 - X
@@ -71,29 +66,23 @@ public class EntityPackets1_13_2 {
                 map(Type.BYTE); // 6 - Pitch
                 map(Types1_13_2.METADATA_LIST, Types1_13.METADATA_LIST); // 7 - Metadata
 
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        for (Metadata metadata : wrapper.get(Types1_13.METADATA_LIST, 0)) {
-                            metadata.setMetaType(Types1_13.META_TYPES.byId(metadata.metaType().typeId()));
-                        }
+                handler(wrapper -> {
+                    for (Metadata metadata : wrapper.get(Types1_13.METADATA_LIST, 0)) {
+                        metadata.setMetaType(Types1_13.META_TYPES.byId(metadata.metaType().typeId()));
                     }
                 });
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_13.ENTITY_METADATA, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_13.ENTITY_METADATA, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT); // 0 - Entity ID
                 map(Types1_13_2.METADATA_LIST, Types1_13.METADATA_LIST); // 1 - Metadata list
 
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        for (Metadata metadata : wrapper.get(Types1_13.METADATA_LIST, 0)) {
-                            metadata.setMetaType(Types1_13.META_TYPES.byId(metadata.metaType().typeId()));
-                        }
+                handler(wrapper -> {
+                    for (Metadata metadata : wrapper.get(Types1_13.METADATA_LIST, 0)) {
+                        metadata.setMetaType(Types1_13.META_TYPES.byId(metadata.metaType().typeId()));
                     }
                 });
             }

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2022 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
@@ -18,9 +18,7 @@
 package com.viaversion.viabackwards.protocol.protocol1_13_1to1_13_2.packets;
 
 import com.viaversion.viabackwards.protocol.protocol1_13_1to1_13_2.Protocol1_13_1To1_13_2;
-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_13to1_12_2.ClientboundPackets1_13;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ServerboundPackets1_13;
@@ -28,107 +26,96 @@ import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ServerboundPacke
 public class InventoryPackets1_13_2 {
 
     public static void register(Protocol1_13_1To1_13_2 protocol) {
-        protocol.registerClientbound(ClientboundPackets1_13.SET_SLOT, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_13.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.FLAT_VAR_INT_ITEM, Type.FLAT_ITEM); // 2 - Slot Value
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_13.WINDOW_ITEMS, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_13.WINDOW_ITEMS, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.UNSIGNED_BYTE); // 0 - Window ID
                 map(Type.FLAT_VAR_INT_ITEM_ARRAY, Type.FLAT_ITEM_ARRAY); // 1 - Window Values
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_13.PLUGIN_MESSAGE, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_13.PLUGIN_MESSAGE, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.STRING); // Channel
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        String channel = wrapper.get(Type.STRING, 0);
-                        if (channel.equals("minecraft:trader_list") || channel.equals("trader_list")) {
-                            wrapper.passthrough(Type.INT); // Passthrough Window ID
+                handler(wrapper -> {
+                    String channel = wrapper.get(Type.STRING, 0);
+                    if (channel.equals("minecraft:trader_list") || channel.equals("trader_list")) {
+                        wrapper.passthrough(Type.INT); // Passthrough Window ID
 
-                            int size = wrapper.passthrough(Type.UNSIGNED_BYTE);
-                            for (int i = 0; i < size; i++) {
-                                // Input Item
+                        int size = wrapper.passthrough(Type.UNSIGNED_BYTE);
+                        for (int i = 0; i < size; i++) {
+                            // Input Item
+                            wrapper.write(Type.FLAT_ITEM, wrapper.read(Type.FLAT_VAR_INT_ITEM));
+                            // Output Item
+                            wrapper.write(Type.FLAT_ITEM, wrapper.read(Type.FLAT_VAR_INT_ITEM));
+
+                            boolean secondItem = wrapper.passthrough(Type.BOOLEAN); // Has second item
+                            if (secondItem) {
                                 wrapper.write(Type.FLAT_ITEM, wrapper.read(Type.FLAT_VAR_INT_ITEM));
-                                // Output Item
-                                wrapper.write(Type.FLAT_ITEM, wrapper.read(Type.FLAT_VAR_INT_ITEM));
-
-                                boolean secondItem = wrapper.passthrough(Type.BOOLEAN); // Has second item
-                                if (secondItem) {
-                                    wrapper.write(Type.FLAT_ITEM, wrapper.read(Type.FLAT_VAR_INT_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.registerClientbound(ClientboundPackets1_13.ENTITY_EQUIPMENT, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_13.ENTITY_EQUIPMENT, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT); // 0 - Entity ID
                 map(Type.VAR_INT); // 1 - Slot ID
                 map(Type.FLAT_VAR_INT_ITEM, Type.FLAT_ITEM); // 2 - Item
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_13.DECLARE_RECIPES, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        int recipesNo = wrapper.passthrough(Type.VAR_INT);
-                        for (int i = 0; i < recipesNo; i++) {
-                            wrapper.passthrough(Type.STRING); // Id
-                            String type = wrapper.passthrough(Type.STRING);
-                            if (type.equals("crafting_shapeless")) {
-                                wrapper.passthrough(Type.STRING); // Group
-                                int ingredientsNo = wrapper.passthrough(Type.VAR_INT);
-                                for (int i1 = 0; i1 < ingredientsNo; i1++) {
-                                    wrapper.write(Type.FLAT_ITEM_ARRAY_VAR_INT, wrapper.read(Type.FLAT_VAR_INT_ITEM_ARRAY_VAR_INT));
-                                }
-                                wrapper.write(Type.FLAT_ITEM, wrapper.read(Type.FLAT_VAR_INT_ITEM));
-                            } else if (type.equals("crafting_shaped")) {
-                                int ingredientsNo = wrapper.passthrough(Type.VAR_INT) * wrapper.passthrough(Type.VAR_INT);
-                                wrapper.passthrough(Type.STRING); // Group
-                                for (int i1 = 0; i1 < ingredientsNo; i1++) {
-                                    wrapper.write(Type.FLAT_ITEM_ARRAY_VAR_INT, wrapper.read(Type.FLAT_VAR_INT_ITEM_ARRAY_VAR_INT));
-                                }
-                                wrapper.write(Type.FLAT_ITEM, wrapper.read(Type.FLAT_VAR_INT_ITEM));
-                            } else if (type.equals("smelting")) {
-                                wrapper.passthrough(Type.STRING); // Group
-                                // Ingredient start
-                                wrapper.write(Type.FLAT_ITEM_ARRAY_VAR_INT, wrapper.read(Type.FLAT_VAR_INT_ITEM_ARRAY_VAR_INT));
-                                // Ingredient end
-                                wrapper.write(Type.FLAT_ITEM, wrapper.read(Type.FLAT_VAR_INT_ITEM));
-                                wrapper.passthrough(Type.FLOAT); // EXP
-                                wrapper.passthrough(Type.VAR_INT); // Cooking time
-                            }
-                        }
+        protocol.registerClientbound(ClientboundPackets1_13.DECLARE_RECIPES, wrapper -> {
+            int recipesNo = wrapper.passthrough(Type.VAR_INT);
+            for (int i = 0; i < recipesNo; i++) {
+                wrapper.passthrough(Type.STRING); // Id
+                String type = wrapper.passthrough(Type.STRING);
+                if (type.equals("crafting_shapeless")) {
+                    wrapper.passthrough(Type.STRING); // Group
+                    int ingredientsNo = wrapper.passthrough(Type.VAR_INT);
+                    for (int i1 = 0; i1 < ingredientsNo; i1++) {
+                        wrapper.write(Type.FLAT_ITEM_ARRAY_VAR_INT, wrapper.read(Type.FLAT_VAR_INT_ITEM_ARRAY_VAR_INT));
                     }
-                });
+                    wrapper.write(Type.FLAT_ITEM, wrapper.read(Type.FLAT_VAR_INT_ITEM));
+                } else if (type.equals("crafting_shaped")) {
+                    int ingredientsNo = wrapper.passthrough(Type.VAR_INT) * wrapper.passthrough(Type.VAR_INT);
+                    wrapper.passthrough(Type.STRING); // Group
+                    for (int i1 = 0; i1 < ingredientsNo; i1++) {
+                        wrapper.write(Type.FLAT_ITEM_ARRAY_VAR_INT, wrapper.read(Type.FLAT_VAR_INT_ITEM_ARRAY_VAR_INT));
+                    }
+                    wrapper.write(Type.FLAT_ITEM, wrapper.read(Type.FLAT_VAR_INT_ITEM));
+                } else if (type.equals("smelting")) {
+                    wrapper.passthrough(Type.STRING); // Group
+                    // Ingredient start
+                    wrapper.write(Type.FLAT_ITEM_ARRAY_VAR_INT, wrapper.read(Type.FLAT_VAR_INT_ITEM_ARRAY_VAR_INT));
+                    // Ingredient end
+                    wrapper.write(Type.FLAT_ITEM, wrapper.read(Type.FLAT_VAR_INT_ITEM));
+                    wrapper.passthrough(Type.FLOAT); // EXP
+                    wrapper.passthrough(Type.VAR_INT); // Cooking time
+                }
             }
         });
 
-        protocol.registerServerbound(ServerboundPackets1_13.CLICK_WINDOW, new PacketRemapper() {
+        protocol.registerServerbound(ServerboundPackets1_13.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
@@ -138,9 +125,9 @@ public class InventoryPackets1_13_2 {
             }
         });
 
-        protocol.registerServerbound(ServerboundPackets1_13.CREATIVE_INVENTORY_ACTION, new PacketRemapper() {
+        protocol.registerServerbound(ServerboundPackets1_13.CREATIVE_INVENTORY_ACTION, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.SHORT); // 0 - Slot
                 map(Type.FLAT_ITEM, Type.FLAT_VAR_INT_ITEM); // 1 - Clicked Item
             }

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2022 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
@@ -18,18 +18,16 @@
 package com.viaversion.viabackwards.protocol.protocol1_13_1to1_13_2.packets;
 
 import com.viaversion.viabackwards.protocol.protocol1_13_1to1_13_2.Protocol1_13_1To1_13_2;
-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_13to1_12_2.ClientboundPackets1_13;
 
 public class WorldPackets1_13_2 {
 
     public static void register(Protocol1_13_1To1_13_2 protocol) {
-        protocol.registerClientbound(ClientboundPackets1_13.SPAWN_PARTICLE, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_13.SPAWN_PARTICLE, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.INT); // 0 - Particle ID
                 map(Type.BOOLEAN); // 1 - Long Distance
                 map(Type.FLOAT); // 2 - X
@@ -41,13 +39,10 @@ public class WorldPackets1_13_2 {
                 map(Type.FLOAT); // 8 - Particle Data
                 map(Type.INT); // 9 - Particle Count
 
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        int id = wrapper.get(Type.INT, 0);
-                        if (id == 27) {
-                            wrapper.write(Type.FLAT_ITEM, wrapper.read(Type.FLAT_VAR_INT_ITEM));
-                        }
+                handler(wrapper -> {
+                    int id = wrapper.get(Type.INT, 0);
+                    if (id == 27) {
+                        wrapper.write(Type.FLAT_ITEM, wrapper.read(Type.FLAT_VAR_INT_ITEM));
                     }
                 });
             }

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2022 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
@@ -29,10 +29,6 @@ import com.viaversion.viabackwards.protocol.protocol1_13_2to1_14.storage.ChunkLi
 import com.viaversion.viabackwards.protocol.protocol1_13_2to1_14.storage.DifficultyStorage;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.entities.Entity1_14Types;
-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.rewriter.EntityRewriter;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
@@ -45,10 +41,10 @@ import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 
 public class Protocol1_13_2To1_14 extends BackwardsProtocol<ClientboundPackets1_14, ClientboundPackets1_13, ServerboundPackets1_14, ServerboundPackets1_13> {
 
-    public static final BackwardsMappings MAPPINGS = new BackwardsMappings("1.14", "1.13.2", Protocol1_14To1_13_2.class, true);
-    private final EntityRewriter entityRewriter = new EntityPackets1_14(this);
-    private final TranslatableRewriter translatableRewriter = new TranslatableRewriter(this);
-    private BlockItemPackets1_14 blockItemPackets;
+    public static final BackwardsMappings MAPPINGS = new BackwardsMappings("1.14", "1.13.2", Protocol1_14To1_13_2.class);
+    private final EntityPackets1_14 entityRewriter = new EntityPackets1_14(this);
+    private final BlockItemPackets1_14 blockItemPackets = new BlockItemPackets1_14(this);
+    private final TranslatableRewriter<ClientboundPackets1_14> translatableRewriter = new TranslatableRewriter<>(this);
 
     public Protocol1_13_2To1_14() {
         super(ClientboundPackets1_14.class, ClientboundPackets1_13.class, ServerboundPackets1_14.class, ServerboundPackets1_13.class);
@@ -56,10 +52,10 @@ public class Protocol1_13_2To1_14 extends BackwardsProtocol<ClientboundPackets1_
 
     @Override
     protected void registerPackets() {
-        executeAsyncAfterLoaded(Protocol1_14To1_13_2.class, MAPPINGS::load);
+        super.registerPackets();
 
         translatableRewriter.registerBossBar(ClientboundPackets1_14.BOSSBAR);
-        translatableRewriter.registerChatMessage(ClientboundPackets1_14.CHAT_MESSAGE);
+        translatableRewriter.registerComponentPacket(ClientboundPackets1_14.CHAT_MESSAGE);
         translatableRewriter.registerCombatEvent(ClientboundPackets1_14.COMBAT_EVENT);
         translatableRewriter.registerDisconnect(ClientboundPackets1_14.DISCONNECT);
         translatableRewriter.registerTabList(ClientboundPackets1_14.TAB_LIST);
@@ -67,123 +63,102 @@ public class Protocol1_13_2To1_14 extends BackwardsProtocol<ClientboundPackets1_
         translatableRewriter.registerPing();
 
         new CommandRewriter1_14(this).registerDeclareCommands(ClientboundPackets1_14.DECLARE_COMMANDS);
-
-        blockItemPackets = new BlockItemPackets1_14(this);
-        blockItemPackets.register();
-        entityRewriter.register();
         new PlayerPackets1_14(this).register();
         new SoundPackets1_14(this).register();
 
-        new StatisticsRewriter(this).register(ClientboundPackets1_14.STATISTICS);
+        new StatisticsRewriter<>(this).register(ClientboundPackets1_14.STATISTICS);
 
         cancelClientbound(ClientboundPackets1_14.UPDATE_VIEW_POSITION);
         cancelClientbound(ClientboundPackets1_14.UPDATE_VIEW_DISTANCE);
-        cancelClientbound(ClientboundPackets1_14.ACKNOWLEDGE_PLAYER_DIGGING);
 
-        registerClientbound(ClientboundPackets1_14.TAGS, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        int blockTagsSize = wrapper.passthrough(Type.VAR_INT);
-                        for (int i = 0; i < blockTagsSize; i++) {
-                            wrapper.passthrough(Type.STRING);
-                            int[] blockIds = wrapper.passthrough(Type.VAR_INT_ARRAY_PRIMITIVE);
-                            for (int j = 0; j < blockIds.length; j++) {
-                                int id = blockIds[j];
-                                // Ignore new blocktags
-                                int blockId = getMappingData().getNewBlockId(id);
-                                blockIds[j] = blockId;
-                            }
-                        }
+        registerClientbound(ClientboundPackets1_14.TAGS, wrapper -> {
+            int blockTagsSize = wrapper.passthrough(Type.VAR_INT);
+            for (int i = 0; i < blockTagsSize; i++) {
+                wrapper.passthrough(Type.STRING);
+                int[] blockIds = wrapper.passthrough(Type.VAR_INT_ARRAY_PRIMITIVE);
+                for (int j = 0; j < blockIds.length; j++) {
+                    int id = blockIds[j];
+                    // Ignore new blocktags
+                    int blockId = MAPPINGS.getNewBlockId(id);
+                    blockIds[j] = blockId;
+                }
+            }
 
-                        int itemTagsSize = wrapper.passthrough(Type.VAR_INT);
-                        for (int i = 0; i < itemTagsSize; i++) {
-                            wrapper.passthrough(Type.STRING);
-                            int[] itemIds = wrapper.passthrough(Type.VAR_INT_ARRAY_PRIMITIVE);
-                            for (int j = 0; j < itemIds.length; j++) {
-                                int itemId = itemIds[j];
-                                // Ignore new itemtags
-                                int oldId = getMappingData().getItemMappings().get(itemId);
-                                itemIds[j] = oldId;
-                            }
-                        }
+            int itemTagsSize = wrapper.passthrough(Type.VAR_INT);
+            for (int i = 0; i < itemTagsSize; i++) {
+                wrapper.passthrough(Type.STRING);
+                int[] itemIds = wrapper.passthrough(Type.VAR_INT_ARRAY_PRIMITIVE);
+                for (int j = 0; j < itemIds.length; j++) {
+                    int itemId = itemIds[j];
+                    // Ignore new itemtags
+                    int oldId = MAPPINGS.getItemMappings().getNewId(itemId);
+                    itemIds[j] = oldId;
+                }
+            }
 
-                        int fluidTagsSize = wrapper.passthrough(Type.VAR_INT); // fluid tags
-                        for (int i = 0; i < fluidTagsSize; i++) {
-                            wrapper.passthrough(Type.STRING);
-                            wrapper.passthrough(Type.VAR_INT_ARRAY_PRIMITIVE);
-                        }
+            int fluidTagsSize = wrapper.passthrough(Type.VAR_INT); // fluid tags
+            for (int i = 0; i < fluidTagsSize; i++) {
+                wrapper.passthrough(Type.STRING);
+                wrapper.passthrough(Type.VAR_INT_ARRAY_PRIMITIVE);
+            }
 
-                        // Eat entity tags
-                        int entityTagsSize = wrapper.read(Type.VAR_INT);
-                        for (int i = 0; i < entityTagsSize; i++) {
-                            wrapper.read(Type.STRING);
-                            wrapper.read(Type.VAR_INT_ARRAY_PRIMITIVE);
-                        }
-                    }
-                });
+            // Eat entity tags
+            int entityTagsSize = wrapper.read(Type.VAR_INT);
+            for (int i = 0; i < entityTagsSize; i++) {
+                wrapper.read(Type.STRING);
+                wrapper.read(Type.VAR_INT_ARRAY_PRIMITIVE);
             }
         });
 
-        registerClientbound(ClientboundPackets1_14.UPDATE_LIGHT, null, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        int x = wrapper.read(Type.VAR_INT);
-                        int z = wrapper.read(Type.VAR_INT);
-                        int skyLightMask = wrapper.read(Type.VAR_INT);
-                        int blockLightMask = wrapper.read(Type.VAR_INT);
-                        int emptySkyLightMask = wrapper.read(Type.VAR_INT);
-                        int emptyBlockLightMask = wrapper.read(Type.VAR_INT);
+        registerClientbound(ClientboundPackets1_14.UPDATE_LIGHT, null, wrapper -> {
+            int x = wrapper.read(Type.VAR_INT);
+            int z = wrapper.read(Type.VAR_INT);
+            int skyLightMask = wrapper.read(Type.VAR_INT);
+            int blockLightMask = wrapper.read(Type.VAR_INT);
+            int emptySkyLightMask = wrapper.read(Type.VAR_INT);
+            int emptyBlockLightMask = wrapper.read(Type.VAR_INT);
 
-                        byte[][] skyLight = new byte[16][];
-                        // we don't need void and +256 light
-                        if (isSet(skyLightMask, 0)) {
-                            wrapper.read(Type.BYTE_ARRAY_PRIMITIVE);
-                        }
-                        for (int i = 0; i < 16; i++) {
-                            if (isSet(skyLightMask, i + 1)) {
-                                skyLight[i] = wrapper.read(Type.BYTE_ARRAY_PRIMITIVE);
-                            } else if (isSet(emptySkyLightMask, i + 1)) {
-                                skyLight[i] = ChunkLightStorage.EMPTY_LIGHT;
-                            }
-                        }
-                        if (isSet(skyLightMask, 17)) {
-                            wrapper.read(Type.BYTE_ARRAY_PRIMITIVE);
-                        }
-
-                        byte[][] blockLight = new byte[16][];
-                        if (isSet(blockLightMask, 0)) {
-                            wrapper.read(Type.BYTE_ARRAY_PRIMITIVE);
-                        }
-                        for (int i = 0; i < 16; i++) {
-                            if (isSet(blockLightMask, i + 1)) {
-                                blockLight[i] = wrapper.read(Type.BYTE_ARRAY_PRIMITIVE);
-                            } else if (isSet(emptyBlockLightMask, i + 1)) {
-                                blockLight[i] = ChunkLightStorage.EMPTY_LIGHT;
-                            }
-                        }
-                        if (isSet(blockLightMask, 17)) {
-                            wrapper.read(Type.BYTE_ARRAY_PRIMITIVE);
-                        }
-
-                        //TODO Soft memory leak: Don't store light if chunk is already loaded
-                        wrapper.user().get(ChunkLightStorage.class).setStoredLight(skyLight, blockLight, x, z);
-                        wrapper.cancel();
-                    }
-
-                    private boolean isSet(int mask, int i) {
-                        return (mask & (1 << i)) != 0;
-                    }
-                });
+            byte[][] skyLight = new byte[16][];
+            // we don't need void and +256 light
+            if (isSet(skyLightMask, 0)) {
+                wrapper.read(Type.BYTE_ARRAY_PRIMITIVE);
             }
+            for (int i = 0; i < 16; i++) {
+                if (isSet(skyLightMask, i + 1)) {
+                    skyLight[i] = wrapper.read(Type.BYTE_ARRAY_PRIMITIVE);
+                } else if (isSet(emptySkyLightMask, i + 1)) {
+                    skyLight[i] = ChunkLightStorage.EMPTY_LIGHT;
+                }
+            }
+            if (isSet(skyLightMask, 17)) {
+                wrapper.read(Type.BYTE_ARRAY_PRIMITIVE);
+            }
+
+            byte[][] blockLight = new byte[16][];
+            if (isSet(blockLightMask, 0)) {
+                wrapper.read(Type.BYTE_ARRAY_PRIMITIVE);
+            }
+            for (int i = 0; i < 16; i++) {
+                if (isSet(blockLightMask, i + 1)) {
+                    blockLight[i] = wrapper.read(Type.BYTE_ARRAY_PRIMITIVE);
+                } else if (isSet(emptyBlockLightMask, i + 1)) {
+                    blockLight[i] = ChunkLightStorage.EMPTY_LIGHT;
+                }
+            }
+            if (isSet(blockLightMask, 17)) {
+                wrapper.read(Type.BYTE_ARRAY_PRIMITIVE);
+            }
+
+            //TODO Soft memory leak: Don't store light if chunk is already loaded
+            wrapper.user().get(ChunkLightStorage.class).setStoredLight(skyLight, blockLight, x, z);
+            wrapper.cancel();
         });
     }
 
+    private static boolean isSet(int mask, int i) {
+        return (mask & (1 << i)) != 0;
+    }
+
     @Override
     public void init(UserConnection user) {
         // Register ClientWorld
@@ -191,7 +166,7 @@ public class Protocol1_13_2To1_14 extends BackwardsProtocol<ClientboundPackets1_
             user.put(new ClientWorld(user));
         }
 
-        user.addEntityTracker(this.getClass(), new EntityTrackerBase(user, Entity1_14Types.PLAYER, true));
+        user.addEntityTracker(this.getClass(), new EntityTrackerBase(user, Entity1_14Types.PLAYER));
 
         if (!user.has(ChunkLightStorage.class)) {
             user.put(new ChunkLightStorage(user));
@@ -206,7 +181,7 @@ public class Protocol1_13_2To1_14 extends BackwardsProtocol<ClientboundPackets1_
     }
 
     @Override
-    public EntityRewriter getEntityRewriter() {
+    public EntityPackets1_14 getEntityRewriter() {
         return entityRewriter;
     }
 
@@ -216,7 +191,7 @@ public class Protocol1_13_2To1_14 extends BackwardsProtocol<ClientboundPackets1_
     }
 
     @Override
-    public TranslatableRewriter getTranslatableRewriter() {
+    public TranslatableRewriter<ClientboundPackets1_14> getTranslatableRewriter() {
         return translatableRewriter;
     }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/data/CommandRewriter1_14.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2022 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
@@ -17,14 +17,15 @@
  */
 package com.viaversion.viabackwards.protocol.protocol1_13_2to1_14.data;
 
-import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viabackwards.protocol.protocol1_13_2to1_14.Protocol1_13_2To1_14;
 import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14;
 import com.viaversion.viaversion.rewriter.CommandRewriter;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-public class CommandRewriter1_14 extends CommandRewriter {
+public class CommandRewriter1_14 extends CommandRewriter<ClientboundPackets1_14> {
 
-    public CommandRewriter1_14(Protocol protocol) {
+    public CommandRewriter1_14(Protocol1_13_2To1_14 protocol) {
         super(protocol);
 
         this.parserHandlers.put("minecraft:nbt_tag", wrapper -> {
@@ -37,7 +38,7 @@ public class CommandRewriter1_14 extends CommandRewriter {
     }
 
     @Override
-    protected @Nullable String handleArgumentType(String argumentType) {
+    public @Nullable String handleArgumentType(String argumentType) {
         switch (argumentType) {
             case "minecraft:nbt_compound_tag":
                 return "minecraft:nbt";

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2022 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
@@ -28,13 +28,13 @@ import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSectionLight;
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSectionLightImpl;
+import com.viaversion.viaversion.api.minecraft.chunks.DataPalette;
+import com.viaversion.viaversion.api.minecraft.chunks.PaletteType;
 import com.viaversion.viaversion.api.minecraft.entities.Entity1_14Types;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
-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_13;
 import com.viaversion.viaversion.api.type.types.version.Types1_13_2;
@@ -47,7 +47,6 @@ import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ServerboundPackets1_13;
-import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.RecipeRewriter1_13_2;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.types.Chunk1_13Type;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.Protocol1_14To1_13_2;
@@ -55,12 +54,11 @@ import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.types.Chunk1_14T
 import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
 import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.RecipeRewriter;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewriters.ItemRewriter<Protocol1_13_2To1_14> {
+public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewriters.ItemRewriter<ClientboundPackets1_14, ServerboundPackets1_13, Protocol1_13_2To1_14> {
 
     private EnchantmentRewriter enchantmentRewriter;
 
@@ -70,126 +68,105 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit
 
     @Override
     protected void registerPackets() {
-        protocol.registerServerbound(ServerboundPackets1_13.EDIT_BOOK, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                handler(wrapper -> handleItemToServer(wrapper.passthrough(Type.FLAT_VAR_INT_ITEM)));
+        protocol.registerServerbound(ServerboundPackets1_13.EDIT_BOOK, wrapper -> handleItemToServer(wrapper.passthrough(Type.FLAT_VAR_INT_ITEM)));
+
+        protocol.registerClientbound(ClientboundPackets1_14.OPEN_WINDOW, wrapper -> {
+            int windowId = wrapper.read(Type.VAR_INT);
+            wrapper.write(Type.UNSIGNED_BYTE, (short) windowId);
+
+            int type = wrapper.read(Type.VAR_INT);
+            String stringType = null;
+            String containerTitle = null;
+            int slotSize = 0;
+            if (type < 6) {
+                if (type == 2) containerTitle = "Barrel";
+                stringType = "minecraft:container";
+                slotSize = (type + 1) * 9;
+            } else {
+                switch (type) {
+                    case 11:
+                        stringType = "minecraft:crafting_table";
+                        break;
+                    case 9: //blast furnace
+                    case 20: //smoker
+                    case 13: //furnace
+                    case 14: //grindstone
+                        if (type == 9) containerTitle = "Blast Furnace";
+                        else if (type == 20) containerTitle = "Smoker";
+                        else if (type == 14) containerTitle = "Grindstone";
+                        stringType = "minecraft:furnace";
+                        slotSize = 3;
+                        break;
+                    case 6:
+                        stringType = "minecraft:dropper";
+                        slotSize = 9;
+                        break;
+                    case 12:
+                        stringType = "minecraft:enchanting_table";
+                        break;
+                    case 10:
+                        stringType = "minecraft:brewing_stand";
+                        slotSize = 5;
+                        break;
+                    case 18:
+                        stringType = "minecraft:villager";
+                        break;
+                    case 8:
+                        stringType = "minecraft:beacon";
+                        slotSize = 1;
+                        break;
+                    case 21: //cartography_table
+                    case 7:
+                        if (type == 21) containerTitle = "Cartography Table";
+                        stringType = "minecraft:anvil";
+                        break;
+                    case 15:
+                        stringType = "minecraft:hopper";
+                        slotSize = 5;
+                        break;
+                    case 19:
+                        stringType = "minecraft:shulker_box";
+                        slotSize = 27;
+                        break;
+                }
             }
-        });
 
-        protocol.registerClientbound(ClientboundPackets1_14.OPEN_WINDOW, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        int windowId = wrapper.read(Type.VAR_INT);
-                        wrapper.write(Type.UNSIGNED_BYTE, (short) windowId);
+            if (stringType == null) {
+                ViaBackwards.getPlatform().getLogger().warning("Can't open inventory for 1.13 player! Type: " + type);
+                wrapper.cancel();
+                return;
+            }
 
-                        int type = wrapper.read(Type.VAR_INT);
-                        String stringType = null;
-                        String containerTitle = null;
-                        int slotSize = 0;
-                        if (type < 6) {
-                            if (type == 2) containerTitle = "Barrel";
-                            stringType = "minecraft:container";
-                            slotSize = (type + 1) * 9;
-                        } else {
-                            switch (type) {
-                                case 11:
-                                    stringType = "minecraft:crafting_table";
-                                    break;
-                                case 9: //blast furnace
-                                case 20: //smoker
-                                case 13: //furnace
-                                case 14: //grindstone
-                                    if (type == 9) containerTitle = "Blast Furnace";
-                                    else if (type == 20) containerTitle = "Smoker";
-                                    else if (type == 14) containerTitle = "Grindstone";
-                                    stringType = "minecraft:furnace";
-                                    slotSize = 3;
-                                    break;
-                                case 6:
-                                    stringType = "minecraft:dropper";
-                                    slotSize = 9;
-                                    break;
-                                case 12:
-                                    stringType = "minecraft:enchanting_table";
-                                    break;
-                                case 10:
-                                    stringType = "minecraft:brewing_stand";
-                                    slotSize = 5;
-                                    break;
-                                case 18:
-                                    stringType = "minecraft:villager";
-                                    break;
-                                case 8:
-                                    stringType = "minecraft:beacon";
-                                    slotSize = 1;
-                                    break;
-                                case 21: //cartography_table
-                                case 7:
-                                    if (type == 21) containerTitle = "Cartography Table";
-                                    stringType = "minecraft:anvil";
-                                    break;
-                                case 15:
-                                    stringType = "minecraft:hopper";
-                                    slotSize = 5;
-                                    break;
-                                case 19:
-                                    stringType = "minecraft:shulker_box";
-                                    slotSize = 27;
-                                    break;
-                            }
-                        }
+            wrapper.write(Type.STRING, stringType);
 
-                        if (stringType == null) {
-                            ViaBackwards.getPlatform().getLogger().warning("Can't open inventory for 1.13 player! Type: " + type);
-                            wrapper.cancel();
-                            return;
-                        }
-
-                        wrapper.write(Type.STRING, stringType);
-
-                        JsonElement title = wrapper.read(Type.COMPONENT);
-                        if (containerTitle != null) {
-                            // Don't rewrite renamed, only translatable titles
-                            JsonObject object;
-                            if (title.isJsonObject() && (object = title.getAsJsonObject()).has("translate")) {
-                                // Don't rewrite other 9x3 translatable containers
-                                if (type != 2 || object.getAsJsonPrimitive("translate").getAsString().equals("container.barrel")) {
-                                    title = ChatRewriter.legacyTextToJson(containerTitle);
-                                }
-                            }
-                        }
-
-                        wrapper.write(Type.COMPONENT, title);
-                        wrapper.write(Type.UNSIGNED_BYTE, (short) slotSize);
+            JsonElement title = wrapper.read(Type.COMPONENT);
+            if (containerTitle != null) {
+                // Don't rewrite renamed, only translatable titles
+                JsonObject object;
+                if (title.isJsonObject() && (object = title.getAsJsonObject()).has("translate")) {
+                    // Don't rewrite other 9x3 translatable containers
+                    if (type != 2 || object.getAsJsonPrimitive("translate").getAsString().equals("container.barrel")) {
+                        title = ChatRewriter.legacyTextToJson(containerTitle);
                     }
-                });
+                }
             }
+
+            wrapper.write(Type.COMPONENT, title);
+            wrapper.write(Type.UNSIGNED_BYTE, (short) slotSize);
         });
 
         // Horse window -> Open Window
-        protocol.registerClientbound(ClientboundPackets1_14.OPEN_HORSE_WINDOW, ClientboundPackets1_13.OPEN_WINDOW, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        wrapper.passthrough(Type.UNSIGNED_BYTE); // Window id
-                        wrapper.write(Type.STRING, "EntityHorse"); // Type
-                        JsonObject object = new JsonObject();
-                        object.addProperty("translate", "minecraft.horse");
-                        wrapper.write(Type.COMPONENT, object); // Title
-                        wrapper.write(Type.UNSIGNED_BYTE, wrapper.read(Type.VAR_INT).shortValue()); // Number of slots
-                        wrapper.passthrough(Type.INT); // Entity id
-                    }
-                });
-            }
+        protocol.registerClientbound(ClientboundPackets1_14.OPEN_HORSE_WINDOW, ClientboundPackets1_13.OPEN_WINDOW, wrapper -> {
+            wrapper.passthrough(Type.UNSIGNED_BYTE); // Window id
+            wrapper.write(Type.STRING, "EntityHorse"); // Type
+            JsonObject object = new JsonObject();
+            object.addProperty("translate", "minecraft.horse");
+            wrapper.write(Type.COMPONENT, object); // Title
+            wrapper.write(Type.UNSIGNED_BYTE, wrapper.read(Type.VAR_INT).shortValue()); // Number of slots
+            wrapper.passthrough(Type.INT); // Entity id
         });
 
-        BlockRewriter blockRewriter = new BlockRewriter(protocol, Type.POSITION);
+        BlockRewriter<ClientboundPackets1_14> blockRewriter = new BlockRewriter<>(protocol, Type.POSITION);
 
         registerSetCooldown(ClientboundPackets1_14.COOLDOWN);
         registerWindowItems(ClientboundPackets1_14.WINDOW_ITEMS, Type.FLAT_VAR_INT_ITEM_ARRAY);
@@ -197,175 +174,146 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit
         registerAdvancements(ClientboundPackets1_14.ADVANCEMENTS, Type.FLAT_VAR_INT_ITEM);
 
         // Trade List -> Plugin Message
-        protocol.registerClientbound(ClientboundPackets1_14.TRADE_LIST, ClientboundPackets1_13.PLUGIN_MESSAGE, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        wrapper.write(Type.STRING, "minecraft:trader_list");
+        protocol.registerClientbound(ClientboundPackets1_14.TRADE_LIST, ClientboundPackets1_13.PLUGIN_MESSAGE, wrapper -> {
+            wrapper.write(Type.STRING, "minecraft:trader_list");
 
-                        int windowId = wrapper.read(Type.VAR_INT);
-                        wrapper.write(Type.INT, windowId);
+            int windowId = wrapper.read(Type.VAR_INT);
+            wrapper.write(Type.INT, windowId);
 
-                        int size = wrapper.passthrough(Type.UNSIGNED_BYTE);
-                        for (int i = 0; i < size; i++) {
-                            // Input Item
-                            Item input = wrapper.read(Type.FLAT_VAR_INT_ITEM);
-                            input = handleItemToClient(input);
-                            wrapper.write(Type.FLAT_VAR_INT_ITEM, input);
+            int size = wrapper.passthrough(Type.UNSIGNED_BYTE);
+            for (int i = 0; i < size; i++) {
+                // Input Item
+                Item input = wrapper.read(Type.FLAT_VAR_INT_ITEM);
+                input = handleItemToClient(input);
+                wrapper.write(Type.FLAT_VAR_INT_ITEM, input);
 
 
-                            // Output Item
-                            Item output = wrapper.read(Type.FLAT_VAR_INT_ITEM);
-                            output = handleItemToClient(output);
-                            wrapper.write(Type.FLAT_VAR_INT_ITEM, output);
+                // Output Item
+                Item output = wrapper.read(Type.FLAT_VAR_INT_ITEM);
+                output = handleItemToClient(output);
+                wrapper.write(Type.FLAT_VAR_INT_ITEM, output);
 
-                            boolean secondItem = wrapper.passthrough(Type.BOOLEAN); // Has second item
-                            if (secondItem) {
-                                // Second Item
-                                Item second = wrapper.read(Type.FLAT_VAR_INT_ITEM);
-                                second = handleItemToClient(second);
-                                wrapper.write(Type.FLAT_VAR_INT_ITEM, second);
-                            }
+                boolean secondItem = wrapper.passthrough(Type.BOOLEAN); // Has second item
+                if (secondItem) {
+                    // Second Item
+                    Item second = wrapper.read(Type.FLAT_VAR_INT_ITEM);
+                    second = handleItemToClient(second);
+                    wrapper.write(Type.FLAT_VAR_INT_ITEM, second);
+                }
 
-                            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
 
-                            wrapper.read(Type.INT);
-                            wrapper.read(Type.INT);
-                            wrapper.read(Type.FLOAT);
-                        }
-                        wrapper.read(Type.VAR_INT);
-                        wrapper.read(Type.VAR_INT);
-                        wrapper.read(Type.BOOLEAN);
-                    }
-                });
+                wrapper.read(Type.INT);
+                wrapper.read(Type.INT);
+                wrapper.read(Type.FLOAT);
             }
+            wrapper.read(Type.VAR_INT);
+            wrapper.read(Type.VAR_INT);
+            wrapper.read(Type.BOOLEAN);
         });
 
         // Open Book -> Plugin Message
-        protocol.registerClientbound(ClientboundPackets1_14.OPEN_BOOK, ClientboundPackets1_13.PLUGIN_MESSAGE, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        wrapper.write(Type.STRING, "minecraft:book_open");
-                        wrapper.passthrough(Type.VAR_INT);
-                    }
-                });
-            }
+        protocol.registerClientbound(ClientboundPackets1_14.OPEN_BOOK, ClientboundPackets1_13.PLUGIN_MESSAGE, wrapper -> {
+            wrapper.write(Type.STRING, "minecraft:book_open");
+            wrapper.passthrough(Type.VAR_INT);
         });
 
-        protocol.registerClientbound(ClientboundPackets1_14.ENTITY_EQUIPMENT, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_14.ENTITY_EQUIPMENT, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT); // 0 - Entity ID
                 map(Type.VAR_INT); // 1 - Slot ID
                 map(Type.FLAT_VAR_INT_ITEM); // 2 - Item
 
                 handler(itemToClientHandler(Type.FLAT_VAR_INT_ITEM));
 
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        int entityId = wrapper.get(Type.VAR_INT, 0);
-                        EntityType entityType = wrapper.user().getEntityTracker(Protocol1_13_2To1_14.class).entityType(entityId);
-                        if (entityType == null) return;
+                handler(wrapper -> {
+                    int entityId = wrapper.get(Type.VAR_INT, 0);
+                    EntityType entityType = wrapper.user().getEntityTracker(Protocol1_13_2To1_14.class).entityType(entityId);
+                    if (entityType == null) return;
 
-                        if (entityType.isOrHasParent(Entity1_14Types.ABSTRACT_HORSE)) {
-                            wrapper.setId(0x3F);
-                            wrapper.resetReader();
-                            wrapper.passthrough(Type.VAR_INT);
-                            wrapper.read(Type.VAR_INT);
-                            Item item = wrapper.read(Type.FLAT_VAR_INT_ITEM);
-                            int armorType = item == null || item.identifier() == 0 ? 0 : item.identifier() - 726;
-                            if (armorType < 0 || armorType > 3) {
-                                ViaBackwards.getPlatform().getLogger().warning("Received invalid horse armor: " + item);
-                                wrapper.cancel();
-                                return;
-                            }
-                            List<Metadata> metadataList = new ArrayList<>();
-                            metadataList.add(new Metadata(16, Types1_13_2.META_TYPES.varIntType, armorType));
-                            wrapper.write(Types1_13.METADATA_LIST, metadataList);
+                    if (entityType.isOrHasParent(Entity1_14Types.ABSTRACT_HORSE)) {
+                        wrapper.setPacketType(ClientboundPackets1_13.ENTITY_METADATA);
+                        wrapper.resetReader();
+                        wrapper.passthrough(Type.VAR_INT);
+                        wrapper.read(Type.VAR_INT);
+                        Item item = wrapper.read(Type.FLAT_VAR_INT_ITEM);
+                        int armorType = item == null || item.identifier() == 0 ? 0 : item.identifier() - 726;
+                        if (armorType < 0 || armorType > 3) {
+                            wrapper.cancel();
+                            return;
                         }
+                        List<Metadata> metadataList = new ArrayList<>();
+                        metadataList.add(new Metadata(16, Types1_13_2.META_TYPES.varIntType, armorType));
+                        wrapper.write(Types1_13.METADATA_LIST, metadataList);
                     }
                 });
             }
         });
 
-        RecipeRewriter recipeHandler = new RecipeRewriter1_13_2(protocol);
-        protocol.registerClientbound(ClientboundPackets1_14.DECLARE_RECIPES, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                handler(new PacketHandler() {
-                    private final Set<String> removedTypes = ImmutableSet.of("crafting_special_suspiciousstew", "blasting", "smoking", "campfire_cooking", "stonecutting");
-
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        int size = wrapper.passthrough(Type.VAR_INT);
-                        int deleted = 0;
-                        for (int i = 0; i < size; i++) {
-                            String type = wrapper.read(Type.STRING);
-                            String id = wrapper.read(Type.STRING); // Recipe Identifier
-                            type = type.replace("minecraft:", "");
-                            if (removedTypes.contains(type)) {
-                                switch (type) {
-                                    case "blasting":
-                                    case "smoking":
-                                    case "campfire_cooking":
-                                        wrapper.read(Type.STRING); // Group
-                                        wrapper.read(Type.FLAT_VAR_INT_ITEM_ARRAY_VAR_INT); // Ingredients
-                                        wrapper.read(Type.FLAT_VAR_INT_ITEM);
-                                        wrapper.read(Type.FLOAT); // EXP
-                                        wrapper.read(Type.VAR_INT); // Cooking time
-                                        break;
-                                    case "stonecutting":
-                                        wrapper.read(Type.STRING); // Group?
-                                        wrapper.read(Type.FLAT_VAR_INT_ITEM_ARRAY_VAR_INT); // Ingredients
-                                        wrapper.read(Type.FLAT_VAR_INT_ITEM); // Result
-                                        break;
-                                }
-                                deleted++;
-                                continue;
-                            }
-                            wrapper.write(Type.STRING, id);
-                            wrapper.write(Type.STRING, type);
-
-                            // Handle the rest of the types
-                            recipeHandler.handle(wrapper, type);
-                        }
-                        wrapper.set(Type.VAR_INT, 0, size - deleted);
+        RecipeRewriter<ClientboundPackets1_14> recipeHandler = new RecipeRewriter<>(protocol);
+        final Set<String> removedTypes = ImmutableSet.of("crafting_special_suspiciousstew", "blasting", "smoking", "campfire_cooking", "stonecutting");
+        protocol.registerClientbound(ClientboundPackets1_14.DECLARE_RECIPES, wrapper -> {
+            int size = wrapper.passthrough(Type.VAR_INT);
+            int deleted = 0;
+            for (int i = 0; i < size; i++) {
+                String type = wrapper.read(Type.STRING);
+                String id = wrapper.read(Type.STRING); // Recipe Identifier
+                type = type.replace("minecraft:", "");
+                if (removedTypes.contains(type)) {
+                    switch (type) {
+                        case "blasting":
+                        case "smoking":
+                        case "campfire_cooking":
+                            wrapper.read(Type.STRING); // Group
+                            wrapper.read(Type.FLAT_VAR_INT_ITEM_ARRAY_VAR_INT); // Ingredients
+                            wrapper.read(Type.FLAT_VAR_INT_ITEM);
+                            wrapper.read(Type.FLOAT); // EXP
+                            wrapper.read(Type.VAR_INT); // Cooking time
+                            break;
+                        case "stonecutting":
+                            wrapper.read(Type.STRING); // Group?
+                            wrapper.read(Type.FLAT_VAR_INT_ITEM_ARRAY_VAR_INT); // Ingredients
+                            wrapper.read(Type.FLAT_VAR_INT_ITEM); // Result
+                            break;
                     }
-                });
+                    deleted++;
+                    continue;
+                }
+                wrapper.write(Type.STRING, id);
+                wrapper.write(Type.STRING, type);
+
+                // Handle the rest of the types
+                recipeHandler.handleRecipeType(wrapper, type);
             }
+            wrapper.set(Type.VAR_INT, 0, size - deleted);
         });
 
 
         registerClickWindow(ServerboundPackets1_13.CLICK_WINDOW, Type.FLAT_VAR_INT_ITEM);
         registerCreativeInvAction(ServerboundPackets1_13.CREATIVE_INVENTORY_ACTION, Type.FLAT_VAR_INT_ITEM);
 
-        protocol.registerClientbound(ClientboundPackets1_14.BLOCK_BREAK_ANIMATION, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_14.BLOCK_BREAK_ANIMATION, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT);
                 map(Type.POSITION1_14, Type.POSITION);
                 map(Type.BYTE);
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_14.BLOCK_ENTITY_DATA, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_14.BLOCK_ENTITY_DATA, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.POSITION1_14, Type.POSITION);
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_14.BLOCK_ACTION, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_14.BLOCK_ACTION, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.POSITION1_14, Type.POSITION); // Location
                 map(Type.UNSIGNED_BYTE); // Action id
                 map(Type.UNSIGNED_BYTE); // Action param
@@ -381,132 +329,107 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_14.BLOCK_CHANGE, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_14.BLOCK_CHANGE, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.POSITION1_14, Type.POSITION);
                 map(Type.VAR_INT);
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        int id = wrapper.get(Type.VAR_INT, 0);
+                handler(wrapper -> {
+                    int id = wrapper.get(Type.VAR_INT, 0);
 
-                        wrapper.set(Type.VAR_INT, 0, protocol.getMappingData().getNewBlockStateId(id));
-                    }
+                    wrapper.set(Type.VAR_INT, 0, protocol.getMappingData().getNewBlockStateId(id));
                 });
             }
         });
 
         blockRewriter.registerMultiBlockChange(ClientboundPackets1_14.MULTI_BLOCK_CHANGE);
 
-        protocol.registerClientbound(ClientboundPackets1_14.EXPLOSION, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_14.EXPLOSION, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.FLOAT); // X
                 map(Type.FLOAT); // Y
                 map(Type.FLOAT); // Z
                 map(Type.FLOAT); // Radius
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        for (int i = 0; i < 3; i++) {
-                            float coord = wrapper.get(Type.FLOAT, i);
+                handler(wrapper -> {
+                    for (int i = 0; i < 3; i++) {
+                        float coord = wrapper.get(Type.FLOAT, i);
 
-                            if (coord < 0f) {
-                                coord = (float) Math.floor(coord);
-                                wrapper.set(Type.FLOAT, i, coord);
-                            }
+                        if (coord < 0f) {
+                            coord = (float) Math.floor(coord);
+                            wrapper.set(Type.FLOAT, i, coord);
                         }
                     }
                 });
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_14.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);
-                        Chunk chunk = wrapper.read(new Chunk1_14Type());
-                        wrapper.write(new Chunk1_13Type(clientWorld), chunk);
+        protocol.registerClientbound(ClientboundPackets1_14.CHUNK_DATA, wrapper -> {
+            ClientWorld clientWorld = wrapper.user().get(ClientWorld.class);
+            Chunk chunk = wrapper.read(new Chunk1_14Type());
+            wrapper.write(new Chunk1_13Type(clientWorld), chunk);
 
-                        ChunkLightStorage.ChunkLight chunkLight = wrapper.user().get(ChunkLightStorage.class).getStoredLight(chunk.getX(), chunk.getZ());
-                        for (int i = 0; i < chunk.getSections().length; i++) {
-                            ChunkSection section = chunk.getSections()[i];
-                            if (section == null) continue;
+            ChunkLightStorage.ChunkLight chunkLight = wrapper.user().get(ChunkLightStorage.class).getStoredLight(chunk.getX(), chunk.getZ());
+            for (int i = 0; i < chunk.getSections().length; i++) {
+                ChunkSection section = chunk.getSections()[i];
+                if (section == null) continue;
 
-                            ChunkSectionLight sectionLight = new ChunkSectionLightImpl();
-                            section.setLight(sectionLight);
-                            if (chunkLight == null) {
-                                sectionLight.setBlockLight(ChunkLightStorage.FULL_LIGHT);
-                                if (clientWorld.getEnvironment() == Environment.NORMAL) {
-                                    sectionLight.setSkyLight(ChunkLightStorage.FULL_LIGHT);
+                ChunkSectionLight sectionLight = new ChunkSectionLightImpl();
+                section.setLight(sectionLight);
+                if (chunkLight == null) {
+                    sectionLight.setBlockLight(ChunkLightStorage.FULL_LIGHT);
+                    if (clientWorld.getEnvironment() == Environment.NORMAL) {
+                        sectionLight.setSkyLight(ChunkLightStorage.FULL_LIGHT);
+                    }
+                } else {
+                    byte[] blockLight = chunkLight.getBlockLight()[i];
+                    sectionLight.setBlockLight(blockLight != null ? blockLight : ChunkLightStorage.FULL_LIGHT);
+                    if (clientWorld.getEnvironment() == Environment.NORMAL) {
+                        byte[] skyLight = chunkLight.getSkyLight()[i];
+                        sectionLight.setSkyLight(skyLight != null ? skyLight : ChunkLightStorage.FULL_LIGHT);
+                    }
+                }
+
+                DataPalette palette = section.palette(PaletteType.BLOCKS);
+                if (Via.getConfig().isNonFullBlockLightFix() && section.getNonAirBlocksCount() != 0 && sectionLight.hasBlockLight()) {
+                    for (int x = 0; x < 16; x++) {
+                        for (int y = 0; y < 16; y++) {
+                            for (int z = 0; z < 16; z++) {
+                                int id = palette.idAt(x, y, z);
+                                if (Protocol1_14To1_13_2.MAPPINGS.getNonFullBlocks().contains(id)) {
+                                    sectionLight.getBlockLightNibbleArray().set(x, y, z, 0);
                                 }
-                            } else {
-                                byte[] blockLight = chunkLight.getBlockLight()[i];
-                                sectionLight.setBlockLight(blockLight != null ? blockLight : ChunkLightStorage.FULL_LIGHT);
-                                if (clientWorld.getEnvironment() == Environment.NORMAL) {
-                                    byte[] skyLight = chunkLight.getSkyLight()[i];
-                                    sectionLight.setSkyLight(skyLight != null ? skyLight : ChunkLightStorage.FULL_LIGHT);
-                                }
-                            }
-
-                            if (Via.getConfig().isNonFullBlockLightFix() && section.getNonAirBlocksCount() != 0 && sectionLight.hasBlockLight()) {
-                                for (int x = 0; x < 16; x++) {
-                                    for (int y = 0; y < 16; y++) {
-                                        for (int z = 0; z < 16; z++) {
-                                            int id = section.getFlatBlock(x, y, z);
-                                            if (Protocol1_14To1_13_2.MAPPINGS.getNonFullBlocks().contains(id)) {
-                                                sectionLight.getBlockLightNibbleArray().set(x, y, z, 0);
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-
-                            for (int j = 0; j < section.getPaletteSize(); j++) {
-                                int old = section.getPaletteEntry(j);
-                                int newId = protocol.getMappingData().getNewBlockStateId(old);
-                                section.setPaletteEntry(j, newId);
                             }
                         }
                     }
-                });
+                }
+
+                for (int j = 0; j < palette.size(); j++) {
+                    int mappedBlockStateId = protocol.getMappingData().getNewBlockStateId(palette.idByIndex(j));
+                    palette.setIdByIndex(j, mappedBlockStateId);
+                }
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_14.UNLOAD_CHUNK, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        int x = wrapper.passthrough(Type.INT);
-                        int z = wrapper.passthrough(Type.INT);
-                        wrapper.user().get(ChunkLightStorage.class).unloadChunk(x, z);
-                    }
-                });
-            }
+        protocol.registerClientbound(ClientboundPackets1_14.UNLOAD_CHUNK, wrapper -> {
+            int x = wrapper.passthrough(Type.INT);
+            int z = wrapper.passthrough(Type.INT);
+            wrapper.user().get(ChunkLightStorage.class).unloadChunk(x, z);
         });
 
-        protocol.registerClientbound(ClientboundPackets1_14.EFFECT, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_14.EFFECT, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.INT); // Effect Id
                 map(Type.POSITION1_14, Type.POSITION); // Location
                 map(Type.INT); // Data
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        int id = wrapper.get(Type.INT, 0);
-                        int data = wrapper.get(Type.INT, 1);
-                        if (id == 1010) { // Play record
-                            wrapper.set(Type.INT, 1, protocol.getMappingData().getNewItemId(data));
-                        } else if (id == 2001) { // Block break + block break sound
-                            wrapper.set(Type.INT, 1, protocol.getMappingData().getNewBlockStateId(data));
-                        }
+                handler(wrapper -> {
+                    int id = wrapper.get(Type.INT, 0);
+                    int data = wrapper.get(Type.INT, 1);
+                    if (id == 1010) { // Play record
+                        wrapper.set(Type.INT, 1, protocol.getMappingData().getNewItemId(data));
+                    } else if (id == 2001) { // Block break + block break sound
+                        wrapper.set(Type.INT, 1, protocol.getMappingData().getNewBlockStateId(data));
                     }
                 });
             }
@@ -514,9 +437,9 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit
 
         registerSpawnParticle(ClientboundPackets1_14.SPAWN_PARTICLE, Type.FLAT_VAR_INT_ITEM, Type.FLOAT);
 
-        protocol.registerClientbound(ClientboundPackets1_14.MAP_DATA, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_14.MAP_DATA, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT);
                 map(Type.BYTE);
                 map(Type.BOOLEAN);
@@ -524,9 +447,9 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_14.SPAWN_POSITION, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_14.SPAWN_POSITION, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.POSITION1_14, Type.POSITION);
             }
         });

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2022 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
@@ -31,12 +31,9 @@ import com.viaversion.viaversion.api.minecraft.VillagerData;
 import com.viaversion.viaversion.api.minecraft.entities.Entity1_13Types;
 import com.viaversion.viaversion.api.minecraft.entities.Entity1_14Types;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
-import com.viaversion.viaversion.api.minecraft.item.Item;
-import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 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_13_2;
@@ -46,7 +43,7 @@ import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPacke
 import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
 import com.viaversion.viaversion.rewriter.meta.MetaHandler;
 
-public class EntityPackets1_14 extends LegacyEntityRewriter<Protocol1_13_2To1_14> {
+public class EntityPackets1_14 extends LegacyEntityRewriter<ClientboundPackets1_14, Protocol1_13_2To1_14> {
 
     private EntityPositionHandler positionHandler;
 
@@ -62,7 +59,7 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<Protocol1_13_2To1_14
         // Cache the position for every newly tracked entity
         if (type == Entity1_14Types.PAINTING) {
             final Position position = wrapper.get(Type.POSITION, 0);
-            positionHandler.cacheEntityPosition(wrapper, position.getX(), position.getY(), position.getZ(), true, false);
+            positionHandler.cacheEntityPosition(wrapper, position.x(), position.y(), position.z(), true, false);
         } else if (wrapper.getId() != ClientboundPackets1_14.JOIN_GAME.getId()) { // ignore join game
             positionHandler.cacheEntityPosition(wrapper, true, false);
         }
@@ -72,34 +69,29 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<Protocol1_13_2To1_14
     protected void registerPackets() {
         positionHandler = new EntityPositionHandler(this, EntityPositionStorage1_14.class, EntityPositionStorage1_14::new);
 
-        protocol.registerClientbound(ClientboundPackets1_14.ENTITY_STATUS, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                handler(wrapper -> {
-                    int entityId = wrapper.passthrough(Type.INT);
-                    byte status = wrapper.passthrough(Type.BYTE);
-                    // Check for death status
-                    if (status != 3) return;
+        protocol.registerClientbound(ClientboundPackets1_14.ENTITY_STATUS, wrapper -> {
+            int entityId = wrapper.passthrough(Type.INT);
+            byte status = wrapper.passthrough(Type.BYTE);
+            // Check for death status
+            if (status != 3) return;
 
-                    EntityTracker tracker = tracker(wrapper.user());
-                    EntityType entityType = tracker.entityType(entityId);
-                    if (entityType != Entity1_14Types.PLAYER) return;
+            EntityTracker tracker = tracker(wrapper.user());
+            EntityType entityType = tracker.entityType(entityId);
+            if (entityType != Entity1_14Types.PLAYER) return;
 
-                    // Remove equipment, else the client will see ghost items
-                    for (int i = 0; i <= 5; i++) {
-                        PacketWrapper equipmentPacket = wrapper.create(ClientboundPackets1_13.ENTITY_EQUIPMENT);
-                        equipmentPacket.write(Type.VAR_INT, entityId);
-                        equipmentPacket.write(Type.VAR_INT, i);
-                        equipmentPacket.write(Type.FLAT_VAR_INT_ITEM, null);
-                        equipmentPacket.send(Protocol1_13_2To1_14.class);
-                    }
-                });
+            // Remove equipment, else the client will see ghost items
+            for (int i = 0; i <= 5; i++) {
+                PacketWrapper equipmentPacket = wrapper.create(ClientboundPackets1_13.ENTITY_EQUIPMENT);
+                equipmentPacket.write(Type.VAR_INT, entityId);
+                equipmentPacket.write(Type.VAR_INT, i);
+                equipmentPacket.write(Type.FLAT_VAR_INT_ITEM, null);
+                equipmentPacket.send(Protocol1_13_2To1_14.class);
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_14.ENTITY_TELEPORT, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_14.ENTITY_TELEPORT, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT);
                 map(Type.DOUBLE);
                 map(Type.DOUBLE);
@@ -108,30 +100,27 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<Protocol1_13_2To1_14
             }
         });
 
-        PacketRemapper relativeMoveHandler = new PacketRemapper() {
+        PacketHandlers relativeMoveHandler = new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT);
                 map(Type.SHORT);
                 map(Type.SHORT);
                 map(Type.SHORT);
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        double x = wrapper.get(Type.SHORT, 0) / EntityPositionHandler.RELATIVE_MOVE_FACTOR;
-                        double y = wrapper.get(Type.SHORT, 1) / EntityPositionHandler.RELATIVE_MOVE_FACTOR;
-                        double z = wrapper.get(Type.SHORT, 2) / EntityPositionHandler.RELATIVE_MOVE_FACTOR;
-                        positionHandler.cacheEntityPosition(wrapper, x, y, z, false, true);
-                    }
+                handler(wrapper -> {
+                    double x = wrapper.get(Type.SHORT, 0) / EntityPositionHandler.RELATIVE_MOVE_FACTOR;
+                    double y = wrapper.get(Type.SHORT, 1) / EntityPositionHandler.RELATIVE_MOVE_FACTOR;
+                    double z = wrapper.get(Type.SHORT, 2) / EntityPositionHandler.RELATIVE_MOVE_FACTOR;
+                    positionHandler.cacheEntityPosition(wrapper, x, y, z, false, true);
                 });
             }
         };
         protocol.registerClientbound(ClientboundPackets1_14.ENTITY_POSITION, relativeMoveHandler);
         protocol.registerClientbound(ClientboundPackets1_14.ENTITY_POSITION_AND_ROTATION, relativeMoveHandler);
 
-        protocol.registerClientbound(ClientboundPackets1_14.SPAWN_ENTITY, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_14.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.VAR_INT, Type.BYTE); // 2 - Type
@@ -147,62 +136,59 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<Protocol1_13_2To1_14
 
                 handler(getObjectTrackerHandler());
 
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        int id = wrapper.get(Type.BYTE, 0);
-                        int mappedId = newEntityId(id);
-                        Entity1_13Types.EntityType entityType = Entity1_13Types.getTypeFromId(mappedId, false);
-                        Entity1_13Types.ObjectType objectType;
-                        if (entityType.isOrHasParent(Entity1_13Types.EntityType.MINECART_ABSTRACT)) {
-                            objectType = Entity1_13Types.ObjectType.MINECART;
-                            int data = 0;
-                            switch (entityType) {
-                                case CHEST_MINECART:
-                                    data = 1;
-                                    break;
-                                case FURNACE_MINECART:
-                                    data = 2;
-                                    break;
-                                case TNT_MINECART:
-                                    data = 3;
-                                    break;
-                                case SPAWNER_MINECART:
-                                    data = 4;
-                                    break;
-                                case HOPPER_MINECART:
-                                    data = 5;
-                                    break;
-                                case COMMAND_BLOCK_MINECART:
-                                    data = 6;
-                                    break;
-                            }
-                            if (data != 0)
-                                wrapper.set(Type.INT, 0, data);
-                        } else {
-                            objectType = Entity1_13Types.ObjectType.fromEntityType(entityType).orElse(null);
+                handler(wrapper -> {
+                    int id = wrapper.get(Type.BYTE, 0);
+                    int mappedId = newEntityId(id);
+                    Entity1_13Types.EntityType entityType = Entity1_13Types.getTypeFromId(mappedId, false);
+                    Entity1_13Types.ObjectType objectType;
+                    if (entityType.isOrHasParent(Entity1_13Types.EntityType.MINECART_ABSTRACT)) {
+                        objectType = Entity1_13Types.ObjectType.MINECART;
+                        int data = 0;
+                        switch (entityType) {
+                            case CHEST_MINECART:
+                                data = 1;
+                                break;
+                            case FURNACE_MINECART:
+                                data = 2;
+                                break;
+                            case TNT_MINECART:
+                                data = 3;
+                                break;
+                            case SPAWNER_MINECART:
+                                data = 4;
+                                break;
+                            case HOPPER_MINECART:
+                                data = 5;
+                                break;
+                            case COMMAND_BLOCK_MINECART:
+                                data = 6;
+                                break;
                         }
+                        if (data != 0)
+                            wrapper.set(Type.INT, 0, data);
+                    } else {
+                        objectType = Entity1_13Types.ObjectType.fromEntityType(entityType).orElse(null);
+                    }
 
-                        if (objectType == null) return;
+                    if (objectType == null) return;
 
-                        wrapper.set(Type.BYTE, 0, (byte) objectType.getId());
+                    wrapper.set(Type.BYTE, 0, (byte) objectType.getId());
 
-                        int data = wrapper.get(Type.INT, 0);
-                        if (objectType == Entity1_13Types.ObjectType.FALLING_BLOCK) {
-                            int blockState = wrapper.get(Type.INT, 0);
-                            int combined = protocol.getMappingData().getNewBlockStateId(blockState);
-                            wrapper.set(Type.INT, 0, combined);
-                        } else if (entityType.isOrHasParent(Entity1_13Types.EntityType.ABSTRACT_ARROW)) {
-                            wrapper.set(Type.INT, 0, data + 1);
-                        }
+                    int data = wrapper.get(Type.INT, 0);
+                    if (objectType == Entity1_13Types.ObjectType.FALLING_BLOCK) {
+                        int blockState = wrapper.get(Type.INT, 0);
+                        int combined = protocol.getMappingData().getNewBlockStateId(blockState);
+                        wrapper.set(Type.INT, 0, combined);
+                    } else if (entityType.isOrHasParent(Entity1_13Types.EntityType.ABSTRACT_ARROW)) {
+                        wrapper.set(Type.INT, 0, data + 1);
                     }
                 });
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_14.SPAWN_MOB, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_14.SPAWN_MOB, 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
@@ -217,25 +203,22 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<Protocol1_13_2To1_14
                 map(Type.SHORT); // 11 - Velocity Z
                 map(Types1_14.METADATA_LIST, Types1_13_2.METADATA_LIST); // 12 - Metadata
 
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        int type = wrapper.get(Type.VAR_INT, 1);
-                        EntityType entityType = Entity1_14Types.getTypeFromId(type);
-                        addTrackedEntity(wrapper, wrapper.get(Type.VAR_INT, 0), entityType);
+                handler(wrapper -> {
+                    int type = wrapper.get(Type.VAR_INT, 1);
+                    EntityType entityType = Entity1_14Types.getTypeFromId(type);
+                    addTrackedEntity(wrapper, wrapper.get(Type.VAR_INT, 0), entityType);
 
-                        int oldId = newEntityId(type);
-                        if (oldId == -1) {
-                            EntityData entityData = entityDataForType(entityType);
-                            if (entityData == null) {
-                                ViaBackwards.getPlatform().getLogger().warning("Could not find 1.13.2 entity type for 1.14 entity type " + type + "/" + entityType);
-                                wrapper.cancel();
-                            } else {
-                                wrapper.set(Type.VAR_INT, 1, entityData.replacementId());
-                            }
+                    int oldId = newEntityId(type);
+                    if (oldId == -1) {
+                        EntityData entityData = entityDataForType(entityType);
+                        if (entityData == null) {
+                            ViaBackwards.getPlatform().getLogger().warning("Could not find 1.13.2 entity type for 1.14 entity type " + type + "/" + entityType);
+                            wrapper.cancel();
                         } else {
-                            wrapper.set(Type.VAR_INT, 1, oldId);
+                            wrapper.set(Type.VAR_INT, 1, entityData.replacementId());
                         }
+                    } else {
+                        wrapper.set(Type.VAR_INT, 1, oldId);
                     }
                 });
 
@@ -244,9 +227,9 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<Protocol1_13_2To1_14
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_14.SPAWN_EXPERIENCE_ORB, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_14.SPAWN_EXPERIENCE_ORB, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT); // 0 - Entity id
                 map(Type.DOUBLE); // Needs to be mapped for the position cache
                 map(Type.DOUBLE);
@@ -255,9 +238,9 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<Protocol1_13_2To1_14
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_14.SPAWN_GLOBAL_ENTITY, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_14.SPAWN_GLOBAL_ENTITY, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT); // 0 - Entity id
                 map(Type.BYTE);
                 map(Type.DOUBLE); // Needs to be mapped for the position cache
@@ -267,9 +250,9 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<Protocol1_13_2To1_14
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_14.SPAWN_PAINTING, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_14.SPAWN_PAINTING, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT);
                 map(Type.UUID);
                 map(Type.VAR_INT);
@@ -281,9 +264,9 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<Protocol1_13_2To1_14
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_14.SPAWN_PLAYER, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_14.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
@@ -301,9 +284,9 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<Protocol1_13_2To1_14
         registerRemoveEntities(ClientboundPackets1_14.DESTROY_ENTITIES);
         registerMetadataRewriter(ClientboundPackets1_14.ENTITY_METADATA, Types1_14.METADATA_LIST, Types1_13_2.METADATA_LIST);
 
-        protocol.registerClientbound(ClientboundPackets1_14.JOIN_GAME, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_14.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
@@ -327,9 +310,9 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<Protocol1_13_2To1_14
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_14.RESPAWN, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_14.RESPAWN, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.INT); // 0 - Dimension ID
 
                 handler(wrapper -> {
@@ -363,18 +346,11 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<Protocol1_13_2To1_14
             if (typeId <= 15) {
                 meta.setMetaType(Types1_13_2.META_TYPES.byId(typeId));
             }
-
-            MetaType type = meta.metaType();
-
-            if (type == Types1_13_2.META_TYPES.itemType) {
-                Item item = (Item) meta.getValue();
-                meta.setValue(protocol.getItemRewriter().handleItemToClient(item));
-            } else if (type == Types1_13_2.META_TYPES.blockStateType) {
-                int blockstate = meta.value();
-                meta.setValue(protocol.getMappingData().getNewBlockStateId(blockstate));
-            }
         });
 
+        registerMetaTypeHandler(Types1_13_2.META_TYPES.itemType, Types1_13_2.META_TYPES.blockStateType, null, null,
+                Types1_13_2.META_TYPES.componentType, Types1_13_2.META_TYPES.optionalComponentType);
+
         filter().type(Entity1_14Types.PILLAGER).cancel(15);
 
         filter().type(Entity1_14Types.FOX).cancel(15);
@@ -497,7 +473,7 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<Protocol1_13_2To1_14
     }
 
     public int villagerDataToProfession(VillagerData data) {
-        switch (data.getProfession()) {
+        switch (data.profession()) {
             case 1: // Armorer
             case 10: // Mason
             case 13: // Toolsmith

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2022 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
@@ -20,9 +20,7 @@ package com.viaversion.viabackwards.protocol.protocol1_13_2to1_14.packets;
 import com.viaversion.viabackwards.protocol.protocol1_13_2to1_14.Protocol1_13_2To1_14;
 import com.viaversion.viabackwards.protocol.protocol1_13_2to1_14.storage.DifficultyStorage;
 import com.viaversion.viaversion.api.minecraft.Position;
-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.rewriter.RewriterBase;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ServerboundPackets1_13;
@@ -36,9 +34,9 @@ public class PlayerPackets1_14 extends RewriterBase<Protocol1_13_2To1_14> {
 
     @Override
     protected void registerPackets() {
-        protocol.registerClientbound(ClientboundPackets1_14.SERVER_DIFFICULTY, new PacketRemapper() {
+        protocol.registerClientbound(ClientboundPackets1_14.SERVER_DIFFICULTY, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.UNSIGNED_BYTE);
                 map(Type.BOOLEAN, Type.NOTHING); // Locked
                 handler(wrapper -> {
@@ -48,96 +46,85 @@ public class PlayerPackets1_14 extends RewriterBase<Protocol1_13_2To1_14> {
             }
         });
 
-        protocol.registerClientbound(ClientboundPackets1_14.OPEN_SIGN_EDITOR, new PacketRemapper() { // c
+        protocol.registerClientbound(ClientboundPackets1_14.OPEN_SIGN_EDITOR, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.POSITION1_14, Type.POSITION);
             }
         });
-        protocol.registerServerbound(ServerboundPackets1_13.QUERY_BLOCK_NBT, new PacketRemapper() {
+        protocol.registerServerbound(ServerboundPackets1_13.QUERY_BLOCK_NBT, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT);
                 map(Type.POSITION, Type.POSITION1_14);
             }
         });
-        protocol.registerServerbound(ServerboundPackets1_13.PLAYER_DIGGING, new PacketRemapper() {
+        protocol.registerServerbound(ServerboundPackets1_13.PLAYER_DIGGING, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT); // Action
                 map(Type.POSITION, Type.POSITION1_14); // Position
             }
         });
 
-        protocol.registerServerbound(ServerboundPackets1_13.RECIPE_BOOK_DATA, new PacketRemapper() {
+        protocol.registerServerbound(ServerboundPackets1_13.RECIPE_BOOK_DATA, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.VAR_INT);
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        int type = wrapper.get(Type.VAR_INT, 0);
-                        if (type == 0) {
-                            wrapper.passthrough(Type.STRING);
-                        } else if (type == 1) {
-                            wrapper.passthrough(Type.BOOLEAN); // Crafting Recipe Book Open
-                            wrapper.passthrough(Type.BOOLEAN); // Crafting Recipe Filter Active
-                            wrapper.passthrough(Type.BOOLEAN); // Smelting Recipe Book Open
-                            wrapper.passthrough(Type.BOOLEAN); // Smelting Recipe Filter Active
+                handler(wrapper -> {
+                    int type = wrapper.get(Type.VAR_INT, 0);
+                    if (type == 0) {
+                        wrapper.passthrough(Type.STRING);
+                    } else if (type == 1) {
+                        wrapper.passthrough(Type.BOOLEAN); // Crafting Recipe Book Open
+                        wrapper.passthrough(Type.BOOLEAN); // Crafting Recipe Filter Active
+                        wrapper.passthrough(Type.BOOLEAN); // Smelting Recipe Book Open
+                        wrapper.passthrough(Type.BOOLEAN); // Smelting Recipe Filter Active
 
-                            // Blast furnace/smoker data
-                            wrapper.write(Type.BOOLEAN, false);
-                            wrapper.write(Type.BOOLEAN, false);
-                            wrapper.write(Type.BOOLEAN, false);
-                            wrapper.write(Type.BOOLEAN, false);
-                        }
+                        // Blast furnace/smoker data
+                        wrapper.write(Type.BOOLEAN, false);
+                        wrapper.write(Type.BOOLEAN, false);
+                        wrapper.write(Type.BOOLEAN, false);
+                        wrapper.write(Type.BOOLEAN, false);
                     }
                 });
             }
         });
 
-        protocol.registerServerbound(ServerboundPackets1_13.UPDATE_COMMAND_BLOCK, new PacketRemapper() {
+        protocol.registerServerbound(ServerboundPackets1_13.UPDATE_COMMAND_BLOCK, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.POSITION, Type.POSITION1_14);
             }
         });
-        protocol.registerServerbound(ServerboundPackets1_13.UPDATE_STRUCTURE_BLOCK, new PacketRemapper() {
+        protocol.registerServerbound(ServerboundPackets1_13.UPDATE_STRUCTURE_BLOCK, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.POSITION, Type.POSITION1_14);
             }
         });
-        protocol.registerServerbound(ServerboundPackets1_13.UPDATE_SIGN, new PacketRemapper() {
+        protocol.registerServerbound(ServerboundPackets1_13.UPDATE_SIGN, new PacketHandlers() {
             @Override
-            public void registerMap() {
+            public void register() {
                 map(Type.POSITION, Type.POSITION1_14);
             }
         });
 
-        protocol.registerServerbound(ServerboundPackets1_13.PLAYER_BLOCK_PLACEMENT, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                handler(new PacketHandler() {
-                    @Override
-                    public void handle(PacketWrapper wrapper) throws Exception {
-                        Position position = wrapper.read(Type.POSITION);
-                        int face = wrapper.read(Type.VAR_INT);
-                        int hand = wrapper.read(Type.VAR_INT);
-                        float x = wrapper.read(Type.FLOAT);
-                        float y = wrapper.read(Type.FLOAT);
-                        float z = wrapper.read(Type.FLOAT);
+        protocol.registerServerbound(ServerboundPackets1_13.PLAYER_BLOCK_PLACEMENT, wrapper -> {
+            Position position = wrapper.read(Type.POSITION);
+            int face = wrapper.read(Type.VAR_INT);
+            int hand = wrapper.read(Type.VAR_INT);
+            float x = wrapper.read(Type.FLOAT);
+            float y = wrapper.read(Type.FLOAT);
+            float z = wrapper.read(Type.FLOAT);
 
-                        wrapper.write(Type.VAR_INT, hand);
-                        wrapper.write(Type.POSITION1_14, position);
-                        wrapper.write(Type.VAR_INT, face);
-                        wrapper.write(Type.FLOAT, x);
-                        wrapper.write(Type.FLOAT, y);
-                        wrapper.write(Type.FLOAT, z);
-                        wrapper.write(Type.BOOLEAN, false); // Inside block
-                    }
-                });
-            }
+            wrapper.write(Type.VAR_INT, hand);
+            wrapper.write(Type.POSITION1_14, position);
+            wrapper.write(Type.VAR_INT, face);
+            wrapper.write(Type.FLOAT, x);
+            wrapper.write(Type.FLOAT, y);
+            wrapper.write(Type.FLOAT, z);
+            wrapper.write(Type.BOOLEAN, false); // Inside block
         });
     }
 }

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2022 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
@@ -23,7 +23,6 @@ import com.viaversion.viabackwards.protocol.protocol1_13_2to1_14.Protocol1_13_2T
 import com.viaversion.viabackwards.protocol.protocol1_13_2to1_14.storage.EntityPositionStorage1_14;
 import com.viaversion.viaversion.api.data.entity.StoredEntityData;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
-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.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
@@ -37,49 +36,44 @@ public class SoundPackets1_14 extends RewriterBase<Protocol1_13_2To1_14> {
 
     @Override
     protected void registerPackets() {
-        SoundRewriter soundRewriter = new SoundRewriter(protocol);
+        SoundRewriter<ClientboundPackets1_14> soundRewriter = new SoundRewriter<>(protocol);
         soundRewriter.registerSound(ClientboundPackets1_14.SOUND);
         soundRewriter.registerNamedSound(ClientboundPackets1_14.NAMED_SOUND);
         soundRewriter.registerStopSound(ClientboundPackets1_14.STOP_SOUND);
 
         // Entity Sound Effect
-        protocol.registerClientbound(ClientboundPackets1_14.ENTITY_SOUND, null, new PacketRemapper() {
-            @Override
-            public void registerMap() {
-                handler(wrapper -> {
-                    wrapper.cancel();
+        protocol.registerClientbound(ClientboundPackets1_14.ENTITY_SOUND, null, wrapper -> {
+            wrapper.cancel();
 
-                    int soundId = wrapper.read(Type.VAR_INT);
-                    int newId = protocol.getMappingData().getSoundMappings().getNewId(soundId);
-                    if (newId == -1) return;
+            int soundId = wrapper.read(Type.VAR_INT);
+            int newId = protocol.getMappingData().getSoundMappings().getNewId(soundId);
+            if (newId == -1) return;
 
-                    int category = wrapper.read(Type.VAR_INT);
-                    int entityId = wrapper.read(Type.VAR_INT);
+            int category = wrapper.read(Type.VAR_INT);
+            int entityId = wrapper.read(Type.VAR_INT);
 
-                    StoredEntityData storedEntity = wrapper.user().getEntityTracker(protocol.getClass()).entityData(entityId);
-                    EntityPositionStorage1_14 entityStorage;
-                    if (storedEntity == null || (entityStorage = storedEntity.get(EntityPositionStorage1_14.class)) == null) {
-                        ViaBackwards.getPlatform().getLogger().warning("Untracked entity with id " + entityId);
-                        return;
-                    }
-
-                    float volume = wrapper.read(Type.FLOAT);
-                    float pitch = wrapper.read(Type.FLOAT);
-                    int x = (int) (entityStorage.getX() * 8D);
-                    int y = (int) (entityStorage.getY() * 8D);
-                    int z = (int) (entityStorage.getZ() * 8D);
-
-                    PacketWrapper soundPacket = wrapper.create(ClientboundPackets1_13.SOUND);
-                    soundPacket.write(Type.VAR_INT, newId);
-                    soundPacket.write(Type.VAR_INT, category);
-                    soundPacket.write(Type.INT, x);
-                    soundPacket.write(Type.INT, y);
-                    soundPacket.write(Type.INT, z);
-                    soundPacket.write(Type.FLOAT, volume);
-                    soundPacket.write(Type.FLOAT, pitch);
-                    soundPacket.send(Protocol1_13_2To1_14.class);
-                });
+            StoredEntityData storedEntity = wrapper.user().getEntityTracker(protocol.getClass()).entityData(entityId);
+            EntityPositionStorage1_14 entityStorage;
+            if (storedEntity == null || (entityStorage = storedEntity.get(EntityPositionStorage1_14.class)) == null) {
+                ViaBackwards.getPlatform().getLogger().warning("Untracked entity with id " + entityId);
+                return;
             }
+
+            float volume = wrapper.read(Type.FLOAT);
+            float pitch = wrapper.read(Type.FLOAT);
+            int x = (int) (entityStorage.getX() * 8D);
+            int y = (int) (entityStorage.getY() * 8D);
+            int z = (int) (entityStorage.getZ() * 8D);
+
+            PacketWrapper soundPacket = wrapper.create(ClientboundPackets1_13.SOUND);
+            soundPacket.write(Type.VAR_INT, newId);
+            soundPacket.write(Type.VAR_INT, category);
+            soundPacket.write(Type.INT, x);
+            soundPacket.write(Type.INT, y);
+            soundPacket.write(Type.INT, z);
+            soundPacket.write(Type.FLOAT, volume);
+            soundPacket.write(Type.FLOAT, pitch);
+            soundPacket.send(Protocol1_13_2To1_14.class);
         });
     }
 }

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2022 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
@@ -19,7 +19,6 @@ package com.viaversion.viabackwards.protocol.protocol1_13_2to1_14.storage;
 
 import com.viaversion.viaversion.api.connection.StoredObject;
 import com.viaversion.viaversion.api.connection.UserConnection;
-
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;