4.0.1

Author: Lukas22041

changelog.txt

@@ -1,3 +1,16 @@
+Version 4.0.0
+
+- Added optional lunalib settings support with a bunch of settings to customise the new UI.
+- Added tab cycling (disbled by default).
+- Added context sentitive command suggestions. (disabled by default)
+- The up/down keys will now loop through autocompletions.
+- Readded the RAM/VRAM display.
+- Reverted the name of a class to fix an issue with ShipBrowser.
+- Moved a few things to on application load, should prevent a small lag when first opening the console.
+- Fixed an issue where sometimes the same command would be added to the command history twice in a row.
+
+
+
 Version 4.0.0
 
 - Complete visual overhaul of the legacy UI.

console.version

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

data/config/LunaSettings.csv

@@ -1,5 +1,11 @@
 fieldID,fieldName,fieldType,defaultValue,secondaryValue,fieldDescription,minValue,maxValue,tab
 ,,,,,,,,
+console_keybindsHeader,Keybinds,Header,Keybinds,,,,,
+console_openKeybind,Console Keybind,Keycode,14,,Key that should be pressed to open the console. ,,,
+console_holdCTRL,Require Ctrl,Boolean,true,,"If enabled, requires CTRL to be held in addition to the keybind.",,,
+console_holdSHIFT,Require Shift,Boolean,false,,"If enabled, requires Shift to be held in addition to the keybind.",,,
+console_holdALT,Require Alt,Boolean,false,,"If enabled, requires Alt to be held in addition to the keybind.",,,
+,,,,,,,,
 console_uiHeader,UI,Header,UI,,,,,
 console_enableBackgroundBlur,Enable blur,Boolean,true,,Enable the blur that is applied to everything behind the console. This blur is only displayed when [GraphicsLib] is active and its [enableShaders] config is set to true.,,,
 console_backgroundDarkening,Background darkening,Double,0.9,,"How strongly the background is darkened while the console is open. 1 is fully dark, 0 is completely visible",0,1,
@@ -15,4 +21,9 @@ console_autocompletionsCount,Autocompletions display count,Int,20,,Sets the maxi
 ,,,,,,,,
 console_MiscHeader,Misc,Header,Misc,,,,,
 console_showRAMAndVram,Show RAM/VRAM usage,Boolean,true,,Display RAM and VRAM usage in the Console.,,,
-,,,,,,,,
+,,,,,,,,
+console_legacyHeader,Legacy Console,Header,Legacy Console,,,,,
+console_legacyText,Legacy Console,Text,"If you want to use the legacy console, it can be enabled in [""ConsoleCommands/data/console/console_settings.json""] by changing [""enableLegacyConsole""] from false to true. 
+
+The legacy console does not use any settings from this screen. 
+Configure it with the LegacyConsoleSettings command in the console.",,,,,

jars/lw_Console.jar

@@ -3,7 +3,7 @@
     "name": "Console Commands",
     "author": "LazyWizard, Lukas04",
     "utility": "true",
-    "version": "4.0.0",
+    "version": "4.0.1",
     "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

@@ -10,28 +10,24 @@ import org.lazywizard.console.BaseCommand.CommandContext
 import org.lazywizard.console.overlay.legacy.addToHistory
 import org.lazywizard.console.overlay.legacy.show
 import org.lazywizard.console.overlay.v2.panels.ConsoleOverlayPanel
