Merge remote-tracking branch 'deathcradle/otapi3' into otapi3

2021-12-07 21:06:48 -08:00 · 2021-12-07 21:06:48 -08:00 · c62fca5353
commit c62fca5353
parent d70f715616 0ef79230a6
28 changed files with 577 additions and 695 deletions
--- a/TShockAPI/Bouncer.cs
+++ b/TShockAPI/Bouncer.cs
@ -22,7 +22,6 @@ using Terraria.ID;
 using TShockAPI.Net;
 using Terraria;
 using Microsoft.Xna.Framework;
-using OTAPI.Tile;
 using TShockAPI.Localization;
 using static TShockAPI.GetDataHandlers;
 using Terraria.ObjectData;
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@ -33,7 +33,6 @@ using TerrariaApi.Server;
 using TShockAPI.Hooks;
 using Terraria.GameContent.Events;
 using Microsoft.Xna.Framework;
-using OTAPI.Tile;
 using TShockAPI.Localization;
 using System.Text.RegularExpressions;
 using Terraria.DataStructures;
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@ -34,7 +34,6 @@ using Terraria.DataStructures;
 using Terraria.GameContent.Tile_Entities;
 using Terraria.Localization;
 using Microsoft.Xna.Framework;
-using OTAPI.Tile;
 using TShockAPI.Localization;
 using TShockAPI.Models;
 using TShockAPI.Models.PlayerUpdate;
--- a/TShockAPI/Handlers/SendTileRectHandler.cs
+++ b/TShockAPI/Handlers/SendTileRectHandler.cs
@ -1,6 +1,4 @@
-using OTAPI.Tile;
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;

--- a/TShockAPI/ItemBans.cs
+++ b/TShockAPI/ItemBans.cs
@ -23,7 +23,6 @@ using TShockAPI.DB;
 using TShockAPI.Net;
 using Terraria;
 using Microsoft.Xna.Framework;
-using OTAPI.Tile;
 using TShockAPI.Localization;
 using static TShockAPI.GetDataHandlers;
 using TerrariaApi.Server;
