fix: use slib McLogger instead of slf4j Logger

Should fix crash on 1.16.5 fabric/forge and 1.17.1 forge with some minecraft launchers
plasmoapp · Apr 20, 2024 · 841624f · 841624f
1 parent 62af914
commit 841624f
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 63 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -49,8 +49,6 @@ subprojects {
         compileOnly(rootProject.libs.guava)
         compileOnly(rootProject.libs.gson)
 
-        compileOnly(rootProject.libs.slf4j)
-
         api(rootProject.libs.annotations)
         api(rootProject.libs.lombok)
 
@@ -62,7 +60,6 @@ subprojects {
 
         testImplementation(rootProject.libs.guava)
         testImplementation(rootProject.libs.gson)
-        testImplementation(rootProject.libs.slf4j)
     }
 
     tasks.test {

diff --git a/client/build.gradle.kts b/client/build.gradle.kts
@@ -152,11 +152,6 @@ dependencies {
     shadowCommon(libs.crowdin) {
         isTransitive = false
     }
-
-    if (platform.mcVersion < 11700 || (platform.isForge && platform.mcVersion < 11800)) {
-        shadowCommon(libs.slf4j)
-        shadowCommon(libs.slf4j.log4j)
-    }
 }
 
 tasks {

diff --git a/client/src/main/java/su/plo/voice/client/audio/device/VoiceDeviceManager.java b/client/src/main/java/su/plo/voice/client/audio/device/VoiceDeviceManager.java
@@ -5,9 +5,9 @@
 import lombok.RequiredArgsConstructor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import su.plo.config.entry.ConfigEntry;
+import su.plo.slib.api.logging.McLogger;
+import su.plo.slib.api.logging.McLoggerFactory;
 import su.plo.voice.BaseVoice;
 import su.plo.voice.api.client.PlasmoVoiceClient;
 import su.plo.voice.api.client.audio.device.*;
@@ -33,7 +33,7 @@
 @RequiredArgsConstructor
 public final class VoiceDeviceManager implements DeviceManager {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(VoiceDeviceManager.class);
+    private static final McLogger LOGGER = McLoggerFactory.createLogger("VoiceDeviceManager");
 
     private final PlasmoVoiceClient voiceClient;
     private final VoiceClientConfig config;

diff --git a/common/src/main/java/su/plo/voice/BaseVoice.java b/common/src/main/java/su/plo/voice/BaseVoice.java
@@ -2,8 +2,8 @@
 
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import su.plo.slib.api.logging.McLogger;
+import su.plo.slib.api.logging.McLoggerFactory;
 import su.plo.voice.addon.VoiceAddonManager;
 import su.plo.voice.api.PlasmoVoice;
 import su.plo.voice.api.addon.AddonManager;
@@ -16,7 +16,6 @@
 import su.plo.voice.encryption.VoiceEncryptionManager;
 import su.plo.voice.encryption.aes.AesEncryptionSupplier;
 import su.plo.voice.event.VoiceEventBus;
-import su.plo.voice.logging.Slf4jLogger;
 import su.plo.voice.util.version.ModrinthLoader;
 
 import java.io.InputStream;
@@ -25,8 +24,8 @@
 
 public abstract class BaseVoice implements PlasmoVoice {
 
-    public static final Logger LOGGER = LoggerFactory.getLogger("PlasmoVoice");
-    public static final DebugLogger DEBUG_LOGGER = new DebugLogger(new Slf4jLogger("PlasmoVoice"));
+    public static final McLogger LOGGER = McLoggerFactory.createLogger("PlasmoVoice");
+    public static final DebugLogger DEBUG_LOGGER = new DebugLogger(LOGGER);
 
     protected final ModrinthLoader loader;
 

diff --git a/common/src/main/kotlin/su/plo/voice/logging/Slf4jLogger.kt b/common/src/main/kotlin/su/plo/voice/logging/Slf4jLogger.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,9 +6,6 @@ kotlinx-coroutines = "1.7.3"
 
 junit5 = "5.8.2"
 
-slf4j = "1.7.30"
-slf4j-log4j = "2.15.0"
-
 lombok = "1.18.24"
 annotations = "23.0.0"
 guava = "31.1-jre"
@@ -47,9 +44,6 @@ kotlinx-coroutines-jdk8 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-j
 junit-api    = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit5" }
 junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit5" }
 
-slf4j        = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
-slf4j-log4j  = { module = "org.apache.logging.log4j:log4j-slf4j-impl", version.ref = "slf4j-log4j" }
-
 lombok       = { module = "org.projectlombok:lombok", version.ref = "lombok" }
 annotations  = { module = "org.jetbrains:annotations", version.ref = "annotations" }
 guava        = { module = "com.google.guava:guava", version.ref = "guava" }

diff --git a/proxy/common/src/main/java/su/plo/voice/proxy/config/VoiceProxyConfig.java b/proxy/common/src/main/java/su/plo/voice/proxy/config/VoiceProxyConfig.java
@@ -7,12 +7,12 @@
 import lombok.experimental.Accessors;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import su.plo.config.Config;
 import su.plo.config.ConfigField;
 import su.plo.config.ConfigValidator;
 import su.plo.config.entry.SerializableConfigEntry;
+import su.plo.slib.api.logging.McLogger;
+import su.plo.slib.api.logging.McLoggerFactory;
 import su.plo.voice.api.proxy.config.ProxyConfig;
 import su.plo.voice.proxy.util.AddressUtil;
 
@@ -26,7 +26,7 @@
 @Accessors(fluent = true)
 public final class VoiceProxyConfig implements ProxyConfig {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(VoiceProxyConfig.class);
+    private static final McLogger LOGGER = McLoggerFactory.createLogger("VoiceProxyConfig");
 
     private byte[] aesEncryptionKey = null;
     private UUID forwardingSecret = null;

diff --git a/server-proxy-common/src/main/kotlin/su/plo/voice/server/language/VoiceServerLanguages.kt b/server-proxy-common/src/main/kotlin/su/plo/voice/server/language/VoiceServerLanguages.kt
@@ -6,11 +6,11 @@ import com.google.common.collect.Maps
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.future.future
-import org.slf4j.LoggerFactory
 import su.plo.config.toml.Toml
 import su.plo.config.toml.TomlWriter
 import su.plo.crowdin.CrowdinLib
 import su.plo.slib.api.language.ServerTranslator
+import su.plo.slib.api.logging.McLoggerFactory
 import su.plo.voice.api.server.resource.ResourceLoader
 import su.plo.voice.api.server.language.ServerLanguages
 import java.io.*
@@ -432,6 +432,6 @@ class VoiceServerLanguages(
     }
 
     companion object {
-        private val LOGGER = LoggerFactory.getLogger(VoiceServerLanguages::class.java)
+        private val LOGGER = McLoggerFactory.createLogger("VoiceServerLanguages")
     }
 }
diff --git a/server/common/src/main/java/su/plo/voice/server/util/version/ServerVersionUtil.java b/server/common/src/main/java/su/plo/voice/server/util/version/ServerVersionUtil.java
@@ -3,12 +3,12 @@
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import lombok.NonNull;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import su.plo.slib.api.chat.component.McTextComponent;
 import su.plo.slib.api.chat.style.McTextClickEvent;
 import su.plo.slib.api.chat.style.McTextHoverEvent;
 import su.plo.slib.api.chat.style.McTextStyle;
+import su.plo.slib.api.logging.McLogger;
+import su.plo.slib.api.logging.McLoggerFactory;
 import su.plo.voice.api.server.player.VoiceServerPlayer;
 import su.plo.voice.util.version.ModrinthLoader;
 import su.plo.voice.util.version.ModrinthVersion;
@@ -19,7 +19,7 @@
 
 public final class ServerVersionUtil {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ServerVersionUtil.class);
+    private static final McLogger LOGGER = McLoggerFactory.createLogger("ServerVersionUtil");
 
     private static final Cache<String, String> LINKS_CACHE = CacheBuilder
             .newBuilder()