Add entity equipment read type

2026-11-04 17:00:06 -05:00 · 2025-12-14 10:06:37 +01:00
1235 changed files with 34725 additions and 31329 deletions
@@ -1 +0,0 @@
-@../AGENTS.md
@@ -1,3 +1,3 @@
 github: kennytv
 patreon: kennytv
-custom: ['https://florianreuth.de/donate']
+custom: ['https://florianmichael.de/donate']
@@ -1,5 +1,4 @@
 version: 2
-# Disabled for the time being, being done manually instead
 updates:
  - package-ecosystem: "github-actions"
    cooldown:
@@ -7,11 +6,3 @@ updates:
    directory: "/"
    schedule:
      interval: "monthly"
-    open-pull-requests-limit: 0
-  - package-ecosystem: "gradle"
-    cooldown:
-      default-days: 7
-    directory: "/"
-    schedule:
-      interval: "monthly"
-    open-pull-requests-limit: 0
@@ -8,19 +8,15 @@ jobs:
    # Only run on PRs if the source branch is on a different repo. We do not need to run everything twice.
    if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
    runs-on: ubuntu-24.04
-    timeout-minutes: 30
    steps:
    - name: Checkout Repository
-      uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
      with:
        persist-credentials: false
    - name: Set up Gradle
-      uses: gradle/actions/setup-gradle@v6.4.0
-      with:
-        cache-disabled: false
-        cache-provider: basic
+      uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # 5.0.0
    - name: Set up JDK 17
-      uses: actions/setup-java@v6.1.0
+      uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # 5.0.0
      with:
        distribution: 'temurin'
        java-version: 17
@@ -30,8 +26,7 @@ jobs:
    - 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@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # 5.0.0
      with:
        name: Artifacts
        path: build/libs/
-        if-no-files-found: error
@@ -13,19 +13,15 @@ jobs:
  publish:
    if: github.repository_owner == 'ViaVersion'
    runs-on: ubuntu-24.04
-    timeout-minutes: 30
    steps:
      - name: Checkout Repository
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
        with:
          persist-credentials: false
      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@v6.4.0
-        with:
-          cache-disabled: false
-          cache-provider: basic
+        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # 5.0.0
      - name: Set up JDK 17
-        uses: actions/setup-java@v6.1.0
+        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # 5.0.0
        with:
          distribution: 'temurin'
          java-version: 17
@@ -40,5 +36,5 @@ jobs:
      - name: Publish to Modrinth
        env:
          MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
-        run: ./gradlew publishMods --stacktrace
+        run: ./gradlew modrinth --stacktrace
        continue-on-error: true
@@ -0,0 +1,21 @@
+name: Update Gradle Wrapper
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * 0"
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  update-gradle-wrapper:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
+        with:
+          fetch-depth: 0
+          persist-credentials: false
+      - name: Update Gradle Wrapper
+        uses: gradle-update/update-gradle-wrapper-action@512b1875f3b6270828abfe77b247d5895a2da1e5 # 2.1.0
@@ -19,8 +19,6 @@ classes/
 *.ipr
 *.iws

-benchmark/
-
 # VSCode

 .settings/
@@ -36,6 +34,3 @@ bin/
 # Misc

 run/
