Fix processResources

Juuxel · Apr 26, 2019 · 028b874 · 028b874
1 parent 8cc8793
commit 028b874
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 28 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -46,6 +46,17 @@ allprojects {
     tasks.withType<KotlinCompile> {
         kotlinOptions.jvmTarget = "1.8"
     }
+
+    tasks.getByName<ProcessResources>("processResources") {
+        inputs.property("version", project.version)
+        filesMatching("fabric.mod.json") {
+            expand(
+                mutableMapOf(
+                    "version" to project.version
+                )
+            )
+        }
+    }
 }
 
 minecraft {
@@ -72,14 +83,3 @@ dependencies {
     modCompileAndInclude("alexiil.mc.lib:libblockattributes:0.4.0")
     modCompileAndInclude("io.github.cottonmc:cotton:0.6.1+1.14-SNAPSHOT")
 }
-
-tasks.getByName<ProcessResources>("processResources") {
-    inputs.property("version", project.version)
-    filesMatching("fabric.mod.json") {
-        expand(
-            mutableMapOf(
-                "version" to project.version
-            )
-        )
-    }
-}
diff --git a/json-plugin/build.gradle.kts b/json-plugin/build.gradle.kts
@@ -32,14 +32,3 @@ application {
 tasks.getByName<JavaExec>("run") {
     workingDir = project.mkdir("run")
 }
-
-tasks.getByName<ProcessResources>("processResources") {
-    inputs.property("version", project.version)
-    filesMatching("fabric.mod.json") {
-        expand(
-            mutableMapOf(
-                "version" to project.version
-            )
-        )
-    }
-}
diff --git a/src/main/kotlin/juuxel/adorn/Adorn.kt b/src/main/kotlin/juuxel/adorn/Adorn.kt
@@ -2,7 +2,6 @@ package juuxel.adorn
 
 import juuxel.adorn.lib.ModBlocks
 import juuxel.adorn.lib.ModGuis
-import net.fabricmc.api.ClientModInitializer
 import net.fabricmc.api.EnvType
 import net.fabricmc.api.Environment
 import net.fabricmc.api.ModInitializer
@@ -16,9 +15,8 @@ object Adorn : ModInitializer {
     }
 
     @Environment(EnvType.CLIENT)
-    object Client : ClientModInitializer {
-        override fun onInitializeClient() {
-            ModGuis.initClient()
-        }
+    @Suppress("UNUSED")
+    fun initClient() {
+        ModGuis.initClient()
     }
 }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -22,7 +22,7 @@
     ],
     "client": [
       {
-        "value": "juuxel.adorn.Adorn$Client",
+        "value": "juuxel.adorn.Adorn::initClient",
         "adapter": "kotlin"
       }
     ]