Merge remote-tracking branch 'upstream/2022.3' into rfg

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -36,7 +36,6 @@ body:
         - Architectury
         - Minecraft Forge
         - Fabric
-        - Lite Loader
         - Velocity
         - Mixins
         - BungeeCord

.github/ISSUE_TEMPLATE/project_wizard_outdated.yaml

@@ -0,0 +1,47 @@
+name: Project Wizard Outdated
+description: The Minecraft project wizard is outdated
+labels: ["status: unverified", "type: bug"]
+body:
+  - type: markdown
+    attributes:
+      value: PLEASE DO NOT USE THIS TEMPLATE FOR FEATURE REQUESTS, INCLUDING REQUESTS FOR NEW PLATFORMS.
+  - type: input
+    id: plugin-version
+    attributes:
+      label: Minecraft Development for IntelliJ plugin version
+    validations:
+      required: true
+  - type: input
+    id: intellij-version
+    attributes:
+      label: IntelliJ version
+    validations:
+      required: true
+  - type: input
+    id: operating-system
+    attributes:
+      label: Operating System
+    validations:
+      required: true
+  - type: dropdown
+    id: target-platform
+    attributes:
+      label: Target platform
+      multiple: true
+      options:
+        - Spigot
+        - Paper
+        - Sponge
+        - Architectury
+        - Minecraft Forge
+        - Fabric
+        - Velocity
+        - BungeeCord
+        - Waterfall
+    validations:
+      required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: Additional description
+      description: If the issue isn't obvious, please be as detailed as you can.

build.gradle.kts

@@ -9,20 +9,22 @@
  */
 
 import org.cadixdev.gradle.licenser.header.HeaderStyle
+import org.cadixdev.gradle.licenser.tasks.LicenseUpdate
 import org.gradle.internal.jvm.Jvm
 import org.gradle.internal.os.OperatingSystem
 import org.jetbrains.gradle.ext.settings
 import org.jetbrains.gradle.ext.taskTriggers
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jlleitschuh.gradle.ktlint.tasks.BaseKtLintCheckTask
+import org.jlleitschuh.gradle.ktlint.tasks.KtLintFormatTask
 
 plugins {
     kotlin("jvm") version "1.8.0"
     java
     mcdev
     groovy
     idea
-    id("org.jetbrains.intellij") version "1.12.0"
+    id("org.jetbrains.intellij") version "1.13.0"
     id("org.cadixdev.licenser")
     id("org.jlleitschuh.gradle.ktlint") version "10.3.0"
 }
@@ -81,7 +83,6 @@ dependencies {
 
     implementation(files(gradleToolingExtensionJar))
 
-    implementation(libs.templateMakerFabric)
     implementation(libs.mappingIo)
     implementation(libs.bundles.asm)
 
@@ -156,10 +157,11 @@ intellij {
         "maven",
         "gradle",
         "Groovy",
+        "Kotlin",
         "org.toml.lang:$pluginTomlVersion",
         "ByteCodeViewer",
-        // needed dependencies for unit tests
         "properties",
+        // needed dependencies for unit tests
         "junit"
     )
 
@@ -272,15 +274,15 @@ license {
                 fileTree(project.projectDir) {
                     include("*.gradle.kts", "gradle.properties")
                     exclude("**/buildSrc/**", "**/build/**")
-                }
+                },
             )
         }
         register("buildSrc") {
             files.from(
                 project.fileTree(project.projectDir.resolve("buildSrc")) {
                     include("**/*.kt", "**/*.kts")
                     exclude("**/build/**")
-                }
+                },
             )
         }
         register("grammars") {
@@ -289,16 +291,17 @@ license {
     }
 }
 
+ktlint {
+    disabledRules.add("filename")
+}
 tasks.withType<BaseKtLintCheckTask>().configureEach {
     workerMaxHeapSize.set("512m")
 }
 
 tasks.register("format") {
     group = "minecraft"
     description = "Formats source code according to project style"
-    val licenseFormat by tasks.existing
-    val ktlintFormat by tasks.existing
-    dependsOn(licenseFormat, ktlintFormat)
+    dependsOn(tasks.withType<LicenseUpdate>(), tasks.withType<KtLintFormatTask>())
 }
 
 val generateAtLexer by lexer("AtLexer", "com/demonwav/mcdev/platform/mcp/at/gen")
@@ -328,7 +331,7 @@ val generate by tasks.registering {
         generateNbttParser,
         generateLangLexer,
         generateLangParser,
-        generateTranslationTemplateLexer
+        generateTranslationTemplateLexer,
     )
 }
 
