reformat with kotlin coding conventions

README.md

@@ -1,14 +1,14 @@
 # autodrop
+
 This mod provides a function to automatically drop items from the
 inventory if they are blacklisted. You can easily disable it by pressing a hotkey (`default: j`).
 
 ## Managing items
+
 - use the configuration section of the modmenu integration
 - press the keybinding for the config GUI (`default: o`)
 - archives can be toggled by double-clicking the archive in the GUI
 
 ### Other
-⚠️ The development version is always the latest stable release of Minecraft. 
-Therefore, new features will only be available for the current and following Minecraft versions.
 
 If you need help with any of my mods just join my [discord server](https://nyon.dev/discord)

build.gradle.kts

@@ -1,7 +1,6 @@
 @file:Suppress("SpellCheckingInspection")
 
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import kotlin.io.path.readText
 
 plugins {
     kotlin("jvm") version "1.9.24"
@@ -50,12 +49,10 @@ repositories {
 
 dependencies {
     minecraft("com.mojang:minecraft:$mcVersion")
-    mappings(
-        loom.layered {
-            parchment("org.parchmentmc.data:parchment-${property("deps.parchment")}@zip")
-            officialMojangMappings()
-        }
-    )
+    mappings(loom.layered {
+        parchment("org.parchmentmc.data:parchment-${property("deps.parchment")}@zip")
+        officialMojangMappings()
+    })
 
     implementation("org.vineflower:vineflower:1.10.1")
     modImplementation("net.fabricmc:fabric-loader:0.15.11")
@@ -75,15 +72,14 @@ tasks {
         val modName = "autodrop"
         val modDescription = "Mod to automatically drop items from your inventory"
 
-        val props =
-            mapOf(
-                "id" to modId,
-                "name" to modName,
-                "description" to modDescription,
-                "version" to project.version,
-                "github" to githubRepo,
-                "mc" to mcVersionRange
-            )
+        val props = mapOf(
+            "id" to modId,
+            "name" to modName,
+            "description" to modDescription,
+            "version" to project.version,
+            "github" to githubRepo,
+            "mc" to mcVersionRange
+        )
 
         props.forEach(inputs::property)
 
@@ -108,13 +104,13 @@ tasks {
     }
 }
 
-val changelogText =
-    buildString {
-        append("# v${project.version}\n")
-        file("../../changelog.md").readText().also { append(it) }
-    }
+val changelogText = buildString {
+    append("# v${project.version}\n")
+    file("../../changelog.md").readText().also { append(it) }
+}
 
-val supportedMcVersions: List<String> = property("supportedMcVersions")!!.toString().split(',').map(String::trim).filter(String::isNotEmpty)
+val supportedMcVersions: List<String> =
+    property("supportedMcVersions")!!.toString().split(',').map(String::trim).filter(String::isNotEmpty)
 
 publishMods {
     displayName = "v${project.version}"
@@ -171,9 +167,7 @@ publishing {
 java {
     withSourcesJar()
 
-    javaVersion.toInt()
-        .let { JavaVersion.values()[it - 1] }
-        .let {
+    javaVersion.toInt().let { JavaVersion.values()[it - 1] }.let {
             sourceCompatibility = it
             targetCompatibility = it
         }

gradle.properties

@@ -1,3 +1,2 @@
 kotlin.code.style=official
-
 org.gradle.jvmargs=-Xmx4096M

src/main/java/dev/nyon/autodrop/mixins/MinecraftClientMixin.java

@@ -10,7 +10,10 @@
 @Mixin(Minecraft.class)
 public class MinecraftClientMixin {
 
-    @Inject(method = "tick", at = @At("TAIL"))
+    @Inject(
+        method = "tick",
+        at = @At("TAIL")
+    )
     public void onTick(CallbackInfo ci) {
         AutoDrop.INSTANCE.tick((Minecraft) (Object) this);
     }

src/main/java/dev/nyon/autodrop/mixins/PlayerInventoryMixin.java

@@ -12,13 +12,27 @@
 @Mixin(Inventory.class)
 public class PlayerInventoryMixin {
 
-    @Inject(method = "add(ILnet/minecraft/world/item/ItemStack;)Z", at = @At(value = "RETURN"))
-    public void onTake(int slot, ItemStack stack, CallbackInfoReturnable<Boolean> cir) {
+    @Inject(
+        method = "add(ILnet/minecraft/world/item/ItemStack;)Z",
+        at = @At(value = "RETURN")
+    )
+    public void onTake(
+        int slot,
+        ItemStack stack,
+        CallbackInfoReturnable<Boolean> cir
+    ) {
         AutoDrop.INSTANCE.onTake();
     }
 
-    @Inject(method = "setItem", at = @At(value = "RETURN"))
-    public void onTake(int i, ItemStack itemStack, CallbackInfo ci) {
+    @Inject(
+        method = "setItem",
+        at = @At(value = "RETURN")
+    )
+    public void onTake(
+        int i,
+        ItemStack itemStack,
+        CallbackInfo ci
+    ) {
         AutoDrop.INSTANCE.onTake();
     }
 }

src/main/kotlin/dev/nyon/autodrop/AutoDrop.kt

@@ -1,23 +1,12 @@
 package dev.nyon.autodrop
 
 import com.mojang.blaze3d.platform.InputConstants
-import dev.nyon.autodrop.config.blockedSlots
-import dev.nyon.autodrop.config.createYaclScreen
-import dev.nyon.autodrop.config.currentItems
-import dev.nyon.autodrop.config.migrate
+import dev.nyon.autodrop.config.*
 import dev.nyon.autodrop.config.models.Config
-import dev.nyon.autodrop.config.reloadArchiveProperties
-import dev.nyon.autodrop.config.settings
 import dev.nyon.konfig.config.config
 import dev.nyon.konfig.config.loadConfig
 import dev.nyon.konfig.config.saveConfig
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.asCoroutineDispatcher
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.*
 import net.fabricmc.api.ClientModInitializer
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper
 import net.fabricmc.loader.api.FabricLoader
@@ -29,50 +18,33 @@ import net.minecraft.network.chat.Style
 import net.minecraft.world.entity.player.Inventory
 import net.minecraft.world.inventory.ClickType
 import org.lwjgl.glfw.GLFW
-import kotlin.io.path.createFile
-import kotlin.io.path.deleteIfExists
-import kotlin.io.path.exists
-import kotlin.io.path.notExists
-import kotlin.io.path.readText
-import kotlin.io.path.writeText
 import kotlin.time.Duration.Companion.milliseconds
 
 lateinit var mcDispatcher: CoroutineDispatcher
 lateinit var mcScope: CoroutineScope
 lateinit var minecraft: Minecraft
 
 object AutoDrop : ClientModInitializer {
-    private val toggleKeyBind =
-        KeyBindingHelper.registerKeyBinding(
-            KeyMapping(
-                "Toggle AutoDrop",
-                InputConstants.Type.KEYSYM,
-                GLFW.GLFW_KEY_J,
-                "autodrop"
-            )
+    private val toggleKeyBind = KeyBindingHelper.registerKeyBinding(
+        KeyMapping(
+            "Toggle AutoDrop", InputConstants.Type.KEYSYM, GLFW.GLFW_KEY_J, "autodrop"
         )
+    )
 
-    private val menuKeyBind =
-        KeyBindingHelper.registerKeyBinding(
-            KeyMapping(
-                "Open GUI",
-                InputConstants.Type.KEYSYM,
-                GLFW.GLFW_KEY_O,
-                "autodrop"
-            )
+    private val menuKeyBind = KeyBindingHelper.registerKeyBinding(
+        KeyMapping(
+            "Open GUI", InputConstants.Type.KEYSYM, GLFW.GLFW_KEY_O, "autodrop"
         )
+    )
 
     fun tick(client: Minecraft) {
         if (toggleKeyBind.consumeClick()) {
             settings.enabled = !settings.enabled
             saveConfig(settings)
             client.gui.setOverlayMessage(
-                Component.translatable("menu.autodrop.name").append(" ")
-                    .append(
+                Component.translatable("menu.autodrop.name").append(" ").append(
                         Component.translatable(if (settings.enabled) "menu.autodrop.overlay.enabled" else "menu.autodrop.overlay.disabled")
-                    )
-                    .withStyle(Style.EMPTY.withColor(0xF99147)),
-                false
+                    ).withStyle(Style.EMPTY.withColor(0xF99147)), false
             )
             if (settings.enabled) onTake()
         }
@@ -81,40 +53,39 @@ object AutoDrop : ClientModInitializer {
 
     private var jobWaiting = false
 
-    fun onTake() =
-        runBlocking {
-            if (!settings.enabled) return@runBlocking
-            if (settings.activeArchives.isEmpty()) return@runBlocking
-            val player = minecraft.player ?: return@runBlocking
-            if (jobWaiting) return@runBlocking
-            jobWaiting = true
-
-            mcScope.launch {
-                delay(settings.dropDelay.milliseconds)
+    fun onTake() = runBlocking {
+        if (!settings.enabled) return@runBlocking
+        if (settings.activeArchives.isEmpty()) return@runBlocking
+        val player = minecraft.player ?: return@runBlocking
+        if (jobWaiting) return@runBlocking
+        jobWaiting = true
 
-                val screen = InventoryScreen(player)
-                screen.menu.slots.filter {
-                    it.hasItem() && !blockedSlots.contains(it.index) && currentItems.contains(it.item.item) && it.container is Inventory
-                }.forEach { slot ->
-                    minecraft.gameMode?.handleInventoryMouseClick(
-                        screen.menu.containerId,
-                        slot.index,
-                        1,
-                        ClickType.THROW,
-                        player
-                    )
-                }
+        mcScope.launch {
+            delay(settings.dropDelay.milliseconds)
 
-                jobWaiting = false
+            val screen = InventoryScreen(player)
+            screen.menu.slots.filter {
+                it.hasItem() && !blockedSlots.contains(it.index) && currentItems.contains(it.item.item) && it.container is Inventory
+            }.forEach { slot ->
+                minecraft.gameMode?.handleInventoryMouseClick(
+                    screen.menu.containerId, slot.index, 1, ClickType.THROW, player
+                )
             }
+
+            jobWaiting = false
         }
+    }
 
     override fun onInitializeClient() {
         minecraft = Minecraft.getInstance()
         mcDispatcher = minecraft.asCoroutineDispatcher()
         mcScope = CoroutineScope(SupervisorJob() + mcDispatcher)
 
-        config(FabricLoader.getInstance().configDir.resolve("autodrop.json"), 1, Config()) { jsonTree, version -> migrate(jsonTree, version) }
+        config(
+            FabricLoader.getInstance().configDir.resolve("autodrop.json"),
+            1,
+            Config()
+        ) { jsonTree, version -> migrate(jsonTree, version) }
         settings = loadConfig<Config>()
 
         reloadArchiveProperties()

src/main/kotlin/dev/nyon/autodrop/config/ConfigHandler.kt

@@ -2,12 +2,7 @@ package dev.nyon.autodrop.config
 
 import dev.nyon.autodrop.config.models.Archive
 import dev.nyon.autodrop.config.models.Config
-import kotlinx.serialization.json.JsonElement
-import kotlinx.serialization.json.contentOrNull
-import kotlinx.serialization.json.jsonArray
-import kotlinx.serialization.json.jsonObject
-import kotlinx.serialization.json.jsonPrimitive
-import kotlinx.serialization.json.longOrNull
+import kotlinx.serialization.json.*
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.item.Item
@@ -30,31 +25,29 @@ fun reloadArchiveProperties() {
 }
 
 internal fun migrate(
-    jsonTree: JsonElement,
-    version: Int?
+    jsonTree: JsonElement, version: Int?
 ): Config? {
     val jsonObject = jsonTree.jsonObject
     return when (version) {
-        null ->
-            Config(
-                jsonObject["enabled"]?.jsonPrimitive?.content?.toBooleanStrictOrNull() ?: return null,
-                jsonObject["archives"]?.jsonArray?.map {
-                    val archiveObject = it.jsonObject
-                    return@map Archive(
-                        archiveObject["name"]?.jsonPrimitive?.content ?: return null,
-                        archiveObject["items"]?.jsonArray?.map secMap@{ content ->
-                            return@secMap ResourceLocation(
-                                content.jsonPrimitive.contentOrNull ?: return null
-                            )
-                        }?.toMutableList() ?: return null,
-                        archiveObject["lockedSlots"]?.jsonArray?.map secMap@{ content ->
-                            content.jsonPrimitive.content.toIntOrNull() ?: return null
-                        }?.toMutableList() ?: return null
-                    )
-                }?.toMutableList() ?: return null,
-                jsonObject["activeArchives"]?.jsonArray?.map { it.jsonPrimitive.content }?.toMutableList() ?: return null,
-                jsonObject["dropDelay"]?.jsonPrimitive?.longOrNull ?: return null
-            )
+        null -> Config(
+            jsonObject["enabled"]?.jsonPrimitive?.content?.toBooleanStrictOrNull() ?: return null,
+            jsonObject["archives"]?.jsonArray?.map {
+                val archiveObject = it.jsonObject
+                return@map Archive(
+                    archiveObject["name"]?.jsonPrimitive?.content ?: return null,
+                    archiveObject["items"]?.jsonArray?.map secMap@{ content ->
+                        return@secMap ResourceLocation(
+                            content.jsonPrimitive.contentOrNull ?: return null
+                        )
+                    }?.toMutableList() ?: return null,
+                    archiveObject["lockedSlots"]?.jsonArray?.map secMap@{ content ->
+                        content.jsonPrimitive.content.toIntOrNull() ?: return null
+                    }?.toMutableList() ?: return null
+                )
+            }?.toMutableList() ?: return null,
+            jsonObject["activeArchives"]?.jsonArray?.map { it.jsonPrimitive.content }?.toMutableList() ?: return null,
+            jsonObject["dropDelay"]?.jsonPrimitive?.longOrNull ?: return null
+        )
 
         else -> null
     }