diff --git a/.editorconfig b/.editorconfig
index 3379eac6945..ee7d4d0a45f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,9 +1,11 @@
 root = true
 
-[*.kt]
-indent_style = space
-indent_size = 4
+[*]
 end_of_line = lf
 charset = utf-8
+insert_final_newline = true
+
+[*.{kt,kts}]
+indent_style = space
+indent_size = 4
 trim_trailing_whitespace = true
-insert_final_newline = true
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index ce6043805f4..3301e657bdf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,10 +21,23 @@ plugins {
     id "fabric-loom"
     id "org.jetbrains.kotlin.jvm"
     id "com.github.johnrengelman.shadow" version "6.1.0"
+    id "org.jlleitschuh.gradle.ktlint" version "10.0.0"
 }
 
 import net.fabricmc.loom.task.RemapJarTask
 
+ktlint {
+    enableExperimentalRules = true
+    ignoreFailures = true
+    disabledRules = ["no-wildcard-imports", "no-blank-line-before-rbrace"]
+
+    reporters {
+        reporter "plain"
+        reporter "checkstyle"
+    }
+
+}
+
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8