User: rednesto Date: 22 Sep 23 16:40 Revision: c55a397cc4f6b3a812df4ab4480508b552079eed Summary: 2023.3 EAP TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=8739&personal=false Index: gradle.properties =================================================================== --- gradle.properties (revision 3d5b92de53a5b4311db008b04d256fdf1d1c060c) +++ gradle.properties (revision c55a397cc4f6b3a812df4ab4480508b552079eed) @@ -21,13 +21,13 @@ # suppress inspection "UnusedProperty" for whole file kotlin.code.style=official -ideaVersion = 2023.2 -ideaVersionName = 2023.2 +ideaVersion = 233-EAP-SNAPSHOT +ideaVersionName = 2023.3 coreVersion = 1.6.10 downloadIdeaSources = true -pluginTomlVersion = 232.8660.88 +pluginTomlVersion = 233.6745.297 # 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 3d5b92de53a5b4311db008b04d256fdf1d1c060c) +++ gradle/libs.versions.toml (revision c55a397cc4f6b3a812df4ab4480508b552079eed) @@ -18,7 +18,7 @@ grammarKit = "org.jetbrains.idea:grammar-kit:1.5.1" # Gradle Tooling -gradleToolingExtension = "com.jetbrains.intellij.gradle:gradle-tooling-extension:232-EAP-SNAPSHOT" +gradleToolingExtension = "com.jetbrains.intellij.gradle:gradle-tooling-extension:233-EAP-SNAPSHOT" annotations = "org.jetbrains:annotations:23.0.0" groovy = "org.codehaus.groovy:groovy-all:2.5.18" Index: src/main/kotlin/facet/MinecraftFacetEditorTab.kt =================================================================== --- src/main/kotlin/facet/MinecraftFacetEditorTab.kt (revision 3d5b92de53a5b4311db008b04d256fdf1d1c060c) +++ src/main/kotlin/facet/MinecraftFacetEditorTab.kt (revision c55a397cc4f6b3a812df4ab4480508b552079eed) @@ -24,7 +24,7 @@ import com.demonwav.mcdev.asset.PlatformAssets import com.demonwav.mcdev.platform.PlatformType import com.intellij.facet.ui.FacetEditorTab -import com.intellij.util.ui.UIUtil +import com.intellij.util.ui.StartupUiUtil import javax.swing.JCheckBox import javax.swing.JComponent import javax.swing.JLabel @@ -102,7 +102,7 @@ } override fun createComponent(): JComponent { - if (UIUtil.isUnderDarcula()) { + if (StartupUiUtil.isDarkTheme) { spongeIcon.icon = PlatformAssets.SPONGE_ICON_2X_DARK mcpIcon.icon = PlatformAssets.MCP_ICON_2X_DARK mixinIcon.icon = PlatformAssets.MIXIN_ICON_2X_DARK Index: src/main/kotlin/facet/MinecraftFacetEditorTabV2.kt =================================================================== --- src/main/kotlin/facet/MinecraftFacetEditorTabV2.kt (revision 3d5b92de53a5b4311db008b04d256fdf1d1c060c) +++ src/main/kotlin/facet/MinecraftFacetEditorTabV2.kt (revision c55a397cc4f6b3a812df4ab4480508b552079eed) @@ -32,7 +32,7 @@ import com.intellij.ui.dsl.builder.RowLayout import com.intellij.ui.dsl.builder.bindSelected import com.intellij.ui.dsl.builder.panel -import com.intellij.util.ui.UIUtil +import com.intellij.util.ui.StartupUiUtil import javax.swing.Icon import javax.swing.JComponent import javax.swing.JLabel @@ -84,7 +84,7 @@ { afterChange { _ -> all(this, bukkit.auto, spigot.auto)(bukkit, spigot, paper) } }, ) - val isDarkMode = UIUtil.isUnderDarcula() + val isDarkMode = StartupUiUtil.isDarkTheme val spongeIcon = if (isDarkMode) PlatformAssets.SPONGE_ICON_2X_DARK else PlatformAssets.SPONGE_ICON_2X createRow(sponge, "Sponge", spongeIcon) Index: src/main/kotlin/insight/generation/ui/EventListenerWizard.kt =================================================================== --- src/main/kotlin/insight/generation/ui/EventListenerWizard.kt (revision 3d5b92de53a5b4311db008b04d256fdf1d1c060c) +++ src/main/kotlin/insight/generation/ui/EventListenerWizard.kt (revision c55a397cc4f6b3a812df4ab4480508b552079eed) @@ -24,7 +24,7 @@ import com.intellij.openapi.editor.ex.util.EditorUtil import com.intellij.openapi.wm.ex.IdeFocusTraversalPolicy import com.intellij.uiDesigner.core.GridConstraints -import com.intellij.util.ui.UIUtil +import com.intellij.util.ui.StartupUiUtil import javax.swing.JLabel import javax.swing.JPanel import javax.swing.JSeparator @@ -42,7 +42,7 @@ classNameTextField.font = EditorUtil.getEditorFont() listenerNameTextField.font = EditorUtil.getEditorFont() publicVoidLabel.font = EditorUtil.getEditorFont() - if (UIUtil.isUnderDarcula()) { + if (StartupUiUtil.isDarkTheme) { publicVoidLabel.foreground = JavaHighlightingColors.KEYWORD.defaultAttributes.foregroundColor } else { publicVoidLabel.foreground = Index: src/main/kotlin/platform/bukkit/creator/ui-steps.kt =================================================================== --- src/main/kotlin/platform/bukkit/creator/ui-steps.kt (revision 3d5b92de53a5b4311db008b04d256fdf1d1c060c) +++ src/main/kotlin/platform/bukkit/creator/ui-steps.kt (revision c55a397cc4f6b3a812df4ab4480508b552079eed) @@ -147,7 +147,7 @@ override fun setupUI(builder: Panel) { with(builder) { row("Load at:") { - segmentedButton(LoadOrder.values().toList(), LoadOrder::toString) + segmentedButton(LoadOrder.values().toList()) { text = it.toString() } .bind(loadOrderProperty) } } Index: src/main/kotlin/platform/sponge/inspection/SpongePluginClassInspection.kt =================================================================== --- src/main/kotlin/platform/sponge/inspection/SpongePluginClassInspection.kt (revision 3d5b92de53a5b4311db008b04d256fdf1d1c060c) +++ src/main/kotlin/platform/sponge/inspection/SpongePluginClassInspection.kt (revision c55a397cc4f6b3a812df4ab4480508b552079eed) @@ -29,6 +29,7 @@ import com.intellij.codeInsight.intention.QuickFixFactory import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool import com.intellij.codeInspection.InspectionManager +import com.intellij.codeInspection.LocalQuickFix import com.intellij.codeInspection.ProblemDescriptor import com.intellij.codeInspection.ProblemHighlightType import com.intellij.codeInspection.ProblemsHolder @@ -90,7 +91,7 @@ classIdentifier, "Plugin class must have an empty constructor or an @Inject constructor.", ProblemHighlightType.GENERIC_ERROR, - AddDefaultConstructorFix(aClass).asQuickFix(), + *LocalQuickFix.notNullElements(LocalQuickFix.from(AddDefaultConstructorFix(aClass))), ) } } Index: src/main/kotlin/update/PluginUtil.kt =================================================================== --- src/main/kotlin/update/PluginUtil.kt (revision 3d5b92de53a5b4311db008b04d256fdf1d1c060c) +++ src/main/kotlin/update/PluginUtil.kt (revision c55a397cc4f6b3a812df4ab4480508b552079eed) @@ -30,7 +30,7 @@ val plugin: IdeaPluginDescriptor get() { return PluginManagerCore.getPlugin(PLUGIN_ID) - ?: error("Minecraft Development plugin not found: " + PluginManagerCore.getPlugins().contentToString()) + ?: error("Minecraft Development plugin not found: " + PluginManagerCore.plugins.contentToString()) } val pluginVersion: String