1.5.2 Release

Closes https://github.com/ViaVersion/ViaRewind-Legacy-Support/issues/82

.github/FUNDING.yml

@@ -1,2 +1,2 @@
 github: FlorianMichael
-custom: ['https://florianmichael.de/donate', 'https://viaversion.com/donate', 'https://creeper123123321.github.io/#donate']
+custom: ['https://florianmichael.de/donate', 'https://creeper123123321.github.io/#donate']

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: ViaRewind-Legacy-Support CI
+name: Build
 on: [pull_request, push, workflow_dispatch]
 
 jobs:
@@ -7,22 +7,15 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
+        with:
+          persist-credentials: false
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v4
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17
           check-latest: true
-      - name: Cache Dependencies
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
       - name: Build with Gradle
-        run: ./gradlew build
+        run: ./gradlew build

.github/workflows/publish.yml

@@ -12,8 +12,10 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
+        with:
+          persist-credentials: false
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v4
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:

build.gradle

@@ -5,22 +5,21 @@ plugins {
 }
 
 repositories {
-    mavenLocal()
     maven {
         url = uri("https://repo.viaversion.com")
     }
-
     maven {
         url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
     }
-
     maven {
         url = uri("https://repo.maven.apache.org/maven2/")
     }
 }
 
-version = project.maven_version
-group = project.maven_group
+base {
+    version = project.maven_version
+    group = project.maven_group
+}
 
 dependencies {
     compileOnly "com.viaversion:viaversion-api:4.10.0"

gradle.properties

@@ -2,9 +2,9 @@
 org.gradle.jvmargs=-Xmx8G
 org.gradle.parallel=true
 
-
 # project
-maven_version=1.5.1
 maven_group=com.viaversion
+maven_version=1.5.2
 
-mcVersionRange=1.8-1.20.6
+# Smile emoji
+mcVersionRange=1.8-1.21.4

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionSha256Sum=7a00d51fb93147819aab76024feece20b6b84e420694101f276be952e08bef03
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-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
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -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
@@ -145,7 +148,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -153,7 +156,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +205,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

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 ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

src/main/java/com/viaversion/viarewind/legacysupport/BukkitPlugin.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaRewind-Legacy-Support - https://github.com/ViaVersion/ViaRewind-Legacy-Support
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/com/viaversion/viarewind/legacysupport/feature/AreaEffectCloudEmulator.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaRewind-Legacy-Support - https://github.com/ViaVersion/ViaRewind-Legacy-Support
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
 
 package com.viaversion.viarewind.legacysupport.feature;
 
+import com.viaversion.viarewind.legacysupport.util.NMSUtil;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viarewind.legacysupport.BukkitPlugin;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
@@ -40,11 +41,14 @@ public class AreaEffectCloudEmulator implements Listener {
 
     public AreaEffectCloudEmulator(final BukkitPlugin plugin) {
         Bukkit.getScheduler().runTaskTimer(plugin, () -> {
-            final Set<Player> affectedPlayers = Bukkit.getOnlinePlayers().stream().filter(p -> Via.getAPI().getPlayerProtocolVersion(p).newerThanOrEqualTo(ProtocolVersion.v1_8)).collect(Collectors.toSet());
+            final Set<Player> affectedPlayers = Bukkit.getOnlinePlayers().stream().filter(p -> Via.getAPI().getPlayerProtocolVersion(p).olderThanOrEqualTo(ProtocolVersion.v1_8)).collect(Collectors.toSet());
             effectClouds.removeIf(e -> !e.isValid());
             effectClouds.forEach(cloud -> {
                 final Location location = cloud.getLocation();
                 final float radius = cloud.getRadius();
+                final Object data = NMSUtil.NEWER_THAN_V1_20_5
+                        ? cloud.getColor()
+                        : null;
 
                 float area = (float) Math.PI * radius * radius;
 
@@ -67,7 +71,8 @@ public class AreaEffectCloudEmulator implements Listener {
                                     cloud.getParticle(),
                                     location.getX() + f3, location.getY(), location.getZ() + f6,
                                     0,
-                                    r / 255f, g / 255f, b / 255f
+                                    r / 255f, g / 255f, b / 255f,
+                                    data
                             );
                         });
                     }

src/main/java/com/viaversion/viarewind/legacysupport/feature/BlockCollisionChanges.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaRewind-Legacy-Support - https://github.com/ViaVersion/ViaRewind-Legacy-Support
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
 
 package com.viaversion.viarewind.legacysupport.feature;
 
+import com.viaversion.viarewind.legacysupport.util.ReflectionUtil;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 
 import java.lang.reflect.Field;
@@ -154,7 +155,10 @@ public class BlockCollisionChanges {
         final Field isEmpty = getFieldAccessible(voxelShape, "isEmpty");
         isEmpty.setBoolean(voxelShapeArray, true);
 
-        final Method initCache = voxelShape.getDeclaredMethod("initCache");
+        final Method initCache = ReflectionUtil.findMethod(voxelShape, new String[]{ "initCache", "moonrise$initCache" });
+        if (initCache == null) {
+            throw new IllegalStateException("Could not find initCache method in " + voxelShape.getName());
+        }
         initCache.invoke(voxelShapeArray);
     }
 }

src/main/java/com/viaversion/viarewind/legacysupport/feature/BlockPlaceSoundEmulator.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaRewind-Legacy-Support - https://github.com/ViaVersion/ViaRewind-Legacy-Support
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/com/viaversion/viarewind/legacysupport/feature/BrewingInteractionEmulator.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaRewind-Legacy-Support - https://github.com/ViaVersion/ViaRewind-Legacy-Support
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/com/viaversion/viarewind/legacysupport/feature/ElytraVelocityEmulator.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaRewind-Legacy-Support - https://github.com/ViaVersion/ViaRewind-Legacy-Support
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/com/viaversion/viarewind/legacysupport/feature/EnchantingGuiEmulator.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaRewind-Legacy-Support - https://github.com/ViaVersion/ViaRewind-Legacy-Support
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/com/viaversion/viarewind/legacysupport/feature/SlimeBounceEmulator.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaRewind-Legacy-Support - https://github.com/ViaVersion/ViaRewind-Legacy-Support
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/com/viaversion/viarewind/legacysupport/util/NMSUtil.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaRewind-Legacy-Support - https://github.com/ViaVersion/ViaRewind-Legacy-Support
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,6 +34,8 @@ public class NMSUtil {
     public static String nmsVersionPackage;
     private static Field playerConnectionField;
 
+    public static final boolean NEWER_THAN_V1_20_5 = BukkitPlugin.getInstance().getServerProtocol().newerThanOrEqualTo(ProtocolVersion.v1_20_5);
+
     static {
         if (BukkitPlugin.getInstance().getServerProtocol().olderThan(ProtocolVersion.v1_17)) {
             nmsVersionPackage = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];

src/main/java/com/viaversion/viarewind/legacysupport/util/ReflectionUtil.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaRewind-Legacy-Support - https://github.com/ViaVersion/ViaRewind-Legacy-Support
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/com/viaversion/viarewind/legacysupport/versioninfo/VersionInformer.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of ViaRewind-Legacy-Support - https://github.com/ViaVersion/ViaRewind-Legacy-Support
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by