2024.1 EAP

minecraft-dev · Jan 18, 2024 · 559d4c8 · 559d4c8
1 parent b579f11
commit 559d4c8
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 13 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -29,7 +29,7 @@ import org.jlleitschuh.gradle.ktlint.tasks.BaseKtLintCheckTask
 import org.jlleitschuh.gradle.ktlint.tasks.KtLintFormatTask
 
 plugins {
-    kotlin("jvm") version "1.9.20"
+    kotlin("jvm") version "1.9.21"
     java
     mcdev
     groovy

diff --git a/gradle.properties b/gradle.properties
@@ -21,13 +21,13 @@
 # suppress inspection "UnusedProperty" for whole file
 kotlin.code.style=official
 
-ideaVersion = 2023.3
-ideaVersionName = 2023.3
+ideaVersion = 241-EAP-SNAPSHOT
+ideaVersionName = 2024.1
 
 coreVersion = 1.6.12
 downloadIdeaSources = true
 
-pluginTomlVersion = 233.11799.172
+pluginTomlVersion = 241.8102.131
 
 # Silences a build-time warning because we are bundling our own kotlin library
 kotlin.stdlib.default.dependency = false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -18,7 +18,7 @@ jflex-skeleton = "org.jetbrains.idea:jflex:1.7.0-c1fdf11"
 grammarKit = "org.jetbrains.idea:grammar-kit:1.5.1"
 
 # Gradle Tooling
-gradleToolingExtension = "com.jetbrains.intellij.gradle:gradle-tooling-extension:233.11799.241"
+gradleToolingExtension = "com.jetbrains.intellij.gradle:gradle-tooling-extension:241-EAP-SNAPSHOT"
 annotations = "org.jetbrains:annotations:24.0.0"
 groovy = "org.codehaus.groovy:groovy-all:2.5.18"
 

diff --git a/readme.md b/readme.md
@@ -23,6 +23,10 @@ Minecraft Development for IntelliJ
         <td align="left">2023.3</td>
         <td align="left"><a href="https://ci.mcdev.io/viewType.html?buildTypeId=MinecraftDev_Nightly_20233"><img src="https://ci.mcdev.io/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20233)/statusIcon.svg" alt="2023.3 Nightly Status" /></a></td>
     </tr>
+    <tr>
+        <td align="left">2024.1</td>
+        <td align="left"><a href="https://ci.mcdev.io/viewType.html?buildTypeId=MinecraftDev_Nightly_20241"><img src="https://ci.mcdev.io/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20241)/statusIcon.svg" alt="2024.1 Nightly Status" /></a></td>
+    </tr>
     <tr>
         <td align="right"><b>OS Tests</b></td>
         <td align="left" colspan="2">

diff --git a/src/main/kotlin/insight/generation/ui/EventGenerationDialog.kt b/src/main/kotlin/insight/generation/ui/EventGenerationDialog.kt
@@ -31,7 +31,7 @@ class EventGenerationDialog(
     private val panel: EventGenerationPanel,
     className: String,
     defaultListenerName: String,
-) : DialogWrapper(editor.project, editor.component, false, IdeModalityType.PROJECT) {
+) : DialogWrapper(editor.project, editor.component, false, IdeModalityType.MODELESS) {
 
     private val wizard: EventListenerWizard = EventListenerWizard(panel.panel, className, defaultListenerName)
 

diff --git a/src/main/kotlin/platform/sponge/inspection/SpongePluginClassInspection.kt b/src/main/kotlin/platform/sponge/inspection/SpongePluginClassInspection.kt
@@ -103,9 +103,11 @@ class SpongePluginClassInspection : AbstractBaseJavaLocalInspectionTool() {
                         ctorIdentifier,
                         "Plugin class empty constructor must not be private.",
                         ProblemHighlightType.GENERIC_ERROR,
-                        ModifierFix(emptyCtor, PsiModifier.PACKAGE_LOCAL, true, false),
-                        ModifierFix(emptyCtor, PsiModifier.PROTECTED, true, false),
-                        ModifierFix(emptyCtor, PsiModifier.PUBLIC, true, false),
+                        *LocalQuickFix.notNullElements(
+                            LocalQuickFix.from(ModifierFix(emptyCtor, PsiModifier.PACKAGE_LOCAL, true, false)),
+                            LocalQuickFix.from(ModifierFix(emptyCtor, PsiModifier.PROTECTED, true, false)),
+                            LocalQuickFix.from(ModifierFix(emptyCtor, PsiModifier.PUBLIC, true, false)),
+                        )
                     )
                 }
             }

diff --git a/src/test/kotlin/framework/MockJdk.kt b/src/test/kotlin/framework/MockJdk.kt
@@ -24,22 +24,20 @@ import com.intellij.openapi.Disposable
 import com.intellij.openapi.projectRoots.JavaSdk
 import com.intellij.openapi.projectRoots.Sdk
 import com.intellij.openapi.projectRoots.SdkAdditionalData
+import com.intellij.openapi.projectRoots.impl.ProjectJdkImpl
 import com.intellij.openapi.roots.OrderRootType
 import com.intellij.openapi.roots.RootProvider
-import com.intellij.openapi.util.UserDataHolderBase
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.util.ArrayUtil
 import com.intellij.util.IncorrectOperationException
 
 @Suppress("NonExtendableApiUsage")
 class MockJdk(private val name: String, jar: VirtualFile, private val home: VirtualFile) :
-    UserDataHolderBase(), Sdk, RootProvider {
+    ProjectJdkImpl(name, JavaSdk.getInstance(), home.path, name), Sdk, RootProvider {
 
     private val urls = arrayOf(jar.url)
     private val roots = arrayOf(jar)
 
-    override fun getSdkType(): JavaSdk = JavaSdk.getInstance()
-    override fun getName() = name
     override fun getVersionString() = name
 
     override fun getHomePath() = this.home.path