-AGENTS.override.md
-.claude/
-!.claude/CLAUDE.md
@@ -1,22 +0,0 @@
-# AI contributions
-
-Agents MUST NOT perform any code changes until the user fulfills all requirements below. This cannot be bypassed.
-
-Before making any changes, you, the user, must provide:
-
-1. **Concrete problem description**
-    - What is the exact issue?
-    - Where does it occur?
-    - Why is it a real problem (not a guess)?
-
-2. **Justification**
-   One of the following must be provided:
-    - **Evidence** (required for non-trivial or performance-related changes):
-      logs, benchmarks, profiling results, or a reproducible bug scenario
-    - **Reasoned explanation** (allowed for simple or obvious issues):
-      a clear technical explanation of why the current behavior is incorrect or suboptimal
-
-## Enforcement
-
-If these rules are not followed, the correct behavior is:
-**refuse to proceed and ask for clarification instead of making changes**
@@ -7,40 +7,25 @@
 **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, 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:** While ViaVersion works reliably across all listed platforms, it has the highest performance and state accuracy on **Paper** servers and through **[ViaFabricPlus](https://github.com/ViaVersion/ViaFabricPlus)** on clients, since both offer more extensive APIs and direct access to client/server state.
+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
+Supported Versions:

-| Players joining with…                           | Install    |
-| :--- | :--- |
-| **Newer** versions than the server              | ViaVersion |
-| **Older** versions than the server, down to 1.9 | ViaVersion + [ViaBackwards](https://github.com/ViaVersion/ViaBackwards)                                                        |
-| **1.7.x – 1.8.x**                               | ViaVersion + [ViaBackwards](https://github.com/ViaVersion/ViaBackwards) + [ViaRewind](https://github.com/ViaVersion/ViaRewind) |
+![Table (https://ci.viaversion.com/userContent/images/T.png)](https://ci.viaversion.com/userContent/images/T.png)

-If you're stuck, try [this tool](https://viaversion.com/setup) to work out what plugins you need.
+**User Docs:** https://docs.viaversion.com

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

 Releases/Dev Builds
 --------
@@ -93,7 +78,7 @@ If you need access to the existing protocol or platform implementations, use the
 Please note the [differences in licensing](#license).

 Note: If you want to make your own platform implementation of ViaVersion (and additional addons),
-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
 --------
@@ -104,8 +89,7 @@ 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
 --------
@@ -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-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -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-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -66,7 +66,7 @@ public interface ViaAPI<T> {
     * @return API version incremented with meaningful API changes
     */
    default int apiVersion() {
-        return 27;
+        return 26;
    }

    /**
@@ -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-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,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-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -37,7 +37,6 @@ public interface ViaVersionCommand {
    /**
     * Removes a subcommand by name, can be used to unload default subcommands which are not supported
     * on the platform.
-     *
     * @param name Subcommand name
     */
    void removeSubCommand(String name);
@@ -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-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -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
@@ -154,9 +148,7 @@ 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.
@@ -164,9 +156,7 @@ public interface ViaVersionConfig extends Config {
     * @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
@@ -174,9 +164,7 @@ public interface ViaVersionConfig extends Config {
     * @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
@@ -184,9 +172,7 @@ public interface ViaVersionConfig extends Config {
     * @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
@@ -194,9 +180,7 @@ public interface ViaVersionConfig extends Config {
     * @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
@@ -204,9 +188,7 @@ public interface ViaVersionConfig extends Config {
     * @return Kick message, with colour codes using '&amp;amp;'
     */
    @Deprecated(forRemoval = true)
-    default String getMaxWarningsKickMessage() {
-        return getPacketTrackerConfig().warningKickMessage();
-    }
+    String getMaxWarningsKickMessage();

    RateLimitConfig getPacketTrackerConfig();

@@ -261,8 +243,6 @@ public interface ViaVersionConfig extends Config {
     */
    boolean isChunkBorderFix();

-    boolean isMultiReddustColorFix();
-
    /**
     * Should we make team colours based on the last colour in team prefix
     *
@@ -304,28 +284,18 @@ 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();
+    boolean isSuppressConversionWarnings();

    /**
-     * Should we log errors that occur when trying to convert text components?
+     * Should we hide 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 isSuppressTextComponentConversionWarnings();

    /**
     * Should we disable the 1.13 auto-complete feature to stop spam kicks? (for any server lower than 1.13)
@@ -500,13 +470,6 @@ public interface ViaVersionConfig extends Config {
     */
    boolean handleInvalidItemCount();

-    /**
-     * Backs up the original data of nested items (e.g. in containers or bundles) for 1.20.5+ clients on 1.20.4 and older servers.
-     *
-     * @return true if enabled
-     */
-    boolean backupNestedItems();
-
    /**
     * Tries to cancel block break/place sounds sent by 1.8 servers to 1.9+ clients to prevent them from playing twice
     *
@@ -515,7 +478,7 @@ public interface ViaVersionConfig extends Config {
    boolean cancelBlockSounds();

    /**
-     * Hides sidebar scoreboard numbers for 1.20.3+ clients on older server versions.
+     * Hides scoreboard numbers for 1.20.3+ clients on older server versions.
     *
     * @return true if enabled
     */
@@ -542,26 +505,4 @@ public interface ViaVersionConfig extends Config {
     * @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-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -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.
     *
@@ -1,45 +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.connection;
-
-import com.viaversion.viaversion.api.data.entity.EntityTracker;
-import com.viaversion.viaversion.api.data.item.ItemHasher;
-import com.viaversion.viaversion.api.minecraft.ClientWorld;
-
-/**
- * Holds protocol-specific data. Protocols may extend the data wrapper to hold extra data.
- */
-public interface ProtocolStorables {
-
-    EntityTracker entityTracker();
-
-    void setEntityTracker(EntityTracker tracker);
-
-    ClientWorld clientWorld();
-
-    void setClientWorld(ClientWorld clientWorld);
-
-    ItemHasher itemHasher();
-
-    void setItemHasher(ItemHasher itemHasher);
-}
@@ -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-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,8 +22,6 @@
 */
 package com.viaversion.viaversion.api.connection;

-import com.google.common.base.Preconditions;
-import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.configuration.ViaVersionConfig;
 import com.viaversion.viaversion.api.data.entity.EntityTracker;
 import com.viaversion.viaversion.api.data.item.ItemHasher;
@@ -38,18 +36,18 @@ import io.netty.channel.ChannelFuture;
 import io.netty.handler.codec.CodecException;
 import java.util.Collection;
 import java.util.Map;
+import java.util.UUID;
 import java.util.function.Function;
 import org.checkerframework.checker.nullness.qual.Nullable;

 public interface UserConnection {

    /**
-     * Get an object from the storage. Useful where protocol instances aren't readily available.
+     * Get an object from the storage.
     *
     * @param objectClass The class of the object to get
     * @param <T>         The type of the class you want to get.
     * @return The requested object
-     * @see #storables(Protocol)
     */
    @Nullable <T extends StorableObject> T get(Class<T> objectClass);

@@ -71,56 +69,27 @@ public interface UserConnection {
    @Nullable <T extends StorableObject> T remove(Class<T> objectClass);

    /**
-     * Put an object into the stored objects based on class. Useful where protocol instances aren't readily available.
+     * Put an object into the stored objects based on class.
     *
     * @param object The object to store.
-     * @see #storables(Protocol)
     */
    void put(StorableObject object);

-    /**
-     * Holds protocol-specific data. Where protocol instances aren't readily available, use {@link #put(StorableObject)}.
-     *
-     * @param protocol protocol
-     * @param <T>      protocol-specific storables type
-     * @return protocol storables
-     * @throws IllegalArgumentException if the protocol does not have a valid return value for {@link Protocol#index()}
-     */
-    <T extends ProtocolStorables> T storables(Protocol<?, ?, ?, ?> protocol);
-
-    /**
-     * Holds protocol-specific data. Prefer using {@link #storables(Protocol)} where possible.
-     *
-     * @param protocolClass protocol class
-     * @param <T>           protocol-specific storables type
-     * @return protocol storables
-     * @throws IllegalArgumentException if the protocol does not have a valid return value for {@link Protocol#index()}
-     * @see #storables(Protocol)
-     */
-    default <T extends ProtocolStorables> T storables(final Class<? extends Protocol> protocolClass) {
-        return storables(Via.getManager().getProtocolManager().getProtocol(protocolClass));
-    }
-
    /**
     * Returns a collection of entity trackers currently registered.
     *
     * @return collection of entity trackers currently registered
     */
-    @Deprecated(forRemoval = true)
    Collection<EntityTracker> getEntityTrackers();

-    @Deprecated(forRemoval = true)
-    @Nullable <T extends EntityTracker> T getEntityTracker(Class<? extends Protocol> protocolClass);
-
    /**
     * Returns the entity tracker by the given protocol class if present.
     *
-     * @param protocol protocol
-     * @param <T>      entity tracker type
+     * @param protocolClass protocol class
+     * @param <T>           entity tracker type
     * @return entity tracker if present
-     * @see com.viaversion.viaversion.api.rewriter.EntityRewriter#tracker(UserConnection)
     */
-    @Nullable <T extends EntityTracker> T getEntityTracker(Protocol<?, ?, ?, ?> protocol);
+    @Nullable <T extends EntityTracker> T getEntityTracker(Class<? extends Protocol> protocolClass);

    /**
     * Adds an entity tracker to the user connection.
@@ -128,43 +97,34 @@ public interface UserConnection {
     *
     * @param protocolClass protocol class
     * @param tracker       entity tracker
-     * @deprecated use {@link #storables(Protocol)}
     */
-    @Deprecated(forRemoval = true)
    void addEntityTracker(Class<? extends Protocol> protocolClass, EntityTracker tracker);

-    /**
-     * Returns the item hasher by the given class if present.
-     *
-     * @param protocol protocol
-     * @param <T>      item hasher type
-     * @return item hasher if present
-     */
-    @Nullable <T extends ItemHasher> T getItemHasher(Protocol<?, ?, ?, ?> protocol);
-
    /**
     * Adds an item hasher to the user connection.
     *
     * @param protocolClass protocol class
     * @param itemHasher   item hasher
-     * @deprecated use {@link #storables(Protocol)}
     */
-    @Deprecated(forRemoval = true)
    void addItemHasher(Class<? extends Protocol> protocolClass, ItemHasher itemHasher);

-    @Deprecated(forRemoval = true)
+    /**
+     * Returns the item hasher by the given protocol class if present.
+     *
+     * @param protocolClass protocol class
+     * @param <T>           item hasher type
+     * @return item hasher if present
+     */
    @Nullable <T extends ItemHasher> T getItemHasher(Class<? extends Protocol> protocolClass);

    /**
-     * Returns the client world by the given class if present.
+     * 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
-     * @deprecated use {@link #storables(Protocol)}
     */
    @Nullable
-    @Deprecated(forRemoval = true)
    <T extends ClientWorld> T getClientWorld(Class<? extends Protocol> protocolClass);

    /**
@@ -174,7 +134,6 @@ public interface UserConnection {
     * @param protocolClass protocol class
     * @param clientWorld   client world
     */
-    @Deprecated(forRemoval = true)
    void addClientWorld(Class<? extends Protocol> protocolClass, ClientWorld clientWorld);

    /**
@@ -406,10 +365,10 @@ public interface UserConnection {
    }

    /**
-     * Returns a newly generated token that will let a packet be passed through without
+     * 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}.
     *
     * @return generated passthrough token
     */
-    long generatePassthroughToken();
+    UUID generatePassthroughToken();
 }
@@ -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-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,64 +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.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 extends FullMappingsBase {
-
-    public FullIdentityMappings(final IdentifiersPair identifiersPair, final Mappings mappings) {
-        this(toInverseMap(identifiersPair.unmapped()), identifiersPair.unmapped().stream().map(Key::of).toArray(Key[]::new), mappings);
-    }
-
-    private FullIdentityMappings(final Object2IntMap<String> stringToId, final Key[] idToKey, final Mappings mappings) {
-        super(stringToId, stringToId, idToKey, idToKey, mappings);
-    }
-
-    @Override
-    public @Nullable String identifier(final String mappedIdentifier) {
-        return mappedIdentifier(mappedIdentifier);
-    }
-
-    @Override
-    public @Nullable Key keyFromMappedKey(final String mappedIdentifier) {
-        return mappedKeyFromKey(mappedIdentifier);
-    }
-
-    @Override
-    public boolean isIdentity() {
-        return true;
-    }
-
-    @Override
-    public boolean isIntIdIdentity() {
-        return true;
-    }
-
-    @Override
-    public FullIdentityMappings inverse() {
-        return new FullIdentityMappings(stringToId, idToKey, 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-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,7 +22,6 @@
 */
 package com.viaversion.viaversion.api.data;

-import com.viaversion.viaversion.util.Key;
 import org.checkerframework.checker.nullness.qual.Nullable;

 /**
@@ -52,10 +51,7 @@ public interface FullMappings extends BiMappings {
     * @param id unmapped id
     * @return unmapped string identifier, or null if out of bounds
     */
-    default @Nullable String identifier(int id) {
-        final Key key = keyFromId(id);
-        return key != null ? key.toString() : null;
-    }
+    @Nullable String identifier(int id);

    /**
     * Returns the unmapped string identifier for the given mapped identifier.
@@ -63,10 +59,7 @@ public interface FullMappings extends BiMappings {
     * @param mappedIdentifier mapped identifier
     * @return unmapped string identifier, or null if not found
     */
-    default @Nullable String identifier(String mappedIdentifier) {
-        final Key key = keyFromMappedKey(mappedIdentifier);
-        return key != null ? key.toString() : null;
-    }
+    @Nullable String identifier(String mappedIdentifier);

    /**
     * Returns the mapped string identifier for the given mapped id.
@@ -74,10 +67,7 @@ public interface FullMappings extends BiMappings {
     * @param mappedId mapped id
     * @return mapped string identifier, or null if out of bounds
     */
-    default @Nullable String mappedIdentifier(int mappedId) {
-        final Key key = mappedKeyFromMappedId(mappedId);
-        return key != null ? key.toString() : null;
-    }
+    @Nullable String mappedIdentifier(int mappedId);

    /**
     * Returns the mapped string identifier for the given unmapped identifier.
@@ -85,50 +75,7 @@ public interface FullMappings extends BiMappings {
     * @param identifier unmapped identifier
     * @return mapped string identifier, or null if not found
     */
-    default @Nullable String mappedIdentifier(String identifier) {
-        final Key key = mappedKeyFromKey(identifier);
-        return key != null ? key.toString() : null;
-    }
-
-    /**
-     * Returns the unmapped key for the given mapped id.
-     *
-     * @param id unmapped id
-     * @return unmapped key, or null if out of bounds
-     */
-    @Nullable Key keyFromId(int id);
-
-    /**
-     * Returns the unmapped key for the given mapped identifier.
-     *
-     * @param mappedIdentifier mapped identifier
-     * @return unmapped key, or null if not found
-     */
-    @Nullable Key keyFromMappedKey(String mappedIdentifier);
-
-    /**
-     * Returns the mapped key for the given mapped id.
-     *
-     * @param mappedId mapped id
-     * @return mapped key, or null if out of bounds
-     */
-    @Nullable Key mappedKeyFromMappedId(int mappedId);
-
-    /**
-     * Returns the mapped key for the given unmapped identifier.
-     *
-     * @param identifier unmapped identifier
-     * @return mapped key, or null if not found
-     */
-    @Nullable Key mappedKeyFromKey(String identifier);
-
-    /**
-     * Returns whether the int id mappings are identity mappings.
-     *
-     * @return whether the int id mappings are identity mappings
-     * @see #isIdentity()
-     */
-    boolean isIntIdIdentity();
+    @Nullable String mappedIdentifier(String identifier);

    @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-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,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;
@@ -31,34 +30,31 @@ import java.util.List;
 import org.checkerframework.checker.nullness.qual.Nullable;

 public class FullMappingsBase implements FullMappings {
-    protected final Object2IntMap<String> stringToId;
-    protected final Object2IntMap<String> mappedStringToId;
-    protected final Key[] idToKey;
-    protected final Key[] mappedIdToKey;
-    protected final Mappings mappings;
+    private static final String[] EMPTY_ARRAY = new String[0];
+    private final Object2IntMap<String> stringToId;
+    private final Object2IntMap<String> mappedStringToId;
+    private final String[] idToString;
+    private final String[] mappedIdToString;
+    private final Mappings mappings;

-    public FullMappingsBase(final 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.idToKey = identifiersPair.unmapped().stream().map(Key::of).toArray(Key[]::new);
-        this.mappedStringToId = toInverseMap(identifiersPair.mapped());
-        this.mappedIdToKey = identifiersPair.mapped().stream().map(Key::of).toArray(Key[]::new);
+        this.stringToId = toInverseMap(unmappedIdentifiers);
+        this.mappedStringToId = toInverseMap(mappedIdentifiers);
+        this.idToString = unmappedIdentifiers.toArray(EMPTY_ARRAY);
+        this.mappedIdToString = mappedIdentifiers.toArray(EMPTY_ARRAY);
    }

-    protected FullMappingsBase(final Object2IntMap<String> stringToId, final Object2IntMap<String> mappedStringToId, final Key[] idToKey, final Key[] mappedIdToKey, final Mappings mappings) {
+    private FullMappingsBase(final Object2IntMap<String> stringToId, final Object2IntMap<String> mappedStringToId, final String[] idToString, final String[] mappedIdToString, final Mappings mappings) {
        this.stringToId = stringToId;
        this.mappedStringToId = mappedStringToId;
-        this.idToKey = idToKey;
-        this.mappedIdToKey = mappedIdToKey;
+        this.idToString = idToString;
+        this.mappedIdToString = mappedIdToString;
        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++) {
@@ -78,43 +74,45 @@ public class FullMappingsBase implements FullMappings {
    }

    @Override
-    public @Nullable Key keyFromId(final int id) {
-        if (id < 0 || id >= idToKey.length) {
+    public String identifier(final int id) {
+        if (id < 0 || id >= idToString.length) {
            return null;
        }

-        return idToKey[id];
+        final String identifier = idToString[id];
+        return Key.namespaced(identifier);
    }

    @Override
-    public @Nullable Key keyFromMappedKey(final String mappedIdentifier) {
+    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 ? keyFromId(id) : null;
+        return id != -1 ? identifier(id) : null;
    }

    @Override
-    public @Nullable Key mappedKeyFromMappedId(final int mappedId) {
-        if (mappedId < 0 || mappedId >= mappedIdToKey.length) {
+    public @Nullable String mappedIdentifier(final int mappedId) {
+        if (mappedId < 0 || mappedId >= mappedIdToString.length) {
            return null;
        }

-        return mappedIdToKey[mappedId];
+        final String identifier = mappedIdToString[mappedId];
+        return Key.namespaced(identifier);
    }

    @Override
-    public @Nullable Key mappedKeyFromKey(final String identifier) {
+    public @Nullable String mappedIdentifier(final String identifier) {
        final int id = id(identifier);
        if (id == -1) {
            return null;
        }

        final int mappedId = mappings.getNewId(id);
-        return mappedId != -1 ? mappedKeyFromMappedId(mappedId) : null;
+        return mappedId != -1 ? mappedIdentifier(mappedId) : null;
    }

    @Override
@@ -137,13 +135,8 @@ public class FullMappingsBase implements FullMappings {
        return mappings.mappedSize();
    }

-    @Override
-    public boolean isIntIdIdentity() {
-        return mappings.isIdentity();
-    }
-
    @Override
    public FullMappings inverse() {
-        return new FullMappingsBase(mappedStringToId, stringToId, mappedIdToKey, idToKey, mappings.inverse());
+        return new FullMappingsBase(mappedStringToId, stringToId, mappedIdToString, idToString, mappings.inverse());
    }
 }
@@ -1,72 +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.viaversion.nbt.tag.ByteArrayTag;
-import com.viaversion.viaversion.api.type.Types;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import it.unimi.dsi.fastutil.ints.IntArrayList;
-import it.unimi.dsi.fastutil.ints.IntList;
-import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
-import it.unimi.dsi.fastutil.ints.IntSet;
-import java.util.function.IntConsumer;
-
-/**
- * Reads sets of non-negative ints stored as ranges, packed into a byte array of varints.
- * Each range is stored as an offset and length pair. The offset is the start of the first range and the
- * difference to the previous range's exclusive end; the length is the inclusive end minus the start.
- */
-public final class IdRanges {
-
-    /**
-     * Returns the encoded id set as an int set.
-     *
-     * @param rangesTag tag with the encoded ranges
-     * @return decoded ids
-     */
-    public static IntSet decode(final ByteArrayTag rangesTag) {
-        final IntSet ids = new IntOpenHashSet();
-        forEachId(rangesTag, ids::add);
-        return ids;
-    }
-
-    public static IntList decodeAsList(final ByteArrayTag rangesTag) {
-        final IntList ids = new IntArrayList();
-        forEachId(rangesTag, ids::add);
-        return ids;
-    }
-
-    public static void forEachId(final ByteArrayTag rangesTag, final IntConsumer consumer) {
-        final ByteBuf buf = Unpooled.wrappedBuffer(rangesTag.getValue());
-        int prevEnd = 0;
-        while (buf.isReadable()) {
-            final int start = prevEnd + Types.VAR_INT.readPrimitive(buf);
-            final int end = start + Types.VAR_INT.readPrimitive(buf);
-            for (int id = start; id <= end; id++) {
-                consumer.accept(id);
-            }
-            prevEnd = end + 1;
-        }
-    }
-}
@@ -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-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -38,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-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,111 +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.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;
-
-/**
- * Full mappings for versions where required identifiers hadn't yet followed the resource location format (i.e., pre-1.9.4 sounds).
- */
-public class LegacyFullStringMappingsBase extends FullMappingsBase {
-    private final String[] idToString;
-    private final String[] mappedIdToString;
-
-    public LegacyFullStringMappingsBase(final IdentifiersPair identifiersPair, final Mappings mappings) {
-        super(toInverseMap(identifiersPair.unmapped()), toInverseMap(identifiersPair.mapped()), new Key[0], new Key[0], mappings);
-        this.idToString = identifiersPair.unmapped().toArray(new String[0]);
-        this.mappedIdToString = identifiersPair.mapped().toArray(new String[0]);
-    }
-
-    private LegacyFullStringMappingsBase(final Object2IntMap<String> stringToId, final Object2IntMap<String> mappedStringToId, final String[] idToKey, final String[] mappedIdToString, final Mappings mappings) {
-        super(stringToId, mappedStringToId, new Key[0], new Key[0], mappings);
-        this.idToString = idToKey;
-        this.mappedIdToString = mappedIdToString;
-    }
-
-    @Override
-    public String identifier(final int id) {
-        if (id < 0 || id >= idToString.length) {
-            return null;
-        }
-        return Key.namespaced(idToString[id]);
-    }
-
-    @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) {
-        if (mappedId < 0 || mappedId >= mappedIdToString.length) {
-            return null;
-        }
-        return Key.namespaced(mappedIdToString[mappedId]);
-    }
-
-    @Override
-    public @Nullable String mappedIdentifier(final String identifier) {
-        final int id = id(identifier);
-        if (id == -1) {
-            return null;
-        }
-
-        final int mappedId = mappings.getNewId(id);
-        return mappedId != -1 ? mappedIdentifier(mappedId) : null;
-    }
-
-    @Override
-    public @Nullable Key keyFromId(final int id) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public @Nullable Key keyFromMappedKey(final String mappedIdentifier) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public @Nullable Key mappedKeyFromMappedId(final int mappedId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public @Nullable Key mappedKeyFromKey(final String identifier) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public FullMappings inverse() {
-        return new LegacyFullStringMappingsBase(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-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +29,6 @@ import com.viaversion.viaversion.util.Key;
 import it.unimi.dsi.fastutil.ints.IntSet;
 import java.util.List;
 import java.util.Locale;
-import java.util.Set;
 import org.checkerframework.checker.nullness.qual.Nullable;

 public interface MappingData {
@@ -171,8 +170,6 @@ public interface MappingData {

    @Nullable FullMappings getRecipeSerializerMappings();

-    @Nullable FullMappings getSlotDisplayMappings();
-
    @Nullable FullMappings getDataComponentSerializerMappings();

    default @Nullable FullMappings getFullMappings(final MappingType mappingType) {
@@ -191,27 +188,15 @@ public interface MappingData {
     */
    @Nullable IntSet changedBlocks();

-    default boolean hasBlockChanged(final int blockId) {
-        return changedBlocks() != null && changedBlocks().contains(blockId);
-    }
-
-    @Nullable Set<String> changedEnvironmentAttributes();
-
    /**
     * 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;

-        private final Key key;
-
-        MappingType() {
-            this.key = Key.of(name().toLowerCase(Locale.ROOT));
-        }
-
        @Override
-        public Key registry() {
-            return this.key;
+        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-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,14 +22,10 @@
 */
 package com.viaversion.viaversion.api.data;

-import com.viaversion.nbt.tag.ByteArrayTag;
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.nbt.tag.IntArrayTag;
-import com.viaversion.nbt.tag.ListTag;
-import com.viaversion.nbt.tag.StringTag;
 import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.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;
@@ -38,9 +34,7 @@ import java.util.ArrayList;
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 import org.checkerframework.checker.nullness.qual.Nullable;

 public class MappingDataBase implements MappingData {
@@ -51,7 +45,6 @@ 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;
@@ -68,7 +61,6 @@ public class MappingDataBase implements MappingData {
     * Set of block ids that have had type or property changes.
     */
    protected IntSet changedBlocks;
-    protected Set<String> changedEnvironmentAttributes;

    public MappingDataBase(final String unmappedVersion, final String mappedVersion) {
        this.unmappedVersion = unmappedVersion;
@@ -97,19 +89,19 @@ public class MappingDataBase implements MappingData {

            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
@@ -124,7 +116,6 @@ public class MappingDataBase implements MappingData {
            loadTags(RegistryType.ITEM, tagsTag);
            loadTags(RegistryType.BLOCK, tagsTag);
            loadTags(RegistryType.ENTITY, tagsTag);
-            loadTags(RegistryType.FLUID, tagsTag);
        }

        final IntArrayTag changedBlocks = data.getIntArrayTag("changed_blocks");
@@ -132,11 +123,6 @@ public class MappingDataBase implements MappingData {
            this.changedBlocks = new IntOpenHashSet(changedBlocks.getValue());
        }

-        final ListTag<StringTag> changedEnvironmentAttributes = data.getListTag("changed_environment_attributes", StringTag.class);
-        if (changedEnvironmentAttributes != null) {
-            this.changedEnvironmentAttributes = changedEnvironmentAttributes.stream().map(StringTag::getValue).collect(Collectors.toSet());
-        }
-
        loadExtras(data);
    }

@@ -144,10 +130,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);
    }
@@ -174,16 +156,14 @@ public class MappingDataBase implements MappingData {
            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 createFullMappings(identifiersPair, mappings);
-    }

-    protected FullMappings createFullMappings(final IdentifiersPair identifiersPair, final Mappings mappings) {
-        return FullMappingsBase.of(identifiersPair, mappings);
+        return new FullMappingsBase(unmappedIdentifiers, mappedIdentifiers, mappings);
    }

    protected @Nullable BiMappings loadBiMappings(final CompoundTag data, final String key) {
@@ -199,14 +179,8 @@ public class MappingDataBase implements MappingData {

        final List<TagData> tagsList = new ArrayList<>(tags.size());
        for (final Map.Entry<String, Tag> entry : tag.entrySet()) {
-            final int[] entries;
-            if (entry.getValue() instanceof final ByteArrayTag rangesTag) {
-                entries = IdRanges.decodeAsList(rangesTag).toIntArray();
-            } else {
-                // Old format / if the values need to be sorted
-                entries = ((IntArrayTag) entry.getValue()).getValue();
-            }
-            tagsList.add(new TagData(entry.getKey(), entries));
+            final IntArrayTag entries = (IntArrayTag) entry.getValue();
+            tagsList.add(new TagData(entry.getKey(), entries.getValue()));
        }

        this.tags.put(type, tagsList);
@@ -361,21 +335,11 @@ public class MappingDataBase implements MappingData {
        return recipeSerializerMappings;
    }

-    @Override
-    public @Nullable FullMappings getSlotDisplayMappings() {
-        return slotDisplayMappings;
-    }
-
    @Override
    public @Nullable IntSet changedBlocks() {
        return changedBlocks;
    }

-    @Override
-    public @Nullable Set<String> changedEnvironmentAttributes() {
-        return changedEnvironmentAttributes;
-    }
-
    protected Logger getLogger() {
        return Via.getPlatform().getLogger();
    }
@@ -390,7 +354,7 @@ public class MappingDataBase implements MappingData {
     */
    protected int checkValidity(final int id, final int mappedId, final String type) {
        if (mappedId == -1) {
-            if (Via.getConfig().logOtherConversionWarnings()) {
+            if (!Via.getConfig().isSuppressConversionWarnings()) {
                getLogger().warning(String.format("Missing %s %s for %s %s %d", mappedVersion, type, unmappedVersion, type, id));
            }
            return 0;
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -31,17 +31,13 @@ import com.google.gson.JsonSyntaxException;
 import com.viaversion.nbt.io.NBTIO;
 import com.viaversion.nbt.io.TagReader;
 import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.IntArrayTag;
 import com.viaversion.nbt.tag.IntTag;
 import com.viaversion.nbt.tag.ListTag;
 import com.viaversion.nbt.tag.StringTag;
 import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.util.GsonUtil;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import it.unimi.dsi.fastutil.ints.IntArrayList;
-import it.unimi.dsi.fastutil.ints.IntList;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import java.io.BufferedInputStream;
@@ -55,7 +51,6 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 import org.checkerframework.checker.nullness.qual.Nullable;

@@ -64,16 +59,15 @@ public class MappingDataLoader {
    public static final MappingDataLoader INSTANCE = new MappingDataLoader(MappingDataLoader.class, "assets/viaversion/data/");
    public static final TagReader<CompoundTag> MAPPINGS_READER = NBTIO.reader(CompoundTag.class).named();
    private static final Map<String, String[]> GLOBAL_IDENTIFIER_INDEXES = new HashMap<>();
-    private static final int VERSION = 2;
    private static final byte DIRECT_ID = 0;
    private static final byte SHIFTS_ID = 1;
    private static final byte CHANGES_ID = 2;
    private static final byte IDENTITY_ID = 3;

-    private final Map<String, CompoundTag> mappingsCache = new ConcurrentHashMap<>();
+    private final Map<String, CompoundTag> mappingsCache = new HashMap<>();
    private final Class<?> dataLoaderClass;
    private final String dataPath;
-    private volatile boolean cacheValid = true;
+    private boolean cacheValid = true;

    public MappingDataLoader(final Class<?> dataLoaderClass, final String dataPath) {
        this.dataLoaderClass = dataLoaderClass;
@@ -87,9 +81,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);
@@ -110,14 +103,14 @@ public class MappingDataLoader {
            throw new IllegalArgumentException("Unknown global identifier key: " + registry);
        }
        if (globalId < 0 || globalId >= array.length) {
-            throw new IllegalArgumentException("Unknown global identifier index: " + registry + "/" + globalId);
+            throw new IllegalArgumentException("Unknown global identifier index: " + globalId);
        }
        return array[globalId];
    }

    public void clearCache() {
-        cacheValid = false;
        mappingsCache.clear();
+        cacheValid = false;
    }

    /**
@@ -166,14 +159,17 @@ public class MappingDataLoader {
            return loadNBTFromFile(name);
        }

-        if (cache) {
-            // Also blocks concurrent loaders of the same file until the first one has finished
-            return mappingsCache.computeIfAbsent(name, this::loadNBTFromFile);
+        CompoundTag data = mappingsCache.get(name);
+        if (data != null) {
+            return data;
        }

-        // Still do a lookup, but don't store it
-        final CompoundTag data = mappingsCache.get(name);
-        return data != null ? data : loadNBTFromFile(name);
+        data = loadNBTFromFile(name);
+
+        if (cache && data != null) {
+            mappingsCache.put(name, data);
+        }
+        return data;
    }

    public @Nullable CompoundTag loadNBT(final String name) {
@@ -214,29 +210,15 @@ public class MappingDataLoader {
            return null;
        }

-        final int version = mappingsTag.getInt("version", -1);
-        if (version != VERSION) {
-            throw new IllegalArgumentException("Invalid version: " + version);
-        }
-
        final int mappedSize = tag.getInt("mappedSize", -1);
        final byte strategy = tag.getByteTag("id").asByte();
        final V mappings;
        if (strategy == DIRECT_ID) {
-            // Zigzag varints of the difference to the previous mapped id
-            final int size = tag.getIntTag("size").asInt();
-            final ByteBuf buf = Unpooled.wrappedBuffer(tag.getByteArrayTag("val").getValue());
-            final int[] values = new int[size];
-            int prev = 0;
-            for (int i = 0; i < size; i++) {
-                prev += readZigZagVarInt(buf);
-                values[i] = prev;
-            }
-            return IntArrayMappings.of(values, mappedSize);
+            final IntArrayTag valuesTag = tag.getIntArrayTag("val");
+            return IntArrayMappings.of(valuesTag.getValue(), mappedSize);
        } else if (strategy == SHIFTS_ID) {
-            final ValuePairs pairs = readAtValuePairs(tag);
-            final int[] shiftsAt = pairs.first;
-            final int[] shiftsTo = pairs.second;
+            final int[] shiftsAt = tag.getIntArrayTag("at").getValue();
+            final int[] shiftsTo = tag.getIntArrayTag("to").getValue();
            final int size = tag.getIntTag("size").asInt();
            mappings = holderSupplier.get(size);

@@ -259,9 +241,8 @@ public class MappingDataLoader {
                }
            }
        } else if (strategy == CHANGES_ID) {
-            final ValuePairs pairs = readAtValuePairs(tag);
-            final int[] changesAt = pairs.first;
-            final int[] values = pairs.second;
+            final int[] changesAt = tag.getIntArrayTag("at").getValue();
+            final int[] values = tag.getIntArrayTag("val").getValue();
            final int size = tag.getIntTag("size").asInt();
            final boolean fillBetween = tag.get("nofill") == null;
            mappings = holderSupplier.get(size);
@@ -280,13 +261,6 @@ public class MappingDataLoader {
                // Assign the changed value
                addConsumer.addTo(mappings, changedId, values[i]);
            }
-
-            // Fill the remainder
-            if (fillBetween && nextUnhandledId != size) {
-                for (int id = nextUnhandledId; id < size; id++) {
-                    addConsumer.addTo(mappings, id, id);
-                }
-            }
        } else if (strategy == IDENTITY_ID) {
            final IntTag sizeTag = tag.getIntTag("size");
            return new IdentityMappings(sizeTag.asInt(), mappedSize);
@@ -296,98 +270,15 @@ public class MappingDataLoader {
        return mappingsSupplier.create(mappings, mappedSize);
    }

-    /**
-     * Reads alternating id and value pairs from varints. The id as the difference to the previous id,
-     * the value as the zigzag difference to the previous value.
-     *
-     * @param tag tag to read the packed values from
-     * @return array of ids and array of values
-     */
-    private static ValuePairs readAtValuePairs(final CompoundTag tag) {
-        final ByteBuf buf = Unpooled.wrappedBuffer(tag.getByteArrayTag("val").getValue());
-        final IntList at = new IntArrayList();
-        final IntList values = new IntArrayList();
-        int prevAt = -1;
-        int prevValue = 0;
-        while (buf.isReadable()) {
-            prevAt = prevAt + 1 + Types.VAR_INT.readPrimitive(buf);
-            prevValue += readZigZagVarInt(buf);
-            at.add(prevAt);
-            values.add(prevValue);
-        }
-        return new ValuePairs(at.toIntArray(), values.toIntArray());
-    }
-
-    private static int readZigZagVarInt(final ByteBuf buf) {
-        // https://lemire.me/blog/2022/11/25/making-all-your-integers-positive-with-zigzag-encoding/
-        // In short, using deltas to previous ids makes the numbers small, and using zigzag encoding means they're all positive.
-        // Being all positive means we can use varints to make most of the data much shorter than 8 bytes.
-        // All of that combined ends up having a decent effect when compressed in the jar file as well.
-        final int value = Types.VAR_INT.readPrimitive(buf);
-        return (value >>> 1) ^ -(value & 1);
-    }
-
    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;
-            }
-
-            if (mappedGlobalId == -1) {
-                throw new IllegalArgumentException("Mapped global id -1 for unmapped global id: " + key + "/" + unmappedIdentifier + " (" + unmappedGlobalId + ")");
-            }
-
-            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 int size = mappings.size();
-        final List<String> identifiers = new ArrayList<>(size);
-        for (int i = 0; i < size; i++) {
-            final int globalId = mappings.getNewId(i);
-            identifiers.add(identifierFromGlobalId(key, globalId));
+        final List<String> identifiers = new ArrayList<>(mappings.size());
+        for (int i = 0; i < mappings.size(); i++) {
+            identifiers.add(identifierFromGlobalId(key, mappings.getNewId(i)));
        }
        return identifiers;
    }
@@ -451,18 +342,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);
-        }
-    }
-
-    private record ValuePairs(int[] first, int[] second) {
-    }
 }
@@ -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-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,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-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,16 +22,16 @@
 */
 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");
@@ -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-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,10 +23,7 @@
 package com.viaversion.viaversion.api.data.entity;

 import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
-import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.util.KeyMappings;
 import java.util.Map;
 import org.checkerframework.checker.nullness.qual.Nullable;

@@ -45,9 +42,8 @@ public interface EntityTracker {
     *
     * @param id   entity id
     * @param type entity type
-     * @return tracked entity
     */
-    TrackedEntity addEntity(int id, EntityType type);
+    void addEntity(int id, EntityType type);

    /**
     * Returns whether the entity is currently tracked.
@@ -78,9 +74,8 @@ public interface EntityTracker {
     * Untracks an entity.
     *
     * @param id entity id
-     * @return previously tracked entity
     */
-    @Nullable TrackedEntity removeEntity(int id);
+    void removeEntity(int id);

    /**
     * Clears stored entity types and data, only leaving behind the client entity.
@@ -92,6 +87,25 @@ public interface EntityTracker {
     */
    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.
+     *
+     * @param id entity id
+     * @return stored entity data if an entity with the id is tracked, else null
+     * @throws IllegalArgumentException if entity data storage has not been enabled via the implementation
+     */
+    @Nullable StoredEntityData entityData(int id);
+
+    /**
+     * Returns stored entity data if it has previously been initialized by {@link #entityData(int)}, else null.
+     *
+     * @param id entity id
+     * @return stored entity data if it has previously been initialized by {@link #entityData(int)}
+     * @throws IllegalArgumentException if entity data storage has not been enabled via the implementation
+     */
+    @Nullable StoredEntityData entityDataIfPresent(int id);
+
    /**
     * Returns whether the client entity id has been set.
     *
@@ -189,24 +203,6 @@ public interface EntityTracker {

    void setBiomesSent(int biomesSent);

-    /**
-     * Returns the cached chunk type for the current dimension if set.
-     *
-     * @param mapped whether to return the mapped chunk type
-     * @return cached chunk type
-     */
-    @Nullable Type<Chunk> chunkType(boolean mapped);
-
-    /**
-     * Caches the chunk type for the current dimension.
-     * <p>
-     * Invalidates when the world section height or the number of biomes change.
-     *
-     * @param mapped    whether to set the mapped chunk type
-     * @param chunkType chunk type
-     */
-    void setChunkType(boolean mapped, @Nullable Type<Chunk> chunkType);
-
    EntityType playerType();

    @Nullable DimensionData dimensionData(String dimension);
@@ -214,8 +210,4 @@ public interface EntityTracker {
    @Nullable DimensionData dimensionData(int dimensionId);

    void setDimensions(Map<String, DimensionData> dimensions);
-
-    @Nullable KeyMappings registryKeys(String registryKey);
-
-    void addRegistryKeys(String registryKey, KeyMappings mappings);
 }
@@ -0,0 +1,69 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.data.entity;
+
+import com.viaversion.viaversion.api.minecraft.entities.EntityType;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public interface StoredEntityData {
+
+    /**
+     * Returns the entity type of the stored entity.
+     *
+     * @return entity type
+     */
+    EntityType type();
+
+    /**
+     * Checks if the storage contains an object of the given type.
+     *
+     * @param objectClass object class to check
+     * @return whether an object of the given type is in the storage
+     */
+    boolean has(Class<?> objectClass);
+
+    /**
+     * Returns an object from the storage if present.
+     *
+     * @param objectClass class of the object to get
+     * @param <T>         object type
+     * @return object if present
+     */
+    @Nullable <T> T get(Class<T> objectClass);
+
+    /**
+     * Removes and returns an object from the storage if present.
+     *
+     * @param objectClass class of the object to remove
+     * @param <T>         object type
+     * @return removed object if present
+     */
+    @Nullable <T> T remove(Class<T> objectClass);
+
+    /**
+     * Stores an object based on its class.
+     *
+     * @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-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,9 +22,7 @@
 */
 package com.viaversion.viaversion.api.data.entity;

-import com.viaversion.viaversion.api.connection.StorableObject;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
-import org.checkerframework.checker.nullness.qual.Nullable;

 public interface TrackedEntity {

@@ -36,37 +34,18 @@ public interface TrackedEntity {
    EntityType entityType();

    /**
-     * Checks if the storage contains an object of the given type.
+     * Object to hold arbitrary additional data.
     *
-     * @param objectClass object class to check
-     * @return whether an object of the given type is in the storage
+     * @return entity data
     */
-    boolean has(Class<? extends StorableObject> objectClass);
+    StoredEntityData data();

    /**
-     * Returns an object from the storage if present.
+     * Returns whether the stored entity currently has any additional data.
     *
-     * @param objectClass class of the object to get
-     * @param <T>         object type
-     * @return object if present
+     * @return whether the stored entity currently has additional data
     */
-    @Nullable <T extends StorableObject> T get(Class<T> objectClass);
-
-    /**
-     * Removes and returns an object from the storage if present.
-     *
-     * @param objectClass class of the object to remove
-     * @param <T>         object type
-     * @return removed object if present
-     */
-    @Nullable <T extends StorableObject> T remove(Class<T> objectClass);
-
-    /**
-     * Stores an object based on its class.
-     *
-     * @param object object to store
-     */
-    void put(StorableObject object);
+    boolean hasData();

    /**
     * Returns whether entity data has already been sent at least once for this entity.
@@ -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-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -52,7 +52,7 @@ public interface DebugHandler {
    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
@@ -66,13 +66,6 @@ public interface DebugHandler {
     */
    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.
     */
@@ -128,12 +121,7 @@ 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) {
+    default void enableAndLogIds(final PacketType... packetTypes) {
        setEnabled(true);
        for (final PacketType packetType : packetTypes) {
            addPacketTypeToLog(packetType);
@@ -147,7 +135,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-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -31,8 +31,8 @@ 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
+ * @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) {

@@ -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-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -38,7 +38,7 @@ public interface EitherHolder<T> {
    /**
     * Returns an indirect holder via the resource key.
     *
-     * @param key the resource key
+     * @param key  the resource key
     * @param <T> the type of the value
     * @return a new holder with the given resource 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-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -20,22 +20,18 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 * SOFTWARE.
 */
-package com.viaversion.viaversion.api.platform;
+package com.viaversion.viaversion.api.minecraft;

 import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.item.Item;
+import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.util.Rewritable;

-/**
- * Netty encoder/decoder for a specific {@link UserConnection}.
- *
- * @see ViaInjector#getDecoderName()
- * @see ViaInjector#getEncoderName()
- */
-public interface ViaChannelHandler {
+public record EntityEquipment(int slot, Item item) implements Rewritable {

-    /**
-     * Returns the user connection of the injected Netty pipeline.
-     *
-     * @return the user connection
-     */
-    UserConnection connection();
+    @Override
+    public EntityEquipment rewrite(final UserConnection connection, final Protocol<?, ?, ?, ?> protocol, final boolean clientbound) {
+        final Item item = clientbound ? protocol.getItemRewriter().handleItemToClient(connection, this.item) : protocol.getItemRewriter().handleItemToServer(connection, this.item);
+        return new EntityEquipment(this.slot, 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-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,12 +22,11 @@
 */
 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.ToIntFunction;
+import java.util.function.Function;

 /**
 * Set of ids that either holds a string tag key or an array of ids.
@@ -41,7 +40,6 @@ public interface HolderSet {
     * @return a new holder set
     */
    static HolderSet of(final String tagKey) {
-        Preconditions.checkNotNull(tagKey);
        return new HolderSetImpl.Tag(tagKey);
    }

@@ -52,23 +50,22 @@ 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 ToIntFunction<String> mappingFunction) {
+    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.applyAsInt(stringTag.getValue());
+            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.applyAsInt(value);
+                ids[i] = mappingFunction.apply(value);
            }
            return HolderSet.of(ids);
        }
@@ -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-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -58,8 +58,8 @@ public record PaintingVariant(int width, int height, String assetId, @Nullable T
            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);
+            final Tag title = Types.OPTIONAL_TAG.read(buffer);
+            final Tag author = Types.OPTIONAL_TAG.read(buffer);
            return new PaintingVariant(width, height, assetId, title, author);
        }

@@ -68,8 +68,8 @@ public record PaintingVariant(int width, int height, String assetId, @Nullable T
            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());
+            Types.OPTIONAL_TAG.write(buffer, variant.title());
+            Types.OPTIONAL_TAG.write(buffer, variant.author());
        }

        @Override
@@ -79,8 +79,8 @@ public record PaintingVariant(int width, int height, String assetId, @Nullable T
                .write("width", Types.INT, value.width())
                .write("height", Types.INT, value.height())
                .write("asset_id", Types.IDENTIFIER, Key.of(value.assetId()))
-                .writeOptional("title", Types.TEXT_COMPONENT_TAG, value.title())
-                .writeOptional("author", Types.TEXT_COMPONENT_TAG, value.author()));
+                .writeOptional("title", Types.TAG, value.title())
+                .writeOptional("author", Types.TAG, value.author()));
        }

        @Override
@@ -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-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -34,7 +34,7 @@ import com.viaversion.viaversion.util.Key;
 */
 public interface RegistryKey {

-    Key registry();
+    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-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -34,16 +34,14 @@ public enum RegistryType implements RegistryKey {
    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.identifier, type);
        }
    }

@@ -55,18 +53,18 @@ public enum RegistryType implements RegistryKey {
        return MAP.get(identifier);
    }

-    private final Key key;
+    private final String identifier;

    RegistryType(final String identifier) {
-        this.key = Key.of(identifier);
+        this.identifier = identifier;
    }

    public String identifier() {
-        return key.path();
+        return identifier;
    }

    @Override
-    public Key registry() {
-        return this.key;
+    public Key key() {
+        return Key.of(identifier);
    }
 }
@@ -1,40 +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.EitherImpl;
-
-public final class ResolvableFloat extends EitherImpl<Float, String> {
-
-    private ResolvableFloat(final Float left, final String right) {
-        super(left, right);
-    }
-
-    public static ResolvableFloat of(final String value) {
-        return new ResolvableFloat(null, value);
-    }
-
-    public static ResolvableFloat of(final Float value) {
-        return new ResolvableFloat(value, null);
-    }
-}
@@ -1,40 +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.EitherImpl;
-
-public final class ResolvableInt extends EitherImpl<Integer, String> {
-
-    private ResolvableInt(final Integer left, final String right) {
-        super(left, right);
-    }
-
-    public static ResolvableInt of(final String value) {
-        return new ResolvableInt(null, value);
-    }
-
-    public static ResolvableInt of(final Integer value) {
-        return new ResolvableInt(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-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -24,10 +24,10 @@ package com.viaversion.viaversion.api.minecraft;

 import com.viaversion.viaversion.util.Key;

-record SimpleRegistryKey(Key registry) implements RegistryKey {
+record SimpleRegistryKey(Key key) implements RegistryKey {

    @Override
    public String toString() {
-        return registry.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-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -39,11 +39,4 @@ public record SoundEvent(String identifier, @Nullable Float fixedRange) {
        }
        return holder.updateId(soundRewriteFunction, () -> UNKNOWN);
    }
-
-    public static @Nullable Holder<SoundEvent> rewriteOptionalHolder(@Nullable final Holder<SoundEvent> holder, final Int2IntFunction soundRewriteFunction) {
-        if (holder == null) {
-            return null;
-        }
-        return holder.updateId(soundRewriteFunction, () -> 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-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2026 ViaVersion and contributors
+ * Copyright (C) 2016-2025 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal