Handle empty items in pre 1.20.5 protocols

Maps empty items to null on read in 1.13, 1.13.2 and 1.20.2 item types and handles the empty item->null transition in 1.10->1.11

.editorconfig

@@ -0,0 +1,16 @@
+[*]
+charset = utf-8
+indent_size = 4
+indent_style = space
+insert_final_newline = false
+tab_width = 4
+
+[*.java]
+ij_java_class_count_to_use_import_on_demand = 999999
+ij_java_names_count_to_use_import_on_demand = 999999
+ij_java_imports_layout = *, |, $*
+ij_java_generate_final_locals = true
+ij_java_generate_final_parameters = true
+
+[{*.json,*.yml}]
+indent_size = 2

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: kennytv
+patreon: kennytv

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -23,11 +23,11 @@ body:
     attributes:
       label: Console Error
       description: |
-        If you encounter warnings/errors in your console, **paste them with https://paste.gg/ and put the paste link here**.
+        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.
       value: |
         ```
-        Put the paste.gg link or text here.
+        Put the mclo.gs link or text here.
         ```
       placeholder: Please do not remove the grave accents; simply replace the line of text in the middle.
     validations:
@@ -71,9 +71,9 @@ body:
     attributes:
       label: Additional Server Info
       description: |
-        Do you use a proxy (e.g. BungeeCord)? What software do you use and what plugins?
+        Do you use a proxy (e.g. Velocity)? What software do you use and what plugins?
       placeholder: |
-        Example: "I also use BungeeCord with the following plugins: x, y, z"
+        Example: "I also use Velocity with the following plugins: x, y, z"
     validations:
       required: false
 
@@ -82,7 +82,7 @@ body:
       label: Checklist
       description: Make sure you have followed each of the steps outlined here.
       options:
-        - label: Via plugins are only running on **EITHER** the backend servers (e.g. Paper) **OR** the proxy (e.g. BungeeCord), **not on both**.
+        - label: Via plugins are only running on **EITHER** the backend servers (e.g. Paper) **OR** the proxy (e.g. Velocity), **not on both**.
           required: true
         - label: I have included a ViaVersion dump.
           required: true

.github/workflows/gradle.yml

@@ -13,12 +13,12 @@ jobs:
     - name: Checkout Repository
       uses: actions/checkout@v4
     - name: Validate Gradle Wrapper
-      uses: gradle/wrapper-validation-action@v1
-    - name: Set up JDK 11
-      uses: actions/setup-java@v3
+      uses: gradle/actions/wrapper-validation@v3
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: 11
+        java-version: 17
         check-latest: true
     - name: Build with Gradle
       run: ./gradlew build

.github/workflows/publish.yml

@@ -13,9 +13,9 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/actions/wrapper-validation@v3
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17

.idea/copyright/viaversion_gpl.xml

@@ -1,6 +1,6 @@
 <component name="CopyrightManager">
   <copyright>
-    <option name="notice" value="This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion&#10;Copyright (C) &amp;#36;originalComment.match(&quot;Copyright \(C\) (\d+)&quot;, 1, &quot;-&quot;)&amp;#36;today.year ViaVersion and contributors&#10;&#10;This program is free software: you can redistribute it and/or modify&#10;it under the terms of the GNU General Public License as published by&#10;the Free Software Foundation, either version 3 of the License, or&#10;(at your option) any later version.&#10;&#10;This program is distributed in the hope that it will be useful,&#10;but WITHOUT ANY WARRANTY; without even the implied warranty of&#10;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the&#10;GNU General Public License for more details.&#10;&#10;You should have received a copy of the GNU General Public License&#10;along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;." />
+    <option name="notice" value="This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion&#10;Copyright (C) 2016-&amp;#36;today.year ViaVersion and contributors&#10;&#10;This program is free software: you can redistribute it and/or modify&#10;it under the terms of the GNU General Public License as published by&#10;the Free Software Foundation, either version 3 of the License, or&#10;(at your option) any later version.&#10;&#10;This program is distributed in the hope that it will be useful,&#10;but WITHOUT ANY WARRANTY; without even the implied warranty of&#10;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the&#10;GNU General Public License for more details.&#10;&#10;You should have received a copy of the GNU General Public License&#10;along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;." />
     <option name="myName" value="viaversion-gpl" />
   </copyright>
 </component>

.idea/copyright/viaversion_mit.xml

@@ -1,6 +1,6 @@
 <component name="CopyrightManager">
   <copyright>
-    <option name="notice" value="This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion&#10;Copyright (C) &amp;#36;originalComment.match(&quot;Copyright \(C\) (\d+)&quot;, 1, &quot;-&quot;)&amp;#36;today.year ViaVersion and contributors&#10;&#10;Permission is hereby granted, free of charge, to any person obtaining a copy&#10;of this software and associated documentation files (the &quot;Software&quot;), to deal&#10;in the Software without restriction, including without limitation the rights&#10;to use, copy, modify, merge, publish, distribute, sublicense, and/or sell&#10;copies of the Software, and to permit persons to whom the Software is&#10;furnished to do so, subject to the following conditions:&#10;&#10;The above copyright notice and this permission notice shall be included in all&#10;copies or substantial portions of the Software.&#10;&#10;THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR&#10;IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,&#10;FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE&#10;AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER&#10;LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,&#10;OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE&#10;SOFTWARE." />
+    <option name="notice" value="This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion&#10;Copyright (C) 2016-&amp;#36;today.year ViaVersion and contributors&#10;&#10;Permission is hereby granted, free of charge, to any person obtaining a copy&#10;of this software and associated documentation files (the &quot;Software&quot;), to deal&#10;in the Software without restriction, including without limitation the rights&#10;to use, copy, modify, merge, publish, distribute, sublicense, and/or sell&#10;copies of the Software, and to permit persons to whom the Software is&#10;furnished to do so, subject to the following conditions:&#10;&#10;The above copyright notice and this permission notice shall be included in all&#10;copies or substantial portions of the Software.&#10;&#10;THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR&#10;IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,&#10;FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE&#10;AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER&#10;LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,&#10;OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE&#10;SOFTWARE." />
     <option name="myName" value="viaversion-mit" />
   </copyright>
 </component>

.idea/scopes/ViaVersion_API.xml

@@ -1,3 +1,3 @@
 <component name="DependencyValidationManager">
-  <scope name="ViaVersion-API" pattern="src[viaversion-parent.viaversion-api*]:*..*&amp;&amp;!src[viaversion-parent.viaversion-api.main]:com.viaversion.viaversion.api.minecraft.nbt.*" />
+  <scope name="ViaVersion-API" pattern="src[viaversion-parent.viaversion-api*]:*..*" />
 </component>

README.md

@@ -7,9 +7,9 @@
 **Allows the connection of higher client versions to lower server versions -
 it works on any platform you can think of.**
 
