cleaned up previous commit

FFXIVClassic Common Class Lib/Sql.cs

@@ -5,76 +5,16 @@ using System.Text;
 using System.Threading.Tasks;
 using MySql.Data.MySqlClient;
 using NLog;
+using System.Data;
+using System.Data.Common;
 
 namespace FFXIVClassic.Common
 {
-    /*
+    // todo:
-    class SqlCommand
+    // havent decided whether it's worth wrapping every sql class
+    // so i'll just leave it with logger for now
+    public class Sql
     {
         public static Logger Log = LogManager.GetCurrentClassLogger();
-
-        public SqlCommand()
-        {
-
     }
-
-        public SqlCommand(string cmdText)
-        {
-            try
-            {
-                MySqlCommand.MySqlCommand("");
-            }
-        }
-        public SqlCommand(string cmdText, MySqlConnection connection);
-        public SqlCommand(string cmdText, MySqlConnection connection, MySqlTransaction transaction);
-
-        ~SqlCommand()
-        {
-
-        }
-
-        public int CacheAge { get; set; }
-        
-        public string CommandText { get; set; }
-        public int CommandTimeout { get; set; }
-        
-        public CommandType CommandType { get; set; }
-
-        public MySqlConnection Connection { get; set; }
-        
-        public bool DesignTimeVisible { get; set; }
-        public bool EnableCaching { get; set; }
-        
-        public bool IsPrepared { get; }
-        
-        public long LastInsertedId { get; }
-
-        public MySqlParameterCollection Parameters { get; }
-        
-        public MySqlTransaction Transaction { get; set; }
-        public UpdateRowSource UpdatedRowSource { get; set; }
-        protected DbConnection DbConnection { get; set; }
-        protected DbParameterCollection DbParameterCollection { get; }
-        protected DbTransaction DbTransaction { get; set; }
-
-        public IAsyncResult BeginExecuteNonQuery();
-        public IAsyncResult BeginExecuteNonQuery(AsyncCallback callback, object stateObject);
-        public IAsyncResult BeginExecuteReader();
-        public IAsyncResult BeginExecuteReader(CommandBehavior behavior);
-        public void Cancel();
-        public SqlCommand Clone();
-        public MySqlParameter CreateParameter();
-        public void Dispose();
-        public int EndExecuteNonQuery(IAsyncResult asyncResult);
-        public MySqlDataReader EndExecuteReader(IAsyncResult result);
-        public int ExecuteNonQuery();
-        public MySqlDataReader ExecuteReader();
-        public MySqlDataReader ExecuteReader(CommandBehavior behavior);
-        public object ExecuteScalar();
-        public void Prepare();
-        protected DbParameter CreateDbParameter();
-        protected void Dispose(bool disposing);
-        protected DbDataReader ExecuteDbDataReader(CommandBehavior behavior);
-    }
-    */
 }

FFXIVClassic Common Class Lib/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="MySql.Data" version="6.9.8" targetFramework="net45" />
-  <package id="NLog" version="4.3.5" targetFramework="net45" targetFramework="net45" />
+  <package id="NLog" version="4.3.5" targetFramework="net45" />
 </packages>

FFXIVClassic Lobby Server/FFXIVClassic Lobby Server.csproj

@@ -58,8 +58,9 @@
     <Reference Include="FFXIVClassic.Common">
       <HintPath>..\FFXIVClassic Common Class Lib\bin\Debug\FFXIVClassic.Common.dll</HintPath>
     </Reference>
-    <Reference Include="MySql.Data">
+    <Reference Include="MySql.Data, Version=6.9.8.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.6.9.7\lib\net45\MySql.Data.dll</HintPath>
+      <HintPath>..\packages\MySql.Data.6.9.8\lib\net45\MySql.Data.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -112,6 +113,7 @@
     <Content Include="NLog.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <None Include="app.config" />
     <None Include="NLog.xsd">
       <SubType>Designer</SubType>
     </None>

FFXIVClassic Lobby Server/NLog.config

@@ -29,7 +29,10 @@
     <target xsi:type="File" name="f" fileName="${basedir}/logs/${shortdate}.log"
             layout="${longdate} ${uppercase:${level}} ${message}" />
     -->
