chore: ktlint rule set update

Author: RubixDev

build.gradle.kts

@@ -39,13 +39,12 @@ spotless {
             "ktlint_standard_no-wildcard-imports" to "disabled",
             "ktlint_standard_blank-line-before-declaration" to "disabled",
             "ktlint_standard_spacing-between-declarations-with-annotations" to "disabled",
-            // these don't play well with preprocessing
-            "ktlint_standard_import-ordering" to "disabled",
             // these are replaced by the custom rule set
+            "ktlint_standard_import-ordering" to "disabled",
             "ktlint_standard_comment-spacing" to "disabled",
             "ktlint_standard_chain-wrapping" to "disabled",
         ),
-    ).customRuleSets(listOf("com.github.RubixDev:ktlint-ruleset-mc-preprocessor:01fbcf09be"))
+    ).customRuleSets(listOf("com.github.RubixDev:ktlint-ruleset-mc-preprocessor:3194cea69f"))
 
     kotlinGradle {
         target("**/*.gradle.kts")

common.gradle.kts

@@ -1,8 +1,8 @@
+import kotlin.reflect.KProperty
+import kotlin.reflect.full.starProjectedType
 import net.fabricmc.loom.task.RemapJarTask
 import org.gradle.jvm.tasks.Jar
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import kotlin.reflect.KProperty
-import kotlin.reflect.full.starProjectedType
 
 plugins {
     id("maven-publish")

src/main/kotlin/de/rubixdev/enchantedshulkers/config/WorldConfig.kt

@@ -5,6 +5,14 @@ import com.moandjiezana.toml.TomlWriter
 import de.rubixdev.enchantedshulkers.Mod
 import de.rubixdev.enchantedshulkers.Mod.MOD_ID
 import de.rubixdev.enchantedshulkers.Utils.clientModVersion
+import java.io.File
+import java.io.IOException
+import java.util.function.Function
+import kotlin.reflect.KMutableProperty1
+import kotlin.reflect.full.declaredMemberProperties
+import kotlin.reflect.full.findAnnotation
+import kotlin.reflect.full.starProjectedType
+import kotlin.reflect.jvm.isAccessible
 import net.fabricmc.fabric.api.networking.v1.PacketByteBufs
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking
 import net.fabricmc.loader.api.FabricLoader
@@ -17,14 +25,6 @@ import net.minecraft.server.MinecraftServer
 import net.minecraft.server.network.ServerPlayerEntity
 import net.minecraft.text.Text
 import net.minecraft.util.WorldSavePath
-import java.io.File
-import java.io.IOException
-import java.util.function.Function
-import kotlin.reflect.KMutableProperty1
-import kotlin.reflect.full.declaredMemberProperties
-import kotlin.reflect.full.findAnnotation
-import kotlin.reflect.full.starProjectedType
-import kotlin.reflect.jvm.isAccessible
 
 object WorldConfig {
     private var server: MinecraftServer? = null

src/main/kotlin/de/rubixdev/enchantedshulkers/enchantment/SiphonEnchantment.kt

@@ -3,11 +3,11 @@ package de.rubixdev.enchantedshulkers.enchantment
 import de.rubixdev.enchantedshulkers.Mod
 import de.rubixdev.enchantedshulkers.Utils
 import de.rubixdev.enchantedshulkers.config.WorldConfig
+import kotlin.math.min
 import net.minecraft.enchantment.Enchantment
 import net.minecraft.item.ItemStack
 import net.minecraft.server.network.ServerPlayerEntity
 import net.minecraft.util.collection.DefaultedList
-import kotlin.math.min
 
 class SiphonEnchantment : ContainerEnchantment(Mod.PORTABLE_CONTAINER_TARGET) {
     override fun generate() = WorldConfig.generateSiphon