add Api suffix to ApiHawk interfaces, so they will stop colliding with non-api interfaces

src/BizHawk.Client.Common/Api/APISubsetContainer.cs

@@ -7,15 +7,15 @@ namespace BizHawk.Client.Common
 	{
 		public Dictionary<Type, IExternalApi> Libraries { get; set; }
 
-		public IEmu Emu => (IEmu) Libraries[typeof(IEmu)];
+		public IEmuApi Emu => (IEmuApi) Libraries[typeof(IEmuApi)];
 		public IGameInfoApi GameInfo => (IGameInfoApi) Libraries[typeof(IGameInfoApi)];
-		public IJoypad Joypad => (IJoypad) Libraries[typeof(IJoypad)];
-		public IMem Mem => (IMem) Libraries[typeof(IMem)];
-		public IMemEvents MemEvents => (IMemEvents) Libraries[typeof(IMemEvents)];
-		public IMemorySaveState MemorySaveState => (IMemorySaveState) Libraries[typeof(IMemorySaveState)];
-		public IInputMovie Movie => (IInputMovie) Libraries[typeof(IInputMovie)];
-		public ISql Sql => (ISql) Libraries[typeof(ISql)];
-		public IUserData UserData => (IUserData) Libraries[typeof(IUserData)];
+		public IJoypadApi Joypad => (IJoypadApi) Libraries[typeof(IJoypadApi)];
+		public IMemApi Mem => (IMemApi) Libraries[typeof(IMemApi)];
+		public IMemEventsApi MemEvents => (IMemEventsApi) Libraries[typeof(IMemEventsApi)];
+		public IMemorySaveStateApi MemorySaveState => (IMemorySaveStateApi) Libraries[typeof(IMemorySaveStateApi)];
+		public IInputMovieApi Movie => (IInputMovieApi) Libraries[typeof(IInputMovieApi)];
+		public ISqlApi Sql => (ISqlApi) Libraries[typeof(ISqlApi)];
+		public IUserDataApi UserData => (IUserDataApi) Libraries[typeof(IUserDataApi)];
 
 		public ApiSubsetContainer(Dictionary<Type, IExternalApi> libs)
 		{

src/BizHawk.Client.Common/Api/Classes/MemApi.cs

@@ -9,7 +9,7 @@ using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.Common
 {
-	public sealed class MemApi : IMem
+	public sealed class MemApi : IMemApi
 	{
 		[RequiredService]
 		private IEmulator Emulator { get; set; }

src/BizHawk.Client.Common/Api/Classes/MemEventsApi.cs

@@ -2,7 +2,7 @@
 
 namespace BizHawk.Client.Common
 {
-	public sealed class MemEventsApi : IMemEvents
+	public sealed class MemEventsApi : IMemEventsApi
 	{
 		[RequiredService]
 		private IDebuggable DebuggableCore { get; set; }

src/BizHawk.Client.Common/Api/Classes/MemorySaveStateApi.cs

@@ -4,7 +4,7 @@ using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.Common
 {
-	public sealed class MemorySaveStateApi : IMemorySaveState
+	public sealed class MemorySaveStateApi : IMemorySaveStateApi
 	{
 		[RequiredService]
 		private IStatable StatableCore { get; set; }

src/BizHawk.Client.Common/Api/Classes/SqlApi.cs

@@ -4,7 +4,7 @@ using System.Data.SQLite;
 
 namespace BizHawk.Client.Common
 {
-	public sealed class SqlApi : ISql
+	public sealed class SqlApi : ISqlApi
 	{
 		private SQLiteConnection _dbConnection;
 

src/BizHawk.Client.Common/Api/Interfaces/ICommApi.cs

@@ -1,6 +1,6 @@
 namespace BizHawk.Client.Common
 {
-	public interface IComm : IExternalApi
+	public interface ICommApi : IExternalApi
 	{
 		string SocketServerScreenShot();
 		string SocketServerScreenShotResponse();

src/BizHawk.Client.Common/Api/Interfaces/IEmuApi.cs

@@ -4,7 +4,7 @@ using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.Common
 {
-	public interface IEmu : IExternalApi
+	public interface IEmuApi : IExternalApi
 	{
 		Action FrameAdvanceCallback { get; set; }
 		Action YieldCallback { get; set; }

src/BizHawk.Client.Common/Api/Interfaces/IGuiApi.cs

@@ -4,7 +4,7 @@ using System.Drawing.Imaging;
 
 namespace BizHawk.Client.Common
 {
-	public interface IGui : IDisposable, IExternalApi
+	public interface IGuiApi : IDisposable, IExternalApi
 	{
 		void ToggleCompositingMode();
 		ImageAttributes GetAttributes();

src/BizHawk.Client.Common/Api/Interfaces/IInputApi.cs

@@ -2,7 +2,7 @@
 
 namespace BizHawk.Client.Common
 {
-	public interface IInput : IExternalApi
+	public interface IInputApi : IExternalApi
 	{
 		Dictionary<string, bool> Get();
 		Dictionary<string, object> GetMouse();

src/BizHawk.Client.Common/Api/Interfaces/IInputMovieApi.cs

@@ -2,7 +2,7 @@
 
 namespace BizHawk.Client.Common
 {
-	public interface IInputMovie : IExternalApi
+	public interface IInputMovieApi : IExternalApi
 	{
 		bool StartsFromSavestate();
 		bool StartsFromSaveram();

src/BizHawk.Client.Common/Api/Interfaces/IJoypadApi.cs

@@ -2,7 +2,7 @@
 
 namespace BizHawk.Client.Common
 {
-	public interface IJoypad : IExternalApi
+	public interface IJoypadApi : IExternalApi
 	{
 		IDictionary<string, object> Get(int? controller = null);
 		IDictionary<string, object> GetImmediate(int? controller = null);

src/BizHawk.Client.Common/Api/Interfaces/IMemApi.cs

@@ -2,7 +2,7 @@
 
 namespace BizHawk.Client.Common
 {
-	public interface IMem : IExternalApi
+	public interface IMemApi : IExternalApi
 	{
 		void SetBigEndian(bool enabled = true);
 

src/BizHawk.Client.Common/Api/Interfaces/IMemEventsApi.cs

@@ -1,12 +1,12 @@
-using BizHawk.Emulation.Common;
-
-namespace BizHawk.Client.Common
-{
-	public interface IMemEvents : IExternalApi
-	{
-		void AddReadCallback(MemoryCallbackDelegate cb, uint? address, string domain);
-		void AddWriteCallback(MemoryCallbackDelegate cb, uint? address, string domain);
-		void AddExecCallback(MemoryCallbackDelegate cb, uint? address, string domain);
-		void RemoveMemoryCallback(MemoryCallbackDelegate cb);
-	}
-}
+using BizHawk.Emulation.Common;
+
+namespace BizHawk.Client.Common
+{
+	public interface IMemEventsApi : IExternalApi
+	{
+		void AddReadCallback(MemoryCallbackDelegate cb, uint? address, string domain);
+		void AddWriteCallback(MemoryCallbackDelegate cb, uint? address, string domain);
+		void AddExecCallback(MemoryCallbackDelegate cb, uint? address, string domain);
+		void RemoveMemoryCallback(MemoryCallbackDelegate cb);
+	}
+}

src/BizHawk.Client.Common/Api/Interfaces/IMemorySaveStateApi.cs

@@ -1,6 +1,6 @@
 namespace BizHawk.Client.Common
 {
-	public interface IMemorySaveState : IExternalApi
+	public interface IMemorySaveStateApi : IExternalApi
 	{
 		string SaveCoreStateToMemory();
 		void LoadCoreStateFromMemory(string identifier);

src/BizHawk.Client.Common/Api/Interfaces/ISaveStateApi.cs

@@ -1,6 +1,6 @@
 namespace BizHawk.Client.Common
 {
-	public interface ISaveState : IExternalApi
+	public interface ISaveStateApi : IExternalApi
 	{
 		void Load(string path, bool suppressOSD = false);
 		void LoadSlot(int slotNum, bool suppressOSD = false);

src/BizHawk.Client.Common/Api/Interfaces/ISqlApi.cs

@@ -1,6 +1,6 @@
 namespace BizHawk.Client.Common
 {
-	public interface ISql : IExternalApi
+	public interface ISqlApi : IExternalApi
 	{
 		string CreateDatabase(string name);
 		string OpenDatabase(string name);

src/BizHawk.Client.Common/Api/Interfaces/IToolApi.cs

@@ -1,7 +1,7 @@
 using System;
 namespace BizHawk.Client.Common
 {
-	public interface ITool : IExternalApi
+	public interface IToolApi : IExternalApi
 	{
 		Type GetTool(string name);
 		object CreateInstance(string name);

src/BizHawk.Client.Common/Api/Interfaces/IUserDataApi.cs

@@ -1,6 +1,6 @@
 namespace BizHawk.Client.Common
 {
-	public interface IUserData : IExternalApi
+	public interface IUserDataApi : IExternalApi
 	{
 		void Set(string name, object value);
 		object Get(string key);

src/BizHawk.Client.EmuHawk/AVOut/SynclessRecordingTools.cs

@@ -7,7 +7,6 @@ using System.Windows.Forms;
 using BizHawk.Bizware.BizwareGL;
 using BizHawk.Client.Common;
 using BizHawk.Emulation.Common;
-using IGameInfo = BizHawk.Emulation.Common.IGameInfo;
 
 namespace BizHawk.Client.EmuHawk
 {

src/BizHawk.Client.EmuHawk/Api/ApiContainer.cs

@@ -7,11 +7,11 @@ namespace BizHawk.Client.EmuHawk
 {
 	public sealed class ApiContainer : ApiSubsetContainer
 	{
-		public IComm Comm => (IComm) Libraries[typeof(IComm)];
-		public IGui Gui => (IGui) Libraries[typeof(IGui)];
-		public IInput Input => (IInput) Libraries[typeof(IInput)];
-		public ISaveState SaveState => (ISaveState) Libraries[typeof(ISaveState)];
-		public ITool Tool => (ITool) Libraries[typeof(ITool)];
+		public ICommApi Comm => (ICommApi) Libraries[typeof(ICommApi)];
+		public IGuiApi Gui => (IGuiApi) Libraries[typeof(IGuiApi)];
+		public IInputApi Input => (IInputApi) Libraries[typeof(IInputApi)];
+		public ISaveStateApi SaveState => (ISaveStateApi) Libraries[typeof(ISaveStateApi)];
+		public IToolApi Tool => (IToolApi) Libraries[typeof(IToolApi)];
 
 		public ApiContainer(Dictionary<Type, IExternalApi> libs) : base(libs) {}
 	}

src/BizHawk.Client.EmuHawk/Api/Libraries/CommApi.cs

@@ -4,7 +4,7 @@ using BizHawk.Client.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
-	public sealed class CommApi : IComm
+	public sealed class CommApi : ICommApi
 	{
 		public string SocketServerScreenShot() => GlobalWin.socketServer.SendScreenshot();
 

src/BizHawk.Client.EmuHawk/Api/Libraries/EmuApi.cs

@@ -14,7 +14,7 @@ using BizHawk.Emulation.Cores.WonderSwan;
 namespace BizHawk.Client.EmuHawk
 {
 	[Description("A library for interacting with the currently loaded emulator core")]
-	public sealed class EmuApi : IEmu
+	public sealed class EmuApi : IEmuApi
 	{
 		[RequiredService]
 		private IEmulator Emulator { get; set; }
@@ -46,7 +46,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private readonly Action<string> LogCallback;
 
-		/// <summary>Using this property to get a reference to <see cref="GlobalWin.Config">GlobalWin.Config</see> is a terrible, horrible, no good, very bad idea. That's why it's not in the <see cref="IEmu">interface</see>.</summary>
+		/// <summary>Using this property to get a reference to <see cref="GlobalWin.Config">GlobalWin.Config</see> is a terrible, horrible, no good, very bad idea. That's why it's not in the <see cref="IEmuApi">interface</see>.</summary>
 		public Config ForbiddenConfigReference
 		{
 			get

src/BizHawk.Client.EmuHawk/Api/Libraries/GuiApi.cs

@@ -12,7 +12,7 @@ using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
-	public sealed class GuiApi : IGui
+	public sealed class GuiApi : IGuiApi
 	{
 		[RequiredService]
 		private IEmulator Emulator { get; set; }

src/BizHawk.Client.EmuHawk/Api/Libraries/InputApi.cs

@@ -7,7 +7,7 @@ using BizHawk.Client.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
-	public sealed class InputApi : IInput
+	public sealed class InputApi : IInputApi
 	{
 		private readonly DisplayManager _displayManager;
 

src/BizHawk.Client.EmuHawk/Api/Libraries/JoypadApi.cs

@@ -5,7 +5,7 @@ using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
-	public sealed class JoypadApi : IJoypad
+	public sealed class JoypadApi : IJoypadApi
 	{
 		public JoypadApi(Action<string> logCallback)
 		{

src/BizHawk.Client.EmuHawk/Api/Libraries/MovieApi.cs

@@ -7,7 +7,7 @@ using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
-	public sealed class MovieApi : IInputMovie
+	public sealed class MovieApi : IInputMovieApi
 	{
 		public MovieApi(Action<string> logCallback)
 		{

src/BizHawk.Client.EmuHawk/Api/Libraries/SaveStateAPI.cs

@@ -6,7 +6,7 @@ using BizHawk.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
-	public sealed class SaveStateApi : ISaveState
+	public sealed class SaveStateApi : ISaveStateApi
 	{
 		private readonly MainForm _mainForm;
 

src/BizHawk.Client.EmuHawk/Api/Libraries/ToolApi.cs

@@ -6,7 +6,7 @@ using BizHawk.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
-	public sealed class ToolApi : ITool
+	public sealed class ToolApi : IToolApi
 	{
 		public Type GetTool(string name)
 		{

src/BizHawk.Client.EmuHawk/Api/UserDataApi.cs

@@ -3,7 +3,7 @@ using BizHawk.Client.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
-	public sealed class UserDataApi : IUserData
+	public sealed class UserDataApi : IUserDataApi
 	{
 		/// <exception cref="InvalidOperationException">type of <paramref name="value"/> cannot be used in userdata</exception>
 		public void Set(string name, object value)