Attempt to move over to Unimined

fabric/build.gradle

@@ -1,22 +1,7 @@
-apply plugin: "fabric-loom"
-
-loom {
-    accessWidenerPath = project(":common").file("src/main/resources/${accessWidenerVersion}.distanthorizons.accesswidener")
-
-    // "runs" isn't required, but when we do need it then it can be useful
-    runs {
-        client {
-            client()
-            setConfigName("Fabric Client")
-            ideConfigGenerated(true)
-            runDir("../run")
-        }
-        server {
-            server()
-            setConfigName("Fabric Server")
-            ideConfigGenerated(true)
-            runDir("../run")
-        }
+unimined.minecraft {
+    fabric {
+        loader rootProject.fabric_loader_version
+        accessWidener(project(":common").file("src/main/resources/${accessWidenerVersion}.distanthorizons.accesswidener"))
     }
 }
 
@@ -32,27 +17,31 @@ def addMod(path, enabled) {
     if (enabled == "2")
         dependencies { modImplementation(path) }
     else if (enabled == "1")
-        dependencies { modCompileOnly(path) }
+        dependencies { compileOnly(path) }
+}
+
+// TODO: There currently seems to be a bug which causes the regular addModJar to not work, swap back to the regular addModJar when fixed
+def addModJar_(path) {
+    dependencies {
+        modImplementation(path)
+        include(path)
+    }
 }
 
 dependencies {
-    minecraft "com.mojang:minecraft:${minecraft_version}"
-    mappings loom.layered() {
-        // Mojmap mappings
-        officialMojangMappings()
-        // Parchment mappings (it adds parameter mappings & javadoc)
-        parchment("org.parchmentmc.data:parchment-${rootProject.parchment_version}@zip")
-    }
-    // Fabric loader
-    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-
+    annotationProcessor "javax.annotation:javax.annotation-api:1.3.2"
+    implementation("javax.annotation:javax.annotation-api:1.3.2")
+    runtimeOnly "javax.annotation:javax.annotation-api:1.3.2"
+    compileOnly "javax.annotation:javax.annotation-api:1.3.2"
+    modImplementation "javax.annotation:javax.annotation-api:1.3.2"
+    
     // Fabric API
-    addModJar(fabricApi.module("fabric-api-base", rootProject.fabric_api_version))
-    addModJar(fabricApi.module("fabric-lifecycle-events-v1", rootProject.fabric_api_version))
-    addModJar(fabricApi.module("fabric-resource-loader-v0", rootProject.fabric_api_version))
-    addModJar(fabricApi.module("fabric-events-interaction-v0", rootProject.fabric_api_version))
-    addModJar(fabricApi.module("fabric-rendering-v1", rootProject.fabric_api_version)) // TODO: Remove this as it is only needed in 1 line (FabricClientProxy)
-    addModJar(fabricApi.module("fabric-networking-api-v1", rootProject.fabric_api_version))
+    addModJar_(fabricApi.fabricModule("fabric-api-base", rootProject.fabric_api_version))
+    addModJar_(fabricApi.fabricModule("fabric-lifecycle-events-v1", rootProject.fabric_api_version))
+    addModJar_(fabricApi.fabricModule("fabric-resource-loader-v0", rootProject.fabric_api_version))
+    addModJar_(fabricApi.fabricModule("fabric-events-interaction-v0", rootProject.fabric_api_version))
+    addModJar_(fabricApi.fabricModule("fabric-rendering-v1", rootProject.fabric_api_version)) // TODO: Remove this as it is only needed in 1 line (FabricClientProxy)
+    addModJar_(fabricApi.fabricModule("fabric-networking-api-v1", rootProject.fabric_api_version))
 
     // Mod Menu
     modImplementation("com.terraformersmc:modmenu:${rootProject.modmenu_version}")
@@ -123,11 +112,13 @@ processResources {
     dependsOn(copyCommonLoaderResources)
 }
 
-runClient {
-    dependsOn(copyCoreResources)
-    dependsOn(copyCommonLoaderResources)
+afterEvaluate {
+    runClient {
+        dependsOn(copyCoreResources)
+        dependsOn(copyCommonLoaderResources)
 //    jvmArgs([ "-XX:-OmitStackTraceInFastThrow", minecraftMemoryJavaArg ])
-    finalizedBy(deleteResources)
+        finalizedBy(deleteResources)
+    }
 }
 
 //jar {