Implement nullable delegate

Also, I changed my mind on the util class naming convention, I like it now

Author: DenWav

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

@@ -30,7 +30,7 @@ class BukkitFileIconProvider : FileIconProvider {
         val module = ModuleUtilCore.findModuleForFile(file, project) ?: return null
         val bukkitModule = MinecraftFacet.getInstance(module, BukkitModuleType, SpigotModuleType, PaperModuleType) ?: return null
 
-        if (file == bukkitModule.getPluginYml()) {
+        if (file == bukkitModule.pluginYml) {
             return bukkitModule.icon
         }
         return null

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

@@ -22,9 +22,8 @@ import com.demonwav.mcdev.platform.bukkit.util.BukkitConstants
 import com.demonwav.mcdev.util.addImplements
 import com.demonwav.mcdev.util.extendsOrImplements
 import com.demonwav.mcdev.util.findContainingMethod
-import com.google.common.base.Objects
+import com.demonwav.mcdev.util.nullable
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiClassType
@@ -41,7 +40,8 @@ import java.util.Arrays
 
 class BukkitModule<T : AbstractModuleType<*>> constructor(facet: MinecraftFacet, type: T) : AbstractModule(facet) {
 
-    private var pluginYml: VirtualFile? = null
+    var pluginYml by nullable { facet.findFile("plugin.yml", SourceType.RESOURCE) }
+        private set
 
     override lateinit var type: PlatformType
         private set
@@ -52,20 +52,6 @@ class BukkitModule<T : AbstractModuleType<*>> constructor(facet: MinecraftFacet,
     init {
         this.moduleType = type
         this.type = type.platformType
-        setup()
-    }
-
-    private fun setup() {
-        pluginYml = facet.findFile("plugin.yml", SourceType.RESOURCE)
-    }
-
-    fun getPluginYml(): VirtualFile? {
-        if (pluginYml == 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 pluginYml
     }
 
     override fun isEventClassValid(eventClass: PsiClass, method: PsiMethod?) =
@@ -190,23 +176,6 @@ class BukkitModule<T : AbstractModuleType<*>> constructor(facet: MinecraftFacet,
         pluginYml = null
     }
 
-    override fun equals(other: Any?): Boolean {
-        if (this === other) {
-            return true
-        }
-        if (other == null || javaClass != other.javaClass) {
-            return false
-        }
-        val that = other as BukkitModule<*>?
-        return Objects.equal(pluginYml, that!!.pluginYml) &&
-            type === that.type &&
-            Objects.equal(moduleType, that.moduleType)
-    }
-
-    override fun hashCode(): Int {
-        return Objects.hashCode(pluginYml, type, moduleType)
-    }
-
     companion object {
         fun generateBukkitStyleEventListenerMethod(chosenClass: PsiClass,
                                                    chosenName: String,

src/main/kotlin/com/demonwav/mcdev/platform/bungeecord/BungeeCordFileIconProvider.kt

@@ -31,7 +31,7 @@ class BungeeCordFileIconProvider : FileIconProvider {
         val module = ModuleUtilCore.findModuleForFile(file, project) ?: return null
         val bungeecordModule = MinecraftFacet.getInstance(module, BungeeCordModuleType) ?: return null
 
-        if (file == bungeecordModule.getPluginYml()) {
+        if (file == bungeecordModule.pluginYml) {
             return bungeecordModule.icon
         }
         return null

src/main/kotlin/com/demonwav/mcdev/platform/bungeecord/BungeeCordModule.kt

@@ -21,7 +21,7 @@ import com.demonwav.mcdev.platform.bungeecord.generation.BungeeCordGenerationDat
 import com.demonwav.mcdev.platform.bungeecord.util.BungeeCordConstants
 import com.demonwav.mcdev.util.addImplements
 import com.demonwav.mcdev.util.extendsOrImplements
-import com.intellij.openapi.vfs.VirtualFile
+import com.demonwav.mcdev.util.nullable
 import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
@@ -33,24 +33,8 @@ import org.jetbrains.annotations.Contract
 
 class BungeeCordModule internal constructor(facet: MinecraftFacet) : AbstractModule(facet) {
 
-    private var pluginYml: VirtualFile? = null
-
-    init {
-        setup()
-    }
-
-    private fun setup() {
-        pluginYml = facet.findFile("plugin.yml", SourceType.RESOURCE)
-    }
-
-    fun getPluginYml(): VirtualFile? {
-        if (pluginYml == 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 pluginYml
-    }
+    var pluginYml by nullable { facet.findFile("plugin.yml", SourceType.RESOURCE) }
+        private set
 
     override val moduleType = BungeeCordModuleType
     override val type = PlatformType.BUNGEECORD

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

@@ -18,8 +18,8 @@ import com.demonwav.mcdev.platform.AbstractModuleType
 import com.demonwav.mcdev.platform.PlatformType
 import com.demonwav.mcdev.platform.canary.generation.CanaryGenerationData
 import com.demonwav.mcdev.platform.canary.util.CanaryConstants
+import com.demonwav.mcdev.util.nullable
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.PsiAnnotationMemberValue
 import com.intellij.psi.PsiClass
@@ -31,21 +31,10 @@ import com.intellij.psi.search.GlobalSearchScope
 class CanaryModule<out T : AbstractModuleType<*>>(facet: MinecraftFacet, override val moduleType: T) : AbstractModule(facet) {
 
     override val type: PlatformType = moduleType.platformType
-    var canaryInf: VirtualFile? = null
-        get() {
-            if (field == null) {
-                field = facet.findFile(CanaryConstants.CANARY_INF, SourceType.RESOURCE)
-            }
-            return field
-        }
+    
+    var canaryInf by nullable { facet.findFile(CanaryConstants.CANARY_INF, SourceType.RESOURCE) }
         private set
-    var neptuneInf: VirtualFile? = null
-        get() {
-            if (field == null) {
-                field = facet.findFile(CanaryConstants.NEPTUNE_INF, SourceType.RESOURCE)
-            }
-            return field
-        }
+    var neptuneInf by nullable { facet.findFile(CanaryConstants.NEPTUNE_INF, SourceType.RESOURCE) }
         private set
 
     override fun isEventClassValid(eventClass: PsiClass, method: PsiMethod?) =

src/main/kotlin/com/demonwav/mcdev/platform/forge/ForgeFileIconProvider.kt

@@ -31,7 +31,7 @@ class ForgeFileIconProvider : FileIconProvider {
         val module = ModuleUtilCore.findModuleForFile(file, project) ?: return null
         val forgeModule = MinecraftFacet.getInstance(module, ForgeModuleType) ?: return null
 
-        if (file == forgeModule.getMcmod()) {
+        if (file == forgeModule.mcmod) {
             return forgeModule.icon
         }
         return null

src/main/kotlin/com/demonwav/mcdev/platform/forge/ForgeModule.kt

@@ -18,7 +18,7 @@ import com.demonwav.mcdev.platform.AbstractModule
 import com.demonwav.mcdev.platform.PlatformType
 import com.demonwav.mcdev.platform.forge.util.ForgeConstants
 import com.demonwav.mcdev.util.extendsOrImplements
-import com.intellij.openapi.vfs.VirtualFile
+import com.demonwav.mcdev.util.nullable
 import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiClassType
@@ -32,15 +32,8 @@ import org.jetbrains.annotations.Contract
 
 class ForgeModule internal constructor(facet: MinecraftFacet) : AbstractModule(facet) {
 
-    private var mcmod: VirtualFile? = null
-
-    init {
-        setup()
-    }
-
-    private fun setup() {
-        mcmod = facet.findFile(ForgeConstants.MCMOD_INFO, SourceType.RESOURCE)
-    }
+    var mcmod by nullable { facet.findFile(ForgeConstants.MCMOD_INFO, SourceType.RESOURCE) }
+        private set
 
     override val moduleType = ForgeModuleType
     override val type = PlatformType.FORGE
@@ -87,15 +80,6 @@ class ForgeModule internal constructor(facet: MinecraftFacet) : AbstractModule(f
 
     override fun isStaticListenerSupported(method: PsiMethod) = true
 
-    fun getMcmod(): VirtualFile? {
-        if (mcmod == 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 mcmod
-    }
-
     override fun generateEventListenerMethod(containingClass: PsiClass,
                                              chosenClass: PsiClass,
                                              chosenName: String,

src/main/kotlin/com/demonwav/mcdev/platform/liteloader/LiteLoaderFileIconProvider.kt

@@ -29,7 +29,7 @@ class LiteLoaderFileIconProvider : FileIconProvider {
         val module = ModuleUtilCore.findModuleForFile(file, project) ?: return null
         val liteloaderModule = MinecraftFacet.getInstance(module, LiteLoaderModuleType) ?: return null
 
-        if (file == liteloaderModule.getLitemodJson()) {
+        if (file == liteloaderModule.litemodJson) {
             return liteloaderModule.icon
         }
         return null

src/main/kotlin/com/demonwav/mcdev/platform/liteloader/LiteLoaderModule.kt

@@ -16,30 +16,16 @@ import com.demonwav.mcdev.facet.MinecraftFacet
 import com.demonwav.mcdev.platform.AbstractModule
 import com.demonwav.mcdev.platform.PlatformType
 import com.demonwav.mcdev.platform.liteloader.util.LiteLoaderConstants
-import com.intellij.openapi.vfs.VirtualFile
+import com.demonwav.mcdev.util.nullable
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiIdentifier
 import com.intellij.psi.PsiMethod
 
 class LiteLoaderModule internal constructor(facet: MinecraftFacet) : AbstractModule(facet) {
 
-    private var litemodJson: VirtualFile? = null
-
-    init {
-        setup()
-    }
-
-    private fun setup() {
-        litemodJson = facet.findFile(LiteLoaderConstants.LITEMOD_JSON, SourceType.RESOURCE)
-    }
-
-    fun getLitemodJson(): VirtualFile? {
-        if (litemodJson == null) {
-            setup()
-        }
-        return litemodJson
-    }
+    var litemodJson by nullable { facet.findFile(LiteLoaderConstants.LITEMOD_JSON, SourceType.RESOURCE) }
+        private set
 
     override val moduleType = LiteLoaderModuleType
     override val type = PlatformType.LITELOADER

src/main/kotlin/com/demonwav/mcdev/platform/mcp/McpModule.kt

@@ -40,7 +40,7 @@ class McpModule(facet: MinecraftFacet) : AbstractModule(facet) {
 
     override fun writeErrorMessageForEventParameter(eventClass: PsiClass, method: PsiMethod) = ""
 
-    fun getSettings() = settings.state
+    private fun getSettings() = settings.state
 
     fun updateSettings(data: McpModuleSettings.State) {
         this.settings.loadState(data)