Merge pull request #155 from roxaskeyheart/chromatics-3.x

Chromatics 3.x
logicallysynced · Jun 15, 2024 · 5e19375 · 5e19375
2 parents 8bb0689 + 76275cb
commit 5e19375
Show file tree

Hide file tree

Showing 29 changed files with 2,107 additions and 715 deletions.
diff --git a/Chromatics/Chromatics.csproj b/Chromatics/Chromatics.csproj
@@ -2,10 +2,10 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <StartupObject>Chromatics.Program</StartupObject>
-    <Version>3.0.4.0</Version>
+    <Version>3.0.7.0</Version>
     <Authors>Danielle Thompson</Authors>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Copyright>Danielle Thompson 2023</Copyright>
@@ -14,6 +14,7 @@
     <ApplicationIcon>Resources\Chromatics_icon_144x144.ico</ApplicationIcon>
     <PackageReleaseNotes>https://github.com/roxaskeyheart/chromatics/releases</PackageReleaseNotes>
     <Title>Chromatics</Title>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -25,30 +26,30 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autoupdater.NET.Official" Version="1.8.4" />
-    <PackageReference Include="CsvHelper" Version="30.0.1" />
+    <PackageReference Include="Autoupdater.NET.Official" Version="1.9.0" />
+    <PackageReference Include="CsvHelper" Version="32.0.3" />
     <PackageReference Include="Cyotek.Windows.Forms.ColorPicker" Version="2.0.0-beta.7" />
     <PackageReference Include="FFXIVWeather" Version="1.0.16" />
     <PackageReference Include="HidSharp" Version="2.1.0" />
     <PackageReference Include="MouseKeyHook.NetCore" Version="5.6.1.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NLog" Version="5.1.5" />
-    <PackageReference Include="Q42.HueApi" Version="3.22.0" />
-    <PackageReference Include="Q42.HueApi.Entertainment" Version="3.20.1" />
-    <PackageReference Include="RGB.NET.Core" Version="2.0.0-prerelease.108" />
-    <PackageReference Include="RGB.NET.Devices.Asus" Version="2.0.0-prerelease.108" />
-    <PackageReference Include="RGB.NET.Devices.CoolerMaster" Version="2.0.0-prerelease.108" />
-    <PackageReference Include="RGB.NET.Devices.Corsair" Version="2.0.0-prerelease.108" />
-    <PackageReference Include="RGB.NET.Devices.Logitech" Version="2.0.0-prerelease.108" />
-    <PackageReference Include="RGB.NET.Devices.Msi" Version="2.0.0-prerelease.108" />
-    <PackageReference Include="RGB.NET.Devices.Novation" Version="2.0.0-prerelease.108" />
-    <PackageReference Include="RGB.NET.Devices.OpenRGB" Version="2.0.0-prerelease.108" />
-    <PackageReference Include="RGB.NET.Devices.Razer" Version="2.0.0-prerelease.108" />
-    <PackageReference Include="RGB.NET.Devices.SteelSeries" Version="2.0.0-prerelease.108" />
-    <PackageReference Include="RGB.NET.Devices.Wooting" Version="2.0.0-prerelease.108" />
-    <PackageReference Include="RGB.NET.HID" Version="2.0.0-prerelease.108" />
-    <PackageReference Include="RGB.NET.Layout" Version="2.0.0-prerelease.108" />
-    <PackageReference Include="RGB.NET.Presets" Version="2.0.0-prerelease.108" />
+    <PackageReference Include="Q42.HueApi" Version="3.23.1" />
+    <PackageReference Include="Q42.HueApi.Entertainment" Version="3.23.1" />
+    <PackageReference Include="RGB.NET.Core" Version="2.1.1-prerelease.3" />
+    <PackageReference Include="RGB.NET.Devices.Asus" Version="2.1.1-prerelease.3" />
+    <PackageReference Include="RGB.NET.Devices.CoolerMaster" Version="2.1.1-prerelease.3" />
+    <PackageReference Include="RGB.NET.Devices.Corsair" Version="2.1.1-prerelease.3" />
+    <PackageReference Include="RGB.NET.Devices.Logitech" Version="2.1.1-prerelease.3" />
+    <PackageReference Include="RGB.NET.Devices.Msi" Version="2.1.1-prerelease.3" />
+    <PackageReference Include="RGB.NET.Devices.Novation" Version="2.1.1-prerelease.3" />
+    <PackageReference Include="RGB.NET.Devices.OpenRGB" Version="2.1.1-prerelease.3" />
+    <PackageReference Include="RGB.NET.Devices.Razer" Version="2.1.1-prerelease.3" />
+    <PackageReference Include="RGB.NET.Devices.SteelSeries" Version="2.1.1-prerelease.3" />
+    <PackageReference Include="RGB.NET.Devices.Wooting" Version="2.1.1-prerelease.3" />
+    <PackageReference Include="RGB.NET.HID" Version="2.1.1-prerelease.3" />
+    <PackageReference Include="RGB.NET.Layout" Version="2.1.1-prerelease.3" />
+    <PackageReference Include="RGB.NET.Presets" Version="2.1.1-prerelease.3" />
     <PackageReference Include="Sanford.Multimedia.Midi" Version="6.6.2" />
   </ItemGroup>
 
@@ -110,9 +111,7 @@
     <Compile Update="Forms\vDevices\Uc_VirtualLedStrip.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Update="Forms\vDevices\Uc_VirtualMousePad.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Update="Forms\vDevices\Uc_VirtualMousePad.cs" />
     <Compile Update="Forms\vDevices\Uc_VirtualHeadset.cs">
       <SubType>UserControl</SubType>
     </Compile>

diff --git a/Chromatics/Chromatics.csproj.user b/Chromatics/Chromatics.csproj.user
@@ -4,6 +4,9 @@
     <Compile Update="Chromatics.cs">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Update="Forms\Fm_FirstRun.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Update="Forms\Fm_MainWindow.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -31,6 +34,9 @@
     <Compile Update="Forms\vDevices\Uc_VirtualMouse.cs">
       <SubType>UserControl</SubType>
     </Compile>
+    <Compile Update="Forms\vDevices\Uc_VirtualMousePad.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Update="Models\VirtualDeviceModel.cs">
       <SubType>UserControl</SubType>
     </Compile>

diff --git a/Chromatics/Core/AppSettings.cs b/Chromatics/Core/AppSettings.cs
@@ -13,7 +13,7 @@ public static class AppSettings
     {
         private static SettingsModel _settings = new SettingsModel();
 
-        public static readonly string currentSettingsVersion = "1";
+        public static readonly string currentSettingsVersion = "2";
         public static readonly string currentEffectsVersion = "1";
         public static readonly string currentPalettesVersion = "1";
         public static readonly string currentMappingLayerVersion = "1";

diff --git a/Chromatics/Core/GameController.cs b/Chromatics/Core/GameController.cs
@@ -287,7 +287,8 @@ private static void ConnectFFXIVClient()
 
                     //Load Other Memory Zones
                     DutyFinderBellExtension.RefreshData(_memoryHandler);
-
+                    GameStateExtension.RefreshData(_memoryHandler);
+
                     gameConnected = true;
 
                 }
@@ -342,7 +343,7 @@ private static void GameProcessLayers()
 
                     var runningEffects = RGBController.GetRunningEffects();
 
-                    if (getCurrentPlayer.Entity == null && chatLogCount <= 0)
+                    if (getCurrentPlayer.Entity == null && chatLogCount <= 0 && !GameStateExtension.IsLoggedIn())
                     {
                         //Game is still on Main Menu or Character Screen
                         if (!_onTitle || wasPreviewed)