From 4fac9c5d5560d1b7db9e29630c8ad9842e9cd1d8 Mon Sep 17 00:00:00 2001
From: Kyle Wood <kyle@denwav.dev>
Date: Wed, 13 Apr 2022 00:22:21 -0500
Subject: [PATCH] Target 2022.1 IntelliJ release

---
 build.gradle.kts                                           | 1 -
 gradle.properties                                          | 4 ++--
 gradle/libs.versions.toml                                  | 2 +-
 src/main/kotlin/creator/buildsystem/gradle/gradle-steps.kt | 2 +-
 src/main/resources/META-INF/plugin.xml                     | 3 ---
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 24b56d630..113e94cfc 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -62,7 +62,6 @@ val gradleToolingExtensionJar = tasks.register<Jar>(gradleToolingExtensionSource
 
 repositories {
     maven("https://repo.denwav.dev/repository/maven-public/")
-    maven("https://www.jetbrains.com/intellij-repository/snapshots")
     mavenCentral()
 }
 
diff --git a/gradle.properties b/gradle.properties
index 75506fee7..e7d5c2589 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,10 +11,10 @@
 # suppress inspection "UnusedProperty" for whole file
 kotlin.code.style=official
 
-ideaVersion = 221-EAP-SNAPSHOT
+ideaVersion = 2022.1
 ideaVersionName = 2022.1
 
 coreVersion = 1.5.19
 downloadIdeaSources = true
 
-pluginTomlVersion = 221.3427.87
+pluginTomlVersion = 221.5080.126
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2cffbc3bf..a6a44d749 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,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:221.3427.89-EAP-SNAPSHOT"
+gradleToolingExtension = "com.jetbrains.intellij.gradle:gradle-tooling-extension:221.5080.210"
 annotations = "org.jetbrains:annotations:20.1.0"
 groovy = "org.codehaus.groovy:groovy-all:2.5.14"
 
diff --git a/src/main/kotlin/creator/buildsystem/gradle/gradle-steps.kt b/src/main/kotlin/creator/buildsystem/gradle/gradle-steps.kt
index 869a2be65..e0db4370f 100644
--- a/src/main/kotlin/creator/buildsystem/gradle/gradle-steps.kt
+++ b/src/main/kotlin/creator/buildsystem/gradle/gradle-steps.kt
@@ -338,7 +338,7 @@ class GradleWrapperStep(
 
 // Show the background processes window for setup tasks
 private fun showProgress(project: Project) {
-    if (!UISettings.instance.showStatusBar || UISettings.instance.presentationMode) {
+    if (!UISettings.getInstance().showStatusBar || UISettings.getInstance().presentationMode) {
         return
     }
 
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 1f52a6820..830e56a2a 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -33,9 +33,6 @@
     ]]>
     </change-notes>
 
-    <!-- please see https://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
-    <idea-version since-build="213.3714.440" until-build="213.*"/>
-
     <extensionPoints>
         <extensionPoint name="mixinSelectorParser" interface="com.demonwav.mcdev.platform.mixin.reference.MixinSelectorParser" dynamic="true" />
         <extensionPoint name="mixinAnnotationHandler" beanClass="com.demonwav.mcdev.platform.mixin.handlers.MixinAnnotationHandlerInfo" dynamic="true">