5.3.0 Release

Also check for hanging sign block entities
Add TagUtil#getNamespacedTagKey and simplify code in component rewriter
2026-11-04 17:00:06 -05:00 · 2025-03-28 17:06:08 +01:00 · 2025-03-28 17:04:59 +01:00 · 2025-03-28 14:37:00 +01:00 · 2025-03-28 14:12:41 +01:00 · 2025-03-28 14:12:41 +01:00
1162 changed files with 47699 additions and 38953 deletions
@@ -2,15 +2,15 @@
 charset = utf-8
 indent_size = 4
 indent_style = space
-insert_final_newline = false
+insert_final_newline = true
 tab_width = 4

 [*.java]
 ij_java_class_count_to_use_import_on_demand = 999999
 ij_java_names_count_to_use_import_on_demand = 999999
-ij_java_imports_layout = *,|,$*
+ij_java_imports_layout = *, |, $*
 ij_java_generate_final_locals = true
 ij_java_generate_final_parameters = true

 [{*.json,*.yml}]
-indent_size = 2
+indent_size = 2
@@ -1,2 +1,3 @@
 github: kennytv
 patreon: kennytv
+custom: ['https://florianmichael.de/donate']
@@ -21,10 +21,11 @@ body:

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

@@ -51,7 +52,7 @@ body:
        List the steps on how we can reproduce the issue. Make sure we can easily understand what you mean with each step.
      placeholder: |
        Example:
-        1. Login with a 1.13.2 client
+        1. Login with a 1.21.3 client
        2. Place a sign
        3. The sign text is displayed wrong
    validations:
@@ -71,9 +72,9 @@ body:
    attributes:
      label: Additional Server Info
      description: |
-        Do you use a proxy (e.g. BungeeCord)? What software do you use and what plugins?
+        Do you use a proxy (e.g. Velocity)? What software do you use and what plugins?
      placeholder: |
-        Example: "I also use BungeeCord with the following plugins: x, y, z"
+        Example: "I also use Velocity with the following plugins: x, y, z"
    validations:
      required: false

@@ -82,7 +83,7 @@ body:
      label: Checklist
      description: Make sure you have followed each of the steps outlined here.
      options:
-        - label: Via plugins are only running on **EITHER** the backend servers (e.g. Paper) **OR** the proxy (e.g. BungeeCord), **not on both**.
+        - label: Via plugins are only running on **EITHER** the backend servers (e.g. Paper) **OR** the proxy (e.g. Velocity), **not on both**.
          required: true
        - label: I have included a ViaVersion dump.
          required: true
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
@@ -7,13 +7,15 @@ jobs:
    # 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-22.04
+    runs-on: ubuntu-24.04

    steps:
    - name: Checkout Repository
      uses: actions/checkout@v4
-    - name: Validate Gradle Wrapper
-      uses: gradle/wrapper-validation-action@v2
+      with:
+        persist-credentials: false
+    - name: Set up Gradle
+      uses: gradle/actions/setup-gradle@v4
    - name: Set up JDK 17
      uses: actions/setup-java@v4
      with:
@@ -22,3 +24,10 @@ jobs:
        check-latest: true
    - name: Build with Gradle
      run: ./gradlew build
