User: rednesto
Date: 28 Sep 24 16:37
Revision: 18c612f496f07670ae0d1b9fc7059bbf5e7a5cf7
Summary:
Merge branch '2024.2' into 2024.3

# Conflicts:
#	gradle/libs.versions.toml


TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=9723&personal=false

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision c141268290fccabc4369da142449b642f197fb82)
+++ build.gradle.kts	(revision 18c612f496f07670ae0d1b9fc7059bbf5e7a5cf7)
@@ -34,8 +34,6 @@
     `mcdev-publishing`
 }
 
-val ideaVersionProvider: Provider<String> = providers.gradleProperty("ideaVersion")
-val ideaVersionName: String by project
 val coreVersion: String by project
 
 val gradleToolingExtension: Configuration by configurations.creating
@@ -44,7 +42,6 @@
 }
 
 group = "com.demonwav.mcdev"
-version = "$ideaVersionName-$coreVersion"
 
 val gradleToolingExtensionSourceSet: SourceSet = sourceSets.create("gradle-tooling-extension") {
     configurations.named(compileOnlyConfigurationName) {
@@ -121,25 +118,6 @@
         pluginVerifier()
     }
 
-    intellijPlatform {
-        intellijIdeaCommunity(ideaVersionProvider, useInstaller = false)
-        bundledPlugin("com.intellij.java")
-        bundledPlugin("org.jetbrains.idea.maven")
-        bundledPlugin("com.intellij.gradle")
-        bundledPlugin("org.intellij.groovy")
-        // For some reason the Kotlin plugin can't be resolved...
-        bundledPlugin("org.jetbrains.kotlin")
-        bundledPlugin("ByteCodeViewer")
-        bundledPlugin("org.intellij.intelliLang")
-        bundledPlugin("com.intellij.properties")
-        bundledPlugin("org.toml.lang")
-
-        testFramework(TestFrameworkType.JUnit5)
-        testFramework(TestFrameworkType.Plugin.Java)
-
-        pluginVerifier()
-    }
-
     testLibs(libs.test.mockJdk)
     testLibs(libs.test.mixin)
     testLibs(libs.test.spigotapi)
Index: gradle/libs.versions.toml
===================================================================
--- gradle/libs.versions.toml	(revision c141268290fccabc4369da142449b642f197fb82)
+++ gradle/libs.versions.toml	(revision 18c612f496f07670ae0d1b9fc7059bbf5e7a5cf7)
@@ -7,7 +7,7 @@
 fuel = "2.3.1"
 licenser = "0.6.1"
 changelog = "2.2.0"
-intellij-plugin = "2.0.1"
+intellij-plugin = "2.1.0"
 intellij-ide = "243-EAP-SNAPSHOT"
 idea-ext = "1.1.8"
 psiPlugin = "243.7768"
Index: obfuscation-explorer/build.gradle.kts
===================================================================
--- obfuscation-explorer/build.gradle.kts	(revision c141268290fccabc4369da142449b642f197fb82)
+++ obfuscation-explorer/build.gradle.kts	(revision 18c612f496f07670ae0d1b9fc7059bbf5e7a5cf7)
@@ -26,15 +26,11 @@
     `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"
Index: src/main/resources/META-INF/plugin.xml
===================================================================
--- src/main/resources/META-INF/plugin.xml	(revision c141268290fccabc4369da142449b642f197fb82)
+++ src/main/resources/META-INF/plugin.xml	(revision 18c612f496f07670ae0d1b9fc7059bbf5e7a5cf7)
@@ -28,8 +28,8 @@
     <depends>com.intellij.properties</depends>
     <depends>com.intellij.modules.json</depends>
     <depends>ByteCodeViewer</depends>
-    <depends optional="true" config-file="toml-support.xml">org.toml.lang</depends>
-    <depends optional="true" config-file="yaml-support.xml">org.jetbrains.plugins.yaml</depends>
+    <depends optional="true" config-file="mcdev-toml.xml">org.toml.lang</depends>
+    <depends optional="true" config-file="mcdev-yaml.xml">org.jetbrains.plugins.yaml</depends>
 
     <id>com.demonwav.minecraft-dev</id>
     <name>Minecraft Development</name>
@@ -721,14 +721,22 @@
                           id="Find Mixins"/>
 
         <!-- Mixin configuration -->
-        <fileType name="Mixin Configuration" language="JSON"
-                  implementationClass="com.demonwav.mcdev.platform.mixin.config.MixinConfigFileType"
+        <fileType name="Mixin Json Configuration" language="JSON"
+                  implementationClass="com.demonwav.mcdev.platform.mixin.config.MixinConfigFileType$Json"
                   fieldName="INSTANCE"/>
         <psi.referenceContributor language="JSON"
                                   implementation="com.demonwav.mcdev.platform.mixin.config.reference.MixinConfigReferenceContributor"/>
         <lang.importOptimizer language="JSON"
                               implementationClass="com.demonwav.mcdev.platform.mixin.config.MixinConfigImportOptimizer"/>
 
+        <fileType name="Mixin Json5 Configuration" language="JSON5"
+                  implementationClass="com.demonwav.mcdev.platform.mixin.config.MixinConfigFileType$Json5"
+                  fieldName="INSTANCE"/>
+        <psi.referenceContributor language="JSON5"
+                                  implementation="com.demonwav.mcdev.platform.mixin.config.reference.MixinConfigReferenceContributor"/>
+        <lang.importOptimizer language="JSON5"
+                              implementationClass="com.demonwav.mcdev.platform.mixin.config.MixinConfigImportOptimizer"/>
+
         <!-- Mixin Line Marker Providers -->
         <codeInsight.lineMarkerProvider language="JAVA"
                                         implementationClass="com.demonwav.mcdev.platform.mixin.insight.MixinLineMarkerProvider"/>