User: kyle wood
Date: 07 Feb 24 21:53
Revision: 4741d19e6c1761ca8f7a35ab57a7157db90a892f
Summary:
Remove obsolete MinecraftModuleType

This legacy type only existed for compatibility reasons from the
earliest days of MCDev, it's about time it goes away.


TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=9121&personal=false

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision 4c58502b3b51bf916be361c240b1a0a78bdfc22f)
+++ build.gradle.kts	(revision 4741d19e6c1761ca8f7a35ab57a7157db90a892f)
@@ -284,6 +284,7 @@
     style["bnf"] = HeaderStyle.BLOCK_COMMENT.format
 
     val endings = listOf("java", "kt", "kts", "groovy", "gradle.kts", "xml", "properties", "html", "flex", "bnf")
+    exclude("META-INF/plugin.xml") // https://youtrack.jetbrains.com/issue/IDEA-345026
     include(endings.map { "**/*.$it" })
 
     exclude("com/demonwav/mcdev/platform/mixin/invalidInjectorMethodSignature/*.java")
Index: src/main/kotlin/creator/MinecraftModuleBuilder.kt
===================================================================
--- src/main/kotlin/creator/MinecraftModuleBuilder.kt	(revision 4c58502b3b51bf916be361c240b1a0a78bdfc22f)
+++ src/main/kotlin/creator/MinecraftModuleBuilder.kt	(revision 4741d19e6c1761ca8f7a35ab57a7157db90a892f)
@@ -26,7 +26,6 @@
 import com.demonwav.mcdev.creator.platformtype.PlatformTypeStep
 import com.demonwav.mcdev.creator.step.NewProjectWizardChainStep.Companion.nextStep
 import com.demonwav.mcdev.creator.step.TemplateOutdatedStep
-import com.demonwav.mcdev.platform.MinecraftModuleType
 import com.intellij.ide.projectWizard.ProjectSettingsStep
 import com.intellij.ide.util.projectWizard.WizardContext
 import com.intellij.ide.wizard.AbstractNewProjectWizardBuilder
@@ -37,9 +36,9 @@
 
 class MinecraftModuleBuilder : AbstractNewProjectWizardBuilder() {
 
-    override fun getPresentableName() = MinecraftModuleType.NAME
+    override fun getPresentableName() = "Minecraft"
     override fun getNodeIcon() = PlatformAssets.MINECRAFT_ICON
-    override fun getGroupName() = MinecraftModuleType.NAME
+    override fun getGroupName() = "Minecraft"
     override fun getBuilderId() = "MINECRAFT_MODULE"
     override fun getDescription() = MCDevBundle("creator.ui.create_minecraft_project")
 
@@ -51,7 +50,7 @@
         }
     }
 
-    override fun getParentGroup() = MinecraftModuleType.NAME
+    override fun getParentGroup() = "Minecraft"
 
     override fun createStep(context: WizardContext) = RootNewProjectWizardStep(context)
         .nextStep(::NewProjectWizardBaseStep)
Index: src/main/kotlin/facet/MinecraftFacetDetector.kt
===================================================================
--- src/main/kotlin/facet/MinecraftFacetDetector.kt	(revision 4c58502b3b51bf916be361c240b1a0a78bdfc22f)
+++ src/main/kotlin/facet/MinecraftFacetDetector.kt	(revision 4741d19e6c1761ca8f7a35ab57a7157db90a892f)
@@ -41,11 +41,11 @@
 import com.intellij.openapi.roots.libraries.LibraryKind
 import com.intellij.openapi.roots.libraries.LibraryProperties
 import com.intellij.openapi.roots.ui.configuration.libraries.LibraryPresentationManager
-import com.intellij.openapi.startup.StartupActivity
+import com.intellij.openapi.startup.ProjectActivity
 import com.intellij.openapi.util.Key
 import org.jetbrains.plugins.gradle.util.GradleUtil
 
-class MinecraftFacetDetector : StartupActivity {
+class MinecraftFacetDetector : ProjectActivity {
     companion object {
         private val libraryVersionsKey = Key<MutableMap<LibraryKind, String>>("mcdev.libraryVersions")
 
@@ -54,7 +54,7 @@
         }
     }
 
-    override fun runActivity(project: Project) {
+    override suspend fun execute(project: Project) {
         MinecraftModuleRootListener.doCheck(project)
     }
 
Index: src/main/kotlin/platform/MinecraftModuleType.kt
===================================================================
--- src/main/kotlin/platform/MinecraftModuleType.kt	(revision 4c58502b3b51bf916be361c240b1a0a78bdfc22f)
+++ src/main/kotlin/platform/MinecraftModuleType.kt	(revision 4c58502b3b51bf916be361c240b1a0a78bdfc22f)
@@ -1,43 +0,0 @@
-/*
- * Minecraft Development for IntelliJ
- *
- * https://mcdev.io/
- *
- * Copyright (C) 2024 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 <https://www.gnu.org/licenses/>.
- */
-
-package com.demonwav.mcdev.platform
-
-import com.demonwav.mcdev.asset.PlatformAssets
-import com.intellij.openapi.module.JavaModuleType
-import com.intellij.openapi.module.ModuleTypeManager
-
-class MinecraftModuleType : JavaModuleType() {
-
-    override fun getIcon() = PlatformAssets.MINECRAFT_ICON
-    override fun getNodeIcon(isOpened: Boolean) = PlatformAssets.MINECRAFT_ICON
-    override fun getName() = NAME
-    override fun getDescription() =
-        "Minecraft modules are used for developing plugins or mods for <b>Minecraft</b> " +
-            "(Java Edition, also known as the PC Edition)."
-
-    companion object {
-        private const val ID = "MINECRAFT_MODULE_TYPE"
-        const val NAME = "Minecraft"
-
-        val instance: MinecraftModuleType
-            get() = ModuleTypeManager.getInstance().findByID(ID) as MinecraftModuleType
-    }
-}
Index: src/main/resources/META-INF/plugin.xml
===================================================================
--- src/main/resources/META-INF/plugin.xml	(revision 4c58502b3b51bf916be361c240b1a0a78bdfc22f)
+++ src/main/resources/META-INF/plugin.xml	(revision 4741d19e6c1761ca8f7a35ab57a7157db90a892f)
@@ -15,7 +15,7 @@
     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 <https://www.gnu.org/licenses/>.
+    along with this program.  If not, see https://www.gnu.org/licenses/.
 -->
 
 <idea-plugin require-restart="true">
@@ -181,7 +181,6 @@
         <!--region NO PLATFORM-->
         <!---->
 
-        <moduleType id="MINECRAFT_MODULE_TYPE" implementationClass="com.demonwav.mcdev.platform.MinecraftModuleType"/>
         <moduleBuilder id="MINECRAFT_MODULE" builderClass="com.demonwav.mcdev.creator.MinecraftModuleBuilder"/>
         <facetType implementation="com.demonwav.mcdev.facet.MinecraftFacetType" />
         <postStartupActivity implementation="com.demonwav.mcdev.facet.MinecraftFacetDetector"/>