Add explicit toggle for using custom translation template, which shou…

…ld assist in implementing automatic yarn/mojmap I18n templating in the future
minecraft-dev · May 5, 2024 · b3b5fcf · b3b5fcf
1 parent 97988d6
commit b3b5fcf
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/src/main/kotlin/MinecraftConfigurable.kt b/src/main/kotlin/MinecraftConfigurable.kt
@@ -35,6 +35,8 @@ import com.intellij.ui.dsl.builder.bindItem
 import com.intellij.ui.dsl.builder.bindSelected
 import com.intellij.ui.dsl.builder.bindText
 import com.intellij.ui.dsl.builder.panel
+import com.intellij.ui.dsl.builder.selected
+import com.intellij.ui.layout.ComponentPredicate
 import com.intellij.util.IconUtil
 import javax.swing.JComponent
 import org.jetbrains.annotations.Nls
@@ -97,8 +99,17 @@ class MinecraftConfigurable : Configurable {
                 checkBox(MCDevBundle("minecraft.settings.translation.force_json_translation_file"))
                     .bindSelected(settings::isForceJsonTranslationFile)
             }
-            row(MCDevBundle("minecraft.settings.translation.convert_to_translation_template")) {
+
+            lateinit var property: ComponentPredicate
+            row {
+                val checkBox = checkBox(MCDevBundle("minecraft.settings.translation.use_custom_convert_template"))
+                    .bindSelected(settings::isUseCustomConvertToTranslationTemplate)
+                property = checkBox.selected
+            }
+
+            row {
                 textField().bindText(settings::convertToTranslationTemplate)
+                    .enabledIf(property)
             }
         }
 

diff --git a/src/main/kotlin/MinecraftSettings.kt b/src/main/kotlin/MinecraftSettings.kt
@@ -39,6 +39,7 @@ class MinecraftSettings : PersistentStateComponent<MinecraftSettings.State> {
         var isShadowAnnotationsSameLine: Boolean = true,
 
         var isForceJsonTranslationFile: Boolean = false,
+        var isUseCustomConvertToTranslationTemplate: Boolean = false,
         var convertToTranslationTemplate: String = "net.minecraft.client.resources.I18n.format(\"\$key\")",
     )
 
@@ -95,6 +96,12 @@ class MinecraftSettings : PersistentStateComponent<MinecraftSettings.State> {
             state.isForceJsonTranslationFile = forceJsonTranslationFile
         }
 
+    var isUseCustomConvertToTranslationTemplate: Boolean
+        get() = state.isUseCustomConvertToTranslationTemplate
+        set(useCustomConvertToTranslationTemplate) {
+            state.isUseCustomConvertToTranslationTemplate = useCustomConvertToTranslationTemplate
+        }
+
     var convertToTranslationTemplate: String
         get() = state.convertToTranslationTemplate
         set(convertToTranslationTemplate) {

diff --git a/src/main/kotlin/translations/intentions/ConvertToTranslationIntention.kt b/src/main/kotlin/translations/intentions/ConvertToTranslationIntention.kt
@@ -84,7 +84,11 @@ class ConvertToTranslationIntention : PsiElementBaseIntentionAction() {
                     val psi = PsiDocumentManager.getInstance(project).getPsiFile(editor.document) ?: return
                     psi.runWriteAction {
                         val expression = JavaPsiFacade.getElementFactory(project).createExpressionFromText(
-                            MinecraftSettings.instance.convertToTranslationTemplate.replace("\$key", key),
+                            if (MinecraftSettings.instance.isUseCustomConvertToTranslationTemplate) {
+                                MinecraftSettings.instance.convertToTranslationTemplate.replace("\$key", key)
+                            } else {
+                                "net.minecraft.client.resources.I18n.format(\"$key\")"
+                            },
                             element.context,
                         )
                         if (psi.language === JavaLanguage.INSTANCE) {

diff --git a/src/main/resources/messages/MinecraftDevelopment.properties b/src/main/resources/messages/MinecraftDevelopment.properties
@@ -201,5 +201,5 @@ minecraft.settings.chat_color_underline_style=Chat color underline style:
 minecraft.settings.mixin=Mixin
 minecraft.settings.mixin.shadow_annotation_same_line=@Shadow annotations on same line
 minecraft.setting.translation=Translation
-minecraft.settings.translation.force_json_translation_file=Force JSON Translation File (1.13+)
-minecraft.settings.translation.convert_to_translation_template=Template for Convert Literal To Translation
+minecraft.settings.translation.force_json_translation_file=Force JSON translation file (1.13+)
+minecraft.settings.translation.use_custom_convert_template=Use custom template for convert literal to translation