Remove Canary support

Author: DenWav

readme.md

@@ -82,7 +82,7 @@ Issues
 ------
 
 We have a few ambiguous labels on the issues page, so here are their definitions:
- * `platform: all` - An issue which applies to all supported platforms (`Bukkit`, `Sponge`, `BungeeCord`, `Forge`, `LiteLoader`, and `Canary`)
+ * `platform: all` - An issue which applies to all supported platforms (`Bukkit`, `Sponge`, `BungeeCord`, `Forge`, `LiteLoader`)
  * `platform: main` - Multiple platforms, containing at least `Bukkit`, `Sponge`, and `Forge`. It can contain either of the other two as
    well, as long as it doesn't contain all of them. In that case, `platform: all` would be more appropriate, of course.
  * `platform: multi` - Any issue with more than two platforms which doesn't fall under the first two categories.
@@ -102,4 +102,3 @@ Supported Platforms
 - [![MCP Icon](src/main/resources/assets/icons/platform/MCP.png?raw=true) **MCP**](http://www.modcoderpack.com/)
 - [![Mixins Icon](src/main/resources/assets/icons/platform/Mixins_dark.png?raw=true) **Mixins**](https://github.com/SpongePowered/Mixin)
 - [![BungeeCord Icon](src/main/resources/assets/icons/platform/BungeeCord.png?raw=true) **BungeeCord**](https://www.spigotmc.org/wiki/bungeecord/) ([![Waterfall Icon](src/main/resources/assets/icons/platform/Waterfall.png?raw=true) Waterfall](https://github.com/WaterfallMC))
-- [![Canary Icon](src/main/resources/assets/icons/platform/Canary.png?raw=true) **Canary**](https://canarymod.net/) ([![Neptune Icon](src/main/resources/assets/icons/platform/Neptune.png?raw=true) **Neptune**](https://www.neptunepowered.org/))

src/main/kotlin/com/demonwav/mcdev/asset/PlatformAssets.kt

@@ -48,11 +48,6 @@ object PlatformAssets : Assets() {
     val MIXIN_ICON_DARK = loadIcon("/assets/icons/platform/Mixins_dark.png")
     val MIXIN_ICON_2X_DARK = loadIcon("/assets/icons/platform/Mixins@2x_dark.png")
 
-    val CANARY_ICON = loadIcon("/assets/icons/platform/Canary.png")
-    val CANARY_ICON_2X = loadIcon("/assets/icons/platform/Canary@2x.png")
-    val NEPTUNE_ICON = loadIcon("/assets/icons/platform/Neptune.png")
-    val NEPTUNE_ICON_2X = loadIcon("/assets/icons/platform/Neptune@2x.png")
-
     val MCP_ICON = loadIcon("/assets/icons/platform/MCP.png")
     val MCP_ICON_2X = loadIcon("/assets/icons/platform/MCP@2x.png")
     val MCP_ICON_DARK = loadIcon("/assets/icons/platform/MCP_dark.png")

src/main/kotlin/com/demonwav/mcdev/buildsystem/gradle/GradleBuildSystem.kt

@@ -28,8 +28,6 @@ import com.demonwav.mcdev.util.runWriteTask
 import com.demonwav.mcdev.util.runWriteTaskLater
 import com.intellij.codeInsight.actions.ReformatCodeProcessor
 import com.intellij.execution.RunManager
-import com.intellij.execution.impl.RunManagerImpl
-import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl
 import com.intellij.ide.actions.ImportModuleAction
 import com.intellij.ide.util.newProjectWizard.AddModuleWizard
 import com.intellij.openapi.components.ServiceManager
@@ -64,7 +62,7 @@ import java.io.File
 
 class GradleBuildSystem : BuildSystem() {
 
-    var buildGradle: VirtualFile? = null
+    private var buildGradle: VirtualFile? = null
 
     override fun create(project: Project, configuration: ProjectConfiguration, indicator: ProgressIndicator) {
         rootDirectory.refresh(false, true)
@@ -169,19 +167,17 @@ class GradleBuildSystem : BuildSystem() {
         val connection = connector.connect()
         val launcher = connection.newBuild()
 
-        try {
+        connection.use {
             val sdkPair = ExternalSystemJdkUtil.getAvailableJdk(project)
             if (sdkPair.second?.homePath != null && ExternalSystemJdkUtil.USE_INTERNAL_JAVA != sdkPair.first) {
                 launcher.setJavaHome(File(sdkPair.second.homePath))
             }
 
-            launcher.addProgressListener(ProgressListener {
-                indicator.text = it.description
+            launcher.addProgressListener(ProgressListener { event ->
+                indicator.text = event.description
             })
             func(launcher)
             launcher.run()
-        } finally {
-            connection.close()
         }
     }
 
@@ -363,7 +359,7 @@ class GradleBuildSystem : BuildSystem() {
             BaseTemplate.applySettingsGradleTemplate(project, settingsGradle, artifactIdLower, includes)
 
             // Common will be empty, it's for the developers to fill in with common classes
-            val common = rootDirectory.createChildDirectory(this, artifactIdLower + "-common")
+            val common = rootDirectory.createChildDirectory(this, "$artifactIdLower-common")
             createDirectories(common)
         }
 
@@ -388,7 +384,7 @@ class GradleBuildSystem : BuildSystem() {
 
             // For each build system we initialize it, but not the same as a normal create. We need to know the common project name,
             // as we automatically add it as a dependency too
-            gradleBuildSystem.createSubModule(project, configuration, artifactIdLower + "-common", indicator)
+            gradleBuildSystem.createSubModule(project, configuration, "$artifactIdLower-common", indicator)
             map.putIfAbsent(gradleBuildSystem, configuration)
         }
 

src/main/kotlin/com/demonwav/mcdev/buildsystem/maven/MavenBuildSystem.kt

@@ -15,7 +15,6 @@ import com.demonwav.mcdev.platform.PlatformType
 import com.demonwav.mcdev.platform.ProjectConfiguration
 import com.demonwav.mcdev.platform.bukkit.BukkitTemplate
 import com.demonwav.mcdev.platform.bungeecord.BungeeCordTemplate
-import com.demonwav.mcdev.platform.canary.CanaryTemplate
 import com.demonwav.mcdev.platform.sponge.SpongeTemplate
 import com.demonwav.mcdev.util.runWriteAction
 import com.demonwav.mcdev.util.runWriteTask
@@ -50,8 +49,6 @@ class MavenBuildSystem : BuildSystem() {
                     BukkitTemplate.applyPomTemplate(project, buildVersion)
                 PlatformType.BUNGEECORD, PlatformType.WATERFALL -> BungeeCordTemplate.applyPomTemplate(project, buildVersion)
                 PlatformType.SPONGE -> SpongeTemplate.applyPomTemplate(project, buildVersion)
-                PlatformType.CANARY, PlatformType.NEPTUNE ->
-                    CanaryTemplate.applyPomTemplate(project, buildVersion)
                 else -> return@runWriteTask
             }
 

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

@@ -49,7 +49,7 @@ class BuildSystemWizardStep(private val creator: MinecraftProjectCreator) : Modu
             buildSystemBox.selectedIndex = 1
             buildSystemBox.setVisible(false)
         } else if (creator.settings.values
-            .any { s -> s.type === PlatformType.SPONGE || s.type === PlatformType.CANARY || s.type === PlatformType.NEPTUNE }) {
+            .any { s -> s.type === PlatformType.SPONGE }) {
             buildSystemBox.selectedIndex = 1
             buildSystemBox.setVisible(true)
         } else {