\n")
- for ((i, entry) in body.entries.withIndex()) {
- if (i == 6) {
- sb.append("
\n")
- }
- val (key, value) = entry
- sb.append("
")
- .append(key)
- .append("
")
- .append(value)
- .append("
\n")
- }
- sb.append("
\n")
-
- sb.append("\n
").append(stackTrace).append("
\n")
-
- sb.append("\nOriginal stack trace\n\n```\n")
- .append(rawStackTrace)
- .append("\n```\n\n")
-
- sb.append("\n```\n").append(errorMessage).append("\n```\n")
-
- if (attachments.isNotEmpty()) {
- for (attachment in attachments) {
- sb.append("\n---\n\n```\n").append(attachment.name).append("\n```\n")
- sb.append("```\n")
-
- try {
- // No clue what the data format of the attachment is
- // but if we try to decode it as UTF-8 and it succeeds, chances are likely that's what it is
- val charBuf = Charsets.UTF_8.newDecoder()
- .onMalformedInput(CodingErrorAction.REPORT)
- .onUnmappableCharacter(CodingErrorAction.REPORT)
- .decode(ByteBuffer.wrap(attachment.bytes))
-
- val text = charBuf.toString()
- if (text != attachment.displayText) {
- sb.append(attachment.displayText).append("\n```\n")
- sb.append("```\n")
- }
- sb.append(text)
- } catch (e: Exception) {
- // Guess it's not text...
- sb.append(attachment.displayText).append("\n```\n")
- sb.append("```\n")
- sb.append(attachment.encodedBytes)
- }
-
- sb.append("\n```\n")
- }
- }
-
- return sb.toString()
- }
-
- private fun sendFeedback(factory: HttpConnectionFactory, payload: ByteArray): Pair {
- val connection = getConnection(factory, AUTHED_URL)
- connection.connect()
- val json = executeCall(connection, payload)
- return json["html_url"] as String to (json["number"] as Double).toInt()
- }
-
- private fun connect(factory: HttpConnectionFactory, url: String): HttpURLConnection {
- val connection = factory.openHttpConnection(url)
- connection.connectTimeout = 5000
- connection.readTimeout = 5000
- return connection
- }
-
- private const val openIssueUrl = "$BASE_URL?state=open&creator=minecraft-dev-autoreporter&per_page=100"
- private const val closedIssueUrl = "$BASE_URL?state=closed&creator=minecraft-dev-autoreporter&per_page=100"
-
- private const val packagePrefix = "\tat com.demonwav.mcdev"
-
- private fun findDuplicateIssue(envDetails: LinkedHashMap, factory: HttpConnectionFactory): Int? {
- val numberRegex = Regex("\\d+")
- val newLineRegex = Regex("[\r\n]+")
-
- val stack = envDetails["error.raw_stacktrace"]?.replace(numberRegex, "") ?: return null
-
- val ourMcdevParts = stack.lineSequence()
- .filter { line -> line.startsWith(packagePrefix) }
- .map { it.trim() }
- .toList()
-
- if (ourMcdevParts.isEmpty()) {
- return null
- }
-
- val predicate = fun(map: Map<*, *>): Boolean {
- val body = (map["body"] as? String ?: return false)
- .replace(numberRegex, "")
- .replace(newLineRegex, "\n")
-
- // We can't comment on locked issues
- if (map["locked"] as Boolean) {
- return false
- }
-
- val first = body.indexOf("\n```\n", startIndex = 0) + 5
- val second = body.indexOf("\n```\n", startIndex = first)
- if (first == 4 || second == -1) {
- return false
- }
-
- val stackText = body.substring(first, second)
-
- val theirMcdevParts = stackText.lineSequence()
- .filter { line -> line.startsWith(packagePrefix) }
- .map { it.trim() }
- .toList()
-
- return ourMcdevParts == theirMcdevParts
- }
-
- // Look first for an open issue, then for a closed issue if one isn't found
- val block = getAllIssues(openIssueUrl, factory)?.firstOrNull(predicate)
- ?: getAllIssues(closedIssueUrl, factory, limit = 300)?.firstOrNull(predicate)
- ?: return null
- return (block["number"] as Double).toInt()
- }
-
- private fun getMcdevStackElementLines(stack: String, numberRegex: Regex, linkRegex: Regex): List {
- return stack.lineSequence()
- .mapNotNull { line -> linkRegex.matchEntire(line)?.groups?.get("content")?.value }
- .map { line -> StringUtil.unescapeXmlEntities(line) }
- .map { line -> line.replace(numberRegex, "") }
- .toList()
- }
-
- private fun getAllIssues(url: String, factory: HttpConnectionFactory, limit: Int = -1): List>? {
- var useAuthed = false
-
- var next: String? = url
- val list = mutableListOf>()
-
- while (next != null) {
- val connection: HttpURLConnection = connect(factory, next)
- try {
- connection.requestMethod = "GET"
- connection.setRequestProperty("User-Agent", userAgent)
-
- connection.connect()
-
- if (connection.responseCode == HttpStatus.SC_FORBIDDEN && !useAuthed) {
- useAuthed = true
- next = replaceWithAuth(next)
- continue
- }
-
- if (connection.responseCode != HttpStatus.SC_OK) {
- return null
- }
-
- val charset = connection.getHeaderField(HttpHeaders.CONTENT_TYPE)?.let {
- ContentType.parse(it).charset
- } ?: Charsets.UTF_8
-
- val data = connection.inputStream.reader(charset).readText()
-
- val response = Gson().fromJson>>(data)
- list.addAll(response)
-
- if (limit > 0 && list.size >= limit) {
- return list
- }
-
- val link = connection.getHeaderField("Link")
-
- next = getNextLink(link, useAuthed)
- } finally {
- connection.disconnect()
- }
- }
-
- return list
- }
-
- private fun getNextLink(linkHeader: String?, useAuthed: Boolean): String? {
- if (linkHeader == null) {
- return null
- }
- val links = linkHeader.split(",")
- for (link in links) {
- if (!link.contains("rel=\"next\"")) {
- continue
- }
-
- val parts = link.split(";")
- if (parts.isEmpty()) {
- continue
- }
- 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 AUTHED_URL + url.substring(index)
- }
-
- private fun sendCommentOnDuplicateIssue(id: Int, factory: HttpConnectionFactory, payload: ByteArray): String {
- val commentUrl = "$AUTHED_URL/$id/comments"
- val connection = getConnection(factory, commentUrl)
- val json = executeCall(connection, payload)
- return json["html_url"] as String
- }
-
- private fun executeCall(connection: HttpURLConnection, payload: ByteArray): Map<*, *> {
- connection.outputStream.use {
- it.write(payload)
- }
-
- val responseCode = connection.responseCode
- if (responseCode != HttpStatus.SC_CREATED) {
- throw RuntimeException(MCDevBundle("error_reporter.submit.failure", responseCode))
- }
-
- val contentEncoding = connection.contentEncoding ?: "UTF-8"
- val body = connection.inputStream.use {
- IOUtils.toString(it, contentEncoding)
- }
- connection.disconnect()
-
- return Gson().fromJson(body)
- }
-
- private fun getConnection(factory: HttpConnectionFactory, url: String): HttpURLConnection {
- val connection = connect(factory, url)
- connection.doOutput = true
- connection.requestMethod = "POST"
- connection.setRequestProperty("User-Agent", userAgent)
- connection.setRequestProperty("Content-Type", "application/json")
-
- return connection
- }
-
- private val userAgent by lazy {
- var agent = "Minecraft Development IntelliJ IDEA plugin"
-
- val pluginDescription = PluginManagerCore.getPlugin(PluginUtil.PLUGIN_ID)
- if (pluginDescription != null) {
- val name = pluginDescription.name
- val version = pluginDescription.version
- agent = "$name ($version)"
- }
- agent
- }
-}
diff --git a/src/main/kotlin/errorreporter/AnonymousFeedbackTask.kt b/src/main/kotlin/errorreporter/AnonymousFeedbackTask.kt
deleted file mode 100644
index 2c4a3415a..000000000
--- a/src/main/kotlin/errorreporter/AnonymousFeedbackTask.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Minecraft Development for IntelliJ
- *
- * https://mcdev.io/
- *
- * Copyright (C) 2025 minecraft-dev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation, version 3.0 only.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see .
- */
-
-package com.demonwav.mcdev.errorreporter
-
-import com.demonwav.mcdev.util.ProxyHttpConnectionFactory
-import com.intellij.openapi.diagnostic.Attachment
-import com.intellij.openapi.progress.ProgressIndicator
-import com.intellij.openapi.progress.Task
-import com.intellij.openapi.project.Project
-
-class AnonymousFeedbackTask(
- project: Project?,
- title: String,
- canBeCancelled: Boolean,
- private val params: LinkedHashMap,
- private val attachments: List,
- private val callback: (String, Int, Boolean) -> Unit,
- private val errorCallback: (Exception) -> Unit,
-) : Task.Backgroundable(project, title, canBeCancelled) {
-
- override fun run(indicator: ProgressIndicator) {
- indicator.isIndeterminate = true
-
- try {
- val factory = ProxyHttpConnectionFactory
- val (url, token, isDuplicate) = AnonymousFeedback.sendFeedback(factory, params, attachments)
-
- callback(url, token, isDuplicate)
- } catch (e: Exception) {
- errorCallback(e)
- }
- }
-}
diff --git a/src/main/kotlin/errorreporter/ErrorData.kt b/src/main/kotlin/errorreporter/ErrorData.kt
deleted file mode 100644
index a42e6be6c..000000000
--- a/src/main/kotlin/errorreporter/ErrorData.kt
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Minecraft Development for IntelliJ
- *
- * https://mcdev.io/
- *
- * Copyright (C) 2025 minecraft-dev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation, version 3.0 only.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see .
- */
-
-package com.demonwav.mcdev.errorreporter
-
-import com.intellij.openapi.application.ApplicationNamesInfo
-import com.intellij.openapi.application.ex.ApplicationInfoEx
-import com.intellij.openapi.diagnostic.Attachment
-import com.intellij.openapi.util.SystemInfo
-import com.intellij.openapi.util.text.StringUtil
-
-// It's easier to just re-use the code that we already were using, rather than changing to a map like
-// Jetbrains said to do in the deprecation message
-class ErrorData(var throwable: Throwable?, private val lastAction: String?) {
-
- var message: String? = null
- get() = field ?: throwable?.message
-
- var description: String? = null
- var pluginName: String? = null
- var pluginVersion: String? = null
- var attachments = emptyList()
-
- private val versionRegex by lazy(LazyThreadSafetyMode.NONE) {
- Regex("""(?\d{4}\.\d)-(?\d+\.\d+\.\d+)""")
- }
-
- fun formatErrorData(): Pair, List> {
- val appInfo = ApplicationInfoEx.getInstanceEx()
- val namesInfo = ApplicationNamesInfo.getInstance()
-
- val params = LinkedHashMap(21)
-
- params["error.description"] = description
-
- params["Plugin Name"] = pluginName
- params["Plugin Version"] = pluginVersion
-
- params["OS Name"] = SystemInfo.OS_NAME
- params["Java Version"] = SystemInfo.JAVA_VERSION
- params["Java VM Vendor"] = SystemInfo.JAVA_VENDOR
-
- params["App Name"] = namesInfo.productName
- params["App Full Name"] = namesInfo.fullProductName
- params["App Version Name"] = appInfo.versionName
- params["Is EAP"] = appInfo.isEAP.toString()
- params["App Build"] = appInfo.build.asString()
- params["App Version"] = appInfo.fullVersion
-
- if (lastAction.isNullOrBlank()) {
- params["Last Action"] = "None"
- } else {
- params["Last Action"] = lastAction
- }
-
- params["error.message"] = message
- params["error.raw_stacktrace"] = throwable?.stackTraceToString()
- params["error.stacktrace"] = formatStackTrace()
-
- return params to attachments
- }
-
- private fun formatStackTrace(): String? {
- val t = throwable ?: return null
- val stackText = escape(t.stackTraceToString())
-
- val version = pluginVersion ?: return stackText
- val match = versionRegex.matchEntire(version) ?: return stackText
-
- val intellijVersion = match.groups["intellijVersion"]?.value ?: return stackText
- val pluginVersion = match.groups["pluginVersion"]?.value ?: return stackText
-
- val tag = "$pluginVersion-$intellijVersion"
- val baseTagUrl = "https://github.com/minecraft-dev/MinecraftDev/blob/$tag/src/main/kotlin/"
-
- val links = mutableListOf()
-
- val mcdevPackage = "com.demonwav.mcdev"
-
- for (element in t.stackTrace) {
- if (!element.className.startsWith(mcdevPackage)) {
- continue
- }
-
- val path = element.className.substring(mcdevPackage.length + 1).substringBeforeLast('.').replace('.', '/')
- val file = element.fileName
- val line = element.lineNumber
-
- val escapedElement = escape(element)
- val linkText = "$escapedElement"
- links += LinkedStackTraceElement(escapedElement, linkText)
- }
-
- if (links.isEmpty()) {
- return stackText
- }
-
- var currentStackText = stackText
- for (link in links) {
- currentStackText = link.apply(currentStackText)
- }
-
- return currentStackText
- }
-
- private fun escape(text: Any) = StringUtil.escapeXmlEntities(text.toString())
-}
diff --git a/src/main/kotlin/errorreporter/ErrorReporter.kt b/src/main/kotlin/errorreporter/ErrorReporter.kt
index 031e49ee6..62421d7dd 100644
--- a/src/main/kotlin/errorreporter/ErrorReporter.kt
+++ b/src/main/kotlin/errorreporter/ErrorReporter.kt
@@ -26,10 +26,11 @@ import com.intellij.diagnostic.LogMessage
import com.intellij.ide.DataManager
import com.intellij.ide.plugins.PluginManagerCore
import com.intellij.idea.IdeaLogger
-import com.intellij.notification.BrowseNotificationAction
import com.intellij.notification.NotificationGroupManager
import com.intellij.notification.NotificationType
import com.intellij.openapi.actionSystem.CommonDataKeys
+import com.intellij.openapi.application.ApplicationNamesInfo
+import com.intellij.openapi.application.ex.ApplicationInfoEx
import com.intellij.openapi.diagnostic.ErrorReportSubmitter
import com.intellij.openapi.diagnostic.IdeaLoggingEvent
import com.intellij.openapi.diagnostic.SubmittedReportInfo
@@ -37,7 +38,15 @@ import com.intellij.openapi.progress.EmptyProgressIndicator
import com.intellij.openapi.progress.ProgressIndicator
import com.intellij.openapi.progress.ProgressManager
import com.intellij.openapi.progress.Task
+import com.intellij.openapi.util.SystemInfo
import com.intellij.util.Consumer
+import io.sentry.Attachment
+import io.sentry.Hint
+import io.sentry.SentryClient
+import io.sentry.SentryEvent
+import io.sentry.SentryLevel
+import io.sentry.SentryOptions
+import io.sentry.protocol.Message
import java.awt.Component
class ErrorReporter : ErrorReportSubmitter() {
@@ -74,71 +83,76 @@ class ErrorReporter : ErrorReportSubmitter() {
return true
}
- val errorData = ErrorData(event.throwable, IdeaLogger.ourLastActionId)
+ val sentryEvent = SentryEvent()
+ sentryEvent.serverName = ""
+ sentryEvent.level = SentryLevel.ERROR
+ additionalInfo?.let { sentryEvent.setExtra("additional_info", it) }
- errorData.description = additionalInfo
- errorData.message = event.message
+ event.message?.let { msg -> sentryEvent.message = Message().apply { message = msg} }
+
+ val data = event.data
+ if (data is LogMessage) {
+ sentryEvent.throwable = data.throwable
+ }
PluginManagerCore.getPlugin(PluginUtil.PLUGIN_ID)?.let { plugin ->
- errorData.pluginName = plugin.name
- errorData.pluginVersion = plugin.version
+ val (ideaVersion, coreVersion) = plugin.version.split('-', limit = 2)
+ sentryEvent.release = plugin.version
+ sentryEvent.setTag("idea_version", ideaVersion)
+ sentryEvent.setTag("core_version", coreVersion)
}
- val data = event.data
+ val appInfo = ApplicationInfoEx.getInstanceEx()
+ val namesInfo = ApplicationNamesInfo.getInstance()
- if (data is LogMessage) {
- errorData.throwable = data.throwable
- errorData.attachments = data.includedAttachments
- }
+ sentryEvent.platform = "java"
- val (reportValues, attachments) = errorData.formatErrorData()
-
- val task = AnonymousFeedbackTask(
- project,
- "Submitting error report",
- true,
- reportValues,
- attachments,
- { htmlUrl, token, isDuplicate ->
- val type = if (isDuplicate) {
- SubmittedReportInfo.SubmissionStatus.DUPLICATE
- } else {
- SubmittedReportInfo.SubmissionStatus.NEW_ISSUE
- }
+ // Environment
+ sentryEvent.setExtra("os", SystemInfo.OS_NAME)
+ sentryEvent.setExtra("java_version", SystemInfo.JAVA_VERSION)
+ sentryEvent.setExtra("java_vendor", SystemInfo.JAVA_VENDOR)
+
+ // IDE
+ sentryEvent.setExtra("ide", namesInfo.productName)
+ sentryEvent.setExtra("ide_version", namesInfo.productName)
+ sentryEvent.setExtra("ide_is_eap", appInfo.isEAP.toString())
+ sentryEvent.setExtra("ide_build", appInfo.build.asString())
+ sentryEvent.setExtra("ide_version", appInfo.fullVersion)
- val message = if (!isDuplicate) {
- "${MCDevBundle("error_reporter.report.created", token)}"
+ sentryEvent.setExtra("last_action", IdeaLogger.ourLastActionId)
+
+ val task = object : Task.Backgroundable(project, "Submitting error report", true) {
+ override fun run(indicator: ProgressIndicator) {
+ val opts = SentryOptions().apply { dsn = "https://e4e537f6f896904a3ec0586bce8c9a57@sentry.mcdev.io/1" }
+ // Marked internal, but I have no idea what the intended way to do this, everything I can find online
+ // only ever shows the global static API
+ val client = SentryClient(opts)
+
+ val hint = if (data is LogMessage && data.allAttachments.isNotEmpty()) {
+ Hint.withAttachments(data.allAttachments.map { Attachment(it.bytes, it.name) })
} else {
- "${MCDevBundle("error_reporter.report.commented", token)}"
+ null
}
- val actionText = if (!isDuplicate) {
- MCDevBundle("error_reporter.report.created.action")
- } else {
- MCDevBundle("error_reporter.report.commented.action")
+
+ val id = try {
+ client.captureEvent(sentryEvent, hint)
+ } finally {
+ client.close()
}
+ // It would be nice to get the sentry issue associated with this event, but I don't see a direct way to
+ // do that right now
+ val message = "${MCDevBundle("error_reporter.report.created", id.toString())}"
NotificationGroupManager.getInstance().getNotificationGroup("Error Report").createNotification(
MCDevBundle("error_reporter.report.title"),
message,
NotificationType.INFORMATION,
- ).addAction(BrowseNotificationAction(actionText, htmlUrl)).setImportant(false).notify(project)
+ ).setImportant(false).notify(project)
- val reportInfo = SubmittedReportInfo(htmlUrl, "Issue #$token", type)
+ val reportInfo = SubmittedReportInfo(null, "Event $id", SubmittedReportInfo.SubmissionStatus.NEW_ISSUE)
consumer.consume(reportInfo)
- },
- { e ->
- val message = "${MCDevBundle("error_reporter.report.error", e.message)}"
- val actionText = MCDevBundle("error_reporter.report.error.action")
- val userUrl = "https://github.com/minecraft-dev/MinecraftDev/issues"
- NotificationGroupManager.getInstance().getNotificationGroup("Error Report").createNotification(
- MCDevBundle("error_reporter.report.title"),
- message,
- NotificationType.ERROR,
- ).addAction(BrowseNotificationAction(actionText, userUrl)).setImportant(false).notify(project)
-
- consumer.consume(SubmittedReportInfo(null, null, SubmittedReportInfo.SubmissionStatus.FAILED))
- },
- )
+ }
+ }
if (project == null) {
task.run(EmptyProgressIndicator())
diff --git a/src/main/kotlin/errorreporter/LinkedStackTraceElement.kt b/src/main/kotlin/errorreporter/LinkedStackTraceElement.kt
deleted file mode 100644
index 088aace92..000000000
--- a/src/main/kotlin/errorreporter/LinkedStackTraceElement.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Minecraft Development for IntelliJ
- *
- * https://mcdev.io/
- *
- * Copyright (C) 2025 minecraft-dev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation, version 3.0 only.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see .
- */
-
-package com.demonwav.mcdev.errorreporter
-
-data class LinkedStackTraceElement(val stackElementText: String, val httpLinkText: String) {
- fun apply(text: String): String {
- return text.replace(stackElementText, httpLinkText)
- }
-}
diff --git a/src/main/kotlin/errorreporter/package-info.kt b/src/main/kotlin/errorreporter/package-info.kt
deleted file mode 100644
index 011162375..000000000
--- a/src/main/kotlin/errorreporter/package-info.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Minecraft Development for IntelliJ
- *
- * https://mcdev.io/
- *
- * Copyright (C) 2025 minecraft-dev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation, version 3.0 only.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see .
- */
-
-/**
- * This package was taken from https://github.com/go-lang-plugin-org/go-lang-idea-plugin/pull/909
- */
-package com.demonwav.mcdev.errorreporter
diff --git a/src/main/resources/messages/MinecraftDevelopment.properties b/src/main/resources/messages/MinecraftDevelopment.properties
index bf9f6e65c..6425bc59e 100644
--- a/src/main/resources/messages/MinecraftDevelopment.properties
+++ b/src/main/resources/messages/MinecraftDevelopment.properties
@@ -149,12 +149,11 @@ creator.validation.invalid_option=Selection is not a valid option
creator.validation.jdk_preferred=Java {0} is recommended for {1}
creator.validation.jdk_preferred_default_reason=these settings
-error_reporter.submit.action=Report to Minecraft Dev GitHub Issue Tracker
-error_reporter.submit.failure=Expected HTTP_CREATED (201), obtained {0} instead.
+error_reporter.submit.action=Report to Minecraft Dev
error_reporter.submit.ignored=Ignored error
error_reporter.report.title=Error report
-error_reporter.report.created=Created Issue #{0} successfully.
+error_reporter.report.created=Submitted event {0}.
error_reporter.report.created.action=View issue
error_reporter.report.commented=Commented on existing Issue #{0} successfully.
error_reporter.report.commented.action=View comment
diff --git a/src/main/resources/messages/MinecraftDevelopment_zh.properties b/src/main/resources/messages/MinecraftDevelopment_zh.properties
index f7f845c37..70d6259e5 100644
--- a/src/main/resources/messages/MinecraftDevelopment_zh.properties
+++ b/src/main/resources/messages/MinecraftDevelopment_zh.properties
@@ -78,12 +78,12 @@ creator.validation.semantic_version=版本必须是有效的语义版本
creator.validation.jdk_preferred=Java {0} 推荐用于 {1}
creator.validation.jdk_preferred_default_reason=这些设置
-error_reporter.submit.action=向 Minecraft Dev 的 GitHub Issue Tracker报告
-error_reporter.submit.failure=预期为 HTTP_CREATED (201)，结果为 {0}。
+error_reporter.submit.action=向 Minecraft Dev 的 报告
error_reporter.submit.ignored=忽略错误
error_reporter.report.title=错误报告
-error_reporter.report.created=成功创建 Issue #{0}。
+
+error_reporter.report.created=成功创建事件 {0}。
error_reporter.report.created.action=查看 issue
error_reporter.report.commented=已成功 comment 现有 Issue #{0}。
error_reporter.report.commented.action=查看 comment