4.9.0 Release

Fix #3542 (#3543 )
Ignore invalid chunk data in legacy versions (#3538 )
2023-12-04 10:11:08 +01:00 · 2023-12-04 10:09:25 +01:00 · 2023-12-03 18:37:57 +01:00 · 2023-12-03 18:35:19 +01:00 · 2023-12-03 18:34:14 +01:00 · 2023-12-03 18:33:34 +01:00
881 changed files with 33989 additions and 167048 deletions
@@ -7,7 +7,7 @@ body:
    attributes:
      value: |
        **Before reporting a bug, please see if using master/dev builds from https://ci.viaversion.com/ fixes your issue.**
-        Whenever you see fit, you can upload images or video to any of the textfields.
+        Whenever you see fit, you can upload images or videos to any of the text fields.

  - type: input
    attributes:
@@ -71,7 +71,7 @@ body:
    attributes:
      label: Additional Server Info
      description: |
-        Do you use a proxy (eg. BungeeCord)? What software do you use and what plugins?
+        Do you use a proxy (e.g. BungeeCord)? What software do you use and what plugins?
      placeholder: |
        Example: "I also use BungeeCord with the following plugins: x, y, z"
    validations:
@@ -88,5 +88,5 @@ body:
          required: true
        - label: If applicable, I have included a paste (**not a screenshot**) of the error.
          required: true
-        - label: I have tried a build from https://ci.viaversion.com/ and the issue still persists.
+        - label: I have tried the latest build(s) from https://ci.viaversion.com/ and the issue still persists.
          required: true
@@ -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
@@ -1,28 +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:
-    # Only run on PRs if the source branch is on a different repo. We do not need run everything twice.
+    # Only run on PRs if the source branch is on a different repo. We do not need to run everything twice.
    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: gradle/wrapper-validation-action@v1
+    - name: Checkout Repository
+      uses: actions/checkout@v4
+    - name: Validate Gradle Wrapper
+      uses: gradle/wrapper-validation-action@v1
    - name: Set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
      with:
-        distribution: 'adopt'
+        distribution: 'temurin'
        java-version: 11
+        check-latest: true
    - name: Build with Gradle
      run: ./gradlew build
-    - uses: actions/upload-artifact@v2
-      with:
-        name: artifact
-        path: build/libs
@@ -0,0 +1,27 @@
+name: Publish to Hangar and Modrinth
+on:
+  push:
+    branches:
+      - master
+      - dev
+
+jobs:
+  publish:
+    if: github.repository_owner == 'ViaVersion'
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+      - name: Validate Gradle Wrapper
+        uses: gradle/wrapper-validation-action@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: 17
+          check-latest: true
+      - name: Publish
+        env:
+          HANGAR_TOKEN: ${{ secrets.HANGAR_TOKEN }}
+          MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
+        run: ./gradlew build modrinth publishAllPublicationsToHangar --stacktrace
@@ -18,6 +18,8 @@ hs_err_pid*

 # Ignore IDEA directory
 .idea/*
+!.idea/copyright/*
+!.idea/scopes/*

 # Include the project's dictionary
 !.idea/dictionaries/
@@ -106,8 +108,5 @@ nbactions.xml
 nb-configuration.xml
 .nb-gradle/

-
-
-### Git ###
-# Don't exclude the .gitignore itself
-!.gitignore
+### MacOS ###
+.DS_Store
@@ -0,0 +1,11 @@
+<component name="CopyrightManager">
+  <settings>
+    <module2copyright>
+      <element module="ViaVersion-API" copyright="viaversion-mit" />
+      <element module="ViaVersion" copyright="viaversion-gpl" />
+    </module2copyright>
+    <LanguageOptions name="__TEMPLATE__">
+      <option name="addBlankAfter" value="false" />
+    </LanguageOptions>
+  </settings>
+</component>
@@ -0,0 +1,6 @@
+<component name="CopyrightManager">
+  <copyright>
+    <option name="notice" value="This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion&#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="viaversion-gpl" />
+  </copyright>
+</component>
@@ -0,0 +1,6 @@
+<component name="CopyrightManager">
+  <copyright>
+    <option name="notice" value="This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion&#10;Copyright (C) &amp;#36;originalComment.match(&quot;Copyright \(C\) (\d+)&quot;, 1, &quot;-&quot;)&amp;#36;today.year ViaVersion and contributors&#10;&#10;Permission is hereby granted, free of charge, to any person obtaining a copy&#10;of this software and associated documentation files (the &quot;Software&quot;), to deal&#10;in the Software without restriction, including without limitation the rights&#10;to use, copy, modify, merge, publish, distribute, sublicense, and/or sell&#10;copies of the Software, and to permit persons to whom the Software is&#10;furnished to do so, subject to the following conditions:&#10;&#10;The above copyright notice and this permission notice shall be included in all&#10;copies or substantial portions of the Software.&#10;&#10;THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR&#10;IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,&#10;FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE&#10;AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER&#10;LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,&#10;OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE&#10;SOFTWARE." />
+    <option name="myName" value="viaversion-mit" />
+  </copyright>
+</component>
@@ -0,0 +1,3 @@
+<component name="DependencyValidationManager">
+  <scope name="ViaVersion" pattern="com.viaversion.viaversion..*&amp;&amp;!src[viaversion-parent.viaversion-api*]:*..*" />
+</component>
@@ -0,0 +1,3 @@
+<component name="DependencyValidationManager">
+  <scope name="ViaVersion-API" pattern="src[viaversion-parent.viaversion-api*]:*..*&amp;&amp;!src[viaversion-parent.viaversion-api.main]:com.viaversion.viaversion.api.minecraft.nbt.*" />
+</component>
@@ -1,44 +1,41 @@
-# ViaVersion - Spigot, Sponge, BungeeCord, Velocity
+# ViaVersion

 [![Latest Release](https://img.shields.io/github/v/release/ViaVersion/ViaVersion)](https://viaversion.com)
 [![Build Status](https://github.com/ViaVersion/ViaVersion/actions/workflows/gradle.yml/badge.svg?branch=master)](https://github.com/ViaVersion/ViaVersion/actions)
 [![Discord](https://img.shields.io/badge/chat-on%20discord-blue.svg)](https://viaversion.com/discord)

-**Allows the connection of higher client versions to lower server versions**
+**Allows the connection of higher client versions to lower server versions -
+it works on any platform you can think of.**
+
+The base ViaVersion jar runs on Paper, Velocity, Bungee, and Sponge. We also have projects integrating ViaVersion to run
+on Fabric, Forge, or as a standalone proxy to  join from basically any client version on any server version from the
+past decade. **See [HERE](https://github.com/ViaVersion) for an overview of the different Via\* projects.**

 Supported Versions:

-![Table (https://i.imgur.com/uDM9HR8.png)](https://i.imgur.com/uDM9HR8.png)
-
-On Paper you may also use ProtocolSupport, but ensure you have the right build for your server version.
+![Table (https://i.imgur.com/sTrVnC2.png)](https://i.imgur.com/sTrVnC2.png)

 **User Docs:** https://docs.viaversion.com/display/VIAVERSION/

-
-Sources:
+Releases/Dev Builds
 --------
-**[wiki.vg](https://wiki.vg)** (Used for information regarding packet structure, we also contribute back)
+You can find official releases in the following places:

-**[Burger](https://github.com/Pokechu22/Burger)** (See [PAaaS](https://github.com/Matsv/Paaas))
+- **Hangar (for our plugins)**: https://hangar.papermc.io/ViaVersion/ViaVersion
+- **Modrinth (for our mods)**: https://modrinth.com/mod/viaversion
+- **GitHub**: https://github.com/ViaVersion/ViaVersion/releases

-**[OpenNBT](https://github.com/ViaVersion/OpenNBT)**
+Dev builds for **all** of our projects are on our Jenkins server:

+- **Jenkins**: https://ci.viaversion.com

-Releases / Dev Builds:
--------
-You can find official releases here:
-
-https://www.spigotmc.org/resources/viaversion.19254/history
-
+ViaVersion as a Dependency
 ----------

-You can find official dev builds here:
-
-**Jenkins:** https://ci.viaversion.com
-
 **JavaDocs:** https://jd.viaversion.com

-**Maven Repository:**
+**Maven:**
+
 ```xml
 <repository>
    <id>viaversion-repo</id>
@@ -46,34 +43,57 @@ You can find official dev builds here:
 </repository>
 ```

-**API-artifact:**
 ```xml
 <dependency>
    <groupId>com.viaversion</groupId>
    <artifactId>viaversion-api</artifactId>
-    <version>LATEST</version>
+    <version>[4.0.0,5.0.0)</version>
    <scope>provided</scope>
 </dependency>
 ```

-Replace the version depending on your needs.
+**Gradle:**
+
+```kotlin
+repositories {
+    maven("https://repo.viaversion.com")
+}
+
+dependencies {
+    compileOnly("com.viaversion:viaversion-api:VERSION") // Replace the version
+}
+```

 If you need access to the existing protocol or platform implementations, use the parent artifact `viaversion`.
 Please note the [differences in licensing](#license).


-Building:
+Building
 --------
-After cloning this repository, build the project with Gradle by running `./gradlew build` and take the created jar out of
-the `build/libs` directory.
+After cloning this repository, build the project with Gradle by running `./gradlew build` and take the created jar out
+of the `build/libs` directory.


-License:
+Mapping Files
+--------------
+Mapping files are generated and managed in our [Mappings repository](https://github.com/ViaVersion/Mappings).
+
+
+Resources
 --------
-The entirety of the [API directory](api) (including the legacy API directory) is licensed under the MIT License; see [licenses/MIT.md](licenses/MIT.md) for
+
+- **[Via Mappings Generator](https://github.com/ViaVersion/Mappings)**
+- **[Mojang mappings](https://minecraft.wiki/w/Obfuscation_map)** (Thank you, Mojang, very cool)
+- **[wiki.vg](https://wiki.vg)** (Used for historic information regarding packet structure, we also contribute back)
+- **[Burger](https://github.com/Pokechu22/Burger)** (See [PAaaS](https://github.com/Matsv/Paaas))
+
+License
+--------
+The entirety of the [API directory](api) (including the legacy API directory) is licensed under the MIT License;
+see [licenses/MIT.md](licenses/MIT.md) for
 details.

-Everything else, unless explicitly stated otherwise, is licensed under the GNU General Public License, including the end
-product as a whole; see [licenses/GPL.md](licenses/GPL.md) for details.
+Everything else, unless explicitly stated otherwise, is licensed under the GNU General Public License v3, including the
+end-product as a whole; see [licenses/GPL.md](licenses/GPL.md) for details.

 Special thanks to all our [Contributors](https://github.com/ViaVersion/ViaVersion/graphs/contributors).
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,13 +23,12 @@
 package us.myles.ViaVersion.api;

 import io.netty.buffer.ByteBuf;
+import java.util.SortedSet;
+import java.util.UUID;
 import us.myles.ViaVersion.api.boss.BossBar;
 import us.myles.ViaVersion.api.boss.BossColor;
 import us.myles.ViaVersion.api.boss.BossStyle;

-import java.util.SortedSet;
-import java.util.UUID;
-
 /**
 * @deprecated may be removed at some point, use {@link com.viaversion.viaversion.api.Via}
 */
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -24,13 +24,12 @@ package us.myles.ViaVersion.api;

 import com.viaversion.viaversion.api.Via;
 import io.netty.buffer.ByteBuf;
+import java.util.SortedSet;
+import java.util.UUID;
 import us.myles.ViaVersion.api.boss.BossBar;
 import us.myles.ViaVersion.api.boss.BossColor;
 import us.myles.ViaVersion.api.boss.BossStyle;

-import java.util.SortedSet;
-import java.util.UUID;
-
 /**
 * @deprecated may be removed at some point, use {@link Via#getAPI()}
 */
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -26,14 +26,13 @@ import com.google.common.base.Preconditions;
 import com.viaversion.viaversion.api.protocol.version.VersionRange;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;

 /**
 * @deprecated will no longer be updated and may be removed at some point, use {@link com.viaversion.viaversion.api.protocol.version.ProtocolVersion}
@@ -81,6 +80,15 @@ public class ProtocolVersion {
    public static final ProtocolVersion v1_16_4 = register(754, "1.16.4/5", new VersionRange("1.16", 4, 5));
    public static final ProtocolVersion v1_17 = register(755, "1.17");
    public static final ProtocolVersion v1_17_1 = register(756, "1.17.1");
+    public static final ProtocolVersion v1_18 = register(757, "1.18/1.18.1", new VersionRange("1.18", 0, 1));
+    public static final ProtocolVersion v1_18_2 = register(758, "1.18.2");
+    public static final ProtocolVersion v1_19 = register(759, "1.19");
+    public static final ProtocolVersion v1_19_1 = register(760, "1.19.1/2", new VersionRange("1.19", 1, 2));
+    public static final ProtocolVersion v1_19_3 = register(761, "1.19.3");
+    public static final ProtocolVersion v1_19_4 = register(762, "1.19.4");
+    public static final ProtocolVersion v1_20 = register(763, "1.20/1.20.1", new VersionRange("1.20", 0, 1));
+    public static final ProtocolVersion v1_20_2 = register(764, "1.20.2");
+    public static final ProtocolVersion v1_20_3 = register(765, "1.20.3");
    public static final ProtocolVersion unknown = register(-1, "UNKNOWN");

    public static ProtocolVersion register(int version, String name) {
@@ -167,12 +175,12 @@ public class ProtocolVersion {
        Preconditions.checkArgument(!versionWildcard || versionRange == null, "A version cannot be a wildcard and a range at the same time!");
        if (versionRange != null) {
            includedVersions = new LinkedHashSet<>();
-            for (int i = versionRange.getRangeFrom(); i <= versionRange.getRangeTo(); i++) {
+            for (int i = versionRange.rangeFrom(); i <= versionRange.rangeTo(); i++) {
                if (i == 0) {
-                    includedVersions.add(versionRange.getBaseVersion()); // Keep both the base version and with ".0" appended
+                    includedVersions.add(versionRange.baseVersion()); // Keep both the base version and with ".0" appended
                }

-                includedVersions.add(versionRange.getBaseVersion() + "." + i);
+                includedVersions.add(versionRange.baseVersion() + "." + i);
            }
        } else {
            includedVersions = Collections.singleton(name);
@@ -1,11 +1,17 @@
 plugins {
    id("net.kyori.blossom")
-    id("via.shadow-conventions")
+    id("org.jetbrains.gradle.plugin.idea-ext")
 }

-blossom {
-    replaceToken("\$VERSION", project.version)
-    replaceToken("\$IMPL_VERSION", "git-ViaVersion-${project.version}:${rootProject.latestCommitHash()}")
+sourceSets {
+    main {
+        blossom {
+            javaSources {
+                property("version", project.version.toString())
+                property("impl_version", "git-ViaVersion-${project.version}:${rootProject.latestCommitHash()}")
+            }
+        }
+    }
 }

 dependencies {
@@ -13,7 +19,9 @@ dependencies {
        targetConfiguration = "shadow"
    }
    api(libs.fastutil)
-    api(libs.openNBT)
+    api(libs.flare)
+    api(libs.flareFastutil)
+    api(libs.vianbt)
    api(libs.gson)

    compileOnlyApi(libs.snakeYaml)
@@ -25,3 +33,5 @@ dependencies {
 java {
    withJavadocJar()
 }
+
+publishShadowJar()
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -31,5 +31,14 @@ public final class VersionInfo {
     *
     * @see ViaPlatform#getPluginVersion()
     */
-    public static final String VERSION = "$VERSION";
+    public static final String VERSION = "{{ version }}";
+    private static final String IMPLEMENTATION_VERSION = "{{ impl_version }}";
+
+    public static String getVersion() {
+        return VERSION;
+    }
+
+    public static String getImplementationVersion() {
+        return IMPLEMENTATION_VERSION;
+    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -25,6 +25,7 @@ package com.viaversion.viaversion.api;
 import com.google.common.base.Preconditions;
 import com.viaversion.viaversion.api.configuration.ViaVersionConfig;
 import com.viaversion.viaversion.api.platform.ViaPlatform;
+import com.viaversion.viaversion.api.platform.ViaServerProxyPlatform;

 public final class Via {
    private static ViaManager manager;
@@ -63,6 +64,11 @@ public final class Via {
        return manager().getPlatform();
    }

+    public static ViaServerProxyPlatform<?> proxyPlatform() {
+        Preconditions.checkArgument(manager().getPlatform() instanceof ViaServerProxyPlatform, "Platform is not proxying Minecraft servers!");
+        return (ViaServerProxyPlatform<?>) manager().getPlatform();
+    }
+
    /**
     * Register the ViaManager associated with the platform.
     *
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -29,10 +29,9 @@ import com.viaversion.viaversion.api.platform.ViaPlatform;
 import com.viaversion.viaversion.api.protocol.ProtocolManager;
 import com.viaversion.viaversion.api.protocol.version.ServerProtocolVersion;
 import io.netty.buffer.ByteBuf;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.SortedSet;
 import java.util.UUID;
+import org.checkerframework.checker.nullness.qual.Nullable;

 /**
 * General api point. For more specialized api methods, see {@link Via#getManager()}.
@@ -46,13 +45,25 @@ import java.util.UUID;
 public interface ViaAPI<T> {

    /**
-     * Returns the API version incremented with meaningful API changes.
+     * Returns the <b>major version</b> matching {@link #getVersion()}.
+     * It is highly advised to check against the major version and to disable/not initiate
+     * any hooks into ViaVersion if given and expected versions do not match.
+     *
+     * @return major plugin version
+     * @since 4.0.2
+     */
+    default int majorVersion() {
+        return 4;
+    }
+
+    /**
+     * Returns an <b>internally based API version</b> incremented with meaningful API changes.
     * This includes breaking changes to existing API and larger additions.
     *
     * @return API version incremented with meaningful API changes
     */
    default int apiVersion() {
-        return 3;
+        return 22;
    }

    /**
@@ -106,7 +117,7 @@ public interface ViaAPI<T> {
     * Sends a raw packet to the player.
     *
     * @param player the platform's player object, e.g. for Bukkit this is Player
-     * @param packet the packet; you need a VarInt Id, then the packet contents
+     * @param packet the packet; you need a VarInt id, then the packet contents
     * @throws IllegalArgumentException if the player is not injected by Via
     */
    void sendRawPacket(T player, ByteBuf packet);
@@ -115,7 +126,7 @@ public interface ViaAPI<T> {
     * Sends a raw packet to the player.
     *
     * @param uuid   the uuid from the player to send packet
-     * @param packet the packet; you need a VarInt Id, then the packet contents
+     * @param packet the packet; you need a VarInt id, then the packet contents
     * @throws IllegalArgumentException if the player is not injected by Via
     */
    void sendRawPacket(UUID uuid, ByteBuf packet);
@@ -124,7 +135,7 @@ public interface ViaAPI<T> {
     * Returns the supported protocol versions.
     * This method removes any blocked protocol versions.
     *
-     * @return a list of protocol versions
+     * @return a sorted set of protocol versions
     * @see #getFullSupportedVersions() for a full list
     */
    SortedSet<Integer> getSupportedVersions();
@@ -132,7 +143,7 @@ public interface ViaAPI<T> {
    /**
     * Returns the supported protocol versions, including blocked protocols.
     *
-     * @return a list of protocol versions
+     * @return a sorted set of protocol versions
     */
    SortedSet<Integer> getFullSupportedVersions();

@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,13 +23,15 @@
 package com.viaversion.viaversion.api;

 import com.viaversion.viaversion.api.command.ViaVersionCommand;
+import com.viaversion.viaversion.api.configuration.ConfigurationProvider;
 import com.viaversion.viaversion.api.connection.ConnectionManager;
+import com.viaversion.viaversion.api.debug.DebugHandler;
 import com.viaversion.viaversion.api.platform.ViaInjector;
 import com.viaversion.viaversion.api.platform.ViaPlatform;
 import com.viaversion.viaversion.api.platform.ViaPlatformLoader;
 import com.viaversion.viaversion.api.platform.providers.ViaProviders;
 import com.viaversion.viaversion.api.protocol.ProtocolManager;
-
+import com.viaversion.viaversion.api.scheduler.Scheduler;
 import java.util.Set;

 public interface ViaManager {
@@ -83,19 +85,45 @@ public interface ViaManager {
     */
    ViaPlatformLoader getLoader();

+    /**
+     * Returns the async task scheduler.
+     *
+     * @return async task scheduler
+     */
+    Scheduler getScheduler();
+
+    /**
+     * Returns the configuration provider.
+     *
+     * @return the configuration provider
+     */
+    ConfigurationProvider getConfigurationProvider();
+
    /**
     * If debug is enabled, packets and other otherwise suppressed warnings will be logged.
     *
     * @return true if enabled
     */
-    boolean isDebug();
+    default boolean isDebug() {
+        return debugHandler().enabled();
+    }

    /**
     * Sets the debug mode. If enabled, packets and other otherwise suppressed warnings will be logged.
     *
     * @param debug whether debug should be enabled
     */
-    void setDebug(boolean debug);
+    @Deprecated
+    default void setDebug(boolean debug) {
+        debugHandler().setEnabled(debug);
+    }
+
+    /**
+     * Returns the debug handler.
+     *
+     * @return debug handler
+     */
+    DebugHandler debugHandler();

    /**
     * Returns a mutable set of self-added subplatform version strings.
@@ -111,4 +139,12 @@ public interface ViaManager {
     * @param runnable runnable to be executed
     */
    void addEnableListener(Runnable runnable);
+
+    /**
+     * Returns whether the manager has been initialized (and protocols have been loaded).
+     *
+     * @return whether the manager has been initialized
+     */
+    boolean isInitialized();
+
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -28,7 +28,7 @@ public interface ViaCommandSender {
    /**
     * Check if the sender has a permission.
     *
-     * @param permission Permission string eg. viaversion.admin
+     * @param permission Permission string e.g. viaversion.admin
     * @return True if the sender has the permission
     */
    boolean hasPermission(String permission);
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,6 @@
 package com.viaversion.viaversion.api.command;

 import com.viaversion.viaversion.util.ChatColorUtil;
-
 import java.util.Collections;
 import java.util.List;

@@ -59,7 +58,7 @@ public abstract class ViaSubCommand {
     * @return The permission required to use the commands
     */
    public String permission() {
-        return "viaversion.admin";
+        return "viaversion.admin." + name();
    }

    /**
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,9 +22,8 @@
 */
 package com.viaversion.viaversion.api.command;

-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.List;
+import org.checkerframework.checker.nullness.qual.Nullable;

 public interface ViaVersionCommand {
    /**
@@ -33,7 +32,7 @@ public interface ViaVersionCommand {
     * @param command Your own SubCommand instance to handle it.
     * @throws Exception throws an exception when the subcommand already exists or if it's not valid, example: spacee
     */
-    void registerSubCommand(ViaSubCommand command) throws Exception;
+    void registerSubCommand(ViaSubCommand command);

    /**
     * Check if a subcommand is registered.
@@ -0,0 +1,53 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2023 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.configuration;
+
+import java.util.Map;
+
+public interface Config {
+
+    /**
+     * Reloads the config
+     */
+    void reload();
+
+    /**
+     * Saves the config
+     */
+    void save();
+
+    /**
+     * Sets the specified path to the given value.
+     *
+     * @param path  Path of the object to set.
+     * @param value New value to set the path to
+     */
+    void set(String path, Object value);
+
+    /**
+     * Get all the configuration values
+     *
+     * @return Map with key-values
+     */
+    Map<String, Object> getValues();
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,32 +22,26 @@
 */
 package com.viaversion.viaversion.api.configuration;

-import java.util.Map;
+import java.util.Collection;

 public interface ConfigurationProvider {

    /**
-     * Sets the specified path to the given value.
+     * Registers a config to be saved or reloaded when {@link #reloadConfigs()} is called.
     *
-     * @param path  Path of the object to set.
-     * @param value New value to set the path to
+     * @param config the config to register
     */
-    void set(String path, Object value);
+    void register(Config config);

    /**
-     * Saves the config
-     */
-    void saveConfig();
-
-    /**
-     * Reloads the config
-     */
-    void reloadConfig();
-
-    /**
-     * Get all the configuration values
+     * Returns all registered configs.
     *
-     * @return Map with key-values
+     * @return unmodifiable collection of all registered configs
     */
-    Map<String, Object> getValues();
+    Collection<Config> configs();
+
+    /**
+     * Reloads the configuration files.
+     */
+    void reloadConfigs();
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,9 +23,14 @@
 package com.viaversion.viaversion.api.configuration;

 import com.google.gson.JsonElement;
+import com.viaversion.viaversion.api.connection.StorableObject;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.WorldIdentifiers;
+import com.viaversion.viaversion.api.protocol.version.BlockedProtocolVersions;
 import it.unimi.dsi.fastutil.ints.IntSet;
+import org.checkerframework.checker.nullness.qual.Nullable;

-public interface ViaVersionConfig {
+public interface ViaVersionConfig extends Config {

    /**
     * Get if the plugin should check for updates
@@ -82,7 +87,7 @@ public interface ViaVersionConfig {
     * <p>
     * This option requires {@link #isShowShieldWhenSwordInHand()} to be disabled
     *
-     * @return {@code true} if non delayed shield blocking is enabled.
+     * @return {@code true} if non-delayed shield blocking is enabled.
     */
    boolean isNoDelayShieldBlocking();

@@ -121,7 +126,7 @@ public interface ViaVersionConfig {
     * Get if the boss bars for 1.9 &amp; 1.10 clients are being stopped from flickering
     * This will keep all boss bars on 100% (not recommended)
     *
-     * @return true if boss bar anti flickering is enabled
+     * @return true if boss bar anti-flickering is enabled
     */
    boolean isBossbarAntiflicker();

@@ -181,13 +186,6 @@ public interface ViaVersionConfig {
     */
    String getMaxWarningsKickMessage();

-    /**
-     * Is anti-xray enabled?
-     *
-     * @return A boolean
-     */
-    boolean isAntiXRay();
-
    /**
     * Send supported versions in the status response packet
     *
@@ -230,6 +228,13 @@ public interface ViaVersionConfig {
     */
    int getPistonReplacementId();

+    /**
+     * Fix 1.9+ clients not rendering the far away chunks
+     *
+     * @return true to fix chunk borders
+     */
+    boolean isChunkBorderFix();
+
    /**
     * Force json transform
     *
@@ -251,6 +256,8 @@ public interface ViaVersionConfig {
     */
    boolean is1_13TeamColourFix();

+    boolean shouldRegisterUserConnectionOnJoin();
+
    /**
     * Should we fix shift quick move action for 1.12 clients
     *
@@ -258,12 +265,23 @@ public interface ViaVersionConfig {
     */
    boolean is1_12QuickMoveActionFix();

+    /**
+     * API to check for blocked protocol versions.
+     *
+     * @return blocked protocol versions
+     */
+    BlockedProtocolVersions blockedProtocolVersions();
+
    /**
     * Get the blocked protocols
     *
     * @return An Integer list
+     * @deprecated use {@link #blockedProtocolVersions()}
     */
-    IntSet getBlockedProtocols();
+    @Deprecated/*(forRemoval = true)*/
+    default IntSet getBlockedProtocols() {
+        return blockedProtocolVersions().singleBlockedVersions();
+    }

    /**
     * Get the custom disconnect message
@@ -366,7 +384,7 @@ public interface ViaVersionConfig {
    boolean isTruncate1_14Books();

    /**
-     * Handles left handed info by using unused bit 7 on Client Settings packet
+     * Handles left-handed info by using unused bit 7 on Client Settings packet
     *
     * @return true if enabled
     */
@@ -417,9 +435,32 @@ public interface ViaVersionConfig {
    boolean isForcedUse1_17ResourcePack();

    /**
-     *  Get the message that is sent when a user displays a resource pack prompt.
+     * Get the message that is sent when a user displays a resource pack prompt.
     *
     * @return cached serialized component
     */
    JsonElement get1_17ResourcePackPrompt();
+
+    /***
+     * Get the world names that should be returned for each Vanilla dimension.
+     * Note that this can be overridden per-user by using {@link UserConnection#put(StorableObject)} with
+     * a custom instance of {@link WorldIdentifiers} for the user's {@link UserConnection}.
+     *
+     * @return the global map from vanilla dimensions to world name
+     */
+    WorldIdentifiers get1_16WorldNamesMap();
+
+    /**
+     * Caches light until chunks are unloaded to allow subsequent chunk update packets as opposed to instantly uncaching when the first chunk data is sent.
+     *
+     * @return true if enabled
+     */
+    boolean cache1_17Light();
+
+    /**
+     * Force-update 1.19.4+ player's inventory when they try to swap armor in a pre-occupied slot.
+     *
+     * @return true if enabled
+     */
+    boolean isArmorToggleFix();
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,11 +22,10 @@
 */
 package com.viaversion.viaversion.api.connection;

-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+import org.checkerframework.checker.nullness.qual.Nullable;

 /**
 * Handles injected UserConnections
@@ -66,7 +65,7 @@ public interface ConnectionManager {

    /**
     * Returns the UUID from the frontend connection to this proxy server
-     * Returns null when there isn't a server or this connection isn't frontend or it doesn't have an id
+     * Returns null when there isn't a server or this connection isn't frontend, or it doesn't have an id
     * When ViaVersion is reloaded, this method may not return some players.
     * May not return ProtocolSupport players.
     * <p>
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,10 +23,10 @@
 package com.viaversion.viaversion.api.connection;

 import com.viaversion.viaversion.api.protocol.ProtocolPipeline;
+import com.viaversion.viaversion.api.protocol.packet.Direction;
 import com.viaversion.viaversion.api.protocol.packet.State;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.UUID;
+import org.checkerframework.checker.nullness.qual.Nullable;

 public interface ProtocolInfo {

@@ -34,10 +34,63 @@ public interface ProtocolInfo {
     * Returns the protocol state the user is currently in.
     *
     * @return protocol state
+     * @deprecated server and client can be in different states, use {@link #getClientState()} or {@link #getServerState()}
     */
-    State getState();
+    @Deprecated/*(forRemoval = true)*/
+    default State getState() {
+        return this.getServerState();
+    }

-    void setState(State state);
+    /**
+     * Returns the protocol state the client is currently in.
+     *
+     * @return the client protocol state
+     */
+    State getClientState();
+
+    /**
+     * Returns the protocol state the server is currently in.
+     *
+     * @return the server protocol state
+     */
+    State getServerState();
+
+    /**
+     * Returns the protocol state for the given direction.
+     *
+     * @param direction protocol direction
+     * @return state for the given direction
+     */
+    default State getState(final Direction direction) {
+        // Return the state the packet is coming from
+        return direction == Direction.CLIENTBOUND ? this.getServerState() : this.getClientState();
+    }
+
+    /**
+     * Sets both client and server state.
+     *
+     * @param state the new protocol state
+     * @see #setClientState(State)
+     * @see #setServerState(State)
+     */
+    default void setState(final State state) {
+        this.setClientState(state);
+        this.setServerState(state);
+    }
+
+    /**
+     * Sets the client protocol state.
+     *
+     * @param clientState the new client protocol state
+     */
+    void setClientState(State clientState);
+
+    /**
+     * Sets the server protocol state.
+     *
+     * @param serverState the new server protocol state
+     */
+    void setServerState(State serverState);

    /**
     * Returns the user's protocol version, or -1 if not set.
@@ -93,5 +146,6 @@ public interface ProtocolInfo {
     *
     * @return user connection
     */
+    @Deprecated/*(forRemoval = true)*/
    UserConnection getUser();
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -29,4 +29,16 @@ package com.viaversion.viaversion.api.connection;
 * @see UserConnection#put(StorableObject)
 */
 public interface StorableObject {
+
+    /**
+     * Returns whether the object should be uncached on a server switch.
+     *
+     * @return whether the object should be uncached on a server switch
+     */
+    default boolean clearOnServerSwitch() {
+        return true;
+    }
+
+    default void onRemove() {
+    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -32,12 +32,11 @@ import com.viaversion.viaversion.exception.InformativeException;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.Collection;
 import java.util.Map;
 import java.util.UUID;
 import java.util.function.Function;
+import org.checkerframework.checker.nullness.qual.Nullable;

 public interface UserConnection {

@@ -58,6 +57,15 @@ public interface UserConnection {
     */
    boolean has(Class<? extends StorableObject> objectClass);

+    /**
+     * Removes and returns an object from the storage.
+     *
+     * @param objectClass class of the object to get
+     * @param <T>         type of the class you want to get
+     * @return removed storable object if present
+     */
+    @Nullable <T extends StorableObject> T remove(Class<T> objectClass);
+
    /**
     * Put an object into the stored objects based on class.
     *
@@ -83,6 +91,7 @@ public interface UserConnection {

    /**
     * Adds an entity tracker to the user connection.
+     * Does not override existing entity trackers.
     *
     * @param protocolClass protocol class
     * @param tracker       entity tracker
@@ -91,9 +100,18 @@ public interface UserConnection {

    /**
     * Clear stored objects and entity trackers.
-     * Used for Bungee when switching servers.
     */
-    void clearStoredObjects();
+    default void clearStoredObjects() {
+        clearStoredObjects(false);
+    }
+
+    /**
+     * Clear stored objects and entity trackers.
+     * If cleared for a proxy server switch, some stored objects and tracker data will be retained.
+     *
+     * @param isServerSwitch whether the clear is due to a server switch
+     */
+    void clearStoredObjects(boolean isServerSwitch);

    /**
     * Sends a raw packet to the connection on the current thread.
@@ -291,12 +309,26 @@ public interface UserConnection {
    boolean isClientSide();

    /**
-     * Returns whether {@link ViaVersionConfig#getBlockedProtocols()} should be checked for this connection.
+     * Returns whether {@link ViaVersionConfig#blockedProtocolVersions()} should be checked for this connection.
     *
     * @return whether blocked protocols should be applied
     */
    boolean shouldApplyBlockProtocol();

+    /**
+     * Returns whether the packet limiter applies to this user.
+     *
+     * @return whether the packet limiter applies to this user
+     */
+    boolean isPacketLimiterEnabled();
+
+    /**
+     * Sets the status of the packet limiter.
+     *
+     * @param packetLimiterEnabled whether the packet limiter should be enabled
+     */
+    void setPacketLimiterEnabled(boolean packetLimiterEnabled);
+
    /**
     * Returns a newly generated uuid that will let a packet be passed through without
     * transformig its contents if used together with {@link PacketWrapper#PASSTHROUGH_ID}.
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -20,23 +20,23 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 * SOFTWARE.
 */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.data;

-import com.viaversion.viaversion.api.minecraft.item.Item;
-import com.viaversion.viaversion.api.type.Type;
-
-public abstract class BaseItemType extends Type<Item> {
-
-    protected BaseItemType() {
-        super(Item.class);
-    }
-
-    protected BaseItemType(String typeName) {
-        super(typeName, Item.class);
-    }
+public interface BiMappings extends Mappings {

+    /**
+     * Returns the inverse of the bimappings.
+     *
+     * @return inverse of the bimappings
+     */
    @Override
-    public Class<? extends Type> getBaseClass() {
-        return BaseItemType.class;
+    BiMappings inverse();
+
+    static BiMappings of(final Mappings mappings) {
+        return of(mappings, mappings.inverse());
+    }
+
+    static BiMappings of(final Mappings mappings, final Mappings inverse) {
+        return new BiMappingsBase(mappings, inverse);
    }
 }
@@ -0,0 +1,65 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2023 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.data;
+
+public class BiMappingsBase implements BiMappings {
+
+    protected final Mappings mappings;
+    private final BiMappingsBase inverse;
+
+    protected BiMappingsBase(final Mappings mappings, final Mappings inverse) {
+        this.mappings = mappings;
+        this.inverse = new BiMappingsBase(inverse, this);
+    }
+
+    private BiMappingsBase(final Mappings mappings, final BiMappingsBase inverse) {
+        this.mappings = mappings;
+        this.inverse = inverse;
+    }
+
+    @Override
+    public int getNewId(final int id) {
+        return mappings.getNewId(id);
+    }
+
+    @Override
+    public void setNewId(final int id, final int mappedId) {
+        mappings.setNewId(id, mappedId);
+        inverse.mappings.setNewId(mappedId, id);
+    }
+
+    @Override
+    public int size() {
+        return mappings.size();
+    }
+
+    @Override
+    public int mappedSize() {
+        return mappings.mappedSize();
+    }
+
+    @Override
+    public BiMappings inverse() {
+        return this.inverse;
+    }
+}
@@ -0,0 +1,79 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2023 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.data;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+/**
+ * Mappings containing the full string identifier mappings.
+ */
+public interface FullMappings extends Mappings {
+
+    @Deprecated
+    default Mappings mappings() {
+        return this;
+    }
+
+    /**
+     * Returns the unmapped integer id for the given identifier, or -1 if not found.
+     *
+     * @param identifier unmapped string identifier
+     * @return unmapped int id, or -1 if not found
+     */
+    int id(String identifier);
+
+    /**
+     * Returns the mapped integer id for the given mapped identifier, or -1 if not found.
+     *
+     * @param mappedIdentifier mapped string identifier
+     * @return mapped int id, or -1 if not found
+     */
+    int mappedId(String mappedIdentifier);
+
+    /**
+     * Returns the unmapped string identifier for the given mapped id.
+     *
+     * @param id unmapped id
+     * @return unmapped string identifier
+     */
+    String identifier(int id);
+
+    /**
+     * Returns the mapped string identifier for the given mapped id.
+     *
+     * @param mappedId mapped id
+     * @return mapped string identifier
+     */
+    String mappedIdentifier(int mappedId);
+
+    /**
+     * Returns the mapped string identifier for the given unmapped identifier.
+     *
+     * @param identifier unmapped identifier
+     * @return mapped string identifier, or null if not found
+     */
+    @Nullable String mappedIdentifier(String identifier);
+
+    @Override
+    FullMappings inverse();
+}
@@ -0,0 +1,126 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2023 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.data;
+
+import com.viaversion.viaversion.util.Key;
+import it.unimi.dsi.fastutil.objects.Object2IntMap;
+import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
+import java.util.List;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public class FullMappingsBase implements FullMappings {
+    private static final String[] EMPTY_ARRAY = new String[0];
+    private final Object2IntMap<String> stringToId;
+    private final Object2IntMap<String> mappedStringToId;
+    private final String[] idToString;
+    private final String[] mappedIdToString;
+    private final Mappings mappings;
+
+    public FullMappingsBase(final List<String> unmappedIdentifiers, final List<String> mappedIdentifiers, final Mappings mappings) {
+        this.mappings = mappings;
+        this.stringToId = toInverseMap(unmappedIdentifiers);
+        this.mappedStringToId = toInverseMap(mappedIdentifiers);
+        this.idToString = unmappedIdentifiers.toArray(EMPTY_ARRAY);
+        this.mappedIdToString = mappedIdentifiers.toArray(EMPTY_ARRAY);
+    }
+
+    private FullMappingsBase(final Object2IntMap<String> stringToId, final Object2IntMap<String> mappedStringToId, final String[] idToString, final String[] mappedIdToString, final Mappings mappings) {
+        this.stringToId = stringToId;
+        this.mappedStringToId = mappedStringToId;
+        this.idToString = idToString;
+        this.mappedIdToString = mappedIdToString;
+        this.mappings = mappings;
+    }
+
+    @Override
+    public Mappings mappings() {
+        return mappings;
+    }
+
+    @Override
+    public int id(final String identifier) {
+        return stringToId.getInt(Key.stripMinecraftNamespace(identifier));
+    }
+
+    @Override
+    public int mappedId(final String mappedIdentifier) {
+        return mappedStringToId.getInt(Key.stripMinecraftNamespace(mappedIdentifier));
+    }
+
+    @Override
+    public String identifier(final int id) {
+        final String identifier = idToString[id];
+        return Key.namespaced(identifier);
+    }
+
+    @Override
+    public String mappedIdentifier(final int mappedId) {
+        final String identifier = mappedIdToString[mappedId];
+        return Key.namespaced(identifier);
+    }
+
+    @Override
+    public @Nullable String mappedIdentifier(final String identifier) {
+        final int id = id(identifier);
+        if (id == -1) {
+            return null;
+        }
+
+        final int mappedId = mappings.getNewId(id);
+        return mappedId != -1 ? mappedIdentifier(mappedId) : null;
+    }
+
+    @Override
+    public int getNewId(int id) {
+        return mappings.getNewId(id);
+    }
+
+    @Override
+    public void setNewId(int id, int mappedId) {
+        mappings.setNewId(id, mappedId);
+    }
+
+    @Override
+    public int size() {
+        return mappings.size();
+    }
+
+    @Override
+    public int mappedSize() {
+        return mappings.mappedSize();
+    }
+
+    @Override
+    public FullMappings inverse() {
+        return new FullMappingsBase(mappedStringToId, stringToId, mappedIdToString, idToString, mappings.inverse());
+    }
+
+    private static Object2IntMap<String> toInverseMap(final List<String> list) {
+        final Object2IntMap<String> map = new Object2IntOpenHashMap<>(list.size());
+        map.defaultReturnValue(-1);
+        for (int i = 0; i < list.size(); i++) {
+            map.put(list.get(i), i);
+        }
+        return map;
+    }
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -20,29 +20,40 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 * SOFTWARE.
 */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.data;

-import com.viaversion.viaversion.api.minecraft.Position;
-import com.viaversion.viaversion.api.type.Type;
-import io.netty.buffer.ByteBuf;
+public class IdentityMappings implements Mappings {

-public class OptPosition1_14Type extends Type<Position> {
-    public OptPosition1_14Type() {
-        super(Position.class);
+    private final int size;
+    private final int mappedSize;
+
+    public IdentityMappings(final int size, final int mappedSize) {
+        this.size = size;
+        this.mappedSize = mappedSize;
    }

    @Override
-    public Position read(ByteBuf buffer) throws Exception {
-        boolean present = buffer.readBoolean();
-        if (!present) return null;
-        return Type.POSITION1_14.read(buffer);
+    public int getNewId(final int id) {
+        return id >= 0 && id < size ? id : -1;
    }

    @Override
-    public void write(ByteBuf buffer, Position object) throws Exception {
-        buffer.writeBoolean(object != null);
-        if (object != null) {
-            Type.POSITION1_14.write(buffer, object);
-        }
+    public void setNewId(final int id, final int mappedId) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public int size() {
+        return size;
+    }
+
+    @Override
+    public int mappedSize() {
+        return mappedSize;
+    }
+
+    @Override
+    public Mappings inverse() {
+        return new IdentityMappings(mappedSize, size);
    }
 }
@@ -0,0 +1,71 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2023 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.data;
+
+import com.viaversion.viaversion.util.Int2IntBiMap;
+
+public class Int2IntMapBiMappings implements BiMappings {
+
+    private final Int2IntBiMap mappings;
+    private final Int2IntMapBiMappings inverse;
+
+    protected Int2IntMapBiMappings(final Int2IntBiMap mappings) {
+        this.mappings = mappings;
+        this.inverse = new Int2IntMapBiMappings(mappings.inverse(), this);
+        mappings.defaultReturnValue(-1);
+    }
+
+    private Int2IntMapBiMappings(final Int2IntBiMap mappings, final Int2IntMapBiMappings inverse) {
+        this.mappings = mappings;
+        this.inverse = inverse;
+    }
+
+    public static Int2IntMapBiMappings of(final Int2IntBiMap mappings) {
+        return new Int2IntMapBiMappings(mappings);
+    }
+
+    @Override
+    public int getNewId(final int id) {
+        return mappings.get(id);
+    }
+
+    @Override
+    public void setNewId(final int id, final int mappedId) {
+        mappings.put(id, mappedId);
+    }
+
+    @Override
+    public int size() {
+        return mappings.size();
+    }
+
+    @Override
+    public int mappedSize() {
+        return mappings.inverse().size();
+    }
+
+    @Override
+    public BiMappings inverse() {
+        return this.inverse;
+    }
+}
@@ -0,0 +1,77 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2023 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.data;
+
+import it.unimi.dsi.fastutil.ints.Int2IntMap;
+import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
+
+public class Int2IntMapMappings implements Mappings {
+    private final Int2IntMap mappings;
+    private final int mappedIds;
+
+    protected Int2IntMapMappings(final Int2IntMap mappings, final int mappedIds) {
+        this.mappings = mappings;
+        this.mappedIds = mappedIds;
+        mappings.defaultReturnValue(-1);
+    }
+
+    public static Int2IntMapMappings of(final Int2IntMap mappings, final int mappedIds) {
+        return new Int2IntMapMappings(mappings, mappedIds);
+    }
+
+    public static Int2IntMapMappings of() {
+        return new Int2IntMapMappings(new Int2IntOpenHashMap(), -1);
+    }
+
+    @Override
+    public int getNewId(final int id) {
+        return mappings.get(id);
+    }
+
+    @Override
+    public void setNewId(final int id, final int mappedId) {
+        mappings.put(id, mappedId);
+    }
+
+    @Override
+    public int size() {
+        return mappings.size();
+    }
+
+    @Override
+    public int mappedSize() {
+        return mappedIds;
+    }
+
+    @Override
+    public Mappings inverse() {
+        final Int2IntMap inverse = new Int2IntOpenHashMap();
+        inverse.defaultReturnValue(-1);
+        for (final Int2IntMap.Entry entry : mappings.int2IntEntrySet()) {
+            if (entry.getIntValue() != -1) {
+                inverse.putIfAbsent(entry.getIntValue(), entry.getIntKey());
+            }
+        }
+        return of(inverse, size());
+    }
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,101 +22,60 @@
 */
 package com.viaversion.viaversion.api.data;

-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.Arrays;

 public class IntArrayMappings implements Mappings {
-    protected final int[] oldToNew;
+    private final int[] mappings;
+    private final int mappedIds;

-    public IntArrayMappings(int[] oldToNew) {
-        this.oldToNew = oldToNew;
+    protected IntArrayMappings(final int[] mappings, final int mappedIds) {
+        this.mappings = mappings;
+        this.mappedIds = mappedIds;
    }

-    /**
-     * Maps old identifiers to the new ones.
-     * If an old value cannot be found in the new mappings, the diffmapping will be checked for the given entry.
-     *
-     * @param size        set size of the underlying short array
-     * @param oldMapping  mappings to map from
-     * @param newMapping  mappings to map to
-     * @param diffMapping extra mappings that will be used/scanned when an entry cannot be found
-     */
-    public IntArrayMappings(int size, JsonObject oldMapping, JsonObject newMapping, @Nullable JsonObject diffMapping) {
-        oldToNew = new int[size];
-        Arrays.fill(oldToNew, -1);
-        MappingDataLoader.mapIdentifiers(oldToNew, oldMapping, newMapping, diffMapping);
+    public static IntArrayMappings of(final int[] mappings, final int mappedIds) {
+        return new IntArrayMappings(mappings, mappedIds);
    }

-    public IntArrayMappings(JsonObject oldMapping, JsonObject newMapping, @Nullable JsonObject diffMapping) {
-        this(oldMapping.entrySet().size(), oldMapping, newMapping, diffMapping);
-    }
-
-    /**
-     * Maps old identifiers to the new ones.
-     *
-     * @param size       set size of the underlying short array
-     * @param oldMapping mappings to map from
-     * @param newMapping mappings to map to
-     */
-    public IntArrayMappings(int size, JsonObject oldMapping, JsonObject newMapping) {
-        oldToNew = new int[size];
-        Arrays.fill(oldToNew, -1);
-        MappingDataLoader.mapIdentifiers(oldToNew, oldMapping, newMapping);
-    }
-
-    public IntArrayMappings(JsonObject oldMapping, JsonObject newMapping) {
-        this(oldMapping.entrySet().size(), oldMapping, newMapping);
-    }
-
-    /**
-     * Maps old identifiers to the new ones.
-     *
-     * @param size          set size of the underlying short array
-     * @param oldMapping    mappings to map from
-     * @param newMapping    mappings to map to
-     * @param diffMapping   extra mappings that will be used/scanned when an entry cannot be found
-     * @param warnOnMissing should "No key for x" be printed if there is no matching identifier
-     */
-    public IntArrayMappings(int size, JsonArray oldMapping, JsonArray newMapping, JsonObject diffMapping, boolean warnOnMissing) {
-        oldToNew = new int[size];
-        Arrays.fill(oldToNew, -1);
-        MappingDataLoader.mapIdentifiers(oldToNew, oldMapping, newMapping, diffMapping, warnOnMissing);
-    }
-
-    public IntArrayMappings(int size, JsonArray oldMapping, JsonArray newMapping, boolean warnOnMissing) {
-        this(size, oldMapping, newMapping, null, warnOnMissing);
-    }
-
-    public IntArrayMappings(JsonArray oldMapping, JsonArray newMapping, boolean warnOnMissing) {
-        this(oldMapping.size(), oldMapping, newMapping, warnOnMissing);
-    }
-
-    public IntArrayMappings(int size, JsonArray oldMapping, JsonArray newMapping) {
-        this(size, oldMapping, newMapping, true);
-    }
-
-    public IntArrayMappings(JsonArray oldMapping, JsonArray newMapping, JsonObject diffMapping) {
-        this(oldMapping.size(), oldMapping, newMapping, diffMapping, true);
-    }
-
-    public IntArrayMappings(JsonArray oldMapping, JsonArray newMapping) {
-        this(oldMapping.size(), oldMapping, newMapping, true);
+    @Deprecated
+    public static Builder<IntArrayMappings> builder() {
+        return Mappings.builder(IntArrayMappings::new);
    }

    @Override
    public int getNewId(int id) {
-        return id >= 0 && id < oldToNew.length ? oldToNew[id] : -1;
+        return id >= 0 && id < mappings.length ? mappings[id] : -1;
    }

    @Override
-    public void setNewId(int id, int newId) {
-        oldToNew[id] = newId;
+    public void setNewId(int id, int mappedId) {
+        mappings[id] = mappedId;
    }

-    public int[] getOldToNew() {
-        return oldToNew;
+    @Override
+    public int size() {
+        return mappings.length;
+    }
+
+    @Override
+    public int mappedSize() {
+        return mappedIds;
+    }
+
+    @Override
+    public Mappings inverse() {
+        final int[] inverse = new int[mappedIds];
+        Arrays.fill(inverse, -1);
+        for (int id = 0; id < mappings.length; id++) {
+            final int mappedId = mappings[id];
+            if (mappedId != -1 && inverse[mappedId] == -1) {
+                inverse[mappedId] = id;
+            }
+        }
+        return of(inverse, mappings.length);
+    }
+
+    public int[] raw() {
+        return mappings;
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -24,10 +24,8 @@ package com.viaversion.viaversion.api.data;

 import com.viaversion.viaversion.api.minecraft.RegistryType;
 import com.viaversion.viaversion.api.minecraft.TagData;
-import com.viaversion.viaversion.util.Int2IntBiMap;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.List;
+import org.checkerframework.checker.nullness.qual.Nullable;

 public interface MappingData {

@@ -89,15 +87,27 @@ public interface MappingData {
     */
    @Nullable List<TagData> getTags(RegistryType type);

-    @Nullable Int2IntBiMap getItemMappings();
+    @Nullable BiMappings getItemMappings();

    @Nullable ParticleMappings getParticleMappings();

    @Nullable Mappings getBlockMappings();

+    @Nullable Mappings getBlockEntityMappings();
+
    @Nullable Mappings getBlockStateMappings();

    @Nullable Mappings getSoundMappings();

    @Nullable Mappings getStatisticsMappings();
+
+    @Nullable Mappings getMenuMappings();
+
+    @Nullable Mappings getEnchantmentMappings();
+
+    @Nullable FullMappings getEntityMappings();
+
+    @Nullable FullMappings getArgumentTypeMappings();
+
+    @Nullable Mappings getPaintingMappings();
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,140 +22,155 @@
 */
 package com.viaversion.viaversion.api.data;

-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.github.steveice10.opennbt.tag.builtin.IntArrayTag;
+import com.github.steveice10.opennbt.tag.builtin.ListTag;
+import com.github.steveice10.opennbt.tag.builtin.Tag;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.minecraft.RegistryType;
 import com.viaversion.viaversion.api.minecraft.TagData;
-import com.viaversion.viaversion.util.Int2IntBiHashMap;
-import com.viaversion.viaversion.util.Int2IntBiMap;
-import it.unimi.dsi.fastutil.objects.Object2IntMap;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.ArrayList;
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
+import org.checkerframework.checker.nullness.qual.Nullable;

 public class MappingDataBase implements MappingData {
-    protected final String oldVersion;
-    protected final String newVersion;
-    protected final boolean hasDiffFile;
-    protected Int2IntBiMap itemMappings;
+
+    protected final String unmappedVersion;
+    protected final String mappedVersion;
+    protected BiMappings itemMappings;
+    protected FullMappings argumentTypeMappings;
+    protected FullMappings entityMappings;
    protected ParticleMappings particleMappings;
    protected Mappings blockMappings;
    protected Mappings blockStateMappings;
+    protected Mappings blockEntityMappings;
    protected Mappings soundMappings;
    protected Mappings statisticsMappings;
+    protected Mappings enchantmentMappings;
+    protected Mappings paintingMappings;
+    protected Mappings menuMappings;
    protected Map<RegistryType, List<TagData>> tags;
-    protected boolean loadItems = true;

-    public MappingDataBase(String oldVersion, String newVersion) {
-        this(oldVersion, newVersion, false);
-    }
-
-    public MappingDataBase(String oldVersion, String newVersion, boolean hasDiffFile) {
-        this.oldVersion = oldVersion;
-        this.newVersion = newVersion;
-        this.hasDiffFile = hasDiffFile;
+    public MappingDataBase(final String unmappedVersion, final String mappedVersion) {
+        this.unmappedVersion = unmappedVersion;
+        this.mappedVersion = mappedVersion;
    }

    @Override
    public void load() {
-        getLogger().info("Loading " + oldVersion + " -> " + newVersion + " mappings...");
-        JsonObject diffmapping = hasDiffFile ? loadDiffFile() : null;
-        JsonObject oldMappings = MappingDataLoader.loadData("mapping-" + oldVersion + ".json", true);
-        JsonObject newMappings = MappingDataLoader.loadData("mapping-" + newVersion + ".json", true);
-
-        blockMappings = loadFromObject(oldMappings, newMappings, diffmapping, "blocks");
-        blockStateMappings = loadFromObject(oldMappings, newMappings, diffmapping, "blockstates");
-        soundMappings = loadFromArray(oldMappings, newMappings, diffmapping, "sounds");
-        statisticsMappings = loadFromArray(oldMappings, newMappings, diffmapping, "statistics");
-
-        Mappings particles = loadFromArray(oldMappings, newMappings, diffmapping, "particles");
-        if (particles != null) {
-            particleMappings = new ParticleMappings(oldMappings.getAsJsonArray("particles"), particles);
+        if (Via.getManager().isDebug()) {
+            getLogger().info("Loading " + unmappedVersion + " -> " + mappedVersion + " mappings...");
        }

-        if (loadItems && newMappings.has("items")) {
-            itemMappings = new Int2IntBiHashMap();
-            itemMappings.defaultReturnValue(-1);
-            MappingDataLoader.mapIdentifiers(itemMappings, oldMappings.getAsJsonObject("items"), newMappings.getAsJsonObject("items"),
-                    diffmapping != null ? diffmapping.getAsJsonObject("items") : null);
-        }
+        final CompoundTag data = readNBTFile("mappings-" + unmappedVersion + "to" + mappedVersion + ".nbt");
+        blockMappings = loadMappings(data, "blocks");
+        blockStateMappings = loadMappings(data, "blockstates");
+        blockEntityMappings = loadMappings(data, "blockentities");
+        soundMappings = loadMappings(data, "sounds");
+        statisticsMappings = loadMappings(data, "statistics");
+        menuMappings = loadMappings(data, "menus");
+        enchantmentMappings = loadMappings(data, "enchantments");
+        paintingMappings = loadMappings(data, "paintings");
+        itemMappings = loadBiMappings(data, "items");

-        if (diffmapping != null && diffmapping.has("tags")) {
-            this.tags = new EnumMap<>(RegistryType.class);
-            JsonObject tags = diffmapping.getAsJsonObject("tags");
-            if (tags.has(RegistryType.ITEM.getResourceLocation())) {
-                loadTags(RegistryType.ITEM, tags, MappingDataLoader.indexedObjectToMap(newMappings.getAsJsonObject("items")));
-            }
-            if (tags.has(RegistryType.BLOCK.getResourceLocation())) {
-                loadTags(RegistryType.BLOCK, tags, MappingDataLoader.indexedObjectToMap(newMappings.getAsJsonObject("blocks")));
-            }
-        }
+        final CompoundTag unmappedIdentifierData = MappingDataLoader.loadNBT("identifiers-" + unmappedVersion + ".nbt", true);
+        final CompoundTag mappedIdentifierData = MappingDataLoader.loadNBT("identifiers-" + mappedVersion + ".nbt", true);
+        if (unmappedIdentifierData != null && mappedIdentifierData != null) {
+            entityMappings = loadFullMappings(data, unmappedIdentifierData, mappedIdentifierData, "entities");
+            argumentTypeMappings = loadFullMappings(data, unmappedIdentifierData, mappedIdentifierData, "argumenttypes");

-        loadExtras(oldMappings, newMappings, diffmapping);
-    }
-
-    private void loadTags(RegistryType type, JsonObject object, Object2IntMap<String> typeMapping) {
-        JsonObject tags = object.getAsJsonObject(type.getResourceLocation());
-        List<TagData> tagsList = new ArrayList<>(tags.size());
-        for (Map.Entry<String, JsonElement> entry : tags.entrySet()) {
-            JsonArray array = entry.getValue().getAsJsonArray();
-            int[] entries = new int[array.size()];
-            int i = 0;
-            for (JsonElement element : array) {
-                String stringId = element.getAsString();
-                if (!typeMapping.containsKey(stringId) && !typeMapping.containsKey(stringId = stringId.replace("minecraft:", ""))) { // aaa
-                    getLogger().warning(type + " Tags contains invalid type identifier " + stringId + " in tag " + entry.getKey());
-                    continue;
+            final ListTag unmappedParticles = unmappedIdentifierData.get("particles");
+            final ListTag mappedParticles = mappedIdentifierData.get("particles");
+            if (unmappedParticles != null && mappedParticles != null) {
+                Mappings particleMappings = loadMappings(data, "particles");
+                if (particleMappings == null) {
+                    particleMappings = new IdentityMappings(unmappedParticles.size(), mappedParticles.size());
                }

-                entries[i++] = typeMapping.getInt(stringId);
+                final List<String> identifiers = unmappedParticles.getValue().stream().map(t -> (String) t.getValue()).collect(Collectors.toList());
+                final List<String> mappedIdentifiers = mappedParticles.getValue().stream().map(t -> (String) t.getValue()).collect(Collectors.toList());
+                this.particleMappings = new ParticleMappings(identifiers, mappedIdentifiers, particleMappings);
            }
-            tagsList.add(new TagData(entry.getKey(), entries));
+        }
+
+        final CompoundTag tagsTag = data.get("tags");
+        if (tagsTag != null) {
+            this.tags = new EnumMap<>(RegistryType.class);
+            loadTags(RegistryType.ITEM, tagsTag);
+            loadTags(RegistryType.BLOCK, tagsTag);
+        }
+
+        loadExtras(data);
+    }
+
+    protected @Nullable CompoundTag readNBTFile(final String name) {
+        return MappingDataLoader.loadNBT(name);
+    }
+
+    protected @Nullable Mappings loadMappings(final CompoundTag data, final String key) {
+        return MappingDataLoader.loadMappings(data, key);
+    }
+
+    protected @Nullable FullMappings loadFullMappings(final CompoundTag data, final CompoundTag unmappedIdentifiers, final CompoundTag mappedIdentifiers, final String key) {
+        return MappingDataLoader.loadFullMappings(data, unmappedIdentifiers, mappedIdentifiers, key);
+    }
+
+    protected @Nullable BiMappings loadBiMappings(final CompoundTag data, final String key) {
+        final Mappings mappings = loadMappings(data, key);
+        return mappings != null ? BiMappings.of(mappings) : null;
+    }
+
+    private void loadTags(final RegistryType type, final CompoundTag data) {
+        final CompoundTag tag = data.get(type.resourceLocation());
+        if (tag == null) {
+            return;
+        }
+
+        final List<TagData> tagsList = new ArrayList<>(tags.size());
+        for (final Map.Entry<String, Tag> entry : tag.entrySet()) {
+            final IntArrayTag entries = (IntArrayTag) entry.getValue();
+            tagsList.add(new TagData(entry.getKey(), entries.getValue()));
        }

        this.tags.put(type, tagsList);
    }

    @Override
-    public int getNewBlockStateId(int id) {
+    public int getNewBlockStateId(final int id) {
        return checkValidity(id, blockStateMappings.getNewId(id), "blockstate");
    }

    @Override
-    public int getNewBlockId(int id) {
+    public int getNewBlockId(final int id) {
        return checkValidity(id, blockMappings.getNewId(id), "block");
    }

    @Override
-    public int getNewItemId(int id) {
-        return checkValidity(id, itemMappings.get(id), "item");
+    public int getNewItemId(final int id) {
+        return checkValidity(id, itemMappings.getNewId(id), "item");
    }

    @Override
-    public int getOldItemId(int id) {
-        int oldId = itemMappings.inverse().get(id);
-        // Remap new items to stone
-        return oldId != -1 ? oldId : 1;
+    public int getOldItemId(final int id) {
+        return itemMappings.inverse().getNewIdOrDefault(id, 1);
    }

    @Override
-    public int getNewParticleId(int id) {
-        return checkValidity(id, particleMappings.getMappings().getNewId(id), "particles");
+    public int getNewParticleId(final int id) {
+        return checkValidity(id, particleMappings.getNewId(id), "particles");
    }

    @Override
-    public @Nullable List<TagData> getTags(RegistryType type) {
+    public @Nullable List<TagData> getTags(final RegistryType type) {
        return tags != null ? tags.get(type) : null;
    }

    @Override
-    public @Nullable Int2IntBiMap getItemMappings() {
+    public @Nullable BiMappings getItemMappings() {
        return itemMappings;
    }

@@ -169,6 +184,11 @@ public class MappingDataBase implements MappingData {
        return blockMappings;
    }

+    @Override
+    public @Nullable Mappings getBlockEntityMappings() {
+        return blockEntityMappings;
+    }
+
    @Override
    public @Nullable Mappings getBlockStateMappings() {
        return blockStateMappings;
@@ -184,22 +204,29 @@ public class MappingDataBase implements MappingData {
        return statisticsMappings;
    }

-    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 new IntArrayMappings(oldMappings.getAsJsonArray(key), newMappings.getAsJsonArray(key), diff);
+    @Override
+    public @Nullable Mappings getMenuMappings() {
+        return menuMappings;
    }

-    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 new IntArrayMappings(oldMappings.getAsJsonObject(key), newMappings.getAsJsonObject(key), diff);
+    @Override
+    public @Nullable Mappings getEnchantmentMappings() {
+        return enchantmentMappings;
    }

-    protected @Nullable JsonObject loadDiffFile() {
-        return MappingDataLoader.loadData("mappingdiff-" + oldVersion + "to" + newVersion + ".json");
+    @Override
+    public @Nullable FullMappings getEntityMappings() {
+        return entityMappings;
+    }
+
+    @Override
+    public @Nullable FullMappings getArgumentTypeMappings() {
+        return argumentTypeMappings;
+    }
+
+    @Override
+    public @Nullable Mappings getPaintingMappings() {
+        return paintingMappings;
    }

    protected Logger getLogger() {
@@ -214,21 +241,16 @@ public class MappingDataBase implements MappingData {
     * @param type     mapping type (e.g. "item")
     * @return the given mapped id if valid, else 0
     */
-    protected int checkValidity(int id, int mappedId, String type) {
+    protected int checkValidity(final int id, final int mappedId, final String type) {
        if (mappedId == -1) {
-            getLogger().warning(String.format("Missing %s %s for %s %s %d", newVersion, type, oldVersion, type, id));
+            if (!Via.getConfig().isSuppressConversionWarnings()) {
+                getLogger().warning(String.format("Missing %s %s for %s %s %d", mappedVersion, type, unmappedVersion, type, id));
+            }
            return 0;
        }
        return mappedId;
    }

-    /**
-     * To be overridden.
-     *
-     * @param oldMappings  old mappings
-     * @param newMappings  new mappings
-     * @param diffMappings diff mappings if present
-     */
-    protected void loadExtras(JsonObject oldMappings, JsonObject newMappings, @Nullable JsonObject diffMappings) {
+    protected void loadExtras(final CompoundTag data) {
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,6 +22,13 @@
 */
 package com.viaversion.viaversion.api.data;

+import com.github.steveice10.opennbt.NBTIO;
+import com.github.steveice10.opennbt.tag.builtin.ByteTag;
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.github.steveice10.opennbt.tag.builtin.IntArrayTag;
+import com.github.steveice10.opennbt.tag.builtin.IntTag;
+import com.github.steveice10.opennbt.tag.builtin.ListTag;
+import com.google.common.annotations.Beta;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonIOException;
@@ -29,46 +36,36 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonSyntaxException;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.util.GsonUtil;
-import com.viaversion.viaversion.util.Int2IntBiMap;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+import org.checkerframework.checker.nullness.qual.Nullable;

-public class MappingDataLoader {
+public final class MappingDataLoader {

-    private static final Map<String, JsonObject> MAPPINGS_CACHE = new ConcurrentHashMap<>();
-    private static boolean cacheJsonMappings;
-
-    /**
-     * Returns true if a selected number of mappings should be cached.
-     * If enabled, cleanup should be done after the cache is no longer needed.
-     *
-     * @return true if mappings should be cached
-     */
-    public static boolean isCacheJsonMappings() {
-        return cacheJsonMappings;
-    }
+    private static final byte DIRECT_ID = 0;
+    private static final byte SHIFTS_ID = 1;
+    private static final byte CHANGES_ID = 2;
+    private static final byte IDENTITY_ID = 3;
+    private static final Map<String, CompoundTag> MAPPINGS_CACHE = new HashMap<>();
+    private static boolean cacheValid = true;

+    @Deprecated/*(forRemoval = true)*/
    public static void enableMappingsCache() {
-        cacheJsonMappings = true;
+        // Always enabled
    }

-    /**
-     * Returns the cached mappings. Cleared after ViaVersion has been fully loaded.
-     *
-     * @return cached mapping file json objects
-     * @see #isCacheJsonMappings()
-     */
-    public static Map<String, JsonObject> getMappingsCache() {
-        return MAPPINGS_CACHE;
+    public static void clearCache() {
+        MAPPINGS_CACHE.clear();
+        cacheValid = false;
    }

    /**
@@ -76,137 +73,228 @@ public class MappingDataLoader {
     *
     * @return loaded json object, or null if not found or invalid
     */
-    public static @Nullable JsonObject loadFromDataDir(String name) {
-        File file = new File(Via.getPlatform().getDataFolder(), name);
-        if (!file.exists()) return loadData(name);
+    public static @Nullable JsonObject loadFromDataDir(final String name) {
+        final File file = new File(Via.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) {
            // Users might mess up the format, so let's catch the syntax error
            Via.getPlatform().getLogger().warning(name + " is badly formatted!");
-            e.printStackTrace();
-        } catch (IOException | JsonIOException e) {
-            e.printStackTrace();
+            throw new RuntimeException(e);
+        } catch (final IOException | JsonIOException e) {
+            throw new RuntimeException(e);
        }
-        return null;
    }

    /**
-     * Loads the file from the bundled resources. Uses the cache if enabled.
+     * Loads the file from the bundled resources.
     *
     * @return loaded json object from bundled resources if present
     */
-    public static @Nullable JsonObject loadData(String name) {
-        return loadData(name, false);
-    }
-
-    /**
-     * Loads the file from the bundled resources. Uses the cache if enabled.
-     *
-     * @param cacheIfEnabled whether loaded files should be cached
-     * @return loaded json object from bundled resources if present
-     */
-    public static @Nullable JsonObject loadData(String name, boolean cacheIfEnabled) {
-        if (cacheJsonMappings) {
-            JsonObject cached = MAPPINGS_CACHE.get(name);
-            if (cached != null) {
-                return cached;
-            }
+    public static @Nullable JsonObject loadData(final String name) {
+        final InputStream stream = getResource(name);
+        if (stream == null) {
+            return null;
        }

-        InputStream stream = getResource(name);
-        if (stream == null) return null;
-
-        InputStreamReader reader = new InputStreamReader(stream);
-        try {
-            JsonObject object = GsonUtil.getGson().fromJson(reader, JsonObject.class);
-            if (cacheIfEnabled && cacheJsonMappings) {
-                MAPPINGS_CACHE.put(name, object);
-            }
-            return object;
-        } finally {
-            try {
-                reader.close();
-            } catch (IOException ignored) {
-                // Ignored
-            }
+        try (final InputStreamReader reader = new InputStreamReader(stream)) {
+            return GsonUtil.getGson().fromJson(reader, JsonObject.class);
+        } catch (final IOException e) {
+            throw new RuntimeException(e);
        }
    }

-    public static void mapIdentifiers(Int2IntBiMap output, JsonObject oldIdentifiers, JsonObject newIdentifiers, @Nullable JsonObject diffIdentifiers) {
-        Object2IntMap<String> newIdentifierMap = MappingDataLoader.indexedObjectToMap(newIdentifiers);
-        for (Map.Entry<String, JsonElement> entry : oldIdentifiers.entrySet()) {
-            int value = mapIdentifierEntry(entry, newIdentifierMap, diffIdentifiers);
-            if (value != -1) {
-                output.put(Integer.parseInt(entry.getKey()), value);
-            }
+    public static @Nullable CompoundTag loadNBT(final String name, final boolean cache) {
+        if (!cacheValid) {
+            return loadNBTFromFile(name);
+        }
+
+        CompoundTag data = MAPPINGS_CACHE.get(name);
+        if (data != null) {
+            return data;
+        }
+
+        data = loadNBTFromFile(name);
+
+        if (cache && data != null) {
+            MAPPINGS_CACHE.put(name, data);
+        }
+        return data;
+    }
+
+    public static @Nullable CompoundTag loadNBT(final String name) {
+        return loadNBT(name, false);
+    }
+
+    private static @Nullable CompoundTag loadNBTFromFile(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);
        }
    }

-    public static void mapIdentifiers(int[] output, JsonObject oldIdentifiers, JsonObject newIdentifiers) {
-        MappingDataLoader.mapIdentifiers(output, oldIdentifiers, newIdentifiers, null);
+    public static @Nullable Mappings loadMappings(final CompoundTag mappingsTag, final String key) {
+        return loadMappings(mappingsTag, key, size -> {
+            final int[] array = new int[size];
+            Arrays.fill(array, -1);
+            return array;
+        }, (array, id, mappedId) -> array[id] = mappedId, IntArrayMappings::of);
    }

-    public static void mapIdentifiers(int[] output, JsonObject oldIdentifiers, JsonObject newIdentifiers, @Nullable JsonObject diffIdentifiers) {
-        Object2IntMap<String> newIdentifierMap = MappingDataLoader.indexedObjectToMap(newIdentifiers);
-        for (Map.Entry<String, JsonElement> entry : oldIdentifiers.entrySet()) {
-            int value = mapIdentifierEntry(entry, newIdentifierMap, diffIdentifiers);
-            if (value != -1) {
-                output[Integer.parseInt(entry.getKey())] = value;
-            }
+    @Beta
+    public static <M extends Mappings, V> @Nullable Mappings loadMappings(
+            final CompoundTag mappingsTag,
+            final String key,
+            final MappingHolderSupplier<V> holderSupplier,
+            final AddConsumer<V> addConsumer,
+            final MappingsSupplier<M, V> mappingsSupplier
+    ) {
+        final CompoundTag tag = mappingsTag.get(key);
+        if (tag == null) {
+            return null;
        }
-    }

-    private static int mapIdentifierEntry(Map.Entry<String, JsonElement> entry, Object2IntMap newIdentifierMap, @Nullable JsonObject diffIdentifiers) {
-        int value = newIdentifierMap.getInt(entry.getValue().getAsString());
-        if (value == -1) {
-            // Search in diff mappings
-            if (diffIdentifiers != null) {
-                JsonElement diffElement = diffIdentifiers.get(entry.getKey());
-                if (diffElement != null) {
-                    value = newIdentifierMap.getInt(diffElement.getAsString());
+        final ByteTag serializationStragetyTag = tag.get("id");
+        final IntTag mappedSizeTag = tag.get("mappedSize");
+        final byte strategy = serializationStragetyTag.asByte();
+        final V mappings;
+        if (strategy == DIRECT_ID) {
+            final IntArrayTag valuesTag = tag.get("val");
+            return IntArrayMappings.of(valuesTag.getValue(), mappedSizeTag.asInt());
+        } else if (strategy == SHIFTS_ID) {
+            final IntArrayTag shiftsAtTag = tag.get("at");
+            final IntArrayTag shiftsTag = tag.get("to");
+            final IntTag sizeTag = tag.get("size");
+            final int[] shiftsAt = shiftsAtTag.getValue();
+            final int[] shiftsTo = shiftsTag.getValue();
+            final int size = sizeTag.asInt();
+            mappings = holderSupplier.get(size);
+
+            // Handle values until first shift
+            if (shiftsAt[0] != 0) {
+                final int to = shiftsAt[0];
+                for (int id = 0; id < to; id++) {
+                    addConsumer.addTo(mappings, id, id);
                }
            }
-            if (value == -1) {
-                if (!Via.getConfig().isSuppressConversionWarnings() || Via.getManager().isDebug()) {
-                    Via.getPlatform().getLogger().warning("No key for " + entry.getValue() + " :( ");
+
+            // Handle shifts
+            for (int i = 0; i < shiftsAt.length; i++) {
+                final int from = shiftsAt[i];
+                final int to = i == shiftsAt.length - 1 ? size : shiftsAt[i + 1];
+                int mappedId = shiftsTo[i];
+                for (int id = from; id < to; id++) {
+                    addConsumer.addTo(mappings, id, mappedId++);
+                }
+            }
+        } else if (strategy == CHANGES_ID) {
+            final IntArrayTag changesAtTag = tag.get("at");
+            final IntArrayTag valuesTag = tag.get("val");
+            final IntTag sizeTag = tag.get("size");
+            final boolean fillBetween = tag.get("nofill") == null;
+            final int[] changesAt = changesAtTag.getValue();
+            final int[] values = valuesTag.getValue();
+            mappings = holderSupplier.get(sizeTag.asInt());
+
+            for (int i = 0; i < changesAt.length; i++) {
+                final int id = changesAt[i];
+                if (fillBetween) {
+                    // Fill from after the last change to before this change with unchanged ids
+                    final int previousId = i != 0 ? changesAt[i - 1] + 1 : 0;
+                    for (int identity = previousId; identity < id; identity++) {
+                        addConsumer.addTo(mappings, identity, identity);
+                    }
+                }
+
+                // Assign the changed value
+                addConsumer.addTo(mappings, id, values[i]);
+            }
+        } else if (strategy == IDENTITY_ID) {
+            final IntTag sizeTag = tag.get("size");
+            return new IdentityMappings(sizeTag.asInt(), mappedSizeTag.asInt());
+        } else {
+            throw new IllegalArgumentException("Unknown serialization strategy: " + strategy);
+        }
+        return mappingsSupplier.create(mappings, mappedSizeTag.asInt());
+    }
+
+    public static FullMappings loadFullMappings(final CompoundTag mappingsTag, final CompoundTag unmappedIdentifiers, final CompoundTag mappedIdentifiers, final String key) {
+        final ListTag unmappedElements = unmappedIdentifiers.get(key);
+        final ListTag mappedElements = mappedIdentifiers.get(key);
+        if (unmappedElements == null || mappedElements == null) {
+            return null;
+        }
+
+        Mappings mappings = loadMappings(mappingsTag, key);
+        if (mappings == null) {
+            mappings = new IdentityMappings(unmappedElements.size(), mappedElements.size());
+        }
+
+        return new FullMappingsBase(
+                unmappedElements.getValue().stream().map(t -> (String) t.getValue()).collect(Collectors.toList()),
+                mappedElements.getValue().stream().map(t -> (String) t.getValue()).collect(Collectors.toList()),
+                mappings
+        );
+    }
+
+    @Deprecated
+    public static void mapIdentifiers(final int[] output, final JsonObject unmappedIdentifiers, final JsonObject mappedIdentifiers, @Nullable final JsonObject diffIdentifiers, final boolean warnOnMissing) {
+        final Object2IntMap<String> newIdentifierMap = MappingDataLoader.indexedObjectToMap(mappedIdentifiers);
+        for (final Map.Entry<String, JsonElement> entry : unmappedIdentifiers.entrySet()) {
+            final int id = Integer.parseInt(entry.getKey());
+            final int mappedId = mapIdentifierEntry(id, entry.getValue().getAsString(), newIdentifierMap, diffIdentifiers, warnOnMissing);
+            if (mappedId != -1) {
+                output[id] = mappedId;
+            }
+        }
+    }
+
+    private static int mapIdentifierEntry(final int id, final String val, final Object2IntMap<String> mappedIdentifiers, @Nullable final JsonObject diffIdentifiers, final boolean warnOnMissing) {
+        int mappedId = mappedIdentifiers.getInt(val);
+        if (mappedId == -1) {
+            // Search in diff mappings
+            if (diffIdentifiers != null) {
+                JsonElement diffElement = diffIdentifiers.get(val);
+                if (diffElement != null || (diffElement = diffIdentifiers.get(Integer.toString(id))) != null) {
+                    final String mappedName = diffElement.getAsString();
+                    if (mappedName.isEmpty()) {
+                        return -1; // "empty" remaps without warnings
+                    }
+
+                    mappedId = mappedIdentifiers.getInt(mappedName);
+
+                }
+            }
+            if (mappedId == -1) {
+                if (warnOnMissing && !Via.getConfig().isSuppressConversionWarnings() || Via.getManager().isDebug()) {
+                    Via.getPlatform().getLogger().warning("No key for " + val + " :( ");
                }
                return -1;
            }
        }
-        return value;
+        return mappedId;
    }

-    public static void mapIdentifiers(int[] output, JsonArray oldIdentifiers, JsonArray newIdentifiers, boolean warnOnMissing) {
-        mapIdentifiers(output, oldIdentifiers, newIdentifiers, null, warnOnMissing);
-    }
-
-    public static void mapIdentifiers(int[] output, JsonArray oldIdentifiers, JsonArray newIdentifiers, @Nullable JsonObject diffIdentifiers, boolean warnOnMissing) {
-        Object2IntMap<String> newIdentifierMap = MappingDataLoader.arrayToMap(newIdentifiers);
-        for (int i = 0; i < oldIdentifiers.size(); i++) {
-            JsonElement oldIdentifier = oldIdentifiers.get(i);
-            int mappedId = newIdentifierMap.getInt(oldIdentifier.getAsString());
-            if (mappedId == -1) {
-                // Search in diff mappings
-                if (diffIdentifiers != null) {
-                    JsonElement diffElement = diffIdentifiers.get(oldIdentifier.getAsString());
-                    if (diffElement != null) {
-                        String mappedName = diffElement.getAsString();
-                        if (mappedName.isEmpty()) continue; // "empty" remaps
-
-                        mappedId = newIdentifierMap.getInt(mappedName);
-                    }
-                }
-                if (mappedId == -1) {
-                    if (warnOnMissing && !Via.getConfig().isSuppressConversionWarnings() || Via.getManager().isDebug()) {
-                        Via.getPlatform().getLogger().warning("No key for " + oldIdentifier + " :( ");
-                    }
-                    continue;
-                }
+    @Deprecated
+    public static void mapIdentifiers(final int[] output, final JsonArray unmappedIdentifiers, final JsonArray mappedIdentifiers, @Nullable final JsonObject diffIdentifiers, final boolean warnOnMissing) {
+        final Object2IntMap<String> newIdentifierMap = MappingDataLoader.arrayToMap(mappedIdentifiers);
+        for (int id = 0; id < unmappedIdentifiers.size(); id++) {
+            final JsonElement unmappedIdentifier = unmappedIdentifiers.get(id);
+            final int mappedId = mapIdentifierEntry(id, unmappedIdentifier.getAsString(), newIdentifierMap, diffIdentifiers, warnOnMissing);
+            if (mappedId != -1) {
+                output[id] = mappedId;
            }
-            output[i] = mappedId;
        }
    }

@@ -216,10 +304,10 @@ public class MappingDataLoader {
     * @param object json object
     * @return map with indexes hashed by their id value
     */
-    public static Object2IntMap<String> indexedObjectToMap(JsonObject object) {
-        Object2IntMap<String> map = new Object2IntOpenHashMap<>(object.size(), 1F);
+    public static Object2IntMap<String> indexedObjectToMap(final JsonObject object) {
+        final Object2IntMap<String> map = new Object2IntOpenHashMap<>(object.size(), .99F);
        map.defaultReturnValue(-1);
-        for (Map.Entry<String, JsonElement> entry : object.entrySet()) {
+        for (final Map.Entry<String, JsonElement> entry : object.entrySet()) {
            map.put(entry.getValue().getAsString(), Integer.parseInt(entry.getKey()));
        }
        return map;
@@ -231,8 +319,8 @@ public class MappingDataLoader {
     * @param array json array
     * @return map with indexes hashed by their id value
     */
-    public static Object2IntMap<String> arrayToMap(JsonArray array) {
-        Object2IntMap<String> map = new Object2IntOpenHashMap<>(array.size(), 1F);
+    public static Object2IntMap<String> arrayToMap(final JsonArray array) {
+        final Object2IntMap<String> map = new Object2IntOpenHashMap<>(array.size(), .99F);
        map.defaultReturnValue(-1);
        for (int i = 0; i < array.size(); i++) {
            map.put(array.get(i).getAsString(), i);
@@ -240,7 +328,25 @@ public class MappingDataLoader {
        return map;
    }

-    public static @Nullable InputStream getResource(String name) {
+    public static @Nullable InputStream getResource(final String name) {
        return MappingDataLoader.class.getClassLoader().getResourceAsStream("assets/viaversion/data/" + name);
    }
+
+    @FunctionalInterface
+    public interface AddConsumer<T> {
+
+        void addTo(T holder, int id, int mappedId);
+    }
+
+    @FunctionalInterface
+    public interface MappingHolderSupplier<T> {
+
+        T get(int expectedSize);
+    }
+
+    @FunctionalInterface
+    public interface MappingsSupplier<T extends Mappings, V> {
+
+        T create(V mappings, int mappedSize);
+    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,6 +22,11 @@
 */
 package com.viaversion.viaversion.api.data;

+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import java.util.Arrays;
+
 public interface Mappings {

    /**
@@ -32,12 +37,175 @@ public interface Mappings {
     */
    int getNewId(int id);

+    /**
+     * Returns the mapped id from the given id, or the given default if unmapped/invalid.
+     *
+     * @param id  unmapped id
+     * @param def fallback return value
+     * @return mapped id, or def if invalid/out of bounds
+     */
+    default int getNewIdOrDefault(int id, int def) {
+        final int mappedId = getNewId(id);
+        return mappedId != -1 ? mappedId : def;
+    }
+
+    /**
+     * Returns whether the id has a mapping.
+     *
+     * @param id unmapped id
+     * @return whether the id has a mapped id
+     */
+    default boolean contains(int id) {
+        return getNewId(id) != -1;
+    }
+
    /**
     * Manually maps a specific id.
     *
-     * @param id    unmapped id
-     * @param newId mapped id
+     * @param id       unmapped id
+     * @param mappedId mapped id
     * @throws IndexOutOfBoundsException if the unmapped id is invalid
     */
-    void setNewId(int id, int newId);
+    void setNewId(int id, int mappedId);
+
+    /**
+     * Returns amount of unmapped entries, being the size of the mapping.
+     *
+     * @return amount of unmapped entries
+     */
+    int size();
+
+    /**
+     * Returns the amount of new ids total, even if it does not have a direct mapping.
+     * Returns -1 if unknown.
+     *
+     * @return amount of new ids, or -1 if unknown
+     */
+    int mappedSize();
+
+    /**
+     * Mappings with keys and values swapped.
+     *
+     * @return mappings with keys and values swapped
+     */
+    Mappings inverse();
+
+    static <T extends Mappings> Builder<T> builder(final MappingsSupplier<T> supplier) {
+        return new Builder<>(supplier);
+    }
+
+    @FunctionalInterface
+    interface MappingsSupplier<T extends Mappings> {
+
+        T supply(int[] mappings, int mappedIds);
+    }
+
+    @Deprecated
+    class Builder<T extends Mappings> {
+
+        protected final MappingsSupplier<T> supplier;
+        protected JsonElement unmapped;
+        protected JsonElement mapped;
+        protected JsonObject diffMappings;
+        protected int mappedSize = -1;
+        protected int size = -1;
+        protected boolean warnOnMissing = true;
+
+        protected Builder(final MappingsSupplier<T> supplier) {
+            this.supplier = supplier;
+        }
+
+        /**
+         * Sets a custom entry size different to the size of the unmapped collection.
+         *
+         * @param size custom entry size
+         * @return self
+         */
+        public Builder<T> customEntrySize(final int size) {
+            this.size = size;
+            return this;
+        }
+
+        /**
+         * Sets a custom entry mapped ids count different to the size of the mapped collection.
+         *
+         * @param size custom mapped id count
+         * @return self
+         */
+        public Builder<T> customMappedSize(final int size) {
+            this.mappedSize = size;
+            return this;
+        }
+
+        /**
+         * Sets whether warnings should be logged for missing mapped ids.
+         *
+         * @param warnOnMissing whether warnings should be logged for missing mapped ids
+         * @return self
+         */
+        public Builder<T> warnOnMissing(final boolean warnOnMissing) {
+            this.warnOnMissing = warnOnMissing;
+            return this;
+        }
+
+        public Builder<T> unmapped(final JsonArray unmappedArray) {
+            this.unmapped = unmappedArray;
+            return this;
+        }
+
+        public Builder<T> unmapped(final JsonObject unmappedObject) {
+            this.unmapped = unmappedObject;
+            return this;
+        }
+
+        public Builder<T> mapped(final JsonArray mappedArray) {
+            this.mapped = mappedArray;
+            return this;
+        }
+
+        public Builder<T> mapped(final JsonObject mappedObject) {
+            this.mapped = mappedObject;
+            return this;
+        }
+
+        public Builder<T> diffMappings(final JsonObject diffMappings) {
+            this.diffMappings = diffMappings;
+            return this;
+        }
+
+        public T 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()) {
+                    MappingDataLoader.mapIdentifiers(mappings, toJsonObject(unmapped.getAsJsonArray()), mapped.getAsJsonObject(), diffMappings, warnOnMissing);
+                } else {
+                    MappingDataLoader.mapIdentifiers(mappings, unmapped.getAsJsonArray(), mapped.getAsJsonArray(), diffMappings, warnOnMissing);
+                }
+            } else if (mapped.isJsonArray()) {
+                MappingDataLoader.mapIdentifiers(mappings, unmapped.getAsJsonObject(), toJsonObject(mapped.getAsJsonArray()), diffMappings, warnOnMissing);
+            } else {
+                MappingDataLoader.mapIdentifiers(mappings, unmapped.getAsJsonObject(), mapped.getAsJsonObject(), diffMappings, warnOnMissing);
+            }
+
+            return supplier.supply(mappings, mappedSize);
+        }
+
+        protected int size(final JsonElement element) {
+            return element.isJsonObject() ? element.getAsJsonObject().size() : element.getAsJsonArray().size();
+        }
+
+        protected JsonObject toJsonObject(final JsonArray array) {
+            final JsonObject object = new JsonObject();
+            for (int i = 0; i < array.size(); i++) {
+                final JsonElement element = array.get(i);
+                object.add(Integer.toString(i), element);
+            }
+            return object;
+        }
+    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,37 +22,52 @@
 */
 package com.viaversion.viaversion.api.data;

-import com.google.gson.JsonArray;
-import it.unimi.dsi.fastutil.objects.Object2IntMap;
+import it.unimi.dsi.fastutil.ints.IntArrayList;
+import it.unimi.dsi.fastutil.ints.IntList;
+import java.util.List;

-public class ParticleMappings {
-    private final Mappings mappings;
-    private final int blockId;
-    private final int fallingDustId;
-    private final int itemId;
+public class ParticleMappings extends FullMappingsBase {
+    private final IntList itemParticleIds = new IntArrayList(4);
+    private final IntList blockParticleIds = new IntArrayList(4);

-    public ParticleMappings(JsonArray oldMappings, Mappings mappings) {
-        this.mappings = mappings;
-
-        Object2IntMap<String> map = MappingDataLoader.arrayToMap(oldMappings);
-        blockId = map.getInt("block");
-        fallingDustId = map.getInt("falling_dust");
-        itemId = map.getInt("item");
+    public ParticleMappings(final List<String> unmappedIdentifiers, final List<String> mappedIdentifiers, final Mappings mappings) {
+        super(unmappedIdentifiers, mappedIdentifiers, mappings);
+        addBlockParticle("block");
+        addBlockParticle("falling_dust");
+        addBlockParticle("block_marker");
+        addItemParticle("item");
    }

-    public Mappings getMappings() {
-        return mappings;
+    public boolean addItemParticle(final String identifier) {
+        final int id = id(identifier);
+        return id != -1 && itemParticleIds.add(id);
    }

+    public boolean addBlockParticle(final String identifier) {
+        final int id = id(identifier);
+        return id != -1 && blockParticleIds.add(id);
+    }
+
+    public boolean isBlockParticle(final int id) {
+        return blockParticleIds.contains(id);
+    }
+
+    public boolean isItemParticle(final int id) {
+        return itemParticleIds.contains(id);
+    }
+
+    @Deprecated/*(forRemoval = true)*/
    public int getBlockId() {
-        return blockId;
+        return id("block");
    }

+    @Deprecated/*(forRemoval = true)*/
    public int getFallingDustId() {
-        return fallingDustId;
+        return id("falling_dust");
    }

+    @Deprecated/*(forRemoval = true)*/
    public int getItemId() {
-        return itemId;
+        return id("item");
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -20,16 +20,11 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 * SOFTWARE.
 */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.data.entity;

-import com.viaversion.viaversion.api.type.Type;
+public interface DimensionData {

-public class Particle1_13Type extends AbstractParticleType {
+    int minY();

-    public Particle1_13Type() {
-        readers.put(3, blockHandler());
-        readers.put(20, blockHandler());
-        readers.put(11, dustHandler());
-        readers.put(27, itemHandler(Type.FLAT_ITEM));
-    }
+    int height();
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -24,6 +24,7 @@ package com.viaversion.viaversion.api.data.entity;

 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
+import java.util.Map;
 import org.checkerframework.checker.nullness.qual.Nullable;

 public interface EntityTracker {
@@ -51,6 +52,14 @@ public interface EntityTracker {
     */
    boolean hasEntity(int id);

+    /**
+     * Returns the tracked entity for the given entity id if present.
+     *
+     * @param entityId entity id
+     * @return tracked entity if tracked
+     */
+    @Nullable TrackedEntity entity(int entityId);
+
    /**
     * Entity type of the entity if tracked.
     * This returning null does not necessarily mean no entity by the id exists.
@@ -67,12 +76,18 @@ public interface EntityTracker {
     */
    void removeEntity(int id);

+    /**
+     * Clears stored entity types and data.
+     */
+    void clearEntities();
+
    /**
     * Returns the stored entity data if an entity with the id is tracked, else null.
     * If no data has been initialized yet, it will be done and returned by this method.
     *
     * @param id entity id
     * @return stored entity data if an entity with the id is tracked, else null
+     * @throws IllegalArgumentException if entity data storage has not been enabled via the implementation
     */
    @Nullable StoredEntityData entityData(int id);

@@ -81,6 +96,7 @@ public interface EntityTracker {
     *
     * @param id entity id
     * @return stored entity data if it has previously been initialized by {@link #entityData(int)}
+     * @throws IllegalArgumentException if entity data storage has not been enabled via the implementation
     */
    @Nullable StoredEntityData entityDataIfPresent(int id);

@@ -99,8 +115,8 @@ public interface EntityTracker {
    void setClientEntityId(int clientEntityId);

    /**
-     * Returns the current world section height.
-     * Always 16 for sub 1.17 worlds.
+     * Returns the current world section height (block height / 16).
+     * This is always 16 for sub 1.17 worlds.
     *
     * @return current world section height
     */
@@ -126,4 +142,36 @@ public interface EntityTracker {
     * @param currentMinY minimum y of the current world
     */
    void setCurrentMinY(int currentMinY);
+
+    /**
+     * Returns the name of the world the player is currently in.
+     *
+     * @return world name of the current world
+     */
+    @Nullable String currentWorld();
+
+    /**
+     * Sets the name of the world the player is currently in.
+     *
+     * @param currentWorld name of the current world
+     */
+    void setCurrentWorld(String currentWorld);
+
+    int biomesSent();
+
+    void setBiomesSent(int biomesSent);
+
+    EntityType playerType();
+
+    @Nullable DimensionData dimensionData(String dimension);
+
+    void setDimensions(Map<String, DimensionData> dimensions);
+
+    /**
+     * Adds the client player entity to the tracker.
+     * If the client entity has not been set yet, this will return false.
+     *
+     * @return whether the client has been tracked
+     */
+    boolean trackClientEntity();
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -51,6 +51,15 @@ public interface StoredEntityData {
     */
    @Nullable <T> T get(Class<T> objectClass);

+    /**
+     * Removes and returns an object from the storage if present.
+     *
+     * @param objectClass class of the object to remove
+     * @param <T>         object type
+     * @return removed object if present
+     */
+    @Nullable <T> T remove(Class<T> objectClass);
+
    /**
     * Stores an object based on its class.
     *
@@ -0,0 +1,58 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2023 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.data.entity;
+
+import com.viaversion.viaversion.api.minecraft.entities.EntityType;
+
+public interface TrackedEntity {
+
+    /**
+     * Returns the type of the stored entity.
+     *
+     * @return type of the entity
+     */
+    EntityType entityType();
+
+    /**
+     * Object to hold arbitrary additional data.
+     *
+     * @return entity data
+     */
+    StoredEntityData data();
+
+    /**
+     * Returns whether the stored entity currently has any additional data.
+     *
+     * @return whether the stored entity currently has additional data
+     */
+    boolean hasData();
+
+    /**
+     * Returns whether metadata has already been sent at least once for this entity.
+     *
+     * @return whether metadata has already been sent at least once for this entity
+     */
+    boolean hasSentMetadata();
+
+    void sentMetadata(boolean sentMetadata);
+}
@@ -0,0 +1,105 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2023 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.debug;
+
+import com.google.common.annotations.Beta;
+import com.viaversion.viaversion.api.protocol.packet.Direction;
+import com.viaversion.viaversion.api.protocol.packet.PacketType;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+
+@Beta
+public interface DebugHandler {
+
+    /**
+     * Returns whether debug mode is enabled.
+     *
+     * @return whether debug mode is enabled
+     */
+    boolean enabled();
+
+    /**
+     * Sets debug mode.
+     *
+     * @param enabled whether debug should be enabled
+     */
+    void setEnabled(boolean enabled);
+
+    /**
+     * Adds a packet type name to the list of packet types to log.
+     *
+     * @param packetTypeName packet type name
+     */
+    void addPacketTypeNameToLog(String packetTypeName);
+
+    /**
+     * Adds a packet id to the list of packet types to log.
+     * Packets will be checked on each protocol transformer, so this is best used on single protocol pipes.
+     *
+     * @param packetType packet type
+     */
+    void addPacketTypeToLog(PacketType packetType);
+
+    /**
+     * Removes a packet type name from the list of packet types to log.
+     *
+     * @param packetTypeName packet type name
+     */
+    boolean removePacketTypeNameToLog(String packetTypeName);
+
+    /**
+     * Resets packet type filters.
+     */
+    void clearPacketTypesToLog();
+
+    /**
+     * Returns whether packets should be logged after being transformed.
+     * Set to true by default.
+     *
+     * @return whether packets should be logged after being transformed
+     */
+    boolean logPostPacketTransform();
+
+    /**
+     * Sets whether packets should be logged after being transformed.
+     *
+     * @param logPostPacketTransform whether packets should be logged after being transformed
+     */
+    void setLogPostPacketTransform(boolean logPostPacketTransform);
+
+    /**
+     * Returns whether the given packet should be logged.
+     * If no specific packet type has been added, all packet types will be logged.
+     *
+     * @param wrapper   packet wrapper
+     * @param direction packet direction
+     * @return whether the packet should be logged
+     */
+    boolean shouldLog(PacketWrapper wrapper, Direction direction);
+
+    default void enableAndLogIds(final PacketType... packetTypes) {
+        setEnabled(true);
+        for (final PacketType packetType : packetTypes) {
+            addPacketTypeToLog(packetType);
+        }
+    }
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,6 @@
 package com.viaversion.viaversion.api.legacy.bossbar;

 import com.viaversion.viaversion.api.connection.UserConnection;
-
 import java.util.Set;
 import java.util.UUID;

@@ -67,7 +66,7 @@ public interface BossBar {
    BossColor getColor();

    /**
-     * Yay colors!
+     * Yay, colors!
     *
     * @param color Whatever color you want!
     * @return The BossBar object
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,8 @@ package com.viaversion.viaversion.api.legacy.bossbar;
 public enum BossFlag {

    DARKEN_SKY(1),
-    PLAY_BOSS_MUSIC(2);
+    PLAY_BOSS_MUSIC(2),
+    CREATE_FOG(4);

    private final int id;

@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -54,10 +54,10 @@ public interface BlockChangeRecord {
    short getY(int chunkSectionY);

    /**
+     * Returns the absolute y coordinate - only works for sub 1.16 protocols.
+     *
     * @return absolute y coordinate
-     * @deprecated 1.16+ stores the relative y coordinate
     */
-    @Deprecated
    default short getY() {
        return getY(-1);
    }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,7 +22,7 @@
 */
 package com.viaversion.viaversion.api.minecraft;

-import java.util.HashMap;
+import java.util.EnumMap;
 import java.util.Map;

 public enum BlockFace {
@@ -33,7 +33,9 @@ public enum BlockFace {
    TOP((byte) 0, (byte) 1, (byte) 0, EnumAxis.Y),
    BOTTOM((byte) 0, (byte) -1, (byte) 0, EnumAxis.Y);

-    private static final Map<BlockFace, BlockFace> opposites = new HashMap<>();
+    public static final BlockFace[] HORIZONTAL = {NORTH, SOUTH, EAST, WEST};
+
+    private static final Map<BlockFace, BlockFace> opposites = new EnumMap<>(BlockFace.class);

    static {
        opposites.put(BlockFace.NORTH, BlockFace.SOUTH);
@@ -60,18 +62,38 @@ public enum BlockFace {
        return opposites.get(this);
    }

+    public byte modX() {
+        return modX;
+    }
+
+    public byte modY() {
+        return modY;
+    }
+
+    public byte modZ() {
+        return modZ;
+    }
+
+    public EnumAxis axis() {
+        return axis;
+    }
+
+    @Deprecated/*(forRemoval = true)*/
    public byte getModX() {
        return modX;
    }

+    @Deprecated/*(forRemoval = true)*/
    public byte getModY() {
        return modY;
    }

+    @Deprecated/*(forRemoval = true)*/
    public byte getModZ() {
        return modZ;
    }

+    @Deprecated/*(forRemoval = true)*/
    public EnumAxis getAxis() {
        return axis;
    }
@@ -0,0 +1,53 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2023 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft;
+
+import com.viaversion.viaversion.api.connection.StorableObject;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+/**
+ * Stored up until 1.14 to be used in chunk sending.
+ */
+public class ClientWorld implements StorableObject {
+    private Environment environment;
+
+    @Deprecated/*(forRemoval = true)*/
+    public ClientWorld(final UserConnection connection) {
+    }
+
+    public ClientWorld() {
+    }
+
+    public ClientWorld(final Environment environment) {
+        this.environment = environment;
+    }
+
+    public @Nullable Environment getEnvironment() {
+        return environment;
+    }
+
+    public void setEnvironment(final int environmentId) {
+        this.environment = Environment.getEnvironmentById(environmentId);
+    }
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -34,6 +34,11 @@ public enum Environment {
        this.id = id;
    }

+    public int id() {
+        return id;
+    }
+
+    @Deprecated/*(forRemoval = true)*/
    public int getId() {
        return id;
    }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -33,14 +33,29 @@ public class EulerAngle {
        this.z = z;
    }

+    public float x() {
+        return x;
+    }
+
+    public float y() {
+        return y;
+    }
+
+    public float z() {
+        return z;
+    }
+
+    @Deprecated/*(forRemoval = true)*/
    public float getX() {
        return x;
    }

+    @Deprecated/*(forRemoval = true)*/
    public float getY() {
        return y;
    }

+    @Deprecated/*(forRemoval = true)*/
    public float getZ() {
        return z;
    }
@@ -0,0 +1,66 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2023 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft;
+
+public final class GlobalPosition extends Position {
+    private final String dimension;
+
+    public GlobalPosition(final String dimension, final int x, final int y, final int z) {
+        super(x, y, z);
+        this.dimension = dimension;
+    }
+
+    public String dimension() {
+        return dimension;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        final GlobalPosition position = (GlobalPosition) o;
+        if (x != position.x) return false;
+        if (y != position.y) return false;
+        if (z != position.z) return false;
+        return dimension.equals(position.dimension);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = dimension.hashCode();
+        result = 31 * result + x;
+        result = 31 * result + y;
+        result = 31 * result + z;
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "GlobalPosition{" +
+                "dimension='" + dimension + '\'' +
+                ", x=" + x +
+                ", y=" + y +
+                ", z=" + z +
+                '}';
+    }
+}
@@ -0,0 +1,106 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2023 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft;
+
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
+import java.util.ArrayList;
+import java.util.List;
+
+public final class Particle {
+    private final List<ParticleData<?>> arguments = new ArrayList<>(4);
+    private int id;
+
+    public Particle(final int id) {
+        this.id = id;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(final int id) {
+        this.id = id;
+    }
+
+    public <T> ParticleData<T> getArgument(final int index) {
+        //noinspection unchecked
+        return (ParticleData<T>) arguments.get(index);
+    }
+
+    public <T> ParticleData<T> removeArgument(final int index) {
+        //noinspection unchecked
+        return (ParticleData<T>) arguments.remove(index);
+    }
+
+    public List<ParticleData<?>> getArguments() {
+        return arguments;
+    }
+
+    public <T> void add(final Type<T> type, final T value) {
+        arguments.add(new ParticleData<>(type, value));
+    }
+
+    public <T> void add(final int index, final Type<T> type, final T value) {
+        arguments.add(index, new ParticleData<>(type, value));
+    }
+
+    public static final class ParticleData<T> {
+        private final Type<T> type;
+        private T value;
+
+        public ParticleData(final Type<T> type, final T value) {
+            this.type = type;
+            this.value = value;
+        }
+
+        public Type<T> getType() {
+            return type;
+        }
+
+        public T getValue() {
+            return value;
+        }
+
+        public void setValue(final T value) {
+            this.value = value;
+        }
+
+        public void write(final ByteBuf buf) throws Exception {
+            type.write(buf, value);
+        }
+
+        public void write(final PacketWrapper wrapper) {
+            wrapper.write(type, value);
+        }
+
+        @Override
+        public String toString() {
+            return "ParticleData{" +
+                    "type=" + type +
+                    ", value=" + value +
+                    '}';
+        }
+    }
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -20,23 +20,24 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 * SOFTWARE.
 */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.minecraft;

-import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
-import com.viaversion.viaversion.api.type.Type;
+import java.util.UUID;

-public abstract class BaseChunkType extends Type<Chunk> {
+public final class PlayerMessageSignature {
+    private final UUID uuid;
+    private final byte[] signatureBytes;

-    protected BaseChunkType() {
-        super(Chunk.class);
+    public PlayerMessageSignature(final UUID uuid, final byte[] signatureBytes) {
+        this.uuid = uuid;
+        this.signatureBytes = signatureBytes;
    }

-    protected BaseChunkType(String typeName) {
-        super(typeName, Chunk.class);
+    public UUID uuid() {
+        return uuid;
    }

-    @Override
-    public Class<? extends Type> getBaseClass() {
-        return BaseChunkType.class;
+    public byte[] signatureBytes() {
+        return signatureBytes;
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,9 +23,9 @@
 package com.viaversion.viaversion.api.minecraft;

 public class Position {
-    private final int x;
-    private final int y;
-    private final int z;
+    protected final int x;
+    protected final int y;
+    protected final int z;

    public Position(int x, int y, int z) {
        this.x = x;
@@ -33,28 +33,47 @@ public class Position {
        this.z = z;
    }

+    // @Deprecated/*(forRemoval=true)*/ Just leave this unchecked
    public Position(int x, short y, int z) {
-        this.x = x;
-        this.y = y;
-        this.z = z;
+        this(x, (int) y, z);
    }

+    @Deprecated/*(forRemoval=true)*/
    public Position(Position toCopy) {
-        this(toCopy.getX(), toCopy.getY(), toCopy.getZ());
+        this(toCopy.x(), toCopy.y(), toCopy.z());
    }

    public Position getRelative(BlockFace face) {
-        return new Position(x + face.getModX(), (short) (y + face.getModY()), z + face.getModZ());
+        return new Position(x + face.modX(), (short) (y + face.modY()), z + face.modZ());
    }

+    public int x() {
+        return x;
+    }
+
+    public int y() {
+        return y;
+    }
+
+    public int z() {
+        return z;
+    }
+
+    public GlobalPosition withDimension(String dimension) {
+        return new GlobalPosition(dimension, x, y, z);
+    }
+
+    @Deprecated/*(forRemoval=true)*/
    public int getX() {
        return x;
    }

+    @Deprecated/*(forRemoval=true)*/
    public int getY() {
        return y;
    }

+    @Deprecated/*(forRemoval=true)*/
    public int getZ() {
        return z;
    }
@@ -0,0 +1,47 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2023 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft;
+
+public class Position3d {
+    private final double x;
+    private final double y;
+    private final double z;
+
+    public Position3d(final double x, final double y, final double z) {
+        this.x = x;
+        this.y = y;
+        this.z = z;
+    }
+
+    public double x() {
+        return x;
+    }
+
+    public double y() {
+        return y;
+    }
+
+    public double z() {
+        return z;
+    }
+}
@@ -0,0 +1,47 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2023 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft;
+
+public final class ProfileKey {
+    private final long expiresAt;
+    private final byte[] publicKey;
+    private final byte[] keySignature;
+
+    public ProfileKey(final long expiresAt, final byte[] publicKey, final byte[] keySignature) {
+        this.expiresAt = expiresAt;
+        this.publicKey = publicKey;
+        this.keySignature = keySignature;
+    }
+
+    public long expiresAt() {
+        return expiresAt;
+    }
+
+    public byte[] publicKey() {
+        return publicKey;
+    }
+
+    public byte[] keySignature() {
+        return keySignature;
+    }
+}
@@ -0,0 +1,63 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2023 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft;
+
+public final class Quaternion {
+    private final float x;
+    private final float y;
+    private final float z;
+    private final float w;
+
+    public Quaternion(final float x, final float y, final float z, final float w) {
+        this.x = x;
+        this.y = y;
+        this.z = z;
+        this.w = w;
+    }
+
+    public float x() {
+        return x;
+    }
+
+    public float y() {
+        return y;
+    }
+
+    public float z() {
+        return z;
+    }
+
+    public float w() {
+        return w;
+    }
+
+    @Override
+    public String toString() {
+        return "Quaternion{" +
+                "x=" + x +
+                ", y=" + y +
+                ", z=" + z +
+                ", w=" + w +
+                '}';
+    }
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,10 +22,9 @@
 */
 package com.viaversion.viaversion.api.minecraft;

-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.HashMap;
 import java.util.Map;
+import org.checkerframework.checker.nullness.qual.Nullable;

 public enum RegistryType {

@@ -58,7 +57,12 @@ public enum RegistryType {
        this.resourceLocation = resourceLocation;
    }

+    @Deprecated/*(forRemoval = true)*/
    public String getResourceLocation() {
        return resourceLocation;
    }
+
+    public String resourceLocation() {
+        return resourceLocation;
+    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,7 @@ public final class TagData {
    private final String identifier;
    private final int[] entries;

-    public TagData(String identifier, int[] entries) {
+    public TagData(final String identifier, final int[] entries) {
        this.identifier = identifier;
        this.entries = entries;
    }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -33,26 +33,44 @@ public class Vector {
        this.blockZ = blockZ;
    }

+    public int blockX() {
+        return blockX;
+    }
+
+    public int blockY() {
+        return blockY;
+    }
+
+    public int blockZ() {
+        return blockZ;
+    }
+
+    @Deprecated/*(forRemoval=true)*/
    public int getBlockX() {
        return blockX;
    }

-    public void setBlockX(int blockX) {
-        this.blockX = blockX;
-    }
-
+    @Deprecated/*(forRemoval=true)*/
    public int getBlockY() {
        return blockY;
    }

-    public void setBlockY(int blockY) {
-        this.blockY = blockY;
-    }
-
+    @Deprecated/*(forRemoval=true)*/
    public int getBlockZ() {
        return blockZ;
    }

+    @Deprecated/*(forRemoval=true)*/
+    public void setBlockX(int blockX) {
+        this.blockX = blockX;
+    }
+
+    @Deprecated/*(forRemoval=true)*/
+    public void setBlockY(int blockY) {
+        this.blockY = blockY;
+    }
+
+    @Deprecated/*(forRemoval=true)*/
    public void setBlockZ(int blockZ) {
        this.blockZ = blockZ;
    }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -20,16 +20,28 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 * SOFTWARE.
 */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.minecraft;

-import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
-import com.viaversion.viaversion.api.type.Type;
-import io.netty.buffer.ByteBuf;
+public final class Vector3f {
+    private final float x;
+    private final float y;
+    private final float z;

-public abstract class ModernMetaListType extends AbstractMetaListType {
+    public Vector3f(final float x, final float y, final float z) {
+        this.x = x;
+        this.y = y;
+        this.z = z;
+    }

-    @Override
-    protected void writeEnd(final Type<Metadata> type, final ByteBuf buffer) throws Exception {
-        type.write(buffer, null);
+    public float x() {
+        return x;
+    }
+
+    public float y() {
+        return y;
+    }
+
+    public float z() {
+        return z;
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -33,14 +33,29 @@ public class VillagerData {
        this.level = level;
    }

+    public int type() {
+        return type;
+    }
+
+    public int profession() {
+        return profession;
+    }
+
+    public int level() {
+        return level;
+    }
+
+    @Deprecated/*(forRemoval=true)*/
    public int getType() {
        return type;
    }

+    @Deprecated/*(forRemoval=true)*/
    public int getProfession() {
        return profession;
    }

+    @Deprecated/*(forRemoval=true)*/
    public int getLevel() {
        return level;
    }
@@ -0,0 +1,57 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2023 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft;
+
+import com.viaversion.viaversion.api.connection.StorableObject;
+
+public class WorldIdentifiers implements StorableObject {
+    public static final String OVERWORLD_DEFAULT = "minecraft:overworld";
+    public static final String NETHER_DEFAULT = "minecraft:the_nether";
+    public static final String END_DEFAULT = "minecraft:the_end";
+
+    private final String overworld;
+    private final String nether;
+    private final String end;
+
+    public WorldIdentifiers(String overworld) {
+        this(overworld, NETHER_DEFAULT, END_DEFAULT);
+    }
+
+    public WorldIdentifiers(String overworld, String nether, String end) {
+        this.overworld = overworld;
+        this.nether = nether;
+        this.end = end;
+    }
+
+    public String overworld() {
+        return this.overworld;
+    }
+
+    public String nether() {
+        return this.nether;
+    }
+
+    public String end() {
+        return this.end;
+    }
+}
@@ -0,0 +1,51 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2023 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft.blockentity;
+
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public interface BlockEntity {
+
+    static byte pack(int sectionX, int sectionZ) {
+        return (byte) (((sectionX) & 15) << 4 | (sectionZ & 15));
+    }
+
+    default byte sectionX() {
+        return (byte) ((packedXZ() >> 4) & 15);
+    }
+
+    default byte sectionZ() {
+        return (byte) (packedXZ() & 15);
+    }
+
+    byte packedXZ();
+
+    short y();
+
+    int typeId();
+
+    @Nullable CompoundTag tag();
+
+    BlockEntity withTypeId(int typeId);
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -20,41 +20,45 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 * SOFTWARE.
 */
-package com.viaversion.viaversion.api.minecraft.chunks;
+package com.viaversion.viaversion.api.minecraft.blockentity;

 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;

-import java.util.ArrayList;
-import java.util.List;
+public final class BlockEntityImpl implements BlockEntity {
+    private final byte packedXZ;
+    private final short y;
+    private final int typeId;
+    private final CompoundTag tag;

-public class Chunk1_8 extends BaseChunk {
-    private boolean unloadPacket;
-
-    public Chunk1_8(int x, int z, boolean groundUp, int bitmask, ChunkSection[] sections, int[] biomeData, List<CompoundTag> blockEntities) {
-        super(x, z, groundUp, false, bitmask, sections, biomeData, blockEntities);
+    public BlockEntityImpl(final byte packedXZ, final short y, final int typeId, final CompoundTag tag) {
+        this.packedXZ = packedXZ;
+        this.y = y;
+        this.typeId = typeId;
+        this.tag = tag;
    }

-    /**
-     * Chunk unload.
-     *
-     * @param x coord
-     * @param z coord
-     */
-    public Chunk1_8(int x, int z) {
-        this(x, z, true, 0, new ChunkSection[16], null, new ArrayList<>());
-        this.unloadPacket = true;
+    @Override
+    public byte packedXZ() {
+        return packedXZ;
    }

-    /**
-     * Does this chunks have biome data
-     *
-     * @return True if the chunks has biome data
-     */
-    public boolean hasBiomeData() {
-        return biomeData != null && fullChunk;
+    @Override
+    public short y() {
+        return y;
    }

-    public boolean isUnloadPacket() {
-        return unloadPacket;
+    @Override
+    public int typeId() {
+        return typeId;
+    }
+
+    @Override
+    public CompoundTag tag() {
+        return tag;
+    }
+
+    @Override
+    public BlockEntity withTypeId(int typeId) {
+        return new BlockEntityImpl(packedXZ, y, typeId, tag);
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,10 +23,10 @@
 package com.viaversion.viaversion.api.minecraft.chunks;

 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
+import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity;
 import java.util.BitSet;
 import java.util.List;
+import org.checkerframework.checker.nullness.qual.Nullable;

 //TODO Move methods from distinctly different versions to different objects/interfaces
 public class BaseChunk implements Chunk {
@@ -147,4 +147,9 @@ public class BaseChunk implements Chunk {
    public List<CompoundTag> getBlockEntities() {
        return blockEntities;
    }
+
+    @Override
+    public List<BlockEntity> blockEntities() {
+        throw new UnsupportedOperationException();
+    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,11 +23,12 @@
 package com.viaversion.viaversion.api.minecraft.chunks;

 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
+import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity;
 import java.util.BitSet;
 import java.util.List;
+import org.checkerframework.checker.nullness.qual.Nullable;

+// TODO specialized sub interfaces
 public interface Chunk {

    /**
@@ -115,4 +116,11 @@ public interface Chunk {
     * @return list of block entities
     */
    List<CompoundTag> getBlockEntities();
+
+    /**
+     * Returns a list of block entities.
+     *
+     * @return list of block entities
+     */
+    List<BlockEntity> blockEntities();
 }
@@ -0,0 +1,135 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2023 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft.chunks;
+
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity;
+import java.util.BitSet;
+import java.util.List;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public class Chunk1_18 implements Chunk {
+    protected final int x;
+    protected final int z;
+    protected ChunkSection[] sections;
+    protected CompoundTag heightMap;
+    protected final List<BlockEntity> blockEntities;
+
+    public Chunk1_18(int x, int z, ChunkSection[] sections, CompoundTag heightMap, List<BlockEntity> blockEntities) {
+        this.x = x;
+        this.z = z;
+        this.sections = sections;
+        this.heightMap = heightMap;
+        this.blockEntities = blockEntities;
+    }
+
+    @Override
+    public boolean isBiomeData() {
+        return false;
+    }
+
+    @Override
+    public int getX() {
+        return x;
+    }
+
+    @Override
+    public int getZ() {
+        return z;
+    }
+
+    @Override
+    public boolean isFullChunk() {
+        return true;
+    }
+
+    @Override
+    public boolean isIgnoreOldLightData() {
+        return false;
+    }
+
+    @Override
+    public void setIgnoreOldLightData(boolean ignoreOldLightData) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public int getBitmask() {
+        return -1;
+    }
+
+    @Override
+    public void setBitmask(int bitmask) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @Nullable BitSet getChunkMask() {
+        return null;
+    }
+
+    @Override
+    public void setChunkMask(BitSet chunkSectionMask) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public ChunkSection[] getSections() {
+        return sections;
+    }
+
+    @Override
+    public void setSections(ChunkSection[] sections) {
+        this.sections = sections;
+    }
+
+    @Override
+    public int @Nullable [] getBiomeData() {
+        return null;
+    }
+
+    @Override
+    public void setBiomeData(int @Nullable [] biomeData) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @Nullable CompoundTag getHeightMap() {
+        return heightMap;
+    }
+
+    @Override
+    public void setHeightMap(final CompoundTag heightMap) {
+        this.heightMap = heightMap;
+    }
+
+    @Override
+    public List<CompoundTag> getBlockEntities() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public List<BlockEntity> blockEntities() {
+        return blockEntities;
+    }
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -32,143 +32,105 @@ public interface ChunkSection {
    int SIZE = 16 * 16 * 16; // width * depth * height

    /**
-     * Returns the block index of the given coordinates within a section.
-     *
-     * @param x section x
-     * @param y section y
-     * @param z section z
-     * @return section block index
+     * Size (dimensions) of biomes in a chunks section.
     */
+    int BIOME_SIZE = 4 * 4 * 4;
+
    static int index(int x, int y, int z) {
        return y << 8 | z << 4 | x;
    }

-    /**
-     * Returns the block state of the given index.
-     *
-     * @param idx block index within the section
-     * @return block state of the given index
-     */
-    int getFlatBlock(int idx);
+    static int xFromIndex(int idx) {
+        return idx & 0xF;
+    }

-    /**
-     * Returns the block state of the section coordinate.
-     *
-     * @param x section x
-     * @param y section y
-     * @param z section z
-     * @return block state of the given section coordinate
-     */
+    static int yFromIndex(int idx) {
+        return idx >> 8 & 0xF;
+    }
+
+    static int zFromIndex(int idx) {
+        return idx >> 4 & 0xF;
+    }
+
+    @Deprecated/*(forRemoval = true)*/
+    default int getFlatBlock(int idx) {
+        return palette(PaletteType.BLOCKS).idAt(idx);
+    }
+
+    @Deprecated/*(forRemoval = true)*/
    default int getFlatBlock(int x, int y, int z) {
        return getFlatBlock(index(x, y, z));
    }

-    /**
-     * Set a block state in the chunk section.
-     * This method will not update non-air blocks count.
-     *
-     * @param idx block index within the section
-     * @param id  raw or flat id of the block state
-     */
-    void setFlatBlock(int idx, int id);
+    @Deprecated/*(forRemoval = true)*/
+    default void setFlatBlock(int idx, int id) {
+        palette(PaletteType.BLOCKS).setIdAt(idx, id);
+    }

-    /**
-     * Set a block state in the chunk section.
-     * This method will not update non-air blocks count.
-     *
-     * @param x  section x
-     * @param y  section y
-     * @param z  section z
-     * @param id raw or flat id of the block state
-     */
+    @Deprecated/*(forRemoval = true)*/
    default void setFlatBlock(int x, int y, int z, int id) {
        setFlatBlock(index(x, y, z), id);
    }

+    @Deprecated/*(forRemoval = true)*/
    default int getBlockWithoutData(int x, int y, int z) {
        return getFlatBlock(x, y, z) >> 4;
    }

+    @Deprecated/*(forRemoval = true)*/
    default int getBlockData(int x, int y, int z) {
        return getFlatBlock(x, y, z) & 0xF;
    }

-    /**
-     * Set a block in the chunks.
-     * This method will not update non-air blocks count.
-     *
-     * @param x    Block X
-     * @param y    Block Y
-     * @param z    Block Z
-     * @param type The type of the block
-     * @param data The data value of the block
-     */
+    @Deprecated/*(forRemoval = true)*/
    default void setBlockWithData(int x, int y, int z, int type, int data) {
        setFlatBlock(index(x, y, z), type << 4 | (data & 0xF));
    }

+    @Deprecated/*(forRemoval = true)*/
    default void setBlockWithData(int idx, int type, int data) {
        setFlatBlock(idx, type << 4 | (data & 0xF));
    }

-    /**
-     * Sets a block to the given palette index.
-     *
-     * @param idx   block index
-     * @param index palette index
-     */
-    void setPaletteIndex(int idx, int index);
+    @Deprecated/*(forRemoval = true)*/
+    default void setPaletteIndex(int idx, int index) {
+        palette(PaletteType.BLOCKS).setPaletteIndexAt(idx, index);
+    }

-    /**
-     * Returns the palette index of the given block index.
-     *
-     * @param idx block index
-     * @return palette index of the given block index
-     */
-    int getPaletteIndex(int idx);
+    @Deprecated/*(forRemoval = true)*/
+    default int getPaletteIndex(int idx) {
+        return palette(PaletteType.BLOCKS).paletteIndexAt(idx);
+    }

-    /**
-     * Returns the size of the palette.
-     *
-     * @return palette size
-     */
-    int getPaletteSize();
+    @Deprecated/*(forRemoval = true)*/
+    default int getPaletteSize() {
+        return palette(PaletteType.BLOCKS).size();
+    }

-    /**
-     * Returns the block state assigned to the given palette index.
-     *
-     * @param index palette index
-     * @return block state assigned to the given palette index
-     */
-    int getPaletteEntry(int index);
+    @Deprecated/*(forRemoval = true)*/
+    default int getPaletteEntry(int index) {
+        return palette(PaletteType.BLOCKS).idByIndex(index);
+    }

-    /**
-     * Assigns a block state assigned to the given palette index.
-     *
-     * @param index palette index
-     * @param id    block state
-     */
-    void setPaletteEntry(int index, int id);
+    @Deprecated/*(forRemoval = true)*/
+    default void setPaletteEntry(int index, int id) {
+        palette(PaletteType.BLOCKS).setIdByIndex(index, id);
+    }

-    /**
-     * Replaces a block state in the palette.
-     *
-     * @param oldId old block state
-     * @param newId new block state
-     */
-    void replacePaletteEntry(int oldId, int newId);
+    @Deprecated/*(forRemoval = true)*/
+    default void replacePaletteEntry(int oldId, int newId) {
+        palette(PaletteType.BLOCKS).replaceId(oldId, newId);
+    }

-    /**
-     * Adds a new block state to the palette.
-     *
-     * @param id block state
-     */
-    void addPaletteEntry(int id);
+    @Deprecated/*(forRemoval = true)*/
+    default void addPaletteEntry(int id) {
+        palette(PaletteType.BLOCKS).addId(id);
+    }

-    /**
-     * Clears the palette.
-     */
-    void clearPalette();
+    @Deprecated/*(forRemoval = true)*/
+    default void clearPalette() {
+        palette(PaletteType.BLOCKS).clear();
+    }

    /**
     * Returns the number of non-air blocks in this section.
@@ -198,4 +160,16 @@ public interface ChunkSection {
    @Nullable ChunkSectionLight getLight();

    void setLight(@Nullable ChunkSectionLight light);
+
+    /**
+     * Returns the palette of the given type if present.
+     *
+     * @param type type of the palette
+     * @return palette
+     */
+    @Nullable DataPalette palette(PaletteType type);
+
+    void addPalette(PaletteType type, DataPalette blockPalette);
+
+    void removePalette(PaletteType type);
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,120 +22,30 @@
 */
 package com.viaversion.viaversion.api.minecraft.chunks;

-import it.unimi.dsi.fastutil.ints.Int2IntMap;
-import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
-import it.unimi.dsi.fastutil.ints.IntArrayList;
-import it.unimi.dsi.fastutil.ints.IntList;
+import java.util.EnumMap;
 import org.checkerframework.checker.nullness.qual.Nullable;

 public class ChunkSectionImpl implements ChunkSection {

-    private final IntList palette;
-    private final Int2IntMap inversePalette;
-    private final int[] blocks;
+    private final EnumMap<PaletteType, DataPalette> palettes = new EnumMap<>(PaletteType.class);
    private ChunkSectionLight light;
    private int nonAirBlocksCount;

-    public ChunkSectionImpl(boolean holdsLight) {
-        this.blocks = new int[SIZE];
-        palette = new IntArrayList();
-        inversePalette = new Int2IntOpenHashMap();
-        inversePalette.defaultReturnValue(-1);
+    public ChunkSectionImpl() {
+    }
+
+    public ChunkSectionImpl(final boolean holdsLight) {
+        addPalette(PaletteType.BLOCKS, new DataPaletteImpl(ChunkSection.SIZE));
        if (holdsLight) {
            this.light = new ChunkSectionLightImpl();
        }
    }

-    public ChunkSectionImpl(boolean holdsLight, int expectedPaletteLength) {
-        this.blocks = new int[SIZE];
+    public ChunkSectionImpl(final boolean holdsLight, final int expectedPaletteLength) {
+        addPalette(PaletteType.BLOCKS, new DataPaletteImpl(ChunkSection.SIZE, expectedPaletteLength));
        if (holdsLight) {
            this.light = new ChunkSectionLightImpl();
        }
-
-        // Pre-size the palette array/map
-        palette = new IntArrayList(expectedPaletteLength);
-        inversePalette = new Int2IntOpenHashMap(expectedPaletteLength);
-        inversePalette.defaultReturnValue(-1);
-    }
-
-    @Override
-    public int getFlatBlock(int idx) {
-        int index = blocks[idx];
-        return palette.getInt(index);
-    }
-
-    @Override
-    public void setFlatBlock(int idx, int id) {
-        int index = inversePalette.get(id);
-        if (index == -1) {
-            index = palette.size();
-            palette.add(id);
-            inversePalette.put(id, index);
-        }
-
-        blocks[idx] = index;
-    }
-
-    @Override
-    public int getPaletteIndex(int idx) {
-        return blocks[idx];
-    }
-
-    @Override
-    public void setPaletteIndex(int idx, int index) {
-        blocks[idx] = index;
-    }
-
-    @Override
-    public int getPaletteSize() {
-        return palette.size();
-    }
-
-    @Override
-    public int getPaletteEntry(int index) {
-        return palette.getInt(index);
-    }
-
-    @Override
-    public void setPaletteEntry(int index, int id) {
-        int oldId = palette.set(index, id);
-        if (oldId == id) return;
-
-        inversePalette.put(id, index);
-        if (inversePalette.get(oldId) == index) {
-            inversePalette.remove(oldId);
-            for (int i = 0; i < palette.size(); i++) {
-                if (palette.getInt(i) == oldId) {
-                    inversePalette.put(oldId, i);
-                    break;
-                }
-            }
-        }
-    }
-
-    @Override
-    public void replacePaletteEntry(int oldId, int newId) {
-        int index = inversePalette.remove(oldId);
-        if (index == -1) return;
-
-        inversePalette.put(newId, index);
-        for (int i = 0; i < palette.size(); i++) {
-            if (palette.getInt(i) == oldId) {
-                palette.set(i, newId);
-            }
-        }
-    }
-
-    @Override
-    public void addPaletteEntry(int id) {
-        inversePalette.put(id, palette.size());
-        palette.add(id);
-    }
-
-    @Override
-    public void clearPalette() {
-        palette.clear();
-        inversePalette.clear();
    }

    @Override
@@ -144,7 +54,7 @@ public class ChunkSectionImpl implements ChunkSection {
    }

    @Override
-    public void setNonAirBlocksCount(int nonAirBlocksCount) {
+    public void setNonAirBlocksCount(final int nonAirBlocksCount) {
        this.nonAirBlocksCount = nonAirBlocksCount;
    }

@@ -154,7 +64,22 @@ public class ChunkSectionImpl implements ChunkSection {
    }

    @Override
-    public void setLight(@Nullable ChunkSectionLight light) {
+    public void setLight(@Nullable final ChunkSectionLight light) {
        this.light = light;
    }
+
+    @Override
+    public DataPalette palette(final PaletteType type) {
+        return palettes.get(type);
+    }
+
+    @Override
+    public void addPalette(final PaletteType type, final DataPalette palette) {
+        palettes.put(type, palette);
+    }
+
+    @Override
+    public void removePalette(final PaletteType type) {
+        palettes.remove(type);
+    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -47,6 +47,11 @@ public class ChunkSectionLightImpl implements ChunkSectionLight {

    @Override
    public void setSkyLight(byte[] data) {
+        if (data == null) {
+            this.skyLight = null;
+            return;
+        }
+
        if (data.length != LIGHT_LENGTH) throw new IllegalArgumentException("Data length != " + LIGHT_LENGTH);
        if (this.skyLight == null) {
            this.skyLight = new NibbleArray(data);
@@ -0,0 +1,137 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2023 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft.chunks;
+
+public interface DataPalette {
+
+    /**
+     * Returns the packet section index of the given coordinates.
+     *
+     * @param x x
+     * @param y y
+     * @param z z
+     * @return packed section index of the given coordinates
+     */
+    int index(final int x, final int y, final int z);
+
+    /**
+     * Returns the value of the given chunk coordinate.
+     *
+     * @param sectionCoordinate section index within the section
+     * @return section state of the given index
+     */
+    int idAt(int sectionCoordinate);
+
+    /**
+     * Returns the value of the section coordinate.
+     *
+     * @param sectionX section x
+     * @param sectionY section y
+     * @param sectionZ section z
+     * @return id of the given section coordinate
+     */
+    default int idAt(final int sectionX, final int sectionY, final int sectionZ) {
+        return idAt(index(sectionX, sectionY, sectionZ));
+    }
+
+    /**
+     * Set a value in the chunk section.
+     * This method does not update non-air blocks count.
+     *
+     * @param sectionCoordinate section index within the section
+     * @param id                id value
+     */
+    void setIdAt(int sectionCoordinate, int id);
+
+    /**
+     * Set a value in the chunk section.
+     * This method does not update non-air blocks count.
+     *
+     * @param sectionX section x
+     * @param sectionY section y
+     * @param sectionZ section z
+     * @param id       id value
+     */
+    default void setIdAt(final int sectionX, final int sectionY, final int sectionZ, final int id) {
+        setIdAt(index(sectionX, sectionY, sectionZ), id);
+    }
+
+    /**
+     * Returns the id assigned to the given palette index.
+     *
+     * @param index palette index
+     * @return id assigned to the given palette index
+     */
+    int idByIndex(int index);
+
+    /**
+     * Assigns an id assigned to the given palette index.
+     *
+     * @param index palette index
+     * @param id    id value
+     */
+    void setIdByIndex(int index, int id);
+
+    /**
+     * Returns the palette index of the given section index.
+     *
+     * @param packedCoordinate section index
+     * @return palette index of the given section index
+     */
+    int paletteIndexAt(int packedCoordinate);
+
+    /**
+     * Sets the index of the given section coordinate.
+     *
+     * @param sectionCoordinate section index
+     * @param index             palette index
+     */
+    void setPaletteIndexAt(int sectionCoordinate, int index);
+
+    /**
+     * Adds a new id to the palette.
+     *
+     * @param id id value
+     */
+    void addId(int id);
+
+    /**
+     * Replaces an id in the palette.
+     *
+     * @param oldId old id
+     * @param newId new id
+     */
+    void replaceId(int oldId, int newId);
+
+    /**
+     * Returns the size of the palette.
+     *
+     * @return palette size
+     */
+    int size();
+
+    /**
+     * Clears the palette.
+     */
+    void clear();
+}
@@ -0,0 +1,210 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2023 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft.chunks;
+
+import it.unimi.dsi.fastutil.ints.Int2IntMap;
+import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
+import it.unimi.dsi.fastutil.ints.IntArrayList;
+import it.unimi.dsi.fastutil.ints.IntList;
+
+public final class DataPaletteImpl implements DataPalette {
+
+    private static final int DEFAULT_INITIAL_SIZE = 16;
+
+    private final IntList palette;
+    private final Int2IntMap inversePalette;
+    private final int sizeBits;
+    private ChunkData values;
+
+    public DataPaletteImpl(final int valuesLength) {
+        this(valuesLength, DEFAULT_INITIAL_SIZE);
+    }
+
+    public DataPaletteImpl(final int valuesLength, final int initialSize) {
+        values = new EmptyChunkData(valuesLength);
+        sizeBits = Integer.numberOfTrailingZeros(valuesLength) / 3;
+        // Pre-size the palette array/map
+        palette = new IntArrayList(initialSize);
+        // To get an initial table size of initialSize, need to scale it down by load factor.
+        inversePalette = new Int2IntOpenHashMap((int) (initialSize * Int2IntOpenHashMap.DEFAULT_LOAD_FACTOR));
+        inversePalette.defaultReturnValue(-1);
+    }
+
+    @Override
+    public int index(final int x, final int y, final int z) {
+        return (y << this.sizeBits | z) << this.sizeBits | x;
+    }
+
+    @Override
+    public int idAt(final int sectionCoordinate) {
+        final int index = values.get(sectionCoordinate);
+        return palette.getInt(index);
+    }
+
+    @Override
+    public void setIdAt(final int sectionCoordinate, final int id) {
+        int index = inversePalette.get(id);
+        if (index == -1) {
+            index = palette.size();
+            palette.add(id);
+            inversePalette.put(id, index);
+        }
+
+        values.set(sectionCoordinate, index);
+    }
+
+    @Override
+    public int paletteIndexAt(final int packedCoordinate) {
+        return values.get(packedCoordinate);
+    }
+
+    @Override
+    public void setPaletteIndexAt(final int sectionCoordinate, final int index) {
+        values.set(sectionCoordinate, index);
+    }
+
+    @Override
+    public int size() {
+        return palette.size();
+    }
+
+    @Override
+    public int idByIndex(final int index) {
+        return palette.getInt(index);
+    }
+
+    @Override
+    public void setIdByIndex(final int index, final int id) {
+        final int oldId = palette.set(index, id);
+        if (oldId == id) return;
+
+        inversePalette.put(id, index);
+        if (inversePalette.get(oldId) == index) {
+            inversePalette.remove(oldId);
+            for (int i = 0; i < palette.size(); i++) {
+                if (palette.getInt(i) == oldId) {
+                    inversePalette.put(oldId, i);
+                    break;
+                }
+            }
+        }
+    }
+
+    @Override
+    public void replaceId(final int oldId, final int newId) {
+        final int index = inversePalette.remove(oldId);
+        if (index == -1) return;
+
+        inversePalette.put(newId, index);
+        for (int i = 0; i < palette.size(); i++) {
+            if (palette.getInt(i) == oldId) {
+                palette.set(i, newId);
+            }
+        }
+    }
+
+    @Override
+    public void addId(final int id) {
+        inversePalette.put(id, palette.size());
+        palette.add(id);
+    }
+
+    @Override
+    public void clear() {
+        palette.clear();
+        inversePalette.clear();
+    }
+
+    interface ChunkData {
+        int get(int idx);
+        void set(int idx, int val);
+    }
+
+    private class EmptyChunkData implements ChunkData {
+
+        private final int size;
+
+        public EmptyChunkData(int size) {
+            this.size = size;
+        }
+
+        @Override
+        public int get(int idx) {
+            return 0;
+        }
+
+        @Override
+        public void set(int idx, int val) {
+            if (val != 0) {
+                values = new ByteChunkData(size);
+                values.set(idx, val);
+            }
+        }
+    }
+
+    private class ByteChunkData implements ChunkData {
+        private final byte[] data;
+
+        public ByteChunkData(int size) {
+            this.data = new byte[size];
+        }
+
+        @Override
+        public int get(int idx) {
+            return data[idx] & 0xFF;
+        }
+
+        @Override
+        public void set(int idx, int val) {
+            // Overflowed size of byte (over 256 different materials), go up to short
+            if (val > 0xFF) {
+                values = new ShortChunkData(data);
+                values.set(idx, val);
+                return;
+            }
+            data[idx] = (byte) val;
+        }
+    }
+
+    private static class ShortChunkData implements ChunkData {
+        private final short[] data;
+
+        public ShortChunkData(byte[] data) {
+            this.data = new short[data.length];
+            for (int i = 0; i < data.length; i++) {
+                this.data[i] = (short) (data[i] & 0xFF);
+            }
+        }
+
+        @Override
+        public int get(int idx) {
+            return data[idx];
+        }
+
+        @Override
+        public void set(int idx, int val) {
+            data[idx] = (short) val;
+        }
+    }
+
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -20,19 +20,25 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 * SOFTWARE.
 */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.minecraft.chunks;

-import com.viaversion.viaversion.api.type.Type;
+public enum PaletteType {
+    BLOCKS(ChunkSection.SIZE, 8),
+    BIOMES(ChunkSection.BIOME_SIZE, 3);

-public class Particle1_17Type extends AbstractParticleType {
+    private final int size;
+    private final int highestBitsPerValue;

-    public Particle1_17Type() {
-        readers.put(4, blockHandler());
-        readers.put(25, blockHandler());
-        readers.put(15, dustHandler());
-        readers.put(16, dustTransitionHandler());
-        readers.put(36, itemHandler(Type.FLAT_VAR_INT_ITEM));
-        readers.put(37, vibrationHandler(Type.POSITION1_14));
+    PaletteType(final int size, final int highestBitsPerValue) {
+        this.size = size;
+        this.highestBitsPerValue = highestBitsPerValue;
    }
-}

+    public int size() {
+        return size;
+    }
+
+    public int highestBitsPerValue() {
+        return highestBitsPerValue;
+    }
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -30,6 +30,7 @@ public interface EntityType {
     * Returns the entity id.
     *
     * @return entity id
+     * @throws IllegalStateException if ids have not been loaded yet
     */
    int getId();

@@ -47,6 +48,22 @@ public interface EntityType {
     */
    String name();

+    /**
+     * Returns the entity's Vanilla identifier.
+     *
+     * @return entity identifier
+     * @throws IllegalArgumentException if {@link #isAbstractType()} returns true
+     */
+    String identifier();
+
+    /**
+     * Returns whether the type does not represent an actual entity, e.g. animal or monster.
+     *
+     * @return whether the type does not represent an actual entity
+     */
+    boolean isAbstractType();
+
+    @Deprecated/*(forRemoval = true)*/
    default boolean is(EntityType... types) {
        for (EntityType type : types) {
            if (this == type) {
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,13 +23,12 @@
 package com.viaversion.viaversion.api.minecraft.entities;

 import com.viaversion.viaversion.api.Via;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;

 // 1.10 Entity / Object ids
-public class Entity1_10Types {
+public class EntityTypes1_10 {

    public static EntityType getTypeFromId(int typeID, boolean isObject) {
        Optional<EntityType> type;
@@ -170,6 +169,16 @@ public class Entity1_10Types {
        public EntityType getParent() {
            return parent;
        }
+
+        @Override
+        public String identifier() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean isAbstractType() {
+            return id != -1;
+        }
    }

    public enum ObjectType implements com.viaversion.viaversion.api.minecraft.entities.ObjectType {
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,13 +23,12 @@
 package com.viaversion.viaversion.api.minecraft.entities;

 import com.viaversion.viaversion.api.Via;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;

-// 1.11 Entity / Object ids TODO maybe in the future instead of copying it, some api.
-public class Entity1_11Types {
+// 1.11 Entity / Object ids
+public class EntityTypes1_11 {

    public static EntityType getTypeFromId(int typeID, boolean isObject) {
        Optional<EntityType> type;
@@ -187,6 +186,16 @@ public class Entity1_11Types {
            return parent;
        }

+        @Override
+        public String identifier() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean isAbstractType() {
+            return id != -1;
+        }
+
        static {
            for (EntityType type : EntityType.values()) {
                TYPES.put(type.id, type);
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -24,13 +24,12 @@
 package com.viaversion.viaversion.api.minecraft.entities;

 import com.viaversion.viaversion.api.Via;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;

 // 1.12 Entity / Object taken from https://github.com/Matsv/ViaBackwards/blob/master/core/src/main/java/nl/matsv/viabackwards/api/entities/types/EntityType1_12.java
-public class Entity1_12Types {
+public class EntityTypes1_12 {

    public static EntityType getTypeFromId(int typeID, boolean isObject) {
        Optional<EntityType> type;
@@ -191,6 +190,16 @@ public class Entity1_12Types {
            return parent;
        }

+        @Override
+        public String identifier() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean isAbstractType() {
+            return id != -1;
+        }
+
        static {
            for (EntityType type : EntityType.values()) {
                TYPES.put(type.id, type);
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,12 +23,11 @@
 package com.viaversion.viaversion.api.minecraft.entities;

 import com.viaversion.viaversion.api.Via;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;

-public class Entity1_13Types {
+public class EntityTypes1_13 {

    public static EntityType getTypeFromId(int typeID, boolean isObject) {
        Optional<EntityType> type;
@@ -240,6 +239,16 @@ public class Entity1_13Types {
            return parent;
        }

+        @Override
+        public String identifier() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean isAbstractType() {
+            return id != -1;
+        }
+
        static {
            for (EntityType type : EntityType.values()) {
                TYPES.put(type.id, type);
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -24,7 +24,7 @@ package com.viaversion.viaversion.api.minecraft.entities;

 import com.viaversion.viaversion.util.EntityTypeUtil;

-public enum Entity1_14Types implements EntityType {
+public enum EntityTypes1_14 implements EntityType {

    ENTITY(-1),

@@ -204,12 +204,12 @@ public enum Entity1_14Types implements EntityType {
    private final int id;
    private final EntityType parent;

-    Entity1_14Types(int id) {
+    EntityTypes1_14(int id) {
        this.id = id;
        this.parent = null;
    }

-    Entity1_14Types(int id, EntityType parent) {
+    EntityTypes1_14(int id, EntityType parent) {
        this.id = id;
        this.parent = parent;
    }
@@ -224,6 +224,16 @@ public enum Entity1_14Types implements EntityType {
        return parent;
    }

+    @Override
+    public String identifier() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean isAbstractType() {
+        return id != -1;
+    }
+
    static {
        TYPES = EntityTypeUtil.toOrderedArray(values());
    }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -24,7 +24,7 @@ package com.viaversion.viaversion.api.minecraft.entities;

 import com.viaversion.viaversion.util.EntityTypeUtil;

-public enum Entity1_15Types implements EntityType {
+public enum EntityTypes1_15 implements EntityType {

    ENTITY(-1),

@@ -206,12 +206,12 @@ public enum Entity1_15Types implements EntityType {
    private final int id;
    private final EntityType parent;

-    Entity1_15Types(int id) {
+    EntityTypes1_15(int id) {
        this.id = id;
        this.parent = null;
    }

-    Entity1_15Types(int id, EntityType parent) {
+    EntityTypes1_15(int id, EntityType parent) {
        this.id = id;
        this.parent = parent;
    }
@@ -226,6 +226,16 @@ public enum Entity1_15Types implements EntityType {
        return parent;
    }

+    @Override
+    public String identifier() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean isAbstractType() {
+        return id != -1;
+    }
+
    static {
        TYPES = EntityTypeUtil.toOrderedArray(values());
    }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2021 ViaVersion and contributors
+ * Copyright (C) 2016-2023 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -24,7 +24,7 @@ package com.viaversion.viaversion.api.minecraft.entities;

 import com.viaversion.viaversion.util.EntityTypeUtil;

-public enum Entity1_16Types implements EntityType {
+public enum EntityTypes1_16 implements EntityType {

    ENTITY(-1),

@@ -211,12 +211,12 @@ public enum Entity1_16Types implements EntityType {
    private final int id;
    private final EntityType parent;

-    Entity1_16Types(int id) {
+    EntityTypes1_16(int id) {
        this.id = id;
        this.parent = null;
    }

-    Entity1_16Types(int id, EntityType parent) {
+    EntityTypes1_16(int id, EntityType parent) {
        this.id = id;
        this.parent = parent;
    }
@@ -231,6 +231,16 @@ public enum Entity1_16Types implements EntityType {
        return parent;
    }

+    @Override
+    public String identifier() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean isAbstractType() {
+        return id != -1;
+    }
+
    static {
        TYPES = EntityTypeUtil.toOrderedArray(values());
    }