4.0.3

Author: Lukas22041

changelog.txt

@@ -1,3 +1,12 @@
+Version 4.0.3
+
+- Opening the console now describes a few of the common keybinds in the default chat log.
+- Opening the console no longer interupts the current campaign music.
+- Opening the console no longer hides the campaign UI in the background.
+- Fixed the console not correctly re-pausing the game in the campaign.
+
+
+
 Version 4.0.2
 
 - Goto, Jump and OpenMarket now use ID suggestions instead of name ones.

console.version

@@ -5,7 +5,7 @@
     "modVersion": {
         "major": 4,
         "minor": 0,
-        "patch": 2
+        "patch": 3
     },
 
 	#Link towards a direct download, fetched from the online version file

jars/lw_Console.jar

@@ -3,7 +3,7 @@
     "name": "Console Commands",
     "author": "LazyWizard, Lukas04",
     "utility": "true",
-    "version": "4.0.2",
+    "version": "4.0.3",
     "description": "An in-game developer's console, by default summoned with control+backspace.\n\nFor a complete list of commands enter 'help'. For more information on a specific command enter 'help <command>'. Enter 'settings' to customize the console's appearance and behavior, including the key used to summon it.\n\nThis should be compatible with all mods and doesn't require a new game.",
     "gameVersion": "0.98a-RC5",
     "jars": [

mod_info.json

@@ -80,12 +80,22 @@ public void onApplicationLoad() throws Exception
         // Load console settings - implementing it in ReloadConsole ensures the command will work identically
         ReloadConsole.reloadConsole();
 
-        Console.showMessage("Console loaded, summon with " + Console.getSettings().getConsoleSummonKey() + ".", Level.DEBUG);
-
-        if (needsSetup())
-        {
-            Console.showMessage("Use the Settings command to configure the console.", Level.DEBUG);
+        if (Console.isUseLegacyConsole()) {
+            Console.showMessage("Console loaded, summon with " + Console.getSettings().getConsoleSummonKey() + ".", Level.DEBUG);
+            if (needsSetup())
+            {
+                Console.showMessage("Use the Settings command to configure the console.", Level.DEBUG);
+            }
+        } else  {
+            Console.showMessage("Console loaded", Level.DEBUG);
+            //Console.showMessage("Controls: ", Level.DEBUG);
+            Console.showMessage(" - Enter: confirm command", Level.DEBUG);
+            Console.showMessage(" - Tab: autocomplete command/argument", Level.DEBUG);
+            Console.showMessage(" - Left/Right: move cursor", Level.DEBUG);
+            Console.showMessage(" - Up/Down: scroll command history/autocomplete suggestions", Level.DEBUG);
         }
+
+
     }
 
     @Override

src/org/lazywizard/console/ConsoleModPlugin.java

@@ -1,13 +1,16 @@
 package org.lazywizard.console.overlay.v2.panels
 
 import com.fs.graphics.util.Fader
+import com.fs.starfarer.api.EveryFrameScript
 import com.fs.starfarer.api.GameState
 import com.fs.starfarer.api.Global
 import com.fs.starfarer.api.campaign.BaseCustomUIPanelPlugin
 import com.fs.starfarer.api.campaign.InteractionDialogAPI
 import com.fs.starfarer.api.campaign.InteractionDialogPlugin
 import com.fs.starfarer.api.campaign.rules.MemoryAPI
 import com.fs.starfarer.api.combat.EngagementResultAPI
+import com.fs.starfarer.api.impl.MusicPlayerPluginImpl
+import com.fs.starfarer.api.impl.campaign.ids.Factions
 import com.fs.starfarer.api.input.InputEventAPI
 import com.fs.starfarer.api.ui.CustomPanelAPI
 import com.fs.starfarer.api.ui.TooltipMakerAPI
@@ -35,6 +38,7 @@ import org.lazywizard.console.overlay.v2.elements.ConsoleTextfield
 import org.lazywizard.console.overlay.v2.font.ConsoleFont
 import org.lazywizard.console.overlay.v2.misc.ReflectionUtils
 import org.lazywizard.console.overlay.v2.misc.clearChildren
+import org.lazywizard.console.overlay.v2.misc.getChildrenCopy
 import org.lazywizard.console.overlay.v2.misc.getParent
 import org.lazywizard.console.overlay.v2.settings.ConsoleV2Settings
 import org.lazywizard.lazylib.JSONUtils
@@ -141,7 +145,7 @@ class ConsoleOverlayPanel(private val context: CommandContext) : BaseCustomUIPan
 
     var requiresRecreation = false
 
-    var placeHolderDialog: InteractionDialogAPI? = null
+    var placeHolderDialog: UIPanelAPI? = null
 
     var compileScope = CoroutineScope(Dispatchers.Default)
     var compileJob: Job? = null
@@ -165,11 +169,32 @@ class ConsoleOverlayPanel(private val context: CommandContext) : BaseCustomUIPan
 
         instance = this
 
+        if (Global.getCurrentState() == GameState.COMBAT) {
+            wasPaused = Global.getCombatEngine().isPaused
+            //Global.getCombatEngine().viewport.isExternalControl = true //Prevent moving screen with dragging
+            Global.getCombatEngine().isPaused = true
+        }
+
+        if (Global.getCurrentState() == GameState.CAMPAIGN) {
+            wasPaused = Global.getSector().isPaused
+            Global.getSector().isPaused = true;
+        }
+
         //Open a dialog to prevent input from most other mods
         if (context.isInCampaign) {
             if (!Global.getSector().campaignUI.isShowingDialog) {
-                Global.getSector().campaignUI.showInteractionDialog(PlaceholderDialog(), Global.getSector().playerFleet)
-                placeHolderDialog = Global.getSector().campaignUI.currentInteractionDialog
+                var ui = Global.getSector().campaignUI
+
+                //Use message dialog instead of InteractionDialog, as it doesnt hide campaign UI and doesnt mess with pause behaviour
+                ui.showMessageDialog("")
+                val screenPanel = ReflectionUtils.get("screenPanel", ui) as UIPanelAPI
+                placeHolderDialog = screenPanel.getChildrenCopy().find { ReflectionUtils.hasMethodOfName("getOptionMap", it)  } as? UIPanelAPI
+                if (placeHolderDialog != null) {
+                    ReflectionUtils.invoke("setOpacity", placeHolderDialog!!, 0f)
+                    ReflectionUtils.invoke("setBackgroundDimAmount", placeHolderDialog!!, 0f)
+                    ReflectionUtils.invoke("setAbsorbOutsideEvents", placeHolderDialog!!, false)
+                    ReflectionUtils.invoke("makeOptionInstant", placeHolderDialog!!, 0f)
+                }
             }
         }
 
@@ -186,18 +211,6 @@ class ConsoleOverlayPanel(private val context: CommandContext) : BaseCustomUIPan
         var state = AppDriver.getInstance().currentState
         var screenPanel = ReflectionUtils.invoke("getScreenPanel", state) as UIPanelAPI
 
-        if (Global.getCurrentState() == GameState.COMBAT) {
-            wasPaused = Global.getCombatEngine().isPaused
-            //Global.getCombatEngine().viewport.isExternalControl = true //Prevent moving screen with dragging
-            Global.getCombatEngine().isPaused = true
-        }
-
-        if (Global.getCurrentState() == GameState.CAMPAIGN) {
-            wasPaused = Global.getSector().isPaused
-            Global.getSector().isPaused = true;
-        }
-
-
 
         parent = Global.getSettings().createCustom(screenPanel.position.width, screenPanel.position.height, null)
         screenPanel.addComponent(parent)
@@ -1292,7 +1305,13 @@ class ConsoleOverlayPanel(private val context: CommandContext) : BaseCustomUIPan
 
         compileScope.cancel()
 
-        var state = AppDriver.getInstance().currentState
+       /* placeHolderDialog?.dismiss()
+        placeHolderDialog = null*/
+
+        if (placeHolderDialog != null) {
+            ReflectionUtils.invoke("dismiss", placeHolderDialog!!, 0)
+            placeHolderDialog = null
+        }
 
         if (Global.getCurrentState() == GameState.COMBAT) {
             if (!wasPaused) Global.getCombatEngine().isPaused = false
@@ -1301,12 +1320,9 @@ class ConsoleOverlayPanel(private val context: CommandContext) : BaseCustomUIPan
         }
 
         if (Global.getCurrentState() == GameState.CAMPAIGN) {
-            if (!wasPaused) Global.getSector().isPaused = false;
+            Global.getSector().isPaused = wasPaused;
         }
 
-        placeHolderDialog?.dismiss()
-        placeHolderDialog = null
-
         instance = null
         parent.getParent()?.removeComponent(parent)
     }
