Migrate to Cloche

Signed-off-by: Naomi Roberts <[e-mail]>

build.gradle.kts

···
 plugins {
-    id("fabric-loom") version "1.10-SNAPSHOT"
     id("maven-publish")
     kotlin("jvm") version libs.versions.kotlin
+    alias(libs.plugins.cloche)
 }
 
-val minecraft_version = "1.20.1"
-
-version = "1.0.0"
-group = "xyz.naomieow.asbestos"
-
 repositories {
+    cloche {
+        librariesMinecraft()
+        mavenNeoforged()
+        mavenFabric()
+        main()
+    }
     maven("https://maven.wispforest.io")
     maven("https://maven.kosmx.dev/")
     maven("https://maven.ladysnake.org/releases")
···
     maven("https://maven.isxander.dev/releases")
 }
 
-dependencies {
-    minecraft("com.mojang:minecraft:${minecraft_version}")
-    mappings(loom.officialMojangMappings())
+version = "1.0.0"
+group = "xyz.naomieow.asbestos"
 
-    // fabric stuff
-    modImplementation(libs.fabric.kotlin)
-    modImplementation(libs.fabric.loader)
-    modImplementation(libs.fabric.api)
+cloche {
+    minecraftVersion = "1.20.1"
 
-    // kritter
-    modCompileOnly(libs.kritter)
-    modImplementation(libs.fabric.kritter)?.let(::include)
+    metadata {
+        modId = "asbestos"
+        name = "Carcinogenic Fibrous Silicate"
+        description = "Adds Asbestos and all of it's consequences"
+        license = "Polyform Shield 1.0.0"
+        icon = "assets/asbestos/icon.png"
 
-    // yacl
-    modImplementation(libs.fabric.yacl)
+        custom(buildMap {
+            put("cardinal-components", listOf("asbestos:mesothelioma"))
+        })
 
-    // Cardinal Components API
-    modImplementation(libs.cca.base)?.let(::include)
-    modImplementation(libs.cca.entity)?.let(::include)
+        author("Naomi Roberts")
+    }
 
-    // modmenu
-    modImplementation(libs.fabric.modmenu)
-}
+    singleTarget {
+        fabric {
+            loaderVersion = libs.versions.fabric.loader
 
-tasks {
-    processResources {
-        val props = buildMap {
-            put("version", project.version)
-            put("minecraft_version", minecraft_version)
-            put("loader_version", "0.16.9")
-        }
+            includedClient()
 
-        props.forEach(inputs::property)
+            runs {
+                server()
+                client()
+            }
 
-        filesMatching("fabric.mod.json") { expand(props) }
-    }
+            dependencies {
+                // fabric stuff
+                modImplementation(libs.fabric.kotlin)
+                modImplementation(libs.fabric.loader)
+                modImplementation(libs.fabric.api)
 
-    java {
-        withSourcesJar()
-    }
+                // kritter
+                modCompileOnly(libs.kritter)
+                modImplementation(libs.fabric.kritter)
+                include(libs.fabric.kritter)
+
+                // yacl
+                modImplementation(libs.fabric.yacl)
 
-    jar {
-        from("LICENSE") {
-            rename { "${it}_${base.archivesName}"}
+                // Cardinal Components API
+                modImplementation(libs.cca.base)
+                include(libs.cca.base)
+                modImplementation(libs.cca.entity)
+                include(libs.cca.entity)
+
+                // modmenu
+                modImplementation(libs.fabric.modmenu)
+            }
+
+            metadata {
+                entrypoint("main") {
+                    value = "xyz.naomieow.asbestos.AsbestosMod"
+                    adapter = "kotlin"
+                }
+                entrypoint("client") {
+                    value = "xyz.naomieow.asbestos.AsbestosModClient"
+                    adapter = "kotlin"
+                }
+                entrypoint("cardinal-components-entity") {
+                    value = "xyz.naomieow.asbestos.AsbestosMod"
+                    adapter = "kotlin"
+                }
+                entrypoint("modmenu") {
+                    value = "xyz.naomieow.asbestos.config.ModMenuIntegration"
+                    adapter = "kotlin"
+                }
+            }
         }
     }
 }
+//
+//tasks {
+//    processResources {
+//        val props = buildMap {
+//            put("version", project.version)
+//            put("minecraft_version", minecraft_version)
+//            put("loader_version", "0.16.9")
+//        }
+//
+//        props.forEach(inputs::property)
+//
+//        filesMatching("fabric.mod.json") { expand(props) }
+//    }
+//
+//    java {
+//        withSourcesJar()
+//    }
+//
+//    jar {
+//        from("LICENSE") {
+//            rename { "${it}_${base.archivesName}"}
+//        }
+//    }
+//}

gradle.properties

···
-org.gradle.jvmargs=-Xmx1G
-
-archives_base_name = Asbestos
-minecraft_version=1.20.1
-modid=asbestos
+org.gradle.jvmargs=-Xmx8G

libs.versions.toml

···
 [versions]
+# Common
+cloche = "0.10.13"
 kotlin = "2.1.0"
-fabric-kotlin = "1.13.0+kotlin.2.1.0"
-fabric-loader= "0.16.9"
-fabric-api = "0.89.3+1.20.1"
-fabric-modmenu = "7.2.2"
-fabric-yacl = "3.6.1+1.20.1-fabric"
 cca = "5.2.2"
 kritter = "0.1.1+1.20.1"
+# Fabric
+fabric-kotlin = "1.13.0+kotlin.2.1.0"
+fabric-loader= "0.16.14"
+fabric-api = "0.92.6+1.20.1"
+fabric-modmenu = "7.2.2"
+fabric-yacl = "3.6.6+1.20.1-fabric"
 
 [libraries]
-# Common Deps
+# Common
 cca-base = { module = "dev.onyxstudios.cardinal-components-api:cardinal-components-base", version.ref = "cca" }
 cca-entity = { module = "dev.onyxstudios.cardinal-components-api:cardinal-components-entity", version.ref = "cca" }
 kritter = { module = "uwu.serenity.kritter:kritter-common", version.ref = "kritter" }
-# Fabric Deps
+# Fabric
 fabric-kotlin = { module = "net.fabricmc:fabric-language-kotlin", version.ref = "fabric-kotlin" }
 fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric-loader" }
 fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric-api" }
···
 fabric-modmenu = { module = "com.terraformersmc:modmenu", version.ref = "fabric-modmenu" }
 fabric-yacl = { module = "dev.isxander:yet-another-config-lib", version.ref = "fabric-yacl" }
 
-[plugins]
+[plugins]
+cloche = { id = "earth.terrarium.cloche", version.ref = "cloche" }

settings.gradle.kts

···
 
 pluginManagement {
     repositories {
-        maven("https://maven.fabricmc.net/") {
-            name = "Fabric"
-        }
         mavenCentral()
         gradlePluginPortal()
+        maven("https://maven.msrandom.net/repository/cloche/")
     }
 }
 

src/main/resources/fabric.mod.json

···
-{
-  "schemaVersion": 1,
-  "id": "asbestos",
-  "version": "${version}",
-  "name": "Asbestos",
-  "description": "Adds Asbestos and all of it's consequences",
-  "authors": [
-    "naomieow"
-  ],
-  "contact": {
-    "website": "https://gitlab.com/naomieow/Asbestos",
-    "repo": "https://gitlab.com/naomieow/Asbestos"
-  },
-  "license": "LGPL-3.0",
-  "icon": "assets/asbestos/icon.png",
-  "environment": "*",
-  "entrypoints": {
-    "main": [
-      {
-        "value": "xyz.naomieow.asbestos.AsbestosMod",
-        "adapter": "kotlin"
-      }
-    ],
-    "client": [
-      {
-        "value": "xyz.naomieow.asbestos.AsbestosModClient",
-        "adapter": "kotlin"
-      }
-    ],
-    "cardinal-components-entity": [
-      {
-        "value": "xyz.naomieow.asbestos.AsbestosMod",
-        "adapter": "kotlin"
-      }
-    ],
-    "modmenu": [
-      {
-        "value": "xyz.naomieow.asbestos.config.ModMenuIntegration",
-        "adapter": "kotlin"
-      }
-    ]
-  },
-  "custom": {
-    "cardinal-components": [
-      "asbestos:mesothelioma"
-    ]
-  },
-  "depends": {
-    "fabricloader": ">=${loader_version}",
-    "fabric": "*",
-    "minecraft": "${minecraft_version}"
-  }
-}