change config value getting

Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
j10a1n15 · Sep 24, 2024 · 38207c3 · 38207c3
1 parent dd8b7d5
commit 38207c3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/src/main/kotlin/gay/j10a1n15/sillygames/SillyGames.kt b/src/main/kotlin/gay/j10a1n15/sillygames/SillyGames.kt
@@ -1,7 +1,6 @@
 package gay.j10a1n15.sillygames
 
 import gay.j10a1n15.sillygames.commands.CommandManager
-import gay.j10a1n15.sillygames.config.Config
 import gay.j10a1n15.sillygames.events.EventHandler
 import gay.j10a1n15.sillygames.rpc.RpcManager
 import gay.j10a1n15.sillygames.screens.PictureInPicture
@@ -20,10 +19,6 @@ class SillyGames {
         const val MODID = "sillygames"
         const val VERSION = "1.0.0"
         const val NAME = "Silly Games"
-
-        val config by lazy {
-            Config
-        }
     }
 
     @Mod.EventHandler

diff --git a/src/main/kotlin/gay/j10a1n15/sillygames/data/KeybindSet.kt b/src/main/kotlin/gay/j10a1n15/sillygames/data/KeybindSet.kt
@@ -1,6 +1,6 @@
 package gay.j10a1n15.sillygames.data
 
-import gay.j10a1n15.sillygames.SillyGames
+import gay.j10a1n15.sillygames.config.Config
 import gay.j10a1n15.sillygames.utils.Vector2d
 
 class KeybindSet(
@@ -21,11 +21,12 @@ class KeybindSet(
     }
 
     companion object {
-        private val config get() = SillyGames.config
-
-        fun configPrimary() = KeybindSet(config.keybindUp, config.keybindDown, config.keybindLeft, config.keybindRight)
+        fun configPrimary() = with(Config) {
+            KeybindSet(keybindUp, keybindDown, keybindLeft, keybindRight)
+        }
 
-        fun configSecondary() =
-            KeybindSet(config.keybindUpSecondary, config.keybindDownSecondary, config.keybindLeftSecondary, config.keybindRightSecondary)
+        fun configSecondary() = with(Config) {
+            KeybindSet(keybindUpSecondary, keybindDownSecondary, keybindLeftSecondary, keybindRightSecondary)
+        }
     }
 }