I was bored without internet on the road for 6 hours

Author: DenWav

src/main/kotlin/com/demonwav/mcdev/creator/PlatformVersion.kt

@@ -11,6 +11,7 @@
 package com.demonwav.mcdev.creator
 
 import com.demonwav.mcdev.platform.PlatformType
+import com.demonwav.mcdev.util.fromJson
 import com.google.gson.Gson
 import org.jetbrains.concurrency.runAsync
 import java.net.URL
@@ -44,7 +45,7 @@ fun getVersionSelector(type: PlatformType) = runAsync {
         "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.4; en-US; rv:1.9.2.2) Gecko/20100316 Firefox/3.6.2"
     )
     val text = connection.getInputStream().use { it.reader().use { it.readText() } }
-    Gson().fromJson(text, PlatformVersion::class.java)
+    Gson().fromJson<PlatformVersion>(text)
 }
 
 data class PlatformVersion(var versions: Array<String>, var selectedIndex: Int) {

src/main/kotlin/com/demonwav/mcdev/error/AnonymousFeedback.kt

@@ -11,6 +11,7 @@
 package com.demonwav.mcdev.error
 
 import com.demonwav.mcdev.update.PluginUtil
+import com.demonwav.mcdev.util.fromJson
 import com.google.gson.Gson
 import com.intellij.ide.plugins.PluginManager
 import org.apache.commons.io.IOUtils
@@ -92,7 +93,7 @@ object AnonymousFeedback {
             IOUtils.toString(it, contentEncoding)
         }
 
-        val json = Gson().fromJson(body, HashMap::class.java)
+        val json = Gson().fromJson<Map<*, *>>(body)
         val issueNum = json["number"].toString().toDouble().toInt()
         return issueNum
     }

src/main/kotlin/com/demonwav/mcdev/insight/ColorAnnotator.kt

@@ -15,6 +15,7 @@ import com.intellij.lang.annotation.AnnotationHolder
 import com.intellij.lang.annotation.Annotator
 import com.intellij.lang.annotation.HighlightSeverity
 import com.intellij.openapi.editor.colors.TextAttributesKey
+import com.intellij.openapi.editor.colors.TextAttributesScheme
 import com.intellij.openapi.editor.markup.TextAttributes
 import com.intellij.psi.PsiElement
 import java.awt.Color

src/main/kotlin/com/demonwav/mcdev/inspection/IsCancelled.kt

@@ -15,38 +15,21 @@ import com.intellij.openapi.project.Project
 import com.siyeh.ig.InspectionGadgetsFix
 import org.jetbrains.annotations.Nls
 
