Merge branch '2020.2' into 2020.3

Author: DenWav

build.gradle.kts

@@ -115,7 +115,7 @@ intellij {
 
     downloadSources = downloadIdeaSources.toBoolean()
 
-    sandboxDirectory = project.rootDir.canonicalPath + "/.sandbox"
+    sandboxDirectory = layout.projectDirectory.dir(".sandbox")
 }
 
 tasks.publishPlugin {
@@ -294,6 +294,12 @@ sourceSets.main { java.srcDir(generate) }
 // Remove gen directory on clean
 tasks.clean { delete(generate) }
 
+tasks.register("cleanSandbox", Delete::class) {
+    group = "intellij"
+    description = "Deletes the sandbox directory."
+    delete(layout.projectDirectory.dir(".sandbox"))
+}
+
 tasks.runIde {
     maxHeapSize = "2G"
 

gradle.properties

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

readme.md

@@ -36,7 +36,7 @@ Minecraft Development for IntelliJ
     </tr>
 </table>
 
-Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.5.9-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
+Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.5.10-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>

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

@@ -40,6 +40,7 @@ import java.nio.file.StandardOpenOption.CREATE
 import java.nio.file.StandardOpenOption.TRUNCATE_EXISTING
 import java.nio.file.StandardOpenOption.WRITE
 import org.jetbrains.plugins.gradle.service.execution.GradleExternalTaskConfigurationType
+import org.jetbrains.plugins.gradle.service.project.open.canLinkAndRefreshGradleProject
 import org.jetbrains.plugins.gradle.service.project.open.linkAndRefreshGradleProject
 import org.jetbrains.plugins.gradle.util.GradleConstants
 import org.jetbrains.plugins.groovy.GroovyLanguage
@@ -211,9 +212,11 @@ class BasicGradleFinalizerStep(
         rootDirectory.virtualFileOrError.refresh(false, true)
 
         invokeLater {
-            @Suppress("UnstableApiUsage")
-            linkAndRefreshGradleProject(rootDirectory.toAbsolutePath().toString(), project)
-            showProgress(project)
+            val path = rootDirectory.toAbsolutePath().toString()
+            if (canLinkAndRefreshGradleProject(path, project, false)) {
+                linkAndRefreshGradleProject(path, project)
+                showProgress(project)
+            }
         }
 
         // Set up the run config

src/main/kotlin/errorreporter/AnonymousFeedback.kt

@@ -16,8 +16,6 @@ import com.demonwav.mcdev.util.fromJson
 import com.google.gson.Gson
 import com.intellij.ide.plugins.PluginManagerCore
 import com.intellij.openapi.diagnostic.Attachment
-import com.intellij.util.io.readCharSequence
-import java.io.InputStreamReader
 import java.net.HttpURLConnection
 import java.nio.ByteBuffer
 import java.nio.charset.CodingErrorAction
@@ -29,7 +27,8 @@ object AnonymousFeedback {
 
     data class FeedbackData(val url: String, val token: Int, val isDuplicate: Boolean)
 
-    const val url = "https://www.denwav.dev/errorReport"
+    private const val authedUrl = "https://www.denwav.dev/errorReport"
+    private const val baseUrl = "https://api.github.com/repos/minecraft-dev/MinecraftDev/issues"
 
     fun sendFeedback(
         factory: HttpConnectionFactory,
@@ -39,8 +38,8 @@ object AnonymousFeedback {
         val duplicateId = findDuplicateIssue(envDetails, factory)
         if (duplicateId != null) {
             // This is a duplicate
-            val commentUrl =
-                sendCommentOnDuplicateIssue(duplicateId, factory, convertToGitHubIssueFormat(envDetails, attachments))
+            val issueContent = convertToGitHubIssueFormat(envDetails, attachments)
+            val commentUrl = sendCommentOnDuplicateIssue(duplicateId, factory, issueContent)
             return FeedbackData(commentUrl, duplicateId, true)
         }
 
@@ -67,21 +66,31 @@ object AnonymousFeedback {
         }
 
         var stackTrace = body.remove("error.stacktrace")
-        if (stackTrace.isNullOrEmpty()) {
-            stackTrace = "no stacktrace"
+        stackTrace = if (stackTrace.isNullOrEmpty()) {
+            "no stacktrace"
+        } else {
+            linkStacktrace(stackTrace)
         }
 
         val sb = StringBuilder()
 
-        if (!errorDescription.isEmpty()) {
+        if (errorDescription.isNotEmpty()) {
             sb.append(errorDescription).append("\n\n")
         }
 
-        for ((key, value) in body) {
-            sb.append(key).append(": ").append(value).append("\n")
+        sb.append("<table><tr><td><table>\n")
+        for ((i, entry) in body.entries.withIndex()) {
+            if (i == 6) {
+                sb.append("</table></td><td><table>\n")
+            }
+            val (key, value) = entry
+            sb.append("<tr><td><b>").append(key).append("</b></td><td><code>").append(value).append(
+                "</code></td></tr>\n"
+            )
         }
+        sb.append("</table></td></tr></table>\n")
 
-        sb.append("\n```\n").append(stackTrace).append("\n```\n")
+        sb.append("\n<pre>\n").append(stackTrace).append("\n</pre>\n")
         sb.append("\n```\n").append(errorMessage).append("\n```\n")
 
         if (attachments.isNotEmpty()) {
@@ -118,7 +127,7 @@ object AnonymousFeedback {
     }
 
     private fun sendFeedback(factory: HttpConnectionFactory, payload: ByteArray): Pair<String, Int> {
-        val connection = getConnection(factory, url)
+        val connection = getConnection(factory, authedUrl)
         connection.connect()
         val json = executeCall(connection, payload)
         return json["html_url"] as String to (json["number"] as Double).toInt()
@@ -131,17 +140,15 @@ object AnonymousFeedback {
         return connection
     }
 
-    private val numberRegex = Regex("\\d+")
-    private val newLineRegex = Regex("[\r\n]+")
-
-    private const val openIssueUrl = "https://api.github.com/repos/minecraft-dev/MinecraftDev/issues" +
-        "?state=open&creator=minecraft-dev-autoreporter&per_page=100"
-    private const val closedIssueUrl = "https://api.github.com/repos/minecraft-dev/MinecraftDev/issues" +
-        "?state=closed&creator=minecraft-dev-autoreporter&per_page=100"
+    private const val openIssueUrl = "$baseUrl?state=open&creator=minecraft-dev-autoreporter&per_page=100"
+    private const val closedIssueUrl = "$baseUrl?state=closed&creator=minecraft-dev-autoreporter&per_page=100"
 
     private const val packagePrefix = "\tat com.demonwav.mcdev"
 
     private fun findDuplicateIssue(envDetails: LinkedHashMap<String, String?>, factory: HttpConnectionFactory): Int? {
+        val numberRegex = Regex("\\d+")
+        val newLineRegex = Regex("[\r\n]+")
+
         val stack = envDetails["error.stacktrace"]?.replace(numberRegex, "") ?: return null
 
         val stackMcdevParts = stack.lineSequence()
@@ -177,55 +184,50 @@ object AnonymousFeedback {
     }
 
     private fun getAllIssues(url: String, factory: HttpConnectionFactory): List<Map<*, *>>? {
-        var connection = connect(factory, url)
-        connection.requestMethod = "GET"
-        connection.setRequestProperty("User-Agent", userAgent)
-
-        connection.connect()
-        if (connection.responseCode != 200) {
-            connection.disconnect()
-            return null
-        }
+        var useAuthed = false
 
+        var next: String? = url
         val list = mutableListOf<Map<*, *>>()
-        var data = connection.inputStream.reader().use(InputStreamReader::readCharSequence).toString()
 
-        var response = Gson().fromJson<List<Map<*, *>>>(data)
-        list.addAll(response)
+        while (next != null) {
+            val connection: HttpURLConnection = connect(factory, next)
+            try {
+                connection.requestMethod = "GET"
+                connection.setRequestProperty("User-Agent", userAgent)
 
-        var link = connection.getHeaderField("Link")
-        connection.disconnect()
+                connection.connect()
 
-        var next = getNextLink(link)
-        while (next != null) {
-            connection = connect(factory, next)
-            connection.requestMethod = "GET"
-            connection.setRequestProperty("User-Agent", userAgent)
+                if (connection.responseCode == 403 && !useAuthed) {
+                    useAuthed = true
+                    next = replaceWithAuth(next)
+                    continue
+                }
 
-            connection.connect()
-            if (connection.responseCode != 200) {
-                connection.disconnect()
-                continue
-            }
+                if (connection.responseCode != 200) {
+                    return null
+                }
+
+                val charset = connection.getHeaderField(HttpHeaders.CONTENT_TYPE)?.let {
+                    ContentType.parse(it).charset
+                } ?: Charsets.UTF_8
 
-            val charset = connection.getHeaderField(HttpHeaders.CONTENT_TYPE)?.let {
-                ContentType.parse(it).charset
-            } ?: Charsets.UTF_8
+                val data = connection.inputStream.reader(charset).readText()
 
-            data = connection.inputStream.reader(charset).readText()
+                val response = Gson().fromJson<List<Map<*, *>>>(data)
+                list.addAll(response)
 
-            response = Gson().fromJson(data)
-            list.addAll(response)
+                val link = connection.getHeaderField("Link")
 
-            link = connection.getHeaderField("Link")
-            connection.disconnect()
-            next = getNextLink(link)
+                next = getNextLink(link, useAuthed)
+            } finally {
+                connection.disconnect()
+            }
         }
 
         return list
     }
 
-    private fun getNextLink(linkHeader: String?): String? {
+    private fun getNextLink(linkHeader: String?, useAuthed: Boolean): String? {
         if (linkHeader == null) {
             return null
         }
@@ -239,14 +241,31 @@ object AnonymousFeedback {
             if (parts.isEmpty()) {
                 continue
             }
-            return parts[0].trim().removePrefix("<").removeSuffix(">")
+            val nextUrl = parts[0].trim().removePrefix("<").removeSuffix(">")
+            if (!useAuthed) {
+                return nextUrl
+            }
+
+            return replaceWithAuth(nextUrl)
         }
 
         return null
     }
 
+    private fun replaceWithAuth(url: String): String? {
+        // non-authed-API requests are rate limited at 60 / hour / IP
+        // authed requests have a rate limit of 5000 / hour / account
+        // We don't want to use the authed URL by default since all users would use the same rate limit
+        // but it's a good fallback when the non-authed API stops working.
+        val index = url.indexOf('?')
+        if (index == -1) {
+            return null
+        }
+        return authedUrl + url.substring(index)
+    }
+
     private fun sendCommentOnDuplicateIssue(id: Int, factory: HttpConnectionFactory, payload: ByteArray): String {
-        val commentUrl = "$url/$id/comments"
+        val commentUrl = "$authedUrl/$id/comments"
         val connection = getConnection(factory, commentUrl)
         val json = executeCall(connection, payload)
         return json["html_url"] as String
@@ -281,6 +300,74 @@ object AnonymousFeedback {
         return connection
     }
 
+    private fun linkStacktrace(stacktrace: String): String {
+        val versionRegex = Regex("""(?<intellijVersion>\d{4}\.\d)-(?<pluginVersion>\d+\.\d+\.\d+)""")
+
+        val version = PluginUtil.pluginVersion
+        val match = versionRegex.matchEntire(version) ?: return stacktrace
+
+        val intellijVersion = match.groups["intellijVersion"]?.value ?: return stacktrace
+        val pluginVersion = match.groups["pluginVersion"]?.value ?: return stacktrace
+
+        val tag = "$pluginVersion-$intellijVersion"
+
+        //         v                             stack element text                                  v
+        //      at com.demonwav.mcdev.facet.MinecraftFacet.shouldShowPluginIcon(MinecraftFacet.kt:185)
+        // prefix ^        class path ^   ^                           file name ^               ^  ^ line number
+        val stackElementRegex = Regex(
+            """(?<prefix>\s+at\s+)""" +
+                """(?<stackElementText>""" +
+                """(?<className>com\.demonwav\.mcdev(?:\.\p{javaJavaIdentifierStart}\p{javaJavaIdentifierPart}*)+)""" +
+                """(?:\.\p{javaJavaIdentifierStart}\p{javaJavaIdentifierPart}*|<(?:cl)?init>)""" +
+                """\((?<fileName>.*\.\w+):(?<lineNumber>\d+)\)""" +
+                """)\s*"""
+        )
+
+        val baseTagUrl = "https://github.com/minecraft-dev/MinecraftDev/blob/$tag/src/main/kotlin/"
+
+        val sb = StringBuilder(stacktrace.length * 2)
+
+        for (line in stacktrace.lineSequence()) {
+            val lineMatch = stackElementRegex.matchEntire(line)
+            if (lineMatch == null) {
+                sb.append(line).append('\n')
+                continue
+            }
+
+            val prefix = lineMatch.groups["prefix"]?.value
+            val className = lineMatch.groups["className"]?.value
+            val fileName = lineMatch.groups["fileName"]?.value
+            val lineNumber = lineMatch.groups["lineNumber"]?.value
+            val stackElementText = lineMatch.groups["stackElementText"]?.value
+
+            if (prefix == null || className == null || fileName == null ||
+                lineNumber == null || stackElementText == null
+            ) {
+                sb.append(line).append('\n')
+                continue
+            }
+
+            val path = className.substringAfter("com.demonwav.mcdev.")
+                .substringBeforeLast('.')
+                .replace('.', '/')
+            sb.apply {
+                append(prefix)
+                append("<a href=\"")
+                append(baseTagUrl)
+                append(path)
+                append('/')
+                append(fileName)
+                append("#L")
+                append(lineNumber)
+                append("\">")
+                append(stackElementText)
+                append("</a>\n")
+            }
+        }
+
+        return sb.toString()
+    }
+
     private val userAgent by lazy {
         var agent = "Minecraft Development IntelliJ IDEA plugin"
 

src/main/kotlin/facet/MinecraftFacet.kt

@@ -44,8 +44,7 @@ class MinecraftFacet(
     name: String,
     configuration: MinecraftFacetConfiguration,
     underlyingFacet: Facet<*>?
-) :
-    Facet<MinecraftFacetConfiguration>(facetType, module, name, configuration, underlyingFacet) {
+) : Facet<MinecraftFacetConfiguration>(facetType, module, name, configuration, underlyingFacet) {
 
     private val moduleMap = ConcurrentHashMap<AbstractModuleType<*>, AbstractModule>()
     private val roots: HashMultimap<SourceType, VirtualFile?> = HashMultimap.create()

src/main/kotlin/insight/generation/MinecraftClassCreateAction.kt

@@ -55,6 +55,7 @@ class MinecraftClassCreateAction :
             builder.addKind("Block", icon, MinecraftTemplates.FORGE_BLOCK_TEMPLATE)
             builder.addKind("Item", icon, MinecraftTemplates.FORGE_ITEM_TEMPLATE)
             builder.addKind("Packet", icon, MinecraftTemplates.FORGE_PACKET_TEMPLATE)
+            builder.addKind("Enchantment", icon, MinecraftTemplates.FORGE_ENCHANTMENT_TEMPLATE)
         }
         if (isFabric) {
             val icon = PlatformAssets.FABRIC_ICON

src/main/kotlin/platform/forge/creator/ForgeProjectConfig.kt

@@ -58,7 +58,11 @@ class ForgeProjectConfig : ProjectConfig(), GradleCreator {
         rootDirectory: Path,
         buildSystem: GradleBuildSystem
     ) {
-        buildSystem.gradleVersion = Fg2ProjectCreator.FG_WRAPPER_VERSION
+        buildSystem.gradleVersion = if (isFg3(mcVersion, forgeVersion)) {
+            Fg3ProjectCreator.FG4_WRAPPER_VERSION
+        } else {
+            Fg2ProjectCreator.FG_WRAPPER_VERSION
+        }
     }
 
     private fun isFg3(mcVersion: SemanticVersion, forgeVersion: SemanticVersion): Boolean {

src/main/kotlin/platform/forge/creator/ForgeProjectCreator.kt

@@ -170,6 +170,10 @@ open class Fg3ProjectCreator(
 
         return steps
     }
+
+    companion object {
+        val FG4_WRAPPER_VERSION = SemanticVersion.release(6, 8, 1)
+    }
 }
 
 class Fg3Mc112ProjectCreator(