@@ -370,7 +373,7 @@ tasks.buildSearchableOptions {
         "--add-opens=java.desktop/javax.swing=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"
+        "--add-opens=java.desktop/sun.swing=ALL-UNNAMED",
     )
 
     if (OperatingSystem.current().isMacOsX) {

gradle.properties

@@ -14,7 +14,7 @@ kotlin.code.style=official
 ideaVersion = 2022.3
 ideaVersionName = 2022.3
 
-coreVersion = 1.5.23
+coreVersion = 1.6.1
 downloadIdeaSources = false
 
 pluginTomlVersion = 223.7571.59

gradle/libs.versions.toml

@@ -10,7 +10,6 @@ coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", ve
 coroutines-jdk8 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8", version.ref = "coroutines" }
 coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "coroutines" }
 
-templateMakerFabric = "com.extracraftx.minecraft:TemplateMakerFabric:0.4.1"
 mappingIo = "net.fabricmc:mapping-io:0.2.1"
 
 # GrammarKit

readme.md

@@ -133,12 +133,12 @@ This project is licensed under [MIT](license.txt).
 Supported Platforms
 -------------------
 
-- [![Bukkit Icon](src/main/resources/assets/icons/platform/Bukkit.png?raw=true) **Bukkit**](https://hub.spigotmc.org/stash/projects/SPIGOT/repos/bukkit/browse) ([![Spigot Icon](src/main/resources/assets/icons/platform/Spigot.png?raw=true) Spigot](https://spigotmc.org/) and [![Paper Icon](src/main/resources/assets/icons/platform/Paper.png?raw=true) Paper](https://papermc.io/))
+- [![Spigot Icon](src/main/resources/assets/icons/platform/Spigot.png?raw=true) **Spigot**](https://spigotmc.org/) ([![Paper Icon](src/main/resources/assets/icons/platform/Paper.png?raw=true) Paper](https://papermc.io/))
 - [![Sponge Icon](src/main/resources/assets/icons/platform/Sponge_dark.png?raw=true) **Sponge**](https://www.spongepowered.org/)
 - [![Architectury Icon](src/main/resources/assets/icons/platform/Architectury.png?raw=true) **Architectury**](https://github.com/architectury/architectury-api)
 - [![Forge Icon](src/main/resources/assets/icons/platform/Forge.png?raw=true) **Minecraft Forge**](https://forums.minecraftforge.net/)
 - [![Fabric Icon](src/main/resources/assets/icons/platform/Fabric.png?raw=true) **Fabric**](https://fabricmc.net)
-- [![LiteLoader Icon](src/main/resources/assets/icons/platform/LiteLoader.png?raw=true) **LiteLoader**](http://www.liteloader.com/)
-- [![MCP Icon](src/main/resources/assets/icons/platform/MCP.png?raw=true) **MCP**](http://www.modcoderpack.com/)
 - [![Mixins Icon](src/main/resources/assets/icons/platform/Mixins_dark.png?raw=true) **Mixins**](https://github.com/SpongePowered/Mixin)
 - [![BungeeCord Icon](src/main/resources/assets/icons/platform/BungeeCord.png?raw=true) **BungeeCord**](https://www.spigotmc.org/wiki/bungeecord/) ([![Waterfall Icon](src/main/resources/assets/icons/platform/Waterfall.png?raw=true) Waterfall](https://github.com/PaperMC/Waterfall))
+- [![Velocity Icon](src/main/resources/assets/icons/platform/Velocity.png?raw=true) **Velocity**](https://velocitypowered.com/)
+- [![Adventure Icon](src/main/resources/assets/icons/platform/Adventure.png?raw=true) **Adventure**](https://kyori.net/)

src/main/kotlin/MinecraftSettings.kt

@@ -24,7 +24,7 @@ class MinecraftSettings : PersistentStateComponent<MinecraftSettings.State> {
         var isShowEventListenerGutterIcons: Boolean = true,
         var isShowChatColorGutterIcons: Boolean = true,
         var isShowChatColorUnderlines: Boolean = false,
-        var underlineType: UnderlineType = UnderlineType.DOTTED
+        var underlineType: UnderlineType = UnderlineType.DOTTED,
     )
 
     private var state = State()
@@ -81,7 +81,8 @@ class MinecraftSettings : PersistentStateComponent<MinecraftSettings.State> {
         DOTTED("Dotted", EffectType.BOLD_DOTTED_LINE),
         BOXED("Boxed", EffectType.BOXED),
         ROUNDED_BOXED("Rounded Boxed", EffectType.ROUNDED_BOX),
-        WAVED("Waved", EffectType.WAVE_UNDERSCORE);
+        WAVED("Waved", EffectType.WAVE_UNDERSCORE),
+        ;
 
         override fun toString(): String {
             return regular