Merge branch '2020.2' into 2020.3

Author: RedNesto

build.gradle.kts

@@ -19,7 +19,7 @@ plugins {
     mcdev
     groovy
     idea
-    id("org.jetbrains.intellij") version "1.0"
+    id("org.jetbrains.intellij") version "1.1.3"
     id("org.cadixdev.licenser") version "0.6.1"
     id("org.jlleitschuh.gradle.ktlint") version "10.0.0"
 }
@@ -60,7 +60,7 @@ repositories {
     mavenCentral()
     maven("https://repo.denwav.dev/repository/maven-public/")
     maven("https://repo.spongepowered.org/maven")
-    maven("https://jetbrains.bintray.com/intellij-third-party-dependencies")
+    maven("https://cache-redirector.jetbrains.com/intellij-dependencies")
     maven("https://repo.gradle.org/gradle/libs-releases-local/")
     maven("https://maven.extracraftx.com")
 }
@@ -200,7 +200,7 @@ tasks.test {
 
 idea {
     module {
-        generatedSourceDirs.add(file("gen"))
+        generatedSourceDirs.add(file("build/gen"))
         excludeDirs.add(file(intellij.sandboxDir.get()))
     }
 }
@@ -278,7 +278,7 @@ val generateTranslationTemplateLexer by lexer("TranslationTemplateLexer", "com/d
 val generate by tasks.registering {
     group = "minecraft"
     description = "Generates sources needed to compile the plugin."
-    outputs.dir("gen")
+    outputs.dir(layout.buildDirectory.dir("gen"))
     dependsOn(
         generateAtLexer,
         generateAtParser,

buildSrc/src/main/kotlin/util.kt

@@ -17,21 +17,21 @@ import org.gradle.kotlin.dsl.provideDelegate
 import org.gradle.kotlin.dsl.registering
 
 fun Project.lexer(flex: String, pack: String) = tasks.registering(JavaExec::class) {
-    val src = "src/main/grammars/$flex.flex"
-    val dst = "gen/$pack"
-    val output = "$dst/$flex.java"
+    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 jflex by project.configurations
     val jflexSkeleton by project.configurations
 
     classpath = jflex
-    main = "jflex.Main"
+    mainClass.set("jflex.Main")
 
     doFirst {
         args(
             "--skel", jflexSkeleton.singleFile.absolutePath,
-            "-d", dst,
-            src
+            "-d", dst.get().asFile.absolutePath,
+            src.asFile.absolutePath
         )
 
         // Delete current lexer
@@ -43,11 +43,11 @@ fun Project.lexer(flex: String, pack: String) = tasks.registering(JavaExec::clas
 }
 
 fun Project.parser(bnf: String, pack: String) = tasks.registering(JavaExec::class) {
-    val src = "src/main/grammars/$bnf.bnf".replace('/', File.separatorChar)
-    val dstRoot = "gen"
-    val dst = "$dstRoot/$pack".replace('/', File.separatorChar)
-    val psiDir = "$dst/psi/".replace('/', File.separatorChar)
-    val parserDir = "$dst/parser/".replace('/', File.separatorChar)
+    val src = project.layout.projectDirectory.file("src/main/grammars/$bnf.bnf")
+    val dstRoot = project.layout.buildDirectory.dir("gen")
+    val dst = dstRoot.map { it.dir(pack) }
+    val psiDir = dst.map { it.dir("psi") }
+    val parserDir = dst.map { it.dir("parser") }
 
     val grammarKit by project.configurations
 
@@ -56,7 +56,7 @@ fun Project.parser(bnf: String, pack: String) = tasks.registering(JavaExec::clas
     }
 
     classpath = grammarKit
-    main = "org.intellij.grammar.Main"
+    mainClass.set("org.intellij.grammar.Main")
 
     if (JavaVersion.current().isJava9Compatible) {
         jvmArgs(
@@ -66,7 +66,9 @@ fun Project.parser(bnf: String, pack: String) = tasks.registering(JavaExec::clas
         )
     }
 
-    args(dstRoot, src)
+    doFirst {
+        args(dstRoot.get().asFile, src.asFile)
+    }
 
     inputs.file(src)
     outputs.dirs(

gradle/libs.versions.toml

@@ -6,7 +6,7 @@ junit = "5.7.1"
 coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "coroutines" }
 
-templateMakerFabric = "com.extracraftx.minecraft:TemplateMakerFabric:0.3.0"
+templateMakerFabric = "com.extracraftx.minecraft:TemplateMakerFabric:0.4.0"
 
 # GrammarKit
 jflex-lib = "org.jetbrains.idea:jflex:1.7.0-b7f882a"

src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModelFG3BuilderImpl.groovy

@@ -11,6 +11,8 @@
 package com.demonwav.mcdev.platform.mcp.gradle.tooling
 
 import org.gradle.api.Project
+import org.gradle.api.file.FileCollection
+import org.gradle.api.provider.Provider
 import org.jetbrains.annotations.NotNull
 import org.jetbrains.plugins.gradle.tooling.ErrorMessageBuilder
 import org.jetbrains.plugins.gradle.tooling.ModelBuilderService
@@ -46,8 +48,20 @@ final class McpModelFG3BuilderImpl implements ModelBuilderService {
         }
 
         def taskOutput = task.outputs.files.singleFile
+
+        // Cheap way to be compatible with FG5
+        def mappings = extension.mappings
+        if (mappings instanceof Provider) {
+            mappings = mappings.get()
+        }
+
+        def accessTransformers = extension.accessTransformers
+        if (accessTransformers instanceof FileCollection) {
+            accessTransformers = accessTransformers.asList()
+        }
+
         //noinspection GroovyAssignabilityCheck
-        return new McpModelFG3Impl(minecraftDepVersions, extension.mappings, taskOutput, task.name, extension.accessTransformers)
+        return new McpModelFG3Impl(minecraftDepVersions, mappings, taskOutput, task.name, accessTransformers)
     }
 
     @Override

src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/vanillagradle/VanillaGradleModelBuilderImpl.groovy

@@ -0,0 +1,36 @@
+/*
+ * Minecraft Dev for IntelliJ
+ *
+ * https://minecraftdev.org
+ *
+ * Copyright (c) 2021 minecraft-dev
+ *
+ * MIT License
+ */
+
+package com.demonwav.mcdev.platform.mcp.gradle.tooling.vanillagradle
+
+import org.gradle.api.Project
+import org.jetbrains.annotations.NotNull
+import org.jetbrains.plugins.gradle.tooling.ErrorMessageBuilder
+import org.jetbrains.plugins.gradle.tooling.ModelBuilderService
+
+class VanillaGradleModelBuilderImpl implements ModelBuilderService {
+
+    @Override
+    boolean canBuild(String modelName) {
+        return VanillaGradleModel.name == modelName
+    }
+
+    @Override
+    Object buildAll(String modelName, Project project) {
+        return new VanillaGradleModelImpl(project.plugins.hasPlugin('org.spongepowered.gradle.vanilla'))
+    }
+
+    @Override
+    ErrorMessageBuilder getErrorMessageBuilder(@NotNull Project project, @NotNull Exception e) {
+        return ErrorMessageBuilder.create(
+                project, e, "MinecraftDev import errors"
+        ).withDescription("Unable to build MinecraftDev VanillaGradle project configuration")
+    }
+}

src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/vanillagradle/VanillaGradleModelImpl.groovy

@@ -0,0 +1,25 @@
+/*
+ * Minecraft Dev for IntelliJ
+ *
+ * https://minecraftdev.org
+ *
+ * Copyright (c) 2021 minecraft-dev
+ *
+ * MIT License
+ */
+
+package com.demonwav.mcdev.platform.mcp.gradle.tooling.vanillagradle
+
+class VanillaGradleModelImpl implements VanillaGradleModel, Serializable {
+
+    private final boolean hasVanillaGradle
+
+    VanillaGradleModelImpl(boolean hasVanillaGradle) {
+        this.hasVanillaGradle = hasVanillaGradle
+    }
+
+    @Override
+    boolean hasVanillaGradle() {
+        return hasVanillaGradle
+    }
+}

src/gradle-tooling-extension/java/com/demonwav/mcdev/platform/mcp/gradle/tooling/vanillagradle/VanillaGradleModel.java

@@ -0,0 +1,16 @@
+/*
+ * Minecraft Dev for IntelliJ
+ *
+ * https://minecraftdev.org
+ *
+ * Copyright (c) 2021 minecraft-dev
+ *
+ * MIT License
+ */
+
+package com.demonwav.mcdev.platform.mcp.gradle.tooling.vanillagradle;
+
+public interface VanillaGradleModel {
+
+    boolean hasVanillaGradle();
+}

src/gradle-tooling-extension/resources/META-INF/services/org.jetbrains.plugins.gradle.tooling.ModelBuilderService

@@ -1,2 +1,3 @@
+com.demonwav.mcdev.platform.mcp.gradle.tooling.vanillagradle.VanillaGradleModelBuilderImpl
 com.demonwav.mcdev.platform.mcp.gradle.tooling.McpModelFG2BuilderImpl
 com.demonwav.mcdev.platform.mcp.gradle.tooling.McpModelFG3BuilderImpl

src/main/kotlin/creator/CreatorStep.kt

@@ -94,23 +94,25 @@ class BasicJavaClassStep(
     private val project: Project,
     private val buildSystem: BuildSystem,
     private val className: String,
-    private val classText: String
+    private val classText: String,
+    private val openInEditor: Boolean = true,
+    private val rootProvider: (BuildSystem) -> Path = { it.dirsOrError.sourceDirectory }
 ) : CreatorStep {
     override fun runStep(indicator: ProgressIndicator) {
-        val dirs = buildSystem.dirsOrError
-
         runWriteTask {
             indicator.text = "Writing class: $className"
             val files = className.split(".")
             val className = files.last()
 
-            val sourceDir = getMainClassDirectory(dirs.sourceDirectory, files)
+            val sourceDir = getMainClassDirectory(rootProvider(buildSystem), files)
 
             val classFile = CreatorStep.writeTextToFile(project, sourceDir, "$className.java", classText)
 
-            // Set the editor focus on the created class
-            PsiManager.getInstance(project).findFile(classFile)?.let { classPsi ->
-                EditorHelper.openInEditor(classPsi)
+            if (openInEditor) {
+                // Set the editor focus on the created class
+                PsiManager.getInstance(project).findFile(classFile)?.let { classPsi ->
+                    EditorHelper.openInEditor(classPsi)
+                }
             }
         }
     }

src/main/kotlin/creator/LicenseStep.kt

@@ -0,0 +1,41 @@
+/*
+ * Minecraft Dev for IntelliJ
+ *
+ * https://minecraftdev.org
+ *
+ * Copyright (c) 2021 minecraft-dev
+ *
+ * MIT License
+ */
+
+package com.demonwav.mcdev.creator
+
+import com.demonwav.mcdev.platform.CommonTemplate
+import com.demonwav.mcdev.util.License
+import com.intellij.openapi.progress.ProgressIndicator
+import com.intellij.openapi.project.Project
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.StandardOpenOption
+
+class LicenseStep(
+    private val project: Project,
+    private val rootDirectory: Path,
+    private val license: License,
+    private val author: String
+) : CreatorStep {
+
+    override fun runStep(indicator: ProgressIndicator) {
+        val licenseFile = rootDirectory.resolve("LICENSE")
+
+        val fileText = CommonTemplate.applyLicenseTemplate(project, license, author)
+
+        Files.write(
+            licenseFile,
+            fileText.toByteArray(Charsets.UTF_8),
+            StandardOpenOption.CREATE,
+            StandardOpenOption.WRITE,
+            StandardOpenOption.TRUNCATE_EXISTING
+        )
+    }
+}