Merge remote-tracking branch 'origin/master'

.editorconfig

@@ -2,7 +2,7 @@
 charset = utf-8
 indent_size = 4
 indent_style = space
-insert_final_newline = false
+insert_final_newline = true
 tab_width = 4
 
 [*.java]
@@ -13,4 +13,4 @@ ij_java_generate_final_locals = true
 ij_java_generate_final_parameters = true
 
 [{*.json,*.yml}]
-indent_size = 2
+indent_size = 2

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/gradle.yml → .github/workflows/build.yml

@@ -7,13 +7,13 @@ jobs:
     # Only run on PRs if the source branch is on a different repo. We do not need to run everything twice.
     if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout Repository
       uses: actions/checkout@v4
     - name: Validate Gradle Wrapper
-      uses: gradle/actions/wrapper-validation@v3
+      uses: gradle/actions/wrapper-validation@v4
     - name: Set up JDK 17
       uses: actions/setup-java@v4
       with:

.github/workflows/publish.yml

@@ -8,12 +8,12 @@ on:
 jobs:
   publish:
     if: github.repository_owner == 'ViaVersion'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
       - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v3
+        uses: gradle/actions/wrapper-validation@v4
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:

.github/workflows/update-gradle-wrapper.yml

@@ -0,0 +1,14 @@
+name: Update Gradle Wrapper
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * 0"
+
+jobs:
+  update-gradle-wrapper:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+      - name: Update Gradle Wrapper
+        uses: gradle-update/update-gradle-wrapper-action@v2

.gitignore

@@ -109,4 +109,7 @@ nb-configuration.xml
 .nb-gradle/
 
 ### MacOS ###
-.DS_Store
+.DS_Store
+
+### Run Folder (ViaProxy) ###
+common/run/

README.md

