Possible fix for #15

DeflatedPickle · Oct 12, 2020 · 91563da · 91563da
1 parent 5361c48
commit 91563da
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 8 deletions.
diff --git a/launcher/src/main/kotlin/com/deflatedpickle/quiver/launcher/Launcher.kt b/launcher/src/main/kotlin/com/deflatedpickle/quiver/launcher/Launcher.kt
@@ -9,6 +9,8 @@ import com.deflatedpickle.haruhi.util.RegistryUtil
 import com.deflatedpickle.quiver.backend.util.ActionUtil
 import com.deflatedpickle.quiver.frontend.extension.add
 import com.deflatedpickle.quiver.launcher.window.Toolbar
+import com.deflatedpickle.quiver.launcher.window.menu.MenuFile
+import com.deflatedpickle.quiver.launcher.window.menu.MenuTools
 import javax.swing.JMenu
 
 @Plugin(
@@ -28,10 +30,20 @@ object Launcher {
             val lang = LangUtil.getLang("deflatedpickle@launcher#1.0.0")
 
             val menuBar = RegistryUtil.get(MenuCategory.MENU.name)
-            (menuBar?.get(MenuCategory.FILE.name) as JMenu).apply {
-                add(lang.trans("action.new_pack")) { ActionUtil.newPack() }
-                add(lang.trans("action.open_pack")) { ActionUtil.openPack() }
-                addSeparator()
+            if (menuBar != null) {
+                val menuFile = menuBar.get(MenuCategory.FILE.name)
+                if (menuFile is JMenu) {
+                    menuFile.text = lang.trans("menu.file")
+
+                    menuFile.add(lang.trans("action.new_pack")) { ActionUtil.newPack() }
+                    menuFile.add(lang.trans("action.open_pack")) { ActionUtil.openPack() }
+                    menuFile.addSeparator()
+                }
+
+                val menuTools = menuBar.get(MenuCategory.TOOLS.name)
+                if (menuTools is JMenu) {
+                    menuTools.text = lang.trans("menu.tools")
+                }
             }
 
             Toolbar.add(lang.trans("action.new_pack")) { ActionUtil.newPack() }

diff --git a/launcher/src/main/kotlin/com/deflatedpickle/quiver/launcher/window/menu/MenuBar.kt b/launcher/src/main/kotlin/com/deflatedpickle/quiver/launcher/window/menu/MenuBar.kt
@@ -13,10 +13,8 @@ import javax.swing.JMenuBar
 object MenuBar : JMenuBar() {
     private val menuRegistry = object : Registry<String, JMenu>() {
         init {
-            val lang = LangUtil.getLang("deflatedpickle@launcher#1.0.0")
-
-            register(MenuCategory.FILE.name, addMenu(JMenu(lang.trans("menu.file"))))
-            register(MenuCategory.TOOLS.name, addMenu(JMenu(lang.trans("menu.tools"))))
+            register(MenuCategory.FILE.name, addMenu(MenuFile))
+            register(MenuCategory.TOOLS.name, addMenu(MenuTools))
         }
     }
 

diff --git a/launcher/src/main/kotlin/com/deflatedpickle/quiver/launcher/window/menu/MenuFile.kt b/launcher/src/main/kotlin/com/deflatedpickle/quiver/launcher/window/menu/MenuFile.kt
@@ -0,0 +1,5 @@
+package com.deflatedpickle.quiver.launcher.window.menu
+
+import javax.swing.JMenu
+
+object MenuFile : JMenu()
diff --git a/launcher/src/main/kotlin/com/deflatedpickle/quiver/launcher/window/menu/MenuTools.kt b/launcher/src/main/kotlin/com/deflatedpickle/quiver/launcher/window/menu/MenuTools.kt
@@ -0,0 +1,5 @@
+package com.deflatedpickle.quiver.launcher.window.menu
+
+import javax.swing.JMenu
+
+object MenuTools : JMenu()