Adds MySql Support

TShockAPI/Commands.cs

@@ -1467,11 +1467,9 @@ namespace TShockAPI
             int givenCode = Convert.ToInt32(args.Parameters[0]);
             if (givenCode == TShock.AuthToken)
             {
-                TextWriter tw = new StreamWriter(FileTools.UsersPath, true);
+                TShock.Users.AddUser(args.Player.IP,"","","superadmin");
-                tw.Write("\n" + args.Player.IP + " superadmin");
                 args.Player.SendMessage("SuperAdmin authenticated. Please re-connect using the same IP.");
                 TShock.AuthToken = 0;
-                tw.Close();
             }
         }
 

TShockAPI/ConfigFile.cs

@@ -72,6 +72,12 @@ namespace TShockAPI
         /// </summary>
         public string StorageType = "sqlite";
 
+        public string MySqlHost = "localhost";
+        public string MySqlDbName = "";
+        public string MySqlPort = "3306";
+        public string MySqlUsername = "";
+        public string MySqlPassword = "";
+
         public static ConfigFile Read(string path)
         {
             if (!File.Exists(path))

TShockAPI/DB/BanManager.cs

@@ -36,8 +36,13 @@ namespace TShockAPI.DB
 
             using (var com = database.CreateCommand())
             {
-                com.CommandText =
+                if (TShock.Config.StorageType.ToLower() == "sqlite")
-                    "CREATE TABLE IF NOT EXISTS 'Bans' ('IP' TEXT UNIQUE , 'Name' TEXT, 'Reason' TEXT);";
+                    com.CommandText =
+                        "CREATE TABLE IF NOT EXISTS 'Bans' ('IP' TEXT UNIQUE , 'Name' TEXT, 'Reason' TEXT);";
+                else if (TShock.Config.StorageType.ToLower() == "mysql")
+                    com.CommandText =
+                        "CREATE TABLE IF NOT EXISTS  Bans (IP VARCHAR(255), Name VARCHAR(255), Reason VARCHAR(255));";
+
                 com.ExecuteNonQuery();
             }
         }

TShockAPI/DB/GroupManager.cs

