5.7.2 Release

Update dependencies
Fix nether biome sky colors, add missing dimension ambient sounds
2026-11-04 17:00:06 -05:00 · 2026-03-01 16:28:28 +01:00 · 2026-03-01 16:28:16 +01:00 · 2026-02-22 13:47:24 +01:00 · 2026-02-21 16:03:13 +01:00 · 2026-02-20 22:17:25 +01:00
1107 changed files with 33366 additions and 6785 deletions
@@ -1,2 +1,3 @@
 github: kennytv
 patreon: kennytv
+custom: ['https://florianreuth.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

@@ -49,21 +50,12 @@ body:
      label: Steps to Reproduce
      description: |
        List the steps on how we can reproduce the issue. Make sure we can easily understand what you mean with each step.
+        **Please always include the client version(s) with which the issue happens. Ideally also try to find out, from what specific version onward/in what version range the issue happens.**
      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:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Expected Behavior
-      description: |
-        Describe what exactly you expected to happen.
-      placeholder: |
-        Example: "Placed sign text should not disappear."
+        3. The sign text disappears
    validations:
      required: true

@@ -1,6 +1,14 @@
 version: 2
 updates:
  - package-ecosystem: "github-actions"
+    cooldown:
+      default-days: 7
    directory: "/"
    schedule:
-      interval: "weekly"
+      interval: "monthly"
+  - package-ecosystem: "gradle"
+    cooldown:
+      default-days: 7
+    directory: "/"
+    schedule:
+      interval: "monthly"
@@ -1,24 +1,34 @@
-name: Java CI with Gradle
-
-on: [push, pull_request]
+name: Build
+on: [pull_request, push, workflow_dispatch]
+permissions:
+  contents: read

 jobs:
  build:
    # 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-24.04
-
+    timeout-minutes: 30
    steps:
    - name: Checkout Repository
-      uses: actions/checkout@v4
-    - name: Validate Gradle Wrapper
-      uses: gradle/actions/wrapper-validation@v4
+      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
+      with:
+        persist-credentials: false
+    - name: Set up Gradle
+      uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # 5.0.1
    - name: Set up JDK 17
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # 5.2.0
      with:
        distribution: 'temurin'
        java-version: 17
        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 == 'ViaVersion/ViaVersionDev' && github.ref_name == 'preview' }}
+      uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # 6.0.0
+      with:
+        name: Artifacts
+        path: build/libs/
+        if-no-files-found: error
@@ -4,24 +4,38 @@ on:
    branches:
      - master
      - dev
+  workflow_dispatch:
+
+permissions:
+  contents: read

 jobs:
  publish:
    if: github.repository_owner == 'ViaVersion'
    runs-on: ubuntu-24.04
+    timeout-minutes: 30
    steps:
      - name: Checkout Repository
-        uses: actions/checkout@v4
-      - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
+        with:
+          persist-credentials: false
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # 5.0.1
      - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # 5.2.0
        with:
          distribution: 'temurin'
          java-version: 17
          check-latest: true
-      - name: Publish
+      - name: Build with Gradle
+        run: ./gradlew build
+      - name: Publish to Hangar
        env:
          HANGAR_TOKEN: ${{ secrets.HANGAR_TOKEN }}
+        run: ./gradlew publishAllPublicationsToHangar --stacktrace
+        continue-on-error: true
+      - name: Publish to Modrinth
+        env:
          MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
-        run: ./gradlew build modrinth publishAllPublicationsToHangar --stacktrace
+        run: ./gradlew modrinth --stacktrace
+        continue-on-error: true
@@ -1,14 +0,0 @@
-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
-      - name: Update Gradle Wrapper
-        uses: gradle-update/update-gradle-wrapper-action@v2
@@ -1,112 +1,36 @@
-### Java files ###
-*.class
+# Gradle

-# Package Files
-#*.jar
-*.war
-*.ear
+.gradle/
+build/
+out/
+classes/
+.kotlin/

-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
+# Eclipse

+*.launch

+# Idea

