Merge branch '2020.2' into 2020.3

Author: RedNesto

build.gradle.kts

@@ -20,7 +20,7 @@ plugins {
     groovy
     idea
     id("org.jetbrains.intellij") version "1.0"
-    id("org.cadixdev.licenser") version "0.6.0"
+    id("org.cadixdev.licenser") version "0.6.1"
     id("org.jlleitschuh.gradle.ktlint") version "10.0.0"
 }
 
@@ -58,7 +58,7 @@ val gradleToolingExtensionJar = tasks.register<Jar>(gradleToolingExtensionSource
 
 repositories {
     mavenCentral()
-    maven("https://wav.jfrog.io/artifactory/mcdev/")
+    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://repo.gradle.org/gradle/libs-releases-local/")
@@ -79,7 +79,7 @@ dependencies {
     implementation(libs.templateMakerFabric)
 
     jflex(libs.jflex.lib)
-    jflexSkeleton("${libs.jflex.skeleton.text()}:idea@skeleton")
+    jflexSkeleton("${libs.jflex.skeleton.text()}@skeleton")
     grammarKit(libs.grammarKit)
 
     testLibs(libs.test.mockJdk)

gradle.properties

@@ -14,7 +14,7 @@ kotlin.code.style=official
 ideaVersion = 2020.3.2
 ideaVersionName = 2020.3
 
-coreVersion = 1.5.11
+coreVersion = 1.5.12
 downloadIdeaSources = true
 
 pluginTomlVersion = 0.2.140.3644-203

gradle/libs.versions.toml

@@ -18,7 +18,7 @@ gradleToolingExtension = "com.jetbrains.intellij.gradle:gradle-tooling-extension
 annotations = "org.jetbrains:annotations:19.0.0"
 
 # Testing
-test-mockJdk = "org.jetbrains.idea:mockJDK:1.7-4d76c50"
+test-mockJdk = "org.jetbrains.idea:mock-jdk:1.7-4d76c50"
 test-mixin = "org.spongepowered:mixin:0.7-SNAPSHOT"
 test-spongeapi = "org.spongepowered:spongeapi:7.0.0"
 test-nbt = "com.demonwav.mcdev:all-types-nbt:1.0"

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )

gradlew

@@ -40,7 +40,7 @@ Minecraft Development for IntelliJ
     </tr>
 </table>
 
-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)
+Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.5.12-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>

readme.md

@@ -20,6 +20,7 @@ import com.intellij.openapi.application.runReadAction
 import com.intellij.openapi.progress.ProgressIndicator
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
+import com.intellij.psi.PsiDocumentManager
 import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiManager
 import com.intellij.psi.SmartPsiElementPointer
@@ -46,6 +47,7 @@ interface CreatorStep {
             runWriteTask {
                 for (scheduledReformat in scheduledReformats) {
                     val file = scheduledReformat.element ?: continue
+                    PsiDocumentManager.getInstance(file.project).getDocument(file)?.setReadOnly(false)
                     ReformatCodeProcessor(file, false).run()
                 }
             }
@@ -81,6 +83,7 @@ interface CreatorStep {
         fun writeText(file: Path, text: String, psiManager: PsiManager? = null) {
             Files.write(file, text.toByteArray(Charsets.UTF_8), CREATE, TRUNCATE_EXISTING, WRITE)
             psiManager?.findFile(file.virtualFileOrError)?.let {
+                PsiDocumentManager.getInstance(psiManager.project).getDocument(it)?.setReadOnly(false)
                 ReformatCodeProcessor(it, false).run()
             }
         }

src/main/kotlin/creator/CreatorStep.kt

@@ -53,16 +53,22 @@ class SimpleGradleSetupStep(
     private val project: Project,
     private val rootDirectory: Path,
     private val buildSystem: BuildSystem,
-    private val gradleFiles: GradleFiles<String>
+    private val gradleFiles: GradleFiles<String>,
+    private val kotlinScript: Boolean = false
 ) : CreatorStep {
 
     override fun runStep(indicator: ProgressIndicator) {
         runWriteTask {
+            if (project.isDisposed) {
+                return@runWriteTask
+            }
+
             buildSystem.directories =
                 DirectorySet.create(rootDirectory)
             val (buildGradle, gradleProp, settingsGradle) = setupGradleFiles(
                 rootDirectory,
-                gradleFiles
+                gradleFiles,
+                kotlinScript
             )
 
             val psiManager = PsiManager.getInstance(project)
@@ -93,13 +99,18 @@ class GradleSetupStep(
     private val project: Project,
     private val rootDirectory: Path,
     private val buildSystem: BuildSystem,
-    private val gradleFiles: GradleFiles<String>
+    private val gradleFiles: GradleFiles<String>,
+    private val kotlinScript: Boolean = false
 ) : CreatorStep {
     override fun runStep(indicator: ProgressIndicator) {
-        val (_, gradleProp, settingsGradle) = setupGradleFiles(rootDirectory, gradleFiles)
+        val (_, gradleProp, settingsGradle) = setupGradleFiles(rootDirectory, gradleFiles, kotlinScript)
 
         runWriteTask {
-            val buildGradlePsi = addBuildGradleDependencies(project, buildSystem, gradleFiles.buildGradle)
+            if (project.isDisposed) {
+                return@runWriteTask
+            }
+
+            val buildGradlePsi = addBuildGradleDependencies(project, buildSystem, gradleFiles.buildGradle, kotlinScript)
             val psiManager = PsiManager.getInstance(project)
             psiManager.findDirectory(rootDirectory.virtualFileOrError)?.let { dir ->
                 dir.findFile(buildGradlePsi.name)?.delete()
@@ -123,11 +134,11 @@ data class GradleFiles<out T>(
     val settingsGradle: T?
 )
 
-fun setupGradleFiles(dir: Path, givenFiles: GradleFiles<String>): GradleFiles<Path> {
+fun setupGradleFiles(dir: Path, givenFiles: GradleFiles<String>, kotlinScript: Boolean = false): GradleFiles<Path> {
     return GradleFiles(
-        dir.resolve("build.gradle"),
+        dir.resolve(if (kotlinScript) "build.gradle.kts" else "build.gradle"),
         givenFiles.gradleProperties?.let { dir.resolve("gradle.properties") },
-        givenFiles.settingsGradle?.let { dir.resolve("settings.gradle") }
+        givenFiles.settingsGradle?.let { dir.resolve(if (kotlinScript) "settings.gradle.kts" else "settings.gradle") },
     ).apply {
         Files.deleteIfExists(buildGradle)
         Files.createFile(buildGradle)
@@ -136,10 +147,15 @@ fun setupGradleFiles(dir: Path, givenFiles: GradleFiles<String>): GradleFiles<Pa
     }
 }
 
-fun addBuildGradleDependencies(project: Project, buildSystem: BuildSystem, text: String): PsiFile {
+fun addBuildGradleDependencies(
+    project: Project,
+    buildSystem: BuildSystem,
+    text: String,
+    kotlinScript: Boolean = false
+): PsiFile {
     val file = PsiFileFactory.getInstance(project).createFileFromText(GroovyLanguage, text)
     return file.runWriteAction {
-        val fileName = "build.gradle"
+        val fileName = if (kotlinScript) "build.gradle.kts" else "build.gradle"
         file.name = fileName
 
         val groovyFile = file as GroovyFile
@@ -203,7 +219,8 @@ private fun getClosableBlockByName(element: PsiElement, name: String) =
 class BasicGradleFinalizerStep(
     private val module: Module,
     private val rootDirectory: Path,
-    private val buildSystem: BuildSystem
+    private val buildSystem: BuildSystem,
+    private vararg val additionalRunTasks: String
 ) : CreatorStep {
     private val project
         get() = module.project
@@ -212,7 +229,7 @@ class BasicGradleFinalizerStep(
         // Tell IntelliJ to import this project
         rootDirectory.virtualFileOrError.refresh(false, true)
 
-        invokeLater {
+        invokeLater(module.disposed) {
             val path = rootDirectory.toAbsolutePath().toString()
             if (canLinkAndRefreshGradleProject(path, project, false)) {
                 linkAndRefreshGradleProject(path, project)
@@ -222,10 +239,17 @@ class BasicGradleFinalizerStep(
 
         // Set up the run config
         // Get the gradle external task type, this is what sets it as a gradle task
+        addRunTaskConfiguration("build")
+        for (tasks in additionalRunTasks) {
+            addRunTaskConfiguration(tasks)
+        }
+    }
+
+    private fun addRunTaskConfiguration(task: String) {
         val gradleType = GradleExternalTaskConfigurationType.getInstance()
 
         val runManager = RunManager.getInstance(project)
-        val runConfigName = buildSystem.artifactId + " build"
+        val runConfigName = buildSystem.artifactId + ' ' + task
 
         val runConfiguration = ExternalSystemRunConfiguration(
             GradleConstants.SYSTEM_ID,
@@ -237,7 +261,7 @@ class BasicGradleFinalizerStep(
         // Set relevant gradle values
         runConfiguration.settings.externalProjectPath = rootDirectory.toAbsolutePath().toString()
         runConfiguration.settings.executionName = runConfigName
-        runConfiguration.settings.taskNames = listOf("build")
+        runConfiguration.settings.taskNames = listOf(task)
 
         runConfiguration.isAllowRunningInParallel = false
 

src/main/kotlin/creator/buildsystem/gradle/gradle-steps.kt

@@ -66,6 +66,10 @@ class MinecraftFacet(
     }
 
     fun refresh() {
+        if (module.isDisposed) {
+            return
+        }
+
         // Don't allow parent types with child types in auto detected set
         val allEnabled = configuration.state.run {
             autoDetectTypes = PlatformType.removeParents(autoDetectTypes)

src/main/kotlin/facet/MinecraftFacet.kt

@@ -24,6 +24,10 @@ class PluginLineMarkerProvider : LineMarkerProviderDescriptor() {
     override fun getName() = "Minecraft Plugin line marker"
 
     override fun getLineMarkerInfo(element: PsiElement): LineMarkerInfo<*>? {
+        if (!element.isValid) {
+            return null
+        }
+
         val module = ModuleUtilCore.findModuleForPsiElement(element) ?: return null
 
         val instance = MinecraftFacet.getInstance(module) ?: return null

src/main/kotlin/insight/PluginLineMarkerProvider.kt

@@ -11,6 +11,9 @@
 package com.demonwav.mcdev.nbt.tags
 
 import java.io.DataOutputStream
+import java.text.DecimalFormat
+import java.text.NumberFormat
+import java.util.Locale
 
 class TagDouble(override val value: Double) : NbtValueTag<Double>(Double::class.java) {
     override val payloadSize = 8
@@ -21,4 +24,16 @@ class TagDouble(override val value: Double) : NbtValueTag<Double>(Double::class.
     }
 
     override fun toString() = toString(StringBuilder(), 0, WriterState.COMPOUND).toString()
+
+    override fun toString(sb: StringBuilder, indentLevel: Int, writerState: WriterState): StringBuilder {
+        return sb.append(FORMATTER.format(value))
+    }
+
+    companion object {
+        val FORMATTER = (NumberFormat.getInstance(Locale.ROOT) as DecimalFormat).apply {
+            minimumFractionDigits = 1 // Default NBTT double format always uses a fraction, like in Kotlin
+            maximumFractionDigits = 20 // Should be more than enough, but let's use 20 just in case
+            groupingSize = 0 // Disables thousands separator
+        }
+    }
 }

src/main/kotlin/nbt/tags/TagDouble.kt

@@ -17,12 +17,12 @@ abstract class BaseTemplate {
 
     protected fun Project.applyTemplate(
         templateName: String,
-        properties: Map<String, String>? = null
+        properties: Map<String, *>? = null
     ): String {
         val manager = FileTemplateManager.getInstance(this)
         val template = manager.getJ2eeTemplate(templateName)
 
-        val allProperties = manager.defaultProperties
+        val allProperties = manager.defaultProperties.toMutableMap()
         properties?.let { prop -> allProperties.putAll(prop) }
 
         return template.getText(allProperties)

src/main/kotlin/platform/BaseTemplate.kt

@@ -29,6 +29,8 @@ import com.demonwav.mcdev.creator.buildsystem.maven.CommonModuleDependencyStep
 import com.demonwav.mcdev.creator.buildsystem.maven.MavenBuildSystem
 import com.demonwav.mcdev.creator.buildsystem.maven.MavenGitignoreStep
 import com.demonwav.mcdev.platform.PlatformType
+import com.demonwav.mcdev.util.MinecraftVersions
+import com.demonwav.mcdev.util.SemanticVersion
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.progress.ProgressIndicator
 import com.intellij.openapi.project.Project
@@ -154,9 +156,13 @@ open class BukkitDependenciesStep(
                         "https://papermc.io/repo/repository/maven-public/"
                     )
                 )
+                val paperGroupId = when {
+                    SemanticVersion.parse(mcVersion) >= MinecraftVersions.MC1_17 -> "io.papermc.paper"
+                    else -> "com.destroystokyo.paper"
+                }
                 buildSystem.dependencies.add(
                     BuildDependency(
-                        "com.destroystokyo.paper",
+                        paperGroupId,
                         "paper-api",
                         "$mcVersion-R0.1-SNAPSHOT",
                         mavenScope = "provided",

src/main/kotlin/platform/bukkit/creator/BukkitProjectCreator.kt

@@ -42,7 +42,7 @@ abstract class SrgActionBase : AnAction() {
         val mcpModule = data.instance.getModuleOfType(McpModuleType) ?: return showBalloon("No mappings found", e)
 
         mcpModule.srgManager?.srgMap?.onSuccess { srgMap ->
-            var parent = data.element.parent
+            var parent = data.element.parent ?: return@onSuccess showBalloon("Not a valid element", e)
 
             if (parent is PsiMember) {
                 val shadowTarget = parent.findFirstShadowTarget()?.element
@@ -52,7 +52,7 @@ abstract class SrgActionBase : AnAction() {
             }
 
             if (parent is PsiReference) {
-                parent = parent.resolve()
+                parent = parent.resolve() ?: return@onSuccess showBalloon("Not a valid element", e)
             }
 
             withSrgTarget(parent, srgMap, e, data)

src/main/kotlin/platform/mcp/actions/SrgActionBase.kt

@@ -92,30 +92,30 @@ class McpVersion private constructor(private val map: Map<String, Map<String, Li
 
     companion object {
         fun downloadData(): McpVersion? {
-            try {
-                val text = URL("http://export.mcpbot.bspk.rs/versions.json").readText()
-                val map = Gson().fromJson<MutableMap<String, MutableMap<String, MutableList<Int>>>>(text)
-
-                val tempMappings = URL("https://assets.tterrag.com/temp_mappings.json").readText()
-                val tempMappingsMap = Gson()
-                    .fromJson<MutableMap<String, MutableMap<String, MutableList<Int>>>>(tempMappings)
-
-                // Merge the temporary mappings list into the main one, temporary solution for 1.16
-                tempMappingsMap.forEach { (mcVersion, channels) ->
-                    val existingChannels = map.getOrPut(mcVersion, ::mutableMapOf)
-                    channels.forEach { (channelName, newVersions) ->
-                        val existingVersions = existingChannels.getOrPut(channelName, ::mutableListOf)
-                        existingVersions.addAll(newVersions)
-                    }
-                }
+            val bspkrsMappings = try {
+                val bspkrsText = URL("https://maven.minecraftforge.net/de/oceanlabs/mcp/versions.json").readText()
+                Gson().fromJson<MutableMap<String, MutableMap<String, MutableList<Int>>>>(bspkrsText)
+            } catch (ignored: IOException) {
+                mutableMapOf()
+            }
 
-                val mcpVersion = McpVersion(map)
-                mcpVersion.versions
-                return mcpVersion
+            val tterragMappings = try {
+                val tterragText = URL("https://assets.tterrag.com/temp_mappings.json").readText()
+                Gson().fromJson<MutableMap<String, MutableMap<String, MutableList<Int>>>>(tterragText)
             } catch (ignored: IOException) {
+                emptyMap()
+            }
+
+            // Merge the temporary mappings list into the main one, temporary solution for 1.16
+            tterragMappings.forEach { (mcVersion, channels) ->
+                val existingChannels = bspkrsMappings.getOrPut(mcVersion, ::mutableMapOf)
+                channels.forEach { (channelName, newVersions) ->
+                    val existingVersions = existingChannels.getOrPut(channelName, ::mutableListOf)
+                    existingVersions.addAll(newVersions)
+                }
             }
 
-            return null
+            return if (bspkrsMappings.isEmpty()) null else McpVersion(bspkrsMappings)
         }
     }
 }

src/main/kotlin/platform/mcp/version/McpVersion.kt

@@ -105,6 +105,10 @@ class GenerateOverwriteAction : MixinCodeInsightAction() {
                 .first().positionCaret(editor, true)
         }
 
+        if (!psiClass.isValid) {
+            return
+        }
+
         // Generate needed shadows
         val newShadows = createShadowMembers(project, psiClass, filterNewShadows(requiredMembers, psiClass))