Merge remote-tracking branch 'origin/main'

.github/workflows/build.yml

@@ -9,7 +9,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
+        uses: gradle/actions/wrapper-validation@v4
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:

.github/workflows/publish.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@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-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+      - name: Update Gradle Wrapper
+        uses: gradle-update/update-gradle-wrapper-action@v1

build-logic/src/main/groovy/vaf.base-conventions.gradle

@@ -22,8 +22,8 @@ base {
 }
 
 dependencies {
-    compileOnly "com.viaversion:viaversion-common:5.0.3-SNAPSHOT"
-    compileOnly "com.viaversion:viabackwards-common:5.0.3-SNAPSHOT"
+    compileOnly "com.viaversion:viaversion-common:5.0.4-SNAPSHOT"
+    compileOnly "com.viaversion:viabackwards-common:5.0.4-SNAPSHOT"
 }
 
 publishing {

common/src/main/java/net/raphimc/viaaprilfools/protocol/s20w14infinitetov1_16/Protocol20w14infiniteTo1_16.java

@@ -25,7 +25,6 @@ import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.RegistryType;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_16;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 import com.viaversion.viaversion.protocols.v1_15_2to1_16.Protocol1_15_2To1_16;
@@ -166,7 +165,6 @@ public class Protocol20w14infiniteTo1_16 extends BackwardsProtocol<ClientboundPa
     @Override
     public void init(UserConnection userConnection) {
         userConnection.addEntityTracker(this.getClass(), new EntityTrackerBase(userConnection, EntityTypes1_16.PLAYER));
-        userConnection.getProtocolInfo().getPipeline().add(Via.getManager().getProtocolManager().getBaseProtocol(ProtocolVersion.v1_16));
     }
 
     @Override

common/src/main/java/net/raphimc/viaaprilfools/protocol/s3d_sharewaretov1_14/Protocol3D_SharewareTo1_14.java

@@ -20,11 +20,9 @@ package net.raphimc.viaaprilfools.protocol.s3d_sharewaretov1_14;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
 import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
-import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_14;
 import com.viaversion.viaversion.protocols.v1_13_2to1_14.Protocol1_13_2To1_14;
@@ -84,7 +82,6 @@ public class Protocol3D_SharewareTo1_14 extends BackwardsProtocol<ClientboundPac
     @Override
     public void init(UserConnection userConnection) {
         userConnection.put(new ChunkCenterTracker3D_Shareware());
-        userConnection.getProtocolInfo().getPipeline().add(Via.getManager().getProtocolManager().getBaseProtocol(ProtocolVersion.v1_14));
     }
 
     @Override

common/src/main/java/net/raphimc/viaaprilfools/protocol/scombattest8ctov1_16_2/ProtocolCombatTest8cTo1_16_2.java

@@ -17,11 +17,8 @@
  */
 package net.raphimc.viaaprilfools.protocol.scombattest8ctov1_16_2;
 
-import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.AbstractProtocol;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ClientboundPackets1_16_2;
 import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ServerboundPackets1_16_2;
@@ -48,9 +45,4 @@ public class ProtocolCombatTest8cTo1_16_2 extends AbstractProtocol<ClientboundPa
         });
     }
 
-    @Override
-    public void init(UserConnection userConnection) {
-        userConnection.getProtocolInfo().getPipeline().add(Via.getManager().getProtocolManager().getBaseProtocol(ProtocolVersion.v1_16_2));
-    }
-
 }

fabric/src/main/resources/fabric.mod.json

@@ -24,7 +24,8 @@
   "depends": {
     "fabricloader": ">=0.14.0",
     "viafabric": ">=0.4.10",
-    "viabackwards": ">=5.0.0"
+    "viaversion": ">=5.0.4-SNAPSHOT",
+    "viabackwards": ">=5.0.4-SNAPSHOT"
   },
   "custom": {
     "modmenu:api": true,

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionSha256Sum=5b9c5eb3f9fc2c94abaea57d90bd78747ca117ddbbf96c859d3741181a12bf2a
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

velocity/src/main/java/net/raphimc/viaaprilfools/VelocityPlugin.java

@@ -27,7 +27,6 @@ import com.velocitypowered.api.plugin.annotation.DataDirectory;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.ViaManager;
 import com.viaversion.viaversion.api.protocol.version.VersionProvider;
-import com.viaversion.viaversion.velocity.providers.VelocityVersionProvider;
 import com.viaversion.viaversion.velocity.util.LoggerWrapper;
 import net.raphimc.viaaprilfools.api.VAFServerVersionProvider;
 import net.raphimc.viaaprilfools.platform.ViaAprilFoolsPlatform;