Change to use ClientModInitializer so we only use 1 entrypoint

VixidDev · Jun 28, 2024 · d8eaefb · d8eaefb
1 parent 8631f8f
commit d8eaefb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/src/main/kotlin/dev/vixid/vsm/VSM.kt b/src/main/kotlin/dev/vixid/vsm/VSM.kt
@@ -13,10 +13,11 @@ import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
+import net.fabricmc.api.ClientModInitializer
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
-object VSM {
+object VSM : ClientModInitializer {
     val logger: Logger = LoggerFactory.getLogger("vsm")
 
 	val config = ManagedConfig.create(File("config/vsm/config.json"), VSMConfig::class.java) {
@@ -33,11 +34,7 @@ object VSM {
 	private val globalJob = Job()
 	val coroutineScope = CoroutineScope(CoroutineName("VSM") + SupervisorJob(globalJob))
 
-	@JvmStatic
-	fun onInitialise() {}
-
-	@JvmStatic
-	fun onInitialiseClient() {
+	override fun onInitializeClient() {
 		GlobalScreen.registerNativeHook()
 
 		config.instance.initialise()

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -14,11 +14,11 @@
 	"icon": "assets/vsm/icon.png",
 	"environment": "client",
 	"entrypoints": {
-		"main": [
-			"dev.vixid.vsm.VSM::onInitialise"
-		],
 		"client": [
-			"dev.vixid.vsm.VSM::onInitialiseClient"
+			{
+				"value": "dev.vixid.vsm.VSM",
+				"adapter": "kotlin"
+			}
 		]
 	},
 	"mixins": [