Properly handle block change acknowledgements in 1.18.2 -> 1.19

2026-11-04 08:52:10 -05:00 · 2024-08-13 23:54:23 +02:00
1156 changed files with 8955 additions and 39344 deletions
@@ -1,3 +1,2 @@
 github: kennytv
 patreon: kennytv
-custom: ['https://florianreuth.de/donate']
@@ -21,11 +21,10 @@ body:

  - type: textarea
    attributes:
-      label: Server/Client Error
+      label: Console 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.
@@ -41,7 +40,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.21.3 causes text to disappear."
+        Example: "Placing signs on 1.13.2 causes text to disappear."
    validations:
      required: true

@@ -50,12 +49,21 @@ 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.21.3 client
+        1. Login with a 1.13.2 client
        2. Place a sign
-        3. The sign text disappears
+        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."
    validations:
      required: true

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

 jobs:
  build:
    # Only run on PRs if the source branch is on a different repo. We do not need 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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
-      with:
-        persist-credentials: false
-    - name: Set up Gradle
-      uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # 5.0.1
+      uses: actions/checkout@v4
+    - name: Validate Gradle Wrapper
+      uses: gradle/actions/wrapper-validation@v4
    - name: Set up JDK 17
-      uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # 5.2.0
+      uses: actions/setup-java@v4
      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,38 +4,24 @@ 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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
-        with:
-          persist-credentials: false
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # 5.0.1
+        uses: actions/checkout@v4
+      - name: Validate Gradle Wrapper
+        uses: gradle/actions/wrapper-validation@v4
      - name: Set up JDK 17
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # 5.2.0
+        uses: actions/setup-java@v4
        with:
          distribution: 'temurin'
          java-version: 17
          check-latest: true
-      - name: Build with Gradle
-        run: ./gradlew build
-      - name: Publish to Hangar
+      - name: Publish
        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 modrinth --stacktrace
-        continue-on-error: true
+        run: ./gradlew build modrinth publishAllPublicationsToHangar --stacktrace
@@ -1,36 +1,112 @@
-# Gradle
+### Java files ###
+*.class

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

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

-*.launch

-# Idea

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

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

-.settings/
-.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/
-.classpath
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+
+# Eclipse Core
 .project

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

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

-# Misc
+# CDT-specific
+.cproject

-run/
+# 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
@@ -7,35 +7,18 @@
 **Allows the connection of higher client versions to lower server versions -
 it works on any platform you can think of.**

