Merge branch '2025.2' into 2025.3

Author: DenWav

.editorconfig

@@ -1,6 +1,10 @@
+root = true
+
 [*.{kt,kts}]
-max_line_length=120
-ij_kotlin_imports_layout=*
+indent_size = 4
+indent_style = space
+max_line_length = 120
+ij_kotlin_imports_layout = *
 ij_kotlin_name_count_to_use_star_import = 2147483647
 ij_kotlin_name_count_to_use_star_import_for_members = 2147483647
 insert_final_newline = true

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "templates"]
 	path = templates
-	branch = v1
+	branch = v2
 	url = https://github.com/minecraft-dev/templates

build.gradle.kts

@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2025 minecraft-dev
+ * Copyright (C) 2026 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
@@ -19,11 +19,14 @@
  */
 
 import io.sentry.android.gradle.extensions.SentryPluginExtension
+import java.util.concurrent.atomic.AtomicInteger
+import kotlin.concurrent.atomics.AtomicInt
 import org.gradle.kotlin.dsl.configure
 import org.jetbrains.changelog.Changelog
 import org.jetbrains.gradle.ext.settings
 import org.jetbrains.gradle.ext.taskTriggers
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
+import org.jetbrains.intellij.platform.gradle.tasks.CleanSandboxTask
 import org.jetbrains.intellij.platform.gradle.tasks.PrepareSandboxTask
 
 plugins {
@@ -102,6 +105,8 @@ dependencies {
         exclude(group = "org.slf4j")
     }
 
+    implementation(libs.jspecify)
+
     intellijPlatform {
         intellijIdea(libs.versions.intellij.ide) {
             useInstaller = false
@@ -123,7 +128,6 @@ dependencies {
         bundledPlugin("org.toml.lang")
         bundledPlugin("org.jetbrains.plugins.yaml")
 
-
         testFramework(TestFrameworkType.JUnit5)
         testFramework(TestFrameworkType.Platform)
         testFramework(TestFrameworkType.Plugin.Java)
@@ -200,8 +204,39 @@ tasks.processResources {
     }
 }
 
+// Run unit tests in paralllel. Unfortunately, to accomplish this, we also need separate sandboxes for each test fork.
+// All of this is still worth doing since the IntelliJ test fixtures themselves are rather slow.
+val testForks = 6
+val sandboxTestTasks = mutableListOf<TaskProvider<PrepareSandboxTask>>()
+repeat(testForks) {
+    sandboxTestTasks += tasks.register<PrepareSandboxTask>("prepareTestSandboxFork$it") {
+        sandboxSuffix.set("-fork-$it")
+        doFirst {
+            sandboxDirectory.get().asFile.listFiles()
+                ?.filter { f -> f.name.endsWith("-fork-$it") }
+                ?.forEach { f -> f.deleteRecursively() }
+        }
+    }
+}
+tasks.prepareTestSandbox {
+    doFirst {
+        sandboxDirectory.get().asFile.listFiles()
+            ?.filter { f -> f.name.endsWith("-test") }
+            ?.forEach { f -> f.deleteRecursively() }
+    }
+}
+
+val cleanTestSandboxForks by tasks.registering(Delete::class) {
+    doFirst {
+        tasks.prepareTestSandbox.flatMap { it.sandboxDirectory }
+            .get().asFile.listFiles()
+            ?.filter { it.name.matches(Regex(".*-(?:fork-\\d+|test)")) }
+            ?.let { delete(it) }
+    }
+}
 tasks.test {
-    dependsOn(tasks.jar, testLibs)
+    dependsOn(tasks.jar, testLibs, sandboxTestTasks)
+    finalizedBy(cleanTestSandboxForks)
 
     testLibs.resolvedConfiguration.resolvedArtifacts.forEach {
         systemProperty("testLibs.${it.name}", it.file.absolutePath)
@@ -213,6 +248,12 @@ tasks.test {
         "-Dsun.io.useCanonCaches=false",
         "-Dsun.io.useCanonPrefixCache=false",
     )
+
+    val sandboxDir = tasks.prepareTestSandbox.flatMap { it.sandboxDirectory }.get().asFile
+
+    maxParallelForks = testForks
+    systemProperty("sandboxDir", sandboxDir.absolutePath)
+    systemProperty("forks", testForks.toString())
 }
 
 idea {

buildSrc/src/main/kotlin/mcdev-core.gradle.kts

@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2025 minecraft-dev
+ * Copyright (C) 2026 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
@@ -19,6 +19,7 @@
  */
 
 import org.cadixdev.gradle.licenser.header.HeaderStyle
+import org.cadixdev.gradle.licenser.tasks.LicenseTask
 import org.gradle.accessors.dm.LibrariesForLibs
 import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
@@ -66,6 +67,7 @@ kotlin {
     compilerOptions {
         jvmTarget = JvmTarget.JVM_21
         languageVersion = KotlinVersion.KOTLIN_2_2
+        apiVersion = KotlinVersion.KOTLIN_2_2
         jvmDefault = JvmDefaultMode.NO_COMPATIBILITY
         freeCompilerArgs = listOf("-Xjdk-release=21")
         optIn.add("kotlin.contracts.ExperimentalContracts")
@@ -130,14 +132,58 @@ intellijPlatform {
 }
 
 license {
-    header.set(resources.text.fromFile(rootProject.layout.projectDirectory.file("copyright.txt")))
+    header.set(resources.text.fromString($$"""
+        Minecraft Development for IntelliJ
+
+        https://mcdev.io/
+
+        Copyright (C) ${year} minecraft-dev
+
+        This program is free software: you can redistribute it and/or modify
+        it under the terms of the GNU Lesser General Public License as published
+        by the Free Software Foundation, version 3.0 only.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU Lesser General Public License
+        along with this program.  If not, see <https://www.gnu.org/licenses/>.
+    """.trimIndent()))
+
+    properties {
+        set("year", "2026")
+    }
+
     style["flex"] = HeaderStyle.BLOCK_COMMENT.format
     style["bnf"] = HeaderStyle.BLOCK_COMMENT.format
 
     val endings = listOf("java", "kt", "kts", "groovy", "gradle.kts", "xml", "properties", "html", "flex", "bnf")
     include(endings.map { "**/*.$it" })
 }
 
+tasks.withType(LicenseTask::class).configureEach {
+    val changedFiles = if (rootProject.ext.has("changedFiles")) {
+        @Suppress("UNCHECKED_CAST")
+        rootProject.ext["changedFiles"] as Set<File>
+    } else {
+        val unstagedFiles = git("diff", "--name-only").lines()
+        val stagedFiles = git("diff", "--staged", "--name-only").lines()
+        var changedFiles = (unstagedFiles + stagedFiles)
+            .filter { it.isNotBlank() }
+            .map(project::file)
+            .toSet()
+        rootProject.ext["changedFiles"] = changedFiles
+        changedFiles
+    }
+    doFirst {
+        files = files.filter {
+            it in changedFiles
+        }
+    }
+}
+
 idea {
     module {
         excludeDirs.add(file(intellijPlatform.sandboxContainer.get()))
@@ -149,12 +195,6 @@ tasks.runIde {
     jvmArgs("--add-exports=java.base/jdk.internal.vm=ALL-UNNAMED")
 }
 
-tasks.register("cleanSandbox", Delete::class) {
-    group = "intellij"
-    description = "Deletes the sandbox directory."
-    delete(layout.projectDirectory.dir(".sandbox"))
-}
-
 tasks.test {
     useJUnitPlatform()
 }

buildSrc/src/main/kotlin/mcdev-publishing.gradle.kts

@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2025 minecraft-dev
+ * Copyright (C) 2026 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published

buildSrc/src/main/kotlin/util.kt

@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2025 minecraft-dev
+ * Copyright (C) 2026 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
@@ -18,6 +18,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+import java.io.ByteArrayOutputStream
+import java.io.InputStream
+import java.io.OutputStream
+import java.nio.charset.Charset
 import org.gradle.api.Project
 import org.gradle.api.tasks.TaskContainer
 import org.gradle.api.tasks.util.PatternFilterable
@@ -65,3 +69,11 @@ fun Project.parser(bnf: String, pack: String): TaskDelegate<ParserExec> {
         this.grammarKit.setFrom(grammarKit)
     }
 }
+
+fun Project.git(vararg args: String): String {
+    val output = providers.exec {
+        commandLine("git", *args)
+        isIgnoreExitValue = true
+    }
+    return output.standardOutput.asText.get()
+}

changelog.md

@@ -1,5 +1,37 @@
 # Minecraft Development for IntelliJ
 
+## [1.8.12]
+
+### Version Support
+- Added IntelliJ 2026.1
+- Dropped IntelliJ 2025.1
+
+### Added
+
+- Automatic fetching of Paper versions in the project wizard.
+- More advanced customization in custom project templates, including:
+  - Visibility control for property groups.
+  - Inline Gradle plugin enabling and version selection.
+- Several new inspections for mixins:
+  - `@Shadow` parameter names not matching their target.
+  - Parameter name mismatch compared to the target class in unobfuscated versions.
+  - Mixin class types that don't match the target's type.
+
+### Changed
+
+- The Run and Build tool windows now open automatically during project creation or Maven import.
+- Updated Fabric mixin parameter handling for versions 0.17.0 and higher.
+- Downgraded the parameter name mismatch inspection to a weak warning.
+
+### Fixed
+
+- Fixed translation folding when arguments are provided as an explicit array.
+- Fixed an issue where the Paper library would sometimes not be detected.
+- Fixed unintended renaming of mixin targets incorrectly affecting strings and non-Java files.
+- Fixed local and inner classes being incorrectly disallowed in mixins.
+- Improved the accuracy of parameter name inspections by correctly handling local variable table (LVT) ordering.
+- Fixed NeoForge version detection when in vanilla mode.
+
 ## [1.8.11]
 
 ### Added

copyright.txt

@@ -13,12 +13,11 @@
 
 from __future__ import annotations
 import argparse
-import shlex
 import subprocess
 import sys
 from typing import List, Tuple
 
-BRANCHES=["2024.3", "2025.1", "2025.2", "2025.3"]
+BRANCHES=["2025.2", "2025.3", "2026.1"]
 
 def check_file_contains_version(path: str, version: str) -> bool:
     try:

create_release.py

@@ -23,7 +23,7 @@ org.gradle.jvmargs=-Xmx1g
 
 ideaVersionName = 2025.3
 
-coreVersion = 1.8.11
+coreVersion = 1.8.12
 
 # Silences a build-time warning because we are bundling our own kotlin library
 kotlin.stdlib.default.dependency = false