Touchup Canary Platform

- Don't refer to hooks as 'event's in parameter names
- Add icon to Neptune.inf files (optional plugin descriptor in NeptuneMod)
- Reinstate the MCP text format colouring (although for both canary + neptune this time)

Author: jamierocks

src/main/kotlin/com/demonwav/mcdev/platform/canary/CanaryFileIconProvider.kt

@@ -31,7 +31,7 @@ class CanaryFileIconProvider : FileIconProvider {
         val module = ModuleUtilCore.findModuleForFile(file, project) ?: return null
         val canaryModule = MinecraftFacet.getInstance(module, CanaryModuleType, NeptuneModuleType) ?: return null
 
-        if (file == canaryModule.getCanaryInf()) {
+        if (file == canaryModule.getCanaryInf() || file == canaryModule.getNeptuneInf()) {
             return canaryModule.icon
         }
         return null

src/main/kotlin/com/demonwav/mcdev/platform/canary/CanaryModule.kt

@@ -32,13 +32,15 @@ class CanaryModule<out T : AbstractModuleType<*>>(facet: MinecraftFacet, overrid
 
     override val type: PlatformType = moduleType.platformType
     private var canaryInf: VirtualFile? = null
+    private var neptuneInf: VirtualFile? = null
 
     init {
         setup()
     }
 
     private fun setup() {
         canaryInf = facet.findFile(CanaryConstants.CANARY_INF, SourceType.RESOURCE)
+        neptuneInf = facet.findFile(CanaryConstants.NEPTUNE_INF, SourceType.RESOURCE)
     }
 
     fun getCanaryInf(): VirtualFile? {
@@ -50,6 +52,15 @@ class CanaryModule<out T : AbstractModuleType<*>>(facet: MinecraftFacet, overrid
         return canaryInf
     }
 
+    fun getNeptuneInf(): VirtualFile? {
+        if (neptuneInf == null) {
+            // try and find the file again if it's not already present
+            // when this object was first created it may not have been ready
+            setup()
+        }
+        return neptuneInf
+    }
+
     override fun isEventClassValid(eventClass: PsiClass, method: PsiMethod?) =
         CanaryConstants.HOOK_CLASS == eventClass.qualifiedName
 
@@ -89,6 +100,7 @@ class CanaryModule<out T : AbstractModuleType<*>>(facet: MinecraftFacet, overrid
         super.dispose()
 
         canaryInf = null
+        neptuneInf = null
     }
 
     companion object {
@@ -102,7 +114,7 @@ class CanaryModule<out T : AbstractModuleType<*>>(facet: MinecraftFacet, overrid
             val list = newMethod.parameterList
             val parameter = JavaPsiFacade.getElementFactory(project)
                 .createParameter(
-                    "event",
+                    "hook",
                     PsiClassType.getTypeByName(chosenClass.qualifiedName, project, GlobalSearchScope.allScope(project))
                 )
             list.add(parameter)

src/main/kotlin/com/demonwav/mcdev/platform/canary/CanaryModuleType.kt

@@ -34,6 +34,7 @@ object CanaryModuleType : AbstractModuleType<CanaryModule<CanaryModuleType>>("ne
 
     init {
         CommonColors.applyStandardColors(colorMap, CanaryConstants.CHAT_FORMAT_CLASS)
+        CommonColors.applyStandardColors(colorMap, CanaryConstants.MCP_CHAT_FORMATTING)
         CanaryLegacyColors.applyLegacyColors(colorMap, CanaryConstants.LEGACY_COLORS_CLASS)
         CanaryLegacyColors.applyLegacyColors(colorMap, CanaryConstants.LEGACY_TEXT_FORMAT_CLASS)
     }

src/main/kotlin/com/demonwav/mcdev/platform/canary/NeptuneModuleType.kt

@@ -26,6 +26,7 @@ object NeptuneModuleType : AbstractModuleType<CanaryModule<NeptuneModuleType>>("
 
     init {
         CommonColors.applyStandardColors(colorMap, CanaryConstants.CHAT_FORMAT_CLASS)
+        CommonColors.applyStandardColors(colorMap, CanaryConstants.MCP_CHAT_FORMATTING)
         CanaryLegacyColors.applyLegacyColors(colorMap, CanaryConstants.LEGACY_COLORS_CLASS)
         CanaryLegacyColors.applyLegacyColors(colorMap, CanaryConstants.LEGACY_TEXT_FORMAT_CLASS)
     }

src/main/kotlin/com/demonwav/mcdev/platform/canary/util/CanaryConstants.kt

@@ -13,6 +13,7 @@ package com.demonwav.mcdev.platform.canary.util
 object CanaryConstants {
 
     const val CANARY_INF = "Canary.inf"
+    const val NEPTUNE_INF = "Neptune.inf"
 
     /* Hooks */
     const val HOOK_HANDLER_ANNOTATION = "net.canarymod.hook.HookHandler"