-The base ViaVersion jar runs on [Paper](https://papermc.io/software/paper/)
-and [Velocity](https://papermc.io/software/velocity/). We also have projects integrating ViaVersion to run
-on [Fabric](https://github.com/ViaVersion/ViaFabric), [Forge](https://github.com/ViaVersion/ViaForge), [Bungee](https://github.com/ViaVersion/ViaBungee), [Sponge](https://github.com/ViaVersion/ViaSponge),
-or as [a standalone proxy](https://github.com/ViaVersion/ViaProxy) 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.**
+The base ViaVersion jar runs on Paper and Velocity. We also have projects integrating ViaVersion to run
+on Fabric, Forge, Bungee, Sponge, or as a standalone proxy to join from basically any client version on
+any server version from the past decade. **See [HERE](https://viaversion.com) for an overview of the different Via\* projects.**

-Note that ViaVersion will be able to **run best on either Paper servers or
-through [ViaFabricPlus](https://github.com/ViaVersion/ViaFabricPlus?tab=readme-ov-file#viafabricplus)** due to having
+Note that ViaVersion will be able to **run best on either Paper servers or through [ViaFabricPlus](https://github.com/ViaVersion/ViaFabricPlus?tab=readme-ov-file#viafabricplus)** due to having
 direct access to client/server state and more extensive API.

 Supported Versions:

-![Table (https://ci.viaversion.com/userContent/images/T.png)](https://ci.viaversion.com/userContent/images/T.png)
+![Table (https://i.imgur.com/zrQTcf0.png)](https://i.imgur.com/zrQTcf0.png)

-**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.
+**User Docs:** https://docs.viaversion.com/display/VIAVERSION/

 Releases/Dev Builds
 --------
@@ -88,7 +71,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),
-take a look at the [documentation](https://github.com/ViaVersion/ViaVersion/wiki/Creating-a-new-ViaVersion-platform).
+you can use the [ViaLoader](https://github.com/ViaVersion/ViaLoader) project.

 Building
 --------
@@ -97,17 +80,19 @@ 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).
+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)
- Previously: **[Burger](https://github.com/Pokechu22/Burger)** (see [PAaaS](https://github.com/Matsv/Paaas)) and **wiki.vg**
+- **[wiki.vg](https://wiki.vg)** (Used for historic information regarding packet structure, we also contribute back)
+- **[Burger](https://github.com/Pokechu22/Burger)** (See [PAaaS](https://github.com/Matsv/Paaas))

 License
 --------
@@ -1,10 +0,0 @@
-# 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,9 +19,7 @@ dependencies {
    api(libs.vianbt) {
        exclude("it.unimi.dsi", "fastutil")
    }
-    api(libs.gson) {
-        exclude("com.google.errorprone", "error_prone_annotations")
-    }
+    api(libs.gson)
    implementation(rootProject.libs.text) {
        exclude("com.google.code.gson", "gson")
        exclude("com.viaversion", "nbt")
@@ -29,11 +27,7 @@ dependencies {
    api(libs.snakeYaml)

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

@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -84,8 +84,4 @@ 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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -114,8 +114,7 @@ public interface ViaAPI<T> {
    ProtocolVersion getPlayerProtocolVersion(UUID uuid);

    /**
-     * 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.
+     * Returns whether Via injected into this player connection.
     *
     * @param uuid uuid of the player
     * @return whether Via has a cached a UserConnection for this player
@@ -123,8 +122,7 @@ public interface ViaAPI<T> {
    boolean isInjected(UUID uuid);

    /**
-     * 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.
+     * Returns the Via injected UserConnection if present.
     *
     * @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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,56 +0,0 @@
-/*
- * 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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -66,7 +66,7 @@ public interface ViaSubCommand {
     *
     * @param sender Command sender
     * @param args   Arguments
-     * @return commands executed successfully if false, show usage
+     * @return commands executed succesfully 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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -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: space
+     * @throws IllegalArgumentException throws an exception when the subcommand already exists or if it's not valid, example: spacee
     */
    void registerSubCommand(ViaSubCommand command);

@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,27 +0,0 @@
-/*
- * 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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -27,7 +27,6 @@ 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 {

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

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

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

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

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

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

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

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

    /**
     * Send supported versions in the status response packet
@@ -261,6 +233,13 @@ 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
     *
@@ -291,8 +270,6 @@ 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
@@ -302,28 +279,11 @@ public interface ViaVersionConfig extends Config {
    String getReloadDisconnectMsg();

    /**
-     * Should we log warnings on issues when trying to convert data over versions?
+     * Should we hide errors that occur when trying to convert block and item data over versions?
     *
     * @return true if enabled
     */
-    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();
-    }
+    boolean isSuppressConversionWarnings();

    /**
     * Should we disable the 1.13 auto-complete feature to stop spam kicks? (for any server lower than 1.13)
@@ -504,55 +464,4 @@ public interface ViaVersionConfig extends Config {
     * @return true if enabled
     */
    boolean cancelBlockSounds();
-
-    /**
-     * Hides scoreboard numbers for 1.20.3+ clients on older server versions.
-     *
-     * @return true if enabled
-     */
-    boolean hideScoreboardNumbers();
-
-    /**
-     * Fixes 1.21+ clients on 1.20.5 servers placing water/lava buckets at the wrong location when moving fast.
-     *
-     * @return true if enabled
-     */
-    boolean fix1_21PlacementRotation();
-
-    /**
-     * 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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -28,81 +28,51 @@ import java.util.UUID;
 import org.checkerframework.checker.nullness.qual.Nullable;

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

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

-    @Deprecated
-    default boolean isClientConnected(UUID uuid) {
-        return hasServerConnection(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();
    }

    /**
-     * Returns if Via has injected. See above for the connection types.
-     *
-     * @param uuid player uuid
-     * @return true if the player is handled by Via
-     */
-    boolean hasClientConnection(UUID uuid);
-
-    /**
-     * Returns the server UserConnection. See above for the connection types.
+     * 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.
     *
-     * @return server UserConnection of the player or null
+     * @return frontend UserConnection of the player connected to this proxy server
     */
-    @Nullable
-    UserConnection getServerConnection(UUID uuid);
-
-    @Deprecated
-    @Nullable default UserConnection getConnectedClient(UUID uuid) {
-        return getServerConnection(uuid);
-    }
+    @Nullable UserConnection getConnectedClient(UUID clientIdentifier);

    /**
-     * Returns the client UserConnection. See above for the connection types.
+     * 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
     * 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
+     * @return UUID of the frontend connection to this proxy server
     */
-    @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();
+    @Nullable UUID getConnectedClientId(UserConnection connection);

    /**
     * Returns all UserConnections which are registered
@@ -114,6 +84,15 @@ 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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -134,15 +134,6 @@ 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.
     *
@@ -151,4 +142,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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -30,6 +30,15 @@ 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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -29,11 +29,6 @@ public abstract class StoredObject implements StorableObject {
        this.user = user;
    }

-    public UserConnection user() {
-        return this.user;
-    }
-
-    @Deprecated
    public UserConnection getUser() {
        return user;
    }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -24,8 +24,6 @@ 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;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
@@ -101,45 +99,19 @@ 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
+     * Clear stored objects and entity trackers.
     */
-    void addItemHasher(Class<? extends Protocol> protocolClass, ItemHasher itemHasher);
+    default void clearStoredObjects() {
+        clearStoredObjects(false);
+    }

    /**
-     * Returns the item hasher by the given protocol class if present.
+     * Clear stored objects and entity trackers.
+     * If cleared for a proxy server switch, some stored objects and tracker data will be retained.
     *
-     * @param protocolClass protocol class
-     * @param <T>           item hasher type
-     * @return item hasher if present
+     * @param isServerSwitch whether the clear is due to a server switch
     */
-    @Nullable <T extends ItemHasher> T getItemHasher(Class<? extends Protocol> protocolClass);
-
-    /**
-     * Returns the client world by the given protocol class if present.
-     *
-     * @param protocolClass protocol class
-     * @param <T>           client world type
-     * @return client world if present
-     */
-    @Nullable
-    <T extends ClientWorld> T getClientWorld(Class<? extends Protocol> protocolClass);
-
-    /**
-     * Adds a client world to the user connection.
-     * Does not override existing client worlds.
-     *
-     * @param protocolClass protocol class
-     * @param clientWorld   client world
-     */
-    void addClientWorld(Class<? extends Protocol> protocolClass, ClientWorld clientWorld);
-
-    /**
-     * Clear stored objects, entity trackers and client worlds.
-     */
-    void clearStoredObjects();
+    void clearStoredObjects(boolean isServerSwitch);

    /**
     * Sends a raw packet to the connection on the current thread.
@@ -194,15 +166,9 @@ 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(int bytes);
-
-    @Deprecated(forRemoval = true)
-    default boolean checkServerboundPacket() {
-        return checkServerboundPacket(0);
-    }
+    boolean checkServerboundPacket();

    /**
     * Monitors clientbound packets and returns whether a packet can/should be processed.
@@ -215,11 +181,6 @@ 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();
    }
@@ -338,35 +299,23 @@ public interface UserConnection {
    void setPendingDisconnect(boolean pendingDisconnect);

    /**
-     * Returns whether this is a backend connection.
-     * This is a mod integrated into the client, or for example a backend Velocity connection.
+     * Returns whether this is a client-side connection.
+     * This is a mod integrated into the client itself, or for example a backend Velocity connection.
     *
-     * @return whether this is a backend connection
+     * @return whether this is a client-side 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
     */
-    default boolean shouldApplyBlockProtocol() {
-        return isServerSide();
-    }
+    boolean shouldApplyBlockProtocol();

    /**
     * Returns a newly generated uuid that will let a packet be passed through without
-     * transforming its contents if used together with {@link PacketWrapper#PASSTHROUGH_ID}.
+     * transformig 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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,123 +0,0 @@
-/*
- * 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;
-
-import com.google.common.base.Preconditions;
-import com.viaversion.viaversion.api.data.MappingDataLoader.IdentifiersPair;
-import com.viaversion.viaversion.util.Key;
-import it.unimi.dsi.fastutil.objects.Object2IntMap;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
-public class FullIdentityMappings implements FullMappings {
-    private static final String[] EMPTY_ARRAY = new String[0];
-    private final Object2IntMap<String> stringToId;
-    private final String[] idToString;
-    private final Mappings mappings;
-
-    public FullIdentityMappings(final IdentifiersPair identifiersPair, final Mappings mappings) {
-        Preconditions.checkNotNull(mappings, "Mappings cannot be null");
-        this.mappings = mappings;
-        this.stringToId = FullMappingsBase.toInverseMap(identifiersPair.unmapped());
-        this.idToString = identifiersPair.unmapped().toArray(EMPTY_ARRAY);
-    }
-
-    private FullIdentityMappings(final Object2IntMap<String> stringToId, final String[] idToString, final Mappings mappings) {
-        this.stringToId = stringToId;
-        this.idToString = idToString;
-        this.mappings = mappings;
-    }
-
-    @Override
-    public int id(final String identifier) {
-        return stringToId.getInt(Key.stripMinecraftNamespace(identifier));
-    }
-
-    @Override
-    public int mappedId(final String mappedIdentifier) {
-        return id(mappedIdentifier);
-    }
-
-    @Override
-    public String identifier(final int id) {
-        if (id < 0 || id >= idToString.length) {
-            return null;
-        }
-        final String identifier = idToString[id];
-        return Key.namespaced(identifier);
-    }
-
-    @Override
-    public @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) {
-        return identifier(mappedId);
-    }
-
-    @Override
-    public @Nullable String mappedIdentifier(final String identifier) {
-        return identifier(identifier);
-    }
-
-    @Override
-    public int getNewId(int id) {
-        return mappings.getNewId(id);
-    }
-
-    @Override
-    public void setNewId(int id, int mappedId) {
-        mappings.setNewId(id, mappedId);
-    }
-
-    @Override
-    public int size() {
-        return mappings.size();
-    }
-
-    @Override
-    public int mappedSize() {
-        return mappings.mappedSize();
-    }
-
-    @Override
-    public boolean isIdentity() {
-        return true;
-    }
-
-    @Override
-    public boolean isIntIdIdentity() {
-        return true;
-    }
-
-    @Override
-    public FullMappings inverse() {
-        return new FullIdentityMappings(stringToId, idToString, mappings.inverse());
-    }
-}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -53,14 +53,6 @@ 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.
     *
@@ -77,14 +69,6 @@ public interface FullMappings extends BiMappings {
     */
    @Nullable String mappedIdentifier(String identifier);

-    /**
-     * Returns whether the int id mappings are identity mappings.
-     *
-     * @return whether the int id mappings are identity mappings
-     * @see #isIdentity()
-     */
-    boolean isIntIdIdentity();
-
    @Override
    FullMappings inverse();
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,6 @@
 package com.viaversion.viaversion.api.data;

 import com.google.common.base.Preconditions;
-import com.viaversion.viaversion.api.data.MappingDataLoader.IdentifiersPair;
 import com.viaversion.viaversion.util.Key;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
@@ -38,13 +37,13 @@ public class FullMappingsBase implements FullMappings {
    private final String[] mappedIdToString;
    private final Mappings mappings;

-    public FullMappingsBase(final IdentifiersPair identifiersPair, final Mappings mappings) {
+    public FullMappingsBase(final List<String> unmappedIdentifiers, final List<String> mappedIdentifiers, final Mappings mappings) {
        Preconditions.checkNotNull(mappings, "Mappings cannot be null");
        this.mappings = mappings;
-        this.stringToId = toInverseMap(identifiersPair.unmapped());
-        this.idToString = identifiersPair.unmapped().toArray(EMPTY_ARRAY);
-        this.mappedStringToId = toInverseMap(identifiersPair.mapped());
-        this.mappedIdToString = identifiersPair.mapped().toArray(EMPTY_ARRAY);
+        this.stringToId = toInverseMap(unmappedIdentifiers);
+        this.mappedStringToId = toInverseMap(mappedIdentifiers);
+        this.idToString = unmappedIdentifiers.toArray(EMPTY_ARRAY);
+        this.mappedIdToString = mappedIdentifiers.toArray(EMPTY_ARRAY);
    }

    private FullMappingsBase(final Object2IntMap<String> stringToId, final Object2IntMap<String> mappedStringToId, final String[] idToString, final String[] mappedIdToString, final Mappings mappings) {
@@ -55,11 +54,7 @@ public class FullMappingsBase implements FullMappings {
        this.mappings = mappings;
    }

-    public static FullMappings of(final IdentifiersPair identifiersPair, final Mappings mappings) {
-        return mappings.isIdentity() && identifiersPair.identity() ? new FullIdentityMappings(identifiersPair, mappings) : new FullMappingsBase(identifiersPair, mappings);
-    }
-
-    static Object2IntMap<String> toInverseMap(final List<String> list) {
+    private static Object2IntMap<String> toInverseMap(final List<String> list) {
        final Object2IntMap<String> map = new Object2IntOpenHashMap<>(list.size());
        map.defaultReturnValue(-1);
        for (int i = 0; i < list.size(); i++) {
@@ -89,18 +84,7 @@ public class FullMappingsBase implements FullMappings {
    }

    @Override
-    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) {
+    public String mappedIdentifier(final int mappedId) {
        if (mappedId < 0 || mappedId >= mappedIdToString.length) {
            return null;
        }
@@ -140,11 +124,6 @@ public class FullMappingsBase implements FullMappings {
        return mappings.mappedSize();
    }

-    @Override
-    public boolean isIntIdIdentity() {
-        return mappings.isIdentity();
-    }
-
    @Override
    public FullMappings inverse() {
        return new FullMappingsBase(mappedStringToId, stringToId, mappedIdToString, idToString, mappings.inverse());
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -38,9 +38,4 @@ public record IdentityMappings(int size, int mappedSize) implements Mappings {
    public Mappings inverse() {
        return new IdentityMappings(mappedSize, size);
    }
-
-    @Override
-    public boolean isIdentity() {
-        return true;
-    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,13 +22,9 @@
 */
 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 {
@@ -39,84 +35,54 @@ public interface MappingData {
    void load();

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

    /**
-     * Returns the mapped block id, or 0 if unmapped.
+     * Returns the mapped block id, or -1 if unmapped.
     *
     * @param id unmapped block id
-     * @return mapped block id, or 0 if unmapped
+     * @return mapped block id, or -1 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 0 if unmapped.
+     * Returns the mapped item id, or -1 if unmapped.
     *
     * @param id unmapped item id
-     * @return mapped item id, or 0 if unmapped
+     * @return mapped item id, or -1 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 0 if unmapped.
+     * Returns the mapped particle id, or -1 if unmapped.
     *
     * @param id unmapped particle id
-     * @return mapped particle id, or 0 if unmapped
+     * @return mapped particle id, or -1 if unmapped
     * @throws NullPointerException if this mappingdata does not hold particle mappings
     */
    int getNewParticleId(int id);

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

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

    @Nullable Mappings getBlockMappings();

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

    @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();

    @Nullable FullMappings getRecipeSerializerMappings();

-    @Nullable FullMappings getSlotDisplayMappings();
-
    @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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -26,11 +26,8 @@ import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.nbt.tag.IntArrayTag;
 import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.MappingDataLoader.IdentifiersPair;
 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;
@@ -46,23 +43,18 @@ public class MappingDataBase implements MappingData {
    protected FullMappings entityMappings;
    protected FullMappings recipeSerializerMappings;
    protected FullMappings itemDataSerializerMappings;
-    protected FullMappings slotDisplayMappings;
-    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;
@@ -76,40 +68,38 @@ 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 = loadFullOrBiMappings(data, unmappedIdentifierData, mappedIdentifierData, "items");
-            blockMappings = loadFullOrBiMappings(data, unmappedIdentifierData, mappedIdentifierData, "blocks");
-            soundMappings = loadFullOrBiMappings(data, unmappedIdentifierData, mappedIdentifierData, "sounds");
-
+            itemMappings = loadFullMappings(data, unmappedIdentifierData, mappedIdentifierData, "items");
            entityMappings = loadFullMappings(data, unmappedIdentifierData, mappedIdentifierData, "entities");
            argumentTypeMappings = loadFullMappings(data, unmappedIdentifierData, mappedIdentifierData, "argumenttypes");
-            slotDisplayMappings = loadFullMappings(data, unmappedIdentifierData, mappedIdentifierData, "slot_displays");
            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 IdentifiersPair particleIdentifiers = identifiersFromGlobalIds(unmappedIdentifierData, mappedIdentifierData, "particles");
-            if (particleIdentifiers != null) {
+            final List<String> unmappedParticles = identifiersFromGlobalIds(unmappedIdentifierData, "particles");
+            final List<String> mappedParticles = identifiersFromGlobalIds(mappedIdentifierData, "particles");
+            if (unmappedParticles != null && mappedParticles != null) {
                Mappings particleMappings = loadMappings(data, "particles");
                if (particleMappings == null) {
-                    particleMappings = new IdentityMappings(particleIdentifiers.unmapped().size(), particleIdentifiers.mapped().size());
+                    particleMappings = new IdentityMappings(unmappedParticles.size(), mappedParticles.size());
                }
-                this.particleMappings = new ParticleMappings(particleIdentifiers, particleMappings);
+                this.particleMappings = new ParticleMappings(unmappedParticles, mappedParticles, particleMappings);
            }
        } 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");
@@ -120,11 +110,6 @@ 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);
    }

@@ -132,10 +117,6 @@ public class MappingDataBase implements MappingData {
        return MappingDataLoader.INSTANCE.identifiersFromGlobalIds(mappingsTag, key);
    }

-    protected @Nullable IdentifiersPair identifiersFromGlobalIds(final CompoundTag unmappedTag, final CompoundTag mappedTag, final String key) {
-        return MappingDataLoader.INSTANCE.identifiersFromGlobalIds(unmappedTag, mappedTag, key);
-    }
-
    protected @Nullable CompoundTag readMappingsFile(final String name) {
        return MappingDataLoader.INSTANCE.loadNBT(name);
    }
@@ -152,22 +133,19 @@ 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;
        }

-        final IdentifiersPair identifiersPair = identifiersFromGlobalIds(unmappedIdentifiersTag, mappedIdentifiersTag, key);
+        final List<String> unmappedIdentifiers = identifiersFromGlobalIds(unmappedIdentifiersTag, key);
+        final List<String> mappedIdentifiers = identifiersFromGlobalIds(mappedIdentifiersTag, key);
        Mappings mappings = loadBiMappings(data, key); // Load as bi-mappings to keep the inverse cached
        if (mappings == null) {
-            mappings = new IdentityMappings(identifiersPair.unmapped().size(), identifiersPair.mapped().size());
+            mappings = new IdentityMappings(unmappedIdentifiers.size(), mappedIdentifiers.size());
        }
-        return FullMappingsBase.of(identifiersPair, mappings);
+
+        return new FullMappingsBase(unmappedIdentifiers, mappedIdentifiers, mappings);
    }

    protected @Nullable BiMappings loadBiMappings(final CompoundTag data, final String key) {
@@ -176,7 +154,7 @@ public class MappingDataBase implements MappingData {
    }

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

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

    @Override
@@ -225,16 +203,6 @@ public class MappingDataBase implements MappingData {
        return checkValidity(id, attributeMappings.getNewId(id), "attributes");
    }

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

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

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

@@ -286,14 +246,6 @@ 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;
@@ -310,7 +262,7 @@ public class MappingDataBase implements MappingData {
    }

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

@@ -339,16 +291,6 @@ public class MappingDataBase implements MappingData {
        return recipeSerializerMappings;
    }

-    @Override
-    public @Nullable FullMappings getSlotDisplayMappings() {
-        return slotDisplayMappings;
-    }
-
-    @Override
-    public @Nullable IntSet changedBlocks() {
-        return changedBlocks;
-    }
-
    protected Logger getLogger() {
        return Via.getPlatform().getLogger();
    }
@@ -363,7 +305,7 @@ public class MappingDataBase implements MappingData {
     */
    protected int checkValidity(final int id, final int mappedId, final String type) {
        if (mappedId == -1) {
-            if (Via.getConfig().logOtherConversionWarnings()) {
+            if (!Via.getConfig().isSuppressConversionWarnings()) {
                getLogger().warning(String.format("Missing %s %s for %s %s %d", mappedVersion, type, unmappedVersion, type, id));
            }
            return 0;
@@ -373,4 +315,4 @@ public class MappingDataBase implements MappingData {

    protected void loadExtras(final CompoundTag data) {
    }
-}
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -30,6 +30,7 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonSyntaxException;
 import com.viaversion.nbt.io.NBTIO;
 import com.viaversion.nbt.io.TagReader;
+import com.viaversion.nbt.tag.ByteTag;
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.nbt.tag.IntArrayTag;
 import com.viaversion.nbt.tag.IntTag;
@@ -81,9 +82,8 @@ public class MappingDataLoader {
        for (final Map.Entry<String, Tag> entry : globalIdentifiers.entrySet()) {
            //noinspection unchecked
            final ListTag<StringTag> value = (ListTag<StringTag>) entry.getValue();
-            final int size = value.size();
-            final String[] array = new String[size];
-            for (int i = 0; i < size; i++) {
+            final String[] array = new String[value.size()];
+            for (int i = 0, size = value.size(); i < size; i++) {
                array[i] = value.get(i).getValue();
            }
            GLOBAL_IDENTIFIER_INDEXES.put(entry.getKey(), array);
@@ -211,122 +211,79 @@ public class MappingDataLoader {
            return null;
        }

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

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

-            // Read shifts
+            // Handle shifts
            for (int i = 0; i < shiftsAt.length; i++) {
-                final boolean isLast = i == shiftsAt.length - 1;
                final int from = shiftsAt[i];
-                final int to = isLast ? size : shiftsAt[i + 1];
+                final int to = i == shiftsAt.length - 1 ? size : shiftsAt[i + 1];
                int mappedId = shiftsTo[i];
                for (int id = from; id < to; id++) {
                    addConsumer.addTo(mappings, id, mappedId++);
                }
            }
        } else if (strategy == CHANGES_ID) {
-            final int[] changesAt = tag.getIntArrayTag("at").getValue();
-            final int[] values = tag.getIntArrayTag("val").getValue();
-            final int size = tag.getIntTag("size").asInt();
+            final IntArrayTag changesAtTag = tag.getIntArrayTag("at");
+            final IntArrayTag valuesTag = tag.getIntArrayTag("val");
+            final IntTag sizeTag = tag.getUnchecked("size");
            final boolean fillBetween = tag.get("nofill") == null;
-            mappings = holderSupplier.get(size);
+            final int[] changesAt = changesAtTag.getValue();
+            final int[] values = valuesTag.getValue();
+            mappings = holderSupplier.get(sizeTag.asInt());

-            int nextUnhandledId = 0;
            for (int i = 0; i < changesAt.length; i++) {
-                final int changedId = changesAt[i];
+                final int id = changesAt[i];
                if (fillBetween) {
                    // Fill from after the last change to before this change with unchanged ids
-                    for (int id = nextUnhandledId; id < changedId; id++) {
-                        addConsumer.addTo(mappings, id, id);
+                    final int previousId = i != 0 ? changesAt[i - 1] + 1 : 0;
+                    for (int identity = previousId; identity < id; identity++) {
+                        addConsumer.addTo(mappings, identity, identity);
                    }
-                    nextUnhandledId = changedId + 1;
                }

                // Assign the changed value
-                addConsumer.addTo(mappings, changedId, values[i]);
+                addConsumer.addTo(mappings, id, values[i]);
            }
        } else if (strategy == IDENTITY_ID) {
-            final IntTag sizeTag = tag.getIntTag("size");
-            return new IdentityMappings(sizeTag.asInt(), mappedSize);
+            final IntTag sizeTag = tag.getUnchecked("size");
+            return new IdentityMappings(sizeTag.asInt(), mappedSizeTag.asInt());
        } else {
            throw new IllegalArgumentException("Unknown serialization strategy: " + strategy);
        }
-        return mappingsSupplier.create(mappings, mappedSize);
+        return mappingsSupplier.create(mappings, mappedSizeTag.asInt());
    }

    public @Nullable List<String> identifiersFromGlobalIds(final CompoundTag mappingsTag, final String key) {
        final Mappings mappings = loadMappings(mappingsTag, key);
-        return mappings != null ? identifiers(mappings, key) : null;
-
-    }
-
-    /**
-     * Returns a pair of identifier lists, also keeping track of whether the two lists are equal.
-     *
-     * @param unmappedTag unmapped mappings tag
-     * @param mappedTag   mapped mappings tag
-     * @param key         mappings key
-     * @return pair of identifier lists
-     */
-    public @Nullable IdentifiersPair identifiersFromGlobalIds(final CompoundTag unmappedTag, final CompoundTag mappedTag, final String key) {
-        final Mappings unmapped = loadMappings(unmappedTag, key);
-        if (unmapped == null) {
+        if (mappings == null) {
            return null;
        }

-        final Mappings mapped = loadMappings(mappedTag, key);
-        if (mapped == null) {
-            return null;
-        }
-
-        final int size = unmapped.size();
-        if (size != mapped.size()) {
-            return new IdentifiersPair(identifiers(unmapped, key), identifiers(mapped, key), false);
-        }
-
-        // Small optimization to only load one array and reduce loading for full mappings
-        final List<String> unmappedIdentifiers = new ArrayList<>(size);
-        final List<String> mappedIdentifiers = new ArrayList<>(size);
-        boolean identity = true;
-        for (int i = 0; i < size; i++) {
-            final int unmappedGlobalId = unmapped.getNewId(i);
-            final int mappedGlobalId = mapped.getNewId(i);
-            final String unmappedIdentifier = identifierFromGlobalId(key, unmappedGlobalId);
-            if (unmappedGlobalId == mappedGlobalId) {
-                unmappedIdentifiers.add(unmappedIdentifier);
-                mappedIdentifiers.add(unmappedIdentifier);
-                continue;
-            }
-
-            identity = false;
-            unmappedIdentifiers.add(unmappedIdentifier);
-            mappedIdentifiers.add(identifierFromGlobalId(key, mappedGlobalId));
-        }
-        return identity ? new IdentifiersPair(unmappedIdentifiers) : new IdentifiersPair(unmappedIdentifiers, mappedIdentifiers);
-    }
-
-    private List<String> identifiers(final Mappings mappings, final String key) {
        final List<String> identifiers = new ArrayList<>(mappings.size());
        for (int i = 0; i < mappings.size(); i++) {
-            final int globalId = mappings.getNewId(i);
-            identifiers.add(identifierFromGlobalId(key, globalId));
+            identifiers.add(identifierFromGlobalId(key, mappings.getNewId(i)));
        }
        return identifiers;
    }
@@ -338,7 +295,7 @@ public class MappingDataLoader {
     * @return map with indexes hashed by their id value
     */
    public Object2IntMap<String> indexedObjectToMap(final JsonObject object) {
-        final Object2IntMap<String> map = new Object2IntOpenHashMap<>(object.size());
+        final Object2IntMap<String> map = new Object2IntOpenHashMap<>(object.size(), .99F);
        map.defaultReturnValue(-1);
        for (final Map.Entry<String, JsonElement> entry : object.entrySet()) {
            map.put(entry.getValue().getAsString(), Integer.parseInt(entry.getKey()));
@@ -353,7 +310,7 @@ public class MappingDataLoader {
     * @return map with indexes hashed by their id value
     */
    public Object2IntMap<String> arrayToMap(final JsonArray array) {
-        final Object2IntMap<String> map = new Object2IntOpenHashMap<>(array.size());
+        final Object2IntMap<String> map = new Object2IntOpenHashMap<>(array.size(), .99F);
        map.defaultReturnValue(-1);
        for (int i = 0; i < array.size(); i++) {
            map.put(array.get(i).getAsString(), i);
@@ -390,15 +347,4 @@ public class MappingDataLoader {

        T create(V mappings, int mappedSize);
    }
-
-    public record IdentifiersPair(List<String> unmapped, List<String> mapped, boolean identity) {
-
-        public IdentifiersPair(final List<String> unmapped, final List<String> mapped) {
-            this(unmapped, mapped, false);
-        }
-
-        public IdentifiersPair(final List<String> identifiers) {
-            this(identifiers, identifiers, true);
-        }
-    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,8 +22,6 @@
 */
 package com.viaversion.viaversion.api.data;

-import org.checkerframework.checker.nullness.qual.Nullable;
-
 public interface Mappings {

    /**
@@ -86,40 +84,4 @@ public interface Mappings {
     * @return mappings with keys and values swapped
     */
    Mappings inverse();
-
-
-    /**
-     * Returns whether the mappings are unchanged identity mappings.
-     *
-     * @return whether the mappings are unchanged identity mappings
-     */
-    default boolean isIdentity() {
-        return false;
-    }
-
-    /**
-     * Returns whether the mappings null or identity mappings.
-     *
-     * @param mappings mappings
-     * @return whether the mappings are identity mappings
-     * @see #isFullIdentity(Mappings)
-     */
-    static boolean isIntIdIdentity(@Nullable final Mappings mappings) {
-        if (mappings == null) {
-            return true;
-        }
-        return mappings instanceof FullMappings fullMappings ? fullMappings.isIntIdIdentity() : mappings.isIdentity();
-    }
-
-    /**
-     * Returns whether the mappings null or full identity mappings.
-     * Stronger than {@link #isIntIdIdentity(Mappings)}, but equal to that if not {@link FullMappings}.
-     *
-     * @param mappings mappings
-     * @return whether the mappings are full identity mappings
-     * @see #isIntIdIdentity(Mappings)
-     */
-    static boolean isFullIdentity(@Nullable final Mappings mappings) {
-        return mappings == null || mappings.isIdentity();
-    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,21 +22,20 @@
 */
 package com.viaversion.viaversion.api.data;

-import com.viaversion.viaversion.api.data.MappingDataLoader.IdentifiersPair;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntList;
+import java.util.List;

 public class ParticleMappings extends FullMappingsBase {
    private final IntList itemParticleIds = new IntArrayList(4);
    private final IntList blockParticleIds = new IntArrayList(4);

-    public ParticleMappings(final IdentifiersPair identifiersPair, final Mappings mappings) {
-        super(identifiersPair, mappings);
+    public ParticleMappings(final List<String> unmappedIdentifiers, final List<String> mappedIdentifiers, final Mappings mappings) {
+        super(unmappedIdentifiers, mappedIdentifiers, mappings);
        addBlockParticle("block");
        addBlockParticle("falling_dust");
        addBlockParticle("block_marker");
        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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -78,15 +78,10 @@ public interface EntityTracker {
    void removeEntity(int id);

    /**
-     * Clears stored entity types and data, only leaving behind the client entity.
+     * Clears stored entity types and data.
     */
    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.
@@ -107,19 +102,11 @@ public interface EntityTracker {
    @Nullable StoredEntityData entityDataIfPresent(int id);

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

    /**
     * Sets the client entity id.
@@ -128,20 +115,6 @@ 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.
@@ -185,20 +158,6 @@ 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);
@@ -210,4 +169,12 @@ public interface EntityTracker {
    @Nullable DimensionData dimensionData(int dimensionId);

    void setDimensions(Map<String, DimensionData> dimensions);
+
+    /**
+     * Adds the client player entity to the tracker.
+     * If the client entity has not been set yet, this will return false.
+     *
+     * @return whether the client has been tracked
+     */
+    boolean trackClientEntity();
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -55,4 +55,4 @@ public interface TrackedEntity {
    boolean hasSentEntityData();

    void sentEntityData(boolean sentEntityData);
-}
+}
@@ -1,42 +0,0 @@
-/*
- * 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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,6 +22,7 @@
 */
 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;
@@ -49,14 +50,16 @@ public interface DebugHandler {
     *
     * @param packetTypeName packet type name
     */
+    @Beta
    void addPacketTypeNameToLog(String packetTypeName);

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

    /**
@@ -64,51 +67,22 @@ 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();

-    /**
-     * 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.
+     * Set to true by default.
     *
     * @return whether packets should be logged after being transformed
     */
+    @Beta
    boolean logPostPacketTransform();

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

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

-    /**
-     * 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) {
+    @Beta
+    default void enableAndLogIds(final PacketType... packetTypes) {
        setEnabled(true);
        for (final PacketType packetType : packetTypes) {
            addPacketTypeToLog(packetType);
@@ -147,7 +118,7 @@ public interface DebugHandler {
     * @param t     thrown exception
     */
    default void error(final String error, final Throwable t) {
-        if (Via.getConfig().logOtherConversionWarnings() || enabled()) {
+        if (!Via.getConfig().isSuppressConversionWarnings() || 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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,55 +0,0 @@
-/*
- * 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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -58,7 +58,7 @@ public class BlockChangeRecord1_16_2 implements BlockChangeRecord {

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

@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -33,6 +33,7 @@ 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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -37,13 +37,6 @@ 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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -66,17 +66,6 @@ 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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,12 +23,13 @@
 package com.viaversion.viaversion.api.minecraft;

 import com.viaversion.viaversion.api.connection.StorableObject;
+import org.checkerframework.checker.nullness.qual.Nullable;

 /**
 * Stored up until 1.14 to be used in chunk sending.
 */
 public class ClientWorld implements StorableObject {
-    private Environment environment = Environment.NORMAL;
+    private Environment environment;

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

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

-    /**
-     * Sets the environment of the world and returns whether the environment was changed.
-     *
-     * @param environmentId the id of the environment to set
-     * @return whether the environment was changed
-     */
-    public boolean setEnvironment(final int environmentId) {
-        final int previousEnvironmentId = environment.id();
+    public void setEnvironment(final int environmentId) {
        this.environment = Environment.getEnvironmentById(environmentId);
-
-        return previousEnvironmentId != environmentId;
    }
 }
@@ -1,82 +0,0 @@
-/*
- * 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();
-}
@@ -1,55 +0,0 @@
-/*
- * 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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -24,28 +24,22 @@ package com.viaversion.viaversion.api.minecraft;

 public enum GameMode {

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

    private final String text;
-    private final int id;

-    GameMode(String text, final int id) {
+    GameMode(String text) {
        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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,35 +22,11 @@
 */
 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, 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 GameProfile(@Nullable String name, @Nullable UUID id, Property[] properties) {

    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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,10 +22,6 @@
 */
 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> {

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

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

    /**
@@ -83,31 +79,4 @@ public interface Holder<T> {
     * @see #hasId()
     */
    int id();
-
-    /**
-     * Returns a new holder with the id rewritten using the given function, or self if this is a direct holder or the id did not change.
-     *
-     * @param rewriteFunction the function to rewrite the id
-     * @return a new holder with the id rewritten, or self
-     */
-    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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,35 +22,50 @@
 */
 package com.viaversion.viaversion.api.minecraft;

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

-record ValueHolder<T>(T value) implements Holder<T> {
+final class HolderImpl<T> implements Holder<T> {
+
+    private final T value;
+    private final int id;
+
+    HolderImpl(final int id) {
+        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 true;
+        return id == -1;
    }

    @Override
    public boolean hasId() {
-        return false;
+        return id != -1;
+    }
+
+    @Override
+    public T value() {
+        Preconditions.checkArgument(isDirect(), "Holder is not direct");
+        return value;
    }

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

    @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;
+    public String toString() {
+        return "HolderImpl{" +
+            "value=" + value +
+            ", id=" + id +
+            '}';
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,12 +22,7 @@
 */
 package com.viaversion.viaversion.api.minecraft;

-import com.google.common.base.Preconditions;
-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.
@@ -37,12 +32,11 @@ public interface HolderSet {
    /**
     * Creates a new holder set for the given tag.
     *
-     * @param tagKey the tag key, not including '#'
+     * @param tagKey the tag key
     * @return a new holder set
     */
    static HolderSet of(final String tagKey) {
-        Preconditions.checkNotNull(tagKey);
-        return new HolderSetImpl.Tag(tagKey);
+        return new HolderSetImpl(tagKey);
    }

    /**
@@ -52,33 +46,13 @@ public interface HolderSet {
     * @return a new holder set
     */
    static HolderSet of(final int[] ids) {
-        Preconditions.checkNotNull(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();
+        return new HolderSetImpl(ids);
    }

    /**
-     * Gets the tag key, not including '#'.
+     * Gets the tag key.
     *
-     * @return the tag key without a '#'
+     * @return the tag key
     * @see #hasTagKey()
     */
    String tagKey();
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,69 +22,50 @@
 */
 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 {
+final class HolderSetImpl extends EitherImpl<String, int[]> implements HolderSet {

-    record Tag(String tagKey) implements HolderSet {
-        @Override
-        public boolean hasTagKey() {
-            return true;
-        }
+    HolderSetImpl(final String tagKey) {
+        super(tagKey, null);
+    }

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

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

-        @Override
-        public HolderSet rewrite(final Int2IntFunction idRewriter) {
+    @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()) {
            return this;
        }
-    }

-    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) +
-                '}';
+        final int[] ids = ids();
+        final int[] mappedIds = new int[ids.length];
+        for (int i = 0; i < mappedIds.length; i++) {
+            mappedIds[i] = idRewriter.apply(ids[i]);
        }
+        return new HolderSetImpl(mappedIds);
    }
 }
@@ -1,70 +0,0 @@
-/*
- * 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 it.unimi.dsi.fastutil.ints.Int2IntFunction;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
-record IdHolder<T>(int id) implements Holder<T> {
-
-    IdHolder {
-        Preconditions.checkArgument(id >= 0, "id cannot be negative");
-    }
-
-    @Override
-    public boolean isDirect() {
-        return false;
-    }
-
-    @Override
-    public boolean hasId() {
-        return true;
-    }
-
-    @Override
-    public T value() {
-        throw new IllegalArgumentException("Holder is not direct");
-    }
-
-    @Override
-    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 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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,21 +22,13 @@
 */
 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, @Nullable Tag title, @Nullable Tag author) {
+public record PaintingVariant(int width, int height, String assetId) {

-    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<>() {
+    public static HolderType<PaintingVariant> TYPE = new HolderType<>() {
        @Override
        public PaintingVariant readDirect(final ByteBuf buffer) {
            final int width = Types.VAR_INT.readPrimitive(buffer);
@@ -52,40 +44,4 @@ public record PaintingVariant(int width, int height, String assetId, @Nullable T
            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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -24,13 +24,12 @@ package com.viaversion.viaversion.api.minecraft;

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

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

@@ -73,15 +72,6 @@ public final class Particle implements IdHolder, Copyable {
        arguments.set(index, new ParticleData<>(type, value));
    }

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

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

@@ -119,11 +109,6 @@ public final class Particle implements IdHolder, Copyable {
            wrapper.write(type, value);
        }

-        @Override
-        public ParticleData<T> copy() {
-            return new ParticleData<>(type, Copyable.copy(value));
-        }
-
        @Override
        public String toString() {
            return "ParticleData{" +
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,6 @@
 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;

 /**
@@ -32,14 +31,9 @@ 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) implements Copyable {
+public record RegistryEntry(String key, @Nullable Tag tag) {

    public RegistryEntry withKey(final String key) {
        return new RegistryEntry(key, tag != null ? tag.copy() : null);
    }
-
-    @Override
-    public RegistryEntry copy() {
-        return new RegistryEntry(key, tag != null ? tag.copy() : null);
-    }
 }
@@ -1,42 +0,0 @@
-/*
- * 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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,28 +22,25 @@
 */
 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 implements RegistryKey {
+public enum RegistryType {

    BLOCK("block"),
    ITEM("item"),
    FLUID("fluid"),
    ENTITY("entity_type"),
    GAME_EVENT("game_event"),
-    ENCHANTMENT("enchantment"),
-    DAMAGE_TYPE("damage_type"),
-    BANNER_PATTERN("banner_pattern");
+    ENCHANTMENT("enchantment");

    private static final Map<String, RegistryType> MAP = new HashMap<>();
    private static final RegistryType[] VALUES = values();

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

@@ -51,22 +48,17 @@ public enum RegistryType implements RegistryKey {
        return VALUES;
    }

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

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

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

-    public String identifier() {
-        return identifier;
-    }
-
-    @Override
-    public Key key() {
-        return Key.of(identifier);
+    public String resourceLocation() {
+        return resourceLocation;
    }
 }
@@ -1,37 +0,0 @@
-/*
- * 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);
-    }
-}
@@ -1,33 +0,0 @@
-/*
- * 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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,21 +22,11 @@
 */
 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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,28 +0,0 @@
-/*
- * 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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -143,16 +143,6 @@ 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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -79,8 +79,7 @@ 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);

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

    void setSections(ChunkSection[] sections);

@@ -108,15 +106,10 @@ 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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -123,16 +123,6 @@ 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();
@@ -1,145 +0,0 @@
-/*
- * 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-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -61,17 +61,6 @@ public interface ChunkSection {

    void setNonAirBlocksCount(int nonAirBlocksCount);

-    /**
-     * Returns the number of fluid blocks in this section.
-     * <p>
-     * Available with versions 26.1+.
-     *
-     * @return fluid blocks in this section
-     */
-    int getFluidCount();
-
-    void setFluidCount(int fluidCount);
-
    /**
     * Returns whether this section holds light data.
     * Only true for &lt; 1.14 chunks.
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -30,7 +30,6 @@ public class ChunkSectionImpl implements ChunkSection {
    private final EnumMap<PaletteType, DataPalette> palettes = new EnumMap<>(PaletteType.class);
    private ChunkSectionLight light;
    private int nonAirBlocksCount;
-    private int fluidCount;

    public ChunkSectionImpl() {
    }
@@ -38,14 +37,14 @@ public class ChunkSectionImpl implements ChunkSection {
    public ChunkSectionImpl(final boolean holdsLight) {
        addPalette(PaletteType.BLOCKS, new DataPaletteImpl(ChunkSection.SIZE));
        if (holdsLight) {
-            this.light = ChunkSectionLightImpl.createWithBlockLight();
+            this.light = new ChunkSectionLightImpl();
        }
    }

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

@@ -59,16 +58,6 @@ public class ChunkSectionImpl implements ChunkSection {
        this.nonAirBlocksCount = nonAirBlocksCount;
    }

-    @Override
-    public int getFluidCount() {
-        return fluidCount;
-    }
-
-    @Override
-    public void setFluidCount(final int fluidCount) {
-        this.fluidCount = fluidCount;
-    }
-
    @Override
    public @Nullable ChunkSectionLight getLight() {
        return light;
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -35,7 +35,7 @@ public interface ChunkSectionLight {
    /**
     * Returns whether the section has sky light.
     *
-     * @return true if sky light is present
+     * @return true if skylight 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 block light is present
+     * @return true if skylight is present
     */
    boolean hasBlockLight();

@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -30,17 +30,9 @@ public class ChunkSectionLightImpl implements ChunkSectionLight {
    private NibbleArray blockLight;
    private NibbleArray skyLight;

-    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();
+    public ChunkSectionLightImpl() {
+        // Block light is always written
+        this.blockLight = new NibbleArray(ChunkSection.SIZE);
    }

    @Override