Merge branch 'general-devel' of github.com:TShock/TShock into general-devel

TShockAPI/Commands.cs

@@ -20,16 +20,13 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
-using System.Net;
 using System.Text;
 using System.Threading;
 using TShockAPI.PluginUpdater;
 using Terraria;
 using TShockAPI.DB;
-using System.Reflection;
 
 namespace TShockAPI
 {

TShockAPI/DB/BanManager.cs

@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.IO;
 using MySql.Data.MySqlClient;
 
 namespace TShockAPI.DB

TShockAPI/DB/GroupManager.cs

@@ -21,7 +21,6 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Data;
 using System.Diagnostics;
-using System.IO;
 using System.Linq;
 using MySql.Data.MySqlClient;
 

TShockAPI/DB/ItemManager.cs

@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.IO;
 using System.Linq;
 using MySql.Data.MySqlClient;
 

TShockAPI/DB/RegionManager.cs

@@ -19,10 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Diagnostics.CodeAnalysis;
-using System.IO;
 using System.Linq;
-using System.Xml;
 using MySql.Data.MySqlClient;
 using Terraria;
 

TShockAPI/DB/UserManager.cs

@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 using System;
 using System.Data;
-using System.IO;
 using System.Collections.Generic;
 using System.Linq;
 using MySql.Data.MySqlClient;

TShockAPI/HandlerList.cs

@@ -20,7 +20,6 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using System.Text;
 
 namespace TShockAPI
 {

TShockAPI/Hooks/GeneralHooks.cs

@@ -15,10 +15,6 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace TShockAPI.Hooks
 {

TShockAPI/Hooks/PlayerHooks.cs

@@ -15,11 +15,9 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-using System;
+
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
 
 namespace TShockAPI.Hooks
 {

TShockAPI/PaginationTools.cs

@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
 namespace TShockAPI

TShockAPI/PluginUpdater/PluginUpdaterThread.cs

@@ -16,10 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
 using System.Threading;
 using Terraria;
 

TShockAPI/PluginUpdater/PluginVersionCheck.cs

@@ -18,9 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net;
-using System.Text;
 using JsonLoader;
 using Newtonsoft.Json;
 

TShockAPI/PluginUpdater/VersionInfo.cs

@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace JsonLoader
 {

TShockAPI/Resources.Designer.cs

@@ -27,9 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //------------------------------------------------------------------------------
 
 namespace TShockAPI {
-    using System;
-    
-    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

TShockAPI/Rest/RestManager.cs

@@ -300,8 +300,8 @@ namespace TShockAPI
 				return RestMissingParam("user");
 
 			var group = parameters["group"];
-			if (string.IsNullOrWhiteSpace(group))
+		    if (string.IsNullOrWhiteSpace(group))
-				return RestMissingParam("group");
+		        group = TShock.Config.DefaultRegistrationGroupName;
 
 			var password = parameters["password"];
 			if (string.IsNullOrWhiteSpace(password))

TShockAPI/Rest/RestPermissions.cs

@@ -16,9 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using System;
 using System.ComponentModel;
-using System.Linq;
 
 namespace Rests
 {

TShockAPI/Rest/SecureRest.cs

@@ -20,7 +20,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
-using System.Text;
 using HttpServer;
 using TShockAPI;
 using TShockAPI.DB;
@@ -55,7 +54,7 @@ namespace Rests
 			}
 
 			// TODO: Get rid of this when the old REST permission model is removed.
-			if (!TShock.Config.RestUseNewPermissionModel)
+			if (TShock.Config.RestApiEnabled && !TShock.Config.RestUseNewPermissionModel)
 			{
 				string warningMessage = string.Concat(
 					"You're using the old REST permission model which is highly vulnerable in matter of security. ",
@@ -67,7 +66,7 @@ namespace Rests
 				Console.WriteLine(warningMessage);
 				Console.ForegroundColor = ConsoleColor.Gray;
 			}
-			else
+			else if (TShock.Config.RestApiEnabled)
 			{
 				string warningMessage = string.Concat(
 					"You're using the new more secure REST permission model which can lead to compatibility problems ",

TShockAPI/SaveManager.cs

@@ -19,7 +19,6 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Threading;
-using System.Diagnostics;
 using Terraria;
 
 namespace TShockAPI

TShockAPI/TShock.cs

@@ -26,7 +26,6 @@ using System.Globalization;
 using System.IO;
 using System.Net;
 using System.Reflection;
-using System.Threading;
 using Hooks;
 using MaxMind;
 using Mono.Data.Sqlite;

TShockAPI/TShockAPI.csproj

@@ -61,22 +61,14 @@
       <HintPath>..\SqlBins\MySql.Data.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="MySql.Web, Version=6.3.6.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\SqlBins\MySql.Web.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>.\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
+    <Reference Include="TerrariaServer, Version=0.0.0.0, Culture=neutral, processorArchitecture=x86">
-    <Reference Include="TerrariaServer">
+      <SpecificVersion>False</SpecificVersion>
+      <ExecutableExtension>.exe</ExecutableExtension>
       <HintPath>..\TerrariaServerBins\TerrariaServer.exe</HintPath>
     </Reference>
   </ItemGroup>
@@ -187,7 +179,8 @@
     </PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
-    <PostBuildEvent>"$(ProjectDir)postbuild.bat"</PostBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>

TShockAPI/Utils.cs

@@ -24,7 +24,6 @@ using System.Net;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
-using TShockAPI.DB;
 using Terraria;
 
 namespace TShockAPI