diff --git a/Intrinsics/MyMod.cs b/Intrinsics/MyMod.cs index 9fbeff3..947fe2e 100644 --- a/Intrinsics/MyMod.cs +++ b/Intrinsics/MyMod.cs @@ -16,7 +16,10 @@ partial class IntrinsicsMod : Mod { internal Item TradeItem = new Item(); internal bool IsTrading = false; - internal UIIntrinsicsDialog IntrinsicsDialog; + internal UIIntrinsicsDialog ControlPanelDialog; + + internal ModHotKey ControlPanelHotkey; + //////////////// @@ -35,8 +38,10 @@ partial class IntrinsicsMod : Mod { public override void Load() { ModContent.GetInstance()?.LoadContent(); + this.ControlPanelHotkey = this.RegisterHotKey( "Control Panel", "P" ); + if( !Main.dedServ ) { - this.IntrinsicsDialog = new UIIntrinsicsDialog(); + this.ControlPanelDialog = new UIIntrinsicsDialog(); this.InitializeControlsUI(); } } diff --git a/Intrinsics/MyPlayer.cs b/Intrinsics/MyPlayer.cs index cb083aa..f62e259 100644 --- a/Intrinsics/MyPlayer.cs +++ b/Intrinsics/MyPlayer.cs @@ -1,13 +1,14 @@ -using HamstarHelpers.Helpers.Debug; -using Intrinsics.Items; -using Intrinsics.NetProtocols; -using Intrinsics.NPCs; -using System; +using System; using System.Collections.Generic; using Terraria; +using Terraria.GameInput; using Terraria.ID; using Terraria.ModLoader; using Terraria.ModLoader.IO; +using HamstarHelpers.Helpers.Debug; +using Intrinsics.Items; +using Intrinsics.NetProtocols; +using Intrinsics.NPCs; namespace Intrinsics { @@ -230,5 +231,14 @@ partial class IntrinsicsPlayer : ModPlayer { this.PrevSelectedItem = null; } } + + + //////////////// + + public override void ProcessTriggers( TriggersSet triggersSet ) { + if( IntrinsicsMod.Instance.ControlPanelHotkey.JustPressed ) { + IntrinsicsMod.Instance.ControlPanelDialog.Open(); + } + } } } diff --git a/Intrinsics/UI/UI.cs b/Intrinsics/UI/UI.cs index 39061a7..36a6687 100644 --- a/Intrinsics/UI/UI.cs +++ b/Intrinsics/UI/UI.cs @@ -67,10 +67,10 @@ partial class IntrinsicsControlsUI : UIState { //// this.Label.OnClick += ( evt, elem ) => { - IntrinsicsMod.Instance.IntrinsicsDialog.Open(); + IntrinsicsMod.Instance.ControlPanelDialog.Open(); }; this.ButtonOpenDialog.OnClick += ( evt, elem ) => { - IntrinsicsMod.Instance.IntrinsicsDialog.Open(); + IntrinsicsMod.Instance.ControlPanelDialog.Open(); }; //// @@ -102,12 +102,12 @@ partial class IntrinsicsControlsUI : UIState { public void UpdateLayout() { var mymod = IntrinsicsMod.Instance; - int x = mymod.Config.ControlsPositionX >= 0 ? - mymod.Config.ControlsPositionX : - Main.screenWidth + mymod.Config.ControlsPositionX; - int y = mymod.Config.ControlsPositionY >= 0 ? - mymod.Config.ControlsPositionY : - Main.screenHeight + mymod.Config.ControlsPositionY; + int x = mymod.Config.ControlsPositionX >= 0 + ? mymod.Config.ControlsPositionX + : Main.screenWidth + mymod.Config.ControlsPositionX; + int y = mymod.Config.ControlsPositionY >= 0 + ? mymod.Config.ControlsPositionY + : Main.screenHeight + mymod.Config.ControlsPositionY; this.Recalculate(); diff --git a/Intrinsics/build.txt b/Intrinsics/build.txt index 682bc24..d37b0c9 100644 --- a/Intrinsics/build.txt +++ b/Intrinsics/build.txt @@ -1,6 +1,6 @@ author = hamstar version = 1.1.3 displayName = Intrinsics -modReferences = HamstarHelpers@5.2.1 +modReferences = HamstarHelpers@5.5.0 buildIgnore = *.csproj, *.user, *.bat, obj\*, bin\*, .vs\*, .git\* homepage = https://forums.terraria.org/index.php?threads/intrinsics.80322/