Properly handle block change acknowledgements in 1.18.2 -> 1.19

2026-11-06 01:42:33 -05:00 · 2024-08-13 23:54:23 +02:00
948 changed files with 5350 additions and 18775 deletions
@@ -1,3 +1,2 @@
 github: kennytv
 patreon: kennytv
-custom: ['https://florianmichael.de/donate']
@@ -21,11 +21,10 @@ body:

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

@@ -52,7 +51,7 @@ body:
        List the steps on how we can reproduce the issue. Make sure we can easily understand what you mean with each step.
      placeholder: |
        Example:
-        1. Login with a 1.21.3 client
+        1. Login with a 1.13.2 client
        2. Place a sign
        3. The sign text is displayed wrong
    validations:
@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
@@ -12,10 +12,8 @@ jobs:
    steps:
    - name: Checkout Repository
      uses: actions/checkout@v4
-      with:
-        persist-credentials: false
-    - name: Set up Gradle
-      uses: gradle/actions/setup-gradle@v4
+    - name: Validate Gradle Wrapper
+      uses: gradle/actions/wrapper-validation@v4
    - name: Set up JDK 17
      uses: actions/setup-java@v4
      with:
@@ -24,10 +22,3 @@ jobs:
        check-latest: true
    - name: Build with Gradle
      run: ./gradlew build
-    - name: Upload Artifacts to GitHub
-      # Only upload on the preview repository as there is no CI job for it.
-      if: ${{ github.repository == 'ViaVersion/ViaVersionDev' && github.ref_name == 'preview' }}
-      uses: actions/upload-artifact@v4
-      with:
-        name: Artifacts
-        path: build/libs/
@@ -12,10 +12,8 @@ jobs:
    steps:
      - name: Checkout Repository
        uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@v4
+      - name: Validate Gradle Wrapper
+        uses: gradle/actions/wrapper-validation@v4
      - name: Set up JDK 17
        uses: actions/setup-java@v4
        with:
@@ -1,16 +0,0 @@
-name: Update Gradle Wrapper
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 0 * * 0"
-
-jobs:
-  update-gradle-wrapper:
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-      - name: Update Gradle Wrapper
-        uses: gradle-update/update-gradle-wrapper-action@v2
@@ -109,7 +109,4 @@ nb-configuration.xml
 .nb-gradle/

 ### MacOS ###
-.DS_Store
-
-### Run Folder (ViaProxy) ###
-common/run/
+.DS_Store
@@ -18,14 +18,7 @@ Supported Versions:

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

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

 Releases/Dev Builds
 --------