-        <target xsi:type="ColoredConsole" name="console" layout="[${longdate}] [${uppercase:${level}}] ${message}" />
+        <target xsi:type="ColoredConsole" name="console" layout="[${longdate}] [${uppercase:${level}}] ${message}">
+            <highlight-row condition="equals('${logger}','FFXIVClassic_Lobby_Server.packets.BasePacket') and equals('${event-context:item=color}','5')" foregroundColor="White" backgroundColor="Yellow" />
+            <highlight-row condition="equals('${logger}','FFXIVClassic_Lobby_Server.packets.SubPacket') and equals('${event-context:item=color}','5')" foregroundColor="White" backgroundColor="DarkMagenta" />
+        </target>
         <target xsi:type="File" name="file" fileName="${basedir}/logs/${shortdate}/lobby.log" layout="[${longdate}] [${uppercase:${level}}] ${message}" />
     </targets>
 

FFXIVClassic Lobby Server/app.config

@@ -3,7 +3,7 @@
   <system.data>
     <DbProviderFactories>
       <remove invariant="MySql.Data.MySqlClient" />
-      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
+      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.8.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
     </DbProviderFactories>
   </system.data>
 </configuration>

FFXIVClassic Lobby Server/packages.config

@@ -2,7 +2,7 @@
 <packages>
   <package id="Cyotek.CircularBuffer" version="1.0.0.0" targetFramework="net45" />
   <package id="Dapper" version="1.42" targetFramework="net45" />
-  <package id="MySql.Data" version="6.9.7" targetFramework="net45" />
+  <package id="MySql.Data" version="6.9.8" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
   <package id="NLog" version="4.3.4" targetFramework="net45" />
   <package id="NLog.Config" version="4.3.4" targetFramework="net45" />

FFXIVClassic Map Server/App.config

@@ -6,6 +6,6 @@
 <system.data>
     <DbProviderFactories>
       <remove invariant="MySql.Data.MySqlClient" />
-      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
+      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.8.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
     </DbProviderFactories>
   </system.data></configuration>

FFXIVClassic Map Server/FFXIVClassic Map Server.csproj

@@ -49,8 +49,8 @@
     <Reference Include="MoonSharp.Interpreter">
       <HintPath>..\packages\MoonSharp.1.2.1.0\lib\net40-client\MoonSharp.Interpreter.dll</HintPath>
     </Reference>
-    <Reference Include="MySql.Data, Version=6.9.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+    <Reference Include="MySql.Data, Version=6.9.8.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.6.9.7\lib\net45\MySql.Data.dll</HintPath>
+      <HintPath>..\packages\MySql.Data.6.9.8\lib\net45\MySql.Data.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

FFXIVClassic Map Server/NLog.config

@@ -32,7 +32,8 @@
       <!--<target xsi:type="ColoredConsole" name="console" layout="[${longdate}] [${uppercase:${level}}] ${message}" />-->
       <target xsi:type="File" name="file" fileName="${basedir}/logs/${shortdate}/map.log" layout="[${longdate}] [${uppercase:${level}}] ${message}"/>
       <target xsi:type="ColoredConsole" name="console" layout="[${longdate}] [${uppercase:${level}}] ${message}">
-          <highlight-row condition="equals('${logger}','FFXIVClassic_Map_Server.lua.LuaScript') and equals('${event-context:item=color}','5')" foregroundColor="DarkMagenta" backgroundColor="NoChange" />
+          <highlight-row condition="equals('${logger}','FFXIVClassic_Map_Server.packets.BasePacket') and equals('${event-context:item=color}','5')" foregroundColor="White" backgroundColor="Yellow" />
+          <highlight-row condition="equals('${logger}','FFXIVClassic_Map_Server.packets.SubPacket') and equals('${event-context:item=color}','5')" foregroundColor="White" backgroundColor="DarkMagenta" />
       </target>
   </targets>
 

FFXIVClassic Map Server/packages.config

@@ -3,7 +3,7 @@
   <package id="Cyotek.CircularBuffer" version="1.0.0.0" targetFramework="net45" />
   <package id="Dapper" version="1.42" targetFramework="net45" />
   <package id="MoonSharp" version="1.2.1.0" targetFramework="net45" />
-  <package id="MySql.Data" version="6.9.7" targetFramework="net45" />
+  <package id="MySql.Data" version="6.9.8" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
   <package id="NLog" version="4.3.5" targetFramework="net45" />
   <package id="NLog.Config" version="4.3.5" targetFramework="net45" />

data/lobby_config.ini

@@ -8,4 +8,4 @@ host=127.0.0.1
 port=3306
 database=ffxiv_server
 username=root
-password=
+password=root

data/map_config.ini

@@ -8,4 +8,4 @@ host=127.0.0.1
 port=3306
 database=ffxiv_server
 username=root
-password=
+password=root