Merge branch '2022.3' into 2023.1

# Conflicts:
#	src/main/kotlin/creator/step/AbstractLatentStep.kt

Author: Earthcomputer

.gitignore

@@ -5,6 +5,8 @@
 
 .idea/*
 !.idea/icon.png
+!.idea/encodings.xml
+!.idea/inspectionProfiles/Project_Default.xml
 
 **/out/
 **/build/

.idea/encodings.xml

@@ -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/asset/MCDevBundle.kt

@@ -20,6 +20,7 @@
 
 package com.demonwav.mcdev.creator
 
+import com.demonwav.mcdev.asset.MCDevBundle
 import com.demonwav.mcdev.asset.PlatformAssets
 import com.demonwav.mcdev.creator.buildsystem.BuildSystemPropertiesStep
 import com.demonwav.mcdev.creator.platformtype.PlatformTypeStep
@@ -40,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() = "Create a new Minecraft project"
+    override fun getDescription() = MCDevBundle("creator.ui.create_minecraft_project")
 
     override fun setupRootModel(modifiableRootModel: ModifiableRootModel) {
         if (moduleJdk != null) {

src/main/kotlin/creator/MinecraftModuleBuilder.kt

@@ -20,6 +20,7 @@
 
 package com.demonwav.mcdev.creator
 
+import com.demonwav.mcdev.asset.MCDevBundle
 import com.demonwav.mcdev.creator.ProjectSetupFinalizer.Factory
 import com.demonwav.mcdev.creator.step.NewProjectWizardChainStep.Companion.nextStep
 import com.demonwav.mcdev.util.mapFirstNotNull
@@ -123,7 +124,7 @@ class JdkProjectSetupFinalizer(
     private var sdk by sdkProperty
     private var sdkComboBox: JdkComboBoxWithPreference? = null
     private var preferredJdkLabel: Placeholder? = null
-    private var preferredJdkReason = "these settings"
+    private var preferredJdkReason = MCDevBundle("creator.validation.jdk_preferred_default_reason")
 
     var preferredJdk: JavaSdkVersion = JavaSdkVersion.JDK_17
         private set
@@ -150,7 +151,7 @@ class JdkProjectSetupFinalizer(
             preferredJdkLabel?.component = null
         } else {
             preferredJdkLabel?.component =
-                JLabel("Java ${preferredJdk.description} is recommended for $preferredJdkReason")
+                JLabel(MCDevBundle("creator.validation.jdk_preferred", preferredJdk.description, preferredJdkReason))
                     .also { it.foreground = JBColor.YELLOW }
         }
     }

src/main/kotlin/creator/ProjectSetupFinalizerWizardStep.kt

@@ -20,6 +20,7 @@
 
 package com.demonwav.mcdev.creator.buildsystem
 
+import com.demonwav.mcdev.asset.MCDevBundle
 import com.demonwav.mcdev.creator.findStep
 import com.demonwav.mcdev.creator.storeToData
 import com.intellij.ide.util.projectWizard.WizardContext
@@ -47,7 +48,8 @@ abstract class AbstractBuildSystemStep(
     abstract val platformName: String
 
     override val self get() = this
-    override val label = "Build System:"
+    override val label
+        get() = MCDevBundle("creator.ui.build_system.label.generic")
 
     override fun initSteps(): LinkedHashMap<String, NewProjectWizardStep> {
         context.putUserData(PLATFORM_NAME_KEY, platformName)
@@ -94,11 +96,13 @@ abstract class AbstractBuildSystemStep(
 }
 
 class GradleBuildSystem : AbstractBuildSystemStep.Factory {
-    override val name = "Gradle"
+    override val name
+        get() = MCDevBundle("creator.ui.build_system.label.gradle")
 }
 
 class MavenBuildSystem : AbstractBuildSystemStep.Factory {
-    override val name = "Maven"
+    override val name
+        get() = MCDevBundle("creator.ui.build_system.label.maven")
 }
 
 abstract class AbstractRunBuildSystemStep(

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

@@ -20,6 +20,7 @@
 
 package com.demonwav.mcdev.creator.buildsystem
 
+import com.demonwav.mcdev.asset.MCDevBundle
 import com.demonwav.mcdev.creator.storeToData
 import com.demonwav.mcdev.util.SemanticVersion
 import com.intellij.ide.wizard.AbstractNewProjectWizardStep
@@ -37,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>("Group ID must be changed from \"org.example\"") {
+private val nonExampleValidation = validationErrorIf<String>(MCDevBundle("creator.validation.group_id_non_example")) {
     it == "org.example"
 }
 
-private val versionValidation = validationErrorIf<String>("Version must be a valid semantic version") {
+private val versionValidation = validationErrorIf<String>(MCDevBundle("creator.validation.semantic_version")) {
     SemanticVersion.tryParse(it) == null
 }
 
@@ -66,22 +67,22 @@ class BuildSystemPropertiesStep<ParentStep>(private val parent: ParentStep) : Ab
     private fun suggestArtifactId() = parent.name
 
     override fun setupUI(builder: Panel) {
-        builder.collapsibleGroup("Build System Properties") {
-            row("Group ID:") {
+        builder.collapsibleGroup(MCDevBundle("creator.ui.group.title")) {
+            row(MCDevBundle("creator.ui.group.group_id")) {
                 textField()
                     .bindText(groupIdProperty)
                     .columns(COLUMNS_MEDIUM)
                     .validationRequestor(WHEN_GRAPH_PROPAGATION_FINISHED(propertyGraph))
                     .textValidation(CHECK_NON_EMPTY, CHECK_GROUP_ID, nonExampleValidation)
             }
-            row("Artifact ID:") {
+            row(MCDevBundle("creator.ui.group.artifact_id")) {
                 textField()
                     .bindText(artifactIdProperty)
                     .columns(COLUMNS_MEDIUM)
                     .validationRequestor(WHEN_GRAPH_PROPAGATION_FINISHED(propertyGraph))
                     .textValidation(CHECK_NON_EMPTY, CHECK_ARTIFACT_ID)
             }
-            row("Version:") {
+            row(MCDevBundle("creator.ui.group.version")) {
                 textField()
                     .bindText(versionProperty)
                     .columns(COLUMNS_MEDIUM)

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

@@ -20,6 +20,7 @@
 
 package com.demonwav.mcdev.creator.buildsystem
 
+import com.demonwav.mcdev.asset.MCDevBundle
 import com.demonwav.mcdev.creator.addTemplates
 import com.demonwav.mcdev.creator.findStep
 import com.demonwav.mcdev.creator.notifyCreatedProjectNotOpened
@@ -88,7 +89,8 @@ class GradleWrapperStep(parent: NewProjectWizardStep) : AbstractRunGradleTaskSte
 }
 
 abstract class AbstractPatchGradleFilesStep(parent: NewProjectWizardStep) : AbstractLongRunningStep(parent) {
-    override val description = "Patching Gradle files"
+    override val description
+        get() = MCDevBundle("creator.step.gradle.patch_gradle.description")
 
     abstract fun patch(project: Project, gradleFiles: GradleFiles)
 
@@ -192,7 +194,8 @@ abstract class AbstractPatchGradleFilesStep(parent: NewProjectWizardStep) : Abst
 }
 
 open class GradleImportStep(parent: NewProjectWizardStep) : AbstractLongRunningStep(parent) {
-    override val description = "Importing Gradle project"
+    override val description
+        get() = MCDevBundle("creator.step.gradle.import_gradle.description")
 
     open val additionalRunTasks = emptyList<String>()
 

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

@@ -20,6 +20,7 @@
 
 package com.demonwav.mcdev.creator.buildsystem
 
+import com.demonwav.mcdev.asset.MCDevBundle
 import com.demonwav.mcdev.creator.findStep
 import com.demonwav.mcdev.creator.getVersionJson
 import com.demonwav.mcdev.creator.notifyCreatedProjectNotOpened
@@ -62,7 +63,8 @@ fun FixedAssetsNewProjectWizardStep.addDefaultMavenProperties() {
 }
 
 abstract class AbstractPatchPomStep(parent: NewProjectWizardStep) : AbstractLongRunningStep(parent) {
-    override val description = "Patching pom.xml"
+    override val description
+        get() = MCDevBundle("creator.step.maven.patch_pom.description")
 
     open fun patchPom(model: MavenDomProjectModel, root: XmlTag) {
         setupCore(model)
@@ -168,7 +170,8 @@ class ReformatPomStep(parent: NewProjectWizardStep) : AbstractReformatFilesStep(
 }
 
 class MavenImportStep(parent: NewProjectWizardStep) : AbstractLongRunningStep(parent) {
-    override val description = "Importing Maven project"
+    override val 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/buildsystem/maven-steps.kt

@@ -20,6 +20,7 @@
 
 package com.demonwav.mcdev.creator.platformtype
 
+import com.demonwav.mcdev.asset.MCDevBundle
 import com.demonwav.mcdev.creator.platformtype.ModPlatformStep.Factory
 import com.intellij.ide.wizard.AbstractNewProjectWizardMultiStep
 import com.intellij.ide.wizard.NewProjectWizardMultiStepFactory
@@ -39,10 +40,12 @@ class ModPlatformStep(
     }
 
     override val self = this
-    override val label = "Platform:"
+    override val label
+        get() = MCDevBundle("creator.ui.platform.label")
 
     class TypeFactory : PlatformTypeStep.Factory {
-        override val name = "Mod"
+        override val name
+            get() = MCDevBundle("creator.ui.platform.mod.name")
         override fun createStep(parent: PlatformTypeStep) = ModPlatformStep(parent)
     }