@@ -98,7 +91,8 @@ Resources

 - **[Via Mappings Generator](https://github.com/ViaVersion/Mappings)**
 - **[Mojang mappings](https://minecraft.wiki/w/Obfuscation_map)** (Thank you, Mojang, very cool)
- Previously: **[Burger](https://github.com/Pokechu22/Burger)** (see [PAaaS](https://github.com/Matsv/Paaas)) and **wiki.vg**
+- **[wiki.vg](https://wiki.vg)** (Used for historic information regarding packet structure, we also contribute back)
+- **[Burger](https://github.com/Pokechu22/Burger)** (See [PAaaS](https://github.com/Matsv/Paaas))

 License
 --------
@@ -19,12 +19,9 @@ dependencies {
    api(libs.vianbt) {
        exclude("it.unimi.dsi", "fastutil")
    }
-    api(libs.gson) {
-        exclude("com.google.errorprone", "error_prone_annotations")
-    }
+    api(libs.gson)
    implementation(rootProject.libs.text) {
        exclude("com.google.code.gson", "gson")
-        exclude("com.google.guava", "guava")
        exclude("com.viaversion", "nbt")
    }
    api(libs.snakeYaml)
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -114,8 +114,7 @@ public interface ViaAPI<T> {
    ProtocolVersion getPlayerProtocolVersion(UUID uuid);

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

    /**
-     * Returns whether Via injected into this player connection. Note that this method may not work on
-     * clientside implementations and is generally not recommended to be used. Use {@link ConnectionManager} instead.
+     * Returns the Via injected UserConnection if present.
     *
     * @param uuid uuid of the player
     * @return user connection if present
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -66,7 +66,7 @@ public interface ViaSubCommand {
     *
     * @param sender Command sender
     * @param args   Arguments
-     * @return commands executed successfully if false, show usage
+     * @return commands executed succesfully if false, show usage
     */
    boolean execute(ViaCommandSender sender, String[] args);

@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -30,7 +30,7 @@ public interface ViaVersionCommand {
     * Register your own subcommand inside ViaVersion
     *
     * @param command Your own SubCommand instance to handle it.
-     * @throws IllegalArgumentException throws an exception when the subcommand already exists or if it's not valid, example: space
+     * @throws IllegalArgumentException throws an exception when the subcommand already exists or if it's not valid, example: spacee
     */
    void registerSubCommand(ViaSubCommand command);

@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -464,18 +464,4 @@ public interface ViaVersionConfig extends Config {
     * @return true if enabled
     */
    boolean cancelBlockSounds();
-
-    /**
-     * Hides scoreboard numbers for 1.20.3+ clients on older server versions.
-     *
-     * @return true if enabled
-     */
-    boolean hideScoreboardNumbers();
-
-    /**
-     * Fixes 1.21+ clients on 1.20.5 servers placing water/lava buckets at the wrong location when moving fast.
-     *
-     * @return true if enabled
-     */
-    boolean fix1_21PlacementRotation();
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -28,81 +28,51 @@ import java.util.UUID;
 import org.checkerframework.checker.nullness.qual.Nullable;

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

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

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

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

    /**
-     * Returns the client UserConnection. See above for the connection types.
+     * Returns the UUID from the frontend connection to this proxy server
+     * Returns null when there isn't a server or this connection isn't frontend, or it doesn't have an id
     * When ViaVersion is reloaded, this method may not return some players.
     * <p>
     * Note that connections are removed as soon as their channel is closed,
     * so avoid using this method during player quits for example.
     *
-     * @return client UserConnection of the player or null
+     * @return UUID of the frontend connection to this proxy server
     */
-    @Nullable
-    UserConnection getClientConnection(UUID uuid);
-
-    /**
-     * Returns a map containing the UUIDs and server UserConnections
-     * When ViaVersion is reloaded, this method may not return some players.
-     *
-     * @return map containing the UUIDs and frontend UserConnections
-     */
-    Map<UUID, UserConnection> getServerConnections();
-
-    @Deprecated
-    default Map<UUID, UserConnection> getConnectedClients() {
-        return getServerConnections();
-    }
-
-    /**
-     * Returns a map containing the UUIDs and client UserConnections
-     * When ViaVersion is reloaded, this method may not return some players.
-     *
-     * @return map containing the UUIDs and client UserConnections
-     */
-    Map<UUID, UserConnection> getClientConnections();
+    @Nullable UUID getConnectedClientId(UserConnection connection);

    /**
     * Returns all UserConnections which are registered
@@ -114,6 +84,15 @@ public interface ConnectionManager {
     */
    Set<UserConnection> getConnections();

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

    void onDisconnect(UserConnection connection);
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -142,4 +142,4 @@ public interface ProtocolInfo {
    ProtocolPipeline getPipeline();

    void setPipeline(ProtocolPipeline pipeline);
-}
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -29,11 +29,6 @@ public abstract class StoredObject implements StorableObject {
        this.user = user;
    }

-    public UserConnection user() {
-        return this.user;
-    }
-
-    @Deprecated
    public UserConnection getUser() {
        return user;
    }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -24,7 +24,6 @@ package com.viaversion.viaversion.api.connection;

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

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

    /**
-     * Clear stored objects, entity trackers and client worlds.
+     * Clear stored objects and entity trackers.
     * If cleared for a proxy server switch, some stored objects and tracker data will be retained.
     *
     * @param isServerSwitch whether the clear is due to a server switch
@@ -319,35 +299,23 @@ public interface UserConnection {
    void setPendingDisconnect(boolean pendingDisconnect);

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

-    /**
-     * Returns whether this is a frontend connection.
-     * This is a plugin integrated into the server, or for example a frontend Velocity connection.
-     *
-     * @return whether this is a frontend connection
-     */
-    default boolean isServerSide() {
-        return !isClientSide();
-    }
-
    /**
     * Returns whether {@link ViaVersionConfig#blockedProtocolVersions()} should be checked for this connection.
     *
     * @return whether blocked protocols should be applied
     */
-    default boolean shouldApplyBlockProtocol() {
-        return isServerSide();
-    }
+    boolean shouldApplyBlockProtocol();

    /**
     * Returns a newly generated uuid that will let a packet be passed through without
-     * transforming its contents if used together with {@link PacketWrapper#PASSTHROUGH_ID}.
+     * transformig its contents if used together with {@link PacketWrapper#PASSTHROUGH_ID}.
     *
     * @return generated passthrough token
     */
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -53,14 +53,6 @@ public interface FullMappings extends BiMappings {
     */
    @Nullable String identifier(int id);

-    /**
-     * Returns the unmapped string identifier for the given mapped identifier.
-     *
-     * @param mappedIdentifier mapped identifier
-     * @return unmapped string identifier, or null if not found
-     */
-    @Nullable String identifier(String mappedIdentifier);
-
    /**
     * Returns the mapped string identifier for the given mapped id.
     *
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -84,18 +84,7 @@ public class FullMappingsBase implements FullMappings {
    }

    @Override
-    public @Nullable String identifier(final String mappedIdentifier) {
-        final int mappedId = mappedId(mappedIdentifier);
-        if (mappedId == -1) {
-            return null;
-        }
-
-        final int id = mappings.inverse().getNewId(mappedId);
-        return id != -1 ? identifier(id) : null;
-    }
-
-    @Override
-    public @Nullable String mappedIdentifier(final int mappedId) {
+    public String mappedIdentifier(final int mappedId) {
        if (mappedId < 0 || mappedId >= mappedIdToString.length) {
            return null;
        }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -35,84 +35,54 @@ public interface MappingData {
    void load();

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

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

-    /**
-     * Returns the backwards mapped block id, or 1 if unmapped.
-     *
-     * @param id mapped block id
-     * @return backwards mapped block id, or 1 if unmapped
-     */
    int getOldBlockId(int id);

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

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

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

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

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

    @Nullable Mappings getEnchantmentMappings();

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

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

    @Nullable FullMappings getEntityMappings();

@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -43,10 +43,10 @@ public class MappingDataBase implements MappingData {
    protected FullMappings entityMappings;
    protected FullMappings recipeSerializerMappings;
    protected FullMappings itemDataSerializerMappings;
-    protected FullMappings attributeMappings;
    protected ParticleMappings particleMappings;
    protected BiMappings itemMappings;
    protected BiMappings blockMappings;
+    protected BiMappings attributeMappings;
    protected Mappings blockStateMappings;
    protected Mappings blockEntityMappings;
    protected Mappings soundMappings;
@@ -76,6 +76,8 @@ public class MappingDataBase implements MappingData {
        menuMappings = loadMappings(data, "menus");
        enchantmentMappings = loadMappings(data, "enchantments");
        paintingMappings = loadMappings(data, "paintings");
+        attributeMappings = loadBiMappings(data, "attributes");
+

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

            final List<String> unmappedParticles = identifiersFromGlobalIds(unmappedIdentifierData, "particles");
            final List<String> mappedParticles = identifiersFromGlobalIds(mappedIdentifierData, "particles");
@@ -179,7 +180,7 @@ public class MappingDataBase implements MappingData {

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

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

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

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

@@ -324,4 +315,4 @@ public class MappingDataBase implements MappingData {

    protected void loadExtras(final CompoundTag data) {
    }
-}
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -30,6 +30,7 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonSyntaxException;
 import com.viaversion.nbt.io.NBTIO;
 import com.viaversion.nbt.io.TagReader;
+import com.viaversion.nbt.tag.ByteTag;
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.nbt.tag.IntArrayTag;
 import com.viaversion.nbt.tag.IntTag;
@@ -210,64 +211,68 @@ public class MappingDataLoader {
            return null;
        }

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

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

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

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

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

    public @Nullable List<String> identifiersFromGlobalIds(final CompoundTag mappingsTag, final String key) {
@@ -290,7 +295,7 @@ public class MappingDataLoader {
     * @return map with indexes hashed by their id value
     */
    public Object2IntMap<String> indexedObjectToMap(final JsonObject object) {
-        final Object2IntMap<String> map = new Object2IntOpenHashMap<>(object.size());
+        final Object2IntMap<String> map = new Object2IntOpenHashMap<>(object.size(), .99F);
        map.defaultReturnValue(-1);
        for (final Map.Entry<String, JsonElement> entry : object.entrySet()) {
            map.put(entry.getValue().getAsString(), Integer.parseInt(entry.getKey()));
@@ -305,7 +310,7 @@ public class MappingDataLoader {
     * @return map with indexes hashed by their id value
     */
    public Object2IntMap<String> arrayToMap(final JsonArray array) {
-        final Object2IntMap<String> map = new Object2IntOpenHashMap<>(array.size());
+        final Object2IntMap<String> map = new Object2IntOpenHashMap<>(array.size(), .99F);
        map.defaultReturnValue(-1);
        for (int i = 0; i < array.size(); i++) {
            map.put(array.get(i).getAsString(), i);
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -36,7 +36,6 @@ public class ParticleMappings extends FullMappingsBase {
        addBlockParticle("falling_dust");
        addBlockParticle("block_marker");
        addBlockParticle("dust_pillar");
-        addBlockParticle("block_crumble");
        addItemParticle("item");
    }

@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -78,7 +78,7 @@ public interface EntityTracker {
    void removeEntity(int id);

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

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

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

    /**
     * Sets the client entity id.
@@ -123,20 +115,6 @@ public interface EntityTracker {
     */
    void setClientEntityId(int clientEntityId);

-    /**
-     * Returns whether the client player has the "insta build" ability, usually from creative mode.
-     *
-     * @return whether the client player can insta build
-     */
-    boolean canInstaBuild();
-
-    /**
-     * Sets whether the client player has the "insta build" ability, usually from creative mode.
-     *
-     * @param instaBuild whether the client player can insta build
-     */
-    void setInstaBuild(boolean instaBuild);
-
    /**
     * Returns the current world section height (block height / 16).
     * This is always 16 for sub 1.17 worlds.
@@ -191,4 +169,12 @@ public interface EntityTracker {
    @Nullable DimensionData dimensionData(int dimensionId);

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

    void sentEntityData(boolean sentEntityData);
-}
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,6 +22,7 @@
 */
 package com.viaversion.viaversion.api.debug;

+import com.google.common.annotations.Beta;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.protocol.packet.Direction;
 import com.viaversion.viaversion.api.protocol.packet.PacketType;
@@ -49,6 +50,7 @@ public interface DebugHandler {
     *
     * @param packetTypeName packet type name
     */
+    @Beta
    void addPacketTypeNameToLog(String packetTypeName);

    /**
@@ -57,6 +59,7 @@ public interface DebugHandler {
     *
     * @param packetType packet type
     */
+    @Beta
    void addPacketTypeToLog(PacketType packetType);

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

    /**
     * Resets packet type filters.
     */
+    @Beta
    void clearPacketTypesToLog();

-    /**
-     * Sets whether packets should be logged before and after being transformed.
-     *
-     * @param logPacketTransform whether packets should be logged
-     */
-    default void setLogPacketTransform(boolean logPacketTransform) {
-        setLogPrePacketTransform(logPacketTransform);
-        setLogPostPacketTransform(logPacketTransform);
-    }
-
-    /**
-     * Returns whether packets should be logged before being transformed.
-     * Set to true by default.
-     *
-     * @return whether packets should be logged before being transformed
-     */
-    boolean logPrePacketTransform();
-
-    /**
-     * Sets whether packets should be logged before being transformed.
-     *
-     * @param logPrePacketTransform whether packets should be logged before being transformed
-     */
-    void setLogPrePacketTransform(boolean logPrePacketTransform);
-
    /**
     * Returns whether packets should be logged after being transformed.
-     * Set to false by default.
+     * Set to true by default.
     *
     * @return whether packets should be logged after being transformed
     */
+    @Beta
    boolean logPostPacketTransform();

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

    /**
@@ -121,6 +103,7 @@ public interface DebugHandler {
     */
    boolean shouldLog(PacketWrapper wrapper, Direction direction);

+    @Beta
    default void enableAndLogIds(final PacketType... packetTypes) {
        setEnabled(true);
        for (final PacketType packetType : packetTypes) {
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,55 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.viaversion.viaversion.api.minecraft;
-
-import com.viaversion.viaversion.api.type.Types;
-import com.viaversion.viaversion.api.type.types.misc.HolderType;
-import io.netty.buffer.ByteBuf;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
-/**
- * Represents an animal variant (e.g. for cows, pigs, chickens).
- *
- * @param modelType model type id
- * @param texture texture path
- * @param biomes biomes this variant can spawn in, if limited to specific biomes
- */
-public record AnimalVariant(int modelType, String texture, @Nullable HolderSet biomes) {
-
-    public static HolderType<AnimalVariant> TYPE = new HolderType<>() {
-        @Override
-        public AnimalVariant readDirect(final ByteBuf buffer) {
-            final int modelType = Types.VAR_INT.readPrimitive(buffer);
-            final String texture = Types.STRING.read(buffer);
-            final HolderSet biomes = Types.OPTIONAL_HOLDER_SET.read(buffer);
-            return new AnimalVariant(modelType, texture, biomes);
-        }
-
-        @Override
-        public void writeDirect(final ByteBuf buffer, final AnimalVariant variant) {
-            Types.VAR_INT.writePrimitive(buffer, variant.modelType());
-            Types.STRING.write(buffer, variant.texture());
-            Types.OPTIONAL_HOLDER_SET.write(buffer, variant.biomes());
-        }
-    };
-}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -65,4 +65,4 @@ public interface BlockChangeRecord {
    int getBlockId();

    void setBlockId(int blockId);
-}
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -58,7 +58,7 @@ public class BlockChangeRecord1_16_2 implements BlockChangeRecord {

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

@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -37,13 +37,6 @@ public class BlockPosition {
        return new BlockPosition(x + face.modX(), y + face.modY(), z + face.modZ());
    }

-    public double distanceFromCenterSquared(final double x, final double y, final double z) {
-        final double dx = this.x + 0.5 - x;
-        final double dy = this.y + 0.5 - y;
-        final double dz = this.z + 0.5 - z;
-        return dx * dx + dy * dy + dz * dz;
-    }
-
    public int x() {
        return x;
    }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -66,17 +66,6 @@ public final class ChunkPosition {
        return (long) chunkX & 0xffffffffL | ((long) chunkZ & 0xffffffffL) << 32;
    }

-    /**
-     * Returns a long key for the given block coordinates.
-     *
-     * @param x the block X coordinate
-     * @param z the block Z coordinate
-     * @return the chunk key
-     */
-    public static long chunkKeyForBlock(final int x, final int z) {
-        return chunkKey(x >> 4, z >> 4);
-    }
-
    @Override
    public boolean equals(final Object o) {
        if (this == o) return true;
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,12 +23,13 @@
 package com.viaversion.viaversion.api.minecraft;

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

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

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

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

-    /**
-     * Sets the environment of the world and returns whether the environment was changed.
-     *
-     * @param environmentId the id of the environment to set
-     * @return whether the environment was changed
-     */
-    public boolean setEnvironment(final int environmentId) {
-        final int previousEnvironmentId = environment.id();
+    public void setEnvironment(final int environmentId) {
        this.environment = Environment.getEnvironmentById(environmentId);
-
-        return previousEnvironmentId != environmentId;
    }
 }
@@ -1,82 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.viaversion.viaversion.api.minecraft;
-
-public interface EitherHolder<T> {
-
-    /**
-     * Returns a direct or indirect value holder.
-     *
-     * @param value the value
-     * @param <T>   the type of the value
-     * @return a new direct holder
-     */
-    static <T> EitherHolder<T> of(final Holder<T> value) {
-        return new EitherHolderImpl<>(value, null);
-    }
-
-    /**
-     * Returns an indirect holder via the resource key.
-     *
-     * @param key  the resource key
-     * @param <T> the type of the value
-     * @return a new holder with the given resource key
-     */
-    static <T> EitherHolder<T> of(final String key) {
-        return new EitherHolderImpl<>(null, key);
-    }
-
-    /**
-     * Returns true if this holder is backed by a direct value.
-     *
-     * @return true if the holder is direct
-     * @see #hasKey()
-     */
-    boolean hasHolder();
-
-    /**
-     * Returns true if this holder has a resource key.
-     *
-     * @return true if this holder has a resource key
-     * @see #hasHolder()
-     */
-    boolean hasKey();
-
-    /**
-     * Returns the value of this holder.
-     *
-     * @return the value of this holder
-     * @throws IllegalArgumentException if this contains a resource key instead of a holder
-     * @see #hasHolder()
-     */
-    Holder<T> holder();
-
-    /**
-     * Returns the resource key.
-     *
-     * @return the resource key
-     * @throws IllegalArgumentException if this contains a holder instead of a resource key
-     * @see #hasKey()
-     */
-    String key();
-}
@@ -1,55 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.viaversion.viaversion.api.minecraft;
-
-import com.google.common.base.Preconditions;
-import com.viaversion.viaversion.util.EitherImpl;
-
-final class EitherHolderImpl<T> extends EitherImpl<Holder<T>, String> implements EitherHolder<T> {
-
-    EitherHolderImpl(final Holder<T> left, final String value) {
-        super(left, value);
-    }
-
-    @Override
-    public boolean hasHolder() {
-        return isLeft();
-    }
-
-    @Override
-    public boolean hasKey() {
-        return isRight();
-    }
-
-    @Override
-    public Holder<T> holder() {
-        Preconditions.checkArgument(hasHolder(), "Either does not have a holder");
-        return left();
-    }
-
-    @Override
-    public String key() {
-        Preconditions.checkArgument(hasKey(), "Either does not have a key");
-        return right();
-    }
-}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -24,28 +24,22 @@ package com.viaversion.viaversion.api.minecraft;

 public enum GameMode {

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

    private final String text;
-    private final int id;

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

    public String text() {
        return text;
    }

-    public int id() {
-        return id;
-    }
-
    public static GameMode getById(int id) {
        return switch (id) {
            case -1 -> NOT_SET;
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,8 +22,6 @@
 */
 package com.viaversion.viaversion.api.minecraft;

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

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

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

    /**
@@ -81,12 +79,4 @@ public interface Holder<T> {
     * @see #hasId()
     */
    int id();
-
-    /**
-     * Returns a new holder with the id rewritten using the given function, or self if this is a direct holder or the id did not change.
-     *
-     * @param rewriteFunction the function to rewrite the id
-     * @return a new holder with the id rewritten, or self
-     */
-    Holder<T> updateId(final Int2IntFunction rewriteFunction);
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,38 +23,49 @@
 package com.viaversion.viaversion.api.minecraft;

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

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

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

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

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

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

    @Override
-    public Holder<T> updateId(final Int2IntFunction rewriteFunction) {
-        final int rewrittenId = rewriteFunction.applyAsInt(id);
-        if (rewrittenId == id) {
-            return this;
-        }
-        if (rewrittenId == -1) {
-            throw new IllegalArgumentException("Received invalid id in updateId");
-        }
-        return Holder.of(rewrittenId);
+    public int id() {
+        return id;
+    }
+
+    @Override
+    public String toString() {
+        return "HolderImpl{" +
+            "value=" + value +
+            ", id=" + id +
+            '}';
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -36,7 +36,7 @@ public interface HolderSet {
     * @return a new holder set
     */
    static HolderSet of(final String tagKey) {
-        return new HolderSetImpl.Tag(tagKey);
+        return new HolderSetImpl(tagKey);
    }

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

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

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

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

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

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

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

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

-    record Ids(int[] ids) implements HolderSet {
-        @Override
-        public boolean hasTagKey() {
-            return false;
-        }
-
-        @Override
-        public String tagKey() {
-            throw new IllegalArgumentException("This holder set has direct ids");
-        }
-
-        @Override
-        public boolean hasIds() {
-            return true;
-        }
-
-        @Override
-        public HolderSet rewrite(final Int2IntFunction idRewriter) {
-            final int[] mappedIds = new int[ids.length];
-            for (int i = 0; i < mappedIds.length; i++) {
-                mappedIds[i] = idRewriter.applyAsInt(ids[i]);
-            }
-            return new Ids(mappedIds);
-        }
-
-        @Override
-        public String toString() {
-            return "Ids{" +
-                "ids=" + Arrays.toString(ids) +
-                '}';
+        final int[] ids = ids();
+        final int[] mappedIds = new int[ids.length];
+        for (int i = 0; i < mappedIds.length; i++) {
+            mappedIds[i] = idRewriter.apply(ids[i]);
        }
+        return new HolderSetImpl(mappedIds);
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,19 +22,13 @@
 */
 package com.viaversion.viaversion.api.minecraft;

-import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.misc.HolderType;
 import io.netty.buffer.ByteBuf;
-import org.checkerframework.checker.nullness.qual.Nullable;

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

-    public PaintingVariant(final int width, final int height, final String assetId) {
-        this(width, height, assetId, null, null);
-    }
-
-    public static HolderType<PaintingVariant> TYPE1_21 = new HolderType<>() {
+    public static HolderType<PaintingVariant> TYPE = new HolderType<>() {
        @Override
        public PaintingVariant readDirect(final ByteBuf buffer) {
            final int width = Types.VAR_INT.readPrimitive(buffer);
@@ -50,24 +44,4 @@ public record PaintingVariant(int width, int height, String assetId, @Nullable T
            Types.STRING.write(buffer, variant.assetId());
        }
    };
-    public static HolderType<PaintingVariant> TYPE1_21_2 = new HolderType<>() {
-        @Override
-        public PaintingVariant readDirect(final ByteBuf buffer) {
-            final int width = Types.VAR_INT.readPrimitive(buffer);
-            final int height = Types.VAR_INT.readPrimitive(buffer);
-            final String assetId = Types.STRING.read(buffer);
-            final Tag title = Types.OPTIONAL_TAG.read(buffer);
-            final Tag author = Types.OPTIONAL_TAG.read(buffer);
-            return new PaintingVariant(width, height, assetId, title, author);
-        }
-
-        @Override
-        public void writeDirect(final ByteBuf buffer, final PaintingVariant variant) {
-            Types.VAR_INT.writePrimitive(buffer, variant.width());
-            Types.VAR_INT.writePrimitive(buffer, variant.height());
-            Types.STRING.write(buffer, variant.assetId());
-            Types.OPTIONAL_TAG.write(buffer, variant.title());
-            Types.OPTIONAL_TAG.write(buffer, variant.author());
-        }
-    };
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -24,13 +24,12 @@ package com.viaversion.viaversion.api.minecraft;

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

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

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

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

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

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

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

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

 /**
@@ -32,14 +31,9 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 * @param key key of the registry entry
 * @param tag data of the registry entry, or null if the client should use its default
 */
-public record RegistryEntry(String key, @Nullable Tag tag) implements Copyable {
+public record RegistryEntry(String key, @Nullable Tag tag) {

    public RegistryEntry withKey(final String key) {
        return new RegistryEntry(key, tag != null ? tag.copy() : null);
    }
-
-    @Override
-    public RegistryEntry copy() {
-        return new RegistryEntry(key, tag != null ? tag.copy() : null);
-    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,48 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.viaversion.viaversion.api.minecraft;
-
-import it.unimi.dsi.fastutil.ints.Int2IntFunction;
-
-record ValueHolder<T>(T value) implements Holder<T> {
-
-    @Override
-    public boolean isDirect() {
-        return true;
-    }
-
-    @Override
-    public boolean hasId() {
-        return false;
-    }
-
-    @Override
-    public int id() {
-        return -1;
-    }
-
-    @Override
-    public Holder<T> updateId(final Int2IntFunction rewriteFunction) {
-        return this;
-    }
-}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -143,16 +143,6 @@ public class BaseChunk implements Chunk {
        this.heightMap = heightMap;
    }

-    @Override
-    public Heightmap[] heightmaps() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void setHeightmaps(final Heightmap[] heightmaps) {
-        throw new UnsupportedOperationException();
-    }
-
    @Override
    public List<CompoundTag> getBlockEntities() {
        return blockEntities;
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -79,8 +79,7 @@ public interface Chunk {
     * @return chunk section bit mask, only non-null for 1.17+ chunks
     * @see #getBitmask()
     */
-    @Nullable
-    BitSet getChunkMask();
+    @Nullable BitSet getChunkMask();

    void setChunkMask(BitSet chunkSectionMask);

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

    void setSections(ChunkSection[] sections);

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

    void setHeightMap(@Nullable CompoundTag heightMap);

-    Heightmap[] heightmaps();
-
-    void setHeightmaps(Heightmap[] heightmaps);
-
    /**
     * Returns a list of block entities.
     *
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -123,16 +123,6 @@ public class Chunk1_18 implements Chunk {
        this.heightMap = heightMap;
    }

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

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

@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -35,7 +35,7 @@ public interface ChunkSectionLight {
    /**
     * Returns whether the section has sky light.
     *
-     * @return true if sky light is present
+     * @return true if skylight is present
     */
    boolean hasSkyLight();

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

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

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

    @Override
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,26 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.viaversion.viaversion.api.minecraft.chunks;
-
-public record Heightmap(int type, long[] data) {
-}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -41,4 +41,4 @@ public enum PaletteType {
    public int highestBitsPerValue() {
        return highestBitsPerValue;
    }
-}
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -53,11 +53,6 @@ final class EmptyStructuredData<T> implements StructuredData<T> {
        return this.key;
    }

-    @Override
-    public StructuredData<T> copy() {
-        return new EmptyStructuredData<>(this.key, this.id);
-    }
-
    @Override
    public T value() {
        return null;
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -59,11 +59,6 @@ final class FilledStructuredData<T> implements StructuredData<T> {
        return key;
    }

-    @Override
-    public StructuredData<T> copy() {
-        return new FilledStructuredData<>(this.key, this.copy(this.value), this.id);
-    }
-
    @Override
    public T value() {
        return value;
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,12 +22,11 @@
 */
 package com.viaversion.viaversion.api.minecraft.data;

-import com.viaversion.viaversion.util.Copyable;
 import com.viaversion.viaversion.util.IdHolder;
 import io.netty.buffer.ByteBuf;
 import org.checkerframework.checker.nullness.qual.Nullable;

-public interface StructuredData<T> extends IdHolder, Copyable {
+public interface StructuredData<T> extends IdHolder {

    /**
     * Returns filled structured data, equivalent to an Optional with a value in vanilla.
@@ -53,17 +52,15 @@ public interface StructuredData<T> extends IdHolder, Copyable {
        return new EmptyStructuredData<>(key, id);
    }

-    @Nullable
-    T value();
-
    void setValue(final T value);

+    void write(final ByteBuf buffer);
+
    void setId(final int id);

    StructuredDataKey<T> key();

-    @Override
-    StructuredData<T> copy();
+    @Nullable T value();

    /**
     * Returns whether the structured data is present. Even if true, the value may be null.
@@ -80,6 +77,4 @@ public interface StructuredData<T> extends IdHolder, Copyable {
     * @return true if the structured data is empty
     */
    boolean isEmpty();
-
-    void write(final ByteBuf buffer);
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2025 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -26,36 +26,14 @@ import com.google.common.base.Preconditions;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.data.FullMappings;
 import com.viaversion.viaversion.api.protocol.Protocol;
-import com.viaversion.viaversion.util.Copyable;
 import com.viaversion.viaversion.util.Unit;
 import it.unimi.dsi.fastutil.ints.Int2IntFunction;
 import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap;
-import java.util.Collection;
 import java.util.Map;
 import java.util.function.Function;
 import org.checkerframework.checker.nullness.qual.Nullable;

-/**
- * Loosely represents Minecraft's data component patch, but may also be used for an item's full data components.
- * <p>
- * The most commonly used methods will ignore empty data (aka empty overrides that remove item defaults) since those will rarely be needed.
- * These are:
- * <ul>
- *     <li>{@link #get(StructuredDataKey)}</li>
- *     <li>{@link #set(StructuredDataKey, Object)}</li>
- *     <li>{@link #set(StructuredDataKey)}</li>
- *     <li>{@link #getNonEmptyData(StructuredDataKey)}</li>
- *     <li>{@link #hasValue(StructuredDataKey)}</li>
- * </ul>
- *
- * To interact with empty patches specifically, use:
- * <ul>
- *     <li>{@link #setEmpty(StructuredDataKey)}</li>
- *     <li>{@link #hasEmpty(StructuredDataKey)}</li>
- * </ul>
- * Other methods (e.g. {@link #getData(StructuredDataKey)} and {@link #has(StructuredDataKey)}) will handle both empty and non-empty data.
- */
-public final class StructuredDataContainer implements Copyable {
+public final class StructuredDataContainer {

    private final Map<StructuredDataKey<?>, StructuredData<?>> data;
    private FullMappings lookup;
@@ -73,49 +51,70 @@ public final class StructuredDataContainer implements Copyable {
    }

    public StructuredDataContainer() {
-        this(new Reference2ObjectOpenHashMap<>(0));
+        this(new Reference2ObjectOpenHashMap<>());
    }

    /**
-     * Returns the non-empty value by id if present.
-     *
-     * @param key serializer id
-     * @param <T> data type
-     * @return structured data
-     * @see #hasEmpty(StructuredDataKey)
-     */
-    public @Nullable <T> T get(final StructuredDataKey<T> key) {
-        final StructuredData<?> data = this.data.get(key);
-        if (data == null || data.isEmpty()) {
-            return null;
-        }
-        //noinspection unchecked
-        return ((StructuredData<T>) data).value();
-    }
-
-    /**
-     * Returns structured data by id if present, either empty or non-empty.
+     * Returns structured data by id if present.
     *
     * @param key serializer id
     * @param <T> data type
     * @return structured data
     */
-    public @Nullable <T> StructuredData<T> getData(final StructuredDataKey<T> key) {
+    public @Nullable <T> StructuredData<T> get(final StructuredDataKey<T> key) {
        //noinspection unchecked
        return (StructuredData<T>) this.data.get(key);
    }

    /**
-     * Returns non-empty structured data by id if present.
+     * Returns structured data by id if not empty.
     *
     * @param key serializer id
     * @param <T> data type
-     * @return non-empty structured data
+     * @return structured data if not empty
     */
-    public @Nullable <T> StructuredData<T> getNonEmptyData(final StructuredDataKey<T> key) {
-        final StructuredData<?> data = this.data.get(key);
+    public @Nullable <T> StructuredData<T> getNonEmpty(final StructuredDataKey<T> key) {
        //noinspection unchecked
-        return data != null && data.isPresent() ? (StructuredData<T>) data : null;
+        final StructuredData<T> data = (StructuredData<T>) this.data.get(key);
+        return data != null && data.isPresent() ? data : null;
+    }
+
+    /**
+     * Returns structured data by id if not empty, or creates it.
+     *
+     * @param key             serializer id
+     * @param mappingFunction function to create structured data if not present
+     * @param <T>             data type
+     * @return structured data if not empty
+     */
+    public <T> StructuredData<T> computeIfAbsent(final StructuredDataKey<T> key, final Function<StructuredDataKey<T>, T> mappingFunction) {
+        final StructuredData<T> data = this.getNonEmpty(key);
+        if (data != null) {
+            return data;
+        }
+
+        final int id = serializerId(key);
+        final StructuredData<T> empty = StructuredData.of(key, mappingFunction.apply(key), id);
+        this.data.put(key, empty);
+        return empty;
+    }
+
+    /**
+     * Updates and returns the structured data by id if not empty.
+     *
+     * @param key             serializer id
+     * @param mappingFunction function to update existing data
+     * @param <T>             data type
+     * @return updated structured data if not empty
+     */
+    public <T> @Nullable StructuredData<T> updateIfPresent(final StructuredDataKey<T> key, final Function<T, T> mappingFunction) {
+        final StructuredData<T> data = this.getNonEmpty(key);
+        if (data == null) {
+            return null;
+        }
+
+        data.setValue(mappingFunction.apply(data.value()));
+        return data;
    }

    public <T> void set(final StructuredDataKey<T> key, final T value) {
@@ -125,119 +124,49 @@ public final class StructuredDataContainer implements Copyable {
        }
    }

-    public void set(final StructuredDataKey<Unit> key) {
-        this.set(key, Unit.INSTANCE);
-    }
-
-    public void setEmpty(final StructuredDataKey<?> key) {
-        // Empty optional to override the Minecraft default
-        this.data.put(key, StructuredData.empty(key, serializerId(key)));
-    }
-
-    /**
-     * Updates the structured data by id if not empty.
-     *
-     * @param key         serializer id
-     * @param valueMapper function to update existing data
-     * @param <T>         data type
-     */
-    public <T> void replace(final StructuredDataKey<T> key, final Function<T, @Nullable T> valueMapper) {
-        final StructuredData<T> data = this.getNonEmptyData(key);
-        if (data == null) {
-            return;
-        }
-
-        final T replacement = valueMapper.apply(data.value());
-        if (replacement != null) {
-            data.setValue(replacement);
-        } else {
-            this.data.remove(key);
-        }
-    }
-
    public <T> void replaceKey(final StructuredDataKey<T> key, final StructuredDataKey<T> toKey) {
        replace(key, toKey, Function.identity());
    }

-    public <T, V> void replace(final StructuredDataKey<T> key, final StructuredDataKey<V> toKey, final Function<T, @Nullable V> valueMapper) {
-        final StructuredData<?> data = this.data.remove(key);
+    public <T, V> void replace(final StructuredDataKey<T> key, final StructuredDataKey<V> toKey, final Function<T, V> valueMapper) {
+        final StructuredData<T> data = remove(key);
        if (data == null) {
            return;
        }

        if (data.isPresent()) {
-            //noinspection unchecked
-            final T value = (T) data.value();
-            final V replacement = valueMapper.apply(value);
-            if (replacement != null) {
-                set(toKey, replacement);
-            }
+            set(toKey, valueMapper.apply(data.value()));
        } else {
-            // Also replace the key for empty data
-            setEmpty(toKey);
+            addEmpty(toKey);
        }
    }

-    /**
-     * Removes data by the given key.
-     *
-     * @param key data key
-     * @see #replace(StructuredDataKey, Function)
-     * @see #replace(StructuredDataKey, StructuredDataKey, Function)
-     * @see #replaceKey(StructuredDataKey, StructuredDataKey)
-     */
-    public void remove(final StructuredDataKey<?> key) {
-        this.data.remove(key);
+    public void set(final StructuredDataKey<Unit> key) {
+        this.set(key, Unit.INSTANCE);
+    }
+
+    public void addEmpty(final StructuredDataKey<?> key) {
+        // Empty optional to override the Minecraft default
+        this.data.put(key, StructuredData.empty(key, serializerId(key)));
    }

    /**
-     * Removes data by the given keys.
+     * Removes and returns structured data by the given key.
     *
-     * @param keys data keys
-     * @see #replace(StructuredDataKey, Function)
-     * @see #replace(StructuredDataKey, StructuredDataKey, Function)
-     * @see #replaceKey(StructuredDataKey, StructuredDataKey)
+     * @param key serializer key
+     * @param <T> data type
+     * @return removed structured data
     */
-    public void remove(final Collection<StructuredDataKey<?>> keys) {
-        for (final StructuredDataKey<?> key : keys) {
-            this.data.remove(key);
-        }
+    public @Nullable <T> StructuredData<T> remove(final StructuredDataKey<T> key) {
+        final StructuredData<?> data = this.data.remove(key);
+        //noinspection unchecked
+        return data != null ? (StructuredData<T>) data : null;
    }

-    /**
-     * Returns whether there is data for the given key, either empty or non-empty.
-     *
-     * @param key data key
-     * @return whether there data for the given key
-     * @see #hasEmpty(StructuredDataKey)
-     * @see #hasValue(StructuredDataKey)
-     */
-    public boolean has(final StructuredDataKey<?> key) {
+    public boolean contains(final StructuredDataKey<?> key) {
        return this.data.containsKey(key);
    }

-    /**
-     * Returns whether there is non-empty data for the given key.
-     *
-     * @param key data key
-     * @return whether there is non-empty data for the given key
-     */
-    public boolean hasValue(final StructuredDataKey<?> key) {
-        final StructuredData<?> data = this.data.get(key);
-        return data != null && data.isPresent();
-    }
-
-    /**
-     * Returns whether the structured data has an empty patch/override.
-     *
-     * @param key serializer id
-     * @return whether the structured data has an empty patch/override
-     */
-    public boolean hasEmpty(final StructuredDataKey<?> key) {
-        final StructuredData<?> data = this.data.get(key);
-        return data != null && data.isEmpty();
-    }
-
    /**
     * Sets the lookup for serializer ids. Required to call most of the other methods.
     *
@@ -261,13 +190,8 @@ public final class StructuredDataContainer implements Copyable {
        }
    }

-    @Override
    public StructuredDataContainer copy() {
-        final Reference2ObjectOpenHashMap<StructuredDataKey<?>, StructuredData<?>> map = new Reference2ObjectOpenHashMap<>();
-        for (final StructuredData<?> value : data.values()) {
-            map.put(value.key(), value.copy());
-        }
-        final StructuredDataContainer copy = new StructuredDataContainer(map);
+        final StructuredDataContainer copy = new StructuredDataContainer(new Reference2ObjectOpenHashMap<>(data));
        copy.lookup = this.lookup;
        return copy;
    }