Merge pull request #1 from EraTiem-Network/next

1.0.0.alpha1

.gitignore

@@ -4,6 +4,11 @@ build/
 !**/src/main/**/build/
 !**/src/test/**/build/
 
+/spigot/run
+/paper/run
+/bungeecord/run
+/waterfall/run
+/velocity/run
 
 ### Files with secrets and private paths ###
 .idea/runConfigurations

README.md

@@ -2,5 +2,4 @@
 ### The Logger-Utility used by Eratiem-Network
 
 For now, it's just a simple ConsoleLogger-Utility, but will be expanded to log into:
-- [ ] File
-- [ ] ElasticSearch
+- [ ] Grafana/Loki

build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "net.eratiem"
-version = "1.1.0"
+version = "1.0.0.alpha1"
 
 subprojects {
   this.group = rootProject.group
@@ -85,6 +85,7 @@ subprojects {
           val api = when (project.name) {
             "spigot" -> rootProject.libs.versions.plugin.spigot
             "paper" -> rootProject.libs.versions.plugin.paper
+            "folia" -> rootProject.libs.versions.plugin.folia
             "bungeecord" -> rootProject.libs.versions.plugin.bungeecord
             else -> rootProject.libs.versions.plugin.waterfall
           }

bungeecord/src/main/kotlin/net/eratiem/eralogger/EraLoggerPlugin.kt

@@ -0,0 +1,13 @@
+package net.eratiem.eralogger
+
+import net.md_5.bungee.api.plugin.Plugin
+
+class EraLoggerPlugin : Plugin() {
+    override fun onEnable() {
+        logger.info("EraLogger can now be used!")
+    }
+
+    override fun onDisable() {
+        logger.info("EraLogger disabled!")
+    }
+}

gradle/libs.versions.toml

@@ -2,29 +2,30 @@
 kotlin = "1.8.20"
 shadow = "8.1.1"
 run = "2.0.1"
-slf4j-api = "2.0.7"
 
 # Minecraft Software
 spigot = "1.19.4-R0.1-SNAPSHOT"
 paper = "1.19.4-R0.1-SNAPSHOT"
+folia = "1.19.4-R0.1-SNAPSHOT"
 bungeecord = "1.19-R0.1-SNAPSHOT"
 waterfall = "1.19-R0.1-SNAPSHOT"
 velocity = "3.1.1"
 
 # Plugin Values
 plugin-spigot = "1.19"
 plugin-paper = "1.19"
+plugin-folia = "1.19"
 plugin-bungeecord = "1.19"
 plugin-waterfall = "1.19"
 
 [libraries]
 kotlin-gradleplugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
-slf4j-api = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j-api" }
 
 # Minecraft Software Dependencies
 minecraft-server-spigot = { group = "org.spigotmc", name = "spigot-api", version.ref = "spigot" }
 minecraft-server-paper = { group = "io.papermc.paper", name = "paper-api", version.ref = "paper" }
+minecraft-server-folia = { group = "dev.folia", name = "folia-api", version.ref = "folia" }
 minecraft-proxy-bungeecord = { group = "net.md-5", name = "bungeecord-api", version.ref = "bungeecord" }
 minecraft-proxy-waterfall = { group = "io.github.waterfallmc", name = "waterfall-api", version.ref = "waterfall" }
 minecraft-proxy-velocity = { group = "com.velocitypowered", name = "velocity-api", version.ref = "velocity" }

gradle/module-resources/folia.kts

@@ -0,0 +1,11 @@
+plugins {
+//  alias(libs.plugins.run.paper)
+}
+
+dependencies {
+    compileOnly(libs.minecraft.server.folia)
+}
+
+//tasks.runServer {
+//  minecraftVersion("1.19.4")
+//}

settings.gradle.kts

@@ -10,14 +10,15 @@ val modules: Map<String, Boolean> = mapOf(
 
   "spigot" to true,
   "paper" to false,
+  "folia" to false,
 
   "bungeecord" to true,
   "waterfall" to false,
   "velocity" to true
 )
 
 val modulesWithPluginYAML: List<String> = listOf(
-  "spigot", "paper", "bungeecord", "waterfall"
+  "spigot", "paper", "folia", "bungeecord", "waterfall"
 )
 
 val moduleResources =

spigot/src/main/kotlin/net/eratiem/eralogger/EraLoggerPlugin.kt

@@ -3,16 +3,11 @@ package net.eratiem.eralogger
 import org.bukkit.plugin.java.JavaPlugin
 
 class EraLoggerPlugin : JavaPlugin() {
-    private lateinit var logger: EraLogger
-
     override fun onEnable() {
-        logger = EraLogger.getInstance(name, getLogger())
         logger.info("EraLogger can now be used!")
     }
 
     override fun onDisable() {
         logger.info("EraLogger disabled!")
-        if (this::logger.isInitialized)
-            EraLogger.destroyInstance(name)
     }
 }

tools/build.gradle.kts

@@ -2,16 +2,12 @@ plugins {
   id("maven-publish")
 }
 
-dependencies {
-  implementation(rootProject.libs.slf4j.api)
-}
-
 if (properties["enableToolsMavenDependency"] == "true") {
   publishing {
     publications {
       create<MavenPublication>("Tools") {
         groupId = project.group.toString()
-        artifactId = rootProject.name.toLowerCase()
+        artifactId = rootProject.name.lowercase()
         version = project.version.toString()
 
         artifact(rootProject.ext["toolsArtifact"] as TaskProvider<*>)

tools/src/main/kotlin/net/eratiem/eralogger/EraFormatter.kt

@@ -0,0 +1,10 @@
+package net.eratiem.eralogger
+
+import java.util.logging.Formatter
+import java.util.logging.LogRecord
+
+internal class EraFormatter : Formatter() {
+  override fun format(record: LogRecord?): String {
+    return "TEST"
+  }
+}

tools/src/main/kotlin/net/eratiem/eralogger/EraHandler.kt

@@ -0,0 +1,19 @@
+package net.eratiem.eralogger
+
+import java.util.logging.Handler
+import java.util.logging.LogRecord
+
+internal class EraHandler : Handler() {
+
+  init {
+    formatter = EraFormatter()
+  }
+
+  override fun publish(record: LogRecord?) {
+    println("EraLogger: ${record?.message}")
+  }
+
+  override fun flush() {}
+
+  override fun close() {}
+}

tools/src/main/kotlin/net/eratiem/eralogger/EraLogger.kt

@@ -1,60 +1,8 @@
 package net.eratiem.eralogger
 
-import org.slf4j.Logger
-import java.util.logging.Logger as JLogger
+import java.util.logging.Logger
 
-interface EraLogger {
-    companion object {
-        private val instances: LinkedHashMap<String, EraLogger> = linkedMapOf()
 
-        fun getInstance(plugin: String, logger: JLogger): EraLogger =
-            instances.getOrPut(plugin) { EraLoggerImpl(logger as Logger) }
-
-        fun destroyInstance(plugin: String): Boolean =
-            instances.remove(plugin) == null
-    }
-
-    var debug: Boolean
-    fun debug(msg: String)
-    fun info(msg: String)
-    fun warning(msg: String)
-    fun error(msg: String)
-    fun error(msg: String, err: Throwable)
-    fun severe(msg: String)
-    fun severe(msg: String, err: Throwable)
-
-    private class EraLoggerImpl(
-        private val logger: Logger,
-        override var debug: Boolean = false
-    ) : EraLogger {
-        override fun debug(msg: String) {
-            if (debug)
-                logger.info("DEBUG: $msg")
-        }
-
-        override fun info(msg: String) {
-            logger.info(msg)
-        }
-
-        override fun warning(msg: String) {
-            logger.warn(msg)
-        }
-
-        override fun error(msg: String) {
-            logger.error(msg)
-        }
-
-        override fun error(msg: String, err: Throwable) {
-            logger.error(msg, err)
-        }
-
-        override fun severe(msg: String) {
-            logger.error(msg)
-        }
-
-        override fun severe(msg: String, err: Throwable) {
-            logger.error(msg, err)
-        }
-
-    }
+fun Logger.addToEraLogger() {
+  addHandler(EraHandler())
 }

velocity/src/main/kotlin/net/eratiem/eralogger/EraLoggerPlugin.kt

@@ -5,7 +5,7 @@ import com.velocitypowered.api.event.proxy.ProxyInitializeEvent
 import com.velocitypowered.api.event.proxy.ProxyShutdownEvent
 import com.velocitypowered.api.plugin.Dependency
 import com.velocitypowered.api.plugin.Plugin
-import java.util.logging.Logger
+import org.slf4j.Logger
 import javax.inject.Inject
 
 @Plugin(
@@ -17,11 +17,8 @@ import javax.inject.Inject
     dependencies = [Dependency(id = "kotlinprovider")]
 )
 class EraLoggerPlugin @Inject constructor(
-    logger: Logger
+    private val logger: Logger
 ) {
-    private val name = "EraLogger"
-    private var logger: EraLogger = EraLogger.getInstance(name, logger)
-
     @Subscribe
     fun onInitialize(event: ProxyInitializeEvent) {
         logger.info("EraLogger can now be used!")
@@ -30,6 +27,5 @@ class EraLoggerPlugin @Inject constructor(
     @Subscribe
     fun onShutdown(event: ProxyShutdownEvent) {
         logger.info("EraLogger disabled!")
-        EraLogger.destroyInstance(name)
     }
 }