-class IsCancelled(val buildFix: InspectionGadgetsFix, val errorString: String) {
+class IsCancelled(
+    fix: (ProblemDescriptor) -> Unit,
+    val errorString: String
+) {
+    val buildFix: InspectionGadgetsFix
 
-    class IsCancelledBuilder {
-        private var fix: InspectionGadgetsFix? = null
-        private var errorString: String? = null
+    init {
+        this.buildFix = object : InspectionGadgetsFix() {
+            override fun doFix(project: Project, descriptor: ProblemDescriptor) = fix(descriptor)
 
-        fun setFix(fix: (ProblemDescriptor) -> Unit): IsCancelledBuilder {
-            this.fix = object : InspectionGadgetsFix() {
-                override fun doFix(project: Project, descriptor: ProblemDescriptor) = fix(descriptor)
+            @Nls(capitalization = Nls.Capitalization.Sentence)
+            override fun getName() = "Simplify"
 
-                @Nls
-                override fun getName() = "Simplify"
-
-                @Nls
-                override fun getFamilyName() = "Useless Is Cancelled Check"
-            }
-            return this
-        }
-
-        fun setErrorString(errorString: String): IsCancelledBuilder {
-            this.errorString = errorString
-            return this
-        }
-
-        fun build(): IsCancelled {
-            return IsCancelled(fix!!, errorString!!)
-        }
-    }
-
-    companion object {
-        fun builder(): IsCancelledBuilder {
-            return IsCancelledBuilder()
+            @Nls(capitalization = Nls.Capitalization.Sentence)
+            override fun getFamilyName() = "Useless IsCancelled Check"
         }
     }
 }

src/main/kotlin/com/demonwav/mcdev/platform/bukkit/BukkitModule.kt

@@ -152,18 +152,18 @@ class BukkitModule<T : AbstractModuleType<*>> constructor(facet: MinecraftFacet,
             return null
         }
 
-        if (resolve !is ClsMethodImpl) {
+        if (resolve !is PsiMethod) {
             return null
         }
 
         if (resolve.name != BukkitConstants.EVENT_ISCANCELLED_METHOD_NAME) {
             return null
         }
 
-        return IsCancelled.builder()
-            .setErrorString("Cancellable.isCancelled() check is useless in a method annotated with ignoreCancelled=true.")
-            .setFix { expression.replace(JavaPsiFacade.getElementFactory(project).createExpressionFromText("false", expression)) }
-            .build()
+        return IsCancelled(
+            errorString = "Cancellable.isCancelled() check is useless in a method annotated with ignoreCancelled=true.",
+            fix = { expression.replace(JavaPsiFacade.getElementFactory(project).createExpressionFromText("false", expression)) }
+        )
     }
 
     @Contract(value = "null -> false", pure = true)

src/main/kotlin/com/demonwav/mcdev/platform/liteloader/version/LiteLoaderVersion.kt

@@ -10,6 +10,7 @@
 
 package com.demonwav.mcdev.platform.liteloader.version
 
+import com.demonwav.mcdev.util.fromJson
 import com.demonwav.mcdev.util.sortVersions
 import com.google.gson.Gson
 import java.io.IOException
@@ -27,7 +28,7 @@ class LiteLoaderVersion private constructor(private var map: Map<*, *>) {
             try {
                 val text = URL("http://dl.liteloader.com/versions/versions.json").readText()
 
-                val map = Gson().fromJson(text, Map::class.java)
+                val map = Gson().fromJson<Map<*, *>>(text)
                 val liteLoaderVersion = LiteLoaderVersion(map)
                 liteLoaderVersion.sortedMcVersions
                 return liteLoaderVersion

src/main/kotlin/com/demonwav/mcdev/platform/mcp/srg/McpUnscrambler.kt

@@ -10,10 +10,6 @@
 
 package com.demonwav.mcdev.platform.mcp.srg
 
-import com.demonwav.mcdev.facet.MinecraftFacet
-import com.demonwav.mcdev.platform.mcp.McpModuleType
-import com.demonwav.mcdev.util.mapFirstNotNull
-import com.intellij.openapi.module.ModuleManager
 import com.intellij.openapi.project.Project
 import com.intellij.unscramble.UnscrambleSupport
 import javax.swing.JComponent
@@ -25,9 +21,7 @@ class McpUnscrambler : UnscrambleSupport<JComponent> {
     override fun getPresentableName() = "Remap SRG names"
 
     override fun unscramble(project: Project, text: String, logName: String, settings: JComponent?): String? {
-        val srgMap = ModuleManager.getInstance(project).modules.mapFirstNotNull {
-            MinecraftFacet.getInstance(it, McpModuleType)?.srgManager?.srgMapNow
-        } ?: return null
+        val srgMap = SrgManager.findAnyInstance(project)?.srgMapNow ?: return null
         return srgPattern.replace(text) { srgMap.mapSrgName(it.value) ?: it.value }
     }
 }

src/main/kotlin/com/demonwav/mcdev/platform/mcp/srg/SrgManager.kt

@@ -10,6 +10,11 @@
 
 package com.demonwav.mcdev.platform.mcp.srg
 
+import com.demonwav.mcdev.facet.MinecraftFacet
+import com.demonwav.mcdev.platform.mcp.McpModuleType
+import com.demonwav.mcdev.util.mapFirstNotNull
+import com.intellij.openapi.module.ModuleManager
+import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Getter
 import org.jetbrains.concurrency.Promise
 import org.jetbrains.concurrency.createError
@@ -52,5 +57,10 @@ class SrgManager(val files: Set<String>) {
         private val map = HashMap<Set<String>, SrgManager>()
 
         fun getInstance(files: Set<String>) = map.computeIfAbsent(files, ::SrgManager)
+
+        fun findAnyInstance(project: Project) =
+            ModuleManager.getInstance(project).modules.mapFirstNotNull {
+                MinecraftFacet.getInstance(it, McpModuleType)?.srgManager
+            }
     }
 }

src/main/kotlin/com/demonwav/mcdev/platform/mcp/version/McpVersion.kt

@@ -10,6 +10,7 @@
 
 package com.demonwav.mcdev.platform.mcp.version
 
+import com.demonwav.mcdev.util.fromJson
 import com.demonwav.mcdev.util.sortVersions
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
@@ -76,8 +77,7 @@ class McpVersion private constructor(private val map: Map<String, Map<String, Li
         fun downloadData(): McpVersion? {
             try {
                 val text = URL("http://export.mcpbot.bspk.rs/versions.json").readText()
-                val tokenType = object : TypeToken<Map<String, Map<String, List<Int>>>>() {}.type
-                val map = Gson().fromJson<Map<String, Map<String, List<Int>>>>(text, tokenType)
+                val map = Gson().fromJson<Map<String, Map<String, List<Int>>>>(text)
                 val mcpVersion = McpVersion(map)
                 mcpVersion.versions
                 return mcpVersion

src/main/kotlin/com/demonwav/mcdev/platform/sponge/SpongeModule.kt

@@ -20,6 +20,7 @@ import com.demonwav.mcdev.platform.sponge.generation.SpongeGenerationData
 import com.demonwav.mcdev.platform.sponge.util.SpongeConstants
 import com.demonwav.mcdev.util.extendsOrImplements
 import com.demonwav.mcdev.util.findContainingMethod
+import com.intellij.codeInspection.ProblemDescriptor
 import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.PsiAnnotationMemberValue
 import com.intellij.psi.PsiClass
@@ -121,7 +122,6 @@ class SpongeModule(facet: MinecraftFacet) : AbstractModule(facet) {
             when (sub) {
                 "TRUE" -> isCancelled = true
                 "FALSE" -> isCancelled = false
-                "UNDEFINED" -> return null
                 else -> return null
             }
         }
@@ -155,21 +155,12 @@ class SpongeModule(facet: MinecraftFacet) : AbstractModule(facet) {
             return null
         }
 
-        val isCancelledBuilder = IsCancelled.builder()
-            .setErrorString(
-                "Cancellable.isCancelled() check is useless in a method not annotated with @IsCancelled(Tristate.UNDEFINED)"
-            )
-
-        if (isCancelled) {
-            isCancelledBuilder.setFix {
-                expression.replace(JavaPsiFacade.getElementFactory(project).createExpressionFromText("true", expression))
-            }
-        } else {
-            isCancelledBuilder.setFix {
-                expression.replace(JavaPsiFacade.getElementFactory(project).createExpressionFromText("false", expression))
+        return IsCancelled(
+            errorString = "Cancellable.isCancelled() check is useless in a method not annotated with @IsCancelled(Tristate.UNDEFINED)",
+            fix = {
+                expression.replace(JavaPsiFacade.getElementFactory(project)
+                                       .createExpressionFromText(if (isCancelled) "true" else "false", expression))
             }
-        }
-
-        return isCancelledBuilder.build()
+        )
     }
 }