+import org.lazywizard.console.overlay.v2.settings.ConsoleV2Settings
 import org.lazywizard.lazylib.StringUtils
 import java.util.*
 
 internal class ConsoleCampaignListener : CampaignInputListener, ConsoleListener {
-    override fun getListenerInputPriority(): Int = 9999
+    override fun getListenerInputPriority(): Int = Int.MAX_VALUE-10
 
     override fun processCampaignInputPreCore(events: MutableList<InputEventAPI>) {
         if (Global.getSector().campaignUI.isShowingMenu) return
 
-
-        if (ConsoleOverlayPanel.instance == null && Console.getSettings().consoleSummonKey.isPressed(events)) {
-            if (Console.isUseLegacyConsole()) {
-                show(context)
-            }
-            else if (ConsoleOverlayPanel.instance == null) {
-                ConsoleOverlayPanel(context)
-            }
+        if (ConsoleOverlayPanel.instance == null && Console.isUseLegacyConsole() && Console.getSettings().consoleSummonKey.isPressed(events)) {
+            show(context)
+            events.clear()
+        }
+        else if (ConsoleOverlayPanel.instance == null && ConsoleV2Settings.consoleKeybind.isPressed(events)) {
+            ConsoleOverlayPanel(context)
             events.clear()
         }
-
-
-
 
         Console.advance(this)
     }
@@ -64,13 +60,12 @@ internal class ConsoleCombatListener : BaseEveryFrameCombatPlugin(), ConsoleList
         if (!::context.isInitialized || Global.getCombatEngine().playerShip == null) return
 
 
-        if (ConsoleOverlayPanel.instance == null && Console.getSettings().consoleSummonKey.isPressed(events)) {
-            if (Console.isUseLegacyConsole()) {
-                show(context)
-            }
-            else if (ConsoleOverlayPanel.instance == null) {
-                ConsoleOverlayPanel(context)
-            }
+        if (ConsoleOverlayPanel.instance == null && Console.isUseLegacyConsole() && Console.getSettings().consoleSummonKey.isPressed(events)) {
+            show(context)
+            events.clear()
+        }
+        else if (ConsoleOverlayPanel.instance == null && ConsoleV2Settings.consoleKeybind.isPressed(events)) {
+            ConsoleOverlayPanel(context)
             events.clear()
         }
 

src/org/lazywizard/console/ConsolePlugins.kt

@@ -144,7 +144,7 @@ object ConsoleSettings {
         }
     }
 
-    private class KeystrokePref(val key: String, default: Keystroke) {
+    public class KeystrokePref(val key: String, default: Keystroke) {
         private var field = parseKeystroke(settings.optString(key, asString(default)))
 
         private fun asString(keystroke: Keystroke) =

src/org/lazywizard/console/ConsoleSettings.kt

@@ -29,7 +29,6 @@ public CommandResult runCommand(String args, CommandContext context)
         if (ConsoleOverlayPanel.getInstance() != null) {
             Console.showMessage("Error: This command only works within the legacy console");
             return CommandResult.ERROR;
-
         }
 
         if (!context.isInCampaign())

src/org/lazywizard/console/ShowSettings.java

@@ -1,12 +1,23 @@
 package org.lazywizard.console.overlay.v2.settings
 
 import lunalib.lunaSettings.LunaSettings
+import org.lazywizard.console.ConsoleSettings
+import org.lazywizard.console.ConsoleSettings.Keystroke
+import org.lazywizard.console.ConsoleSettings.KeystrokePref
+import org.lwjgl.input.Keyboard
 import java.awt.Color
 
 object ConsoleV2Settings {
 
     var MOD_ID = "lw_console"
 
+   /* var consoleKeybind = Keyboard.KEY_BACK
+    var needsHoldCTRL = true
+    var needsHoldShift = false
+    var needsHoldAlt = false*/
+
+    var consoleKeybind = ConsoleSettings.Keystroke(Keyboard.KEY_BACK, true, false, false)
+
     var enableBackgroundBlur = true
     var backgroundDarkening = 0.9f
     var textInputColor =  Color(243, 245,  250)
@@ -23,6 +34,18 @@ object ConsoleV2Settings {
     //Only called from the ConsoleLunaSettingsListener class
     @JvmStatic
     fun update() {
+
+        /*consoleKeybind = LunaSettings.getInt(MOD_ID, "console_openKeybind")!!
+        needsHoldCTRL = LunaSettings.getBoolean(MOD_ID, "console_holdCTRL")!!
+        needsHoldShift = LunaSettings.getBoolean(MOD_ID, "console_holdSHIFT")!!
+        needsHoldAlt = LunaSettings.getBoolean(MOD_ID, "console_holdALT")!!*/
+
+        consoleKeybind = Keystroke(LunaSettings.getInt(MOD_ID, "console_openKeybind")!!,
+            LunaSettings.getBoolean(MOD_ID, "console_holdCTRL")!!,
+            LunaSettings.getBoolean(MOD_ID, "console_holdALT")!!,
+            LunaSettings.getBoolean(MOD_ID, "console_holdSHIFT")!!
+        )
+
         enableBackgroundBlur = LunaSettings.getBoolean(MOD_ID, "console_enableBackgroundBlur")!!
         backgroundDarkening = LunaSettings.getFloat(MOD_ID, "console_backgroundDarkening")!!
         textInputColor = LunaSettings.getColor(MOD_ID, "console_inputTextColor")!!