Merge branch 'api-14' into api-15

# Conflicts:
#	SpongeAPI
#	forge/src/mixins/resources/mixins.spongeforge.core.json
#	neoforge/src/mixins/resources/mixins.spongeneo.core.json
#	src/mixins/java/org/spongepowered/common/mixin/core/server/commands/TeleportCommandMixin.java
#	src/mixins/java/org/spongepowered/common/mixin/core/server/level/ServerPlayerMixin.java
#	src/mixins/java/org/spongepowered/common/mixin/core/world/entity/EntityMixin.java
#	vanilla/src/mixins/resources/mixins.spongevanilla.core.json

Author: Yeregorix

SpongeAPI

@@ -407,13 +407,13 @@ tasks {
         from(applaunch.map { it.output })
     }
 
-    val jar by existing
-    val sourcesJar by existing
-
     shadowJar {
-        mergeServiceFiles()
         archiveClassifier.set("dev")
 
+        mergeServiceFiles()
+        duplicatesStrategy = DuplicatesStrategy.INCLUDE
+        configurations = listOf()
+
         manifest {
             attributes(mapOf(
                 "Access-Widener" to "common.accesswidener",
@@ -422,16 +422,11 @@ tasks {
             from(commonManifest)
         }
 
-        from(jar)
-        from(sourcesJar)
-        from(mixinsJar)
-        from(accessorsJar)
-        from(launchJar)
-        from(applaunchJar)
-
-        dependencies {
-            include(project(":"))
-        }
+        from(mixins.map { it.output })
+        from(accessors.map { it.output })
+        from(launch.map { it.output })
+        from(applaunch.map { it.output })
+        from(applaunchConf.map { it.output })
     }
 
     test {

build.gradle.kts

@@ -355,10 +355,11 @@ tasks {
     }
 
     val servicesShadowJar by register("servicesShadowJar", ShadowJar::class) {
-        group = "shadow"
+        group = "build"
         archiveClassifier.set("services")
 
         mergeServiceFiles()
+        duplicatesStrategy = DuplicatesStrategy.INCLUDE
         configurations = listOf(serviceShadedLibrariesConfig.get())
         exclude("META-INF/INDEX.LIST", "META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA", "**/module-info.class")
 
@@ -379,10 +380,10 @@ tasks {
     }
 
     shadowJar {
-        group = "shadow"
         archiveClassifier.set("mod")
 
         mergeServiceFiles()
+        duplicatesStrategy = DuplicatesStrategy.INCLUDE
         configurations = listOf(gameShadedLibrariesConfig.get())
 
         manifest {

forge/build.gradle.kts

@@ -27,7 +27,6 @@
     "server.BootstrapMixin_Forge",
     "server.MinecraftServerMixin_Forge",
     "server.ReloadableServerResourcesMixin_Forge",
-    "server.commands.SpreadPlayersCommandMixin_Forge",
     "server.level.ServerPlayerMixin_Forge",
     "server.network.ServerGamePacketListenerImplMixin_Forge",
     "tags.TagLoaderMixin_Forge",

forge/src/mixins/java/org/spongepowered/forge/mixin/core/server/commands/SpreadPlayersCommandMixin_Forge.java

@@ -76,7 +76,7 @@ at = { module = "dev.architectury:at", version = "1.0.1" }
 [plugins]
 blossom = { id = "net.kyori.blossom", version = "2.1.0" }
 indra-licenserSpotless = { id = "net.kyori.indra.licenser.spotless", version = "3.1.3" }
-shadow = { id = "com.gradleup.shadow", version = "8.3.8" }
+shadow = { id = "com.gradleup.shadow", version = "9.0.2" }
 versions = { id = "com.github.ben-manes.versions", version = "0.51.0" }
 forgeGradle = { id = "net.minecraftforge.gradle", version = "6.0.35" }
 modDevGradle = { id = "net.neoforged.moddev", version = "2.0.78" }