User: rednesto
Date: 18 Jan 24 15:25
Revision: 559d4c89e99c86b10914fc9239a3b87544013899
Summary:
2024.1 EAP


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

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision b579f118c916306d05ce1f58925c94f87806053d)
+++ build.gradle.kts	(revision 559d4c89e99c86b10914fc9239a3b87544013899)
@@ -29,7 +29,7 @@
 import org.jlleitschuh.gradle.ktlint.tasks.KtLintFormatTask
 
 plugins {
-    kotlin("jvm") version "1.9.20"
+    kotlin("jvm") version "1.9.21"
     java
     mcdev
     groovy
Index: gradle.properties
===================================================================
--- gradle.properties	(revision b579f118c916306d05ce1f58925c94f87806053d)
+++ gradle.properties	(revision 559d4c89e99c86b10914fc9239a3b87544013899)
@@ -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
Index: gradle/libs.versions.toml
===================================================================
--- gradle/libs.versions.toml	(revision b579f118c916306d05ce1f58925c94f87806053d)
+++ gradle/libs.versions.toml	(revision 559d4c89e99c86b10914fc9239a3b87544013899)
@@ -18,7 +18,7 @@
 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"
 
Index: readme.md
===================================================================
--- readme.md	(revision b579f118c916306d05ce1f58925c94f87806053d)
+++ readme.md	(revision 559d4c89e99c86b10914fc9239a3b87544013899)
@@ -24,6 +24,10 @@
         <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">
             <a href="https://github.com/minecraft-dev/MinecraftDev/actions?query=workflow%3A%22Test%22"><img src="https://github.com/minecraft-dev/MinecraftDev/workflows/Test/badge.svg?branch=dev&event=push" alt="GitHub Action Status" /></a>
Index: src/main/kotlin/insight/generation/ui/EventGenerationDialog.kt
===================================================================
--- src/main/kotlin/insight/generation/ui/EventGenerationDialog.kt	(revision b579f118c916306d05ce1f58925c94f87806053d)
+++ src/main/kotlin/insight/generation/ui/EventGenerationDialog.kt	(revision 559d4c89e99c86b10914fc9239a3b87544013899)
@@ -31,7 +31,7 @@
     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)
 
Index: src/main/kotlin/platform/sponge/inspection/SpongePluginClassInspection.kt
===================================================================
--- src/main/kotlin/platform/sponge/inspection/SpongePluginClassInspection.kt	(revision b579f118c916306d05ce1f58925c94f87806053d)
+++ src/main/kotlin/platform/sponge/inspection/SpongePluginClassInspection.kt	(revision 559d4c89e99c86b10914fc9239a3b87544013899)
@@ -103,10 +103,12 @@
                         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)),
-                    )
+                        )
+                    )
                 }
             }
 
Index: src/test/kotlin/framework/MockJdk.kt
===================================================================
--- src/test/kotlin/framework/MockJdk.kt	(revision b579f118c916306d05ce1f58925c94f87806053d)
+++ src/test/kotlin/framework/MockJdk.kt	(revision 559d4c89e99c86b10914fc9239a3b87544013899)
@@ -24,22 +24,20 @@
 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