Merge branch '2020.3' into 2021.1

Author: DenWav

build.gradle.kts

@@ -10,6 +10,7 @@
 
 import org.cadixdev.gradle.licenser.header.HeaderStyle
 import org.gradle.internal.jvm.Jvm
+import org.gradle.internal.os.OperatingSystem
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -232,7 +233,7 @@ license {
         register("gradle") {
             files.from(
                 fileTree(project.projectDir) {
-                    include("**/*.gradle.kts", "gradle.properties")
+                    include("*.gradle.kts", "gradle.properties")
                     exclude("**/buildSrc/**", "**/build/**")
                 }
             )
@@ -313,6 +314,29 @@ tasks.runIde {
     // systemProperty("user.country", "US")
 }
 
+tasks.buildSearchableOptions {
+    // not working atm
+    enabled = false
+    // https://youtrack.jetbrains.com/issue/IDEA-210683
+    jvmArgs(
+        "--illegal-access=deny",
+        "--add-exports=java.base/jdk.internal.vm=ALL-UNNAMED",
+        "--add-opens=java.base/java.lang=ALL-UNNAMED",
+        "--add-opens=java.base/java.util=ALL-UNNAMED",
+        "--add-opens=java.desktop/java.awt=ALL-UNNAMED",
+        "--add-opens=java.desktop/java.awt.event=ALL-UNNAMED",
+        "--add-opens=java.desktop/javax.swing=ALL-UNNAMED",
+        "--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED",
+        "--add-opens=java.desktop/sun.awt=ALL-UNNAMED",
+        "--add-opens=java.desktop/sun.font=ALL-UNNAMED",
+        "--add-opens=java.desktop/sun.swing=ALL-UNNAMED"
+    )
+
+    if (OperatingSystem.current().isMacOsX) {
+        jvmArgs("--add-opens=java.desktop/com.apple.eawt.event=ALL-UNNAMED")
+    }
+}
+
 // version catalogs still have rough edges as it's still experimental
 // this lets us get around some of that while still getting the benefits of using catalogs
 fun Provider<MinimalExternalModuleDependency>.text(): String {

gradle.properties

@@ -14,7 +14,7 @@ kotlin.code.style=official
 ideaVersion = 2021.1
 ideaVersionName = 2021.1
 
-coreVersion = 1.5.10
+coreVersion = 1.5.11
 downloadIdeaSources = true
 
 pluginTomlVersion = 0.2.144.3766-211

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

readme.md

@@ -36,7 +36,7 @@ Minecraft Development for IntelliJ
     </tr>
 </table>
 
-Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.5.10-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
+Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.5.11-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
 ----------------------
 
 <a href="https://discord.gg/j6UNcfr"><img src="https://i.imgur.com/JXu9C1G.png" height="48px"></img></a>