Fix: Empty click gui at first launch

Author: bladekt

common/src/main/kotlin/com/lambda/gui/api/component/button/ButtonComponent.kt

@@ -42,20 +42,20 @@ abstract class ButtonComponent(
     private val renderHovered get() = hovered || System.currentTimeMillis() - lastHoveredTime < 110
 
     // Removes button shrinking if there's no space between buttons
-    protected val shrink get() = lerp(0.0, interactAnimation, ClickGui.buttonStep)
+    protected val shrinkAnimation get() = lerp(0.0, interactAnimation, ClickGui.buttonStep)
 
     init {
         // Active color
         renderer.filled {
-            position = rect.shrink(shrink)
+            position = rect.shrink(shrinkAnimation)
             shade = GuiSettings.shade
             color(GuiSettings.mainColor.multAlpha(activeAnimation * 0.3 * showAnimation))
         }
 
         // Hover glint
         renderer.filled {
             val hoverRect = Rect.basedOn(rect.leftTop, rect.size.x * hoverRectAnimation, rect.size.y)
-            position = hoverRect.shrink(shrink)
+            position = hoverRect.shrink(shrinkAnimation)
             shade = GuiSettings.shade
 
             val alpha = interactAnimation * 0.2 * showAnimation

common/src/main/kotlin/com/lambda/gui/impl/clickgui/buttons/ModuleButton.kt

@@ -67,7 +67,7 @@ class ModuleButton(
 
             position = lerp(left, right, activeAnimation)
                 .clamp(rect)
-                .shrink(interactAnimation)
+                .shrink(shrinkAnimation)
 
             // 0.0 .. 1.0 .. 0.0 animation
             val alpha = 1.0 - (abs(activeAnimation - 0.5) * 2.0)

common/src/main/kotlin/com/lambda/gui/impl/clickgui/buttons/setting/Slider.kt

@@ -28,7 +28,7 @@ abstract class Slider <V : Any, T : AbstractSetting<V>>(
 
     init {
         renderer.filled {
-            position = rect.moveSecond(Vec2d(-rect.size.x * (1.0 - renderProgress), 0.0)).shrink(shrink)
+            position = rect.moveSecond(Vec2d(-rect.size.x * (1.0 - renderProgress), 0.0)).shrink(shrinkAnimation)
             shade = GuiSettings.shade
             color(GuiSettings.mainColor.multAlpha(showAnimation * 0.3))
         }

common/src/main/kotlin/com/lambda/gui/impl/clickgui/windows/ModuleWindow.kt

@@ -4,14 +4,48 @@ import com.lambda.gui.api.GuiEvent
 import com.lambda.gui.api.component.ListWindow
 import com.lambda.gui.impl.clickgui.AbstractClickGui
 import com.lambda.gui.impl.clickgui.buttons.ModuleButton
+import com.lambda.module.Module
 
 abstract class ModuleWindow(
     override var title: String,
     override var width: Double = 110.0,
     override var height: Double = 300.0,
     gui: AbstractClickGui
 ) : ListWindow<ModuleButton>(gui) {
-   override fun onEvent(e: GuiEvent) {
+    private var lastUpdate = 0L
+
+    abstract fun getModuleList(): Collection<Module>
+
+    private fun updateModules() {
+        val time = System.currentTimeMillis()
+        if (time - lastUpdate < 1000L) return
+        lastUpdate = time
+
+        contentComponents.apply {
+            val modules = getModuleList()
+
+            // Add missing module buttons
+            modules.filter { module ->
+                children.all { button ->
+                    button.module != module
+                }
+            }.map { ModuleButton(it, contentComponents) }
+                .forEach(contentComponents::addChild)
+
+            // Remove deleted modules
+            children.forEach { button ->
+                if (button.module !in modules) {
+                    this@ModuleWindow.gui.scheduleAction {
+                        removeChild(button)
+                    }
+                }
+            }
+        }
+    }
+
+    override fun onEvent(e: GuiEvent) {
+        if (e is GuiEvent.Show || e is GuiEvent.Tick) updateModules()
+
         if (e is GuiEvent.Tick) {
             contentComponents.children.sortBy {
                 it.module.name

common/src/main/kotlin/com/lambda/gui/impl/clickgui/windows/tag/CustomModuleWindow.kt

@@ -1,8 +1,6 @@
 package com.lambda.gui.impl.clickgui.windows.tag
 
-import com.lambda.gui.api.GuiEvent
 import com.lambda.gui.impl.clickgui.AbstractClickGui
-import com.lambda.gui.impl.clickgui.buttons.ModuleButton
 import com.lambda.gui.impl.clickgui.windows.ModuleWindow
 import com.lambda.module.Module
 
@@ -11,29 +9,5 @@ class CustomModuleWindow(
     val modules: MutableList<Module> = mutableListOf(),
     gui: AbstractClickGui
 ) : ModuleWindow(title, gui = gui) {
-    override fun onEvent(e: GuiEvent) {
-        if (e is GuiEvent.Tick) updateModules()
-        super.onEvent(e)
-    }
-
-    private fun updateModules() {
-        contentComponents.apply {
-            // Add missing module buttons
-            modules.filter { module ->
-                children.all { button ->
-                    button.module != module
-                }
-            }.map { ModuleButton(it, contentComponents) }
-                .forEach(contentComponents::addChild)
-
-            // Remove deleted modules
-            children.forEach { button ->
-                if (button.module !in modules) {
-                    this@CustomModuleWindow.gui.scheduleAction {
-                        removeChild(button)
-                    }
-                }
-            }
-        }
-    }
+    override fun getModuleList() = modules
 }

common/src/main/kotlin/com/lambda/gui/impl/clickgui/windows/tag/TagWindow.kt

@@ -1,7 +1,6 @@
 package com.lambda.gui.impl.clickgui.windows.tag
 
 import com.lambda.gui.impl.clickgui.AbstractClickGui
-import com.lambda.gui.impl.clickgui.buttons.ModuleButton
 import com.lambda.gui.impl.clickgui.windows.ModuleWindow
 import com.lambda.module.ModuleRegistry
 import com.lambda.module.tag.ModuleTag
@@ -10,10 +9,6 @@ class TagWindow(
     val tag: ModuleTag,
     owner: AbstractClickGui
 ) : ModuleWindow(tag.name, gui = owner) {
-    init {
-        ModuleRegistry.modules
-            .filter { it.defaultTags.firstOrNull() == tag }
-            .map { ModuleButton(it, contentComponents) }
-            .forEach(contentComponents::addChild)
-    }
+    override fun getModuleList() = ModuleRegistry.modules
+        .filter { it.defaultTags.firstOrNull() == tag }
 }