Merge pull request #84 from magneticflux-/develop

.github/workflows/ci.yml

@@ -84,4 +84,5 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CURSE_API_KEY: ${{ secrets.CURSE_API_KEY }}
+          MODRINTH_API_KEY: ${{ secrets.MODRINTH_API_KEY }}
         run: ./gradlew githubRelease publish

build.gradle.kts

@@ -11,12 +11,13 @@ plugins {
     java
     idea
     `maven-publish`
-    id("fabric-loom") version "0.12-SNAPSHOT"
+    id("fabric-loom") version "1.0-SNAPSHOT"
     id("com.github.ben-manes.versions") version "0.42.0"
     id("com.matthewprenger.cursegradle") version "1.4.0"
-    id("com.diffplug.spotless") version "6.7.2"
-    kotlin("jvm") version "1.7.0"
-    kotlin("plugin.serialization") version "1.7.0"
+    id("com.modrinth.minotaur") version "2.+"
+    id("com.diffplug.spotless") version "6.11.0"
+    kotlin("jvm") version "1.7.20"
+    kotlin("plugin.serialization") version "1.7.20"
     id("org.shipkit.shipkit-auto-version") version "1.+"
     id("org.shipkit.shipkit-changelog") version "1.+"
     id("org.shipkit.shipkit-github-release") version "1.+"
@@ -51,6 +52,7 @@ repositories {
 }
 
 val curseforge_id: String by project
+val modrinth_id: String by project
 val archives_base_name: String by project
 val maven_group: String by project
 val minecraft_version: String by project
@@ -212,12 +214,33 @@ curseforge {
     )
 }
 
+modrinth {
+    // Stored in ~/.gradle/gradle.properties
+    when {
+        project.hasProperty("modrinthApiKey") -> token.set(project.property("modrinthApiKey").toString())
+        System.getenv("MODRINTH_API_KEY") != null -> token.set(System.getenv("MODRINTH_API_KEY"))
+        else -> println("No Modrinth API key found, \'modrinth\' tasks will not work")
+    }
+    projectId.set(modrinth_id)
+    versionNumber.set(version.toString())
+    gameVersions.add(minecraft_version)
+    uploadFile.set(tasks.remapJar as Any)
+    additionalFiles.add(tasks.remapSourcesJar as Any)
+    loaders.addAll("fabric", "quilt")
+    dependencies {
+        required.project("fabric-api")
+        optional.project("modmenu")
+        embedded.project("cloth-config")
+        embedded.project("fabric-language-kotlin")
+    }
+}
+
 spotless {
     kotlin {
-        ktlint("0.45.2")
+        ktlint("0.47.1")
     }
     kotlinGradle {
-        ktlint("0.45.2")
+        ktlint("0.47.1")
     }
 }
 

gradle.properties

@@ -5,19 +5,20 @@ kotlin.code.style=official
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://fabricmc.net/use
-minecraft_version=1.19
-yarn_mappings=1.19+build.4
-loader_version=0.14.8
+minecraft_version=1.19.1
+yarn_mappings=1.19.1+build.6
+loader_version=0.14.9
 # Mod Properties
 maven_group=com.skaggsm
 archives_base_name=fabric-mumblelink-mod
 curseforge_id=321669
+modrinth_id=3QyVJtCB
 # Dependencies
-fabric_version=0.57.0+1.19
-kotlin_version=1.8.1+kotlin.1.7.0
-cloth_config_version=7.0.72
+fabric_version=0.58.5+1.19.1
+kotlin_version=1.8.4+kotlin.1.7.20
+cloth_config_version=8.2.88
 fiber_2_cloth_version=4.0.0
 fiber_version=0.23.0-2
-modmenu_version=4.0.0
+modmenu_version=4.0.6
 # Don't include the standard library, it's already bundled with fabric-language-kotlin
 kotlin.stdlib.default.dependency=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/kotlin/com/skaggsm/mumblelinkmod/client/ClientMumbleLinkMod.kt

@@ -164,8 +164,9 @@ object ClientMumbleLinkMod : ClientModInitializer {
     private fun ensureLinked(): MumbleLink {
         var localMumble = mumble
 
-        if (localMumble != null)
+        if (localMumble != null) {
             return localMumble
+        }
 
         LOG.info("Linking to VoIP client...")
         localMumble = MumbleLinkImpl()

src/main/kotlin/com/skaggsm/mumblelinkmod/main/MainMumbleLinkMod.kt

@@ -49,7 +49,6 @@ object MainMumbleLinkMod : ModInitializer {
         setupEvents()
     }
 
-    @Suppress("DEPRECATION")
     private fun setupConfig() {
         config = MainConfig()
 
@@ -65,8 +64,9 @@ object MainMumbleLinkMod : ModInitializer {
 
     fun createSettings(): AnnotatedSettings {
         val settingsBuilder = AnnotatedSettings.builder()
-        if (FabricLoader.getInstance().environmentType == EnvType.CLIENT)
+        if (FabricLoader.getInstance().environmentType == EnvType.CLIENT) {
             Fiber2Cloth.configure(settingsBuilder)
+        }
         return settingsBuilder.build()
     }
 
@@ -116,16 +116,24 @@ object MainMumbleLinkMod : ModInitializer {
         val dim = toWorld.value
         val dimNamespace = dim.namespace.split('_').joinToString(" ") {
             it.replaceFirstChar { c ->
-                if (c.isLowerCase()) c.titlecase(
-                    Locale.getDefault()
-                ) else c.toString()
+                if (c.isLowerCase()) {
+                    c.titlecase(
+                        Locale.getDefault()
+                    )
+                } else {
+                    c.toString()
+                }
             }
         }
         val dimPath = dim.path.split('_').joinToString(" ") {
             it.replaceFirstChar { c ->
-                if (c.isLowerCase()) c.titlecase(
-                    Locale.getDefault()
-                ) else c.toString()
+                if (c.isLowerCase()) {
+                    c.titlecase(
+                        Locale.getDefault()
+                    )
+                } else {
+                    c.toString()
+                }
             }
         }
         val dimId = "$dimNamespace $dimPath"