Merge branch 'api-14' into api-14-viewer/death-protection

Author: MrHell228

build.gradle.kts

@@ -30,6 +30,16 @@ configurations {
        }
     }
 }
+
+nexusPublishing {
+    repositories {
+        named("sonatype") {
+            nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
+            snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/"))
+        }
+    }
+}
+
 tasks {
     register("printSourceDirs") {
         doLast {

gradle.properties

@@ -1,5 +1,5 @@
 group=org.spongepowered
-version=14.0.0-SNAPSHOT
+version=14.1.0-SNAPSHOT
 organization=SpongePowered
 projectUrl=https://www.spongepowered.org
 projectDescription=A plugin API for Minecraft: Java Edition

gradle/libs.versions.toml

@@ -63,5 +63,5 @@ indra-checkstyle = { id = "net.kyori.indra.checkstyle", version.ref = "indra" }
 indra-crossdoc = { id = "net.kyori.indra.crossdoc", version.ref = "indra" }
 indra-publishing = { id = "net.kyori.indra.publishing", version.ref = "indra" }
 indra-publishing-sonatype = { id = "net.kyori.indra.publishing.sonatype", version.ref = "indra" }
-nexusPublish = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0-rc-2"}
+nexusPublish = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0"}
 spongeGradle-convention = { id = "org.spongepowered.gradle.sponge.dev", version = "2.2.0" }

gradle/verification-metadata.xml

@@ -720,6 +720,14 @@
             <sha256 value="23f1cdfa4613c00cc6ea5c9f5360e1471b449f82633f13cf5ff6cdb34fa31ebd" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.github.gradle-nexus" name="publish-plugin" version="2.0.0">
+         <artifact name="publish-plugin-2.0.0.jar">
+            <sha256 value="942c1a16d161f64631901b4e2dad541d2fcbfe51cf0323955dabe02e2a9ef2aa" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="publish-plugin-2.0.0.module">
+            <sha256 value="e13ff4d6e10f283b6287103c982f076bd619e2a461fb39c16d44d1d15d71e8f7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.github.gradle-nexus" name="publish-plugin" version="2.0.0-rc-1">
          <artifact name="publish-plugin-2.0.0-rc-1.jar">
             <sha256 value="dc64ecfe8b8685e0958f4cb87936578caba34403538dbbcc953be8a8629d3277" origin="Generated by Gradle"/>
@@ -736,6 +744,11 @@
             <sha256 value="4f1b39ce2f40840322ada0b8e2cb5394f0f9ff4cd2fab53063b870424a310c0e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.github.gradle-nexus.publish-plugin" name="io.github.gradle-nexus.publish-plugin.gradle.plugin" version="2.0.0">
+         <artifact name="io.github.gradle-nexus.publish-plugin.gradle.plugin-2.0.0.pom">
+            <sha256 value="a329ab95f4bfdd5c891083cad3abb30741fdc6ba0bb29b1152a80fe0a69d62ef" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.github.gradle-nexus.publish-plugin" name="io.github.gradle-nexus.publish-plugin.gradle.plugin" version="2.0.0-rc-1">
          <artifact name="io.github.gradle-nexus.publish-plugin.gradle.plugin-2.0.0-rc-1.pom">
             <sha256 value="eff5d3edaa600504de953faef5a67a84f99f19216a95b63d22a7023eaa906a9f" origin="Generated by Gradle"/>
@@ -1923,11 +1936,24 @@
             <sha256 value="f482314b5079c1455f6fb0d4257a745d101c6124ce961522ba86f9dc90901e47" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="2.0.21">
+         <artifact name="kotlin-stdlib-2.0.21.jar">
+            <sha256 value="f31cc53f105a7e48c093683bbd5437561d1233920513774b470805641bedbc09" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-2.0.21.module">
+            <sha256 value="81fd6d181012487ee3246eff4e2bacb64b58c46e5b5aa72971a4ddf1bd1541ed" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.9.22">
          <artifact name="kotlin-stdlib-common-1.9.22.module">
             <sha256 value="f93c9e9abf8d52d8e8fd8e851aa802ecec55132161c4aeee7d3cd924bf794246" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="2.0.21">
+         <artifact name="kotlin-stdlib-common-2.0.21.module">
+            <sha256 value="6f5df8af633600a6b9cfb0fcc764af3d5119f376677677b91b6aee816b1d30ab" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.8.0">
          <artifact name="kotlin-stdlib-jdk7-1.8.0.jar">
             <sha256 value="4c889d1d9803f5f2eb6c1592a6b7e62369ac7660c9eee15aba16fec059163666" origin="Generated by Gradle"/>

gradle/wrapper/gradle-wrapper.jar

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=a4b4158601f8636cdeeab09bd76afb640030bb5b144aafe261a5e8af027dc612
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -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,7 @@ 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\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -112,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -203,15 +205,15 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_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" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew

@@ -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 ##########################################################################
@@ -68,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -13,9 +13,6 @@ plugins {
 }
 
 dependencyResolutionManagement {
-    repositories {
-        mavenLocal()
-    }
     repositoriesMode = RepositoriesMode.FAIL_ON_PROJECT_REPOS
     pluginManagement.repositories.forEach(repositories::add)
 }

settings.gradle.kts

@@ -40,7 +40,7 @@
 /**
  * An advancement.
  */
-public interface Advancement extends DefaultedRegistryValue, ComponentLike, DataPackSerializable {
+public interface Advancement extends DefaultedRegistryValue<Advancement>, ComponentLike, DataPackSerializable {
 
     /**
      * Creates a new {@link Builder} to create an {@link Advancement}.