snapshot

3 files changed, 9 insertions, 9 deletions

diff --git a/src/main/kotlin/features/macros/ComboProcessor.kt b/src/main/kotlin/features/macros/ComboProcessor.kt
index 03e9238..2b979c3 100644
--- a/src/main/kotlin/features/macros/ComboProcessor.kt
+++ b/src/main/kotlin/features/macros/ComboProcessor.kt
@@ -24,12 +24,6 @@ object ComboProcessor {
 	var lastInput = TimeMark.farPast()
 	val breadCrumbs = mutableListOf<SavedKeyBinding>()
 
-	init {
-		setActions(
-			MacroData.DConfig.data.comboActions
-		)
-	}
-
 	fun setActions(actions: List<ComboKeyAction>) {
 		rootTrie = KeyComboTrie.fromComboList(actions)
 		reset()
diff --git a/src/main/kotlin/features/macros/MacroData.kt b/src/main/kotlin/features/macros/MacroData.kt
index 91de423..447516e 100644
--- a/src/main/kotlin/features/macros/MacroData.kt
+++ b/src/main/kotlin/features/macros/MacroData.kt
@@ -8,5 +8,10 @@ data class MacroData(
 	var comboActions: List<ComboKeyAction> = listOf(),
 	var wheels: List<MacroWheel> = listOf(),
 ) {
-	object DConfig : DataHolder<MacroData>(kotlinx.serialization.serializer(), "macros", ::MacroData)
+	object DConfig : DataHolder<MacroData>(kotlinx.serialization.serializer(), "macros", ::MacroData) {
+		override fun onLoad() {
+			ComboProcessor.setActions(data.comboActions)
+			RadialMacros.setWheels(data.wheels)
+		}
+	}
 }
diff --git a/src/main/kotlin/features/macros/RadialMenu.kt b/src/main/kotlin/features/macros/RadialMenu.kt
index 3496d43..43e65a7 100644
--- a/src/main/kotlin/features/macros/RadialMenu.kt
+++ b/src/main/kotlin/features/macros/RadialMenu.kt
@@ -1,5 +1,6 @@
 package moe.nea.firmament.features.macros
 
+import me.shedaniel.math.Color
 import org.joml.Vector2f
 import util.render.CustomRenderLayers
 import kotlin.math.atan2
@@ -93,7 +94,7 @@ object RadialMenuViewer {
 			option.renderSlice(event.context)
 			mat.popMatrix()
 		}
-		event.context.drawLine(1, 1, delta.x.toInt(), delta.y.toInt(), me.shedaniel.math.Color.ofOpaque(0x00FF00))
+		event.context.drawLine(1, 1, delta.x.toInt(), delta.y.toInt(), Color.ofOpaque(0x00FF00))
 		mat.popMatrix()
 	}
 
@@ -115,7 +116,7 @@ object RadialMenuViewer {
 }
 
 object RadialMacros {
-	var wheels = MacroData.DConfig.data.wheels
+	lateinit var wheels: List<MacroWheel>
 		private set
 
 	fun setWheels(wheels: List<MacroWheel>) {