Move createSettings out of a client-env class

magneticflux- · Jun 24, 2021 · 7f5bf9d · 7f5bf9d
1 parent 22bc6d3
commit 7f5bf9d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/main/kotlin/com/skaggsm/mumblelinkmod/client/ClientMumbleLinkMod.kt b/src/main/kotlin/com/skaggsm/mumblelinkmod/client/ClientMumbleLinkMod.kt
@@ -7,16 +7,15 @@ import com.skaggsm.mumblelinkmod.main.MainConfig
 import com.skaggsm.mumblelinkmod.main.MainMumbleLinkMod
 import com.skaggsm.mumblelinkmod.main.MainMumbleLinkMod.LOG
 import com.skaggsm.mumblelinkmod.main.MainMumbleLinkMod.SERIALIZER
+import com.skaggsm.mumblelinkmod.main.MainMumbleLinkMod.createSettings
 import com.skaggsm.mumblelinkmod.main.SendMumbleURL
 import com.skaggsm.mumblelinkmod.main.updated
-import io.github.fablabsmc.fablabs.api.fiber.v1.annotation.AnnotatedSettings
 import io.github.fablabsmc.fablabs.api.fiber.v1.serialization.FiberSerialization
 import io.github.fablabsmc.fablabs.api.fiber.v1.tree.ConfigBranch
 import io.github.fablabsmc.fablabs.api.fiber.v1.tree.ConfigTree
 import io.github.fablabsmc.fablabs.impl.fiber.tree.ConfigBranchImpl
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import me.shedaniel.fiber2cloth.api.Fiber2Cloth
 import net.fabricmc.api.ClientModInitializer
 import net.fabricmc.api.EnvType.CLIENT
 import net.fabricmc.api.Environment
@@ -126,13 +125,6 @@ object ClientMumbleLinkMod : ClientModInitializer {
         )
     }
 
-    fun createSettings(): AnnotatedSettings {
-        val settingsBuilder = AnnotatedSettings.builder()
-        if (FabricLoader.getInstance().environmentType == CLIENT)
-            Fiber2Cloth.configure(settingsBuilder)
-        return settingsBuilder.build()
-    }
-
     private fun setupEvents() {
         ClientPlayNetworking.registerGlobalReceiver(SendMumbleURL.ID, ClientMumbleLinkMod::channelHandler)
 

diff --git a/src/main/kotlin/com/skaggsm/mumblelinkmod/main/MainMumbleLinkMod.kt b/src/main/kotlin/com/skaggsm/mumblelinkmod/main/MainMumbleLinkMod.kt
@@ -3,7 +3,7 @@ package com.skaggsm.mumblelinkmod.main
 import com.skaggsm.mumblelinkmod.ServerOnChangeWorldCallback
 import com.skaggsm.mumblelinkmod.ServerOnConnectCallback
 import com.skaggsm.mumblelinkmod.ServerOnTeamsModify
-import com.skaggsm.mumblelinkmod.client.ClientMumbleLinkMod.createSettings
+import io.github.fablabsmc.fablabs.api.fiber.v1.annotation.AnnotatedSettings
 import io.github.fablabsmc.fablabs.api.fiber.v1.serialization.FiberSerialization
 import io.github.fablabsmc.fablabs.api.fiber.v1.serialization.JanksonValueSerializer
 import io.github.fablabsmc.fablabs.api.fiber.v1.tree.ConfigBranch
@@ -12,6 +12,8 @@ import io.netty.buffer.Unpooled
 import me.sargunvohra.mcmods.autoconfig1u.AutoConfig
 import me.sargunvohra.mcmods.autoconfig1u.ConfigHolder
 import me.sargunvohra.mcmods.autoconfig1u.serializer.Toml4jConfigSerializer
+import me.shedaniel.fiber2cloth.api.Fiber2Cloth
+import net.fabricmc.api.EnvType
 import net.fabricmc.api.ModInitializer
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking
 import net.fabricmc.loader.api.FabricLoader
@@ -54,6 +56,7 @@ object MainMumbleLinkMod : ModInitializer {
     // Configs
     @Deprecated("Use the new scoped configs!")
     lateinit var oldConfigHolder: ConfigHolder<OldConfig>
+
     @Deprecated("Use the new scoped configs!")
     var oldConfig: OldConfig? = null
     lateinit var config: MainConfig
@@ -92,6 +95,13 @@ object MainMumbleLinkMod : ModInitializer {
         deserialize()
     }
 
+    fun createSettings(): AnnotatedSettings {
+        val settingsBuilder = AnnotatedSettings.builder()
+        if (FabricLoader.getInstance().environmentType == EnvType.CLIENT)
+            Fiber2Cloth.configure(settingsBuilder)
+        return settingsBuilder.build()
+    }
+
     fun serialize() {
         FiberSerialization.serialize(
             configTree,