-The base ViaVersion jar runs on Paper, Velocity, Bungee, and Sponge. We also have projects integrating ViaVersion to run
-on Fabric, Forge, or as a standalone proxy to  join from basically any client version on any server version from the
-past decade. **See [HERE](https://github.com/ViaVersion) for an overview of the different Via\* projects.**
+The base ViaVersion jar runs on Paper and Velocity. We also have projects integrating ViaVersion to run
+on Fabric, Forge, Bungee, Sponge, or as a standalone proxy to join from basically any client version on
+any server version from the past decade. **See [HERE](https://github.com/ViaVersion) for an overview of the different Via\* projects.**
 
 Supported Versions:
 
@@ -47,7 +47,7 @@ ViaVersion as a Dependency
 <dependency>
     <groupId>com.viaversion</groupId>
     <artifactId>viaversion-api</artifactId>
-    <version>[4.0.0,5.0.0)</version>
+    <version>[5.0.0,6.0.0)</version>
     <scope>provided</scope>
 </dependency>
 ```
@@ -73,6 +73,8 @@ Building
 After cloning this repository, build the project with Gradle by running `./gradlew build` and take the created jar out
 of the `build/libs` directory.
 
+You need JDK 17 or newer to build ViaVersion.
+
 
 Mapping Files
 --------------

adventure/build.gradle.kts

@@ -1,25 +0,0 @@
-plugins {
-    id("com.github.johnrengelman.shadow")
-}
-
-// Shade and relocate adventure in an extra module, so that common/the rest can directly depend on a
-// relocated adventure without breaking native platform's adventure usage with project wide relocation
-tasks {
-    shadowJar {
-        relocate("net.kyori", "com.viaversion.viaversion.libs.kyori")
-    }
-    build {
-        dependsOn(shadowJar)
-    }
-}
-
-dependencies {
-    api(libs.bundles.adventure) {
-        exclude("org.checkerframework")
-        exclude("net.kyori", "adventure-api")
-        exclude("net.kyori", "adventure-bom")
-        exclude("com.google.code.gson", "gson")
-    }
-}
-
-publishShadowJar()

api-legacy/build.gradle.kts

@@ -1,3 +0,0 @@
-dependencies {
-    compileOnly(projects.viaversionApi)
-}

api-legacy/src/main/java/us/myles/ViaVersion/api/Via.java

@@ -1,101 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package us.myles.ViaVersion.api;
-
-import io.netty.buffer.ByteBuf;
-import java.util.SortedSet;
-import java.util.UUID;
-import us.myles.ViaVersion.api.boss.BossBar;
-import us.myles.ViaVersion.api.boss.BossColor;
-import us.myles.ViaVersion.api.boss.BossStyle;
-
-/**
- * @deprecated may be removed at some point, use {@link com.viaversion.viaversion.api.Via}
- */
-@Deprecated
-public class Via<T> implements ViaAPI<T> {
-
-    private static final ViaAPI INSTANCE = new Via();
-
-    private Via() {
-    }
-
-    @Deprecated
-    public static ViaAPI getAPI() {
-        return INSTANCE;
-    }
-
-    @Override
-    public int getPlayerVersion(T player) {
-        return com.viaversion.viaversion.api.Via.getAPI().getPlayerVersion(player);
-    }
-
-    @Override
-    public int getPlayerVersion(UUID uuid) {
-        return com.viaversion.viaversion.api.Via.getAPI().getPlayerVersion(uuid);
-    }
-
-    @Override
-    public boolean isInjected(UUID playerUUID) {
-        return com.viaversion.viaversion.api.Via.getAPI().isInjected(playerUUID);
-    }
-
-    @Override
-    public String getVersion() {
-        return com.viaversion.viaversion.api.Via.getAPI().getVersion();
-    }
-
-    @Override
-    public void sendRawPacket(T player, ByteBuf packet) {
-        com.viaversion.viaversion.api.Via.getAPI().sendRawPacket(player, packet);
-    }
-
-    @Override
-    public void sendRawPacket(UUID uuid, ByteBuf packet) {
-        com.viaversion.viaversion.api.Via.getAPI().sendRawPacket(uuid, packet);
-    }
-
-    @Override
-    public BossBar createBossBar(String title, BossColor color, BossStyle style) {
-        return new BossBar(com.viaversion.viaversion.api.Via.getAPI().legacyAPI().createLegacyBossBar(title,
-                com.viaversion.viaversion.api.legacy.bossbar.BossColor.values()[color.ordinal()],
-                com.viaversion.viaversion.api.legacy.bossbar.BossStyle.values()[style.ordinal()]));
-    }
-
-    @Override
-    public BossBar createBossBar(String title, float health, BossColor color, BossStyle style) {
-        return new BossBar(com.viaversion.viaversion.api.Via.getAPI().legacyAPI().createLegacyBossBar(title, health,
-                com.viaversion.viaversion.api.legacy.bossbar.BossColor.values()[color.ordinal()],
-                com.viaversion.viaversion.api.legacy.bossbar.BossStyle.values()[style.ordinal()]));
-    }
-
-    @Override
-    public SortedSet<Integer> getSupportedVersions() {
-        return com.viaversion.viaversion.api.Via.getAPI().getSupportedVersions();
-    }
-
-    @Override
-    public SortedSet<Integer> getFullSupportedVersions() {
-        return com.viaversion.viaversion.api.Via.getAPI().getFullSupportedVersions();
-    }
-}

api-legacy/src/main/java/us/myles/ViaVersion/api/ViaAPI.java

@@ -1,62 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package us.myles.ViaVersion.api;
-
-import com.viaversion.viaversion.api.Via;
-import io.netty.buffer.ByteBuf;
-import java.util.SortedSet;
-import java.util.UUID;
-import us.myles.ViaVersion.api.boss.BossBar;
-import us.myles.ViaVersion.api.boss.BossColor;
-import us.myles.ViaVersion.api.boss.BossStyle;
-
-/**
- * @deprecated may be removed at some point, use {@link Via#getAPI()}
- */
-@Deprecated
-public interface ViaAPI<T> {
-
-    int getPlayerVersion(T player);
-
-    int getPlayerVersion(UUID uuid);
-
-    default boolean isPorted(UUID playerUUID) {
-        return isInjected(playerUUID);
-    }
-
-    boolean isInjected(UUID playerUUID);
-
-    String getVersion();
-
-    void sendRawPacket(T player, ByteBuf packet);
-
-    void sendRawPacket(UUID uuid, ByteBuf packet);
-
-    BossBar createBossBar(String title, BossColor color, BossStyle style);
-
-    BossBar createBossBar(String title, float health, BossColor color, BossStyle style);
-
-    SortedSet<Integer> getSupportedVersions();
-
-    SortedSet<Integer> getFullSupportedVersions();
-}

api-legacy/src/main/java/us/myles/ViaVersion/api/boss/BossBar.java

@@ -1,133 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package us.myles.ViaVersion.api.boss;
-
-import java.util.Set;
-import java.util.UUID;
-
-@Deprecated
-public class BossBar<T> {
-
-    private final com.viaversion.viaversion.api.legacy.bossbar.BossBar bossBar;
-
-    public BossBar(com.viaversion.viaversion.api.legacy.bossbar.BossBar bossBar) {
-        this.bossBar = bossBar;
-    }
-
-    public String getTitle() {
-        return bossBar.getTitle();
-    }
-
-    public BossBar setTitle(String title) {
-        bossBar.setTitle(title);
-        return this;
-    }
-
-    public float getHealth() {
-        return bossBar.getHealth();
-    }
-
-    public BossBar setHealth(float health) {
-        bossBar.setHealth(health);
-        return this;
-    }
-
-    public BossColor getColor() {
-        return BossColor.values()[bossBar.getColor().ordinal()];
-    }
-
-    public BossBar setColor(BossColor color) {
-        bossBar.setColor(com.viaversion.viaversion.api.legacy.bossbar.BossColor.values()[color.ordinal()]);
-        return this;
-    }
-
-    public BossStyle getStyle() {
-        return BossStyle.values()[bossBar.getStyle().ordinal()];
-    }
-
-    public BossBar setStyle(BossStyle style) {
-        bossBar.setStyle(com.viaversion.viaversion.api.legacy.bossbar.BossStyle.values()[style.ordinal()]);
-        return this;
-    }
-
-    @Deprecated
-    public BossBar addPlayer(T player) {
-        return this;
-    }
-
-    public BossBar addPlayer(UUID player) {
-        bossBar.addPlayer(player);
-        return this;
-    }
-
-    @Deprecated
-    public BossBar addPlayers(T... players) {
-        return this;
-    }
-
-    @Deprecated
-    public BossBar removePlayer(T player) {
-        return this;
-    }
-
-    public BossBar removePlayer(UUID uuid) {
-        bossBar.removePlayer(uuid);
-        return this;
-    }
-
-    public BossBar addFlag(BossFlag flag) {
-        bossBar.addFlag(com.viaversion.viaversion.api.legacy.bossbar.BossFlag.values()[flag.ordinal()]);
-        return this;
-    }
-
-    public BossBar removeFlag(BossFlag flag) {
-        bossBar.removeFlag(com.viaversion.viaversion.api.legacy.bossbar.BossFlag.values()[flag.ordinal()]);
-        return this;
-    }
-
-    public boolean hasFlag(BossFlag flag) {
-        return bossBar.hasFlag(com.viaversion.viaversion.api.legacy.bossbar.BossFlag.values()[flag.ordinal()]);
-    }
-
-    public Set<UUID> getPlayers() {
-        return bossBar.getPlayers();
-    }
-
-    public BossBar show() {
-        bossBar.show();
-        return this;
-    }
-
-    public BossBar hide() {
-        bossBar.hide();
-        return this;
-    }
-
-    public boolean isVisible() {
-        return bossBar.isVisible();
-    }
-
-    public UUID getId() {
-        return bossBar.getId();
-    }
-}

api-legacy/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java

@@ -1,254 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package us.myles.ViaVersion.api.protocol;
-
-import com.google.common.base.Preconditions;
-import com.viaversion.viaversion.api.protocol.version.VersionRange;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
-/**
- * @deprecated will no longer be updated and may be removed at some point, use {@link com.viaversion.viaversion.api.protocol.version.ProtocolVersion}
- */
-@Deprecated
-public class ProtocolVersion {
-    private static final Int2ObjectMap<ProtocolVersion> versions = new Int2ObjectOpenHashMap<>();
-    private static final List<ProtocolVersion> versionList = new ArrayList<>();
-
-    public static final ProtocolVersion v1_4_6 = register(51, "1.4.6/7", new VersionRange("1.4", 6, 7));
-    public static final ProtocolVersion v1_5_1 = register(60, "1.5.1");
-    public static final ProtocolVersion v1_5_2 = register(61, "1.5.2");
-    public static final ProtocolVersion v_1_6_1 = register(73, "1.6.1");
-    public static final ProtocolVersion v_1_6_2 = register(74, "1.6.2");
-    public static final ProtocolVersion v_1_6_3 = register(77, "1.6.3");
-    public static final ProtocolVersion v_1_6_4 = register(78, "1.6.4");
-    public static final ProtocolVersion v1_7_1 = register(4, "1.7-1.7.5", new VersionRange("1.7", 0, 5));
-    public static final ProtocolVersion v1_7_6 = register(5, "1.7.6-1.7.10", new VersionRange("1.7", 6, 10));
-    public static final ProtocolVersion v1_8 = register(47, "1.8.x");
-    public static final ProtocolVersion v1_9 = register(107, "1.9");
-    public static final ProtocolVersion v1_9_1 = register(108, "1.9.1");
-    public static final ProtocolVersion v1_9_2 = register(109, "1.9.2");
-    public static final ProtocolVersion v1_9_3 = register(110, "1.9.3/4", new VersionRange("1.9", 3, 4));
-    public static final ProtocolVersion v1_10 = register(210, "1.10.x");
-    public static final ProtocolVersion v1_11 = register(315, "1.11");
-    public static final ProtocolVersion v1_11_1 = register(316, "1.11.1/2", new VersionRange("1.11", 1, 2));
-    public static final ProtocolVersion v1_12 = register(335, "1.12");
-    public static final ProtocolVersion v1_12_1 = register(338, "1.12.1");
-    public static final ProtocolVersion v1_12_2 = register(340, "1.12.2");
-    public static final ProtocolVersion v1_13 = register(393, "1.13");
-    public static final ProtocolVersion v1_13_1 = register(401, "1.13.1");
-    public static final ProtocolVersion v1_13_2 = register(404, "1.13.2");
-    public static final ProtocolVersion v1_14 = register(477, "1.14");
-    public static final ProtocolVersion v1_14_1 = register(480, "1.14.1");
-    public static final ProtocolVersion v1_14_2 = register(485, "1.14.2");
-    public static final ProtocolVersion v1_14_3 = register(490, "1.14.3");
-    public static final ProtocolVersion v1_14_4 = register(498, "1.14.4");
-    public static final ProtocolVersion v1_15 = register(573, "1.15");
-    public static final ProtocolVersion v1_15_1 = register(575, "1.15.1");
-    public static final ProtocolVersion v1_15_2 = register(578, "1.15.2");
-    public static final ProtocolVersion v1_16 = register(735, "1.16");
-    public static final ProtocolVersion v1_16_1 = register(736, "1.16.1");
-    public static final ProtocolVersion v1_16_2 = register(751, "1.16.2");
-    public static final ProtocolVersion v1_16_3 = register(753, "1.16.3");
-    public static final ProtocolVersion v1_16_4 = register(754, "1.16.4/5", new VersionRange("1.16", 4, 5));
-    public static final ProtocolVersion v1_17 = register(755, "1.17");
-    public static final ProtocolVersion v1_17_1 = register(756, "1.17.1");
-    public static final ProtocolVersion v1_18 = register(757, "1.18/1.18.1", new VersionRange("1.18", 0, 1));
-    public static final ProtocolVersion v1_18_2 = register(758, "1.18.2");
-    public static final ProtocolVersion v1_19 = register(759, "1.19");
-    public static final ProtocolVersion v1_19_1 = register(760, "1.19.1/2", new VersionRange("1.19", 1, 2));
-    public static final ProtocolVersion v1_19_3 = register(761, "1.19.3");
-    public static final ProtocolVersion v1_19_4 = register(762, "1.19.4");
-    public static final ProtocolVersion v1_20 = register(763, "1.20/1.20.1", new VersionRange("1.20", 0, 1));
-    public static final ProtocolVersion v1_20_2 = register(764, "1.20.2");
-    public static final ProtocolVersion v1_20_3 = register(765, "1.20.3");
-    public static final ProtocolVersion unknown = register(-1, "UNKNOWN");
-
-    public static ProtocolVersion register(int version, String name) {
-        return register(version, -1, name);
-    }
-
-    public static ProtocolVersion register(int version, int snapshotVersion, String name) {
-        return register(version, snapshotVersion, name, null);
-    }
-
-    public static ProtocolVersion register(int version, String name, @Nullable VersionRange versionRange) {
-        return register(version, -1, name, versionRange);
-    }
-
-    public static ProtocolVersion register(int version, int snapshotVersion, String name, @Nullable VersionRange versionRange) {
-        ProtocolVersion protocol = new ProtocolVersion(version, snapshotVersion, name, versionRange);
-        versionList.add(protocol);
-        versions.put(protocol.getVersion(), protocol);
-        if (protocol.isSnapshot()) {
-            versions.put(protocol.getFullSnapshotVersion(), protocol);
-        }
-        return protocol;
-    }
-
-    public static boolean isRegistered(int id) {
-        return versions.containsKey(id);
-    }
-
-    public static @NonNull ProtocolVersion getProtocol(int id) {
-        ProtocolVersion protocolVersion = versions.get(id);
-        if (protocolVersion != null) {
-            return protocolVersion;
-        } else {
-            return new ProtocolVersion(id, "Unknown (" + id + ")");
-        }
-    }
-
-    public static int getIndex(ProtocolVersion version) {
-        return versionList.indexOf(version);
-    }
-
-    public static List<ProtocolVersion> getProtocols() {
-        return Collections.unmodifiableList(new ArrayList<>(versions.values()));
-    }
-
-    public static @Nullable ProtocolVersion getClosest(String protocol) {
-        for (ProtocolVersion version : versions.values()) {
-            String name = version.getName();
-            if (name.equals(protocol)) {
-                return version;
-            }
-
-            if (version.isVersionWildcard()) {
-                // Test against the major version with and without a minor version
-                String majorVersion = name.substring(0, name.length() - 2);
-                if (majorVersion.equals(protocol) || (protocol.startsWith(name.substring(0, name.length() - 1)))) {
-                    return version;
-                }
-            } else if (version.isRange()) {
-                if (version.getIncludedVersions().contains(protocol)) {
-                    return version;
-                }
-            }
-        }
-        return null;
-    }
-
-    private final int version;
-    private final int snapshotVersion;
-    private final String name;
-    private final boolean versionWildcard;
-    private final Set<String> includedVersions;
-
-    public ProtocolVersion(int version, String name) {
-        this(version, -1, name, null);
-    }
-
-    public ProtocolVersion(int version, int snapshotVersion, String name, @Nullable VersionRange versionRange) {
-        this.version = version;
-        this.snapshotVersion = snapshotVersion;
-        this.name = name;
-        this.versionWildcard = name.endsWith(".x");
-
-        Preconditions.checkArgument(!versionWildcard || versionRange == null, "A version cannot be a wildcard and a range at the same time!");
-        if (versionRange != null) {
-            includedVersions = new LinkedHashSet<>();
-            for (int i = versionRange.rangeFrom(); i <= versionRange.rangeTo(); i++) {
-                if (i == 0) {
-                    includedVersions.add(versionRange.baseVersion()); // Keep both the base version and with ".0" appended
-                }
-
-                includedVersions.add(versionRange.baseVersion() + "." + i);
-            }
-        } else {
-            includedVersions = Collections.singleton(name);
-        }
-    }
-
-    public int getVersion() {
-        return version;
-    }
-
-    public int getSnapshotVersion() {
-        Preconditions.checkArgument(isSnapshot());
-        return snapshotVersion;
-    }
-
-    public int getFullSnapshotVersion() {
-        Preconditions.checkArgument(isSnapshot());
-        return (1 << 30) | snapshotVersion; // Bit indicating snapshot versions
-    }
-
-    public int getOriginalVersion() {
-        return snapshotVersion == -1 ? version : ((1 << 30) | snapshotVersion);
-    }
-
-    public boolean isKnown() {
-        return version != -1;
-    }
-
-    public boolean isRange() {
-        return includedVersions.size() != 1;
-    }
-
-    public Set<String> getIncludedVersions() {
-        return Collections.unmodifiableSet(includedVersions);
-    }
-
-    public boolean isVersionWildcard() {
-        return versionWildcard;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public boolean isSnapshot() {
-        return snapshotVersion != -1;
-    }
-
-    public int getId() {
-        return version;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        ProtocolVersion that = (ProtocolVersion) o;
-        return version == that.version;
-    }
-
-    @Override
-    public int hashCode() {
-        return version;
-    }
-
-    @Override
-    public String toString() {
-        return String.format("%s (%d)", this.name, this.version);
-    }
-}

api/build.gradle.kts

@@ -15,14 +15,15 @@ sourceSets {
 }
 
 dependencies {
-    api(projects.adventure) {
-        targetConfiguration = "shadow"
-    }
     api(libs.fastutil)
-    api(libs.flare)
-    api(libs.flareFastutil)
-    api(libs.vianbt)
+    api(libs.vianbt) {
+        exclude("it.unimi.dsi", "fastutil")
+    }
     api(libs.gson)
+    implementation(rootProject.libs.text) {
+        exclude("com.google.code.gson", "gson")
+        exclude("com.viaversion", "nbt")
+    }
 
     compileOnlyApi(libs.snakeYaml)
     compileOnlyApi(libs.netty)
@@ -33,5 +34,3 @@ dependencies {
 java {
     withJavadocJar()
 }
-
-publishShadowJar()

api/src/main/java-templates/com/viaversion/viaversion/util/VersionInfo.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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

api/src/main/java/com/viaversion/viaversion/api/Via.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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

api/src/main/java/com/viaversion/viaversion/api/ViaAPI.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -27,10 +27,13 @@ import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.legacy.LegacyViaAPI;
 import com.viaversion.viaversion.api.platform.ViaPlatform;
 import com.viaversion.viaversion.api.protocol.ProtocolManager;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.api.protocol.version.ServerProtocolVersion;
 import io.netty.buffer.ByteBuf;
 import java.util.SortedSet;
+import java.util.TreeSet;
 import java.util.UUID;
+import java.util.stream.Collectors;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
@@ -53,7 +56,7 @@ public interface ViaAPI<T> {
      * @since 4.0.2
      */
     default int majorVersion() {
-        return 4;
+        return 5;
     }
 
     /**
@@ -63,7 +66,7 @@ public interface ViaAPI<T> {
      * @return API version incremented with meaningful API changes
      */
     default int apiVersion() {
-        return 22;
+        return 26;
     }
 
     /**
@@ -75,12 +78,21 @@ public interface ViaAPI<T> {
 
     /**
      * Returns the protocol version of a player.
-     * This will also retrieve the version from ProtocolSupport if it's being used.
      *
      * @param player the platform's player object, e.g. Bukkit this is Player
      * @return protocol version, for example (47=1.8-1.8.8, 107=1.9, 108=1.9.1), or -1 if no longer connected
      */
-    int getPlayerVersion(T player);
+    default int getPlayerVersion(T player) {
+        return getPlayerProtocolVersion(player).getVersion();
+    }
+
+    /**
+     * Returns the protocol version of a player.
+     *
+     * @param player the platform's player object, e.g. Bukkit this is Player
+     * @return the protocol version object (see {@link ProtocolVersion}), or ProtocolVersion.unknown if not connected
+     */
+    ProtocolVersion getPlayerProtocolVersion(T player);
 
     /**
      * Returns the protocol version of a player.
@@ -88,7 +100,18 @@ public interface ViaAPI<T> {
      * @param uuid UUID of a player
      * @return protocol version, for example (47=1.8-1.8.8, 107=1.9, 108=1.9.1), or -1 if not connected
      */
-    int getPlayerVersion(UUID uuid);
+    default int getPlayerVersion(UUID uuid) {
+        return getPlayerProtocolVersion(uuid).getVersion();
+    }
+
+
+    /**
+     * Returns the protocol version of a player.
+     *
+     * @param uuid UUID of a player
+     * @return the protocol version object (see {@link ProtocolVersion}), or ProtocolVersion.unknown if not connected
+     */
+    ProtocolVersion getPlayerProtocolVersion(UUID uuid);
 
     /**
      * Returns whether Via injected into this player connection.
@@ -131,6 +154,16 @@ public interface ViaAPI<T> {
      */
     void sendRawPacket(UUID uuid, ByteBuf packet);
 
+    @Deprecated
+    default SortedSet<Integer> getSupportedVersions() {
+        return getSupportedProtocolVersions().stream().map(ProtocolVersion::getVersion).collect(Collectors.toCollection(TreeSet::new));
+    }
+
+    @Deprecated
+    default SortedSet<Integer> getFullSupportedVersions() {
+        return getFullSupportedProtocolVersions().stream().map(ProtocolVersion::getVersion).collect(Collectors.toCollection(TreeSet::new));
+    }
+
     /**
      * Returns the supported protocol versions.
      * This method removes any blocked protocol versions.
@@ -138,14 +171,15 @@ public interface ViaAPI<T> {
      * @return a sorted set of protocol versions
      * @see #getFullSupportedVersions() for a full list
      */
-    SortedSet<Integer> getSupportedVersions();
+    SortedSet<ProtocolVersion> getSupportedProtocolVersions();
+
 
     /**
      * Returns the supported protocol versions, including blocked protocols.
      *
      * @return a sorted set of protocol versions
      */
-    SortedSet<Integer> getFullSupportedVersions();
+    SortedSet<ProtocolVersion> getFullSupportedProtocolVersions();
 
     /**
      * Returns legacy api only applicable on/to legacy versions.

api/src/main/java/com/viaversion/viaversion/api/ViaManager.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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

api/src/main/java/com/viaversion/viaversion/api/command/ViaCommandSender.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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

api/src/main/java/com/viaversion/viaversion/api/command/ViaSubCommand.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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,21 +26,21 @@ import com.viaversion.viaversion.util.ChatColorUtil;
 import java.util.Collections;
 import java.util.List;
 
-public abstract class ViaSubCommand {
+public interface ViaSubCommand {
 
     /**
      * Subcommand name
      *
      * @return The commands name
      */
-    public abstract String name();
+    String name();
 
     /**
      * subcommand description, this'll show in /viaversion list
      *
      * @return The commands description
      */
-    public abstract String description();
+    String description();
 
     /**
      * Usage example:
@@ -48,7 +48,7 @@ public abstract class ViaSubCommand {
      *
      * @return The commands usage
      */
-    public String usage() {
+    default String usage() {
         return name();
     }
 
@@ -57,7 +57,7 @@ public abstract class ViaSubCommand {
      *
      * @return The permission required to use the commands
      */
-    public String permission() {
+    default String permission() {
         return "viaversion.admin." + name();
     }
 
@@ -68,7 +68,7 @@ public abstract class ViaSubCommand {
      * @param args   Arguments
      * @return commands executed succesfully if false, show usage
      */
-    public abstract boolean execute(ViaCommandSender sender, String[] args);
+    boolean execute(ViaCommandSender sender, String[] args);
 
     /**
      * Yay, possibility to implement tab-completion
@@ -77,7 +77,7 @@ public abstract class ViaSubCommand {
      * @param args   args
      * @return tab complete possibilities
      */
-    public List<String> onTabComplete(ViaCommandSender sender, String[] args) {
+    default List<String> onTabComplete(ViaCommandSender sender, String[] args) {
         return Collections.emptyList();
     }
 
@@ -87,7 +87,7 @@ public abstract class ViaSubCommand {
      * @param s string to replace
      * @return output String
      */
-    public static String color(String s) {
+    static String color(String s) {
         return ChatColorUtil.translateAlternateColorCodes(s);
     }
 
@@ -98,7 +98,7 @@ public abstract class ViaSubCommand {
      * @param message message
      * @param args    objects to replace
      */
-    public static void sendMessage(ViaCommandSender sender, String message, Object... args) {
+    default void sendMessage(ViaCommandSender sender, String message, Object... args) {
         sender.sendMessage(color(args == null ? message : String.format(message, args)));
     }
 }

api/src/main/java/com/viaversion/viaversion/api/command/ViaVersionCommand.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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 Exception throws an exception when the subcommand already exists or if it's not valid, example: spacee
+     * @throws IllegalArgumentException throws an exception when the subcommand already exists or if it's not valid, example: spacee
      */
     void registerSubCommand(ViaSubCommand command);
 

api/src/main/java/com/viaversion/viaversion/api/configuration/Config.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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

api/src/main/java/com/viaversion/viaversion/api/configuration/ConfigurationProvider.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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

api/src/main/java/com/viaversion/viaversion/api/configuration/ViaVersionConfig.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -27,8 +27,6 @@ import com.viaversion.viaversion.api.connection.StorableObject;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.WorldIdentifiers;
 import com.viaversion.viaversion.api.protocol.version.BlockedProtocolVersions;
-import it.unimi.dsi.fastutil.ints.IntSet;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 public interface ViaVersionConfig extends Config {
 
@@ -235,13 +233,6 @@ public interface ViaVersionConfig extends Config {
      */
     boolean isChunkBorderFix();
 
-    /**
-     * Force json transform
-     *
-     * @return true if enabled
-     */
-    boolean isForceJsonTransform();
-
     /**
      * Should we fix nbt array's in json chat messages for 1.12 clients
      *
@@ -272,17 +263,6 @@ public interface ViaVersionConfig extends Config {
      */
     BlockedProtocolVersions blockedProtocolVersions();
 
-    /**
-     * Get the blocked protocols
-     *
-     * @return An Integer list
-     * @deprecated use {@link #blockedProtocolVersions()}
-     */
-    @Deprecated/*(forRemoval = true)*/
-    default IntSet getBlockedProtocols() {
-        return blockedProtocolVersions().singleBlockedVersions();
-    }
-
     /**
      * Get the custom disconnect message
      *
@@ -463,4 +443,25 @@ public interface ViaVersionConfig extends Config {
      * @return true if enabled
      */
     boolean isArmorToggleFix();
+
+    /**
+     * If disabled, tamed cats will be displayed as ocelots to 1.14+ clients on 1.13 servers. Otherwise, ocelots (tamed and untamed) will be displayed as cats.
+     *
+     * @return true if enabled
+     */
+    boolean translateOcelotToCat();
+
+    /**
+     * Returns the value of the "enforce secure chat" setting sent to 1.19+ clients on join.
+     *
+     * @return the value sent to 1.19+ clients on join
+     */
+    boolean enforceSecureChat();
+
+    /**
+     * Handles items with invalid count values (higher than max stack size) on 1.20.3 servers.
+     *
+     * @return true if enabled
+     */
+    boolean handleInvalidItemCount();
 }

api/src/main/java/com/viaversion/viaversion/api/connection/ConnectionManager.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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
@@ -54,7 +54,6 @@ public interface ConnectionManager {
      * Returns the frontend UserConnection from the player connected to this proxy server
      * Returns null when there isn't a server or connection was not found
      * When ViaVersion is reloaded, this method may not return some players.
-     * May not return ProtocolSupport players.
      * <p>
      * Note that connections are removed as soon as their channel is closed,
      * so avoid using this method during player quits for example.
@@ -67,7 +66,6 @@ public interface ConnectionManager {
      * 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.
-     * May not return ProtocolSupport players.
      * <p>
      * Note that connections are removed as soon as their channel is closed,
      * so avoid using this method during player quits for example.
@@ -81,7 +79,6 @@ public interface ConnectionManager {
      * May contain duplicated UUIDs on multiple ProtocolInfo.
      * May contain frontend, backend and/or client-sided connections.
      * When ViaVersion is reloaded, this method may not return some players.
-     * May not contain ProtocolSupport players.
      *
      * @return connected UserConnections
      */
@@ -91,7 +88,6 @@ public interface ConnectionManager {
      * Returns a map containing the UUIDs and frontend UserConnections from players connected to this proxy server
      * Returns empty list when there isn't a server
      * When ViaVersion is reloaded, this method may not return some players.
-     * May not contain ProtocolSupport players.
      *
      * @return map containing the UUIDs and frontend UserConnections from players connected to this proxy server
      */

api/src/main/java/com/viaversion/viaversion/api/connection/ProtocolInfo.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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
@@ -25,22 +25,12 @@ package com.viaversion.viaversion.api.connection;
 import com.viaversion.viaversion.api.protocol.ProtocolPipeline;
 import com.viaversion.viaversion.api.protocol.packet.Direction;
 import com.viaversion.viaversion.api.protocol.packet.State;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import java.util.UUID;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 public interface ProtocolInfo {
 
-    /**
-     * Returns the protocol state the user is currently in.
-     *
-     * @return protocol state
-     * @deprecated server and client can be in different states, use {@link #getClientState()} or {@link #getServerState()}
-     */
-    @Deprecated/*(forRemoval = true)*/
-    default State getState() {
-        return this.getServerState();
-    }
-
     /**
      * Returns the protocol state the client is currently in.
      *
@@ -93,24 +83,36 @@ public interface ProtocolInfo {
     void setServerState(State serverState);
 
     /**
-     * Returns the user's protocol version, or -1 if not set.
+     * Returns the user's protocol version, or null if not set.
      * This is set during the {@link State#HANDSHAKE} state.
      *
-     * @return protocol version, or -1 if not set
+     * @return protocol version, may be unknown
+     * @see ProtocolVersion#isKnown()
      */
-    int getProtocolVersion();
+    ProtocolVersion protocolVersion();
 
-    void setProtocolVersion(int protocolVersion);
+    void setProtocolVersion(ProtocolVersion protocolVersion);
 
     /**
-     * Returns the server protocol version the user is connected to, or -1 if not set.
+     * Returns the server protocol version the user is connected to.
      * This is set during the {@link State#HANDSHAKE} state.
      *
-     * @return server protocol version, or -1 if not set
+     * @return the server protocol version the user is connected to, may be unknown
+     * @see ProtocolVersion#isKnown()
      */
-    int getServerProtocolVersion();
+    ProtocolVersion serverProtocolVersion();
 
-    void setServerProtocolVersion(int serverProtocolVersion);
+    void setServerProtocolVersion(ProtocolVersion protocolVersion);
+
+    @Deprecated
+    default int getProtocolVersion() {
+        return protocolVersion() != null ? protocolVersion().getVersion() : -1;
+    }
+
+    @Deprecated
+    default int getServerProtocolVersion() {
+        return serverProtocolVersion() != null ? serverProtocolVersion().getVersion() : -1;
+    }
 
     /**
      * Returns the username associated with this connection.
@@ -140,12 +142,4 @@ public interface ProtocolInfo {
     ProtocolPipeline getPipeline();
 
     void setPipeline(ProtocolPipeline pipeline);
-
-    /**
-     * Returns the user connection this info represents.
-     *
-     * @return user connection
-     */
-    @Deprecated/*(forRemoval = true)*/
-    UserConnection getUser();
-}
+}

api/src/main/java/com/viaversion/viaversion/api/connection/StorableObject.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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

api/src/main/java/com/viaversion/viaversion/api/connection/StoredObject.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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

api/src/main/java/com/viaversion/viaversion/api/connection/UserConnection.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -27,11 +27,11 @@ import com.viaversion.viaversion.api.data.entity.EntityTracker;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.protocol.packet.PacketTracker;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
-import com.viaversion.viaversion.exception.CancelException;
 import com.viaversion.viaversion.exception.InformativeException;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
+import io.netty.handler.codec.CodecException;
 import java.util.Collection;
 import java.util.Map;
 import java.util.UUID;
@@ -205,11 +205,10 @@ public interface UserConnection {
      *
      * @param buf            ByteBuf with packet id and packet contents
      * @param cancelSupplier function called with original CancelException for generating the Exception when the packet is cancelled
-     * @throws CancelException      if the packet should be cancelled
+     * @throws CodecException       if the packet should be cancelled (by netty)
      * @throws InformativeException if packet transforming failed
-     * @throws Exception            if any other processing outside of transforming fails
      */
-    void transformClientbound(ByteBuf buf, Function<Throwable, Exception> cancelSupplier) throws Exception;
+    void transformClientbound(ByteBuf buf, Function<Throwable, CodecException> cancelSupplier) throws InformativeException;
 
     /**
      * Transforms the serverbound packet contained in ByteBuf.
@@ -217,11 +216,10 @@ public interface UserConnection {
      * @param buf            ByteBuf with packet id and packet contents
      * @param cancelSupplier Function called with original CancelException for generating the Exception used when
      *                       packet is cancelled
-     * @throws CancelException      if the packet should be cancelled
+     * @throws CodecException       if the packet should be cancelled (by netty)
      * @throws InformativeException if packet transforming failed
-     * @throws Exception            if any other processing outside of transforming fails
      */
-    void transformServerbound(ByteBuf buf, Function<Throwable, Exception> cancelSupplier) throws Exception;
+    void transformServerbound(ByteBuf buf, Function<Throwable, CodecException> cancelSupplier) throws InformativeException;
 
     /**
      * Transforms the packet depending on whether the connection is clientside or not.
@@ -229,7 +227,7 @@ public interface UserConnection {
      * @see #transformClientbound(ByteBuf, Function)
      * @see #transformServerbound(ByteBuf, Function)
      */
-    default void transformOutgoing(ByteBuf buf, Function<Throwable, Exception> cancelSupplier) throws Exception {
+    default void transformOutgoing(ByteBuf buf, Function<Throwable, CodecException> cancelSupplier) throws InformativeException {
         if (isClientSide()) {
             transformServerbound(buf, cancelSupplier);
         } else {
@@ -243,7 +241,7 @@ public interface UserConnection {
      * @see #transformClientbound(ByteBuf, Function)
      * @see #transformServerbound(ByteBuf, Function)
      */
-    default void transformIncoming(ByteBuf buf, Function<Throwable, Exception> cancelSupplier) throws Exception {
+    default void transformIncoming(ByteBuf buf, Function<Throwable, CodecException> cancelSupplier) throws InformativeException {
         if (isClientSide()) {
             transformClientbound(buf, cancelSupplier);
         } else {
@@ -315,20 +313,6 @@ public interface UserConnection {
      */
     boolean shouldApplyBlockProtocol();
 
-    /**
-     * Returns whether the packet limiter applies to this user.
-     *
-     * @return whether the packet limiter applies to this user
-     */
-    boolean isPacketLimiterEnabled();
-
-    /**
-     * Sets the status of the packet limiter.
-     *
-     * @param packetLimiterEnabled whether the packet limiter should be enabled
-     */
-    void setPacketLimiterEnabled(boolean packetLimiterEnabled);
-
     /**
      * Returns a newly generated uuid that will let a packet be passed through without
      * transformig its contents if used together with {@link PacketWrapper#PASSTHROUGH_ID}.

api/src/main/java/com/viaversion/viaversion/api/data/BiMappings.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2023 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

api/src/main/java/com/viaversion/viaversion/api/data/BiMappingsBase.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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

api/src/main/java/com/viaversion/viaversion/api/data/FullMappings.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -27,12 +27,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 /**
  * Mappings containing the full string identifier mappings.
  */
-public interface FullMappings extends Mappings {
-
-    @Deprecated
-    default Mappings mappings() {
-        return this;
-    }
+public interface FullMappings extends BiMappings {
 
     /**
      * Returns the unmapped integer id for the given identifier, or -1 if not found.
@@ -54,17 +49,17 @@ public interface FullMappings extends Mappings {
      * Returns the unmapped string identifier for the given mapped id.
      *
      * @param id unmapped id
-     * @return unmapped string identifier
+     * @return unmapped string identifier, or null if out of bounds
      */
-    String identifier(int id);
+    @Nullable String identifier(int id);
 
     /**
      * Returns the mapped string identifier for the given mapped id.
      *
      * @param mappedId mapped id
-     * @return mapped string identifier
+     * @return mapped string identifier, or null if out of bounds
      */
-    String mappedIdentifier(int mappedId);
+    @Nullable String mappedIdentifier(int mappedId);
 
     /**
      * Returns the mapped string identifier for the given unmapped identifier.

api/src/main/java/com/viaversion/viaversion/api/data/FullMappingsBase.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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.data;
 
+import com.google.common.base.Preconditions;
 import com.viaversion.viaversion.util.Key;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
@@ -37,6 +38,7 @@ public class FullMappingsBase implements FullMappings {
     private final Mappings mappings;
 
     public FullMappingsBase(final List<String> unmappedIdentifiers, final List<String> mappedIdentifiers, final Mappings mappings) {
+        Preconditions.checkNotNull(mappings, "Mappings cannot be null");
         this.mappings = mappings;
         this.stringToId = toInverseMap(unmappedIdentifiers);
         this.mappedStringToId = toInverseMap(mappedIdentifiers);
@@ -52,9 +54,13 @@ public class FullMappingsBase implements FullMappings {
         this.mappings = mappings;
     }
 
-    @Override
-    public Mappings mappings() {
-        return mappings;
+    private static Object2IntMap<String> toInverseMap(final List<String> list) {
+        final Object2IntMap<String> map = new Object2IntOpenHashMap<>(list.size());
+        map.defaultReturnValue(-1);
+        for (int i = 0; i < list.size(); i++) {
+            map.put(list.get(i), i);
+        }
+        return map;
     }
 
     @Override
@@ -69,12 +75,20 @@ public class FullMappingsBase implements FullMappings {
 
     @Override
     public String identifier(final int id) {
+        if (id < 0 || id >= idToString.length) {
+            return null;
+        }
+
         final String identifier = idToString[id];
         return Key.namespaced(identifier);
     }
 
     @Override
     public String mappedIdentifier(final int mappedId) {
+        if (mappedId < 0 || mappedId >= mappedIdToString.length) {
+            return null;
+        }
+
         final String identifier = mappedIdToString[mappedId];
         return Key.namespaced(identifier);
     }
@@ -114,13 +128,4 @@ public class FullMappingsBase implements FullMappings {
     public FullMappings inverse() {
         return new FullMappingsBase(mappedStringToId, stringToId, mappedIdToString, idToString, mappings.inverse());
     }
-
-    private static Object2IntMap<String> toInverseMap(final List<String> list) {
-        final Object2IntMap<String> map = new Object2IntOpenHashMap<>(list.size());
-        map.defaultReturnValue(-1);
-        for (int i = 0; i < list.size(); i++) {
-            map.put(list.get(i), i);
-        }
-        return map;
-    }
 }

api/src/main/java/com/viaversion/viaversion/api/data/IdentityMappings.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2023 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,15 +22,7 @@
  */
 package com.viaversion.viaversion.api.data;
 
-public class IdentityMappings implements Mappings {
-
-    private final int size;
-    private final int mappedSize;
-
-    public IdentityMappings(final int size, final int mappedSize) {
-        this.size = size;
-        this.mappedSize = mappedSize;
-    }
+public record IdentityMappings(int size, int mappedSize) implements Mappings {
 
     @Override
     public int getNewId(final int id) {
@@ -42,16 +34,6 @@ public class IdentityMappings implements Mappings {
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public int size() {
-        return size;
-    }
-
-    @Override
-    public int mappedSize() {
-        return mappedSize;
-    }
-
     @Override
     public Mappings inverse() {
         return new IdentityMappings(mappedSize, size);

api/src/main/java/com/viaversion/viaversion/api/data/Int2IntMapBiMappings.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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

api/src/main/java/com/viaversion/viaversion/api/data/Int2IntMapMappings.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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

api/src/main/java/com/viaversion/viaversion/api/data/IntArrayMappings.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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,11 +37,6 @@ public class IntArrayMappings implements Mappings {
         return new IntArrayMappings(mappings, mappedIds);
     }
 
-    @Deprecated
-    public static Builder<IntArrayMappings> builder() {
-        return Mappings.builder(IntArrayMappings::new);
-    }
-
     @Override
     public int getNewId(int id) {
         return id >= 0 && id < mappings.length ? mappings[id] : -1;

api/src/main/java/com/viaversion/viaversion/api/data/MappingData.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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,6 +79,8 @@ public interface MappingData {
      */
     int getNewParticleId(int id);
 
+    int getNewAttributeId(int id);
+
     /**
      * Returns a list of tags to send if present.
      *
@@ -87,8 +89,21 @@ public interface MappingData {
      */
     @Nullable List<TagData> getTags(RegistryType type);
 
+    /**
+     * Returns item mappings.
+     *
+     * @return item mappings
+     */
     @Nullable BiMappings getItemMappings();
 
+    /**
+     * Returns item mappings if they also have identifier data present.
+     *
+     * @return item mappings if they also have identifier data present
+     * @see #getItemMappings()
+     */
+    @Nullable FullMappings getFullItemMappings();
+
     @Nullable ParticleMappings getParticleMappings();
 
     @Nullable Mappings getBlockMappings();
@@ -105,9 +120,15 @@ public interface MappingData {
 
     @Nullable Mappings getEnchantmentMappings();
 
+    @Nullable Mappings getAttributeMappings();
+
+    @Nullable Mappings getPaintingMappings();
+
     @Nullable FullMappings getEntityMappings();
 
     @Nullable FullMappings getArgumentTypeMappings();
 
-    @Nullable Mappings getPaintingMappings();
+    @Nullable FullMappings getRecipeSerializerMappings();
+
+    @Nullable FullMappings getDataComponentSerializerMappings();
 }

api/src/main/java/com/viaversion/viaversion/api/data/MappingDataBase.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,10 +22,9 @@
  */
 package com.viaversion.viaversion.api.data;
 
-import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import com.github.steveice10.opennbt.tag.builtin.IntArrayTag;
-import com.github.steveice10.opennbt.tag.builtin.ListTag;
-import com.github.steveice10.opennbt.tag.builtin.Tag;
+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.IntArrayTag;
+import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.minecraft.RegistryType;
 import com.viaversion.viaversion.api.minecraft.TagData;
@@ -34,7 +33,6 @@ import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 public class MappingDataBase implements MappingData {
@@ -44,6 +42,8 @@ public class MappingDataBase implements MappingData {
     protected BiMappings itemMappings;
     protected FullMappings argumentTypeMappings;
     protected FullMappings entityMappings;
+    protected FullMappings recipeSerializerMappings;
+    protected FullMappings itemDataSerializerMappings;
     protected ParticleMappings particleMappings;
     protected Mappings blockMappings;
     protected Mappings blockStateMappings;
@@ -53,6 +53,7 @@ public class MappingDataBase implements MappingData {
     protected Mappings enchantmentMappings;
     protected Mappings paintingMappings;
     protected Mappings menuMappings;
+    protected Mappings attributeMappings;
     protected Map<RegistryType, List<TagData>> tags;
 
     public MappingDataBase(final String unmappedVersion, final String mappedVersion) {
@@ -66,7 +67,7 @@ public class MappingDataBase implements MappingData {
             getLogger().info("Loading " + unmappedVersion + " -> " + mappedVersion + " mappings...");
         }
 
-        final CompoundTag data = readNBTFile("mappings-" + unmappedVersion + "to" + mappedVersion + ".nbt");
+        final CompoundTag data = readMappingsFile("mappings-" + unmappedVersion + "to" + mappedVersion + ".nbt");
         blockMappings = loadMappings(data, "blocks");
         blockStateMappings = loadMappings(data, "blockstates");
         blockEntityMappings = loadMappings(data, "blockentities");
@@ -75,48 +76,76 @@ public class MappingDataBase implements MappingData {
         menuMappings = loadMappings(data, "menus");
         enchantmentMappings = loadMappings(data, "enchantments");
         paintingMappings = loadMappings(data, "paintings");
-        itemMappings = loadBiMappings(data, "items");
+        attributeMappings = loadMappings(data, "attributes");
 
-        final CompoundTag unmappedIdentifierData = MappingDataLoader.loadNBT("identifiers-" + unmappedVersion + ".nbt", true);
-        final CompoundTag mappedIdentifierData = MappingDataLoader.loadNBT("identifiers-" + mappedVersion + ".nbt", true);
+
+        final CompoundTag unmappedIdentifierData = readUnmappedIdentifiersFile("identifiers-" + unmappedVersion + ".nbt");
+        final CompoundTag mappedIdentifierData = readMappedIdentifiersFile("identifiers-" + mappedVersion + ".nbt");
         if (unmappedIdentifierData != null && mappedIdentifierData != null) {
+            itemMappings = loadFullMappings(data, unmappedIdentifierData, mappedIdentifierData, "items");
             entityMappings = loadFullMappings(data, unmappedIdentifierData, mappedIdentifierData, "entities");
             argumentTypeMappings = loadFullMappings(data, unmappedIdentifierData, mappedIdentifierData, "argumenttypes");
+            recipeSerializerMappings = loadFullMappings(data, unmappedIdentifierData, mappedIdentifierData, "recipe_serializers");
+            itemDataSerializerMappings = loadFullMappings(data, unmappedIdentifierData, mappedIdentifierData, "data_component_type");
 
-            final ListTag unmappedParticles = unmappedIdentifierData.get("particles");
-            final ListTag mappedParticles = mappedIdentifierData.get("particles");
+            final List<String> unmappedParticles = identifiersFromGlobalIds(unmappedIdentifierData, "particles");
+            final List<String> mappedParticles = identifiersFromGlobalIds(mappedIdentifierData, "particles");
             if (unmappedParticles != null && mappedParticles != null) {
                 Mappings particleMappings = loadMappings(data, "particles");
                 if (particleMappings == null) {
                     particleMappings = new IdentityMappings(unmappedParticles.size(), mappedParticles.size());
                 }
-
-                final List<String> identifiers = unmappedParticles.getValue().stream().map(t -> (String) t.getValue()).collect(Collectors.toList());
-                final List<String> mappedIdentifiers = mappedParticles.getValue().stream().map(t -> (String) t.getValue()).collect(Collectors.toList());
-                this.particleMappings = new ParticleMappings(identifiers, mappedIdentifiers, particleMappings);
+                this.particleMappings = new ParticleMappings(unmappedParticles, mappedParticles, particleMappings);
             }
+        } else {
+            // Might not have identifiers in older versions
+            itemMappings = loadBiMappings(data, "items");
         }
 
-        final CompoundTag tagsTag = data.get("tags");
+        final CompoundTag tagsTag = data.getCompoundTag("tags");
         if (tagsTag != null) {
             this.tags = new EnumMap<>(RegistryType.class);
             loadTags(RegistryType.ITEM, tagsTag);
             loadTags(RegistryType.BLOCK, tagsTag);
+            loadTags(RegistryType.ENTITY, tagsTag);
         }
 
         loadExtras(data);
     }
 
-    protected @Nullable CompoundTag readNBTFile(final String name) {
-        return MappingDataLoader.loadNBT(name);
+    protected @Nullable List<String> identifiersFromGlobalIds(final CompoundTag mappingsTag, final String key) {
+        return MappingDataLoader.INSTANCE.identifiersFromGlobalIds(mappingsTag, key);
+    }
+
+    protected @Nullable CompoundTag readMappingsFile(final String name) {
+        return MappingDataLoader.INSTANCE.loadNBT(name);
+    }
+
+    protected @Nullable CompoundTag readUnmappedIdentifiersFile(final String name) {
+        return MappingDataLoader.INSTANCE.loadNBT(name, true);
+    }
+
+    protected @Nullable CompoundTag readMappedIdentifiersFile(final String name) {
+        return MappingDataLoader.INSTANCE.loadNBT(name, true);
     }
 
     protected @Nullable Mappings loadMappings(final CompoundTag data, final String key) {
-        return MappingDataLoader.loadMappings(data, key);
+        return MappingDataLoader.INSTANCE.loadMappings(data, key);
     }
 
-    protected @Nullable FullMappings loadFullMappings(final CompoundTag data, final CompoundTag unmappedIdentifiers, final CompoundTag mappedIdentifiers, final String key) {
-        return MappingDataLoader.loadFullMappings(data, unmappedIdentifiers, mappedIdentifiers, key);
+    protected @Nullable FullMappings loadFullMappings(final CompoundTag data, final CompoundTag unmappedIdentifiersTag, final CompoundTag mappedIdentifiersTag, final String key) {
+        if (!unmappedIdentifiersTag.contains(key) || !mappedIdentifiersTag.contains(key)) {
+            return null;
+        }
+
+        final List<String> unmappedIdentifiers = identifiersFromGlobalIds(unmappedIdentifiersTag, key);
+        final List<String> mappedIdentifiers = identifiersFromGlobalIds(mappedIdentifiersTag, key);
+        Mappings mappings = loadBiMappings(data, key); // Load as bi-mappings to keep the inverse cached
+        if (mappings == null) {
+            mappings = new IdentityMappings(unmappedIdentifiers.size(), mappedIdentifiers.size());
+        }
+
+        return new FullMappingsBase(unmappedIdentifiers, mappedIdentifiers, mappings);
     }
 
     protected @Nullable BiMappings loadBiMappings(final CompoundTag data, final String key) {
@@ -125,7 +154,7 @@ public class MappingDataBase implements MappingData {
     }
 
     private void loadTags(final RegistryType type, final CompoundTag data) {
-        final CompoundTag tag = data.get(type.resourceLocation());
+        final CompoundTag tag = data.getCompoundTag(type.resourceLocation());
         if (tag == null) {
             return;
         }
@@ -164,6 +193,11 @@ public class MappingDataBase implements MappingData {
         return checkValidity(id, particleMappings.getNewId(id), "particles");
     }
 
+    @Override
+    public int getNewAttributeId(final int id) {
+        return checkValidity(id, attributeMappings.getNewId(id), "attributes");
+    }
+
     @Override
     public @Nullable List<TagData> getTags(final RegistryType type) {
         return tags != null ? tags.get(type) : null;
@@ -174,6 +208,14 @@ public class MappingDataBase implements MappingData {
         return itemMappings;
     }
 
+    @Override
+    public @Nullable FullMappings getFullItemMappings() {
+        if (itemMappings instanceof FullMappings) {
+            return (FullMappings) itemMappings;
+        }
+        return null;
+    }
+
     @Override
     public @Nullable ParticleMappings getParticleMappings() {
         return particleMappings;
@@ -214,6 +256,11 @@ public class MappingDataBase implements MappingData {
         return enchantmentMappings;
     }
 
+    @Override
+    public @Nullable Mappings getAttributeMappings() {
+        return attributeMappings;
+    }
+
     @Override
     public @Nullable FullMappings getEntityMappings() {
         return entityMappings;
@@ -224,11 +271,21 @@ public class MappingDataBase implements MappingData {
         return argumentTypeMappings;
     }
 
+    @Override
+    public @Nullable FullMappings getDataComponentSerializerMappings() {
+        return itemDataSerializerMappings;
+    }
+
     @Override
     public @Nullable Mappings getPaintingMappings() {
         return paintingMappings;
     }
 
+    @Override
+    public @Nullable FullMappings getRecipeSerializerMappings() {
+        return recipeSerializerMappings;
+    }
+
     protected Logger getLogger() {
         return Via.getPlatform().getLogger();
     }
@@ -253,4 +310,4 @@ public class MappingDataBase implements MappingData {
 
     protected void loadExtras(final CompoundTag data) {
     }
-}
+}

api/src/main/java/com/viaversion/viaversion/api/data/MappingDataLoader.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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,49 +22,95 @@
  */
 package com.viaversion.viaversion.api.data;
 
-import com.github.steveice10.opennbt.NBTIO;
-import com.github.steveice10.opennbt.tag.builtin.ByteTag;
-import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import com.github.steveice10.opennbt.tag.builtin.IntArrayTag;
-import com.github.steveice10.opennbt.tag.builtin.IntTag;
-import com.github.steveice10.opennbt.tag.builtin.ListTag;
 import com.google.common.annotations.Beta;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonIOException;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSyntaxException;
+import com.viaversion.nbt.io.NBTIO;
+import com.viaversion.nbt.io.TagReader;
+import com.viaversion.nbt.tag.ByteTag;
+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.IntArrayTag;
+import com.viaversion.nbt.tag.IntTag;
+import com.viaversion.nbt.tag.ListTag;
+import com.viaversion.nbt.tag.StringTag;
+import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.util.GsonUtil;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
+import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
+import java.util.logging.Logger;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-public final class MappingDataLoader {
+public class MappingDataLoader {
 
+    public static final MappingDataLoader INSTANCE = new MappingDataLoader(MappingDataLoader.class, "assets/viaversion/data/");
+    public static final TagReader<CompoundTag> MAPPINGS_READER = NBTIO.reader(CompoundTag.class).named();
+    private static final Map<String, String[]> GLOBAL_IDENTIFIER_INDEXES = new HashMap<>();
     private static final byte DIRECT_ID = 0;
     private static final byte SHIFTS_ID = 1;
     private static final byte CHANGES_ID = 2;
     private static final byte IDENTITY_ID = 3;
-    private static final Map<String, CompoundTag> MAPPINGS_CACHE = new HashMap<>();
-    private static boolean cacheValid = true;
 
-    @Deprecated/*(forRemoval = true)*/
-    public static void enableMappingsCache() {
-        // Always enabled
+    private final Map<String, CompoundTag> mappingsCache = new HashMap<>();
+    private final Class<?> dataLoaderClass;
+    private final String dataPath;
+    private boolean cacheValid = true;
+
+    public MappingDataLoader(final Class<?> dataLoaderClass, final String dataPath) {
+        this.dataLoaderClass = dataLoaderClass;
+        this.dataPath = dataPath;
     }
 
-    public static void clearCache() {
-        MAPPINGS_CACHE.clear();
+    public static void loadGlobalIdentifiers() {
+        // Load in a file with all the identifiers we need, so that we don't need to duplicate them
+        // for every single new version with only a couple of changes in them.
+        final CompoundTag globalIdentifiers = INSTANCE.loadNBT("identifier-table.nbt");
+        for (final Map.Entry<String, Tag> entry : globalIdentifiers.entrySet()) {
+            //noinspection unchecked
+            final ListTag<StringTag> value = (ListTag<StringTag>) entry.getValue();
+            final String[] array = new String[value.size()];
+            for (int i = 0, size = value.size(); i < size; i++) {
+                array[i] = value.get(i).getValue();
+            }
+            GLOBAL_IDENTIFIER_INDEXES.put(entry.getKey(), array);
+        }
+    }
+
+    /**
+     * Returns the global id of the identifier in the registry.
+     *
+     * @param registry registry key
+     * @param globalId global id
+     * @return identifier
+     * @throws IllegalArgumentException if the registry key is invalid
+     */
+    public @Nullable String identifierFromGlobalId(final String registry, final int globalId) {
+        final String[] array = GLOBAL_IDENTIFIER_INDEXES.get(registry);
+        if (array == null) {
+            throw new IllegalArgumentException("Unknown global identifier key: " + registry);
+        }
+        if (globalId < 0 || globalId >= array.length) {
+            throw new IllegalArgumentException("Unknown global identifier index: " + globalId);
+        }
+        return array[globalId];
+    }
+
+    public void clearCache() {
+        mappingsCache.clear();
         cacheValid = false;
     }
 
@@ -73,8 +119,8 @@ public final class MappingDataLoader {
      *
      * @return loaded json object, or null if not found or invalid
      */
-    public static @Nullable JsonObject loadFromDataDir(final String name) {
-        final File file = new File(Via.getPlatform().getDataFolder(), name);
+    public @Nullable JsonObject loadFromDataDir(final String name) {
+        final File file = new File(getDataFolder(), name);
         if (!file.exists()) {
             return loadData(name);
         }
@@ -84,7 +130,7 @@ public final class MappingDataLoader {
             return GsonUtil.getGson().fromJson(reader, JsonObject.class);
         } catch (final JsonSyntaxException e) {
             // Users might mess up the format, so let's catch the syntax error
-            Via.getPlatform().getLogger().warning(name + " is badly formatted!");
+            getLogger().warning(name + " is badly formatted!");
             throw new RuntimeException(e);
         } catch (final IOException | JsonIOException e) {
             throw new RuntimeException(e);
@@ -96,7 +142,7 @@ public final class MappingDataLoader {
      *
      * @return loaded json object from bundled resources if present
      */
-    public static @Nullable JsonObject loadData(final String name) {
+    public @Nullable JsonObject loadData(final String name) {
         final InputStream stream = getResource(name);
         if (stream == null) {
             return null;
@@ -109,12 +155,12 @@ public final class MappingDataLoader {
         }
     }
 
-    public static @Nullable CompoundTag loadNBT(final String name, final boolean cache) {
+    public @Nullable CompoundTag loadNBT(final String name, final boolean cache) {
         if (!cacheValid) {
             return loadNBTFromFile(name);
         }
 
-        CompoundTag data = MAPPINGS_CACHE.get(name);
+        CompoundTag data = mappingsCache.get(name);
         if (data != null) {
             return data;
         }
@@ -122,29 +168,29 @@ public final class MappingDataLoader {
         data = loadNBTFromFile(name);
 
         if (cache && data != null) {
-            MAPPINGS_CACHE.put(name, data);
+            mappingsCache.put(name, data);
         }
         return data;
     }
 
-    public static @Nullable CompoundTag loadNBT(final String name) {
+    public @Nullable CompoundTag loadNBT(final String name) {
         return loadNBT(name, false);
     }
 
-    private static @Nullable CompoundTag loadNBTFromFile(final String name) {
+    public @Nullable CompoundTag loadNBTFromFile(final String name) {
         final InputStream resource = getResource(name);
         if (resource == null) {
             return null;
         }
 
-        try (final InputStream stream = resource) {
-            return NBTIO.readTag(stream);
+        try (final InputStream stream = new BufferedInputStream(resource)) {
+            return MAPPINGS_READER.read(stream);
         } catch (final IOException e) {
             throw new RuntimeException(e);
         }
     }
 
-    public static @Nullable Mappings loadMappings(final CompoundTag mappingsTag, final String key) {
+    public @Nullable Mappings loadMappings(final CompoundTag mappingsTag, final String key) {
         return loadMappings(mappingsTag, key, size -> {
             final int[] array = new int[size];
             Arrays.fill(array, -1);
@@ -153,29 +199,29 @@ public final class MappingDataLoader {
     }
 
     @Beta
-    public static <M extends Mappings, V> @Nullable Mappings loadMappings(
-            final CompoundTag mappingsTag,
-            final String key,
-            final MappingHolderSupplier<V> holderSupplier,
-            final AddConsumer<V> addConsumer,
-            final MappingsSupplier<M, V> mappingsSupplier
+    public <M extends Mappings, V> @Nullable Mappings loadMappings(
+        final CompoundTag mappingsTag,
+        final String key,
+        final MappingHolderSupplier<V> holderSupplier,
+        final AddConsumer<V> addConsumer,
+        final MappingsSupplier<M, V> mappingsSupplier
     ) {
-        final CompoundTag tag = mappingsTag.get(key);
+        final CompoundTag tag = mappingsTag.getCompoundTag(key);
         if (tag == null) {
             return null;
         }
 
-        final ByteTag serializationStragetyTag = tag.get("id");
-        final IntTag mappedSizeTag = tag.get("mappedSize");
+        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.get("val");
+            final IntArrayTag valuesTag = tag.getIntArrayTag("val");
             return IntArrayMappings.of(valuesTag.getValue(), mappedSizeTag.asInt());
         } else if (strategy == SHIFTS_ID) {
-            final IntArrayTag shiftsAtTag = tag.get("at");
-            final IntArrayTag shiftsTag = tag.get("to");
-            final IntTag sizeTag = tag.get("size");
+            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();
@@ -199,9 +245,9 @@ public final class MappingDataLoader {
                 }
             }
         } else if (strategy == CHANGES_ID) {
-            final IntArrayTag changesAtTag = tag.get("at");
-            final IntArrayTag valuesTag = tag.get("val");
-            final IntTag sizeTag = tag.get("size");
+            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;
             final int[] changesAt = changesAtTag.getValue();
             final int[] values = valuesTag.getValue();
@@ -221,7 +267,7 @@ public final class MappingDataLoader {
                 addConsumer.addTo(mappings, id, values[i]);
             }
         } else if (strategy == IDENTITY_ID) {
-            final IntTag sizeTag = tag.get("size");
+            final IntTag sizeTag = tag.getUnchecked("size");
             return new IdentityMappings(sizeTag.asInt(), mappedSizeTag.asInt());
         } else {
             throw new IllegalArgumentException("Unknown serialization strategy: " + strategy);
@@ -229,73 +275,17 @@ public final class MappingDataLoader {
         return mappingsSupplier.create(mappings, mappedSizeTag.asInt());
     }
 
-    public static FullMappings loadFullMappings(final CompoundTag mappingsTag, final CompoundTag unmappedIdentifiers, final CompoundTag mappedIdentifiers, final String key) {
-        final ListTag unmappedElements = unmappedIdentifiers.get(key);
-        final ListTag mappedElements = mappedIdentifiers.get(key);
-        if (unmappedElements == null || mappedElements == null) {
+    public @Nullable List<String> identifiersFromGlobalIds(final CompoundTag mappingsTag, final String key) {
+        final Mappings mappings = loadMappings(mappingsTag, key);
+        if (mappings == null) {
             return null;
         }
 
-        Mappings mappings = loadMappings(mappingsTag, key);
-        if (mappings == null) {
-            mappings = new IdentityMappings(unmappedElements.size(), mappedElements.size());
-        }
-
-        return new FullMappingsBase(
-                unmappedElements.getValue().stream().map(t -> (String) t.getValue()).collect(Collectors.toList()),
-                mappedElements.getValue().stream().map(t -> (String) t.getValue()).collect(Collectors.toList()),
-                mappings
-        );
-    }
-
-    @Deprecated
-    public static void mapIdentifiers(final int[] output, final JsonObject unmappedIdentifiers, final JsonObject mappedIdentifiers, @Nullable final JsonObject diffIdentifiers, final boolean warnOnMissing) {
-        final Object2IntMap<String> newIdentifierMap = MappingDataLoader.indexedObjectToMap(mappedIdentifiers);
-        for (final Map.Entry<String, JsonElement> entry : unmappedIdentifiers.entrySet()) {
-            final int id = Integer.parseInt(entry.getKey());
-            final int mappedId = mapIdentifierEntry(id, entry.getValue().getAsString(), newIdentifierMap, diffIdentifiers, warnOnMissing);
-            if (mappedId != -1) {
-                output[id] = mappedId;
-            }
-        }
-    }
-
-    private static int mapIdentifierEntry(final int id, final String val, final Object2IntMap<String> mappedIdentifiers, @Nullable final JsonObject diffIdentifiers, final boolean warnOnMissing) {
-        int mappedId = mappedIdentifiers.getInt(val);
-        if (mappedId == -1) {
-            // Search in diff mappings
-            if (diffIdentifiers != null) {
-                JsonElement diffElement = diffIdentifiers.get(val);
-                if (diffElement != null || (diffElement = diffIdentifiers.get(Integer.toString(id))) != null) {
-                    final String mappedName = diffElement.getAsString();
-                    if (mappedName.isEmpty()) {
-                        return -1; // "empty" remaps without warnings
-                    }
-
-                    mappedId = mappedIdentifiers.getInt(mappedName);
-
-                }
-            }
-            if (mappedId == -1) {
-                if (warnOnMissing && !Via.getConfig().isSuppressConversionWarnings() || Via.getManager().isDebug()) {
-                    Via.getPlatform().getLogger().warning("No key for " + val + " :( ");
-                }
-                return -1;
-            }
-        }
-        return mappedId;
-    }
-
-    @Deprecated
-    public static void mapIdentifiers(final int[] output, final JsonArray unmappedIdentifiers, final JsonArray mappedIdentifiers, @Nullable final JsonObject diffIdentifiers, final boolean warnOnMissing) {
-        final Object2IntMap<String> newIdentifierMap = MappingDataLoader.arrayToMap(mappedIdentifiers);
-        for (int id = 0; id < unmappedIdentifiers.size(); id++) {
-            final JsonElement unmappedIdentifier = unmappedIdentifiers.get(id);
-            final int mappedId = mapIdentifierEntry(id, unmappedIdentifier.getAsString(), newIdentifierMap, diffIdentifiers, warnOnMissing);
-            if (mappedId != -1) {
-                output[id] = mappedId;
-            }
+        final List<String> identifiers = new ArrayList<>(mappings.size());
+        for (int i = 0; i < mappings.size(); i++) {
+            identifiers.add(identifierFromGlobalId(key, mappings.getNewId(i)));
         }
+        return identifiers;
     }
 
     /**
@@ -304,7 +294,7 @@ public final class MappingDataLoader {
      * @param object json object
      * @return map with indexes hashed by their id value
      */
-    public static Object2IntMap<String> indexedObjectToMap(final JsonObject object) {
+    public Object2IntMap<String> indexedObjectToMap(final JsonObject object) {
         final Object2IntMap<String> map = new Object2IntOpenHashMap<>(object.size(), .99F);
         map.defaultReturnValue(-1);
         for (final Map.Entry<String, JsonElement> entry : object.entrySet()) {
@@ -319,7 +309,7 @@ public final class MappingDataLoader {
      * @param array json array
      * @return map with indexes hashed by their id value
      */
-    public static Object2IntMap<String> arrayToMap(final JsonArray array) {
+    public Object2IntMap<String> arrayToMap(final JsonArray array) {
         final Object2IntMap<String> map = new Object2IntOpenHashMap<>(array.size(), .99F);
         map.defaultReturnValue(-1);
         for (int i = 0; i < array.size(); i++) {
@@ -328,8 +318,16 @@ public final class MappingDataLoader {
         return map;
     }
 
-    public static @Nullable InputStream getResource(final String name) {
-        return MappingDataLoader.class.getClassLoader().getResourceAsStream("assets/viaversion/data/" + name);
+    public Logger getLogger() {
+        return Via.getPlatform().getLogger();
+    }
+
+    public File getDataFolder() {
+        return Via.getPlatform().getDataFolder();
+    }
+
+    public @Nullable InputStream getResource(final String name) {
+        return dataLoaderClass.getClassLoader().getResourceAsStream(dataPath + name);
     }
 
     @FunctionalInterface

api/src/main/java/com/viaversion/viaversion/api/data/Mappings.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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,11 +22,6 @@
  */
 package com.viaversion.viaversion.api.data;
 
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import java.util.Arrays;
-
 public interface Mappings {
 
     /**
@@ -89,123 +84,4 @@ public interface Mappings {
      * @return mappings with keys and values swapped
      */
     Mappings inverse();
-
-    static <T extends Mappings> Builder<T> builder(final MappingsSupplier<T> supplier) {
-        return new Builder<>(supplier);
-    }
-
-    @FunctionalInterface
-    interface MappingsSupplier<T extends Mappings> {
-
-        T supply(int[] mappings, int mappedIds);
-    }
-
-    @Deprecated
-    class Builder<T extends Mappings> {
-
-        protected final MappingsSupplier<T> supplier;
-        protected JsonElement unmapped;
-        protected JsonElement mapped;
-        protected JsonObject diffMappings;
-        protected int mappedSize = -1;
-        protected int size = -1;
-        protected boolean warnOnMissing = true;
-
-        protected Builder(final MappingsSupplier<T> supplier) {
-            this.supplier = supplier;
-        }
-
-        /**
-         * Sets a custom entry size different to the size of the unmapped collection.
-         *
-         * @param size custom entry size
-         * @return self
-         */
-        public Builder<T> customEntrySize(final int size) {
-            this.size = size;
-            return this;
-        }
-
-        /**
-         * Sets a custom entry mapped ids count different to the size of the mapped collection.
-         *
-         * @param size custom mapped id count
-         * @return self
-         */
-        public Builder<T> customMappedSize(final int size) {
-            this.mappedSize = size;
-            return this;
-        }
-
-        /**
-         * Sets whether warnings should be logged for missing mapped ids.
-         *
-         * @param warnOnMissing whether warnings should be logged for missing mapped ids
-         * @return self
-         */
-        public Builder<T> warnOnMissing(final boolean warnOnMissing) {
-            this.warnOnMissing = warnOnMissing;
-            return this;
-        }
-
-        public Builder<T> unmapped(final JsonArray unmappedArray) {
-            this.unmapped = unmappedArray;
-            return this;
-        }
-
-        public Builder<T> unmapped(final JsonObject unmappedObject) {
-            this.unmapped = unmappedObject;
-            return this;
-        }
-
-        public Builder<T> mapped(final JsonArray mappedArray) {
-            this.mapped = mappedArray;
-            return this;
-        }
-
-        public Builder<T> mapped(final JsonObject mappedObject) {
-            this.mapped = mappedObject;
-            return this;
-        }
-
-        public Builder<T> diffMappings(final JsonObject diffMappings) {
-            this.diffMappings = diffMappings;
-            return this;
-        }
-
-        public T build() {
-            final int size = this.size != -1 ? this.size : size(unmapped);
-            final int mappedSize = this.mappedSize != -1 ? this.mappedSize : size(mapped);
-            final int[] mappings = new int[size];
-            Arrays.fill(mappings, -1);
-
-            // Do conversion if one is an array and the other an object, otherwise directly map
-            if (unmapped.isJsonArray()) {
-                if (mapped.isJsonObject()) {
-                    MappingDataLoader.mapIdentifiers(mappings, toJsonObject(unmapped.getAsJsonArray()), mapped.getAsJsonObject(), diffMappings, warnOnMissing);
-                } else {
-                    MappingDataLoader.mapIdentifiers(mappings, unmapped.getAsJsonArray(), mapped.getAsJsonArray(), diffMappings, warnOnMissing);
-                }
-            } else if (mapped.isJsonArray()) {
-                MappingDataLoader.mapIdentifiers(mappings, unmapped.getAsJsonObject(), toJsonObject(mapped.getAsJsonArray()), diffMappings, warnOnMissing);
-            } else {
-                MappingDataLoader.mapIdentifiers(mappings, unmapped.getAsJsonObject(), mapped.getAsJsonObject(), diffMappings, warnOnMissing);
-            }
-
-            return supplier.supply(mappings, mappedSize);
-        }
-
-        protected int size(final JsonElement element) {
-            return element.isJsonObject() ? element.getAsJsonObject().size() : element.getAsJsonArray().size();
-        }
-
-        protected JsonObject toJsonObject(final JsonArray array) {
-            final JsonObject object = new JsonObject();
-            for (int i = 0; i < array.size(); i++) {
-                final JsonElement element = array.get(i);
-                object.add(Integer.toString(i), element);
-            }
-            return object;
-        }
-    }
 }

api/src/main/java/com/viaversion/viaversion/api/data/ParticleMappings.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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,6 +35,7 @@ public class ParticleMappings extends FullMappingsBase {
         addBlockParticle("block");
         addBlockParticle("falling_dust");
         addBlockParticle("block_marker");
+        addBlockParticle("dust_pillar");
         addItemParticle("item");
     }
 
@@ -55,19 +56,4 @@ public class ParticleMappings extends FullMappingsBase {
     public boolean isItemParticle(final int id) {
         return itemParticleIds.contains(id);
     }
-
-    @Deprecated/*(forRemoval = true)*/
-    public int getBlockId() {
-        return id("block");
-    }
-
-    @Deprecated/*(forRemoval = true)*/
-    public int getFallingDustId() {
-        return id("falling_dust");
-    }
-
-    @Deprecated/*(forRemoval = true)*/
-    public int getItemId() {
-        return id("item");
-    }
 }

api/src/main/java/com/viaversion/viaversion/api/data/entity/ClientEntityIdChangeListener.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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

api/src/main/java/com/viaversion/viaversion/api/data/entity/DimensionData.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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,6 +24,8 @@ package com.viaversion.viaversion.api.data.entity;
 
 public interface DimensionData {
 
+    int id();
+
     int minY();
 
     int height();

api/src/main/java/com/viaversion/viaversion/api/data/entity/EntityTracker.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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
@@ -34,6 +34,7 @@ public interface EntityTracker {
      *
      * @return user connection
      */
+    @Deprecated
     UserConnection user();
 
     /**
@@ -165,6 +166,8 @@ public interface EntityTracker {
 
     @Nullable DimensionData dimensionData(String dimension);
 
+    @Nullable DimensionData dimensionData(int dimensionId);
+
     void setDimensions(Map<String, DimensionData> dimensions);
 
     /**

api/src/main/java/com/viaversion/viaversion/api/data/entity/StoredEntityData.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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

api/src/main/java/com/viaversion/viaversion/api/data/entity/TrackedEntity.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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
@@ -48,11 +48,11 @@ public interface TrackedEntity {
     boolean hasData();
 
     /**
-     * Returns whether metadata has already been sent at least once for this entity.
+     * Returns whether entity data has already been sent at least once for this entity.
      *
-     * @return whether metadata has already been sent at least once for this entity
+     * @return whether entity data has already been sent at least once for this entity
      */
-    boolean hasSentMetadata();
+    boolean hasSentEntityData();
 
-    void sentMetadata(boolean sentMetadata);
+    void sentEntityData(boolean sentEntityData);
 }

api/src/main/java/com/viaversion/viaversion/api/debug/DebugHandler.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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,11 +23,12 @@
 package com.viaversion.viaversion.api.debug;
 
 import com.google.common.annotations.Beta;
+import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.protocol.packet.Direction;
 import com.viaversion.viaversion.api.protocol.packet.PacketType;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import java.util.logging.Level;
 
-@Beta
 public interface DebugHandler {
 
     /**
@@ -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,11 +67,13 @@ public interface DebugHandler {
      *
      * @param packetTypeName packet type name
      */
+    @Beta
     boolean removePacketTypeNameToLog(String packetTypeName);
 
     /**
      * Resets packet type filters.
      */
+    @Beta
     void clearPacketTypesToLog();
 
     /**
@@ -77,6 +82,7 @@ public interface DebugHandler {
      *
      * @return whether packets should be logged after being transformed
      */
+    @Beta
     boolean logPostPacketTransform();
 
     /**
@@ -84,6 +90,7 @@ public interface DebugHandler {
      *
      * @param logPostPacketTransform whether packets should be logged after being transformed
      */
+    @Beta
     void setLogPostPacketTransform(boolean logPostPacketTransform);
 
     /**
@@ -96,10 +103,23 @@ public interface DebugHandler {
      */
     boolean shouldLog(PacketWrapper wrapper, Direction direction);
 
+    @Beta
     default void enableAndLogIds(final PacketType... packetTypes) {
         setEnabled(true);
         for (final PacketType packetType : packetTypes) {
             addPacketTypeToLog(packetType);
         }
     }
+
+    /**
+     * Logs an error if debug mode is enabled or error suppression is disabled.
+     *
+     * @param error error message
+     * @param t     thrown exception
+     */
+    default void error(final String error, final Throwable t) {
+        if (!Via.getConfig().isSuppressConversionWarnings() || enabled()) {
+            Via.getPlatform().getLogger().log(Level.SEVERE, error, t);
+        }
+    }
 }

api/src/main/java/com/viaversion/viaversion/api/legacy/LegacyViaAPI.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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

api/src/main/java/com/viaversion/viaversion/api/legacy/bossbar/BossBar.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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

api/src/main/java/com/viaversion/viaversion/api/legacy/bossbar/BossColor.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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

api/src/main/java/com/viaversion/viaversion/api/legacy/bossbar/BossFlag.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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

api/src/main/java/com/viaversion/viaversion/api/legacy/bossbar/BossStyle.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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

api/src/main/java/com/viaversion/viaversion/api/minecraft/BlockChangeRecord.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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

api/src/main/java/com/viaversion/viaversion/api/minecraft/BlockChangeRecord1_16_2.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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

api/src/main/java/com/viaversion/viaversion/api/minecraft/BlockChangeRecord1_8.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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

api/src/main/java/com/viaversion/viaversion/api/minecraft/BlockFace.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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
@@ -34,7 +34,6 @@ public enum BlockFace {
     BOTTOM((byte) 0, (byte) -1, (byte) 0, EnumAxis.Y);
 
     public static final BlockFace[] HORIZONTAL = {NORTH, SOUTH, EAST, WEST};
-
     private static final Map<BlockFace, BlockFace> opposites = new EnumMap<>(BlockFace.class);
 
     static {
@@ -78,26 +77,6 @@ public enum BlockFace {
         return axis;
     }
 
-    @Deprecated/*(forRemoval = true)*/
-    public byte getModX() {
-        return modX;
-    }
-
-    @Deprecated/*(forRemoval = true)*/
-    public byte getModY() {
-        return modY;
-    }
-
-    @Deprecated/*(forRemoval = true)*/
-    public byte getModZ() {
-        return modZ;
-    }
-
-    @Deprecated/*(forRemoval = true)*/
-    public EnumAxis getAxis() {
-        return axis;
-    }
-
     public enum EnumAxis {
         X, Y, Z
     }

api/src/main/java/com/viaversion/viaversion/api/minecraft/BlockPosition.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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,29 +22,19 @@
  */
 package com.viaversion.viaversion.api.minecraft;
 
-public class Position {
+public class BlockPosition {
     protected final int x;
     protected final int y;
     protected final int z;
 
-    public Position(int x, int y, int z) {
+    public BlockPosition(int x, int y, int z) {
         this.x = x;
         this.y = y;
         this.z = z;
     }
 
-    // @Deprecated/*(forRemoval=true)*/ Just leave this unchecked
-    public Position(int x, short y, int z) {
-        this(x, (int) y, z);
-    }
-
-    @Deprecated/*(forRemoval=true)*/
-    public Position(Position toCopy) {
-        this(toCopy.x(), toCopy.y(), toCopy.z());
-    }
-
-    public Position getRelative(BlockFace face) {
-        return new Position(x + face.modX(), (short) (y + face.modY()), z + face.modZ());
+    public BlockPosition getRelative(BlockFace face) {
+        return new BlockPosition(x + face.modX(), y + face.modY(), z + face.modZ());
     }
 
     public int x() {
@@ -59,30 +49,15 @@ public class Position {
         return z;
     }
 
-    public GlobalPosition withDimension(String dimension) {
-        return new GlobalPosition(dimension, x, y, z);
-    }
-
-    @Deprecated/*(forRemoval=true)*/
-    public int getX() {
-        return x;
-    }
-
-    @Deprecated/*(forRemoval=true)*/
-    public int getY() {
-        return y;
-    }
-
-    @Deprecated/*(forRemoval=true)*/
-    public int getZ() {
-        return z;
+    public GlobalBlockPosition withDimension(String dimension) {
+        return new GlobalBlockPosition(dimension, x, y, z);
     }
 
     @Override
     public boolean equals(final Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
-        Position position = (Position) o;
+        BlockPosition position = (BlockPosition) o;
         if (x != position.x) return false;
         if (y != position.y) return false;
         return z == position.z;
@@ -98,10 +73,10 @@ public class Position {
 
     @Override
     public String toString() {
-        return "Position{" +
-                "x=" + x +
-                ", y=" + y +
-                ", z=" + z +
-                '}';
+        return "BlockPosition{" +
+            "x=" + x +
+            ", y=" + y +
+            ", z=" + z +
+            '}';
     }
 }

api/src/main/java/com/viaversion/viaversion/api/minecraft/ChunkPosition.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.minecraft.metadata;
+package com.viaversion.viaversion.api.minecraft;
 
 import java.util.Objects;
 
@@ -82,8 +82,8 @@ public final class ChunkPosition {
     @Override
     public String toString() {
         return "ChunkPosition{" +
-                "chunkX=" + chunkX +
-                ", chunkZ=" + chunkZ +
-                '}';
+            "chunkX=" + chunkX +
+            ", chunkZ=" + chunkZ +
+            '}';
     }
 }

api/src/main/java/com/viaversion/viaversion/api/minecraft/ClientWorld.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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.viaversion.api.connection.StorableObject;
-import com.viaversion.viaversion.api.connection.UserConnection;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
@@ -32,10 +31,6 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 public class ClientWorld implements StorableObject {
     private Environment environment;
 
-    @Deprecated/*(forRemoval = true)*/
-    public ClientWorld(final UserConnection connection) {
-    }
-
     public ClientWorld() {
     }
 

api/src/main/java/com/viaversion/viaversion/api/minecraft/Environment.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -38,20 +38,11 @@ public enum Environment {
         return id;
     }
 
-    @Deprecated/*(forRemoval = true)*/
-    public int getId() {
-        return id;
-    }
-
     public static Environment getEnvironmentById(int id) {
-        switch (id) {
-            default:
-            case -1:
-                return NETHER;
-            case 0:
-                return NORMAL;
-            case 1:
-                return END;
-        }
+        return switch (id) {
+            case 0 -> NORMAL;
+            case 1 -> END;
+            default -> NETHER; // -1 implicitly
+        };
     }
 }

api/src/main/java/com/viaversion/viaversion/api/minecraft/EulerAngle.java

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

api/src/main/java/com/viaversion/viaversion/api/minecraft/GameMode.java

@@ -0,0 +1,51 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2024 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft;
+
+public enum GameMode {
+
+    SURVIVAL("Survival Mode"),
+    CREATIVE("Creative Mode"),
+    ADVENTURE("Adventure Mode"),
+    SPECTATOR("Spectator Mode");
+
+    private final String text;
+
+    GameMode(String text) {
+        this.text = text;
+    }
+
+    public String text() {
+        return text;
+    }
+
+    public static GameMode getById(int id) {
+        return switch (id) {
+            case 0 -> SURVIVAL;
+            case 1 -> CREATIVE;
+            case 2 -> ADVENTURE;
+            case 3 -> SPECTATOR;
+            default -> throw new IllegalArgumentException("Unknown gamemode id: " + id);
+        };
+    }
+}

api/src/main/java/com/viaversion/viaversion/api/minecraft/GameProfile.java

@@ -0,0 +1,32 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2024 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft;
+
+import java.util.UUID;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public record GameProfile(@Nullable String name, @Nullable UUID id, Property[] properties) {
+
+    public record Property(String name, String value, @Nullable String signature) {
+    }
+}

api/src/main/java/com/viaversion/viaversion/api/minecraft/GlobalBlockPosition.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
+ * Copyright (C) 2016-2024 ViaVersion and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,10 +22,10 @@
  */
 package com.viaversion.viaversion.api.minecraft;
 
-public final class GlobalPosition extends Position {
+public final class GlobalBlockPosition extends BlockPosition {
     private final String dimension;
 
-    public GlobalPosition(final String dimension, final int x, final int y, final int z) {
+    public GlobalBlockPosition(final String dimension, final int x, final int y, final int z) {
         super(x, y, z);
         this.dimension = dimension;
     }
@@ -38,7 +38,7 @@ public final class GlobalPosition extends Position {
     public boolean equals(final Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
-        final GlobalPosition position = (GlobalPosition) o;
+        final GlobalBlockPosition position = (GlobalBlockPosition) o;
         if (x != position.x) return false;
         if (y != position.y) return false;
         if (z != position.z) return false;
@@ -56,11 +56,11 @@ public final class GlobalPosition extends Position {
 
     @Override
     public String toString() {
-        return "GlobalPosition{" +
-                "dimension='" + dimension + '\'' +
-                ", x=" + x +
-                ", y=" + y +
-                ", z=" + z +
-                '}';
+        return "GlobalBlockPosition{" +
+            "dimension='" + dimension + '\'' +
+            ", x=" + x +
+            ", y=" + y +
+            ", z=" + z +
+            '}';
     }
 }

api/src/main/java/com/viaversion/viaversion/api/minecraft/Holder.java

@@ -0,0 +1,82 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2024 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft;
+
+public interface Holder<T> {
+
+    /**
+     * Returns an indirect id holder.
+     *
+     * @param id  the id
+     * @param <T> the type of the value
+     * @return a new holder with the given id
+     * @throws IllegalArgumentException if the id is negative
+     */
+    static <T> Holder<T> of(final int id) {
+        return new HolderImpl<>(id);
+    }
+
+    /**
+     * Returns a direct value holder.
+     *
+     * @param value the value
+     * @param <T>   the type of the value
+     * @return a new direct holder
+     */
+    static <T> Holder<T> of(final T value) {
+        return new HolderImpl<>(value);
+    }
+
+    /**
+     * Returns true if this holder is backed by a direct value.
+     *
+     * @return true if the holder is direct
+     * @see #hasId()
+     */
+    boolean isDirect();
+
+    /**
+     * Returns true if this holder has an id.
+     *
+     * @return true if this holder has an id
+     * @see #isDirect()
+     */
+    boolean hasId();
+
+    /**
+     * Returns the value of this holder.
+     *
+     * @return the value of this holder
+     * @throws IllegalArgumentException if this holder is not direct
+     * @see #isDirect()
+     */
+    T value();
+
+    /**
+     * Returns the id of this holder, or -1 if this holder is direct.
+     *
+     * @return the id of this holder, or -1 if this holder is direct
+     * @see #hasId()
+     */
+    int id();
+}

api/src/main/java/com/viaversion/viaversion/api/minecraft/HolderImpl.java

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

api/src/main/java/com/viaversion/viaversion/api/minecraft/HolderSet.java

@@ -0,0 +1,79 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2024 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft;
+
+/**
+ * Set of ids that either holds a string tag key or an array of ids.
+ */
+public interface HolderSet {
+
+    /**
+     * Creates a new holder set for the given tag.
+     *
+     * @param tagKey the tag key
+     * @return a new holder set
+     */
+    static HolderSet of(final String tagKey) {
+        return new HolderSetImpl(tagKey);
+    }
+
+    /**
+     * Creates a new holder set for the given ids.
+     *
+     * @param ids the direct ids
+     * @return a new holder set
+     */
+    static HolderSet of(final int[] ids) {
+        return new HolderSetImpl(ids);
+    }
+
+    /**
+     * Gets the tag key.
+     *
+     * @return the tag key
+     * @see #hasTagKey()
+     */
+    String tagKey();
+
+    /**
+     * Returns whether this holder set has a tag key.
+     *
+     * @return true if this holder set has a tag key, false if it has direct ids
+     */
+    boolean hasTagKey();
+
+    /**
+     * Gets the direct ids.
+     *
+     * @return direct ids
+     * @see #hasIds()
+     */
+    int[] ids();
+
+    /**
+     * Returns whether this holder set has direct ids.
+     *
+     * @return true if this holder set has direct ids, false if it has a tag key
+     */
+    boolean hasIds();
+}

api/src/main/java/com/viaversion/viaversion/api/minecraft/HolderSetImpl.java

@@ -0,0 +1,56 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2024 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft;
+
+import com.viaversion.viaversion.util.EitherImpl;
+
+final class HolderSetImpl extends EitherImpl<String, int[]> implements HolderSet {
+
+    HolderSetImpl(final String tagKey) {
+        super(tagKey, null);
+    }
+
+    HolderSetImpl(final int[] ids) {
+        super(null, ids);
+    }
+
+    @Override
+    public String tagKey() {
+        return left();
+    }
+
+    @Override
+    public boolean hasTagKey() {
+        return isLeft();
+    }
+
+    @Override
+    public int[] ids() {
+        return right();
+    }
+
+    @Override
+    public boolean hasIds() {
+        return isRight();
+    }
+}

api/src/main/java/com/viaversion/viaversion/api/minecraft/Particle.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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,11 +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.IdHolder;
 import io.netty.buffer.ByteBuf;
 import java.util.ArrayList;
 import java.util.List;
 
-public final class Particle {
+public final class Particle implements IdHolder {
     private final List<ParticleData<?>> arguments = new ArrayList<>(4);
     private int id;
 
@@ -36,7 +37,8 @@ public final class Particle {
         this.id = id;
     }
 
-    public int getId() {
+    @Override
+    public int id() {
         return id;
     }
 
@@ -66,6 +68,18 @@ public final class Particle {
         arguments.add(index, new ParticleData<>(type, value));
     }
 
+    public <T> void set(final int index, final Type<T> type, final T value) {
+        arguments.set(index, new ParticleData<>(type, value));
+    }
+
+    @Override
+    public String toString() {
+        return "Particle{" +
+            "arguments=" + arguments +
+            ", id=" + id +
+            '}';
+    }
+
     public static final class ParticleData<T> {
         private final Type<T> type;
         private T value;
@@ -87,7 +101,7 @@ public final class Particle {
             this.value = value;
         }
 
-        public void write(final ByteBuf buf) throws Exception {
+        public void write(final ByteBuf buf) {
             type.write(buf, value);
         }
 
@@ -98,9 +112,9 @@ public final class Particle {
         @Override
         public String toString() {
             return "ParticleData{" +
-                    "type=" + type +
-                    ", value=" + value +
-                    '}';
+                "type=" + type +
+                ", value=" + value +
+                '}';
         }
     }
 }

api/src/main/java/com/viaversion/viaversion/api/minecraft/PlayerMessageSignature.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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,20 +24,5 @@ package com.viaversion.viaversion.api.minecraft;
 
 import java.util.UUID;
 
-public final class PlayerMessageSignature {
-    private final UUID uuid;
-    private final byte[] signatureBytes;
-
-    public PlayerMessageSignature(final UUID uuid, final byte[] signatureBytes) {
-        this.uuid = uuid;
-        this.signatureBytes = signatureBytes;
-    }
-
-    public UUID uuid() {
-        return uuid;
-    }
-
-    public byte[] signatureBytes() {
-        return signatureBytes;
-    }
+public record PlayerMessageSignature(UUID uuid, byte[] signatureBytes) {
 }

api/src/main/java/com/viaversion/viaversion/api/minecraft/ProfileKey.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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,26 +22,5 @@
  */
 package com.viaversion.viaversion.api.minecraft;
 
-public final class ProfileKey {
-    private final long expiresAt;
-    private final byte[] publicKey;
-    private final byte[] keySignature;
-
-    public ProfileKey(final long expiresAt, final byte[] publicKey, final byte[] keySignature) {
-        this.expiresAt = expiresAt;
-        this.publicKey = publicKey;
-        this.keySignature = keySignature;
-    }
-
-    public long expiresAt() {
-        return expiresAt;
-    }
-
-    public byte[] publicKey() {
-        return publicKey;
-    }
-
-    public byte[] keySignature() {
-        return keySignature;
-    }
+public record ProfileKey(long expiresAt, byte[] publicKey, byte[] keySignature) {
 }

api/src/main/java/com/viaversion/viaversion/api/minecraft/Quaternion.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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,42 +22,5 @@
  */
 package com.viaversion.viaversion.api.minecraft;
 
-public final class Quaternion {
-    private final float x;
-    private final float y;
-    private final float z;
-    private final float w;
-
-    public Quaternion(final float x, final float y, final float z, final float w) {
-        this.x = x;
-        this.y = y;
-        this.z = z;
-        this.w = w;
-    }
-
-    public float x() {
-        return x;
-    }
-
-    public float y() {
-        return y;
-    }
-
-    public float z() {
-        return z;
-    }
-
-    public float w() {
-        return w;
-    }
-
-    @Override
-    public String toString() {
-        return "Quaternion{" +
-                "x=" + x +
-                ", y=" + y +
-                ", z=" + z +
-                ", w=" + w +
-                '}';
-    }
+public record Quaternion(float x, float y, float z, float w) {
 }

api/src/main/java/com/viaversion/viaversion/api/minecraft/RegistryEntry.java

@@ -0,0 +1,33 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2024 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft;
+
+import com.viaversion.nbt.tag.Tag;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public record RegistryEntry(String key, @Nullable Tag tag) {
+
+    public RegistryEntry withKey(final String key) {
+        return new RegistryEntry(key, tag != null ? tag.copy() : null);
+    }
+}

api/src/main/java/com/viaversion/viaversion/api/minecraft/RegistryType.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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
@@ -57,11 +57,6 @@ public enum RegistryType {
         this.resourceLocation = resourceLocation;
     }
 
-    @Deprecated/*(forRemoval = true)*/
-    public String getResourceLocation() {
-        return resourceLocation;
-    }
-
     public String resourceLocation() {
         return resourceLocation;
     }

api/src/main/java/com/viaversion/viaversion/api/minecraft/SoundEvent.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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
@@ -20,24 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package us.myles.ViaVersion.api.boss;
+package com.viaversion.viaversion.api.minecraft;
 
-@Deprecated
-public enum BossStyle {
+import org.checkerframework.checker.nullness.qual.Nullable;
 
-    SOLID(0),
-    SEGMENTED_6(1),
-    SEGMENTED_10(2),
-    SEGMENTED_12(3),
-    SEGMENTED_20(4);
+public record SoundEvent(String identifier, @Nullable Float fixedRange) {
 
-    private final int id;
-
-    BossStyle(int id) {
-        this.id = id;
-    }
-
-    public int getId() {
-        return id;
+    public SoundEvent withIdentifier(final String identifier) {
+        return new SoundEvent(identifier, this.fixedRange);
     }
 }

api/src/main/java/com/viaversion/viaversion/api/minecraft/TagData.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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,20 +22,23 @@
  */
 package com.viaversion.viaversion.api.minecraft;
 
-public final class TagData {
-    private final String identifier;
-    private final int[] entries;
+import java.util.Arrays;
 
-    public TagData(final String identifier, final int[] entries) {
-        this.identifier = identifier;
-        this.entries = entries;
+public record TagData(String identifier, int[] entries) {
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        final TagData tagData = (TagData) o;
+        if (!identifier.equals(tagData.identifier)) return false;
+        return Arrays.equals(entries, tagData.entries);
     }
 
-    public String identifier() {
-        return identifier;
-    }
-
-    public int[] entries() {
-        return entries;
+    @Override
+    public int hashCode() {
+        int result = identifier.hashCode();
+        result = 31 * result + Arrays.hashCode(entries);
+        return result;
     }
 }

api/src/main/java/com/viaversion/viaversion/api/minecraft/Vector.java

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

api/src/main/java/com/viaversion/viaversion/api/minecraft/Vector3f.java

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

api/src/main/java/com/viaversion/viaversion/api/minecraft/VillagerData.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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,41 +22,5 @@
  */
 package com.viaversion.viaversion.api.minecraft;
 
-public class VillagerData {
-    private final int type;
-    private final int profession;
-    private final int level;
-
-    public VillagerData(final int type, final int profession, final int level) {
-        this.type = type;
-        this.profession = profession;
-        this.level = level;
-    }
-
-    public int type() {
-        return type;
-    }
-
-    public int profession() {
-        return profession;
-    }
-
-    public int level() {
-        return level;
-    }
-
-    @Deprecated/*(forRemoval=true)*/
-    public int getType() {
-        return type;
-    }
-
-    @Deprecated/*(forRemoval=true)*/
-    public int getProfession() {
-        return profession;
-    }
-
-    @Deprecated/*(forRemoval=true)*/
-    public int getLevel() {
-        return level;
-    }
+public record VillagerData(int type, int profession, int level) {
 }

api/src/main/java/com/viaversion/viaversion/api/minecraft/WorldIdentifiers.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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,34 +24,12 @@ package com.viaversion.viaversion.api.minecraft;
 
 import com.viaversion.viaversion.api.connection.StorableObject;
 
-public class WorldIdentifiers implements StorableObject {
+public record WorldIdentifiers(String overworld, String nether, String end) implements StorableObject {
     public static final String OVERWORLD_DEFAULT = "minecraft:overworld";
     public static final String NETHER_DEFAULT = "minecraft:the_nether";
     public static final String END_DEFAULT = "minecraft:the_end";
 
-    private final String overworld;
-    private final String nether;
-    private final String end;
-
     public WorldIdentifiers(String overworld) {
         this(overworld, NETHER_DEFAULT, END_DEFAULT);
     }
-
-    public WorldIdentifiers(String overworld, String nether, String end) {
-        this.overworld = overworld;
-        this.nether = nether;
-        this.end = end;
-    }
-
-    public String overworld() {
-        return this.overworld;
-    }
-
-    public String nether() {
-        return this.nether;
-    }
-
-    public String end() {
-        return this.end;
-    }
 }

api/src/main/java/com/viaversion/viaversion/api/minecraft/blockentity/BlockEntity.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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,7 +22,7 @@
  */
 package com.viaversion.viaversion.api.minecraft.blockentity;
 
-import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.viaversion.nbt.tag.CompoundTag;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 public interface BlockEntity {

api/src/main/java/com/viaversion/viaversion/api/minecraft/blockentity/BlockEntityImpl.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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,40 +22,9 @@
  */
 package com.viaversion.viaversion.api.minecraft.blockentity;
 
-import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.viaversion.nbt.tag.CompoundTag;
 
-public final class BlockEntityImpl implements BlockEntity {
-    private final byte packedXZ;
-    private final short y;
-    private final int typeId;
-    private final CompoundTag tag;
-
-    public BlockEntityImpl(final byte packedXZ, final short y, final int typeId, final CompoundTag tag) {
-        this.packedXZ = packedXZ;
-        this.y = y;
-        this.typeId = typeId;
-        this.tag = tag;
-    }
-
-    @Override
-    public byte packedXZ() {
-        return packedXZ;
-    }
-
-    @Override
-    public short y() {
-        return y;
-    }
-
-    @Override
-    public int typeId() {
-        return typeId;
-    }
-
-    @Override
-    public CompoundTag tag() {
-        return tag;
-    }
+public record BlockEntityImpl(byte packedXZ, short y, int typeId, CompoundTag tag) implements BlockEntity {
 
     @Override
     public BlockEntity withTypeId(int typeId) {

api/src/main/java/com/viaversion/viaversion/api/minecraft/chunks/BaseChunk.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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,7 +22,7 @@
  */
 package com.viaversion.viaversion.api.minecraft.chunks;
 
-import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity;
 import java.util.BitSet;
 import java.util.List;

api/src/main/java/com/viaversion/viaversion/api/minecraft/chunks/Chunk.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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,7 +22,7 @@
  */
 package com.viaversion.viaversion.api.minecraft.chunks;
 
-import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity;
 import java.util.BitSet;
 import java.util.List;

api/src/main/java/com/viaversion/viaversion/api/minecraft/chunks/Chunk1_18.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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,7 +22,7 @@
  */
 package com.viaversion.viaversion.api.minecraft.chunks;
 
-import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity;
 import java.util.BitSet;
 import java.util.List;

api/src/main/java/com/viaversion/viaversion/api/minecraft/chunks/ChunkSection.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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
@@ -52,86 +52,6 @@ public interface ChunkSection {
         return idx >> 4 & 0xF;
     }
 
-    @Deprecated/*(forRemoval = true)*/
-    default int getFlatBlock(int idx) {
-        return palette(PaletteType.BLOCKS).idAt(idx);
-    }
-
-    @Deprecated/*(forRemoval = true)*/
-    default int getFlatBlock(int x, int y, int z) {
-        return getFlatBlock(index(x, y, z));
-    }
-
-    @Deprecated/*(forRemoval = true)*/
-    default void setFlatBlock(int idx, int id) {
-        palette(PaletteType.BLOCKS).setIdAt(idx, id);
-    }
-
-    @Deprecated/*(forRemoval = true)*/
-    default void setFlatBlock(int x, int y, int z, int id) {
-        setFlatBlock(index(x, y, z), id);
-    }
-
-    @Deprecated/*(forRemoval = true)*/
-    default int getBlockWithoutData(int x, int y, int z) {
-        return getFlatBlock(x, y, z) >> 4;
-    }
-
-    @Deprecated/*(forRemoval = true)*/
-    default int getBlockData(int x, int y, int z) {
-        return getFlatBlock(x, y, z) & 0xF;
-    }
-
-    @Deprecated/*(forRemoval = true)*/
-    default void setBlockWithData(int x, int y, int z, int type, int data) {
-        setFlatBlock(index(x, y, z), type << 4 | (data & 0xF));
-    }
-
-    @Deprecated/*(forRemoval = true)*/
-    default void setBlockWithData(int idx, int type, int data) {
-        setFlatBlock(idx, type << 4 | (data & 0xF));
-    }
-
-    @Deprecated/*(forRemoval = true)*/
-    default void setPaletteIndex(int idx, int index) {
-        palette(PaletteType.BLOCKS).setPaletteIndexAt(idx, index);
-    }
-
-    @Deprecated/*(forRemoval = true)*/
-    default int getPaletteIndex(int idx) {
-        return palette(PaletteType.BLOCKS).paletteIndexAt(idx);
-    }
-
-    @Deprecated/*(forRemoval = true)*/
-    default int getPaletteSize() {
-        return palette(PaletteType.BLOCKS).size();
-    }
-
-    @Deprecated/*(forRemoval = true)*/
-    default int getPaletteEntry(int index) {
-        return palette(PaletteType.BLOCKS).idByIndex(index);
-    }
-
-    @Deprecated/*(forRemoval = true)*/
-    default void setPaletteEntry(int index, int id) {
-        palette(PaletteType.BLOCKS).setIdByIndex(index, id);
-    }
-
-    @Deprecated/*(forRemoval = true)*/
-    default void replacePaletteEntry(int oldId, int newId) {
-        palette(PaletteType.BLOCKS).replaceId(oldId, newId);
-    }
-
-    @Deprecated/*(forRemoval = true)*/
-    default void addPaletteEntry(int id) {
-        palette(PaletteType.BLOCKS).addId(id);
-    }
-
-    @Deprecated/*(forRemoval = true)*/
-    default void clearPalette() {
-        palette(PaletteType.BLOCKS).clear();
-    }
-
     /**
      * Returns the number of non-air blocks in this section.
      *

api/src/main/java/com/viaversion/viaversion/api/minecraft/chunks/ChunkSectionImpl.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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

api/src/main/java/com/viaversion/viaversion/api/minecraft/chunks/ChunkSectionLight.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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

api/src/main/java/com/viaversion/viaversion/api/minecraft/chunks/ChunkSectionLightImpl.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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

api/src/main/java/com/viaversion/viaversion/api/minecraft/chunks/DataPalette.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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

api/src/main/java/com/viaversion/viaversion/api/minecraft/chunks/DataPaletteImpl.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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
@@ -137,6 +137,7 @@ public final class DataPaletteImpl implements DataPalette {
 
     interface ChunkData {
         int get(int idx);
+
         void set(int idx, int val);
     }
 

api/src/main/java/com/viaversion/viaversion/api/minecraft/chunks/NibbleArray.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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

api/src/main/java/com/viaversion/viaversion/api/minecraft/chunks/PaletteType.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 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

api/src/main/java/com/viaversion/viaversion/api/minecraft/data/EmptyStructuredData.java

@@ -0,0 +1,94 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2024 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft.data;
+
+import io.netty.buffer.ByteBuf;
+
+final class EmptyStructuredData<T> implements StructuredData<T> {
+
+    private final StructuredDataKey<T> key;
+    private int id;
+
+    EmptyStructuredData(final StructuredDataKey<T> key, final int id) {
+        this.key = key;
+        this.id = id;
+    }
+
+    @Override
+    public void setValue(final T value) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void write(final ByteBuf buffer) {
+    }
+
+    @Override
+    public void setId(final int id) {
+        this.id = id;
+    }
+
+    @Override
+    public StructuredDataKey<T> key() {
+        return this.key;
+    }
+
+    @Override
+    public T value() {
+        return null;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return true;
+    }
+
+    @Override
+    public int id() {
+        return this.id;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        final EmptyStructuredData<?> that = (EmptyStructuredData<?>) o;
+        if (id != that.id) return false;
+        return key.equals(that.key);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = key.hashCode();
+        result = 31 * result + id;
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "EmptyStructuredData{" +
+            "key=" + key +
+            ", id=" + id +
+            '}';
+    }
+}

api/src/main/java/com/viaversion/viaversion/api/minecraft/data/FilledStructuredData.java

@@ -0,0 +1,103 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2024 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft.data;
+
+import com.google.common.base.Preconditions;
+import io.netty.buffer.ByteBuf;
+import java.util.Objects;
+
+final class FilledStructuredData<T> implements StructuredData<T> {
+
+    private final StructuredDataKey<T> key;
+    private T value;
+    private int id;
+
+    FilledStructuredData(final StructuredDataKey<T> key, final T value, final int id) {
+        Preconditions.checkNotNull(key);
+        this.key = key;
+        this.value = value;
+        this.id = id;
+    }
+
+    @Override
+    public void setValue(final T value) {
+        this.value = value;
+    }
+
+    @Override
+    public void write(final ByteBuf buffer) {
+        key.type().write(buffer, value);
+    }
+
+    @Override
+    public void setId(final int id) {
+        this.id = id;
+    }
+
+    @Override
+    public StructuredDataKey<T> key() {
+        return key;
+    }
+
+    @Override
+    public T value() {
+        return value;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return false;
+    }
+
+    @Override
+    public int id() {
+        return id;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        final FilledStructuredData<?> that = (FilledStructuredData<?>) o;
+        if (id != that.id) return false;
+        if (!key.equals(that.key)) return false;
+        return Objects.equals(value, that.value);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = key.hashCode();
+        result = 31 * result + (value != null ? value.hashCode() : 0);
+        result = 31 * result + id;
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "FilledStructuredData{" +
+            "key=" + key +
+            ", value=" + value +
+            ", id=" + id +
+            '}';
+    }
+}

api/src/main/java/com/viaversion/viaversion/api/minecraft/data/StructuredData.java

@@ -0,0 +1,80 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2024 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft.data;
+
+import com.viaversion.viaversion.util.IdHolder;
+import io.netty.buffer.ByteBuf;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public interface StructuredData<T> extends IdHolder {
+
+    /**
+     * Returns filled structured data, equivalent to an Optional with a value in vanilla.
+     *
+     * @param key   serializer key
+     * @param value value
+     * @param id    serializer id
+     * @param <T>   serializer type
+     * @return filled structured data
+     */
+    static <T> StructuredData<T> of(final StructuredDataKey<T> key, final T value, final int id) {
+        return new FilledStructuredData<>(key, value, id);
+    }
+
+    /**
+     * Returns empty structured data, equivalent to an empty Optional in vanilla.
+     *
+     * @param key serializer key
+     * @param id  serializer id
+     * @return empty structured data
+     */
+    static <T> StructuredData<T> empty(final StructuredDataKey<T> key, final int id) {
+        return new EmptyStructuredData<>(key, id);
+    }
+
+    void setValue(final T value);
+
+    void write(final ByteBuf buffer);
+
+    void setId(final int id);
+
+    StructuredDataKey<T> key();
+
+    @Nullable T value();
+
+    /**
+     * Returns whether the structured data is present. Even if true, the value may be null.
+     *
+     * @return true if the structured data is present
+     */
+    default boolean isPresent() {
+        return !isEmpty();
+    }
+
+    /**
+     * Returns whether the structured data is empty. Not to be confused with a null value.
+     *
+     * @return true if the structured data is empty
+     */
+    boolean isEmpty();
+}

api/src/main/java/com/viaversion/viaversion/api/minecraft/data/StructuredDataContainer.java

@@ -0,0 +1,170 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2024 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.viaversion.viaversion.api.minecraft.data;
+
+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.Unit;
+import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap;
+import java.util.Map;
+import java.util.function.Function;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public final class StructuredDataContainer {
+
+    private final Map<StructuredDataKey<?>, StructuredData<?>> data;
+    private FullMappings lookup;
+    private boolean mappedNames;
+
+    public StructuredDataContainer(final Map<StructuredDataKey<?>, StructuredData<?>> data) {
+        this.data = data;
+    }
+
+    public StructuredDataContainer(final StructuredData<?>[] dataArray) {
+        this(new Reference2ObjectOpenHashMap<>(dataArray.length));
+        for (final StructuredData<?> data : dataArray) {
+            this.data.put(data.key(), data);
+        }
+    }
+
+    public StructuredDataContainer() {
+        this(new Reference2ObjectOpenHashMap<>());
+    }
+
+    /**
+     * Returns structured data by id if present.
+     *
+     * @param key serializer id
+     * @param <T> data type
+     * @return structured data
+     */
+    public @Nullable <T> StructuredData<T> get(final StructuredDataKey<T> key) {
+        //noinspection unchecked
+        return (StructuredData<T>) this.data.get(key);
+    }
+
+    /**
+     * Returns structured data by id if not empty.
+     *
+     * @param key serializer id
+     * @param <T> data type
+     * @return structured data if not empty
+     */
+    public @Nullable <T> StructuredData<T> getNonEmpty(final StructuredDataKey<T> key) {
+        //noinspection unchecked
+        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;
+    }
+
+    public <T> void set(final StructuredDataKey<T> key, final T value) {
+        final int id = serializerId(key);
+        if (id != -1) {
+            this.data.put(key, StructuredData.of(key, value, id));
+        }
+    }
+
+    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 and returns structured data by the given key.
+     *
+     * @param key serializer key
+     * @param <T> data type
+     * @return removed structured data
+     */
+    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;
+    }
+
+    public boolean contains(final StructuredDataKey<?> key) {
+        return this.data.containsKey(key);
+    }
+
+    /**
+     * Sets the lookup for serializer ids. Required to call most of the other methods.
+     *
+     * @param protocol    protocol to retreive the id of the serializer from
+     * @param mappedNames if the names are mapped (true if structures from the mapped version are added, false for the unmapped version)
+     */
+    public void setIdLookup(final Protocol<?, ?, ?, ?> protocol, final boolean mappedNames) {
+        this.lookup = protocol.getMappingData().getDataComponentSerializerMappings();
+        Preconditions.checkNotNull(this.lookup, "Data component serializer mappings are null");
+        this.mappedNames = mappedNames;
+    }
+
+    public StructuredDataContainer copy() {
+        final StructuredDataContainer copy = new StructuredDataContainer(new Reference2ObjectOpenHashMap<>(data));
+        copy.lookup = this.lookup;
+        return copy;
+    }
+
+    private int serializerId(final StructuredDataKey<?> key) {
+        final int id = mappedNames ? lookup.mappedId(key.identifier()) : lookup.id(key.identifier());
+        if (id == -1) {
+            Via.getPlatform().getLogger().severe("Could not find item data serializer for type " + key);
+        }
+        return id;
+    }
+
+    public Map<StructuredDataKey<?>, StructuredData<?>> data() {
+        return data;
+    }
+
+    @Override
+    public String toString() {
+        return "StructuredDataContainer{" +
+            "data=" + data +
+            '}';
+    }
+}