+    - name: Upload Artifacts to GitHub
+      # Only upload on the preview repository as there is no CI job for it.
+      if: ${{ github.repository == 'ViaVersionDev' && github.ref_name == 'preview' }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: Artifacts
+        path: build/libs/
@@ -8,12 +8,14 @@ on:
 jobs:
  publish:
    if: github.repository_owner == 'ViaVersion'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
    steps:
      - name: Checkout Repository
        uses: actions/checkout@v4
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v2
+        with:
+          persist-credentials: false
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v4
      - name: Set up JDK 17
        uses: actions/setup-java@v4
        with:
@@ -0,0 +1,16 @@
+name: Update Gradle Wrapper
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * 0"
+
+jobs:
+  update-gradle-wrapper:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+      - name: Update Gradle Wrapper
+        uses: gradle-update/update-gradle-wrapper-action@v2
@@ -109,4 +109,7 @@ nb-configuration.xml
 .nb-gradle/

 ### MacOS ###
-.DS_Store
+.DS_Store
+
+### Run Folder (ViaProxy) ###
+common/run/
@@ -1,21 +1,31 @@
 # 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)
+[![Build Status](https://github.com/ViaVersion/ViaVersion/actions/workflows/build.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 -
 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.**
+The base ViaVersion jar runs on Paper and Velocity. We also have projects integrating ViaVersion to run
+on Fabric, Forge, Bungee, Sponge, or as a standalone proxy to join from basically any client version on
+any server version from the past decade. **See [HERE](https://viaversion.com) for an overview of the different Via\* projects.**
+
+Note that ViaVersion will be able to **run best on either Paper servers or through [ViaFabricPlus](https://github.com/ViaVersion/ViaFabricPlus?tab=readme-ov-file#viafabricplus)** due to having
+direct access to client/server state and more extensive API.

 Supported Versions:

-![Table (https://i.imgur.com/sTrVnC2.png)](https://i.imgur.com/sTrVnC2.png)
+![Table (https://i.imgur.com/zrQTcf0.png)](https://i.imgur.com/zrQTcf0.png)

-**User Docs:** https://docs.viaversion.com/display/VIAVERSION/
+**User Docs:** https://docs.viaversion.com
+
+Snapshot support
+--------
+**ViaVersion will only be released a few days *after* a Minecraft update** unless the protocol changes of the update were trivial. If you want early-access, usually days or even weeks before the final release, you can subscribe to either:
+- [GitHub Sponsors](https://github.com/sponsors/kennytv/sponsorships?sponsor=kennytv&tier_id=385613&preview=false) (preferred option. Use the `/verify` command on this Discord after), or alternatively
+- [Patreon](https://www.patreon.com/kennytv/membership) (see the highest tier and make sure to link Patreon to your Discord account under Settings->Connections)
+  This also includes access to a private repository with the code, which will be pushed to the public repository after the given delay on a Minecraft update.

 Releases/Dev Builds
 --------
@@ -47,7 +57,7 @@ ViaVersion as a Dependency
 <dependency>
    <groupId>com.viaversion</groupId>
    <artifactId>viaversion-api</artifactId>
-    <version>[4.0.0,5.0.0)</version>
+    <version>[5.0.0,6.0.0)</version>
    <scope>provided</scope>
 </dependency>
 ```
@@ -67,16 +77,20 @@ dependencies {
 If you need access to the existing protocol or platform implementations, use the parent artifact `viaversion`.
 Please note the [differences in licensing](#license).

+Note: If you want to make your own platform implementation of ViaVersion (and additional addons),
+you can use the [ViaLoader](https://github.com/ViaVersion/ViaLoader) project.

 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.

+You need JDK 17 or newer to build ViaVersion.
+

 Mapping Files
 --------------
-Mapping files are generated and managed in our [Mappings repository](https://github.com/ViaVersion/Mappings).
+Mapping files are generated and managed in our [Mappings repository](https://github.com/ViaVersion/Mappings). The generated mapping output is stored [here](./common/src/main/resources/assets/viaversion).


 Resources
@@ -84,12 +98,11 @@ Resources

 - **[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))
+- Previously: **[Burger](https://github.com/Pokechu22/Burger)** (see [PAaaS](https://github.com/Matsv/Paaas)) and **wiki.vg**

 License
 --------
-The entirety of the [API directory](api) (including the legacy API directory) is licensed under the MIT License;
+The entirety of the [API directory](api) is licensed under the MIT License;
 see [licenses/MIT.md](licenses/MIT.md) for
 details.

@@ -1,3 +0,0 @@
-dependencies {
-    compileOnly(projects.viaversionApi)
-}
@@ -1,101 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 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 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;
-
-/**
- * @deprecated may be removed at some point, use {@link com.viaversion.viaversion.api.Via}
- */
-@Deprecated
-public class Via<T> implements ViaAPI<T> {
-
-    private static final ViaAPI INSTANCE = new Via();
-
-    private Via() {
-    }
-
-    @Deprecated
-    public static ViaAPI getAPI() {
-        return INSTANCE;
-    }
-
-    @Override
-    public int getPlayerVersion(T player) {
-        return com.viaversion.viaversion.api.Via.getAPI().getPlayerVersion(player);
-    }
-
-    @Override
-    public int getPlayerVersion(UUID uuid) {
-        return com.viaversion.viaversion.api.Via.getAPI().getPlayerVersion(uuid);
-    }
-
-    @Override
-    public boolean isInjected(UUID playerUUID) {
-        return com.viaversion.viaversion.api.Via.getAPI().isInjected(playerUUID);
-    }
-
-    @Override
-    public String getVersion() {
-        return com.viaversion.viaversion.api.Via.getAPI().getVersion();
-    }
-
-    @Override
-    public void sendRawPacket(T player, ByteBuf packet) {
-        com.viaversion.viaversion.api.Via.getAPI().sendRawPacket(player, packet);
-    }
-
-    @Override
-    public void sendRawPacket(UUID uuid, ByteBuf packet) {
-        com.viaversion.viaversion.api.Via.getAPI().sendRawPacket(uuid, packet);
-    }
-
-    @Override
-    public BossBar createBossBar(String title, BossColor color, BossStyle style) {
-        return new BossBar(com.viaversion.viaversion.api.Via.getAPI().legacyAPI().createLegacyBossBar(title,
-                com.viaversion.viaversion.api.legacy.bossbar.BossColor.values()[color.ordinal()],
-                com.viaversion.viaversion.api.legacy.bossbar.BossStyle.values()[style.ordinal()]));
-    }
-
-    @Override
-    public BossBar createBossBar(String title, float health, BossColor color, BossStyle style) {
-        return new BossBar(com.viaversion.viaversion.api.Via.getAPI().legacyAPI().createLegacyBossBar(title, health,
-                com.viaversion.viaversion.api.legacy.bossbar.BossColor.values()[color.ordinal()],
-                com.viaversion.viaversion.api.legacy.bossbar.BossStyle.values()[style.ordinal()]));
-    }
-
-    @Override
-    public SortedSet<Integer> getSupportedVersions() {
-        return com.viaversion.viaversion.api.Via.getAPI().getSupportedVersions();
-    }
-
-    @Override
-    public SortedSet<Integer> getFullSupportedVersions() {
-        return com.viaversion.viaversion.api.Via.getAPI().getFullSupportedVersions();
-    }
-}
@@ -1,62 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 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 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;
-
-/**
- * @deprecated may be removed at some point, use {@link Via#getAPI()}
- */
-@Deprecated
-public interface ViaAPI<T> {
-
-    int getPlayerVersion(T player);
-
-    int getPlayerVersion(UUID uuid);
-
-    default boolean isPorted(UUID playerUUID) {
-        return isInjected(playerUUID);
-    }
-
-    boolean isInjected(UUID playerUUID);
-
-    String getVersion();
-
-    void sendRawPacket(T player, ByteBuf packet);
-
-    void sendRawPacket(UUID uuid, ByteBuf packet);
-
-    BossBar createBossBar(String title, BossColor color, BossStyle style);
-
-    BossBar createBossBar(String title, float health, BossColor color, BossStyle style);
-
-    SortedSet<Integer> getSupportedVersions();
-
-    SortedSet<Integer> getFullSupportedVersions();
-}
@@ -1,133 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 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 us.myles.ViaVersion.api.boss;
-
-import java.util.Set;
-import java.util.UUID;
-
-@Deprecated
-public class BossBar<T> {
-
-    private final com.viaversion.viaversion.api.legacy.bossbar.BossBar bossBar;
-
-    public BossBar(com.viaversion.viaversion.api.legacy.bossbar.BossBar bossBar) {
-        this.bossBar = bossBar;
-    }
-
-    public String getTitle() {
-        return bossBar.getTitle();
-    }
-
-    public BossBar setTitle(String title) {
-        bossBar.setTitle(title);
-        return this;
-    }
-
-    public float getHealth() {
-        return bossBar.getHealth();
-    }
-
-    public BossBar setHealth(float health) {
-        bossBar.setHealth(health);
-        return this;
-    }
-
-    public BossColor getColor() {
-        return BossColor.values()[bossBar.getColor().ordinal()];
-    }
-
-    public BossBar setColor(BossColor color) {
-        bossBar.setColor(com.viaversion.viaversion.api.legacy.bossbar.BossColor.values()[color.ordinal()]);
-        return this;
-    }
-
-    public BossStyle getStyle() {
-        return BossStyle.values()[bossBar.getStyle().ordinal()];
-    }
-
-    public BossBar setStyle(BossStyle style) {
-        bossBar.setStyle(com.viaversion.viaversion.api.legacy.bossbar.BossStyle.values()[style.ordinal()]);
-        return this;
-    }
-
-    @Deprecated
-    public BossBar addPlayer(T player) {
-        return this;
-    }
-
-    public BossBar addPlayer(UUID player) {
-        bossBar.addPlayer(player);
-        return this;
-    }
-
-    @Deprecated
-    public BossBar addPlayers(T... players) {
-        return this;
-    }
-
-    @Deprecated
-    public BossBar removePlayer(T player) {
-        return this;
-    }
-
-    public BossBar removePlayer(UUID uuid) {
-        bossBar.removePlayer(uuid);
-        return this;
-    }
-
-    public BossBar addFlag(BossFlag flag) {
-        bossBar.addFlag(com.viaversion.viaversion.api.legacy.bossbar.BossFlag.values()[flag.ordinal()]);
-        return this;
-    }
-
-    public BossBar removeFlag(BossFlag flag) {
-        bossBar.removeFlag(com.viaversion.viaversion.api.legacy.bossbar.BossFlag.values()[flag.ordinal()]);
-        return this;
-    }
-
-    public boolean hasFlag(BossFlag flag) {
-        return bossBar.hasFlag(com.viaversion.viaversion.api.legacy.bossbar.BossFlag.values()[flag.ordinal()]);
-    }
-
-    public Set<UUID> getPlayers() {
-        return bossBar.getPlayers();
-    }
-
-    public BossBar show() {
-        bossBar.show();
-        return this;
-    }
-
-    public BossBar hide() {
-        bossBar.hide();
-        return this;
-    }
-
-    public boolean isVisible() {
-        return bossBar.isVisible();
-    }
-
-    public UUID getId() {
-        return bossBar.getId();
-    }
-}
@@ -1,255 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 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 us.myles.ViaVersion.api.protocol;
-
-import com.google.common.base.Preconditions;
-import com.viaversion.viaversion.api.protocol.version.SubVersionRange;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-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}
- */
-@Deprecated
-public class ProtocolVersion {
-    private static final Int2ObjectMap<ProtocolVersion> versions = new Int2ObjectOpenHashMap<>();
-    private static final List<ProtocolVersion> versionList = new ArrayList<>();
-
-    public static final ProtocolVersion v1_4_6 = register(51, "1.4.6/7", new SubVersionRange("1.4", 6, 7));
-    public static final ProtocolVersion v1_5_1 = register(60, "1.5.1");
-    public static final ProtocolVersion v1_5_2 = register(61, "1.5.2");
-    public static final ProtocolVersion v_1_6_1 = register(73, "1.6.1");
-    public static final ProtocolVersion v_1_6_2 = register(74, "1.6.2");
-    public static final ProtocolVersion v_1_6_3 = register(77, "1.6.3");
-    public static final ProtocolVersion v_1_6_4 = register(78, "1.6.4");
-    public static final ProtocolVersion v1_7_1 = register(4, "1.7-1.7.5", new SubVersionRange("1.7", 0, 5));
-    public static final ProtocolVersion v1_7_6 = register(5, "1.7.6-1.7.10", new SubVersionRange("1.7", 6, 10));
-    public static final ProtocolVersion v1_8 = register(47, "1.8.x");
-    public static final ProtocolVersion v1_9 = register(107, "1.9");
-    public static final ProtocolVersion v1_9_1 = register(108, "1.9.1");
-    public static final ProtocolVersion v1_9_2 = register(109, "1.9.2");
-    public static final ProtocolVersion v1_9_3 = register(110, "1.9.3/1.9.4", new SubVersionRange("1.9", 3, 4));
-    public static final ProtocolVersion v1_10 = register(210, "1.10.x");
-    public static final ProtocolVersion v1_11 = register(315, "1.11");
-    public static final ProtocolVersion v1_11_1 = register(316, "1.11.1/1.11.2", new SubVersionRange("1.11", 1, 2));
-    public static final ProtocolVersion v1_12 = register(335, "1.12");
-    public static final ProtocolVersion v1_12_1 = register(338, "1.12.1");
-    public static final ProtocolVersion v1_12_2 = register(340, "1.12.2");
-    public static final ProtocolVersion v1_13 = register(393, "1.13");
-    public static final ProtocolVersion v1_13_1 = register(401, "1.13.1");
-    public static final ProtocolVersion v1_13_2 = register(404, "1.13.2");
-    public static final ProtocolVersion v1_14 = register(477, "1.14");
-    public static final ProtocolVersion v1_14_1 = register(480, "1.14.1");
-    public static final ProtocolVersion v1_14_2 = register(485, "1.14.2");
-    public static final ProtocolVersion v1_14_3 = register(490, "1.14.3");
-    public static final ProtocolVersion v1_14_4 = register(498, "1.14.4");
-    public static final ProtocolVersion v1_15 = register(573, "1.15");
-    public static final ProtocolVersion v1_15_1 = register(575, "1.15.1");
-    public static final ProtocolVersion v1_15_2 = register(578, "1.15.2");
-    public static final ProtocolVersion v1_16 = register(735, "1.16");
-    public static final ProtocolVersion v1_16_1 = register(736, "1.16.1");
-    public static final ProtocolVersion v1_16_2 = register(751, "1.16.2");
-    public static final ProtocolVersion v1_16_3 = register(753, "1.16.3");
-    public static final ProtocolVersion v1_16_4 = register(754, "1.16.4/1.16.5", new SubVersionRange("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 SubVersionRange("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/1.19.2", new SubVersionRange("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 SubVersionRange("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/1.20.4", new SubVersionRange("1.20", 3, 4));
-    public static final ProtocolVersion v1_20_5 = register(766, "1.20.5");
-    public static final ProtocolVersion unknown = register(-1, "UNKNOWN");
-
-    public static ProtocolVersion register(int version, String name) {
-        return register(version, -1, name);
-    }
-
-    public static ProtocolVersion register(int version, int snapshotVersion, String name) {
-        return register(version, snapshotVersion, name, null);
-    }
-
-    public static ProtocolVersion register(int version, String name, @Nullable SubVersionRange versionRange) {
-        return register(version, -1, name, versionRange);
-    }
-
-    public static ProtocolVersion register(int version, int snapshotVersion, String name, @Nullable SubVersionRange versionRange) {
-        ProtocolVersion protocol = new ProtocolVersion(version, snapshotVersion, name, versionRange);
-        versionList.add(protocol);
-        versions.put(protocol.getVersion(), protocol);
-        if (protocol.isSnapshot()) {
-            versions.put(protocol.getFullSnapshotVersion(), protocol);
-        }
-        return protocol;
-    }
-
-    public static boolean isRegistered(int id) {
-        return versions.containsKey(id);
-    }
-
-    public static @NonNull ProtocolVersion getProtocol(int id) {
-        ProtocolVersion protocolVersion = versions.get(id);
-        if (protocolVersion != null) {
-            return protocolVersion;
-        } else {
-            return new ProtocolVersion(id, "Unknown (" + id + ")");
-        }
-    }
-
-    public static int getIndex(ProtocolVersion version) {
-        return versionList.indexOf(version);
-    }
-
-    public static List<ProtocolVersion> getProtocols() {
-        return Collections.unmodifiableList(new ArrayList<>(versions.values()));
-    }
-
-    public static @Nullable ProtocolVersion getClosest(String protocol) {
-        for (ProtocolVersion version : versions.values()) {
-            String name = version.getName();
-            if (name.equals(protocol)) {
-                return version;
-            }
-
-            if (version.isVersionWildcard()) {
-                // Test against the major version with and without a minor version
-                String majorVersion = name.substring(0, name.length() - 2);
-                if (majorVersion.equals(protocol) || (protocol.startsWith(name.substring(0, name.length() - 1)))) {
-                    return version;
-                }
-            } else if (version.isRange()) {
-                if (version.getIncludedVersions().contains(protocol)) {
-                    return version;
-                }
-            }
-        }
-        return null;
-    }
-
-    private final int version;
-    private final int snapshotVersion;
-    private final String name;
-    private final boolean versionWildcard;
-    private final Set<String> includedVersions;
-
-    public ProtocolVersion(int version, String name) {
-        this(version, -1, name, null);
-    }
-
-    public ProtocolVersion(int version, int snapshotVersion, String name, @Nullable SubVersionRange versionRange) {
-        this.version = version;
-        this.snapshotVersion = snapshotVersion;
-        this.name = name;
-        this.versionWildcard = name.endsWith(".x");
-
-        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.rangeFrom(); i <= versionRange.rangeTo(); i++) {
-                if (i == 0) {
-                    includedVersions.add(versionRange.baseVersion()); // Keep both the base version and with ".0" appended
-                }
-
-                includedVersions.add(versionRange.baseVersion() + "." + i);
-            }
-        } else {
-            includedVersions = Collections.singleton(name);
-        }
-    }
-
-    public int getVersion() {
-        return version;
-    }
-
-    public int getSnapshotVersion() {
-        Preconditions.checkArgument(isSnapshot());
-        return snapshotVersion;
-    }
-
-    public int getFullSnapshotVersion() {
-        Preconditions.checkArgument(isSnapshot());
-        return (1 << 30) | snapshotVersion; // Bit indicating snapshot versions
-    }
-
-    public int getOriginalVersion() {
-        return snapshotVersion == -1 ? version : ((1 << 30) | snapshotVersion);
-    }
-
-    public boolean isKnown() {
-        return version != -1;
-    }
-
-    public boolean isRange() {
-        return includedVersions.size() != 1;
-    }
-
-    public Set<String> getIncludedVersions() {
-        return Collections.unmodifiableSet(includedVersions);
-    }
-
-    public boolean isVersionWildcard() {
-        return versionWildcard;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public boolean isSnapshot() {
-        return snapshotVersion != -1;
-    }
-
-    public int getId() {
-        return version;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        ProtocolVersion that = (ProtocolVersion) o;
-        return version == that.version;
-    }
-
-    @Override
-    public int hashCode() {
-        return version;
-    }
-
-    @Override
-    public String toString() {
-        return String.format("%s (%d)", this.name, this.version);
-    }
-}
@@ -16,14 +16,18 @@ sourceSets {

 dependencies {
    api(libs.fastutil)
-    api(libs.vianbt)
-    api(libs.gson)
+    api(libs.vianbt) {
+        exclude("it.unimi.dsi", "fastutil")
+    }
+    api(libs.gson) {
+        exclude("com.google.errorprone", "error_prone_annotations")
+    }
    implementation(rootProject.libs.text) {
        exclude("com.google.code.gson", "gson")
        exclude("com.viaversion", "nbt")
    }
+    api(libs.snakeYaml)

-    compileOnlyApi(libs.snakeYaml)
    compileOnlyApi(libs.netty)
    compileOnlyApi(libs.guava)
    compileOnlyApi(libs.checkerQual)
@@ -32,5 +36,3 @@ dependencies {
 java {
    withJavadocJar()
 }
-
-publishShadowJar()
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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
@@ -56,7 +56,7 @@ public interface ViaAPI<T> {
     * @since 4.0.2
     */
    default int majorVersion() {
-        return 4;
+        return 5;
    }

    /**
@@ -78,7 +78,6 @@ public interface ViaAPI<T> {

    /**
     * Returns the protocol version of a player.
-     * This will also retrieve the version from ProtocolSupport if it's being used.
     *
     * @param player the platform's player object, e.g. Bukkit this is Player
     * @return protocol version, for example (47=1.8-1.8.8, 107=1.9, 108=1.9.1), or -1 if no longer connected
@@ -89,7 +88,6 @@ public interface ViaAPI<T> {

    /**
     * Returns the protocol version of a player.
-     * This will also retrieve the version from ProtocolSupport if it's being used.
     *
     * @param player the platform's player object, e.g. Bukkit this is Player
     * @return the protocol version object (see {@link ProtocolVersion}), or ProtocolVersion.unknown if not connected
@@ -109,7 +107,6 @@ public interface ViaAPI<T> {

    /**
     * Returns the protocol version of a player.
-     * This will also retrieve the version from ProtocolSupport if it's being used.
     *
     * @param uuid UUID of a player
     * @return the protocol version object (see {@link ProtocolVersion}), or ProtocolVersion.unknown if not connected
@@ -117,7 +114,8 @@ public interface ViaAPI<T> {
    ProtocolVersion getPlayerProtocolVersion(UUID uuid);

    /**
-     * Returns whether Via injected into this player connection.
+     * Returns whether Via injected into this player connection. Note that this method may not work on
+     * clientside implementations and is generally not recommended to be used. Use {@link ConnectionManager} instead.
     *
     * @param uuid uuid of the player
     * @return whether Via has a cached a UserConnection for this player
@@ -125,7 +123,8 @@ public interface ViaAPI<T> {
    boolean isInjected(UUID uuid);

    /**
-     * Returns the Via injected UserConnection if present.
+     * Returns whether Via injected into this player connection. Note that this method may not work on
+     * clientside implementations and is generally not recommended to be used. Use {@link ConnectionManager} instead.
     *
     * @param uuid uuid of the player
     * @return user connection if present
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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
@@ -140,6 +140,13 @@ public interface ViaManager {
     */
    void addEnableListener(Runnable runnable);

+    /**
+     * Adds a runnable to be executed when ViaVersion has finished its init after the full server load.
+     *
+     * @param runnable runnable to be executed
+     */
+    void addPostEnableListener(Runnable runnable);
+
    /**
     * Returns whether the manager has been initialized (and protocols have been loaded).
     *
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,21 +26,21 @@ import com.viaversion.viaversion.util.ChatColorUtil;
 import java.util.Collections;
 import java.util.List;

-public abstract class ViaSubCommand {
+public interface ViaSubCommand {

    /**
     * Subcommand name
     *
     * @return The commands name
     */
-    public abstract String name();
+    String name();

    /**
     * subcommand description, this'll show in /viaversion list
     *
     * @return The commands description
     */
-    public abstract String description();
+    String description();

    /**
     * Usage example:
@@ -48,7 +48,7 @@ public abstract class ViaSubCommand {
     *
     * @return The commands usage
     */
-    public String usage() {
+    default String usage() {
        return name();
    }

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

@@ -66,9 +66,9 @@ public abstract class ViaSubCommand {
     *
     * @param sender Command sender
     * @param args   Arguments
-     * @return commands executed succesfully if false, show usage
+     * @return commands executed successfully if false, show usage
     */
-    public abstract boolean execute(ViaCommandSender sender, String[] args);
+    boolean execute(ViaCommandSender sender, String[] args);

    /**
     * Yay, possibility to implement tab-completion
@@ -77,7 +77,7 @@ public abstract class ViaSubCommand {
     * @param args   args
     * @return tab complete possibilities
     */
-    public List<String> onTabComplete(ViaCommandSender sender, String[] args) {
+    default List<String> onTabComplete(ViaCommandSender sender, String[] args) {
        return Collections.emptyList();
    }

@@ -87,7 +87,7 @@ public abstract class ViaSubCommand {
     * @param s string to replace
     * @return output String
     */
-    public static String color(String s) {
+    static String color(String s) {
        return ChatColorUtil.translateAlternateColorCodes(s);
    }

@@ -98,7 +98,7 @@ public abstract class ViaSubCommand {
     * @param message message
     * @param args    objects to replace
     */
-    public static void sendMessage(ViaCommandSender sender, String message, Object... args) {
+    default void sendMessage(ViaCommandSender sender, String message, Object... args) {
        sender.sendMessage(color(args == null ? message : String.format(message, args)));
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,10 +30,17 @@ public interface ViaVersionCommand {
     * Register your own subcommand inside ViaVersion
     *
     * @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
+     * @throws IllegalArgumentException throws an exception when the subcommand already exists or if it's not valid, example: space
     */
    void registerSubCommand(ViaSubCommand command);

+    /**
+     * Removes a subcommand by name, can be used to unload default subcommands which are not supported
+     * on the platform.
+     * @param name Subcommand name
+     */
+    void removeSubCommand(String name);
+
    /**
     * Check if a subcommand is registered.
     *
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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
@@ -67,9 +67,9 @@ public interface ViaVersionConfig extends Config {
    boolean isShowNewDeathMessages();

    /**
-     * Get if metadata errors will be suppressed
+     * Get if entity data errors will be suppressed
     *
-     * @return true if metadata errors suppression is enabled
+     * @return true if entity data errors suppression is enabled
     */
    boolean isSuppressMetadataErrors();

@@ -292,13 +292,6 @@ public interface ViaVersionConfig extends Config {
     */
    boolean isDisable1_13AutoComplete();

-    /**
-     * Tries to minimize cooldown animation.
-     *
-     * @return true if enabled
-     */
-    boolean isMinimizeCooldown();
-
    /**
     * Enable the serverside blockconnections for 1.13+ clients
     *
@@ -457,4 +450,32 @@ public interface ViaVersionConfig extends Config {
     * @return the value sent to 1.19+ clients on join
     */
    boolean enforceSecureChat();
+
+    /**
+     * Handles items with invalid count values (higher than max stack size) on 1.20.3 servers.
+     *
+     * @return true if enabled
+     */
+    boolean handleInvalidItemCount();
+
+    /**
+     * Tries to cancel block break/place sounds sent by 1.8 servers to 1.9+ clients to prevent them from playing twice
+     *
+     * @return true if enabled
+     */
+    boolean cancelBlockSounds();
+
+    /**
+     * Hides scoreboard numbers for 1.20.3+ clients on older server versions.
+     *
+     * @return true if enabled
+     */
+    boolean hideScoreboardNumbers();
+
+    /**
+     * Fixes 1.21+ clients on 1.20.5 servers placing water/lava buckets at the wrong location when moving fast.
+     *
+     * @return true if enabled
+     */
+    boolean fix1_21PlacementRotation();
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,75 +28,92 @@ import java.util.UUID;
 import org.checkerframework.checker.nullness.qual.Nullable;

 /**
- * Handles injected UserConnections
+ * Handles injected UserConnections.
+ * Check {@link UserConnection#isServerSide()} and {@link UserConnection#isClientSide()} to determine the connection type.
 */
 public interface ConnectionManager {

    /**
-     * Returns if Via injected into this player connection.
+     * Returns if Via has injected. See above for the connection types.
     *
-     * @param playerId player uuid
+     * @param uuid player uuid
     * @return true if the player is handled by Via
     */
-    boolean isClientConnected(UUID playerId);
+    boolean hasServerConnection(UUID uuid);

-    /**
-     * Frontend connections will have the UUID stored. Override this if your platform isn't always frontend.
-     * UUIDs can't be duplicate between frontend connections.
-     *
-     * @return true if the user is a frontend connection
-     */
-    default boolean isFrontEnd(UserConnection connection) {
-        return !connection.isClientSide();
+    @Deprecated
+    default boolean isClientConnected(UUID uuid) {
+        return hasServerConnection(uuid);
    }

    /**
-     * Returns the frontend UserConnection from the player connected to this proxy server
-     * Returns null when there isn't a server or connection was not found
-     * When ViaVersion is reloaded, this method may not return some players.
-     * May not return ProtocolSupport players.
-     * <p>
-     * Note that connections are removed as soon as their channel is closed,
-     * so avoid using this method during player quits for example.
+     * Returns if Via has injected. See above for the connection types.
     *
-     * @return frontend UserConnection of the player connected to this proxy server
+     * @param uuid player uuid
+     * @return true if the player is handled by Via
     */
-    @Nullable UserConnection getConnectedClient(UUID clientIdentifier);
+    boolean hasClientConnection(UUID uuid);

    /**
-     * 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 the server UserConnection. See above for the connection types.
     * When ViaVersion is reloaded, this method may not return some players.
-     * May not return ProtocolSupport players.
     * <p>
     * Note that connections are removed as soon as their channel is closed,
     * so avoid using this method during player quits for example.
     *
-     * @return UUID of the frontend connection to this proxy server
+     * @return server UserConnection of the player or null
     */
-    @Nullable UUID getConnectedClientId(UserConnection connection);
+    @Nullable
+    UserConnection getServerConnection(UUID uuid);
+
+    @Deprecated
+    @Nullable default UserConnection getConnectedClient(UUID uuid) {
+        return getServerConnection(uuid);
+    }
+
+    /**
+     * Returns the client UserConnection. See above for the connection types.
+     * When ViaVersion is reloaded, this method may not return some players.
+     * <p>
+     * Note that connections are removed as soon as their channel is closed,
+     * so avoid using this method during player quits for example.
+     *
+     * @return client UserConnection of the player or null
+     */
+    @Nullable
+    UserConnection getClientConnection(UUID uuid);
+
+    /**
+     * Returns a map containing the UUIDs and server UserConnections
+     * When ViaVersion is reloaded, this method may not return some players.
+     *
+     * @return map containing the UUIDs and frontend UserConnections
+     */
+    Map<UUID, UserConnection> getServerConnections();
+
+    @Deprecated
+    default Map<UUID, UserConnection> getConnectedClients() {
+        return getServerConnections();
+    }
+
+    /**
+     * Returns a map containing the UUIDs and client UserConnections
+     * When ViaVersion is reloaded, this method may not return some players.
+     *
+     * @return map containing the UUIDs and client UserConnections
+     */
+    Map<UUID, UserConnection> getClientConnections();

    /**
     * Returns all UserConnections which are registered
     * May contain duplicated UUIDs on multiple ProtocolInfo.
     * May contain frontend, backend and/or client-sided connections.
     * When ViaVersion is reloaded, this method may not return some players.
-     * May not contain ProtocolSupport players.
     *
     * @return connected UserConnections
     */
    Set<UserConnection> getConnections();

-    /**
-     * Returns a map containing the UUIDs and frontend UserConnections from players connected to this proxy server
-     * Returns empty list when there isn't a server
-     * When ViaVersion is reloaded, this method may not return some players.
-     * May not contain ProtocolSupport players.
-     *
-     * @return map containing the UUIDs and frontend UserConnections from players connected to this proxy server
-     */
-    Map<UUID, UserConnection> getConnectedClients();
-
    void onLoginSuccess(UserConnection connection);

    void onDisconnect(UserConnection connection);
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,17 +31,6 @@ import org.checkerframework.checker.nullness.qual.Nullable;

 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()}
-     */
-    @Deprecated/*(forRemoval = true)*/
-    default State getState() {
-        return this.getServerState();
-    }
-
    /**
     * Returns the protocol state the client is currently in.
     *
@@ -153,12 +142,4 @@ public interface ProtocolInfo {
    ProtocolPipeline getPipeline();

    void setPipeline(ProtocolPipeline pipeline);
-
-    /**
-     * Returns the user connection this info represents.
-     *
-     * @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-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,6 +29,11 @@ public abstract class StoredObject implements StorableObject {
        this.user = user;
    }

+    public UserConnection user() {
+        return this.user;
+    }
+
+    @Deprecated
    public UserConnection getUser() {
        return user;
    }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,14 +24,15 @@ package com.viaversion.viaversion.api.connection;

 import com.viaversion.viaversion.api.configuration.ViaVersionConfig;
 import com.viaversion.viaversion.api.data.entity.EntityTracker;
+import com.viaversion.viaversion.api.minecraft.ClientWorld;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.protocol.packet.PacketTracker;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
-import com.viaversion.viaversion.exception.CancelException;
 import com.viaversion.viaversion.exception.InformativeException;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
+import io.netty.handler.codec.CodecException;
 import java.util.Collection;
 import java.util.Map;
 import java.util.UUID;
@@ -99,14 +100,33 @@ public interface UserConnection {
    void addEntityTracker(Class<? extends Protocol> protocolClass, EntityTracker tracker);

    /**
-     * Clear stored objects and entity trackers.
+     * Returns the client world by the given protocol class if present.
+     *
+     * @param protocolClass protocol class
+     * @param <T>           client world type
+     * @return client world if present
+     */
+    @Nullable
+    <T extends ClientWorld> T getClientWorld(Class<? extends Protocol> protocolClass);
+
+    /**
+     * Adds a client world to the user connection.
+     * Does not override existing client worlds.
+     *
+     * @param protocolClass protocol class
+     * @param clientWorld   client world
+     */
+    void addClientWorld(Class<? extends Protocol> protocolClass, ClientWorld clientWorld);
+
+    /**
+     * Clear stored objects, entity trackers and client worlds.
     */
    default void clearStoredObjects() {
        clearStoredObjects(false);
    }

    /**
-     * Clear stored objects and entity trackers.
+     * Clear stored objects, entity trackers and client worlds.
     * 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
@@ -205,11 +225,10 @@ public interface UserConnection {
     *
     * @param buf            ByteBuf with packet id and packet contents
     * @param cancelSupplier function called with original CancelException for generating the Exception when the packet is cancelled
-     * @throws CancelException      if the packet should be cancelled
+     * @throws CodecException       if the packet should be cancelled (by netty)
     * @throws InformativeException if packet transforming failed
-     * @throws Exception            if any other processing outside of transforming fails
     */
-    void transformClientbound(ByteBuf buf, Function<Throwable, Exception> cancelSupplier) throws Exception;
+    void transformClientbound(ByteBuf buf, Function<Throwable, CodecException> cancelSupplier) throws InformativeException;

    /**
     * Transforms the serverbound packet contained in ByteBuf.
@@ -217,11 +236,10 @@ public interface UserConnection {
     * @param buf            ByteBuf with packet id and packet contents
     * @param cancelSupplier Function called with original CancelException for generating the Exception used when
     *                       packet is cancelled
-     * @throws CancelException      if the packet should be cancelled
+     * @throws CodecException       if the packet should be cancelled (by netty)
     * @throws InformativeException if packet transforming failed
-     * @throws Exception            if any other processing outside of transforming fails
     */
-    void transformServerbound(ByteBuf buf, Function<Throwable, Exception> cancelSupplier) throws Exception;
+    void transformServerbound(ByteBuf buf, Function<Throwable, CodecException> cancelSupplier) throws InformativeException;

    /**
     * Transforms the packet depending on whether the connection is clientside or not.
@@ -229,7 +247,7 @@ public interface UserConnection {
     * @see #transformClientbound(ByteBuf, Function)
     * @see #transformServerbound(ByteBuf, Function)
     */
-    default void transformOutgoing(ByteBuf buf, Function<Throwable, Exception> cancelSupplier) throws Exception {
+    default void transformOutgoing(ByteBuf buf, Function<Throwable, CodecException> cancelSupplier) throws InformativeException {
        if (isClientSide()) {
            transformServerbound(buf, cancelSupplier);
        } else {
@@ -243,7 +261,7 @@ public interface UserConnection {
     * @see #transformClientbound(ByteBuf, Function)
     * @see #transformServerbound(ByteBuf, Function)
     */
-    default void transformIncoming(ByteBuf buf, Function<Throwable, Exception> cancelSupplier) throws Exception {
+    default void transformIncoming(ByteBuf buf, Function<Throwable, CodecException> cancelSupplier) throws InformativeException {
        if (isClientSide()) {
            transformClientbound(buf, cancelSupplier);
        } else {
@@ -301,37 +319,35 @@ public interface UserConnection {
    void setPendingDisconnect(boolean pendingDisconnect);

    /**
-     * Returns whether this is a client-side connection.
-     * This is a mod integrated into the client itself, or for example a backend Velocity connection.
+     * Returns whether this is a backend connection.
+     * This is a mod integrated into the client, or for example a backend Velocity connection.
     *
-     * @return whether this is a client-side connection
+     * @return whether this is a backend connection
     */
    boolean isClientSide();

+    /**
+     * Returns whether this is a frontend connection.
+     * This is a plugin integrated into the server, or for example a frontend Velocity connection.
+     *
+     * @return whether this is a frontend connection
+     */
+    default boolean isServerSide() {
+        return !isClientSide();
+    }
+
    /**
     * 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);
+    default boolean shouldApplyBlockProtocol() {
+        return isServerSide();
+    }

    /**
     * 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}.
+     * transforming its contents if used together with {@link PacketWrapper#PASSTHROUGH_ID}.
     *
     * @return generated passthrough token
     */
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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
@@ -49,17 +49,25 @@ public interface FullMappings extends BiMappings {
     * Returns the unmapped string identifier for the given mapped id.
     *
     * @param id unmapped id
-     * @return unmapped string identifier
+     * @return unmapped string identifier, or null if out of bounds
     */
-    String identifier(int id);
+    @Nullable String identifier(int id);
+
+    /**
+     * Returns the unmapped string identifier for the given mapped identifier.
+     *
+     * @param mappedIdentifier mapped identifier
+     * @return unmapped string identifier, or null if not found
+     */
+    @Nullable String identifier(String mappedIdentifier);

    /**
     * Returns the mapped string identifier for the given mapped id.
     *
     * @param mappedId mapped id
-     * @return mapped string identifier
+     * @return mapped string identifier, or null if out of bounds
     */
-    String mappedIdentifier(int mappedId);
+    @Nullable String mappedIdentifier(int mappedId);

    /**
     * Returns the mapped string identifier for the given unmapped identifier.
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,6 +54,15 @@ public class FullMappingsBase implements FullMappings {
        this.mappings = mappings;
    }

+    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;
+    }
+
    @Override
    public int id(final String identifier) {
        return stringToId.getInt(Key.stripMinecraftNamespace(identifier));
@@ -66,12 +75,31 @@ public class FullMappingsBase implements FullMappings {

    @Override
    public String identifier(final int id) {
+        if (id < 0 || id >= idToString.length) {
+            return null;
+        }
+
        final String identifier = idToString[id];
        return Key.namespaced(identifier);
    }

    @Override
-    public String mappedIdentifier(final int mappedId) {
+    public @Nullable String identifier(final String mappedIdentifier) {
+        final int mappedId = mappedId(mappedIdentifier);
+        if (mappedId == -1) {
+            return null;
+        }
+
+        final int id = mappings.inverse().getNewId(mappedId);
+        return id != -1 ? identifier(id) : null;
+    }
+
+    @Override
+    public @Nullable String mappedIdentifier(final int mappedId) {
+        if (mappedId < 0 || mappedId >= mappedIdToString.length) {
+            return null;
+        }
+
        final String identifier = mappedIdToString[mappedId];
        return Key.namespaced(identifier);
    }
@@ -111,13 +139,4 @@ public class FullMappingsBase implements FullMappings {
    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-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,15 +22,7 @@
 */
 package com.viaversion.viaversion.api.data;

-public class IdentityMappings implements Mappings {
-
-    private final int size;
-    private final int mappedSize;
-
-    public IdentityMappings(final int size, final int mappedSize) {
-        this.size = size;
-        this.mappedSize = mappedSize;
-    }
+public record IdentityMappings(int size, int mappedSize) implements Mappings {

    @Override
    public int getNewId(final int id) {
@@ -42,16 +34,6 @@ public class IdentityMappings implements Mappings {
        throw new UnsupportedOperationException();
    }

-    @Override
-    public int size() {
-        return size;
-    }
-
-    @Override
-    public int mappedSize() {
-        return mappedSize;
-    }
-
    @Override
    public Mappings inverse() {
        return new IdentityMappings(mappedSize, size);
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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
@@ -35,52 +35,84 @@ public interface MappingData {
    void load();

    /**
-     * Returns the mapped block state id, or -1 if unmapped.
+     * Returns the mapped block state id, or 0 if unmapped.
     *
     * @param id unmapped block state id
-     * @return mapped block state id, or -1 if unmapped
+     * @return mapped block state id, or 0 if unmapped
     * @throws NullPointerException if this mappingdata does not hold block state mappings
     */
    int getNewBlockStateId(int id);

    /**
-     * Returns the mapped block id, or -1 if unmapped.
+     * Returns the mapped block id, or 0 if unmapped.
     *
     * @param id unmapped block id
-     * @return mapped block id, or -1 if unmapped
+     * @return mapped block id, or 0 if unmapped
     * @throws NullPointerException if this mappingdata does not hold block mappings
     */
    int getNewBlockId(int id);

    /**
-     * Returns the mapped item id, or -1 if unmapped.
+     * Returns the backwards mapped block id, or 1 if unmapped.
+     *
+     * @param id mapped block id
+     * @return backwards mapped block id, or 1 if unmapped
+     */
+    int getOldBlockId(int id);
+
+    /**
+     * Returns the mapped item id, or 0 if unmapped.
     *
     * @param id unmapped item id
-     * @return mapped item id, or -1 if unmapped
+     * @return mapped item id, or 0 if unmapped
     * @throws NullPointerException if this mappingdata does not hold item mappings
     */
    int getNewItemId(int id);

    /**
-     * Returns the backwards mapped item id, or -1 if unmapped.
+     * Returns the backwards mapped item id, or 1 if unmapped.
     *
     * @param id mapped item id
-     * @return backwards mapped item id, or -1 if unmapped
+     * @return backwards mapped item id, or 1 if unmapped
     * @throws NullPointerException if this mappingdata does not hold item mappings
     */
    int getOldItemId(int id);

    /**
-     * Returns the mapped particle id, or -1 if unmapped.
+     * Returns the mapped particle id, or 0 if unmapped.
     *
     * @param id unmapped particle id
-     * @return mapped particle id, or -1 if unmapped
+     * @return mapped particle id, or 0 if unmapped
     * @throws NullPointerException if this mappingdata does not hold particle mappings
     */
    int getNewParticleId(int id);

+    /**
+     * Returns the mapped attribute id, or 0 if unmapped.
+     *
+     * @param id unmapped attribute id
+     * @return mapped attribute id, or 0 if unmapped
+     * @throws NullPointerException if this mappingdata does not hold attribute mappings
+     */
    int getNewAttributeId(int id);

+    /**
+     * Returns the mapped sound id, or 0 if unmapped.
+     *
+     * @param id unmapped sound id
+     * @return mapped sound id, or 0 if unmapped
+     * @throws NullPointerException if this mappingdata does not hold sound mappings
+     */
+    int getNewSoundId(int id);
+
+    /**
+     * Returns the backwards mapped sound id, or 1 if unmapped.
+     *
+     * @param i mapped sound id
+     * @return backwards mapped sound id, or 1 if unmapped
+     */
+    int getOldSoundId(int i);
+
    /**
     * Returns a list of tags to send if present.
     *
@@ -120,10 +152,10 @@ public interface MappingData {

    @Nullable Mappings getEnchantmentMappings();

-    @Nullable Mappings getAttributeMappings();
-
    @Nullable Mappings getPaintingMappings();

+    @Nullable FullMappings getAttributeMappings();
+
    @Nullable FullMappings getEntityMappings();

    @Nullable FullMappings getArgumentTypeMappings();
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,9 @@
 */
 package com.viaversion.viaversion.api.data;

-import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import com.github.steveice10.opennbt.tag.builtin.IntArrayTag;
-import com.github.steveice10.opennbt.tag.builtin.Tag;
+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.IntArrayTag;
+import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.minecraft.RegistryType;
 import com.viaversion.viaversion.api.minecraft.TagData;
@@ -39,13 +39,14 @@ public class MappingDataBase implements MappingData {

    protected final String unmappedVersion;
    protected final String mappedVersion;
-    protected BiMappings itemMappings;
    protected FullMappings argumentTypeMappings;
    protected FullMappings entityMappings;
    protected FullMappings recipeSerializerMappings;
    protected FullMappings itemDataSerializerMappings;
+    protected FullMappings attributeMappings;
    protected ParticleMappings particleMappings;
-    protected Mappings blockMappings;
+    protected BiMappings itemMappings;
+    protected BiMappings blockMappings;
    protected Mappings blockStateMappings;
    protected Mappings blockEntityMappings;
    protected Mappings soundMappings;
@@ -53,7 +54,6 @@ public class MappingDataBase implements MappingData {
    protected Mappings enchantmentMappings;
    protected Mappings paintingMappings;
    protected Mappings menuMappings;
-    protected Mappings attributeMappings;
    protected Map<RegistryType, List<TagData>> tags;

    public MappingDataBase(final String unmappedVersion, final String mappedVersion) {
@@ -68,7 +68,7 @@ public class MappingDataBase implements MappingData {
        }

        final CompoundTag data = readMappingsFile("mappings-" + unmappedVersion + "to" + mappedVersion + ".nbt");
-        blockMappings = loadMappings(data, "blocks");
+        blockMappings = loadBiMappings(data, "blocks");
        blockStateMappings = loadMappings(data, "blockstates");
        blockEntityMappings = loadMappings(data, "blockentities");
        soundMappings = loadMappings(data, "sounds");
@@ -76,8 +76,6 @@ public class MappingDataBase implements MappingData {
        menuMappings = loadMappings(data, "menus");
        enchantmentMappings = loadMappings(data, "enchantments");
        paintingMappings = loadMappings(data, "paintings");
-        attributeMappings = loadMappings(data, "attributes");
-

        final CompoundTag unmappedIdentifierData = readUnmappedIdentifiersFile("identifiers-" + unmappedVersion + ".nbt");
        final CompoundTag mappedIdentifierData = readMappedIdentifiersFile("identifiers-" + mappedVersion + ".nbt");
@@ -87,6 +85,7 @@ public class MappingDataBase implements MappingData {
            argumentTypeMappings = loadFullMappings(data, unmappedIdentifierData, mappedIdentifierData, "argumenttypes");
            recipeSerializerMappings = loadFullMappings(data, unmappedIdentifierData, mappedIdentifierData, "recipe_serializers");
            itemDataSerializerMappings = loadFullMappings(data, unmappedIdentifierData, mappedIdentifierData, "data_component_type");
+            attributeMappings = loadFullMappings(data, unmappedIdentifierData, mappedIdentifierData, "attributes");

            final List<String> unmappedParticles = identifiersFromGlobalIds(unmappedIdentifierData, "particles");
            final List<String> mappedParticles = identifiersFromGlobalIds(mappedIdentifierData, "particles");
@@ -107,6 +106,7 @@ public class MappingDataBase implements MappingData {
            this.tags = new EnumMap<>(RegistryType.class);
            loadTags(RegistryType.ITEM, tagsTag);
            loadTags(RegistryType.BLOCK, tagsTag);
+            loadTags(RegistryType.ENTITY, tagsTag);
        }

        loadExtras(data);
@@ -132,8 +132,19 @@ public class MappingDataBase implements MappingData {
        return MappingDataLoader.INSTANCE.loadMappings(data, key);
    }

-    protected @Nullable FullMappings loadFullMappings(final CompoundTag data, final CompoundTag unmappedIdentifiers, final CompoundTag mappedIdentifiers, final String key) {
-        return MappingDataLoader.INSTANCE.loadFullMappings(data, unmappedIdentifiers, mappedIdentifiers, key);
+    protected @Nullable FullMappings loadFullMappings(final CompoundTag data, final CompoundTag unmappedIdentifiersTag, final CompoundTag mappedIdentifiersTag, final String key) {
+        if (!unmappedIdentifiersTag.contains(key) || !mappedIdentifiersTag.contains(key)) {
+            return null;
+        }
+
+        final List<String> unmappedIdentifiers = identifiersFromGlobalIds(unmappedIdentifiersTag, key);
+        final List<String> mappedIdentifiers = identifiersFromGlobalIds(mappedIdentifiersTag, key);
+        Mappings mappings = loadBiMappings(data, key); // Load as bi-mappings to keep the inverse cached
+        if (mappings == null) {
+            mappings = new IdentityMappings(unmappedIdentifiers.size(), mappedIdentifiers.size());
+        }
+
+        return new FullMappingsBase(unmappedIdentifiers, mappedIdentifiers, mappings);
    }

    protected @Nullable BiMappings loadBiMappings(final CompoundTag data, final String key) {
@@ -166,6 +177,11 @@ public class MappingDataBase implements MappingData {
        return checkValidity(id, blockMappings.getNewId(id), "block");
    }

+    @Override
+    public int getOldBlockId(final int id) {
+        return blockMappings.inverse().getNewIdOrDefault(id, 1);
+    }
+
    @Override
    public int getNewItemId(final int id) {
        return checkValidity(id, itemMappings.getNewId(id), "item");
@@ -186,6 +202,16 @@ public class MappingDataBase implements MappingData {
        return checkValidity(id, attributeMappings.getNewId(id), "attributes");
    }

+    @Override
+    public int getNewSoundId(final int id) {
+        return checkValidity(id, soundMappings.getNewId(id), "sound");
+    }
+
+    @Override
+    public int getOldSoundId(final int i) {
+        return soundMappings.getNewIdOrDefault(i, 0);
+    }
+
    @Override
    public @Nullable List<TagData> getTags(final RegistryType type) {
        return tags != null ? tags.get(type) : null;
@@ -245,7 +271,7 @@ public class MappingDataBase implements MappingData {
    }

    @Override
-    public @Nullable Mappings getAttributeMappings() {
+    public @Nullable FullMappings getAttributeMappings() {
        return attributeMappings;
    }

@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,21 +22,20 @@
 */
 package com.viaversion.viaversion.api.data;

-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.github.steveice10.opennbt.tag.builtin.StringTag;
-import com.github.steveice10.opennbt.tag.builtin.Tag;
-import com.github.steveice10.opennbt.tag.io.NBTIO;
-import com.github.steveice10.opennbt.tag.io.TagReader;
 import com.google.common.annotations.Beta;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonIOException;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSyntaxException;
+import com.viaversion.nbt.io.NBTIO;
+import com.viaversion.nbt.io.TagReader;
+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.IntArrayTag;
+import com.viaversion.nbt.tag.IntTag;
+import com.viaversion.nbt.tag.ListTag;
+import com.viaversion.nbt.tag.StringTag;
+import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.util.GsonUtil;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
@@ -53,7 +52,6 @@ import java.util.HashMap;
 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 MappingDataLoader {
@@ -212,83 +210,64 @@ public class MappingDataLoader {
            return null;
        }

-        final ByteTag serializationStragetyTag = tag.getUnchecked("id");
-        final IntTag mappedSizeTag = tag.getUnchecked("mappedSize");
-        final byte strategy = serializationStragetyTag.asByte();
+        final int mappedSize = tag.getIntTag("mappedSize").asInt();
+        final byte strategy = tag.getByteTag("id").asByte();
        final V mappings;
        if (strategy == DIRECT_ID) {
            final IntArrayTag valuesTag = tag.getIntArrayTag("val");
-            return IntArrayMappings.of(valuesTag.getValue(), mappedSizeTag.asInt());
+            return IntArrayMappings.of(valuesTag.getValue(), mappedSize);
        } else if (strategy == SHIFTS_ID) {
-            final IntArrayTag shiftsAtTag = tag.getIntArrayTag("at");
-            final IntArrayTag shiftsTag = tag.getIntArrayTag("to");
-            final IntTag sizeTag = tag.getUnchecked("size");
-            final int[] shiftsAt = shiftsAtTag.getValue();
-            final int[] shiftsTo = shiftsTag.getValue();
-            final int size = sizeTag.asInt();
+            final int[] shiftsAt = tag.getIntArrayTag("at").getValue();
+            final int[] shiftsTo = tag.getIntArrayTag("to").getValue();
+            final int size = tag.getIntTag("size").asInt();
            mappings = holderSupplier.get(size);

-            // Handle values until first shift
            if (shiftsAt[0] != 0) {
+                // Add identity values before the first shift
                final int to = shiftsAt[0];
                for (int id = 0; id < to; id++) {
                    addConsumer.addTo(mappings, id, id);
                }
            }

-            // Handle shifts
+            // Read shifts
            for (int i = 0; i < shiftsAt.length; i++) {
+                final boolean isLast = i == shiftsAt.length - 1;
                final int from = shiftsAt[i];
-                final int to = i == shiftsAt.length - 1 ? size : shiftsAt[i + 1];
+                final int to = isLast ? 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.getIntArrayTag("at");
-            final IntArrayTag valuesTag = tag.getIntArrayTag("val");
-            final IntTag sizeTag = tag.getUnchecked("size");
+            final int[] changesAt = tag.getIntArrayTag("at").getValue();
+            final int[] values = tag.getIntArrayTag("val").getValue();
+            final int size = tag.getIntTag("size").asInt();
            final boolean fillBetween = tag.get("nofill") == null;
-            final int[] changesAt = changesAtTag.getValue();
-            final int[] values = valuesTag.getValue();
-            mappings = holderSupplier.get(sizeTag.asInt());
+            mappings = holderSupplier.get(size);

+            int nextUnhandledId = 0;
            for (int i = 0; i < changesAt.length; i++) {
-                final int id = changesAt[i];
+                final int changedId = 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);
+                    for (int id = nextUnhandledId; id < changedId; id++) {
+                        addConsumer.addTo(mappings, id, id);
                    }
+                    nextUnhandledId = changedId + 1;
                }

                // Assign the changed value
-                addConsumer.addTo(mappings, id, values[i]);
+                addConsumer.addTo(mappings, changedId, values[i]);
            }
        } else if (strategy == IDENTITY_ID) {
-            final IntTag sizeTag = tag.getUnchecked("size");
-            return new IdentityMappings(sizeTag.asInt(), mappedSizeTag.asInt());
+            final IntTag sizeTag = tag.getIntTag("size");
+            return new IdentityMappings(sizeTag.asInt(), mappedSize);
        } else {
            throw new IllegalArgumentException("Unknown serialization strategy: " + strategy);
        }
-        return mappingsSupplier.create(mappings, mappedSizeTag.asInt());
-    }
-
-    public FullMappings loadFullMappings(final CompoundTag mappingsTag, final CompoundTag unmappedIdentifiersTag, final CompoundTag mappedIdentifiersTag, final String key) {
-        if (!unmappedIdentifiersTag.contains(key) || !mappedIdentifiersTag.contains(key)) {
-            return null;
-        }
-
-        final List<String> unmappedIdentifiers = identifiersFromGlobalIds(unmappedIdentifiersTag, key);
-        final List<String> mappedIdentifiers = identifiersFromGlobalIds(mappedIdentifiersTag, key);
-        Mappings mappings = loadMappings(mappingsTag, key);
-        if (mappings == null) {
-            mappings = new IdentityMappings(unmappedIdentifiers.size(), mappedIdentifiers.size());
-        }
-
-        return new FullMappingsBase(unmappedIdentifiers, mappedIdentifiers, mappings);
+        return mappingsSupplier.create(mappings, mappedSize);
    }

    public @Nullable List<String> identifiersFromGlobalIds(final CompoundTag mappingsTag, final String key) {
@@ -311,7 +290,7 @@ public class MappingDataLoader {
     * @return map with indexes hashed by their id value
     */
    public Object2IntMap<String> indexedObjectToMap(final JsonObject object) {
-        final Object2IntMap<String> map = new Object2IntOpenHashMap<>(object.size(), .99F);
+        final Object2IntMap<String> map = new Object2IntOpenHashMap<>(object.size());
        map.defaultReturnValue(-1);
        for (final Map.Entry<String, JsonElement> entry : object.entrySet()) {
            map.put(entry.getValue().getAsString(), Integer.parseInt(entry.getKey()));
@@ -326,7 +305,7 @@ public class MappingDataLoader {
     * @return map with indexes hashed by their id value
     */
    public Object2IntMap<String> arrayToMap(final JsonArray array) {
-        final Object2IntMap<String> map = new Object2IntOpenHashMap<>(array.size(), .99F);
+        final Object2IntMap<String> map = new Object2IntOpenHashMap<>(array.size());
        map.defaultReturnValue(-1);
        for (int i = 0; i < array.size(); i++) {
            map.put(array.get(i).getAsString(), i);
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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
@@ -36,6 +36,7 @@ public class ParticleMappings extends FullMappingsBase {
        addBlockParticle("falling_dust");
        addBlockParticle("block_marker");
        addBlockParticle("dust_pillar");
+        addBlockParticle("block_crumble");
        addItemParticle("item");
    }

@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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
@@ -78,7 +78,7 @@ public interface EntityTracker {
    void removeEntity(int id);

    /**
-     * Clears stored entity types and data.
+     * Clears stored entity types and data, only leaving behind the client entity.
     */
    void clearEntities();

@@ -102,11 +102,19 @@ public interface EntityTracker {
    @Nullable StoredEntityData entityDataIfPresent(int id);

    /**
-     * Returns the client entity id or -1 if unset.
+     * Returns whether the client entity id has been set.
     *
-     * @return client entity id or -1 if unset
+     * @return whether the client entity id has been set
     */
-    int clientEntityId();
+    boolean hasClientEntityId();
+
+    /**
+     * Returns the client entity id. Should be wrapped around {@link #hasClientEntityId()}.
+     *
+     * @return client entity id
+     * @throws IllegalStateException if the client entity id has not been set
+     */
+    int clientEntityId() throws IllegalStateException;

    /**
     * Sets the client entity id.
@@ -169,12 +177,4 @@ public interface EntityTracker {
    @Nullable DimensionData dimensionData(int dimensionId);

    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-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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
@@ -66,4 +66,4 @@ public interface StoredEntityData {
     * @param object object to store
     */
    void put(Object object);
-}
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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
@@ -48,11 +48,11 @@ public interface TrackedEntity {
    boolean hasData();

    /**
-     * Returns whether metadata has already been sent at least once for this entity.
+     * Returns whether entity data has already been sent at least once for this entity.
     *
-     * @return whether metadata has already been sent at least once for this entity
+     * @return whether entity data has already been sent at least once for this entity
     */
-    boolean hasSentMetadata();
+    boolean hasSentEntityData();

-    void sentMetadata(boolean sentMetadata);
-}
+    void sentEntityData(boolean sentEntityData);
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,14 +22,12 @@
 */
 package com.viaversion.viaversion.api.debug;

-import com.google.common.annotations.Beta;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.protocol.packet.Direction;
 import com.viaversion.viaversion.api.protocol.packet.PacketType;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import java.util.logging.Level;

-@Beta
 public interface DebugHandler {

    /**
@@ -74,9 +72,34 @@ public interface DebugHandler {
    void clearPacketTypesToLog();

    /**
-     * Returns whether packets should be logged after being transformed.
+     * Sets whether packets should be logged before and after being transformed.
+     *
+     * @param logPacketTransform whether packets should be logged
+     */
+    default void setLogPacketTransform(boolean logPacketTransform) {
+        setLogPrePacketTransform(logPacketTransform);
+        setLogPostPacketTransform(logPacketTransform);
+    }
+
+    /**
+     * Returns whether packets should be logged before being transformed.
     * Set to true by default.
     *
+     * @return whether packets should be logged before being transformed
+     */
+    boolean logPrePacketTransform();
+
+    /**
+     * Sets whether packets should be logged before being transformed.
+     *
+     * @param logPrePacketTransform whether packets should be logged before being transformed
+     */
+    void setLogPrePacketTransform(boolean logPrePacketTransform);
+
+    /**
+     * Returns whether packets should be logged after being transformed.
+     * Set to false by default.
+     *
     * @return whether packets should be logged after being transformed
     */
    boolean logPostPacketTransform();
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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
@@ -0,0 +1,55 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 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.type.Types;
+import com.viaversion.viaversion.api.type.types.misc.HolderType;
+import io.netty.buffer.ByteBuf;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+/**
+ * Represents an animal variant (e.g. for cows, pigs, chickens).
+ *
+ * @param modelType model type id
+ * @param texture texture path
+ * @param biomes biomes this variant can spawn in, if limited to specific biomes
+ */
+public record AnimalVariant(int modelType, String texture, @Nullable HolderSet biomes) {
+
+    public static HolderType<AnimalVariant> TYPE = new HolderType<>() {
+        @Override
+        public AnimalVariant readDirect(final ByteBuf buffer) {
+            final int modelType = Types.VAR_INT.readPrimitive(buffer);
+            final String texture = Types.STRING.read(buffer);
+            final HolderSet biomes = Types.OPTIONAL_HOLDER_SET.read(buffer);
+            return new AnimalVariant(modelType, texture, biomes);
+        }
+
+        @Override
+        public void writeDirect(final ByteBuf buffer, final AnimalVariant variant) {
+            Types.VAR_INT.writePrimitive(buffer, variant.modelType());
+            Types.STRING.write(buffer, variant.texture());
+            Types.OPTIONAL_HOLDER_SET.write(buffer, variant.biomes());
+        }
+    };
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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
@@ -65,4 +65,4 @@ public interface BlockChangeRecord {
    int getBlockId();

    void setBlockId(int blockId);
-}
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,7 +34,6 @@ public enum BlockFace {
    BOTTOM((byte) 0, (byte) -1, (byte) 0, EnumAxis.Y);

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

    static {
@@ -78,26 +77,6 @@ public enum BlockFace {
        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;
-    }
-
    public enum EnumAxis {
        X, Y, Z
    }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,29 +22,26 @@
 */
 package com.viaversion.viaversion.api.minecraft;

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

-    public Position(int x, int y, int z) {
+    public BlockPosition(int x, int y, int z) {
        this.x = x;
        this.y = y;
        this.z = z;
    }

-    // @Deprecated/*(forRemoval=true)*/ Just leave this unchecked
-    public Position(int x, short y, int z) {
-        this(x, (int) y, z);
+    public BlockPosition getRelative(BlockFace face) {
+        return new BlockPosition(x + face.modX(), y + face.modY(), z + face.modZ());
    }

-    @Deprecated/*(forRemoval=true)*/
-    public Position(Position toCopy) {
-        this(toCopy.x(), toCopy.y(), toCopy.z());
-    }
-
-    public Position getRelative(BlockFace face) {
-        return new Position(x + face.modX(), (short) (y + face.modY()), z + face.modZ());
+    public double distanceFromCenterSquared(final double x, final double y, final double z) {
+        final double dx = this.x + 0.5 - x;
+        final double dy = this.y + 0.5 - y;
+        final double dz = this.z + 0.5 - z;
+        return dx * dx + dy * dy + dz * dz;
    }

    public int x() {
@@ -59,30 +56,15 @@ public class Position {
        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;
+    public GlobalBlockPosition withDimension(String dimension) {
+        return new GlobalBlockPosition(dimension, x, y, z);
    }

    @Override
    public boolean equals(final Object o) {
        if (this == o) return true;
        if (o == null || getClass() != o.getClass()) return false;
-        Position position = (Position) o;
+        BlockPosition position = (BlockPosition) o;
        if (x != position.x) return false;
        if (y != position.y) return false;
        return z == position.z;
@@ -98,10 +80,10 @@ public class Position {

    @Override
    public String toString() {
-        return "Position{" +
-                "x=" + x +
-                ", y=" + y +
-                ", z=" + z +
-                '}';
+        return "BlockPosition{" +
+            "x=" + x +
+            ", y=" + y +
+            ", z=" + z +
+            '}';
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,7 +20,7 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 * SOFTWARE.
 */
-package com.viaversion.viaversion.api.minecraft.metadata;
+package com.viaversion.viaversion.api.minecraft;

 import java.util.Objects;

@@ -66,6 +66,17 @@ public final class ChunkPosition {
        return (long) chunkX & 0xffffffffL | ((long) chunkZ & 0xffffffffL) << 32;
    }

+    /**
+     * Returns a long key for the given block coordinates.
+     *
+     * @param x the block X coordinate
+     * @param z the block Z coordinate
+     * @return the chunk key
+     */
+    public static long chunkKeyForBlock(final int x, final int z) {
+        return chunkKey(x >> 4, z >> 4);
+    }
+
    @Override
    public boolean equals(final Object o) {
        if (this == o) return true;
@@ -82,8 +93,8 @@ public final class ChunkPosition {
    @Override
    public String toString() {
        return "ChunkPosition{" +
-                "chunkX=" + chunkX +
-                ", chunkZ=" + chunkZ +
-                '}';
+            "chunkX=" + chunkX +
+            ", chunkZ=" + chunkZ +
+            '}';
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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;

 import com.viaversion.viaversion.api.connection.StorableObject;
-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;
+    private Environment environment = Environment.NORMAL;

    public ClientWorld() {
    }
@@ -38,11 +37,20 @@ public class ClientWorld implements StorableObject {
        this.environment = environment;
    }

-    public @Nullable Environment getEnvironment() {
+    public Environment getEnvironment() {
        return environment;
    }

-    public void setEnvironment(final int environmentId) {
+    /**
+     * Sets the environment of the world and returns whether the environment was changed.
+     *
+     * @param environmentId the id of the environment to set
+     * @return whether the environment was changed
+     */
+    public boolean setEnvironment(final int environmentId) {
+        final int previousEnvironmentId = environment.id();
        this.environment = Environment.getEnvironmentById(environmentId);
+
+        return previousEnvironmentId != environmentId;
    }
 }
@@ -0,0 +1,82 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 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 interface EitherHolder<T> {
+
+    /**
+     * Returns a direct or indirect value holder.
+     *
+     * @param value the value
+     * @param <T>   the type of the value
+     * @return a new direct holder
+     */
+    static <T> EitherHolder<T> of(final Holder<T> value) {
+        return new EitherHolderImpl<>(value, null);
+    }
+
+    /**
+     * Returns an indirect holder via the resource key.
+     *
+     * @param key  the resource key
+     * @param <T> the type of the value
+     * @return a new holder with the given resource key
+     */
+    static <T> EitherHolder<T> of(final String key) {
+        return new EitherHolderImpl<>(null, key);
+    }
+
+    /**
+     * Returns true if this holder is backed by a direct value.
+     *
+     * @return true if the holder is direct
+     * @see #hasKey()
+     */
+    boolean hasHolder();
+
+    /**
+     * Returns true if this holder has a resource key.
+     *
+     * @return true if this holder has a resource key
+     * @see #hasHolder()
+     */
+    boolean hasKey();
+
+    /**
+     * Returns the value of this holder.
+     *
+     * @return the value of this holder
+     * @throws IllegalArgumentException if this contains a resource key instead of a holder
+     * @see #hasHolder()
+     */
+    Holder<T> holder();
+
+    /**
+     * Returns the resource key.
+     *
+     * @return the resource key
+     * @throws IllegalArgumentException if this contains a holder instead of a resource key
+     * @see #hasKey()
+     */
+    String key();
+}
@@ -0,0 +1,55 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 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.google.common.base.Preconditions;
+import com.viaversion.viaversion.util.EitherImpl;
+
+final class EitherHolderImpl<T> extends EitherImpl<Holder<T>, String> implements EitherHolder<T> {
+
+    EitherHolderImpl(final Holder<T> left, final String value) {
+        super(left, value);
+    }
+
+    @Override
+    public boolean hasHolder() {
+        return isLeft();
+    }
+
+    @Override
+    public boolean hasKey() {
+        return isRight();
+    }
+
+    @Override
+    public Holder<T> holder() {
+        Preconditions.checkArgument(hasHolder(), "Either does not have a holder");
+        return left();
+    }
+
+    @Override
+    public String key() {
+        Preconditions.checkArgument(hasKey(), "Either does not have a key");
+        return right();
+    }
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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
@@ -38,20 +38,11 @@ public enum Environment {
        return id;
    }

-    @Deprecated/*(forRemoval = true)*/
-    public int getId() {
-        return id;
-    }
-
    public static Environment getEnvironmentById(int id) {
-        switch (id) {
-            default:
-            case -1:
-                return NETHER;
-            case 0:
-                return NORMAL;
-            case 1:
-                return END;
-        }
+        return switch (id) {
+            case 0 -> NORMAL;
+            case 1 -> END;
+            default -> NETHER; // -1 implicitly
+        };
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,41 +22,5 @@
 */
 package com.viaversion.viaversion.api.minecraft;

-public class EulerAngle {
-    private final float x;
-    private final float y;
-    private final float z;
-
-    public EulerAngle(final float x, final float y, final float z) {
-        this.x = x;
-        this.y = y;
-        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;
-    }
+public record EulerAngle(float x, float y, float z) {
 }
@@ -0,0 +1,52 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 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 enum GameMode {
+
+    NOT_SET(""),
+    SURVIVAL("Survival Mode"),
+    CREATIVE("Creative Mode"),
+    ADVENTURE("Adventure Mode"),
+    SPECTATOR("Spectator Mode");
+
+    private final String text;
+
+    GameMode(String text) {
+        this.text = text;
+    }
+
+    public String text() {
+        return text;
+    }
+
+    public static GameMode getById(int id) {
+        return switch (id) {
+            case -1 -> NOT_SET;
+            case 1 -> CREATIVE;
+            case 2 -> ADVENTURE;
+            case 3 -> SPECTATOR;
+            default /*0*/ -> SURVIVAL;
+        };
+    }
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,51 +25,8 @@ package com.viaversion.viaversion.api.minecraft;
 import java.util.UUID;
 import org.checkerframework.checker.nullness.qual.Nullable;

-public final class GameProfile {
+public record GameProfile(@Nullable String name, @Nullable UUID id, Property[] properties) {

-    private final String name;
-    private final UUID id;
-    private final Property[] properties;
-
-    public GameProfile(@Nullable final String name, @Nullable final UUID id, final Property[] properties) {
-        this.name = name;
-        this.id = id;
-        this.properties = properties;
-    }
-
-    public @Nullable String name() {
-        return name;
-    }
-
-    public @Nullable UUID id() {
-        return id;
-    }
-
-    public Property[] properties() {
-        return properties;
-    }
-
-    public static final class Property {
-        private final String name;
-        private final String value;
-        private final String signature;
-
-        public Property(final String name, final String value, @Nullable final String signature) {
-            this.name = name;
-            this.value = value;
-            this.signature = signature;
-        }
-
-        public String name() {
-            return name;
-        }
-
-        public String value() {
-            return value;
-        }
-
-        public @Nullable String signature() {
-            return signature;
-        }
+    public record Property(String name, String value, @Nullable String signature) {
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,10 @@
 */
 package com.viaversion.viaversion.api.minecraft;

-public final class GlobalPosition extends Position {
+public final class GlobalBlockPosition extends BlockPosition {
    private final String dimension;

-    public GlobalPosition(final String dimension, final int x, final int y, final int z) {
+    public GlobalBlockPosition(final String dimension, final int x, final int y, final int z) {
        super(x, y, z);
        this.dimension = dimension;
    }
@@ -38,7 +38,7 @@ public final class GlobalPosition extends Position {
    public boolean equals(final Object o) {
        if (this == o) return true;
        if (o == null || getClass() != o.getClass()) return false;
-        final GlobalPosition position = (GlobalPosition) o;
+        final GlobalBlockPosition position = (GlobalBlockPosition) o;
        if (x != position.x) return false;
        if (y != position.y) return false;
        if (z != position.z) return false;
@@ -56,11 +56,11 @@ public final class GlobalPosition extends Position {

    @Override
    public String toString() {
-        return "GlobalPosition{" +
-                "dimension='" + dimension + '\'' +
-                ", x=" + x +
-                ", y=" + y +
-                ", z=" + z +
-                '}';
+        return "GlobalBlockPosition{" +
+            "dimension='" + dimension + '\'' +
+            ", x=" + x +
+            ", y=" + y +
+            ", z=" + z +
+            '}';
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,8 @@
 */
 package com.viaversion.viaversion.api.minecraft;

+import it.unimi.dsi.fastutil.ints.Int2IntFunction;
+
 public interface Holder<T> {

    /**
@@ -33,7 +35,7 @@ public interface Holder<T> {
     * @throws IllegalArgumentException if the id is negative
     */
    static <T> Holder<T> of(final int id) {
-        return new HolderImpl<>(id);
+        return new IdHolder<>(id);
    }

    /**
@@ -44,7 +46,7 @@ public interface Holder<T> {
     * @return a new direct holder
     */
    static <T> Holder<T> of(final T value) {
-        return new HolderImpl<>(value);
+        return new ValueHolder<>(value);
    }

    /**
@@ -79,4 +81,12 @@ public interface Holder<T> {
     * @see #hasId()
     */
    int id();
+
+    /**
+     * Returns a new holder with the id rewritten using the given function, or self if this is a direct holder or the id did not change.
+     *
+     * @param rewriteFunction the function to rewrite the id
+     * @return a new holder with the id rewritten, or self
+     */
+    Holder<T> updateId(final Int2IntFunction rewriteFunction);
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,8 @@
 */
 package com.viaversion.viaversion.api.minecraft;

+import it.unimi.dsi.fastutil.ints.Int2IntFunction;
+
 /**
 * Set of ids that either holds a string tag key or an array of ids.
 */
@@ -34,7 +36,7 @@ public interface HolderSet {
     * @return a new holder set
     */
    static HolderSet of(final String tagKey) {
-        return new HolderSetImpl(tagKey);
+        return new HolderSetImpl.Tag(tagKey);
    }

    /**
@@ -44,7 +46,7 @@ public interface HolderSet {
     * @return a new holder set
     */
    static HolderSet of(final int[] ids) {
-        return new HolderSetImpl(ids);
+        return new HolderSetImpl.Ids(ids);
    }

    /**
@@ -76,4 +78,12 @@ public interface HolderSet {
     * @return true if this holder set has direct ids, false if it has a tag key
     */
    boolean hasIds();
+
+    /**
+     * Returns a new holder set with the ids rewritten.
+     *
+     * @param idRewriter the id rewriter
+     * @return a new holder set with the ids rewritten, or self if it has a tag key
+     */
+    HolderSet rewrite(Int2IntFunction idRewriter);
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,35 +22,63 @@
 */
 package com.viaversion.viaversion.api.minecraft;

-import com.viaversion.viaversion.util.EitherImpl;
+import it.unimi.dsi.fastutil.ints.Int2IntFunction;
+import java.util.Arrays;

-final class HolderSetImpl extends EitherImpl<String, int[]> implements HolderSet {
+final class HolderSetImpl {

-    HolderSetImpl(final String tagKey) {
-        super(tagKey, null);
+    record Tag(String tagKey) implements HolderSet {
+        @Override
+        public boolean hasTagKey() {
+            return true;
+        }
+
+        @Override
+        public int[] ids() {
+            throw new IllegalArgumentException("This holder set has a tag key");
+        }
+
+        @Override
+        public boolean hasIds() {
+            return false;
+        }
+
+        @Override
+        public HolderSet rewrite(final Int2IntFunction idRewriter) {
+            return this;
+        }
    }

-    HolderSetImpl(final int[] ids) {
-        super(null, ids);
-    }
+    record Ids(int[] ids) implements HolderSet {
+        @Override
+        public boolean hasTagKey() {
+            return false;
+        }

-    @Override
-    public String tagKey() {
-        return left();
-    }
+        @Override
+        public String tagKey() {
+            throw new IllegalArgumentException("This holder set has direct ids");
+        }

-    @Override
-    public boolean hasTagKey() {
-        return isLeft();
-    }
+        @Override
+        public boolean hasIds() {
+            return true;
+        }

-    @Override
-    public int[] ids() {
-        return right();
-    }
+        @Override
+        public HolderSet rewrite(final Int2IntFunction idRewriter) {
+            final int[] mappedIds = new int[ids.length];
+            for (int i = 0; i < mappedIds.length; i++) {
+                mappedIds[i] = idRewriter.applyAsInt(ids[i]);
+            }
+            return new Ids(mappedIds);
+        }

-    @Override
-    public boolean hasIds() {
-        return isRight();
+        @Override
+        public String toString() {
+            return "Ids{" +
+                "ids=" + Arrays.toString(ids) +
+                '}';
+        }
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,41 +23,38 @@
 package com.viaversion.viaversion.api.minecraft;

 import com.google.common.base.Preconditions;
+import it.unimi.dsi.fastutil.ints.Int2IntFunction;

-final class HolderImpl<T> implements Holder<T> {
+record IdHolder<T>(int id) implements Holder<T> {

-    private final T value;
-    private final int id;
-
-    HolderImpl(final int id) {
+    IdHolder {
        Preconditions.checkArgument(id >= 0, "id cannot be negative");
-        this.value = null;
-        this.id = id;
-    }
-
-    HolderImpl(final T value) {
-        this.value = value;
-        this.id = -1;
    }

    @Override
    public boolean isDirect() {
-        return id == -1;
+        return false;
    }

    @Override
    public boolean hasId() {
-        return id != -1;
+        return true;
    }

    @Override
    public T value() {
-        Preconditions.checkArgument(isDirect(), "Holder is not direct");
-        return value;
+        throw new IllegalArgumentException("Holder is not direct");
    }

    @Override
-    public int id() {
-        return id;
+    public Holder<T> updateId(final Int2IntFunction rewriteFunction) {
+        final int rewrittenId = rewriteFunction.applyAsInt(id);
+        if (rewrittenId == id) {
+            return this;
+        }
+        if (rewrittenId == -1) {
+            throw new IllegalArgumentException("Received invalid id in updateId");
+        }
+        return Holder.of(rewrittenId);
    }
 }
@@ -0,0 +1,73 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 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.nbt.tag.Tag;
+import com.viaversion.viaversion.api.type.Types;
+import com.viaversion.viaversion.api.type.types.misc.HolderType;
+import io.netty.buffer.ByteBuf;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public record PaintingVariant(int width, int height, String assetId, @Nullable Tag title, @Nullable Tag author) {
+
+    public PaintingVariant(final int width, final int height, final String assetId) {
+        this(width, height, assetId, null, null);
+    }
+
+    public static HolderType<PaintingVariant> TYPE1_21 = new HolderType<>() {
+        @Override
+        public PaintingVariant readDirect(final ByteBuf buffer) {
+            final int width = Types.VAR_INT.readPrimitive(buffer);
+            final int height = Types.VAR_INT.readPrimitive(buffer);
+            final String assetId = Types.STRING.read(buffer);
+            return new PaintingVariant(width, height, assetId);
+        }
+
+        @Override
+        public void writeDirect(final ByteBuf buffer, final PaintingVariant variant) {
+            Types.VAR_INT.writePrimitive(buffer, variant.width());
+            Types.VAR_INT.writePrimitive(buffer, variant.height());
+            Types.STRING.write(buffer, variant.assetId());
+        }
+    };
+    public static HolderType<PaintingVariant> TYPE1_21_2 = new HolderType<>() {
+        @Override
+        public PaintingVariant readDirect(final ByteBuf buffer) {
+            final int width = Types.VAR_INT.readPrimitive(buffer);
+            final int height = Types.VAR_INT.readPrimitive(buffer);
+            final String assetId = Types.STRING.read(buffer);
+            final Tag title = Types.OPTIONAL_TAG.read(buffer);
+            final Tag author = Types.OPTIONAL_TAG.read(buffer);
+            return new PaintingVariant(width, height, assetId, title, author);
+        }
+
+        @Override
+        public void writeDirect(final ByteBuf buffer, final PaintingVariant variant) {
+            Types.VAR_INT.writePrimitive(buffer, variant.width());
+            Types.VAR_INT.writePrimitive(buffer, variant.height());
+            Types.STRING.write(buffer, variant.assetId());
+            Types.OPTIONAL_TAG.write(buffer, variant.title());
+            Types.OPTIONAL_TAG.write(buffer, variant.author());
+        }
+    };
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,12 +24,13 @@ package com.viaversion.viaversion.api.minecraft;

 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.util.Copyable;
 import com.viaversion.viaversion.util.IdHolder;
 import io.netty.buffer.ByteBuf;
 import java.util.ArrayList;
 import java.util.List;

-public final class Particle implements IdHolder {
+public final class Particle implements IdHolder, Copyable {
    private final List<ParticleData<?>> arguments = new ArrayList<>(4);
    private int id;

@@ -37,11 +38,6 @@ public final class Particle implements IdHolder {
        this.id = id;
    }

-    @Deprecated
-    public int getId() {
-        return id;
-    }
-
    @Override
    public int id() {
        return id;
@@ -77,6 +73,15 @@ public final class Particle implements IdHolder {
        arguments.set(index, new ParticleData<>(type, value));
    }

+    @Override
+    public Particle copy() {
+        final Particle particle = new Particle(id);
+        for (ParticleData<?> argument : arguments) {
+            particle.arguments.add(argument.copy());
+        }
+        return particle;
+    }
+
    @Override
    public String toString() {
        return "Particle{" +
@@ -85,7 +90,7 @@ public final class Particle implements IdHolder {
            '}';
    }

-    public static final class ParticleData<T> {
+    public static final class ParticleData<T> implements Copyable {
        private final Type<T> type;
        private T value;

@@ -106,7 +111,7 @@ public final class Particle implements IdHolder {
            this.value = value;
        }

-        public void write(final ByteBuf buf) throws Exception {
+        public void write(final ByteBuf buf) {
            type.write(buf, value);
        }

@@ -114,12 +119,17 @@ public final class Particle implements IdHolder {
            wrapper.write(type, value);
        }

+        @Override
+        public ParticleData<T> copy() {
+            return new ParticleData<>(type, copy(value));
+        }
+
        @Override
        public String toString() {
            return "ParticleData{" +
-                    "type=" + type +
-                    ", value=" + value +
-                    '}';
+                "type=" + type +
+                ", value=" + value +
+                '}';
        }
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,20 +24,5 @@ package com.viaversion.viaversion.api.minecraft;

 import java.util.UUID;

-public final class PlayerMessageSignature {
-    private final UUID uuid;
-    private final byte[] signatureBytes;
-
-    public PlayerMessageSignature(final UUID uuid, final byte[] signatureBytes) {
-        this.uuid = uuid;
-        this.signatureBytes = signatureBytes;
-    }
-
-    public UUID uuid() {
-        return uuid;
-    }
-
-    public byte[] signatureBytes() {
-        return signatureBytes;
-    }
+public record PlayerMessageSignature(UUID uuid, byte[] signatureBytes) {
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,26 +22,5 @@
 */
 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;
-    }
+public record ProfileKey(long expiresAt, byte[] publicKey, byte[] keySignature) {
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,42 +22,5 @@
 */
 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 +
-                '}';
-    }
+public record Quaternion(float x, float y, float z, float w) {
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,27 +22,24 @@
 */
 package com.viaversion.viaversion.api.minecraft;

-import com.github.steveice10.opennbt.tag.builtin.Tag;
+import com.viaversion.nbt.tag.Tag;
+import com.viaversion.viaversion.util.Copyable;
 import org.checkerframework.checker.nullness.qual.Nullable;

-public final class RegistryEntry {
-    private final String key;
-    private final Tag tag;
-
-    public RegistryEntry(String key, @Nullable Tag tag) {
-        this.key = key;
-        this.tag = tag;
-    }
-
-    public String key() {
-        return key;
-    }
-
-    public @Nullable Tag tag() {
-        return tag;
-    }
+/**
+ * Represents an entry in a registry.
+ *
+ * @param key key of the registry entry
+ * @param tag data of the registry entry, or null if the client should use its default
+ */
+public record RegistryEntry(String key, @Nullable Tag tag) implements Copyable {

    public RegistryEntry withKey(final String key) {
        return new RegistryEntry(key, tag != null ? tag.copy() : null);
    }
+
+    @Override
+    public RegistryEntry copy() {
+        return new RegistryEntry(key, tag != null ? tag.copy() : null);
+    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,7 +32,8 @@ public enum RegistryType {
    ITEM("item"),
    FLUID("fluid"),
    ENTITY("entity_type"),
-    GAME_EVENT("game_event");
+    GAME_EVENT("game_event"),
+    ENCHANTMENT("enchantment");

    private static final Map<String, RegistryType> MAP = new HashMap<>();
    private static final RegistryType[] VALUES = values();
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,23 +24,7 @@ package com.viaversion.viaversion.api.minecraft;

 import org.checkerframework.checker.nullness.qual.Nullable;

-public final class SoundEvent {
-
-    private final String identifier;
-    private final Float fixedRange;
-
-    public SoundEvent(final String identifier, @Nullable final Float fixedRange) {
-        this.identifier = identifier;
-        this.fixedRange = fixedRange;
-    }
-
-    public String identifier() {
-        return identifier;
-    }
-
-    public @Nullable Float fixedRange() {
-        return fixedRange;
-    }
+public record SoundEvent(String identifier, @Nullable Float fixedRange) {

    public SoundEvent withIdentifier(final String identifier) {
        return new SoundEvent(identifier, this.fixedRange);
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,28 +24,21 @@ package com.viaversion.viaversion.api.minecraft;

 import java.util.Arrays;

-public final class TagData {
-    private final String identifier;
-    private final int[] entries;
+public record TagData(String identifier, int[] entries) {

-    public TagData(final String identifier, final int[] entries) {
-        this.identifier = identifier;
-        this.entries = entries;
-    }
-
-    public String identifier() {
-        return identifier;
-    }
-
-    public int[] entries() {
-        return entries;
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        final TagData tagData = (TagData) o;
+        if (!identifier.equals(tagData.identifier)) return false;
+        return Arrays.equals(entries, tagData.entries);
    }

    @Override
-    public String toString() {
-        return "TagData{" +
-            "identifier='" + identifier + '\'' +
-            ", entries=" + Arrays.toString(entries) +
-            '}';
+    public int hashCode() {
+        int result = identifier.hashCode();
+        result = 31 * result + Arrays.hashCode(entries);
+        return result;
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,26 +22,27 @@
 */
 package com.viaversion.viaversion.api.minecraft;

-public class Position3d {
-    private final double x;
-    private final double y;
-    private final double z;
+import it.unimi.dsi.fastutil.ints.Int2IntFunction;

-    public Position3d(final double x, final double y, final double z) {
-        this.x = x;
-        this.y = y;
-        this.z = z;
+record ValueHolder<T>(T value) implements Holder<T> {
+
+    @Override
+    public boolean isDirect() {
+        return true;
    }

-    public double x() {
-        return x;
+    @Override
+    public boolean hasId() {
+        return false;
    }

-    public double y() {
-        return y;
+    @Override
+    public int id() {
+        return -1;
    }

-    public double z() {
-        return z;
+    @Override
+    public Holder<T> updateId(final Int2IntFunction rewriteFunction) {
+        return this;
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,56 +22,5 @@
 */
 package com.viaversion.viaversion.api.minecraft;

-public class Vector {
-    private int blockX;
-    private int blockY;
-    private int blockZ;
-
-    public Vector(int blockX, int blockY, int blockZ) {
-        this.blockX = blockX;
-        this.blockY = blockY;
-        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;
-    }
-
-    @Deprecated/*(forRemoval=true)*/
-    public int getBlockY() {
-        return 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;
-    }
+public record Vector(int blockX, int blockY, int blockZ) {
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,26 +22,5 @@
 */
 package com.viaversion.viaversion.api.minecraft;

-public final class Vector3f {
-    private final float x;
-    private final float y;
-    private final float z;
-
-    public Vector3f(final float x, final float y, final float z) {
-        this.x = x;
-        this.y = y;
-        this.z = z;
-    }
-
-    public float x() {
-        return x;
-    }
-
-    public float y() {
-        return y;
-    }
-
-    public float z() {
-        return z;
-    }
+public record Vector3f(float x, float y, float z) {
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,41 +22,5 @@
 */
 package com.viaversion.viaversion.api.minecraft;

-public class VillagerData {
-    private final int type;
-    private final int profession;
-    private final int level;
-
-    public VillagerData(final int type, final int profession, final int level) {
-        this.type = type;
-        this.profession = profession;
-        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;
-    }
+public record VillagerData(int type, int profession, int level) {
 }
@@ -0,0 +1,49 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 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.type.Types;
+import com.viaversion.viaversion.api.type.types.misc.HolderType;
+import io.netty.buffer.ByteBuf;
+
+public record WolfVariant(String wildTexture, String tameTexture, String angryTexture, HolderSet biomes) {
+
+    public static HolderType<WolfVariant> TYPE = new HolderType<>() {
+        @Override
+        public WolfVariant readDirect(final ByteBuf buffer) {
+            final String wildTexture = Types.STRING.read(buffer);
+            final String tameTexture = Types.STRING.read(buffer);
+            final String angryTexture = Types.STRING.read(buffer);
+            final HolderSet biomes = Types.HOLDER_SET.read(buffer);
+            return new WolfVariant(wildTexture, tameTexture, angryTexture, biomes);
+        }
+
+        @Override
+        public void writeDirect(final ByteBuf buffer, final WolfVariant variant) {
+            Types.STRING.write(buffer, variant.wildTexture());
+            Types.STRING.write(buffer, variant.tameTexture());
+            Types.STRING.write(buffer, variant.angryTexture());
+            Types.HOLDER_SET.write(buffer, variant.biomes());
+        }
+    };
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,34 +24,12 @@ package com.viaversion.viaversion.api.minecraft;

 import com.viaversion.viaversion.api.connection.StorableObject;

-public class WorldIdentifiers implements StorableObject {
+public record WorldIdentifiers(String overworld, String nether, String end) 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;
-    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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.blockentity;

-import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.viaversion.nbt.tag.CompoundTag;
 import org.checkerframework.checker.nullness.qual.Nullable;

 public interface BlockEntity {
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,40 +22,9 @@
 */
 package com.viaversion.viaversion.api.minecraft.blockentity;

-import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.viaversion.nbt.tag.CompoundTag;

-public final class BlockEntityImpl implements BlockEntity {
-    private final byte packedXZ;
-    private final short y;
-    private final int typeId;
-    private final CompoundTag tag;
-
-    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;
-    }
-
-    @Override
-    public byte packedXZ() {
-        return packedXZ;
-    }
-
-    @Override
-    public short y() {
-        return y;
-    }
-
-    @Override
-    public int typeId() {
-        return typeId;
-    }
-
-    @Override
-    public CompoundTag tag() {
-        return tag;
-    }
+public record BlockEntityImpl(byte packedXZ, short y, int typeId, CompoundTag tag) implements BlockEntity {

    @Override
    public BlockEntity withTypeId(int typeId) {
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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.chunks;

-import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity;
 import java.util.BitSet;
 import java.util.List;
@@ -143,6 +143,16 @@ public class BaseChunk implements Chunk {
        this.heightMap = heightMap;
    }

+    @Override
+    public Heightmap[] heightmaps() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void setHeightmaps(final Heightmap[] heightmaps) {
+        throw new UnsupportedOperationException();
+    }
+
    @Override
    public List<CompoundTag> getBlockEntities() {
        return blockEntities;
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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.chunks;

-import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity;
 import java.util.BitSet;
 import java.util.List;
@@ -79,7 +79,8 @@ public interface Chunk {
     * @return chunk section bit mask, only non-null for 1.17+ chunks
     * @see #getBitmask()
     */
-    @Nullable BitSet getChunkMask();
+    @Nullable
+    BitSet getChunkMask();

    void setChunkMask(BitSet chunkSectionMask);

@@ -88,7 +89,8 @@ public interface Chunk {
     *
     * @return array of nullable chunk sections
     */
-    @Nullable ChunkSection[] getSections();
+    @Nullable
+    ChunkSection[] getSections();

    void setSections(ChunkSection[] sections);

@@ -106,10 +108,15 @@ public interface Chunk {
     *
     * @return compoundtag containing heightmaps if present
     */
-    @Nullable CompoundTag getHeightMap();
+    @Nullable
+    CompoundTag getHeightMap();

    void setHeightMap(@Nullable CompoundTag heightMap);

+    Heightmap[] heightmaps();
+
+    void setHeightmaps(Heightmap[] heightmaps);
+
    /**
     * Returns a list of block entities.
     *
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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.chunks;

-import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity;
 import java.util.BitSet;
 import java.util.List;
@@ -123,6 +123,16 @@ public class Chunk1_18 implements Chunk {
        this.heightMap = heightMap;
    }

+    @Override
+    public Heightmap[] heightmaps() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void setHeightmaps(final Heightmap[] heightmaps) {
+        throw new UnsupportedOperationException();
+    }
+
    @Override
    public List<CompoundTag> getBlockEntities() {
        throw new UnsupportedOperationException();
@@ -0,0 +1,145 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 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.viaversion.nbt.tag.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_21_5 implements Chunk {
+    protected final int x;
+    protected final int z;
+    protected ChunkSection[] sections;
+    protected Heightmap[] heightmaps;
+    protected final List<BlockEntity> blockEntities;
+
+    public Chunk1_21_5(int x, int z, ChunkSection[] sections, Heightmap[] heightmaps, List<BlockEntity> blockEntities) {
+        this.x = x;
+        this.z = z;
+        this.sections = sections;
+        this.heightmaps = heightmaps;
+        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() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void setHeightMap(final CompoundTag heightMap) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Heightmap[] heightmaps() {
+        return heightmaps;
+    }
+
+    @Override
+    public void setHeightmaps(final Heightmap[] heightmaps) {
+        this.heightmaps = heightmaps;
+    }
+
+    @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-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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
@@ -52,86 +52,6 @@ public interface ChunkSection {
        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));
-    }
-
-    @Deprecated/*(forRemoval = true)*/
-    default void setFlatBlock(int idx, int id) {
-        palette(PaletteType.BLOCKS).setIdAt(idx, id);
-    }
-
-    @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;
-    }
-
-    @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));
-    }
-
-    @Deprecated/*(forRemoval = true)*/
-    default void setPaletteIndex(int idx, int index) {
-        palette(PaletteType.BLOCKS).setPaletteIndexAt(idx, index);
-    }
-
-    @Deprecated/*(forRemoval = true)*/
-    default int getPaletteIndex(int idx) {
-        return palette(PaletteType.BLOCKS).paletteIndexAt(idx);
-    }
-
-    @Deprecated/*(forRemoval = true)*/
-    default int getPaletteSize() {
-        return palette(PaletteType.BLOCKS).size();
-    }
-
-    @Deprecated/*(forRemoval = true)*/
-    default int getPaletteEntry(int index) {
-        return palette(PaletteType.BLOCKS).idByIndex(index);
-    }
-
-    @Deprecated/*(forRemoval = true)*/
-    default void setPaletteEntry(int index, int id) {
-        palette(PaletteType.BLOCKS).setIdByIndex(index, id);
-    }
-
-    @Deprecated/*(forRemoval = true)*/
-    default void replacePaletteEntry(int oldId, int newId) {
-        palette(PaletteType.BLOCKS).replaceId(oldId, newId);
-    }
-
-    @Deprecated/*(forRemoval = true)*/
-    default void addPaletteEntry(int id) {
-        palette(PaletteType.BLOCKS).addId(id);
-    }
-
-    @Deprecated/*(forRemoval = true)*/
-    default void clearPalette() {
-        palette(PaletteType.BLOCKS).clear();
-    }
-
    /**
     * Returns the number of non-air blocks in this section.
     *
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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
@@ -37,14 +37,14 @@ public class ChunkSectionImpl implements ChunkSection {
    public ChunkSectionImpl(final boolean holdsLight) {
        addPalette(PaletteType.BLOCKS, new DataPaletteImpl(ChunkSection.SIZE));
        if (holdsLight) {
-            this.light = new ChunkSectionLightImpl();
+            this.light = ChunkSectionLightImpl.createWithBlockLight();
        }
    }

    public ChunkSectionImpl(final boolean holdsLight, final int expectedPaletteLength) {
        addPalette(PaletteType.BLOCKS, new DataPaletteImpl(ChunkSection.SIZE, expectedPaletteLength));
        if (holdsLight) {
-            this.light = new ChunkSectionLightImpl();
+            this.light = ChunkSectionLightImpl.createWithBlockLight();
        }
    }

@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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
@@ -35,7 +35,7 @@ public interface ChunkSectionLight {
    /**
     * Returns whether the section has sky light.
     *
-     * @return true if skylight is present
+     * @return true if sky light is present
     */
    boolean hasSkyLight();

@@ -43,7 +43,7 @@ public interface ChunkSectionLight {
     * Returns whether the section has block light.
     * This returns true unless specifically set to null.
     *
-     * @return true if skylight is present
+     * @return true if block light is present
     */
    boolean hasBlockLight();

@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,9 +30,17 @@ public class ChunkSectionLightImpl implements ChunkSectionLight {
    private NibbleArray blockLight;
    private NibbleArray skyLight;

-    public ChunkSectionLightImpl() {
-        // Block light is always written
-        this.blockLight = new NibbleArray(ChunkSection.SIZE);
+    protected ChunkSectionLightImpl() {
+    }
+
+    public static ChunkSectionLight createWithBlockLight() {
+        final ChunkSectionLightImpl light = new ChunkSectionLightImpl();
+        light.blockLight = new NibbleArray(ChunkSection.SIZE);
+        return light;
+    }
+
+    public static ChunkSectionLight createEmpty() {
+        return new ChunkSectionLightImpl();
    }

    @Override
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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
@@ -137,6 +137,7 @@ public final class DataPaletteImpl implements DataPalette {

    interface ChunkData {
        int get(int idx);
+
        void set(int idx, int val);
    }

@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2025 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,21 +20,7 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 * SOFTWARE.
 */
-package us.myles.ViaVersion.api.boss;
+package com.viaversion.viaversion.api.minecraft.chunks;

-@Deprecated
-public enum BossFlag {
-
-    DARKEN_SKY(1),
-    PLAY_BOSS_MUSIC(2);
-
-    private final int id;
-
-    BossFlag(int id) {
-        this.id = id;
-    }
-
-    public int getId() {
-        return id;
-    }
+public record Heightmap(int type, long[] data) {
 }