Skip to content

Commit f41c450

Browse files
DenWavDenWav
committed
Merge branch '2022.1' into 2022.2
2 parents 0ab5461 + 94c0afb commit f41c450

File tree

870 files changed

+974
-944
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

870 files changed

+974
-944
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ body:
4343
- Waterfall
4444
validations:
4545
required: false
46-
- type: markdown
46+
- type: textarea
47+
id: description
4748
attributes:
48-
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.
49+
label: Description of the bug
50+
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‎

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* https://minecraftdev.org
55
*
6-
* Copyright (c) 2022 minecraft-dev
6+
* Copyright (c) 2023 minecraft-dev
77
*
88
* MIT License
99
*/
@@ -17,12 +17,12 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
1717
import org.jlleitschuh.gradle.ktlint.tasks.BaseKtLintCheckTask
1818

1919
plugins {
20-
kotlin("jvm") version "1.7.20"
20+
kotlin("jvm") version "1.8.0"
2121
java
2222
mcdev
2323
groovy
2424
idea
25-
id("org.jetbrains.intellij") version "1.9.0"
25+
id("org.jetbrains.intellij") version "1.12.0"
2626
id("org.cadixdev.licenser")
2727
id("org.jlleitschuh.gradle.ktlint") version "10.3.0"
2828
}
@@ -243,27 +243,7 @@ tasks.test {
243243
}
244244
}
245245
systemProperty("NO_FS_ROOTS_ACCESS_CHECK", "true")
246-
247-
jvmArgs(
248-
"-Dsun.io.useCanonCaches=false",
249-
"-Dsun.io.useCanonPrefixCache=false",
250-
"--add-opens", "java.base/java.io=ALL-UNNAMED",
251-
"--add-opens", "java.base/java.lang.invoke=ALL-UNNAMED",
252-
"--add-opens", "java.base/java.lang.ref=ALL-UNNAMED",
253-
"--add-opens", "java.base/java.lang.reflect=ALL-UNNAMED",
254-
"--add-opens", "java.base/java.lang=ALL-UNNAMED",
255-
"--add-opens", "java.base/java.util.concurrent.atomic=ALL-UNNAMED",
256-
"--add-opens", "java.base/java.util.concurrent.locks=ALL-UNNAMED",
257-
"--add-opens", "java.base/java.util.concurrent=ALL-UNNAMED",
258-
"--add-opens", "java.base/sun.nio.fs=ALL-UNNAMED",
259-
"--add-opens", "java.desktop/java.awt.event=ALL-UNNAMED",
260-
"--add-opens", "java.desktop/java.awt=ALL-UNNAMED",
261-
"--add-opens", "java.desktop/javax.swing.plaf.basic=ALL-UNNAMED",
262-
"--add-opens", "java.desktop/javax.swing=ALL-UNNAMED",
263-
"--add-opens", "java.desktop/sun.awt=ALL-UNNAMED",
264-
"--add-opens", "java.desktop/sun.font=ALL-UNNAMED",
265-
"--add-opens", "java.desktop/sun.swing=ALL-UNNAMED",
266-
)
246+
jvmArgs("--illegal-access=deny")
267247
}
268248

