Merge branch 'dev' into 2024.1

Author: RedNesto

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -35,6 +35,7 @@ body:
         - Sponge
         - Architectury
         - Minecraft Forge
+        - NeoForge
         - Fabric
         - Velocity
         - Mixins
@@ -46,4 +47,4 @@ body:
     id: description
     attributes:
       label: Description of the bug
-      description: Always include a stack trace if there is one. Otherwise, the more information you can provide in terms of how to reproduce the problem, the more likely it'll be fixed. If there is something specific about your project, a link to the GitHub project can be very helpful.
+      description: Always include a stack trace if there is one. Otherwise, the more information you can provide in terms of how to reproduce the problem, the more likely it'll be fixed. If there is something specific about your project, a link to the GitHub project can be very helpful.

.github/ISSUE_TEMPLATE/project_wizard_outdated.yaml

@@ -34,6 +34,7 @@ body:
         - Sponge
         - Architectury
         - Minecraft Forge
+        - NeoForge
         - Fabric
         - Velocity
         - BungeeCord

.github/workflows/publish.yml

@@ -39,7 +39,7 @@ jobs:
           echo "GRADLE_USER_HOME=$HOME/.gradle" >> "$GITHUB_ENV"
           echo "mcdev.deploy.token=${JETBRAINS_TOKEN}" > ~/.gradle/gradle.properties
       - name: Publish plugin
-        run: ./gradlew clean publishPlugin --no-daemon --stacktrace
+        run: ./gradlew clean :publishPlugin --no-daemon --stacktrace
       - name: Get tag name
         id: get_tag
         shell: bash

build.gradle.kts

@@ -34,7 +34,6 @@ plugins {
     `mcdev-publishing`
 }
 
-val ideaVersionName: String by project
 val coreVersion: String by project
 
 val gradleToolingExtension: Configuration by configurations.creating
@@ -43,7 +42,6 @@ val testLibs: Configuration by configurations.creating {
 }
 
 group = "com.demonwav.mcdev"
-version = "$ideaVersionName-$coreVersion"
 
 val gradleToolingExtensionSourceSet: SourceSet = sourceSets.create("gradle-tooling-extension") {
     configurations.named(compileOnlyConfigurationName) {

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

@@ -32,6 +32,17 @@ plugins {
     id("org.cadixdev.licenser")
 }
 
+val ideaVersionName: String by project
+val coreVersion: String by project
+val buildNumber: String? by project
+
+version = "$ideaVersionName-$coreVersion"
+
+// Build numbers are used for nightlies
+if (buildNumber != null) {
+    version = "$version-$buildNumber"
+}
+
 java {
     toolchain {
         languageVersion.set(JavaLanguageVersion.of(17))
@@ -99,7 +110,7 @@ dependencies {
     }
 
     testImplementation(libs.junit.api)
-    testCompileOnly(libs.junit.vintage) // Hack to get tests to compile and run
+    testImplementation(libs.junit.vintage) // Hack to get tests to compile and run
     testRuntimeOnly(libs.junit.engine)
     testRuntimeOnly(libs.junit.platform.launcher)
 }

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

@@ -23,10 +23,6 @@ plugins {
 }
 
 tasks.publishPlugin {
-    // Build numbers are used for nightlies
-    properties["buildNumber"]?.let { buildNumber ->
-        project.version = "${project.version}-$buildNumber"
-    }
     properties["mcdev.deploy.token"]?.let { deployToken ->
         token.set(deployToken.toString())
     }

changelog.md

@@ -5,6 +5,21 @@
 ### Added
 
 - `plugin.yml`, `paper-plugin.yml` and `bungee.yml` main class reference and validity inspection
+- `mods.toml` and `neoforge.mods.toml` documentation for lookup elements
+- Support for split strings within inspections and method target references in Mixins ([#2358](https://github.com/minecraft-dev/MinecraftDev/pull/2358))
+- Mouse ungrab on breakpoint hit while running a Gradle task
+
+### Changed
+
+- More reliable ClassFqn creator property suggestions and validation
+- Lang spellchecking now works in dumb mode
+
+### Fixed
+
+- [#2362](https://github.com/minecraft-dev/MinecraftDev/issues/2362) CME in fabric.mod.json
+- Ignored annotations registrations
+- NeoGradle and NeoModDev Minecraft version import
+- [#2360](https://github.com/minecraft-dev/MinecraftDev/issues/2360) `Class initialization must not depend on services` error
 
 ## [1.8.1] - 2024-08-10
 

gradle/libs.versions.toml

@@ -7,7 +7,7 @@ asm = "9.6"
 fuel = "2.3.1"
 licenser = "0.6.1"
 changelog = "2.2.0"
-intellij-plugin = "2.0.1"
+intellij-plugin = "2.1.0"
 intellij-ide = "2024.1"
 idea-ext = "1.1.8"
 psiPlugin = "241.14494.158-EAP-SNAPSHOT"

obfuscation-explorer/build.gradle.kts

@@ -26,15 +26,11 @@ plugins {
     `mcdev-publishing`
 }
 
-val ideaVersionName: String by project
-val coreVersion: String by project
-
 val jflex by configurations
 val jflexSkeleton by configurations
 val grammarKit by configurations
 
 group = "io.mcdev.obfex"
-version = "$ideaVersionName-$coreVersion"
 
 intellijPlatform {
     projectName = "Obfuscation Explorer"

src/main/kotlin/facet/MinecraftLibraryKinds.kt

@@ -35,19 +35,21 @@ import com.demonwav.mcdev.platform.neoforge.framework.NEOFORGE_LIBRARY_KIND
 import com.demonwav.mcdev.platform.sponge.framework.SPONGE_LIBRARY_KIND
 import com.demonwav.mcdev.platform.velocity.framework.VELOCITY_LIBRARY_KIND
 
-val MINECRAFT_LIBRARY_KINDS = setOf(
-    BUKKIT_LIBRARY_KIND,
-    SPIGOT_LIBRARY_KIND,
-    PAPER_LIBRARY_KIND,
-    SPONGE_LIBRARY_KIND,
-    FORGE_LIBRARY_KIND,
-    NEOFORGE_LIBRARY_KIND,
-    FABRIC_LIBRARY_KIND,
-    ARCHITECTURY_LIBRARY_KIND,
-    MCP_LIBRARY_KIND,
-    MIXIN_LIBRARY_KIND,
-    BUNGEECORD_LIBRARY_KIND,
-    WATERFALL_LIBRARY_KIND,
-    VELOCITY_LIBRARY_KIND,
-    ADVENTURE_LIBRARY_KIND,
-)
+val MINECRAFT_LIBRARY_KINDS by lazy {
+    setOf(
+        BUKKIT_LIBRARY_KIND,
+        SPIGOT_LIBRARY_KIND,
+        PAPER_LIBRARY_KIND,
+        SPONGE_LIBRARY_KIND,
+        FORGE_LIBRARY_KIND,
+        NEOFORGE_LIBRARY_KIND,
+        FABRIC_LIBRARY_KIND,
+        ARCHITECTURY_LIBRARY_KIND,
+        MCP_LIBRARY_KIND,
+        MIXIN_LIBRARY_KIND,
+        BUNGEECORD_LIBRARY_KIND,
+        WATERFALL_LIBRARY_KIND,
+        VELOCITY_LIBRARY_KIND,
+        ADVENTURE_LIBRARY_KIND,
+    )
+}