--- a/TShockAPI/Properties/AssemblyInfo.cs
+++ b/TShockAPI/Properties/AssemblyInfo.cs
@ -1,57 +0,0 @@
-/*
-TShock, a server mod for Terraria
-Copyright (C) 2011-2019 Pryaxis & TShock Contributors
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-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.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-
-[assembly: AssemblyTitle("TShock for Terraria")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Re-Logic, Pryaxis & TShock Contributors")]
-[assembly: AssemblyProduct("TShockAPI")]
-[assembly: AssemblyCopyright("Copyright © Re-Logic, Pryaxis & TShock Contributors 2011-2021")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-
-[assembly: Guid("01e38989-993c-410c-9011-487f824a606d")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Starting in version 4.2.5, we are no longer including the fourth decimal
-//      location, which previously held the date and time.
-
-// Also, be sure to release on github with the exact assembly version tag as below
-// so that the update manager works correctly (via the Github releases api and mimic)
-
-[assembly: AssemblyVersion("4.5.12")]
-[assembly: AssemblyFileVersion("4.5.12")]
--- a/TShockAPI/TSPlayer.cs
+++ b/TShockAPI/TSPlayer.cs
@ -25,7 +25,6 @@ using System.IO;
 using System.Text;
 using System.Threading;
 using System.Timers;
-using OTAPI.Tile;
 using Terraria;
 using Terraria.DataStructures;
 using Terraria.ID;
--- a/TShockAPI/TSServerPlayer.cs
+++ b/TShockAPI/TSServerPlayer.cs
@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

 using Microsoft.Xna.Framework;
-using OTAPI.Tile;
 using System;
 using System.Collections.Generic;
 using Terraria;
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@ -28,7 +28,7 @@ using System.Linq;
 using System.Net;
 using System.Reflection;
 using MaxMind;
-using Mono.Data.Sqlite;
+using System.Data.SQLite;
 using MySql.Data.MySqlClient;
 using Newtonsoft.Json;
 using Rests;
@ -45,6 +45,7 @@ using TShockAPI.CLI;
 using TShockAPI.Localization;
 using TShockAPI.Configuration;
 using Terraria.GameContent.Creative;
+using System.Runtime.InteropServices;

 namespace TShockAPI
 {
@ -190,6 +191,55 @@ namespace TShockAPI
 			instance = this;
 		}

+
+		static Dictionary<string, IntPtr> _nativeCache = new Dictionary<string, IntPtr>();
+		static IntPtr ResolveNativeDep(string libraryName, Assembly assembly, DllImportSearchPath? searchPath)
+		{
+			if (_nativeCache.TryGetValue(libraryName, out IntPtr cached))
+				return cached;
+
+			IEnumerable<string> matches = Enumerable.Empty<string>();
+
+			if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+			{
+				var osx = Path.Combine(Environment.CurrentDirectory, "runtimes", "osx-x64");
+				if(Directory.Exists(osx))
+					matches = Directory.GetFiles(osx, "*" + libraryName + "*", SearchOption.AllDirectories);
+			}
+			else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+			{
+				var lib64 = Path.Combine(Environment.CurrentDirectory, "runtimes", "linux-x64");
+				if (Directory.Exists(lib64))
+					matches = Directory.GetFiles(lib64, "*" + libraryName + "*", SearchOption.AllDirectories);
+			}
+			else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+			{
+				var x64 = Path.Combine(Environment.CurrentDirectory, "runtimes", "win-x64");
+				if (Directory.Exists(x64))
+					matches = Directory.GetFiles(x64, "*" + libraryName + "*", SearchOption.AllDirectories);
+			}
+
+			if (matches.Count() == 0)
+			{
+				matches = Directory.GetFiles(Environment.CurrentDirectory, "*" + libraryName + "*");
+			}
+
+			Debug.WriteLine($"Looking for `{libraryName}` with {matches.Count()} match(es)");
+
+			var handle = IntPtr.Zero;
+
+			if (matches.Count() == 1)
+			{
+				var match = matches.Single();
+				handle = NativeLibrary.Load(match);
+			}
+
+			// cache either way. if zero, no point calling IO if we've checked this assembly before.
+			_nativeCache.Add(libraryName, handle);
+
+			return handle;
+		}
+
 		/// <summary>Initialize - Called by the TerrariaServerAPI during initialization.</summary>
 		[SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
 		public override void Initialize()
@ -197,18 +247,18 @@ namespace TShockAPI
 			string logFilename;
 			string logPathSetupWarning;

-			OTAPI.Hooks.Net.Socket.Create = () =>
+			OTAPI.Hooks.Netplay.CreateTcpListener += (sender, args) =>
 			{
-				//Console.WriteLine($"Creating socket {nameof(LinuxTcpSocket)}");
-				return new LinuxTcpSocket();
-				//return new OTAPI.Sockets.PoolSocket();
-				//return new Terraria.Net.Sockets.TcpSocket();
+				args.Result = new LinuxTcpSocket();
 			};
-			OTAPI.Hooks.Player.Announce = (int playerId) =>
+			OTAPI.Hooks.NetMessage.PlayerAnnounce += (sender, args) =>
 			{
 				//TShock handles this
-				return OTAPI.HookResult.Cancel;
+				args.Result = OTAPI.HookResult.Cancel;
 			};
+			// if sqlite.interop cannot be found, try and search the runtimes folder. this usually happens when debugging tsapi
+			// since it does not have the dependency installed directly
+			NativeLibrary.SetDllImportResolver(typeof(SQLiteConnection).Assembly, ResolveNativeDep);

 			Main.SettingsUnlock_WorldEvil = true;

@ -269,7 +319,7 @@ namespace TShockAPI
 				{
 					string sql = Path.Combine(SavePath, Config.Settings.SqliteDBPath);
 					Directory.CreateDirectory(Path.GetDirectoryName(sql));
-					DB = new SqliteConnection(string.Format("uri=file://{0},Version=3", sql));
+					DB = new SQLiteConnection(string.Format("Data Source={0},Version=3", sql));
 				}
 				else if (Config.Settings.StorageType.ToLower() == "mysql")
 				{
--- a/TShockAPI/TShockAPI.csproj
+++ b/TShockAPI/TShockAPI.csproj
@ -1,242 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{49606449-072B-4CF5-8088-AA49DA586694}</ProjectGuid>
    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>TShockAPI</RootNamespace>
-    <AssemblyName>TShockAPI</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <TargetFramework>net6.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DocumentationFile>bin\Debug\TShockAPI.XML</DocumentationFile>
-    <PlatformTarget>x86</PlatformTarget>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;COMPAT_SIGS</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DocumentationFile>bin\Release\TShockAPI.XML</DocumentationFile>
-    <PlatformTarget>x86</PlatformTarget>
-    <Prefer32Bit>false</Prefer32Bit>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+    <PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
+    <!-- 
+      Version information for an assembly consists of the following four values:
+
+          Major Version
+          Minor Version 
+          Build Number
+          Starting in version 4.2.5, we are no longer including the fourth decimal
+          location, which previously held the date and time.
+
+      Also, be sure to release on github with the exact assembly version tag as below
+      so that the update manager works correctly (via the Github releases api and mimic)
+    -->
+		<Version>4.5.7-beta</Version>
+    <AssemblyTitle>TShock for Terraria</AssemblyTitle>
+    <Company>Pryaxis &amp; TShock Contributors</Company>
+    <Product>TShockAPI</Product>
+    <Copyright>Copyright © Pryaxis &amp; TShock Contributors 2011-2021</Copyright>
  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="BCrypt.Net-Next" Version="4.0.2" />
+    <PackageReference Include="MySql.Data" Version="8.0.27" />
+    <PackageReference Include="SQLite" Version="3.13.0" />
+    <PackageReference Include="System.Data.SQLite.Core" Version="1.0.115.5" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\TerrariaServerAPI\TerrariaServerAPI\TerrariaServerAPI.csproj" />
+  </ItemGroup>
+
  <ItemGroup>
-    <Reference Include="BCrypt.Net, Version=0.1.4141.31969, Culture=neutral, PublicKeyToken=f3bc8f8c31beeb49, processorArchitecture=MSIL">
-      <HintPath>..\packages\BCrypt.Net.0.1.0\lib\net35\BCrypt.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
    <Reference Include="HttpServer">
      <HintPath>..\prebuilts\HttpServer.dll</HintPath>
    </Reference>
-    <Reference Include="Mono.Data.Sqlite">
-      <HintPath>..\prebuilts\Mono.Data.Sqlite.dll</HintPath>
-    </Reference>
-    <Reference Include="MySql.Data, Version=6.9.8.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.6.9.8\lib\net45\MySql.Data.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="OTAPI">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath Condition="Exists('..\TerrariaServerAPI\TerrariaServerAPI\bin\$(ConfigurationName)\OTAPI.dll')">..\TerrariaServerAPI\TerrariaServerAPI\bin\$(ConfigurationName)\OTAPI.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Web" />
  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="BackupManager.cs" />
-    <Compile Include="CLI\CommandLineParser.cs" />
-    <Compile Include="CLI\FlagSet.cs" />
-    <Compile Include="Configuration\ConfigFile.cs" />
-    <Compile Include="Configuration\IConfigFile.cs" />
-    <Compile Include="Configuration\TShockConfig.cs" />
-    <Compile Include="DB\ProjectileManager.cs" />
-    <Compile Include="DB\RegionManager.cs" />
-    <Compile Include="DB\ResearchDatastore.cs" />
-    <Compile Include="DB\TileManager.cs" />
-    <Compile Include="Extensions\ExceptionExt.cs" />
-    <Compile Include="Handlers\DisplayDollItemSyncHandler.cs" />
-    <Compile Include="Handlers\IPacketHandler.cs" />
-    <Compile Include="Handlers\NetModules\AmbienceHandler.cs" />
-    <Compile Include="Handlers\NetModules\BestiaryHandler.cs" />
-    <Compile Include="Handlers\NetModules\CreativePowerHandler.cs" />
-    <Compile Include="Handlers\NetModules\CreativeUnlocksHandler.cs" />
-    <Compile Include="Handlers\NetModules\INetModuleHandler.cs" />
-    <Compile Include="Handlers\NetModules\LiquidHandler.cs" />
-    <Compile Include="Handlers\NetModules\NetModulePacketHandler.cs" />
-    <Compile Include="Handlers\NetModules\PylonHandler.cs" />
-    <Compile Include="Handlers\EmojiHandler.cs" />
-    <Compile Include="Handlers\LandGolfBallInCupHandler.cs" />
-    <Compile Include="Handlers\RequestTileEntityInteractionHandler.cs" />
-    <Compile Include="Handlers\SendTileRectHandler.cs" />
-    <Compile Include="Handlers\SyncTilePickingHandler.cs" />
-    <Compile Include="Handlers\IllegalPerSe\EmojiPlayerMismatch.cs" />
-    <Compile Include="Hooks\AccountHooks.cs" />
-    <Compile Include="Hooks\GeneralHooks.cs" />
-    <Compile Include="Hooks\PlayerHooks.cs" />
-    <Compile Include="Hooks\RegionHooks.cs" />
-    <Compile Include="ILog.cs" />
-    <Compile Include="Localization\EnglishLanguage.cs" />
-    <Compile Include="Models\PlayerUpdate\ControlSet.cs" />
-    <Compile Include="Models\PlayerUpdate\MiscDataSet1.cs" />
-    <Compile Include="Models\PlayerUpdate\MiscDataSet2.cs" />
-    <Compile Include="Models\PlayerUpdate\MiscDataSet3.cs" />
-    <Compile Include="Models\Projectiles\NewProjectileData.cs" />
-    <Compile Include="NetItem.cs" />
-    <Compile Include="PlayerData.cs" />
-    <Compile Include="RegionHandler.cs" />
-    <Compile Include="Sockets\LinuxTcpSocket.cs" />
-    <Compile Include="SqlLog.cs" />
-    <Compile Include="TextLog.cs" />
-    <Compile Include="PaginationTools.cs" />
-    <Compile Include="Rest\RestPermissions.cs" />
-    <Compile Include="SaveManager.cs" />
-    <Compile Include="DB\BanManager.cs" />
-    <Compile Include="DB\CharacterManager.cs" />
-    <Compile Include="DB\IQueryBuilder.cs" />
-    <Compile Include="DB\ItemManager.cs" />
-    <Compile Include="DB\SqlColumn.cs" />
-    <Compile Include="DB\SqlTable.cs" />
-    <Compile Include="DB\SqlValue.cs" />
-    <Compile Include="Extensions\DbExt.cs" />
-    <Compile Include="DB\GroupManager.cs" />
-    <Compile Include="DB\UserManager.cs" />
-    <Compile Include="Extensions\RandomExt.cs" />
-    <Compile Include="Extensions\StringExt.cs" />
-    <Compile Include="GeoIPCountry.cs" />
-    <Compile Include="HandlerList.cs" />
-    <Compile Include="IPackable.cs" />
-    <Compile Include="Commands.cs" />
-    <Compile Include="FileTools.cs" />
-    <Compile Include="GetDataHandlers.cs" />
-    <Compile Include="Group.cs" />
-    <Compile Include="Extensions\LinqExt.cs" />
-    <Compile Include="Net\BaseMsg.cs" />
-    <Compile Include="Net\DisconnectMsg.cs" />
-    <Compile Include="Net\NetTile.cs" />
-    <Compile Include="Net\ProjectileRemoveMsg.cs" />
-    <Compile Include="Net\SpawnMsg.cs" />
-    <Compile Include="Net\WorldInfoMsg.cs" />
-    <Compile Include="Permissions.cs" />
-    <Compile Include="DB\RememberedPosManager.cs" />
-    <Compile Include="Bouncer.cs" />
-    <Compile Include="ItemBans.cs" />
-    <Compile Include="Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Rest\Rest.cs" />
-    <Compile Include="Rest\RestCommand.cs" />
-    <Compile Include="Rest\RestManager.cs" />
-    <Compile Include="Rest\RestObject.cs" />
-    <Compile Include="Rest\RestVerbs.cs" />
-    <Compile Include="Rest\SecureRest.cs" />
-    <Compile Include="Configuration\ServerSideConfig.cs" />
-    <Compile Include="TSServerPlayer.cs" />
-    <Compile Include="Utils.cs" />
-    <Compile Include="TShock.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TSPlayer.cs" />
-    <Compile Include="UpdateManager.cs" />
-    <Compile Include="DB\WarpsManager.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
-    <None Include="TShockAPI.licenseheader" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <SubType>Designer</SubType>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include=".NETFramework,Version=v4.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\TerrariaServerAPI\TerrariaServerAPI\TerrariaServerAPI.csproj">
-      <Project>{6877506e-adc6-4142-98a6-79e4fa02855a}</Project>
-      <Name>TerrariaServerAPI</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-  </PropertyGroup>
-  <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </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" />
-    </VisualStudio>
-  </ProjectExtensions>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+
 </Project>
--- a/TShockAPI/app.config
+++ b/TShockAPI/app.config
@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <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.8.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
-    </DbProviderFactories>
-  </system.data>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup></configuration>
--- a/TShockAPI/packages.config
+++ b/TShockAPI/packages.config
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="BCrypt.Net" version="0.1.0" targetFramework="net45" />
-  <package id="MySql.Data" version="6.9.8" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
-</packages>
--- a/TShockAPI/web.config
+++ b/TShockAPI/web.config
@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <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.8.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
-    </DbProviderFactories>
-  </system.data>
-</configuration>