Merge remote-tracking branch 'lucko/master' into forge-1.7.10

Author: embeddedt

build.gradle

@@ -78,7 +78,7 @@ subprojects {
             }
         }
         mavenCentral()
-        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+        //maven { url "https://central.sonatype.com/repository/maven-snapshots/" }
         maven { url "https://repo.lucko.me/" }
         maven { url "https://jitpack.io" }
     }

gradle.properties

@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx2G
-org.gradle.parallel=false
 
 rfg.disableDependencyDeobfuscation=true

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+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

@@ -114,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.
@@ -205,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

@@ -70,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,13 +13,18 @@ license {
     header = project.file('HEADER.txt')
 }
 
+java {
+    withSourcesJar()
+    withJavadocJar()
+}
+
 publishing {
     //repositories {
     //    maven {
-    //        url = 'https://oss.sonatype.org/content/repositories/snapshots'
+    //        url = 'https://nexus.lucko.me/repository/maven-snapshots/'
     //        credentials {
-    //            username = sonatypeUsername
-    //            password = sonatypePassword
+    //            username = luckoNexusUsername
+    //            password = luckoNexusPassword
     //        }
     //    }
     //}

spark-api/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.gradleup.shadow' version '8.3.0'
+    id 'com.gradleup.shadow' version '8.3.8'
 }
 
 java {
@@ -8,7 +8,7 @@ java {
 
 dependencies {
     implementation project(':spark-common')
-    implementation 'net.kyori:adventure-platform-bukkit:4.3.3'
+    implementation 'net.kyori:adventure-platform-bukkit:4.4.0'
     compileOnly 'io.papermc.paper:paper-api:1.21.1-R0.1-SNAPSHOT'
 
     // placeholders

spark-bukkit/build.gradle

@@ -60,6 +60,15 @@ public class BukkitSparkPlugin extends JavaPlugin implements SparkPlugin {
 
     @Override
     public void onEnable() {
+        boolean detectedSparkMod = classExists("me.lucko.spark.forge.ForgeSparkMod")
+                || classExists("me.lucko.spark.fabric.FabricSparkMod")
+                || classExists("me.lucko.spark.neoforge.NeoForgeSparkMod");
+        if (detectedSparkMod) {
+            getLogger().warning("The spark Bukkit plugin should not be installed when running hybrid Bukkit/modded servers if the spark mod is also installed. Disabling.");
+            getServer().getPluginManager().disablePlugin(this);
+            return;
+        }
+
         this.audienceFactory = BukkitAudiences.create(this);
         this.gameThreadDumper = new ThreadDumper.Specific(Thread.currentThread());
 
@@ -98,7 +107,9 @@ public boolean hasPermission(String permission) {
 
     @Override
     public void onDisable() {
-        this.platform.disable();
+        if (this.platform != null) {
+            this.platform.disable();
+        }
         if (this.tpsCommand != null) {
             CommandMapUtil.unregisterCommand(this.tpsCommand);
         }
@@ -176,7 +187,7 @@ public TickHook createTickHook() {
 
     @Override
     public TickReporter createTickReporter() {
-        if (classExists("com.destroystokyo.paper.event.server.ServerTickStartEvent")) {
+        if (classExists("com.destroystokyo.paper.event.server.ServerTickEndEvent")) {
             return new PaperTickReporter(this);
         }
         return null;

spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitSparkPlugin.java

@@ -1,11 +1,13 @@
 plugins {
-    id 'com.gradleup.shadow' version '8.3.0'
+    id 'com.gradleup.shadow' version '8.3.8'
 }
 
 dependencies {
     implementation project(':spark-common')
-    implementation 'net.kyori:adventure-platform-bungeecord:4.3.3'
-    compileOnly 'net.md-5:bungeecord-api:1.16-R0.4'
+    implementation 'net.kyori:adventure-platform-bungeecord:4.4.0'
+    compileOnly('net.md-5:bungeecord-api:1.19-R0.1-SNAPSHOT') {
+        exclude(module: 'bungeecord-protocol')
+    }
 }
 
 processResources {