-### Intellij ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
-# Ignore project files
-*.iml
-
-# Ignore IDEA directory
-.idea/*
+.idea/
 !.idea/copyright/*
 !.idea/scopes/*
-
-# Include the project's dictionary
-!.idea/dictionaries/
-!.idea/dictionaries/*
-
-# File-based project format:
+*.iml
 *.ipr
 *.iws

-### Plugin-specific files: ###
-# IntelliJ
-/out/
+# VSCode

-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-
-
-
-### Eclipse ###
-*.pydevproject
-.metadata
-.gradle
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
 .settings/
-.loadpath
-
-# Eclipse Core
+.vscode/
+bin/
+.classpath
 .project

-# External tool builders
-.externalToolBuilders/
+# macOS

-# Locally stored "Eclipse launch configurations"
-*.launch
+.DS_Store

-# CDT-specific
-.cproject
+# Misc

-# JDT-specific (Eclipse Java Development Tools)
-.classpath
-
-# PDT-specific
-.buildpath
-
-# sbteclipse plugin
-.target
-
-# TeXlipse plugin
-.texlipse
-
-
-
-### Maven ###
-target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-
-
-
-### NetBeans ###
-nbproject/private/
-build/
-nbbuild/
-dist/
-nbdist/
-nbactions.xml
-nb-configuration.xml
-.nb-gradle/
-
-### MacOS ###
-.DS_Store
+run/
@@ -8,7 +8,7 @@
 it works on any platform you can think of.**

 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
+on Fabric, Forge, 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
@@ -16,9 +16,16 @@ direct access to client/server state and more extensive API.

 Supported Versions:

-![Table (https://i.imgur.com/zrQTcf0.png)](https://i.imgur.com/zrQTcf0.png)
+![Table (https://ci.viaversion.com/userContent/images/T.png)](https://ci.viaversion.com/userContent/images/T.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
 --------
@@ -71,7 +78,7 @@ If you need access to the existing protocol or platform implementations, use the
 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.
+take a look at the [documentation](https://github.com/ViaVersion/ViaVersion/wiki/Creating-a-new-ViaVersion-platform).

 Building
 --------
@@ -80,19 +87,16 @@ 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). The generated mapping output is stored [here](./common/src/main/resources/assets/viaversion).

-
 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
 --------
@@ -0,0 +1,10 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+If you discover a **security vulnerability**, please **do not** open a public issue. Instead, use one of the following **confidential contact methods**:
+
+* **Email:** [security@viaversion.com](mailto:security@viaversion.com)
+* **Discord:** Join our [Discord server](https://discord.gg/viaversion) and visit the [#exploit-report](https://discord.com/channels/316206679014244363/1388847764137316485) channel for further instructions.
+
+If your issue is **not security-related** (e.g., bug reports, feature requests, or usage questions), please use the [GitHub Issues page](https://github.com/ViaVersion/ViaVersion/issues) or contact us via the [Discord server](https://discord.gg/viaversion).
@@ -19,7 +19,9 @@ dependencies {
    api(libs.vianbt) {
        exclude("it.unimi.dsi", "fastutil")
    }
-    api(libs.gson)
+    api(libs.gson) {
+        exclude("com.google.errorprone", "error_prone_annotations")
+    }
    implementation(rootProject.libs.text) {
        exclude("com.google.code.gson", "gson")
        exclude("com.viaversion", "nbt")
@@ -27,7 +29,11 @@ dependencies {
    api(libs.snakeYaml)

    compileOnlyApi(libs.netty)
-    compileOnlyApi(libs.guava)
+    compileOnlyApi(libs.guava) {
+        exclude("com.google.errorprone", "error_prone_annotations")
+        exclude("org.jspecify", "jspecify")
+        exclude("com.google.j2objc", "j2objc-annotations")
+    }
    compileOnlyApi(libs.checkerQual)
 }

@@ -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-2026 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
@@ -84,4 +84,8 @@ public final class Via {
        Preconditions.checkArgument(manager != null, "ViaVersion has not loaded the platform yet");
        return manager;
    }
+
+    public static boolean isLoaded() {
+        return manager != 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-2026 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
@@ -114,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
@@ -122,7 +123,8 @@ public interface ViaAPI<T> {
    boolean isInjected(UUID uuid);

    /**
-     * Returns the Via injected UserConnection if present.
+     * Returns the injected UserConnection if present. 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-2026 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,56 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2026 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.command;
+
+import com.viaversion.viaversion.api.Via;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import java.util.UUID;
+
+public class UserConnectionViaCommandSender implements ViaCommandSender {
+
+    private final UserConnection connection;
+
+    public UserConnectionViaCommandSender(final UserConnection connection) {
+        this.connection = connection;
+    }
+
+    @Override
+    public boolean hasPermission(String permission) {
+        return true;
+    }
+
+    @Override
+    public void sendMessage(String msg) {
+        Via.getPlatform().sendMessage(connection, msg);
+    }
+
+    @Override
+    public UUID getUUID() {
+        return connection.getProtocolInfo().getUuid();
+    }
+
+    @Override
+    public String getName() {
+        return connection.getProtocolInfo().getUsername();
+    }
+}
@@ -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-2026 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-2026 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,7 +66,7 @@ public interface ViaSubCommand {
     *
     * @param sender Command sender
     * @param args   Arguments
-     * @return commands executed succesfully if false, show usage
+     * @return commands executed successfully if false, show usage
     */
    boolean execute(ViaCommandSender sender, String[] 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-2026 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,7 +30,7 @@ public interface ViaVersionCommand {
     * Register your own subcommand inside ViaVersion
     *
     * @param command Your own SubCommand instance to handle it.
-     * @throws IllegalArgumentException 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);

@@ -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-2026 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-2026 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,27 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2026 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.configuration;
+
+public record RateLimitConfig(boolean enabled, int maxRate, String maxRateKickMessage, int warningRate, int maxWarnings,
+                              long trackingPeriodNanos, String warningKickMessage, String ratePlaceholder) {
+}
@@ -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-2026 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
@@ -27,6 +27,7 @@ import com.viaversion.viaversion.api.connection.StorableObject;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.WorldIdentifiers;
 import com.viaversion.viaversion.api.protocol.version.BlockedProtocolVersions;
+import java.util.concurrent.TimeUnit;

 public interface ViaVersionConfig extends Config {

@@ -67,11 +68,16 @@ public interface ViaVersionConfig extends Config {
    boolean isShowNewDeathMessages();

    /**
-     * Get if entity data errors will be suppressed
+     * Get if entity data errors will be logged
     *
-     * @return true if entity data errors suppression is enabled
+     * @return true if entity data error logging is enabled
     */
-    boolean isSuppressMetadataErrors();
+    boolean logEntityDataErrors();
+
+    @Deprecated(forRemoval = true)
+    default boolean isSuppressMetadataErrors() {
+        return !logEntityDataErrors();
+    }

    /**
     * Get if blocking in 1.9 &amp; 1.10 appears as a player holding a shield
@@ -147,42 +153,64 @@ public interface ViaVersionConfig extends Config {
     *
     * @return The number of packets a client can send per second.
     */
-    int getMaxPPS();
+    @Deprecated(forRemoval = true)
+    default int getMaxPPS() {
+        return getPacketTrackerConfig().maxRate();
+    }

    /**
     * Get the kick message sent if the user hits the max packets per second.
     *
     * @return Kick message, with colour codes using '&amp;amp;'
     */
-    String getMaxPPSKickMessage();
+    @Deprecated(forRemoval = true)
+    default String getMaxPPSKickMessage() {
+        return getPacketTrackerConfig().maxRateKickMessage();
+    }

    /**
     * The time in seconds that should be tracked for warnings
     *
     * @return Time in seconds that should be tracked for warnings
     */
-    int getTrackingPeriod();
+    @Deprecated(forRemoval = true)
+    default int getTrackingPeriod() {
+        return (int) TimeUnit.NANOSECONDS.toSeconds(getPacketTrackerConfig().trackingPeriodNanos());
+    }

    /**
     * The number of packets per second to count as a warning
     *
     * @return The number of packets per second to count as a warning.
     */
-    int getWarningPPS();
+    @Deprecated(forRemoval = true)
+    default int getWarningPPS() {
+        return getPacketTrackerConfig().warningRate();
+    }

    /**
     * Get the maximum number of warnings the client can have in the interval
     *
     * @return The number of packets a client can send per second.
     */
-    int getMaxWarnings();
+    @Deprecated(forRemoval = true)
+    default int getMaxWarnings() {
+        return getPacketTrackerConfig().maxWarnings();
+    }

    /**
     * Get the kick message sent if the user goes over the warnings in the interval
     *
     * @return Kick message, with colour codes using '&amp;amp;'
     */
-    String getMaxWarningsKickMessage();
+    @Deprecated(forRemoval = true)
+    default String getMaxWarningsKickMessage() {
+        return getPacketTrackerConfig().warningKickMessage();
+    }
+
+    RateLimitConfig getPacketTrackerConfig();
+
+    RateLimitConfig getPacketSizeTrackerConfig();

    /**
     * Send supported versions in the status response packet
@@ -233,13 +261,6 @@ public interface ViaVersionConfig extends Config {
     */
    boolean isChunkBorderFix();

-    /**
-     * Should we fix nbt array's in json chat messages for 1.12 clients
-     *
-     * @return true if enabled
-     */
-    boolean is1_12NBTArrayFix();
-
    /**
     * Should we make team colours based on the last colour in team prefix
     *
@@ -270,6 +291,8 @@ public interface ViaVersionConfig extends Config {
     */
    String getBlockedDisconnectMsg();

+    boolean logBlockedJoins();
+
    /**
     * Get the message sent to players being kicked on reload.
     * Players are kicked to stop the server crashing
@@ -279,11 +302,28 @@ public interface ViaVersionConfig extends Config {
    String getReloadDisconnectMsg();

    /**
-     * Should we hide errors that occur when trying to convert block and item data over versions?
+     * Should we log warnings on issues when trying to convert data over versions?
     *
     * @return true if enabled
     */
-    boolean isSuppressConversionWarnings();
+    boolean logOtherConversionWarnings();
+
+    /**
+     * Should we log errors that occur when trying to convert text components?
+     *
+     * @return true if enabled
+     */
+    boolean logTextComponentConversionErrors();
+
+    @Deprecated(forRemoval = true)
+    default boolean isSuppressConversionWarnings() {
+        return !logOtherConversionWarnings();
+    }
+
+    @Deprecated(forRemoval = true)
+    default boolean isSuppressTextComponentConversionWarnings() {
+        return !logTextComponentConversionErrors();
+    }

    /**
     * Should we disable the 1.13 auto-complete feature to stop spam kicks? (for any server lower than 1.13)
@@ -478,4 +518,41 @@ public interface ViaVersionConfig extends Config {
     * @return true if enabled
     */
    boolean fix1_21PlacementRotation();
+
+    /**
+     * If enabled, cancel swing packets sent while having an inventory opened on 1.15.2 and below servers.
+     * This can cause false positives with anti-cheat plugins.
+     *
+     * @return true if enabled
+     */
+    boolean cancelSwingInInventory();
+
+    /**
+     * Returns the max length of error messages. Longer messages will be truncated unless in debug mode.
+     *
+     * @return the max length of error messages
+     */
+    int maxErrorLength();
+
+    /**
+     * If enabled, 1.21.11+ clients on 1.8 (or older) servers will get wider entity hitboxes,
+     * but only when attacking with an item.
+     *
+     * @return true if enabled
+     */
+    boolean use1_8HitboxMargin();
+
+    /**
+     * If enabled, ViaVersion will send the native client version to the server on connect via a plugin message.
+     *
+     * @return true if enabled
+     */
+    boolean sendPlayerDetails();
+
+    /**
+     * If enabled, ViaVersion will send the native server version to a player on connect via a plugin message.
+     *
+     * @return true if enabled
+     */
+    boolean sendServerDetails();
 }
@@ -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-2026 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,51 +28,81 @@ 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.
-     * <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.
     * <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
@@ -84,15 +114,6 @@ public interface ConnectionManager {
     */
    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.
-     *
-     * @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-2026 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
@@ -134,6 +134,15 @@ public interface ProtocolInfo {

    void setUuid(UUID uuid);

+    /**
+     * Returns whether compression is enabled for this connection.
+     *
+     * @return whether compression is enabled
+     */
+    boolean compressionEnabled();
+
+    void setCompressionEnabled(boolean compressionEnabled);
+
    /**
     * Returns the user's pipeline.
     *
@@ -142,4 +151,4 @@ public interface ProtocolInfo {
    ProtocolPipeline getPipeline();

    void setPipeline(ProtocolPipeline pipeline);
-}
+}
@@ -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-2026 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,15 +30,6 @@ package com.viaversion.viaversion.api.connection;
 */
 public interface StorableObject {

-    /**
-     * Returns whether the object should be uncached on a server switch.
-     *
-     * @return whether the object should be uncached on a server switch
-     */
-    default boolean clearOnServerSwitch() {
-        return true;
-    }
-
    default void onRemove() {
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * Copyright (C) 2016-2026 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-2026 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -24,6 +24,7 @@ package com.viaversion.viaversion.api.connection;

 import com.viaversion.viaversion.api.configuration.ViaVersionConfig;
 import com.viaversion.viaversion.api.data.entity.EntityTracker;
+import com.viaversion.viaversion.api.data.item.ItemHasher;
 import com.viaversion.viaversion.api.minecraft.ClientWorld;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.protocol.packet.PacketTracker;
@@ -99,6 +100,23 @@ public interface UserConnection {
     */
    void addEntityTracker(Class<? extends Protocol> protocolClass, EntityTracker tracker);

+    /**
+     * Adds an item hasher to the user connection.
+     *
+     * @param protocolClass protocol class
+     * @param itemHasher   item hasher
+     */
+    void addItemHasher(Class<? extends Protocol> protocolClass, ItemHasher itemHasher);
+
+    /**
+     * Returns the item hasher by the given protocol class if present.
+     *
+     * @param protocolClass protocol class
+     * @param <T>           item hasher type
+     * @return item hasher if present
+     */
+    @Nullable <T extends ItemHasher> T getItemHasher(Class<? extends Protocol> protocolClass);
+
    /**
     * Returns the client world by the given protocol class if present.
     *
@@ -121,17 +139,7 @@ public interface UserConnection {
    /**
     * Clear stored objects, entity trackers and client worlds.
     */
-    default void clearStoredObjects() {
-        clearStoredObjects(false);
-    }
-
-    /**
-     * 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
-     */
-    void clearStoredObjects(boolean isServerSwitch);
+    void clearStoredObjects();

    /**
     * Sends a raw packet to the connection on the current thread.
@@ -186,9 +194,15 @@ public interface UserConnection {
    /**
     * Monitors serverbound packets and returns whether a packet can/should be processed.
     *
+     * @param bytes the number of bytes in the packet
     * @return false if this packet should be cancelled
     */
-    boolean checkServerboundPacket();
+    boolean checkServerboundPacket(int bytes);
+
+    @Deprecated(forRemoval = true)
+    default boolean checkServerboundPacket() {
+        return checkServerboundPacket(0);
+    }

    /**
     * Monitors clientbound packets and returns whether a packet can/should be processed.
@@ -201,6 +215,11 @@ public interface UserConnection {
     * @see #checkClientboundPacket()
     * @see #checkServerboundPacket()
     */
+    default boolean checkIncomingPacket(final int bytes) {
+        return isClientSide() ? checkClientboundPacket() : checkServerboundPacket(bytes);
+    }
+
+    @Deprecated(forRemoval = true)
    default boolean checkIncomingPacket() {
        return isClientSide() ? checkClientboundPacket() : checkServerboundPacket();
    }
@@ -319,23 +338,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();
+    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-2026 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-2026 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-2026 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
@@ -53,6 +53,14 @@ public interface FullMappings extends BiMappings {
     */
    @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.
     *
@@ -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-2026 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
@@ -84,7 +84,18 @@ public class FullMappingsBase implements FullMappings {
    }

    @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;
        }
@@ -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-2026 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-2026 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-2026 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-2026 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-2026 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,13 @@
 */
 package com.viaversion.viaversion.api.data;

+import com.viaversion.viaversion.api.minecraft.RegistryKey;
 import com.viaversion.viaversion.api.minecraft.RegistryType;
 import com.viaversion.viaversion.api.minecraft.TagData;
+import com.viaversion.viaversion.util.Key;
+import it.unimi.dsi.fastutil.ints.IntSet;
 import java.util.List;
+import java.util.Locale;
 import org.checkerframework.checker.nullness.qual.Nullable;

 public interface MappingData {
@@ -35,56 +39,82 @@ 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 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 -1 if unmapped.
+     * 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);

    /**
@@ -114,22 +144,26 @@ public interface MappingData {

    @Nullable Mappings getBlockMappings();

-    @Nullable Mappings getBlockEntityMappings();
+    @Nullable FullMappings getFullBlockMappings();

    @Nullable Mappings getBlockStateMappings();

    @Nullable Mappings getSoundMappings();

+    @Nullable FullMappings getFullSoundMappings();
+
    @Nullable Mappings getStatisticsMappings();

    @Nullable Mappings getMenuMappings();

    @Nullable Mappings getEnchantmentMappings();

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

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

    @Nullable FullMappings getArgumentTypeMappings();
@@ -137,4 +171,32 @@ public interface MappingData {
    @Nullable FullMappings getRecipeSerializerMappings();

    @Nullable FullMappings getDataComponentSerializerMappings();
+
+    default @Nullable FullMappings getFullMappings(final MappingType mappingType) {
+        return switch (mappingType) {
+            case ITEM -> getFullItemMappings();
+            case BLOCK -> getFullBlockMappings();
+            case SOUND -> getFullSoundMappings();
+            case ENTITY_TYPE -> getEntityMappings();
+        };
+    }
+
+    /**
+     * Set of block (not block state) ids that had their base type or properties changed.
+     *
+     * @return set of changed block ids, or null if not tracked/none are present
+     */
+    @Nullable IntSet changedBlocks();
+
+    /**
+     * Type of mappings. Currently only relevant for ops writing of generic holder classes and expanded when needed.
+     */
+    enum MappingType implements RegistryKey {
+        ITEM, BLOCK, SOUND, ENTITY_TYPE;
+
+        @Override
+        public Key key() {
+            return Key.of(name().toLowerCase(Locale.ROOT));
+        }
+    }
 }
@@ -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-2026 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,6 +28,8 @@ 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;
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import it.unimi.dsi.fastutil.ints.IntSet;
 import java.util.ArrayList;
 import java.util.EnumMap;
 import java.util.List;
@@ -43,18 +45,22 @@ public class MappingDataBase implements MappingData {
    protected FullMappings entityMappings;
    protected FullMappings recipeSerializerMappings;
    protected FullMappings itemDataSerializerMappings;
+    protected FullMappings attributeMappings;
+    protected FullMappings blockEntityMappings;
    protected ParticleMappings particleMappings;
    protected BiMappings itemMappings;
    protected BiMappings blockMappings;
-    protected BiMappings attributeMappings;
    protected Mappings blockStateMappings;
-    protected Mappings blockEntityMappings;
    protected Mappings soundMappings;
    protected Mappings statisticsMappings;
    protected Mappings enchantmentMappings;
    protected Mappings paintingMappings;
    protected Mappings menuMappings;
    protected Map<RegistryType, List<TagData>> tags;
+    /**
+     * Set of block ids that have had type or property changes.
+     */
+    protected IntSet changedBlocks;

    public MappingDataBase(final String unmappedVersion, final String mappedVersion) {
        this.unmappedVersion = unmappedVersion;
@@ -68,25 +74,25 @@ public class MappingDataBase implements MappingData {
        }

        final CompoundTag data = readMappingsFile("mappings-" + unmappedVersion + "to" + mappedVersion + ".nbt");
-        blockMappings = loadBiMappings(data, "blocks");
        blockStateMappings = loadMappings(data, "blockstates");
-        blockEntityMappings = loadMappings(data, "blockentities");
-        soundMappings = loadMappings(data, "sounds");
        statisticsMappings = loadMappings(data, "statistics");
        menuMappings = loadMappings(data, "menus");
        enchantmentMappings = loadMappings(data, "enchantments");
        paintingMappings = loadMappings(data, "paintings");
-        attributeMappings = loadBiMappings(data, "attributes");
-

        final CompoundTag unmappedIdentifierData = readUnmappedIdentifiersFile("identifiers-" + unmappedVersion + ".nbt");
        final CompoundTag mappedIdentifierData = readMappedIdentifiersFile("identifiers-" + mappedVersion + ".nbt");
        if (unmappedIdentifierData != null && mappedIdentifierData != null) {
-            itemMappings = loadFullMappings(data, unmappedIdentifierData, mappedIdentifierData, "items");
+            itemMappings = loadFullOrBiMappings(data, unmappedIdentifierData, mappedIdentifierData, "items");
+            blockMappings = loadFullOrBiMappings(data, unmappedIdentifierData, mappedIdentifierData, "blocks");
+            soundMappings = loadFullOrBiMappings(data, unmappedIdentifierData, mappedIdentifierData, "sounds");
+
            entityMappings = loadFullMappings(data, unmappedIdentifierData, mappedIdentifierData, "entities");
            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");
+            blockEntityMappings = loadFullMappings(data, unmappedIdentifierData, mappedIdentifierData, "blockentities");

            final List<String> unmappedParticles = identifiersFromGlobalIds(unmappedIdentifierData, "particles");
            final List<String> mappedParticles = identifiersFromGlobalIds(mappedIdentifierData, "particles");
@@ -100,6 +106,8 @@ public class MappingDataBase implements MappingData {
        } else {
            // Might not have identifiers in older versions
            itemMappings = loadBiMappings(data, "items");
+            blockMappings = loadBiMappings(data, "blocks");
+            soundMappings = loadMappings(data, "sounds");
        }

        final CompoundTag tagsTag = data.getCompoundTag("tags");
@@ -110,6 +118,11 @@ public class MappingDataBase implements MappingData {
            loadTags(RegistryType.ENTITY, tagsTag);
        }

+        final IntArrayTag changedBlocks = data.getIntArrayTag("changed_blocks");
+        if (changedBlocks != null) {
+            this.changedBlocks = new IntOpenHashSet(changedBlocks.getValue());
+        }
+
        loadExtras(data);
    }

@@ -133,6 +146,11 @@ public class MappingDataBase implements MappingData {
        return MappingDataLoader.INSTANCE.loadMappings(data, key);
    }

+    protected @Nullable BiMappings loadFullOrBiMappings(final CompoundTag data, final CompoundTag unmappedIdentifiersTag, final CompoundTag mappedIdentifiersTag, final String key) {
+        final FullMappings mappings = loadFullMappings(data, unmappedIdentifiersTag, mappedIdentifiersTag, key);
+        return mappings != null ? mappings : loadBiMappings(data, 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;
@@ -154,7 +172,7 @@ public class MappingDataBase implements MappingData {
    }

    private void loadTags(final RegistryType type, final CompoundTag data) {
-        final CompoundTag tag = data.getCompoundTag(type.resourceLocation());
+        final CompoundTag tag = data.getCompoundTag(type.identifier());
        if (tag == null) {
            return;
        }
@@ -180,7 +198,7 @@ public class MappingDataBase implements MappingData {

    @Override
    public int getOldBlockId(final int id) {
-        return blockMappings.getNewIdOrDefault(id, 1);
+        return blockMappings.inverse().getNewIdOrDefault(id, 1);
    }

    @Override
@@ -209,8 +227,8 @@ public class MappingDataBase implements MappingData {
    }

    @Override
-    public int getOldSoundId(final int i) {
-        return soundMappings.getNewIdOrDefault(i, 0);
+    public int getOldSoundId(final int id) {
+        return soundMappings.inverse().getNewIdOrDefault(id, 0);
    }

    @Override
@@ -225,8 +243,8 @@ public class MappingDataBase implements MappingData {

    @Override
    public @Nullable FullMappings getFullItemMappings() {
-        if (itemMappings instanceof FullMappings) {
-            return (FullMappings) itemMappings;
+        if (itemMappings instanceof FullMappings fullItemMappings) {
+            return fullItemMappings;
        }
        return null;
    }
@@ -242,7 +260,15 @@ public class MappingDataBase implements MappingData {
    }

    @Override
-    public @Nullable Mappings getBlockEntityMappings() {
+    public @Nullable FullMappings getFullBlockMappings() {
+        if (blockMappings instanceof FullMappings fullBlockMappings) {
+            return fullBlockMappings;
+        }
+        return null;
+    }
+
+    @Override
+    public @Nullable FullMappings getBlockEntityMappings() {
        return blockEntityMappings;
    }

@@ -256,6 +282,14 @@ public class MappingDataBase implements MappingData {
        return soundMappings;
    }

+    @Override
+    public @Nullable FullMappings getFullSoundMappings() {
+        if (soundMappings instanceof FullMappings fullSoundMappings) {
+            return fullSoundMappings;
+        }
+        return null;
+    }
+
    @Override
    public @Nullable Mappings getStatisticsMappings() {
        return statisticsMappings;
@@ -272,7 +306,7 @@ public class MappingDataBase implements MappingData {
    }

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

@@ -301,6 +335,11 @@ public class MappingDataBase implements MappingData {
        return recipeSerializerMappings;
    }

+    @Override
+    public @Nullable IntSet changedBlocks() {
+        return changedBlocks;
+    }
+
    protected Logger getLogger() {
        return Via.getPlatform().getLogger();
    }
@@ -315,7 +354,7 @@ public class MappingDataBase implements MappingData {
     */
    protected int checkValidity(final int id, final int mappedId, final String type) {
        if (mappedId == -1) {
-            if (!Via.getConfig().isSuppressConversionWarnings()) {
+            if (Via.getConfig().logOtherConversionWarnings()) {
                getLogger().warning(String.format("Missing %s %s for %s %s %d", mappedVersion, type, unmappedVersion, type, id));
            }
            return 0;
@@ -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-2026 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
@@ -210,7 +210,7 @@ public class MappingDataLoader {
            return null;
        }

-        final int mappedSize = tag.getIntTag("mappedSize").asInt();
+        final int mappedSize = tag.getInt("mappedSize", -1);
        final byte strategy = tag.getByteTag("id").asByte();
        final V mappings;
        if (strategy == DIRECT_ID) {
@@ -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-2026 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-2026 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-2026 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-2026 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-2026 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
@@ -82,6 +82,11 @@ public interface EntityTracker {
     */
    void clearEntities();

+    /**
+     * Clears all stored data, including entity types, entity data and client entity id.
+     */
+    void clear();
+
    /**
     * Returns the stored entity data if an entity with the id is tracked, else null.
     * If no data has been initialized yet, it will be done and returned by this method.
@@ -123,6 +128,20 @@ public interface EntityTracker {
     */
    void setClientEntityId(int clientEntityId);

+    /**
+     * Returns whether the client player has the "insta build" ability, usually from creative mode.
+     *
+     * @return whether the client player can insta build
+     */
+    boolean canInstaBuild();
+
+    /**
+     * Sets whether the client player has the "insta build" ability, usually from creative mode.
+     *
+     * @param instaBuild whether the client player can insta build
+     */
+    void setInstaBuild(boolean instaBuild);
+
    /**
     * Returns the current world section height (block height / 16).
     * This is always 16 for sub 1.17 worlds.
@@ -166,6 +185,20 @@ public interface EntityTracker {
     */
    void setCurrentWorld(String currentWorld);

+    /**
+     * Returns the id of the current dimension, or -1 if unset (i.e. before 1.20.5).
+     *
+     * @return id of the current dimension, or -1 if unset
+     */
+    int currentDimensionId();
+
+    /**
+     * Sets the id of the current dimension.
+     *
+     * @param currentDimensionId id of the current dimension
+     */
+    void setCurrentDimensionId(int currentDimensionId);
+
    int biomesSent();

    void setBiomesSent(int biomesSent);
@@ -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-2026 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-2026 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
@@ -55,4 +55,4 @@ public interface TrackedEntity {
    boolean hasSentEntityData();

    void sentEntityData(boolean sentEntityData);
-}
+}
@@ -0,0 +1,42 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2026 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.data.item;
+
+/**
+ * Used for converting items to hashed items and caching them for later use during serverbound packets.
+ * <p>
+ * Most of this stays in the internal module given non-permanent, imperfect caching as well as missing converters.
+ */
+public interface ItemHasher {
+
+    /**
+     * Returns whether this connection is currently processing a clientbound player inventory packet.
+     * <p>
+     * Used for checking when it is necessary to track/process item data hashes.
+     *
+     * @return true if processing a clientbound inventory packet, false otherwise
+     */
+    boolean isProcessingClientboundInventoryPacket();
+
+    void setProcessingClientboundInventoryPacket(boolean processingClientboundInventoryPacket);
+}
@@ -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-2026 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,6 @@
 */
 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;
@@ -50,16 +49,14 @@ public interface DebugHandler {
     *
     * @param packetTypeName packet type name
     */
-    @Beta
    void addPacketTypeNameToLog(String packetTypeName);

    /**
-     * Adds a packet id to the list of packet types to log.
+     * Adds a packet type to the list of packet types to log.
     * Packets will be checked on each protocol transformer, so this is best used on single protocol pipes.
     *
     * @param packetType packet type
     */
-    @Beta
    void addPacketTypeToLog(PacketType packetType);

    /**
@@ -67,22 +64,51 @@ public interface DebugHandler {
     *
     * @param packetTypeName packet type name
     */
-    @Beta
    boolean removePacketTypeNameToLog(String packetTypeName);

+    /**
+     * Removes a packet type from the list of packet types to log.
+     *
+     * @param packetType Packet type to remove
+     */
+    boolean removePacketTypeToLog(PacketType packetType);
+
    /**
     * Resets packet type filters.
     */
-    @Beta
    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
     */
-    @Beta
    boolean logPostPacketTransform();

    /**
@@ -90,7 +116,6 @@ public interface DebugHandler {
     *
     * @param logPostPacketTransform whether packets should be logged after being transformed
     */
-    @Beta
    void setLogPostPacketTransform(boolean logPostPacketTransform);

    /**
@@ -103,8 +128,12 @@ public interface DebugHandler {
     */
    boolean shouldLog(PacketWrapper wrapper, Direction direction);

-    @Beta
-    default void enableAndLogIds(final PacketType... packetTypes) {
+    /**
+     * Enables debug mode and adds the given packet types to the log list.
+     *
+     * @param packetTypes packet types to log
+     */
+    default void enableAndLogTypes(final PacketType... packetTypes) {
        setEnabled(true);
        for (final PacketType packetType : packetTypes) {
            addPacketTypeToLog(packetType);
@@ -118,7 +147,7 @@ public interface DebugHandler {
     * @param t     thrown exception
     */
    default void error(final String error, final Throwable t) {
-        if (!Via.getConfig().isSuppressConversionWarnings() || enabled()) {
+        if (Via.getConfig().logOtherConversionWarnings() || enabled()) {
            Via.getPlatform().getLogger().log(Level.SEVERE, error, t);
        }
    }
@@ -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-2026 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-2026 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-2026 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-2026 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-2026 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-2026 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-2026 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-2026 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
@@ -58,7 +58,7 @@ public class BlockChangeRecord1_16_2 implements BlockChangeRecord {

    @Override
    public short getY(int chunkSectionY) {
-        Preconditions.checkArgument(chunkSectionY >= 0, "Invalid chunkSectionY: " + chunkSectionY);
+        Preconditions.checkArgument(chunkSectionY >= 0, "Invalid chunkSectionY: %s", chunkSectionY);
        return (short) ((chunkSectionY << 4) + sectionY);
    }

@@ -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-2026 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-2026 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -33,7 +33,6 @@ public enum BlockFace {
    TOP((byte) 0, (byte) 1, (byte) 0, EnumAxis.Y),
    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 {
@@ -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-2026 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,6 +37,13 @@ public class BlockPosition {
        return new BlockPosition(x + face.modX(), 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() {
        return x;
    }
@@ -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-2026 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,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;
@@ -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-2026 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,82 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2026 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-2026 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-2026 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-2026 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-2026 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,22 +24,28 @@ package com.viaversion.viaversion.api.minecraft;

 public enum GameMode {

-    NOT_SET(""),
-    SURVIVAL("Survival Mode"),
-    CREATIVE("Creative Mode"),
-    ADVENTURE("Adventure Mode"),
-    SPECTATOR("Spectator Mode");
+    NOT_SET("", -1),
+    SURVIVAL("Survival Mode", 0),
+    CREATIVE("Creative Mode", 1),
+    ADVENTURE("Adventure Mode", 2),
+    SPECTATOR("Spectator Mode", 3);

    private final String text;
+    private final int id;

-    GameMode(String text) {
+    GameMode(String text, final int id) {
        this.text = text;
+        this.id = id;
    }

    public String text() {
        return text;
    }

+    public int id() {
+        return id;
+    }
+
    public static GameMode getById(int id) {
        return switch (id) {
            case -1 -> NOT_SET;
@@ -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-2026 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,11 +22,35 @@
 */
 package com.viaversion.viaversion.api.minecraft;

+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 import org.checkerframework.checker.nullness.qual.Nullable;

-public record GameProfile(@Nullable String name, @Nullable UUID id, Property[] properties) {
+public record GameProfile(@Nullable String name, @Nullable UUID id, Property[] properties, boolean dynamic) {
+
+    public GameProfile(@Nullable final String name, @Nullable final UUID id, final Property[] properties) {
+        this(name, id, properties, true);
+    }
+
+    public GameProfile(@Nullable final String name, @Nullable final UUID id) {
+        this(name, id, new Property[0]);
+    }
+
+    public Map<String, List<Property>> propertiesMap() {
+        final Map<String, List<Property>> map = new HashMap<>();
+        for (Property property : properties) {
+            map.computeIfAbsent(property.name(), k -> new ArrayList<>()).add(property);
+        }
+        return map;
+    }

    public record Property(String name, String value, @Nullable String signature) {
+
+        public Property(final String name, final String value) {
+            this(name, value, 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-2026 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-2026 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,6 +23,8 @@
 package com.viaversion.viaversion.api.minecraft;

 import it.unimi.dsi.fastutil.ints.Int2IntFunction;
+import java.util.function.Function;
+import java.util.function.Supplier;

 public interface Holder<T> {

@@ -35,7 +37,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);
    }

    /**
@@ -46,7 +48,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);
    }

    /**
@@ -88,5 +90,24 @@ public interface Holder<T> {
     * @param rewriteFunction the function to rewrite the id
     * @return a new holder with the id rewritten, or self
     */
-    Holder<T> updateId(final Int2IntFunction rewriteFunction);
+    default Holder<T> updateId(final Int2IntFunction rewriteFunction) {
+        return this.updateId(rewriteFunction, null);
+    }
+
+    /**
+     * 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
+     * @param ifMissing       a supplier that provides a new holder if the id is missing (i.e. -1)
+     * @return a new holder with the id rewritten, or self
+     */
+    Holder<T> updateId(Int2IntFunction rewriteFunction, Supplier<Holder<T>> ifMissing);
+
+    /**
+     * Returns a new holder with the value rewritten using the given function, or self if this is an id holder or the value did not change.
+     *
+     * @param rewriteFunction the function to rewrite the value
+     * @return a new holder with the value rewritten, or self
+     */
+    Holder<T> updateValue(final Function<T, T> 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-2026 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,11 @@
 */
 package com.viaversion.viaversion.api.minecraft;

+import com.viaversion.nbt.tag.ListTag;
+import com.viaversion.nbt.tag.StringTag;
+import com.viaversion.nbt.tag.Tag;
 import it.unimi.dsi.fastutil.ints.Int2IntFunction;
+import java.util.function.Function;

 /**
 * Set of ids that either holds a string tag key or an array of ids.
@@ -32,11 +36,11 @@ public interface HolderSet {
    /**
     * Creates a new holder set for the given tag.
     *
-     * @param tagKey the tag key
+     * @param tagKey the tag key, not including '#'
     * @return a new holder set
     */
    static HolderSet of(final String tagKey) {
-        return new HolderSetImpl(tagKey);
+        return new HolderSetImpl.Tag(tagKey);
    }

    /**
@@ -46,13 +50,32 @@ public interface HolderSet {
     * @return a new holder set
     */
    static HolderSet of(final int[] ids) {
-        return new HolderSetImpl(ids);
+        return new HolderSetImpl.Ids(ids);
+    }
+
+    static HolderSet fromTag(final Tag tag, final Function<String, Integer> mappingFunction) {
+        if (tag instanceof StringTag stringTag) {
+            if (stringTag.getValue().startsWith("#")) {
+                return HolderSet.of(stringTag.getValue().substring(1));
+            }
+
+            final int id = mappingFunction.apply(stringTag.getValue());
+            return HolderSet.of(new int[]{id});
+        } else if (tag instanceof ListTag<?> listTag) {
+            final int[] ids = new int[listTag.size()];
+            for (int i = 0; i < listTag.size(); i++) {
+                final String value = ((StringTag) listTag.get(i)).getValue();
+                ids[i] = mappingFunction.apply(value);
+            }
+            return HolderSet.of(ids);
+        }
+        throw new IllegalArgumentException();
    }

    /**
-     * Gets the tag key.
+     * Gets the tag key, not including '#'.
     *
-     * @return the tag key
+     * @return the tag key without a '#'
     * @see #hasTagKey()
     */
    String tagKey();
@@ -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-2026 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,50 +22,69 @@
 */
 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;
+        }

-    HolderSetImpl(final int[] ids) {
-        super(null, ids);
-    }
+        @Override
+        public int[] ids() {
+            throw new IllegalArgumentException("This holder set has a tag key");
+        }

-    @Override
-    public String tagKey() {
-        return left();
-    }
+        @Override
+        public boolean hasIds() {
+            return false;
+        }

-    @Override
-    public boolean hasTagKey() {
-        return isLeft();
-    }
-
-    @Override
-    public int[] ids() {
-        return right();
-    }
-
-    @Override
-    public boolean hasIds() {
-        return isRight();
-    }
-
-    @Override
-    public HolderSet rewrite(final Int2IntFunction idRewriter) {
-        if (hasTagKey()) {
+        @Override
+        public HolderSet rewrite(final Int2IntFunction idRewriter) {
            return this;
        }
+    }

-        final int[] ids = ids();
-        final int[] mappedIds = new int[ids.length];
-        for (int i = 0; i < mappedIds.length; i++) {
-            mappedIds[i] = idRewriter.applyAsInt(ids[i]);
+    record Ids(int[] ids) implements HolderSet {
+        @Override
+        public boolean hasTagKey() {
+            return false;
+        }
+
+        @Override
+        public String tagKey() {
+            throw new IllegalArgumentException("This holder set has direct ids");
+        }
+
+        @Override
+        public boolean hasIds() {
+            return true;
+        }
+
+        @Override
+        public HolderSet rewrite(final Int2IntFunction idRewriter) {
+            // Filter out negative ids as they would come from missing VB mapping data. This happens especially
+            // with block ids which are not mapped and thus written as -1 so VV rewriters can cancel them nicely.
+            final int[] mappedIds = new int[ids.length];
+            int validCount = 0;
+            for (final int id : ids) {
+                final int mappedId = idRewriter.applyAsInt(id);
+                if (mappedId != -1) {
+                    mappedIds[validCount++] = mappedId;
+                }
+            }
+            return new Ids(validCount == ids.length ? mappedIds : Arrays.copyOf(mappedIds, validCount));
+        }
+
+        @Override
+        public String toString() {
+            return "Ids{" +
+                "ids=" + Arrays.toString(ids) +
+                '}';
        }
-        return new HolderSetImpl(mappedIds);
    }
 }
@@ -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-2026 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,65 +24,47 @@ package com.viaversion.viaversion.api.minecraft;

 import com.google.common.base.Preconditions;
 import it.unimi.dsi.fastutil.ints.Int2IntFunction;
+import java.util.function.Function;
+import java.util.function.Supplier;

-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;
-    }
-
-    @Override
-    public Holder<T> updateId(final Int2IntFunction rewriteFunction) {
-        if (isDirect()) {
-            return this;
-        }
-
+    public Holder<T> updateId(final Int2IntFunction rewriteFunction, final Supplier<Holder<T>> ifMissing) {
        final int rewrittenId = rewriteFunction.applyAsInt(id);
        if (rewrittenId == id) {
            return this;
        }
        if (rewrittenId == -1) {
+            if (ifMissing != null) {
+                return ifMissing.get();
+            }
            throw new IllegalArgumentException("Received invalid id in updateId");
        }
        return Holder.of(rewrittenId);
    }

    @Override
-    public String toString() {
-        return "HolderImpl{" +
-            "value=" + value +
-            ", id=" + id +
-            '}';
+    public Holder<T> updateValue(final Function<T, T> 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-2026 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,13 +22,21 @@
 */
 package com.viaversion.viaversion.api.minecraft;

+import com.viaversion.nbt.tag.Tag;
+import com.viaversion.viaversion.api.minecraft.codec.Ops;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.misc.HolderType;
+import com.viaversion.viaversion.util.Key;
 import io.netty.buffer.ByteBuf;
+import org.checkerframework.checker.nullness.qual.Nullable;

-public record PaintingVariant(int width, int height, String assetId) {
+public record PaintingVariant(int width, int height, String assetId, @Nullable Tag title, @Nullable Tag author) {

-    public static HolderType<PaintingVariant> TYPE = new HolderType<>() {
+    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);
@@ -44,4 +52,40 @@ public record PaintingVariant(int width, int height, String assetId) {
            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.TRUSTED_OPTIONAL_TAG.read(buffer);
+            final Tag author = Types.TRUSTED_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.TRUSTED_OPTIONAL_TAG.write(buffer, variant.title());
+            Types.TRUSTED_OPTIONAL_TAG.write(buffer, variant.author());
+        }
+
+        @Override
+        public void writeDirect(final Ops ops, final PaintingVariant value) {
+            // Unused, cannot be direct despite having a direct network codec
+            ops.writeMap(map -> map
+                .write("width", Types.INT, value.width())
+                .write("height", Types.INT, value.height())
+                .write("asset_id", Types.IDENTIFIER, Key.of(value.assetId()))
+                .writeOptional("title", Types.TRUSTED_TAG, value.title())
+                .writeOptional("author", Types.TRUSTED_TAG, value.author()));
+        }
+
+        @Override
+        protected Key identifier(final Ops ops, final int id) {
+            return ops.context().registryAccess().registryKey("painting_variant", id);
+        }
+    };
 }
@@ -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-2026 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,15 @@
 */
 package com.viaversion.viaversion.api.minecraft;

-import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.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;

@@ -73,6 +73,7 @@ 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) {
@@ -89,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;

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

+        @Override
        public ParticleData<T> copy() {
-            if (value instanceof Item item) {
-                return new ParticleData<>(type, (T) item.copy());
-            } else {
-                return new ParticleData<>(type, value);
-            }
+            return new ParticleData<>(type, Copyable.copy(value));
        }

        @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-2026 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-2026 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-2026 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-2026 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,6 +23,7 @@
 package com.viaversion.viaversion.api.minecraft;

 import com.viaversion.nbt.tag.Tag;
+import com.viaversion.viaversion.util.Copyable;
 import org.checkerframework.checker.nullness.qual.Nullable;

 /**
@@ -31,9 +32,14 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 * @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) {
+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);
+    }
 }
@@ -0,0 +1,42 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2026 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.data.MappingData.MappingType;
+import com.viaversion.viaversion.util.Key;
+
+/**
+ * Holds a key for a registry.
+ * Depending on the context, the key may be used to get registry entries from either synchronized or hardcoded registries.
+ *
+ * @see MappingType
+ * @see #of(String)
+ */
+public interface RegistryKey {
+
+    Key key();
+
+    static RegistryKey of(final String key) {
+        return new SimpleRegistryKey(Key.of(key));
+    }
+}
@@ -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-2026 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,11 +22,12 @@
 */
 package com.viaversion.viaversion.api.minecraft;

+import com.viaversion.viaversion.util.Key;
 import java.util.HashMap;
 import java.util.Map;
 import org.checkerframework.checker.nullness.qual.Nullable;

-public enum RegistryType {
+public enum RegistryType implements RegistryKey {

    BLOCK("block"),
    ITEM("item"),
@@ -40,7 +41,7 @@ public enum RegistryType {

    static {
        for (RegistryType type : getValues()) {
-            MAP.put(type.resourceLocation, type);
+            MAP.put(type.identifier, type);
        }
    }

@@ -48,17 +49,22 @@ public enum RegistryType {
        return VALUES;
    }

-    public static @Nullable RegistryType getByKey(String resourceKey) {
-        return MAP.get(resourceKey);
+    public static @Nullable RegistryType getByKey(String identifier) {
+        return MAP.get(identifier);
    }

-    private final String resourceLocation;
+    private final String identifier;

-    RegistryType(final String resourceLocation) {
-        this.resourceLocation = resourceLocation;
+    RegistryType(final String identifier) {
+        this.identifier = identifier;
    }

-    public String resourceLocation() {
-        return resourceLocation;
+    public String identifier() {
+        return identifier;
+    }
+
+    @Override
+    public Key key() {
+        return Key.of(identifier);
    }
 }
@@ -0,0 +1,37 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2026 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 org.checkerframework.checker.nullness.qual.Nullable;
+
+/**
+ * Profile that can be either dynamically filled by the client or is already static.
+ * The additional fields are optional overrides.
+ */
+public record ResolvableProfile(GameProfile profile, @Nullable String bodyTexture, @Nullable String capeTexture,
+                                @Nullable String elytraTexture, @Nullable Integer modelType) {
+
+    public ResolvableProfile(final GameProfile profile) {
+        this(profile, null, null, null, null);
+    }
+}
@@ -0,0 +1,33 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2026 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.util.Key;
+
+record SimpleRegistryKey(Key key) implements RegistryKey {
+
+    @Override
+    public String toString() {
+        return key.toString();
+    }
+}
@@ -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-2026 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,11 +22,21 @@
 */
 package com.viaversion.viaversion.api.minecraft;

+import it.unimi.dsi.fastutil.ints.Int2IntFunction;
 import org.checkerframework.checker.nullness.qual.Nullable;

 public record SoundEvent(String identifier, @Nullable Float fixedRange) {

+    private static final Holder<SoundEvent> UNKNOWN = Holder.of(new SoundEvent("viaversion:unknown", 0F));
+
    public SoundEvent withIdentifier(final String identifier) {
        return new SoundEvent(identifier, this.fixedRange);
    }
+
+    public static @Nullable Holder<SoundEvent> rewriteHolder(@Nullable final Holder<SoundEvent> holder, final Int2IntFunction soundRewriteFunction) {
+        if (holder == null) {
+            return null;
+        }
+        return holder.updateId(soundRewriteFunction, () -> UNKNOWN);
+    }
 }
@@ -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-2026 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,56 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2026 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 it.unimi.dsi.fastutil.ints.Int2IntFunction;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+record ValueHolder<T>(T value) implements Holder<T> {
+
+    @Override
+    public boolean isDirect() {
+        return true;
+    }
+
+    @Override
+    public boolean hasId() {
+        return false;
+    }
+
+    @Override
+    public int id() {
+        return -1;
+    }
+
+    @Override
+    public Holder<T> updateId(final Int2IntFunction rewriteFunction, final Supplier<Holder<T>> ifMissing) {
+        return this;
+    }
+
+    @Override
+    public Holder<T> updateValue(final Function<T, T> rewriteFunction) {
+        final T rewrittenValue = rewriteFunction.apply(value);
+        return rewrittenValue != value ? Holder.of(rewrittenValue) : 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-2026 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,28 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2026 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 record Vector3d(double x, double y, double z) {
+
+    public static final Vector3d ZERO = new Vector3d(0, 0, 0);
+}
@@ -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-2026 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-2026 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-2026 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-2026 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-2026 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-2026 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-2026 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
@@ -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-2026 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
@@ -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-2026 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
@@ -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-2026 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-2026 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-2026 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-2026 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-2026 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