Changed to new message color statics, and covering more exceptions

FabioZumbi12 · Apr 29, 2020 · 617fd53 · 617fd53
1 parent 78d3041
commit 617fd53
Show file tree

Hide file tree

Showing 6 changed files with 421 additions and 339 deletions.
diff --git a/SEDiscordBridge/DiscordBridge.cs b/SEDiscordBridge/DiscordBridge.cs
diff --git a/SEDiscordBridge/SEDBControl.xaml b/SEDiscordBridge/SEDBControl.xaml
@@ -160,7 +160,7 @@
         <CheckBox Content="Enable BOT Status" Margin="3" IsChecked="{Binding UseStatus}" />
         <StackPanel Orientation="Horizontal">
             <TextBox Width="180" Text="{Binding StatusInterval}" ToolTip="Interval to update the BOT status in millis. 1000 ms = 1 second" Margin="3" />
-            <Label Content="Update Status Interval"/>
+            <Label Content="Update Status Interval (in ms)"/>
         </StackPanel>
         <StackPanel Orientation="Horizontal">
             <TextBox Width="180" Text="{Binding StatusPre}" ToolTip="Text to show until server is starting" Margin="3" />

diff --git a/SEDiscordBridge/SEDBControl.xaml.cs b/SEDiscordBridge/SEDBControl.xaml.cs
@@ -1,12 +1,12 @@
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 using System.Data;
 using System.Diagnostics;
 using System.Linq;
+using System.Reflection;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Navigation;
-using VRage.Game;
+using VRageMath;
 
 namespace SEDiscordBridge
 {
@@ -27,8 +27,8 @@ public SEDBControl(SEDiscordBridgePlugin plugin) : this()
             Plugin = plugin;
             DataContext = plugin.Config;
 
-            cbFontColor.ItemsSource = new ObservableCollection<string>(typeof(MyFontEnum).GetFields().Select(x => x.Name).ToList());
-            cbFacFontColor.ItemsSource = new ObservableCollection<string>(typeof(MyFontEnum).GetFields().Select(x => x.Name).ToList());
+            cbFontColor.ItemsSource = new ObservableCollection<string>(typeof(Color).GetProperties(BindingFlags.Static | BindingFlags.Public).Select(x => x.Name).ToList());
+            cbFacFontColor.ItemsSource = new ObservableCollection<string>(typeof(Color).GetProperties(BindingFlags.Static | BindingFlags.Public).Select(x => x.Name).ToList());
             UpdateFacDataGrid();
             UpdatePermsDataGrid();
         }

diff --git a/SEDiscordBridge/SEDiscordBridge.csproj b/SEDiscordBridge/SEDiscordBridge.csproj
@@ -161,6 +161,10 @@
       <HintPath>..\..\..\..\SpaceEngineersDedicado\torch-server\DedicatedServer64\VRage.Library.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="VRage.Math">
+      <HintPath>..\..\..\..\SpaceEngineersDedicado\torch-server\DedicatedServer64\VRage.Math.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="websocket-sharp, Version=1.0.2.32519, Culture=neutral, PublicKeyToken=5660b08a1845a91e, processorArchitecture=MSIL">
       <HintPath>..\packages\WebSocketSharp-NonPreRelease.1.0.0\lib\net35\websocket-sharp.dll</HintPath>
       <Private>False</Private>