Merge branch 'api-8' into api-9

Author: zml2008

gradle.properties

@@ -8,9 +8,9 @@ javadocPublishRoot=https://jd.spongepowered.org/
 
 org.gradle.parallel=true
 
-adventureVersion=4.11.0
-caffeineVersion=3.1.1
-checkstyleVersion=10.3.4
+adventureVersion=4.12.0
+caffeineVersion=3.1.2
+checkstyleVersion=10.5.0
 configurateVersion=4.1.2
 errorproneVersion=2.16
 gsonVersion=2.8.9

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # 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"'
@@ -143,12 +143,16 @@ fi
 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 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

gradlew

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

gradlew.bat

@@ -10,14 +10,17 @@ pluginManagement {
         val indraVersion = "3.0.1"
         id("org.spongepowered.gradle.event-impl-gen") version "7.0.0"
         id("org.spongepowered.gradle.sponge.dev") version "2.1.1"
-        id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.6"
+        id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.7"
         id("net.ltgt.errorprone") version "3.0.1"
         id("net.kyori.indra.publishing") version indraVersion
         id("net.kyori.indra.publishing.sonatype") version indraVersion
         id("net.kyori.indra.checkstyle") version indraVersion
         id("net.kyori.indra.crossdoc") version indraVersion
     }
 }
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version ("0.3.0")
+}
 
 if (JavaVersion.current() < JavaVersion.VERSION_11) {
     throw GradleException("SpongeAPI requires at least Java 11 to build, but you have ${JavaVersion.current()}.")

settings.gradle.kts

@@ -947,7 +947,7 @@ public final class Keys {
     public static final Key<Value<Ticks>> FUSE_DURATION = Keys.key(ResourceKey.sponge("fuse_duration"), Ticks.class);
 
     /**
-     * The {@link GameMode} a {@link Humanoid} has.
+     * The {@link GameMode} a {@link ServerPlayer} has.
      */
     public static final Key<Value<GameMode>> GAME_MODE = Keys.key(ResourceKey.sponge("game_mode"), GameMode.class);
 
@@ -2206,6 +2206,11 @@ public final class Keys {
      */
     public static final Key<Value<Integer>> POWER = Keys.key(ResourceKey.sponge("power"), Integer.class);
 
+    /**
+     * The previous {@link GameMode} of a {@link ServerPlayer}. Readonly.
+     */
+    public static final Key<Value<GameMode>> PREVIOUS_GAME_MODE = Keys.key(ResourceKey.sponge("previous_game_mode"), GameMode.class);
+
     /**
      * A {@link Beacon}'s primary effect.
      */

src/main/java/org/spongepowered/api/data/Keys.java

@@ -344,6 +344,15 @@ default Value.Mutable<GameMode> gameMode() {
         return this.requireValue(Keys.GAME_MODE).asMutable();
     }
 
+    /**
+     * {@link Keys#PREVIOUS_GAME_MODE}
+     *
+     * @return The previous game mode of the player
+     */
+    default Value<GameMode> previousGameMode() {
+        return this.requireValue(Keys.PREVIOUS_GAME_MODE);
+    }
+
     /**
      * {@link Keys#STATISTICS}
      *