feat: support bundle, set constants

Sharlottes · Nov 7, 2023 · 3a07fee · 3a07fee
1 parent 50a5e3a
commit 3a07fee
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 9 deletions.
diff --git a/assets/bundles/bundle.properties b/assets/bundles/bundle.properties
@@ -0,0 +1,5 @@
+mlogwatcher.setting.title=MlogWatcher Setting
+mlogwatcher.setting.mlogLabel=current mlog target path
+mlogwatcher.setting.mlogSelectButton=Change watcher target
+mlogwatcher.setting.fileChooserTitle=select target file to watch changes
+mlogwatcher.setting.extensionInputLabel=file extension to search: 
diff --git a/assets/bundles/bundle_ko.properties b/assets/bundles/bundle_ko.properties
@@ -0,0 +1,5 @@
+mlogwatcher.setting.title=MlogWatcher 설정
+mlogwatcher.setting.mlogLabel=현재 mlog 대상 경로
+mlogwatcher.setting.mlogSelectButton=mlog 대상 경로 바꾸기
+mlogwatcher.setting.fileChooserTitle=변경을 지켜볼 대상 파일을 선택하세요
+mlogwatcher.setting.extensionInputLabel=검색할 파일 확장자 이름: 
diff --git a/src/mlogwatcher/Constants.java b/src/mlogwatcher/Constants.java
@@ -0,0 +1,15 @@
+package mlogwatcher;
+
+public class Constants {
+    static class Bundles {
+        public static final String settingTitle = "@mlogwatcher.setting.title";
+        public static final String settingMlogPathLabel = "@mlogwatcher.setting.mlogLabel";
+        public static final String settingMlogSelectButton = "@mlogwatcher.setting.mlogSelectButton";
+        public static final String settingFileChooserTitle = "@mlogwatcher.setting.fileChooserTitle";
+        public static final String settingExtensionInputLabel = "@mlogwatcher.setting.extensionInputLabel";
+    }
+
+    static class Settings {
+        public static final String mlogPath = "mlogwatcher-mlog-path";
+    }
+}
diff --git a/src/mlogwatcher/FileWatcher.java b/src/mlogwatcher/FileWatcher.java
@@ -1,6 +1,7 @@
 package mlogwatcher;
 
 import arc.Core;
+import arc.func.Cons;
 import arc.util.Log;
 import arc.util.Nullable;
 
@@ -11,7 +12,7 @@ public class FileWatcher {
     @Nullable
     private static Thread fileWatcherThread;
     public static void startWatcherThread() {
-        fileWatcherThread = new FileWatcherThread(Core.settings.getString("mlogwatcher-mlog-path"));
+        fileWatcherThread = new FileWatcherThread(Core.settings.getString(Constants.Settings.mlogPath));
         fileWatcherThread.start();
     }
 

diff --git a/src/mlogwatcher/ProcessorUpdater.java b/src/mlogwatcher/ProcessorUpdater.java
@@ -39,7 +39,7 @@ public static void InsertLogic() {
             return;
         }
 
-        String mlogPath = Core.settings.getString("mlogwatcher-mlog-path");
+        String mlogPath = Core.settings.getString(Constants.Settings.mlogPath);
         String asmCode = Fi.get(mlogPath).readString().replace("\r\n", "\n");
         lastTappedLogicBuild.configure(LogicBlock.compress(asmCode, lastTappedLogicBuild.relativeConnections()));
         Fx.spawn.at(lastTappedLogicBuild.x, lastTappedLogicBuild.y);

diff --git a/src/mlogwatcher/Setting.java b/src/mlogwatcher/Setting.java
@@ -13,29 +13,29 @@
 
 public class Setting {
     public static void init(){
-        Label label = new Label(Core.settings.getString("mlogwatcher-mlog-path", "[lightgray]none[]"));
+        Label label = new Label(Core.settings.getString(Constants.Settings.mlogPath, "[lightgray]@none[]"));
         label.setFontScale(0.75f);
 
         TextField field = new TextField();
         field.setText("mlog");
         field.setFilter((f, c) -> c != ' ' && c != '.');
         field.setMessageText("no ext");
 
-        Dialog dialog = new BaseDialog("MlogWatcher Setting");
+        Dialog dialog = new BaseDialog(Constants.Bundles.settingTitle);
         dialog.addCloseButton();
         dialog.cont.center();
-        dialog.cont.add("current mlog target path").row();
+        dialog.cont.add(Constants.Bundles.settingMlogPathLabel).row();
         dialog.cont.add(label).row();
-        dialog.cont.button("Change watcher target", () -> {
-            Vars.platform.showFileChooser(true, "open target file to watch", field.getText(), fi -> {
+        dialog.cont.button(Constants.Bundles.settingMlogSelectButton, () -> {
+            Vars.platform.showFileChooser(true, Constants.Bundles.settingFileChooserTitle, field.getText(), fi -> {
                 label.setText(fi.absolutePath());
-                Core.settings.put("mlogwatcher-mlog-path", fi.absolutePath());
+                Core.settings.put(Constants.Settings.mlogPath, fi.absolutePath());
                 FileWatcher.stopWatcherThread();
                 FileWatcher.startWatcherThread();
             });
         }).width(280f).height(60f).pad(16f).row();
         dialog.cont.table(fieldTable -> {
-            fieldTable.add("file extension to search: ");
+            fieldTable.add(Constants.Bundles.settingExtensionInputLabel);
             fieldTable.add(field);
         });