269249
idea {
@@ -366,7 +346,6 @@ tasks.register("cleanSandbox", Delete::class) {
366346
tasks.runIde {
367347
maxHeapSize = "4G"
368348

369-
jvmArgs("--add-exports=java.base/jdk.internal.vm=ALL-UNNAMED")
370349
System.getProperty("debug")?.let {
371350
systemProperty("idea.ProcessCanceledException", "disabled")
372351
systemProperty("idea.debug.mode", "true")

‎buildSrc/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* https://minecraftdev.org
55
*
6-
* Copyright (c) 2022 minecraft-dev
6+
* Copyright (c) 2023 minecraft-dev
77
*
88
* MIT License
99
*/

‎buildSrc/settings.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* https://minecraftdev.org
55
*
6-
* Copyright (c) 2022 minecraft-dev
6+
* Copyright (c) 2023 minecraft-dev
77
*
88
* MIT License
99
*/

‎buildSrc/src/main/kotlin/Filter.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* https://minecraftdev.org
55
*
6-
* Copyright (c) 2022 minecraft-dev
6+
* Copyright (c) 2023 minecraft-dev
77
*
88
* MIT License
99
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* https://minecraftdev.org
55
*
6-
* Copyright (c) 2022 minecraft-dev
6+
* Copyright (c) 2023 minecraft-dev
77
*
88
* MIT License
99
*/

‎buildSrc/src/main/kotlin/util.kt‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
*
44
* https://minecraftdev.org
55
*
6-
* Copyright (c) 2022 minecraft-dev
6+
* Copyright (c) 2023 minecraft-dev
77
*
88
* MIT License
99
*/
1010

11+
import java.io.ByteArrayOutputStream
1112
import org.cadixdev.gradle.licenser.LicenseExtension
1213
import org.gradle.api.JavaVersion
1314
import org.gradle.api.Project
@@ -30,14 +31,19 @@ fun Project.lexer(flex: String, pack: String): TaskDelegate<JavaExec> {
3031
val src = layout.projectDirectory.file("src/main/grammars/$flex.flex")
3132
val dst = layout.buildDirectory.dir("gen/$pack")
3233
val output = layout.buildDirectory.file("gen/$pack/$flex.java")
34+
val logOutout = layout.buildDirectory.file("logs/generate$flex.log")
3335

3436
val jflex by project.configurations
3537
val jflexSkeleton by project.configurations
3638

3739
classpath = jflex
3840
mainClass.set("jflex.Main")
3941

40-
doFirst {
42+
val taskOutput = ByteArrayOutputStream()
43+
standardOutput = taskOutput
44+
errorOutput = taskOutput
45+
46+
doFirst {
4147
args(
4248
"--skel", jflexSkeleton.singleFile.absolutePath,
4349
"-d", dst.get().asFile.absolutePath,
@@ -46,6 +52,11 @@ fun Project.lexer(flex: String, pack: String): TaskDelegate<JavaExec> {
4652

4753
// Delete current lexer
4854
project.delete(output)
55+
logOutout.get().asFile.parentFile.mkdirs()
56+
}
57+
58+
doLast {
59+
logOutout.get().asFile.writeBytes(taskOutput.toByteArray())
4960
}
5061

5162
inputs.files(src, jflexSkeleton)
@@ -64,12 +75,13 @@ fun Project.parser(bnf: String, pack: String): TaskDelegate<JavaExec> {
6475
val dst = dstRoot.map { it.dir(pack) }
6576
val psiDir = dst.map { it.dir("psi") }
6677
val parserDir = dst.map { it.dir("parser") }
78+
val logOutout = layout.buildDirectory.file("logs/generate$bnf.log")
6779

6880
val grammarKit by project.configurations
6981

70-
doFirst {
71-
project.delete(psiDir, parserDir)
72-
}
82+
val taskOutput = ByteArrayOutputStream()
83+
standardOutput = taskOutput
84+
errorOutput = taskOutput
7385

7486
classpath = grammarKit
7587
mainClass.set("org.intellij.grammar.Main")
@@ -83,7 +95,12 @@ fun Project.parser(bnf: String, pack: String): TaskDelegate<JavaExec> {
8395
}
8496

8597
doFirst {
98+
project.delete(psiDir, parserDir)
8699
args(dstRoot.get().asFile, src.asFile)
100+
logOutout.get().asFile.parentFile.mkdirs()
101+
}
102+
doLast {
103+
logOutout.get().asFile.writeBytes(taskOutput.toByteArray())
87104
}
88105

89106
inputs.file(src)

‎copyright.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ Minecraft Dev for IntelliJ
22

33
https://minecraftdev.org
44

5-
Copyright (c) 2022 minecraft-dev
5+
Copyright (c) 2023 minecraft-dev
66

77
MIT License

‎gradle.properties‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# https://minecraftdev.org
55
#
6-
# Copyright (c) 2022 minecraft-dev
6+
# Copyright (c) 2023 minecraft-dev
77
#
88
# MIT License
99
#
@@ -14,7 +14,9 @@ kotlin.code.style=official
1414
ideaVersion = 2022.2
1515
ideaVersionName = 2022.2
1616

17-
coreVersion = 1.5.21
17+
coreVersion = 1.5.22
1818
downloadIdeaSources = true
1919

2020
pluginTomlVersion = 222.3345.108
21+
22+
kotlin.stdlib.default.dependency = false

‎gradle/wrapper/gradle-wrapper.jar‎

818 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)