@@ -19,32 +19,49 @@ namespace TShockAPI.DB
 
             using (var com = database.CreateCommand())
             {
-                com.CommandText =
+                if (TShock.Config.StorageType.ToLower() == "sqlite")
-                    "CREATE TABLE IF NOT EXISTS 'GroupList' ('ID' INTEGER PRIMARY KEY UNIQUE, 'GroupName' TEXT UNIQUE, 'Commands' TEXT, 'OrderBy' TEXT);";
+                    com.CommandText =
+                        "CREATE TABLE IF NOT EXISTS 'GroupList' ('GroupName' TEXT UNIQUE, 'Commands' TEXT, 'OrderBy' TEXT);";
+                else if (TShock.Config.StorageType.ToLower() == "mysql")
+                    com.CommandText =
+                        "CREATE TABLE IF NOT EXISTS GroupList (GroupName VARCHAR(255) UNIQUE, Commands VARCHAR(255), OrderBy VARCHAR(255));";
+
                 com.ExecuteNonQuery();
 
-                com.CommandText = "INSERT OR IGNORE INTO GroupList (GroupName, Commands, OrderBy) VALUES (@groupname, @commands, @order);";
+                if (TShock.Config.StorageType.ToLower() == "sqlite")
+                    com.CommandText = "INSERT OR IGNORE INTO GroupList (GroupName, Commands, OrderBy) VALUES (@groupname, @commands, @order);";
+                else if (TShock.Config.StorageType.ToLower() == "mysql")
+                    com.CommandText = "INSERT IGNORE INTO GroupList SET GroupName=@groupname, Commands=@commands, OrderBy=@order;";
                 com.AddParameter("@groupname", "trustedadmin");
                 com.AddParameter("@commands", "maintenance,cfg,butcher,cheat,immunetoban,ignorecheatdetection,ignoregriefdetection,usebanneditem");
                 com.AddParameter("@order", "1");
                 com.ExecuteNonQuery();
                 com.Parameters.Clear();
 
-                com.CommandText = "INSERT OR IGNORE INTO GroupList (GroupName, Commands, OrderBy) VALUES (@groupname, @commands, @order);";
+                if (TShock.Config.StorageType.ToLower() == "sqlite")
+                    com.CommandText = "INSERT OR IGNORE INTO GroupList (GroupName, Commands, OrderBy) VALUES (@groupname, @commands, @order);";
+                else if (TShock.Config.StorageType.ToLower() == "mysql")
+                    com.CommandText = "INSERT IGNORE INTO GroupList SET GroupName=@groupname, Commands=@commands, OrderBy=@order;";
                 com.AddParameter("@groupname", "admin");
                 com.AddParameter("@commands", "ban,unban,whitelist,causeevents,spawnboss,spawnmob,managewarp,time,tp,pvpfun,kill,logs,immunetokick,tphere");
                 com.AddParameter("@order", "2");
                 com.ExecuteNonQuery();
                 com.Parameters.Clear();
 
-                com.CommandText = "INSERT OR IGNORE INTO GroupList (GroupName, Commands, OrderBy) VALUES (@groupname, @commands, @order);";
+                if (TShock.Config.StorageType.ToLower() == "sqlite")
+                    com.CommandText = "INSERT OR IGNORE INTO GroupList (GroupName, Commands, OrderBy) VALUES (@groupname, @commands, @order);";
+                else if (TShock.Config.StorageType.ToLower() == "mysql")
+                    com.CommandText = "INSERT IGNORE INTO GroupList SET GroupName=@groupname, Commands=@commands, OrderBy=@order;";
                 com.AddParameter("@groupname", "newadmin");
                 com.AddParameter("@commands", "kick,editspawn,reservedslot");
                 com.AddParameter("@order", "3");
                 com.ExecuteNonQuery();
                 com.Parameters.Clear();
 
-                com.CommandText = "INSERT OR IGNORE INTO GroupList (GroupName, Commands, OrderBy) VALUES (@groupname, @commands, @order);";
+                if (TShock.Config.StorageType.ToLower() == "sqlite")
+                    com.CommandText = "INSERT OR IGNORE INTO GroupList (GroupName, Commands, OrderBy) VALUES (@groupname, @commands, @order);";
+                else if (TShock.Config.StorageType.ToLower() == "mysql")
+                    com.CommandText = "INSERT IGNORE INTO GroupList SET GroupName=@groupname, Commands=@commands, OrderBy=@order;";
                 com.AddParameter("@groupname", "default");
                 com.AddParameter("@commands", "canwater,canlava,warp,manageusers");
                 com.AddParameter("@order", "4");

TShockAPI/DB/ItemManager.cs

@@ -18,8 +18,12 @@ namespace TShockAPI.DB
 
             using (var com = database.CreateCommand())
             {
-                com.CommandText =
+                if (TShock.Config.StorageType.ToLower() == "sqlite")
-                    "CREATE TABLE IF NOT EXISTS 'ItemBans' ('ItemName' TEXT UNIQUE);";
+                    com.CommandText =
+                        "CREATE TABLE IF NOT EXISTS 'ItemBans' ('ItemName' TEXT UNIQUE);";
+                else if (TShock.Config.StorageType.ToLower() == "mysql")
+                    com.CommandText =
+                        "CREATE TABLE IF NOT EXISTS ItemBans (ItemName VARCHAR(255) UNIQUE);";
                 com.ExecuteNonQuery();
             }
         }

TShockAPI/DB/RegionManager.cs

@@ -28,6 +28,7 @@ using Community.CsharpSqlite.SQLiteClient;
 using Microsoft.Xna.Framework;
 using Terraria;
 