@@ -1,22 +1,22 @@
 # ViaVersion
 
 [![Latest Release](https://img.shields.io/github/v/release/ViaVersion/ViaVersion)](https://viaversion.com)
-[![Build Status](https://github.com/ViaVersion/ViaVersion/actions/workflows/gradle.yml/badge.svg?branch=master)](https://github.com/ViaVersion/ViaVersion/actions)
+[![Build Status](https://github.com/ViaVersion/ViaVersion/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/ViaVersion/ViaVersion/actions)
 [![Discord](https://img.shields.io/badge/chat-on%20discord-blue.svg)](https://viaversion.com/discord)
 
 **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 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.**
+any server version from the past decade. **See [HERE](https://viaversion.com) for an overview of the different Via\* projects.**
 
-Note that ViaVersion will be able to **run best on either Paper servers or Fabric clients** due to having
+Note that ViaVersion will be able to **run best on either Paper servers or through [ViaFabricPlus](https://github.com/ViaVersion/ViaFabricPlus?tab=readme-ov-file#viafabricplus)** due to having
 direct access to client/server state and more extensive API.
 
 Supported Versions:
 
-![Table (https://i.imgur.com/sTrVnC2.png)](https://i.imgur.com/sTrVnC2.png)
+![Table (https://i.imgur.com/zrQTcf0.png)](https://i.imgur.com/zrQTcf0.png)
 
 **User Docs:** https://docs.viaversion.com/display/VIAVERSION/
 
@@ -83,7 +83,7 @@ You need JDK 17 or newer to build ViaVersion.
 
 Mapping Files
 --------------
-Mapping files are generated and managed in our [Mappings repository](https://github.com/ViaVersion/Mappings).
+Mapping files are generated and managed in our [Mappings repository](https://github.com/ViaVersion/Mappings). The generated mapping output is stored [here](./common/src/main/resources/assets/viaversion).
 
 
 Resources
@@ -96,7 +96,7 @@ Resources
 
 License
 --------
-The entirety of the [API directory](api) (including the legacy API directory) is licensed under the MIT License;
+The entirety of the [API directory](api) is licensed under the MIT License;
 see [licenses/MIT.md](licenses/MIT.md) for
 details.
 

api/build.gradle.kts

@@ -19,13 +19,15 @@ dependencies {
     api(libs.vianbt) {
         exclude("it.unimi.dsi", "fastutil")
     }
-    api(libs.gson)
+    api(libs.gson) {
+        exclude("com.google.errorprone", "error_prone_annotations")
+    }
     implementation(rootProject.libs.text) {
         exclude("com.google.code.gson", "gson")
         exclude("com.viaversion", "nbt")
     }
+    api(libs.snakeYaml)
 
-    compileOnlyApi(libs.snakeYaml)
     compileOnlyApi(libs.netty)
     compileOnlyApi(libs.guava)
     compileOnlyApi(libs.checkerQual)

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

@@ -140,6 +140,13 @@ default void setDebug(boolean debug) {
      */
     void addEnableListener(Runnable runnable);
 
+    /**
+     * Adds a runnable to be executed when ViaVersion has finished its init after the full server load.
+     *
+     * @param runnable runnable to be executed
+     */
+    void addPostEnableListener(Runnable runnable);
+
     /**
      * Returns whether the manager has been initialized (and protocols have been loaded).
      *

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

@@ -67,9 +67,9 @@ public interface ViaVersionConfig extends Config {
     boolean isShowNewDeathMessages();
 
     /**
-     * Get if metadata errors will be suppressed
+     * Get if entity data errors will be suppressed
      *
-     * @return true if metadata errors suppression is enabled
+     * @return true if entity data errors suppression is enabled
      */
     boolean isSuppressMetadataErrors();
 
@@ -292,13 +292,6 @@ public interface ViaVersionConfig extends Config {
      */
     boolean isDisable1_13AutoComplete();
 
-    /**
-     * Tries to minimize cooldown animation.
-     *
-     * @return true if enabled
-     */
-    boolean isMinimizeCooldown();
-
     /**
      * Enable the serverside blockconnections for 1.13+ clients
      *
@@ -464,4 +457,25 @@ public interface ViaVersionConfig extends Config {
      * @return true if enabled
      */
     boolean handleInvalidItemCount();
+
+    /**
+     * Tries to cancel block break/place sounds sent by 1.8 servers to 1.9+ clients to prevent them from playing twice
+     *
+     * @return true if enabled
+     */
+    boolean cancelBlockSounds();
+
+    /**
+     * Hides scoreboard numbers for 1.20.3+ clients on older server versions.
+     *
+     * @return true if enabled
+     */
+    boolean hideScoreboardNumbers();
+
+    /**
+     * Fixes 1.21+ clients on 1.20.5 servers placing water/lava buckets at the wrong location when moving fast.
+     *
+     * @return true if enabled
+     */
+    boolean fix1_21PlacementRotation();
 }

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

@@ -29,6 +29,11 @@ protected StoredObject(UserConnection user) {
         this.user = user;
     }
 
+    public UserConnection user() {
+        return this.user;
+    }
+
+    @Deprecated
     public UserConnection getUser() {
         return user;
     }

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

@@ -24,6 +24,7 @@
 
 import com.viaversion.viaversion.api.configuration.ViaVersionConfig;
 import com.viaversion.viaversion.api.data.entity.EntityTracker;
+import com.viaversion.viaversion.api.minecraft.ClientWorld;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.protocol.packet.PacketTracker;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
@@ -99,14 +100,33 @@ public interface UserConnection {
     void addEntityTracker(Class<? extends Protocol> protocolClass, EntityTracker tracker);
 
     /**
-     * Clear stored objects and entity trackers.
+     * Returns the client world by the given protocol class if present.
+     *
+     * @param protocolClass protocol class
+     * @param <T>           client world type
+     * @return client world if present
+     */
+    @Nullable
+    <T extends ClientWorld> T getClientWorld(Class<? extends Protocol> protocolClass);
+
+    /**
+     * Adds a client world to the user connection.
+     * Does not override existing client worlds.
+     *
+     * @param protocolClass protocol class
+     * @param clientWorld   client world
+     */
+    void addClientWorld(Class<? extends Protocol> protocolClass, ClientWorld clientWorld);
+
+    /**
+     * Clear stored objects, entity trackers and client worlds.
      */
     default void clearStoredObjects() {
         clearStoredObjects(false);
     }
 
     /**
-     * Clear stored objects and entity trackers.
+     * Clear stored objects, entity trackers and client worlds.
      * If cleared for a proxy server switch, some stored objects and tracker data will be retained.
      *
      * @param isServerSwitch whether the clear is due to a server switch

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

@@ -53,6 +53,14 @@ public interface FullMappings extends BiMappings {
      */
     @Nullable String identifier(int id);
 
+    /**
+     * Returns the unmapped string identifier for the given mapped identifier.
+     *
+     * @param mappedIdentifier mapped identifier
+     * @return unmapped string identifier, or null if not found
+     */
+    @Nullable String identifier(String mappedIdentifier);
+
     /**
      * Returns the mapped string identifier for the given mapped id.
      *

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

@@ -83,6 +83,17 @@ public String identifier(final int id) {
         return Key.namespaced(identifier);
     }
 
+    @Override
+    public @Nullable String identifier(final String mappedIdentifier) {
+        final int mappedId = mappedId(mappedIdentifier);
+        if (mappedId == -1) {
+            return null;
+        }
+
+        final int id = mappings.inverse().getNewId(mappedId);
+        return id != -1 ? identifier(id) : null;
+    }
+
     @Override
     public String mappedIdentifier(final int mappedId) {
         if (mappedId < 0 || mappedId >= mappedIdToString.length) {