diff options
| author | embeddedt <42941056+embeddedt@users.noreply.github.com> | 2023-05-24 11:05:06 -0400 |
|---|---|---|
| committer | embeddedt <42941056+embeddedt@users.noreply.github.com> | 2023-05-24 11:05:06 -0400 |
| commit | 67c1d7ba2f63cda64ea54e9630238e2b3a963a17 (patch) | |
| tree | 55c404f59b27951299971a1f90a95ad0faba8ee9 /spark-waterdog | |
| parent | a73c5d41be8eb3f25bfbd2bf9908ba4c8ca027b7 (diff) | |
| parent | f5b35cf7590e5e0d3f5b604216e1ba4a3d641c9d (diff) | |
| download | spark-67c1d7ba2f63cda64ea54e9630238e2b3a963a17.tar.gz spark-67c1d7ba2f63cda64ea54e9630238e2b3a963a17.tar.bz2 spark-67c1d7ba2f63cda64ea54e9630238e2b3a963a17.zip | |
Merge remote-tracking branch 'lucko/master' into forge-1.7.10
Diffstat (limited to 'spark-waterdog')
| -rw-r--r-- | spark-waterdog/build.gradle | 6 | ||||
| -rw-r--r-- | spark-waterdog/src/main/java/me/lucko/spark/waterdog/WaterdogSparkPlugin.java | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/spark-waterdog/build.gradle b/spark-waterdog/build.gradle index 9c1a4d3..c4bd382 100644 --- a/spark-waterdog/build.gradle +++ b/spark-waterdog/build.gradle @@ -10,11 +10,12 @@ tasks.withType(JavaCompile) { dependencies { implementation project(':spark-common') implementation 'net.kyori:adventure-text-serializer-legacy:4.12.0' - compileOnly 'dev.waterdog.waterdogpe:waterdog:1.1.3-SNAPSHOT' + compileOnly 'dev.waterdog.waterdogpe:waterdog:1.2.3' } repositories { - maven { url 'https://repo.waterdog.dev/artifactory/main' } + maven { url 'https://repo.opencollab.dev/main/' } + maven { url 'https://repo.waterdog.dev/artifactory/main/' } } processResources { @@ -36,6 +37,7 @@ shadowJar { relocate 'com.google.protobuf', 'me.lucko.spark.lib.protobuf' relocate 'org.objectweb.asm', 'me.lucko.spark.lib.asm' relocate 'one.profiler', 'me.lucko.spark.lib.asyncprofiler' + relocate 'me.lucko.bytesocks.client', 'me.lucko.spark.lib.bytesocks' exclude 'module-info.class' exclude 'META-INF/maven/**' 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 index 1a64a98..23aa6a6 100644 --- a/spark-waterdog/src/main/java/me/lucko/spark/waterdog/WaterdogSparkPlugin.java +++ b/spark-waterdog/src/main/java/me/lucko/spark/waterdog/WaterdogSparkPlugin.java @@ -89,7 +89,7 @@ public class WaterdogSparkPlugin extends Plugin implements SparkPlugin { if (level == Level.INFO) { getLogger().info(msg); } else if (level == Level.WARNING) { - getLogger().warning(msg); + getLogger().warn(msg); } else if (level == Level.SEVERE) { getLogger().error(msg); } else { |