feat: Switched from distributor-logging to slf4md

xpdustry · Jun 11, 2024 · 645c47d · 645c47d
1 parent fe2aa71
commit 645c47d
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 480 deletions.
diff --git a/distributor-build-logic/src/main/kotlin/distributor.mindustry-conventions.gradle.kts b/distributor-build-logic/src/main/kotlin/distributor.mindustry-conventions.gradle.kts
@@ -1,5 +1,6 @@
 import fr.xpdustry.toxopid.dsl.mindustryDependencies
 import fr.xpdustry.toxopid.spec.ModMetadata
+import fr.xpdustry.toxopid.task.GithubArtifactDownload
 
 plugins {
     id("net.kyori.indra")
@@ -22,8 +23,15 @@ tasks.runMindustryClient {
     mods.setFrom()
 }
 
+val downloadSlf4md by tasks.registering(GithubArtifactDownload::class) {
+    user = "xpdustry"
+    repo = "slf4md"
+    name = "slf4md-simple.jar"
+    version = libs.versions.slf4md.map { "v$it" }
+}
+
 tasks.runMindustryServer {
-    mods.from(tasks.shadowJar)
+    mods.from(tasks.shadowJar, downloadSlf4md)
 }
 
 tasks.shadowJar {
@@ -40,7 +48,7 @@ tasks.shadowJar {
                 main = extension.main.get(),
                 java = true,
                 hidden = true,
-                dependencies = extension.dependencies.get(),
+                dependencies = extension.dependencies.get().toMutableList().apply { add("slf4md") },
             )
 
         val temp = temporaryDir.resolve("plugin.json")

diff --git a/distributor-common/build.gradle.kts b/distributor-common/build.gradle.kts
@@ -9,7 +9,6 @@ distributorModule {
     display = "DistributorCommon"
     main = "com.xpdustry.distributor.common.DistributorCommonPlugin"
     description = "Core classes of distributor."
-    dependencies = listOf("distributor-logging")
 }
 
 dependencies {
@@ -33,7 +32,3 @@ tasks.shadowJar {
         exclude(dependency(projects.distributorCommonApi))
     }
 }
-
-tasks.runMindustryServer {
-    mods.from(projects.distributorLoggingSimple.shadowJar)
-}
diff --git a/distributor-logging-simple/build.gradle.kts b/distributor-logging-simple/build.gradle.kts
diff --git a/...gging-simple/src/main/java/com/xpdustry/distributor/logging/simple/DistributorLogger.java b/...gging-simple/src/main/java/com/xpdustry/distributor/logging/simple/DistributorLogger.java
diff --git a/...imple/src/main/java/com/xpdustry/distributor/logging/simple/DistributorLoggerFactory.java b/...imple/src/main/java/com/xpdustry/distributor/logging/simple/DistributorLoggerFactory.java