+
 namespace TShockAPI.DB
 {
     public class RegionManager
@@ -42,8 +43,13 @@ namespace TShockAPI.DB
 
             using (var com = database.CreateCommand())
             {
-                com.CommandText =
+                if (TShock.Config.StorageType.ToLower() == "sqlite")
-                    "CREATE TABLE IF NOT EXISTS 'Regions' ('X1' NUMERIC, 'Y1' NUMERIC, 'X2' NUMERIC, 'Y2' NUMERIC, 'RegionName' TEXT, 'WorldID' TEXT, 'UserIds' TEXT, 'Protected' NUMERIC);";
+                    com.CommandText =
+                        "CREATE TABLE IF NOT EXISTS 'Regions' ('X1' NUMERIC, 'Y1' NUMERIC, 'X2' NUMERIC, 'Y2' NUMERIC, 'RegionName' TEXT, 'WorldID' TEXT, 'UserIds' TEXT, 'Protected' NUMERIC);";
+                else if (TShock.Config.StorageType.ToLower() == "mysql")
+                    com.CommandText =
+                        "CREATE TABLE IF NOT EXISTS Regions (X1 INT(11), Y1 INT(11), X2 INT(11), Y2 INT(11), RegionName VARCHAR(255) UNIQUE, WorldID VARCHAR(255), UserIds VARCHAR(255), Protected INT(1));";
+
                 com.ExecuteNonQuery();
             }
         }

TShockAPI/DB/UserManager.cs

@@ -36,11 +36,20 @@ namespace TShockAPI.DB
 
             using (var com = database.CreateCommand())
             {
-                com.CommandText =
+                if (TShock.Config.StorageType.ToLower() == "sqlite")
-                    "CREATE TABLE IF NOT EXISTS 'Users' ('ID' INTEGER PRIMARY KEY UNIQUE, 'Username' TEXT UNIQUE, 'Password' TEXT, 'UserGroup' TEXT, 'IP' TEXT);";
+                    com.CommandText =
+                        "CREATE TABLE IF NOT EXISTS 'Users' ('ID' INTEGER PRIMARY KEY UNIQUE, 'Username' TEXT UNIQUE, 'Password' TEXT, 'UserGroup' TEXT, 'IP' TEXT);";
+                else if (TShock.Config.StorageType.ToLower() == "mysql")
+                    com.CommandText =
+                        "CREATE TABLE IF NOT EXISTS Users (ID INTEGER PRIMARY KEY UNIQUE, Username VARCHAR(255) UNIQUE, Password VARCHAR(255), UserGroup VARCHAR(255), IP VARCHAR(255));";
+                
                 com.ExecuteNonQuery();
 
-                com.CommandText = "INSERT OR IGNORE INTO Users (ID, UserGroup, IP) VALUES (@id, @group, @ip);";
+                if (TShock.Config.StorageType.ToLower() == "sqlite")
+                    com.CommandText = "INSERT OR IGNORE INTO Users (ID, UserGroup, IP) VALUES (@id, @group, @ip);";
+                else if (TShock.Config.StorageType.ToLower() == "mysql")
+                    com.CommandText = "INSERT IGNORE INTO Users (ID, UserGroup, IP) VALUES (@id, @group, @ip);";
+
                 com.AddParameter("@id", 1);
                 com.AddParameter("@ip", "127.0.0.1");
                 com.AddParameter("@group", "superadmin");

TShockAPI/DB/WarpsManager.cs

@@ -40,8 +40,13 @@ namespace TShockAPI.DB
 
             using (var com = database.CreateCommand())
             {
-                com.CommandText =
+                if (TShock.Config.StorageType.ToLower() == "sqlite")
-                    "CREATE TABLE IF NOT EXISTS 'Warps' ('X' NUMERIC, 'Y' NUMERIC, 'WarpName' TEXT UNIQUE, 'WorldID' TEXT);";
+                    com.CommandText =
+                        "CREATE TABLE IF NOT EXISTS 'Warps' ('X' NUMERIC, 'Y' NUMERIC, 'WarpName' TEXT UNIQUE, 'WorldID' TEXT);";
+                else if (TShock.Config.StorageType.ToLower() == "mysql")
+                    com.CommandText =
+                       "CREATE TABLE IF NOT EXISTS Warps (X INT(11), Y INT(11), WarpName VARCHAR(255) UNIQUE, WorldID VARCHAR(255));";
+
                 com.ExecuteNonQuery();
             }
         }

