Merge branch '2022.3' into 2023.1

Author: DenWav

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -43,6 +43,8 @@ body:
         - Waterfall
     validations:
       required: false
-  - type: markdown
+  - type: textarea
+    id: description
     attributes:
-      value: Always include a stack trace if there is one. Otherwise, the more information you can provide in terms of how to reproduce the problem, the more likely it'll be fixed. If there is something specific about your project, a link to the GitHub project can be very helpful.
+      label: Description of the bug
+      description: Always include a stack trace if there is one. Otherwise, the more information you can provide in terms of how to reproduce the problem, the more likely it'll be fixed. If there is something specific about your project, a link to the GitHub project can be very helpful.

build.gradle.kts

@@ -3,7 +3,7 @@
  *
  * https://minecraftdev.org
  *
- * Copyright (c) 2022 minecraft-dev
+ * Copyright (c) 2023 minecraft-dev
  *
  * MIT License
  */
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jlleitschuh.gradle.ktlint.tasks.BaseKtLintCheckTask
 
 plugins {
-    kotlin("jvm") version "1.7.20"
+    kotlin("jvm") version "1.8.0"
     java
     mcdev
     groovy
@@ -349,7 +349,6 @@ tasks.register("cleanSandbox", Delete::class) {
 tasks.runIde {
     maxHeapSize = "4G"
 
-    jvmArgs("--add-exports=java.base/jdk.internal.vm=ALL-UNNAMED")
     System.getProperty("debug")?.let {
         systemProperty("idea.ProcessCanceledException", "disabled")
         systemProperty("idea.debug.mode", "true")

buildSrc/build.gradle.kts

@@ -3,7 +3,7 @@
  *
  * https://minecraftdev.org
  *
- * Copyright (c) 2022 minecraft-dev
+ * Copyright (c) 2023 minecraft-dev
  *
  * MIT License
  */

buildSrc/settings.gradle.kts

@@ -3,7 +3,7 @@
  *
  * https://minecraftdev.org
  *
- * Copyright (c) 2022 minecraft-dev
+ * Copyright (c) 2023 minecraft-dev
  *
  * MIT License
  */

buildSrc/src/main/kotlin/Filter.kt

@@ -3,7 +3,7 @@
  *
  * https://minecraftdev.org
  *
- * Copyright (c) 2022 minecraft-dev
+ * Copyright (c) 2023 minecraft-dev
  *
  * MIT License
  */

buildSrc/src/main/kotlin/mcdev.gradle.kts

@@ -3,7 +3,7 @@
  *
  * https://minecraftdev.org
  *
- * Copyright (c) 2022 minecraft-dev
+ * Copyright (c) 2023 minecraft-dev
  *
  * MIT License
  */

buildSrc/src/main/kotlin/util.kt

@@ -3,11 +3,12 @@
  *
  * https://minecraftdev.org
  *
- * Copyright (c) 2022 minecraft-dev
+ * Copyright (c) 2023 minecraft-dev
  *
  * MIT License
  */
 
+import java.io.ByteArrayOutputStream
 import org.cadixdev.gradle.licenser.LicenseExtension
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
@@ -30,14 +31,19 @@ fun Project.lexer(flex: String, pack: String): TaskDelegate<JavaExec> {
         val src = layout.projectDirectory.file("src/main/grammars/$flex.flex")
         val dst = layout.buildDirectory.dir("gen/$pack")
         val output = layout.buildDirectory.file("gen/$pack/$flex.java")
+        val logOutout = layout.buildDirectory.file("logs/generate$flex.log")
 
         val jflex by project.configurations
         val jflexSkeleton by project.configurations
 
         classpath = jflex
         mainClass.set("jflex.Main")
 
-        doFirst {
+        val taskOutput = ByteArrayOutputStream()
+        standardOutput = taskOutput
+        errorOutput = taskOutput
+
+                        doFirst {
             args(
                 "--skel", jflexSkeleton.singleFile.absolutePath,
                 "-d", dst.get().asFile.absolutePath,
@@ -46,6 +52,11 @@ fun Project.lexer(flex: String, pack: String): TaskDelegate<JavaExec> {
 
             // Delete current lexer
             project.delete(output)
+            logOutout.get().asFile.parentFile.mkdirs()
+        }
+
+        doLast {
+            logOutout.get().asFile.writeBytes(taskOutput.toByteArray())
         }
 
         inputs.files(src, jflexSkeleton)
@@ -64,12 +75,13 @@ fun Project.parser(bnf: String, pack: String): TaskDelegate<JavaExec> {
         val dst = dstRoot.map { it.dir(pack) }
         val psiDir = dst.map { it.dir("psi") }
         val parserDir = dst.map { it.dir("parser") }
+        val logOutout = layout.buildDirectory.file("logs/generate$bnf.log")
 
         val grammarKit by project.configurations
 
-        doFirst {
-            project.delete(psiDir, parserDir)
-        }
+        val taskOutput = ByteArrayOutputStream()
+        standardOutput = taskOutput
+        errorOutput = taskOutput
 
         classpath = grammarKit
         mainClass.set("org.intellij.grammar.Main")
@@ -83,7 +95,12 @@ fun Project.parser(bnf: String, pack: String): TaskDelegate<JavaExec> {
         }
 
         doFirst {
+            project.delete(psiDir, parserDir)
             args(dstRoot.get().asFile, src.asFile)
+            logOutout.get().asFile.parentFile.mkdirs()
+        }
+        doLast {
+            logOutout.get().asFile.writeBytes(taskOutput.toByteArray())
         }
 
         inputs.file(src)

copyright.txt

@@ -2,6 +2,6 @@ Minecraft Dev for IntelliJ
 
 https://minecraftdev.org
 
-Copyright (c) 2022 minecraft-dev
+Copyright (c) 2023 minecraft-dev
 
 MIT License

gradle.properties

@@ -3,7 +3,7 @@
 #
 # https://minecraftdev.org
 #
-# Copyright (c) 2022 minecraft-dev
+# Copyright (c) 2023 minecraft-dev
 #
 # MIT License
 #
@@ -14,10 +14,10 @@ kotlin.code.style=official
 ideaVersion = 231-EAP-SNAPSHOT
 ideaVersionName = 2023.1
 
-coreVersion = 1.5.21
+coreVersion = 1.5.22
 downloadIdeaSources = true
 
 pluginTomlVersion = 231.4840.388
 
 # Silences a build-time warning because we are bundling our own kotlin library
-kotlin.stdlib.default.dependency = true
+kotlin.stdlib.default.dependency = false