Bump spark version

lucko · Dec 1, 2024 · 9da8931 · 9da8931
1 parent eef85e3
commit 9da8931
Show file tree

Hide file tree

Showing 15 changed files with 118 additions and 70 deletions.
diff --git a/build.gradle b/build.gradle
@@ -17,9 +17,24 @@ subprojects {
     apply plugin: 'org.cadixdev.licenser'
 
     ext {
-        baseVersion = '1.10.110'
+        baseVersion = '1.10.119'
         pluginVersion = baseVersion + '-SNAPSHOT'
         pluginDescription = 'spark is a performance profiling plugin/mod for Minecraft clients, servers and proxies.'
+
+        applyExcludes = { Jar jarTask ->
+            jarTask.exclude 'module-info.class'
+            jarTask.exclude 'META-INF/maven/**'
+            jarTask.exclude 'META-INF/proguard/**'
+            jarTask.exclude 'META-INF/LICENSE'
+            jarTask.exclude 'META-INF/NOTICE'
+            // protobuf
+            jarTask.exclude '**/*.proto'
+            jarTask.exclude '**/*.proto.bin'
+            // async-profiler
+            jarTask.exclude 'linux-arm64/**'
+            jarTask.exclude 'linux-x64/**'
+            jarTask.exclude 'macos/**'
+        }
     }
 
     tasks.withType(JavaCompile).configureEach {

diff --git a/spark-folia/build.gradle b/spark-folia/build.gradle
@@ -57,11 +57,7 @@ shadowJar {
     relocate 'me.lucko.bytesocks.client', 'me.lucko.spark.lib.bytesocks'
     relocate 'org.java_websocket', 'me.lucko.spark.lib.bytesocks.ws'
 
-    exclude 'module-info.class'
-    exclude 'META-INF/maven/**'
-    exclude 'META-INF/proguard/**'
-    exclude '**/*.proto'
-    exclude '**/*.proto.bin'
+    project.applyExcludes(delegate)
 }
 
 artifacts {

diff --git a/spark-folia/src/main/java/me/lucko/spark/folia/FoliaSparkPlugin.java b/spark-folia/src/main/java/me/lucko/spark/folia/FoliaSparkPlugin.java
@@ -125,6 +125,11 @@ public void log(Level level, String msg) {
         getLogger().log(level, msg);
     }
 
+    @Override
+    public void log(Level level, String msg, Throwable throwable) {
+        getLogger().log(level, msg, throwable);
+    }
+
     @Override
     public ThreadDumper getDefaultThreadDumper() {
         return this.gameThreadDumper;

diff --git a/spark-geyser/build.gradle b/spark-geyser/build.gradle
@@ -44,9 +44,7 @@ shadowJar {
     relocate 'me.lucko.bytesocks.client', 'me.lucko.spark.lib.bytesocks'
     relocate 'org.java_websocket', 'me.lucko.spark.lib.bytesocks.ws'
 
-    exclude 'module-info.class'
-    exclude 'META-INF/maven/**'
-    exclude 'META-INF/proguard/**'
+    project.applyExcludes(delegate)
 }
 
 artifacts {

diff --git a/spark-geyser/src/main/java/me/lucko/spark/geyser/GeyserSparkExtension.java b/spark-geyser/src/main/java/me/lucko/spark/geyser/GeyserSparkExtension.java
@@ -117,14 +117,23 @@ public void executeAsync(Runnable task) {
 
     @Override
     public void log(Level level, String msg) {
-        if (level == Level.INFO) {
+        if (level.intValue() >= 1000) { // severe
+            this.logger().error(msg);
+        } else if (level.intValue() >= 900) { // warning
+            this.logger().warning(msg);
+        } else {
             this.logger().info(msg);
-        } else if (level == Level.WARNING) {
+        }
+    }
+
+    @Override
+    public void log(Level level, String msg, Throwable throwable) {
+        if (throwable != null || level.intValue() >= 1000) { // severe
+            this.logger().error(msg, throwable);
+        } else if (level.intValue() >= 900) { // warning
             this.logger().warning(msg);
-        } else if (level == Level.SEVERE) {
-            this.logger().error(msg);
         } else {
-            throw new IllegalArgumentException(level.getName());
+            this.logger().info(msg);
         }
     }
 

diff --git a/spark-minestom/build.gradle b/spark-minestom/build.gradle
@@ -40,11 +40,7 @@ shadowJar {
     relocate 'me.lucko.bytesocks.client', 'me.lucko.spark.lib.bytesocks'
     relocate 'org.java_websocket', 'me.lucko.spark.lib.bytesocks.ws'
 
-    exclude 'module-info.class'
-    exclude 'META-INF/maven/**'
-    exclude 'META-INF/proguard/**'
-    exclude '**/*.proto'
-    exclude '**/*.proto.bin'
+    project.applyExcludes(delegate)
 }
 
 artifacts {

diff --git a/spark-minestom/src/main/java/me/lucko/spark/minestom/MinestomSparkPlugin.java b/spark-minestom/src/main/java/me/lucko/spark/minestom/MinestomSparkPlugin.java
@@ -102,14 +102,23 @@ public void executeAsync(Runnable task) {
 
     @Override
     public void log(Level level, String msg) {
-        if (level == Level.INFO) {
-            this.getLogger().info(msg);
-        } else if (level == Level.WARNING) {
-            this.getLogger().warn(msg);
-        } else if (level == Level.SEVERE) {
+        if (level.intValue() >= 1000) { // severe
             this.getLogger().error(msg);
+        } else if (level.intValue() >= 900) { // warning
+            this.getLogger().warn(msg);
+        } else {
+            this.getLogger().info(msg);
+        }
+    }
+
+    @Override
+    public void log(Level level, String msg, Throwable throwable) {
+        if (level.intValue() >= 1000) { // severe
+            this.getLogger().error(msg, throwable);
+        } else if (level.intValue() >= 900) { // warning
+            this.getLogger().warn(msg, throwable);
         } else {
-            throw new IllegalArgumentException(level.getName());
+            this.getLogger().info(msg, throwable);
         }
     }
 

diff --git a/spark-nukkit/build.gradle b/spark-nukkit/build.gradle
@@ -34,11 +34,7 @@ shadowJar {
     relocate 'me.lucko.bytesocks.client', 'me.lucko.spark.lib.bytesocks'
     relocate 'org.java_websocket', 'me.lucko.spark.lib.bytesocks.ws'
 
-    exclude 'module-info.class'
-    exclude 'META-INF/maven/**'
-    exclude 'META-INF/proguard/**'
-    exclude '**/*.proto'
-    exclude '**/*.proto.bin'
+    project.applyExcludes(delegate)
 }
 
 artifacts {

diff --git a/spark-nukkit/src/main/java/me/lucko/spark/nukkit/NukkitSparkPlugin.java b/spark-nukkit/src/main/java/me/lucko/spark/nukkit/NukkitSparkPlugin.java
@@ -85,14 +85,23 @@ public void executeAsync(Runnable task) {
 
     @Override
     public void log(Level level, String msg) {
-        if (level == Level.INFO) {
-            getLogger().info(msg);
-        } else if (level == Level.WARNING) {
-            getLogger().warning(msg);
-        } else if (level == Level.SEVERE) {
+        if (level.intValue() >= 1000) { // severe
             getLogger().error(msg);
+        } else if (level.intValue() >= 900) { // warning
+            getLogger().warning(msg);
+        } else {
+            getLogger().info(msg);
+        }
+    }
+
+    @Override
+    public void log(Level level, String msg, Throwable throwable) {
+        if (level.intValue() >= 1000) { // severe
+            getLogger().error(msg, throwable);
+        } else if (level.intValue() >= 900) { // warning
+            getLogger().warning(msg, throwable);
         } else {
-            throw new IllegalArgumentException(level.getName());
+            getLogger().info(msg, throwable);
         }
     }
 

diff --git a/spark-sponge7/build.gradle b/spark-sponge7/build.gradle
@@ -32,12 +32,7 @@ shadowJar {
     relocate 'me.lucko.bytesocks.client', 'me.lucko.spark.lib.bytesocks'
     relocate 'org.java_websocket', 'me.lucko.spark.lib.bytesocks.ws'
 
-    exclude 'module-info.class'
-    exclude 'META-INF/maven/**'
-    exclude 'META-INF/proguard/**'
-    exclude 'META-INF/versions/**'
-    exclude '**/*.proto'
-    exclude '**/*.proto.bin'
+    project.applyExcludes(delegate)
 }
 
 artifacts {

diff --git a/spark-sponge7/src/main/java/me/lucko/spark/sponge/Sponge7SparkPlugin.java b/spark-sponge7/src/main/java/me/lucko/spark/sponge/Sponge7SparkPlugin.java
@@ -137,14 +137,23 @@ public void executeSync(Runnable task) {
 
     @Override
     public void log(Level level, String msg) {
-        if (level == Level.INFO) {
-            this.logger.info(msg);
-        } else if (level == Level.WARNING) {
-            this.logger.warn(msg);
-        } else if (level == Level.SEVERE) {
+        if (level.intValue() >= 1000) { // severe
             this.logger.error(msg);
+        } else if (level.intValue() >= 900) { // warning
+            this.logger.warn(msg);
+        } else {
+            this.logger.info(msg);
+        }
+    }
+
+    @Override
+    public void log(Level level, String msg, Throwable throwable) {
+        if (level.intValue() >= 1000) { // severe
+            this.logger.error(msg, throwable);
+        } else if (level.intValue() >= 900) { // warning
+            this.logger.warn(msg, throwable);
         } else {
-            throw new IllegalArgumentException(level.getName());
+            this.logger.info(msg, throwable);
         }
     }
 

diff --git a/spark-velocity4/build.gradle b/spark-velocity4/build.gradle
@@ -39,11 +39,7 @@ shadowJar {
     relocate 'me.lucko.bytesocks.client', 'me.lucko.spark.lib.bytesocks'
     relocate 'org.java_websocket', 'me.lucko.spark.lib.bytesocks.ws'
 
-    exclude 'module-info.class'
-    exclude 'META-INF/maven/**'
-    exclude 'META-INF/proguard/**'
-    exclude '**/*.proto'
-    exclude '**/*.proto.bin'
+    project.applyExcludes(delegate)
 }
 
 artifacts {

diff --git a/spark-velocity4/src/main/java/me/lucko/spark/velocity/Velocity4SparkPlugin.java b/spark-velocity4/src/main/java/me/lucko/spark/velocity/Velocity4SparkPlugin.java
@@ -122,14 +122,23 @@ public void executeAsync(Runnable task) {
 
     @Override
     public void log(Level level, String msg) {
-        if (level == Level.INFO) {
-            this.logger.info(msg);
-        } else if (level == Level.WARNING) {
-            this.logger.warn(msg);
-        } else if (level == Level.SEVERE) {
+        if (level.intValue() >= 1000) { // severe
             this.logger.error(msg);
+        } else if (level.intValue() >= 900) { // warning
+            this.logger.warn(msg);
+        } else {
+            this.logger.info(msg);
+        }
+    }
+
+    @Override
+    public void log(Level level, String msg, Throwable throwable) {
+        if (level.intValue() >= 1000) { // severe
+            this.logger.error(msg, throwable);
+        } else if (level.intValue() >= 900) { // warning
+            this.logger.warn(msg, throwable);
         } else {
-            throw new IllegalArgumentException(level.getName());
+            this.logger.info(msg, throwable);
         }
     }
 

diff --git a/spark-waterdog/build.gradle b/spark-waterdog/build.gradle
@@ -43,11 +43,7 @@ shadowJar {
     relocate 'me.lucko.bytesocks.client', 'me.lucko.spark.lib.bytesocks'
     relocate 'org.java_websocket', 'me.lucko.spark.lib.bytesocks.ws'
 
-    exclude 'module-info.class'
-    exclude 'META-INF/maven/**'
-    exclude 'META-INF/proguard/**'
-    exclude '**/*.proto'
-    exclude '**/*.proto.bin'
+    project.applyExcludes(delegate)
 }
 
 artifacts {

diff --git a/spark-waterdog/src/main/java/me/lucko/spark/waterdog/WaterdogSparkPlugin.java b/spark-waterdog/src/main/java/me/lucko/spark/waterdog/WaterdogSparkPlugin.java
@@ -85,17 +85,27 @@ public void executeAsync(Runnable task) {
 
     @Override
     public void log(Level level, String msg) {
-        if (level == Level.INFO) {
-            getLogger().info(msg);
-        } else if (level == Level.WARNING) {
-            getLogger().warn(msg);
-        } else if (level == Level.SEVERE) {
+        if (level.intValue() >= 1000) { // severe
             getLogger().error(msg);
+        } else if (level.intValue() >= 900) { // warning
+            getLogger().warn(msg);
+        } else {
+            getLogger().info(msg);
+        }
+    }
+
+    @Override
+    public void log(Level level, String msg, Throwable throwable) {
+        if (level.intValue() >= 1000) { // severe
+            getLogger().error(msg, throwable);
+        } else if (level.intValue() >= 900) { // warning
+            getLogger().warn(msg, throwable);
         } else {
-            throw new IllegalArgumentException(level.getName());
+            getLogger().info(msg, throwable);
         }
     }
 
+
     @Override
     public ClassSourceLookup createClassSourceLookup() {
         return new WaterdogClassSourceLookup(getProxy());