TShockAPI/FileTools.cs

@@ -25,11 +25,7 @@ namespace TShockAPI
     {
         public static string RulesPath { get { return Path.Combine(TShock.SavePath, "rules.txt"); } }
         public static string MotdPath { get { return Path.Combine(TShock.SavePath, "motd.txt"); } }
-        public static string BansPath { get { return Path.Combine(TShock.SavePath, "bans.txt"); } }
         public static string WhitelistPath { get { return Path.Combine(TShock.SavePath, "whitelist.txt"); } }
-        public static string GroupsPath { get { return Path.Combine(TShock.SavePath, "groups.txt"); } }
-        public static string UsersPath { get { return Path.Combine(TShock.SavePath, "users.txt"); } }
-        public static string ItemBansPath { get { return Path.Combine(TShock.SavePath, "itembans.txt"); } }
         public static string RememberedPosPath { get { return Path.Combine(TShock.SavePath, "oldpos.xml"); } }
         public static string ConfigPath { get { return Path.Combine(TShock.SavePath, "config.json"); } }
 
@@ -58,11 +54,7 @@ namespace TShockAPI
 
             CreateIfNot(RulesPath, "Respect the admins!\nDon't use TNT!");
             CreateIfNot(MotdPath, "This server is running TShock. Type /help for a list of commands.\n%255,000,000%Current map: %map%\nCurrent players: %players%");
-            CreateIfNot(BansPath);
             CreateIfNot(WhitelistPath);
-            CreateIfNot(GroupsPath, Resources.groups);
-            CreateIfNot(UsersPath, Resources.users);
-            CreateIfNot(ItemBansPath, Resources.itembans);
 
             try
             {

TShockAPI/TShock.cs

@@ -23,6 +23,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Net;
 using System.Reflection;
+using MySql.Data.MySqlClient;
 using Community.CsharpSqlite.SQLiteClient;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Content;
@@ -107,7 +108,22 @@ namespace TShockAPI
             }
             else if (Config.StorageType.ToLower() == "mysql")
             {
-                throw new NotSupportedException("Mysql is not yet supported");
+                try
+                {
+                    DB = new MySqlConnection();
+                    DB.ConnectionString =
+                        "Server='" + Config.MySqlHost +
+                        "';Port='" + Config.MySqlPort +
+                        "';Database='" + Config.MySqlDbName +
+                        "';Uid='" + Config.MySqlUsername +
+                        "';Pwd='" + Config.MySqlPassword + "';";
+                    DB.Open();
+                }
+                catch(MySqlException ex)
+                {
+                    Log.Error(ex.ToString());
+                    throw new Exception("MySql not setup correctly");                    
+                }
             }
             else
             {

TShockAPI/TShockAPI.csproj

@@ -54,6 +54,14 @@
     <Reference Include="Microsoft.Xna.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" />
     <Reference Include="Microsoft.Xna.Framework.Game, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" />
     <Reference Include="Microsoft.Xna.Framework.Graphics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" />
+    <Reference Include="MySql.Data, Version=6.3.6.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\TShock Testing Environment\MySql.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="MySql.Web, Version=6.3.6.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\TShock Testing Environment\MySql.Web.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>.\Newtonsoft.Json.dll</HintPath>
     </Reference>
@@ -152,7 +160,7 @@
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_IncrementBeforeBuild="False" BuildVersion_StartDate="2011/6/17" BuildVersion_BuildVersioningStyle="None.None.None.MonthAndDayStamp" BuildVersion_BuildAction="Both" BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" />
+      <UserProperties BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" BuildVersion_BuildAction="Both" BuildVersion_BuildVersioningStyle="None.None.None.MonthAndDayStamp" BuildVersion_StartDate="2011/6/17" BuildVersion_IncrementBeforeBuild="False" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.