Skip to content

Commit 1de3f6f

Browse files
committed
Rework initialization logging
1 parent 18c373b commit 1de3f6f

File tree

21 files changed

+65
-36
lines changed

21 files changed

+65
-36
lines changed

common/src/main/kotlin/com/lambda/Lambda.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,9 @@ object Lambda {
6363
.registerTypeAdapter(Optional::class.java, OptionalSerializer)
6464
.create()
6565

66-
fun initialize(block: () -> Unit) {
66+
fun initialize(block: (Long) -> Unit) {
6767
recordRenderCall {
68-
Loader.initialize()
69-
block()
68+
block(Loader.initialize())
7069
}
7170
}
7271
}

common/src/main/kotlin/com/lambda/command/CommandRegistry.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ object CommandRegistry : Configurable(LambdaConfig), Loadable {
3232
val commands = getInstances<LambdaCommand> { forPackages("com.lambda.command.commands") }.toMutableList()
3333

3434
override fun load(): String {
35-
return "Registered ${commands.size} commands"
35+
return "Loaded ${commands.size} commands"
3636
}
3737
}

common/src/main/kotlin/com/lambda/config/Configuration.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,10 @@ abstract class Configuration : Jsonable {
104104
}
105105

106106
private fun load(file: File) {
107-
check(file.exists()) { "No configuration file found for ${configName.capitalize()}" }
107+
if (!file.exists()) {
108+
LOG.warn("No configuration file found for ${configName.capitalize()}. Creating new file when saving.")
109+
return
110+
}
108111

109112
loadFromJson(JsonParser.parseReader(file.reader()).asJsonObject)
110113
}

common/src/main/kotlin/com/lambda/core/Loader.kt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ package com.lambda.core
2020
import com.lambda.Lambda
2121
import com.lambda.Lambda.LOG
2222
import com.lambda.util.Communication.ascii
23+
import com.lambda.util.FolderRegister
2324
import com.lambda.util.reflections.getInstances
2425
import kotlin.system.measureTimeMillis
2526
import kotlin.time.DurationUnit
@@ -33,14 +34,18 @@ object Loader {
3334

3435
private val loadables = getInstances<Loadable> { forPackages("com.lambda") }
3536

36-
fun initialize() {
37+
fun initialize(): Long {
3738
ascii.split("\n").forEach { LOG.info(it) }
38-
LOG.info("Initializing ${Lambda.MOD_NAME} ${Lambda.VERSION}")
39+
LOG.info("Initializing ${Lambda.MOD_NAME} ${Lambda.VERSION} (${loadables.size} loaders)...")
3940

4041
val initTime = measureTimeMillis {
41-
loadables.forEach { LOG.info(it.load()) }
42+
loadables.forEach {
43+
var response: String
44+
val time = measureTimeMillis { response = it.load() }
45+
LOG.info("$response ($time ms)")
46+
}
4247
}
4348

44-
LOG.info("${Lambda.MOD_NAME} ${Lambda.VERSION} was successfully initialized (${initTime}ms)")
49+
return initTime
4550
}
4651
}

common/src/main/kotlin/com/lambda/core/PingManager.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ object PingManager : Loadable {
2929
private val pings: LimitedOrderedSet<Long> = LimitedOrderedSet(100)
3030
private const val INTERVAL = 1
3131

32+
override fun load() = "Loaded Ping Manager"
33+
3234
val lastPing: Long
3335
get() = pings.lastOrNull() ?: 0
3436

common/src/main/kotlin/com/lambda/core/TimerManager.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ import com.lambda.event.events.ClientEvent
2323
object TimerManager : Loadable {
2424
var lastTickLength: Float = 50f
2525

26+
override fun load() = "Loaded Timer Manager"
27+
2628
fun getLength(): Float {
2729
var length = 50f
2830

common/src/main/kotlin/com/lambda/graphics/renderer/gui/font/LambdaFont.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ enum class LambdaFont(private val fontName: String) {
3737
glyphs = FontGlyphs(font)
3838
}
3939

40-
object Loader : Loadable {
40+
object FontLoader : Loadable {
4141
override fun load(): String {
4242
entries.forEach(LambdaFont::loadGlyphs)
4343
return "Loaded ${entries.size} fonts"

common/src/main/kotlin/com/lambda/graphics/renderer/gui/font/glyph/FontGlyphs.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class FontGlyphs(
4040
init {
4141
runCatching {
4242
processGlyphs()
43-
LOG.info("Font ${font.fontName} loaded with ${charMap.size} characters")
43+
LOG.info("Loaded ${font.fontName} with ${charMap.size} characters")
4444
}.onFailure {
4545
LOG.error("Failed to load font glyphs: ${it.message}", it)
4646
fontTexture = MipmapTexture(BufferedImage(1024, 1024, BufferedImage.TYPE_INT_ARGB))

common/src/main/kotlin/com/lambda/gui/GuiConfigurable.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,6 @@ object GuiConfigurable : AbstractGuiConfigurable(
2525
LambdaClickGui, ModuleTag.defaults, "gui"
2626
) {
2727
var customWindows by setting("custom windows", listOf<CustomModuleWindow>())
28+
29+
override fun load() = "Loaded GUI Configurable"
2830
}

common/src/main/kotlin/com/lambda/gui/HudGuiConfigurable.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,6 @@ import com.lambda.module.tag.ModuleTag
2222

2323
object HudGuiConfigurable : AbstractGuiConfigurable(
2424
LambdaHudGui, ModuleTag.hudDefaults, "hudgui"
25-
)
25+
) {
26+
override fun load() = "Loaded HUD GUI Configurable"
27+
}

0 commit comments

Comments
 (0)