@@ -1353,47 +1369,4 @@ class ConsoleOverlayPanel(private val context: CommandContext) : BaseCustomUIPan
         val percent = DecimalFormat.getPercentInstance().format(used / Math.max(max, committed).toDouble())
         "$percent (${asString(used)}/${asString(Math.max(max, committed))})"
     }
-
-    class PlaceholderDialog() : InteractionDialogPlugin {
-
-        var dialog: InteractionDialogAPI? = null
-
-        override fun init(dialog: InteractionDialogAPI?) {
-            this.dialog = dialog
-
-            dialog!!.promptText = "Test"
-            /*if (dialog is UIPanelAPI) {
-                dialog.opacity = 0f
-               //var fader =ReflectionUtils.invoke("getFader", dialog) as Fader
-            }*/
-        }
-
-        override fun optionSelected(optionText: String?, optionData: Any?) {
-
-        }
-
-        override fun optionMousedOver(optionText: String?, optionData: Any?) {
-
-        }
-
-        override fun advance(amount: Float) {
-            //ReflectionUtils.invoke("setOpacity", dialog!!, 0f)
-            var fader = ReflectionUtils.invoke("getFader", dialog!!.visualPanel) as Fader
-            fader.brightness = 0f
-        }
-
-        override fun backFromEngagement(battleResult: EngagementResultAPI?) {
-
-        }
-
-        override fun getContext(): Any? {
-            return null
-        }
-
-        override fun getMemoryMap(): MutableMap<String, MemoryAPI> {
-            return hashMapOf()
-        }
-
-    }
-
 }

src/org/lazywizard/console/overlay/v2/panels/ConsoleOverlayPanel.kt

@@ -16,6 +16,7 @@ object ConsoleV2Settings {
     var needsHoldShift = false
     var needsHoldAlt = false*/
 
+    @JvmStatic
     var consoleKeybind = ConsoleSettings.Keystroke(Keyboard.KEY_BACK, true, false, false)
 
     var enableBackgroundBlur = true