Migrate additional packages up to NBT to message bundles

Author: DenWav

src/main/kotlin/asset/MCDevBundle.kt

@@ -29,11 +29,11 @@ private const val BUNDLE = "messages.MinecraftDevelopment"
 
 object MCDevBundle : DynamicBundle(BUNDLE) {
 
-    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String): String {
+    operator fun invoke(@PropertyKey(resourceBundle = BUNDLE) key: String): String {
         return getMessage(key)
     }
 
-    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String {
+    operator fun invoke(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): String {
         return getMessage(key, *params)
     }
 }

src/main/kotlin/creator/MinecraftModuleBuilder.kt

@@ -41,7 +41,7 @@ class MinecraftModuleBuilder : AbstractNewProjectWizardBuilder() {
     override fun getNodeIcon() = PlatformAssets.MINECRAFT_ICON
     override fun getGroupName() = MinecraftModuleType.NAME
     override fun getBuilderId() = "MINECRAFT_MODULE"
-    override fun getDescription() = MCDevBundle.message("creator.ui.create_minecraft_project")
+    override fun getDescription() = MCDevBundle("creator.ui.create_minecraft_project")
 
     override fun setupRootModel(modifiableRootModel: ModifiableRootModel) {
         if (moduleJdk != null) {

src/main/kotlin/creator/ProjectSetupFinalizerWizardStep.kt

@@ -120,7 +120,7 @@ class JdkProjectSetupFinalizer(
     private var sdk by sdkProperty
     private var sdkComboBox: JdkComboBoxWithPreference? = null
     private var preferredJdkLabel: Placeholder? = null
-    private var preferredJdkReason = MCDevBundle.message("creator.validation.jdk_preferred_default_reason")
+    private var preferredJdkReason = MCDevBundle("creator.validation.jdk_preferred_default_reason")
 
     var preferredJdk: JavaSdkVersion = JavaSdkVersion.JDK_17
         private set
@@ -147,7 +147,7 @@ class JdkProjectSetupFinalizer(
             preferredJdkLabel?.component = null
         } else {
             preferredJdkLabel?.component =
-                JLabel(MCDevBundle.message("creator.validation.jdk_preferred", preferredJdk.description, preferredJdkReason))
+                JLabel(MCDevBundle("creator.validation.jdk_preferred", preferredJdk.description, preferredJdkReason))
                     .also { it.foreground = JBColor.YELLOW }
         }
     }

src/main/kotlin/creator/buildsystem/AbstractBuildSystemStep.kt

@@ -49,7 +49,7 @@ abstract class AbstractBuildSystemStep(
 
     override val self get() = this
     override val label
-        get() = MCDevBundle.message("creator.ui.build_system.label.generic")
+        get() = MCDevBundle("creator.ui.build_system.label.generic")
 
     override fun initSteps(): LinkedHashMap<String, NewProjectWizardStep> {
         context.putUserData(PLATFORM_NAME_KEY, platformName)
@@ -97,12 +97,12 @@ abstract class AbstractBuildSystemStep(
 
 class GradleBuildSystem : AbstractBuildSystemStep.Factory {
     override val name
-        get() = MCDevBundle.message("creator.ui.build_system.label.gradle")
+        get() = MCDevBundle("creator.ui.build_system.label.gradle")
 }
 
 class MavenBuildSystem : AbstractBuildSystemStep.Factory {
     override val name
-        get() = MCDevBundle.message("creator.ui.build_system.label.maven")
+        get() = MCDevBundle("creator.ui.build_system.label.maven")
 }
 
 abstract class AbstractRunBuildSystemStep(

src/main/kotlin/creator/buildsystem/BuildSystemPropertiesStep.kt

@@ -38,11 +38,11 @@ import com.intellij.ui.dsl.builder.bindText
 import com.intellij.ui.dsl.builder.columns
 import com.intellij.ui.dsl.builder.textValidation
 
-private val nonExampleValidation = validationErrorIf<String>(MCDevBundle.message("creator.validation.group_id_non_example")) {
+private val nonExampleValidation = validationErrorIf<String>(MCDevBundle("creator.validation.group_id_non_example")) {
     it == "org.example"
 }
 
-private val versionValidation = validationErrorIf<String>(MCDevBundle.message("creator.validation.semantic_version")) {
+private val versionValidation = validationErrorIf<String>(MCDevBundle("creator.validation.semantic_version")) {
     SemanticVersion.tryParse(it) == null
 }
 
@@ -67,22 +67,22 @@ class BuildSystemPropertiesStep<ParentStep>(private val parent: ParentStep) : Ab
     private fun suggestArtifactId() = parent.name
 
     override fun setupUI(builder: Panel) {
-        builder.collapsibleGroup(MCDevBundle.message("creator.ui.group.title")) {
-            row(MCDevBundle.message("creator.ui.group.group_id")) {
+        builder.collapsibleGroup(MCDevBundle("creator.ui.group.title")) {
+            row(MCDevBundle("creator.ui.group.group_id")) {
                 textField()
                     .bindText(groupIdProperty)
                     .columns(COLUMNS_MEDIUM)
                     .validationRequestor(AFTER_GRAPH_PROPAGATION(propertyGraph))
                     .textValidation(CHECK_NON_EMPTY, CHECK_GROUP_ID, nonExampleValidation)
             }
-            row(MCDevBundle.message("creator.ui.group.artifact_id")) {
+            row(MCDevBundle("creator.ui.group.artifact_id")) {
                 textField()
                     .bindText(artifactIdProperty)
                     .columns(COLUMNS_MEDIUM)
                     .validationRequestor(AFTER_GRAPH_PROPAGATION(propertyGraph))
                     .textValidation(CHECK_NON_EMPTY, CHECK_ARTIFACT_ID)
             }
-            row(MCDevBundle.message("creator.ui.group.version")) {
+            row(MCDevBundle("creator.ui.group.version")) {
                 textField()
                     .bindText(versionProperty)
                     .columns(COLUMNS_MEDIUM)

src/main/kotlin/creator/buildsystem/gradle-steps.kt

@@ -90,7 +90,7 @@ class GradleWrapperStep(parent: NewProjectWizardStep) : AbstractRunGradleTaskSte
 
 abstract class AbstractPatchGradleFilesStep(parent: NewProjectWizardStep) : AbstractLongRunningStep(parent) {
     override val description
-        get() = MCDevBundle.message("creator.step.gradle.patch_gradle.description")
+        get() = MCDevBundle("creator.step.gradle.patch_gradle.description")
 
     abstract fun patch(project: Project, gradleFiles: GradleFiles)
 
@@ -195,7 +195,7 @@ abstract class AbstractPatchGradleFilesStep(parent: NewProjectWizardStep) : Abst
 
 open class GradleImportStep(parent: NewProjectWizardStep) : AbstractLongRunningStep(parent) {
     override val description
-        get() = MCDevBundle.message("creator.step.gradle.import_gradle.description")
+        get() = MCDevBundle("creator.step.gradle.import_gradle.description")
 
     open val additionalRunTasks = emptyList<String>()
 

src/main/kotlin/creator/buildsystem/maven-steps.kt

@@ -64,7 +64,7 @@ fun FixedAssetsNewProjectWizardStep.addDefaultMavenProperties() {
 
 abstract class AbstractPatchPomStep(parent: NewProjectWizardStep) : AbstractLongRunningStep(parent) {
     override val description
-        get() = MCDevBundle.message("creator.step.maven.patch_pom.description")
+        get() = MCDevBundle("creator.step.maven.patch_pom.description")
 
     open fun patchPom(model: MavenDomProjectModel, root: XmlTag) {
         setupCore(model)
@@ -171,7 +171,7 @@ class ReformatPomStep(parent: NewProjectWizardStep) : AbstractReformatFilesStep(
 
 class MavenImportStep(parent: NewProjectWizardStep) : AbstractLongRunningStep(parent) {
     override val description
-        get() = MCDevBundle.message("creator.step.maven.import_maven.description")
+        get() = MCDevBundle("creator.step.maven.import_maven.description")
 
     override fun perform(project: Project) {
         val pomFile = VfsUtil.findFile(Path.of(context.projectFileDirectory).resolve("pom.xml"), true)

src/main/kotlin/creator/platformtype/ModPlatformStep.kt

@@ -41,11 +41,11 @@ class ModPlatformStep(
 
     override val self = this
     override val label
-        get() = MCDevBundle.message("creator.ui.platform.label")
+        get() = MCDevBundle("creator.ui.platform.label")
 
     class TypeFactory : PlatformTypeStep.Factory {
         override val name
-            get() = MCDevBundle.message("creator.ui.platform.mod.name")
+            get() = MCDevBundle("creator.ui.platform.mod.name")
         override fun createStep(parent: PlatformTypeStep) = ModPlatformStep(parent)
     }
 

src/main/kotlin/creator/platformtype/PlatformTypeStep.kt

@@ -47,7 +47,7 @@ class PlatformTypeStep private constructor(
 
     override val self = this
     override val label
-        get() = MCDevBundle.message("creator.ui.platform.type.label")
+        get() = MCDevBundle("creator.ui.platform.type.label")
 
     interface Factory : NewProjectWizardMultiStepFactory<PlatformTypeStep>
 }

src/main/kotlin/creator/platformtype/PluginPlatformStep.kt

@@ -41,11 +41,11 @@ class PluginPlatformStep(
 
     override val self = this
     override val label
-        get() = MCDevBundle.message("creator.ui.platform.label")
+        get() = MCDevBundle("creator.ui.platform.label")
 
     class TypeFactory : PlatformTypeStep.Factory {
         override val name
-            get() = MCDevBundle.message("creator.ui.platform.plugin.name")
+            get() = MCDevBundle("creator.ui.platform.plugin.name")
         override fun createStep(parent: PlatformTypeStep) = PluginPlatformStep(parent)
     }