From fab882b7a5b8ac1cbbffd47d8868530fe205d9aa Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Sat, 16 Nov 2019 16:16:33 +1000 Subject: [PATCH] Move most API interfaces and implementations to BizHawk.Client.Common --- .../BizHawk.Client.ApiHawk.csproj | 26 ------------------- .../Classes/Api/PluginBase.cs | 3 ++- .../Classes/BasicApiProvider.cs | 2 ++ .../Interfaces/IExternalApiProvider.cs | 2 ++ BizHawk.Client.ApiHawk/Interfaces/IPlugin.cs | 4 ++- .../Api/Classes}/EmuApi.cs | 2 +- .../Api/Classes}/GameInfoApi.cs | 2 +- .../Api/Classes}/JoypadApi.cs | 2 +- .../Api/Classes}/MemApi.cs | 2 +- .../Api/Classes}/MemApiBase.cs | 2 +- .../Api/Classes}/MemEventsApi.cs | 2 +- .../Api/Classes}/MemorySaveStateApi.cs | 2 +- .../Api/Classes}/MovieApi.cs | 2 +- .../Api/Classes}/SqlApi.cs | 2 +- .../Api/Classes}/UserDataApi.cs | 2 +- .../Api/Interfaces}/IApiContainer.cs | 2 +- .../Api/Interfaces}/IComm.cs | 2 +- .../Api/Interfaces}/IEmu.cs | 2 +- .../Api/Interfaces}/IExternalApi.cs | 2 +- .../Api/Interfaces}/IGameInfo.cs | 2 +- .../Api/Interfaces}/IGui.cs | 2 +- .../Api/Interfaces}/IInput.cs | 2 +- .../Api/Interfaces}/IInputMovie.cs | 2 +- .../Api/Interfaces}/IJoypad.cs | 2 +- .../Api/Interfaces}/IMem.cs | 2 +- .../Api/Interfaces}/IMemEvents.cs | 2 +- .../Api/Interfaces}/IMemorySavestate.cs | 2 +- .../Api/Interfaces}/ISaveState.cs | 2 +- .../Api/Interfaces}/ISql.cs | 2 +- .../Api/Interfaces}/ITool.cs | 2 +- .../Api/Interfaces}/IUserData.cs | 2 +- .../BizHawk.Client.Common.csproj | 26 +++++++++++++++++++ BizHawk.Client.EmuHawk/Api/ApiContainer.cs | 1 + BizHawk.Client.EmuHawk/Api/ApiManager.cs | 1 + .../Api/Libraries/CommApi.cs | 2 ++ .../Api/Libraries/GuiApi.cs | 1 + .../Api/Libraries/SaveStateAPI.cs | 1 + 37 files changed, 67 insertions(+), 54 deletions(-) rename {BizHawk.Client.ApiHawk/Classes/Api => BizHawk.Client.Common/Api/Classes}/EmuApi.cs (99%) rename {BizHawk.Client.ApiHawk/Classes/Api => BizHawk.Client.Common/Api/Classes}/GameInfoApi.cs (97%) rename {BizHawk.Client.ApiHawk/Classes/Api => BizHawk.Client.Common/Api/Classes}/JoypadApi.cs (99%) rename {BizHawk.Client.ApiHawk/Classes/Api => BizHawk.Client.Common/Api/Classes}/MemApi.cs (99%) rename {BizHawk.Client.ApiHawk/Classes/Api => BizHawk.Client.Common/Api/Classes}/MemApiBase.cs (99%) rename {BizHawk.Client.ApiHawk/Classes/Api => BizHawk.Client.Common/Api/Classes}/MemEventsApi.cs (97%) rename {BizHawk.Client.ApiHawk/Classes/Api => BizHawk.Client.Common/Api/Classes}/MemorySaveStateApi.cs (97%) rename {BizHawk.Client.ApiHawk/Classes/Api => BizHawk.Client.Common/Api/Classes}/MovieApi.cs (99%) rename {BizHawk.Client.ApiHawk/Classes/Api => BizHawk.Client.Common/Api/Classes}/SqlApi.cs (98%) rename {BizHawk.Client.ApiHawk/Classes/Api => BizHawk.Client.Common/Api/Classes}/UserDataApi.cs (95%) rename {BizHawk.Client.ApiHawk/Interfaces/Api => BizHawk.Client.Common/Api/Interfaces}/IApiContainer.cs (82%) rename {BizHawk.Client.ApiHawk/Interfaces/Api => BizHawk.Client.Common/Api/Interfaces}/IComm.cs (96%) rename {BizHawk.Client.ApiHawk/Interfaces/Api => BizHawk.Client.Common/Api/Interfaces}/IEmu.cs (96%) rename {BizHawk.Client.ApiHawk/Interfaces/Api => BizHawk.Client.Common/Api/Interfaces}/IExternalApi.cs (86%) rename {BizHawk.Client.ApiHawk/Interfaces/Api => BizHawk.Client.Common/Api/Interfaces}/IGameInfo.cs (89%) rename {BizHawk.Client.ApiHawk/Interfaces/Api => BizHawk.Client.Common/Api/Interfaces}/IGui.cs (98%) rename {BizHawk.Client.ApiHawk/Interfaces/Api => BizHawk.Client.Common/Api/Interfaces}/IInput.cs (83%) rename {BizHawk.Client.ApiHawk/Interfaces/Api => BizHawk.Client.Common/Api/Interfaces}/IInputMovie.cs (95%) rename {BizHawk.Client.ApiHawk/Interfaces/Api => BizHawk.Client.Common/Api/Interfaces}/IJoypad.cs (94%) rename {BizHawk.Client.ApiHawk/Interfaces/Api => BizHawk.Client.Common/Api/Interfaces}/IMem.cs (98%) rename {BizHawk.Client.ApiHawk/Interfaces/Api => BizHawk.Client.Common/Api/Interfaces}/IMemEvents.cs (89%) rename {BizHawk.Client.ApiHawk/Interfaces/Api => BizHawk.Client.Common/Api/Interfaces}/IMemorySavestate.cs (85%) rename {BizHawk.Client.ApiHawk/Interfaces/Api => BizHawk.Client.Common/Api/Interfaces}/ISaveState.cs (82%) rename {BizHawk.Client.ApiHawk/Interfaces/Api => BizHawk.Client.Common/Api/Interfaces}/ISql.cs (85%) rename {BizHawk.Client.ApiHawk/Interfaces/Api => BizHawk.Client.Common/Api/Interfaces}/ITool.cs (90%) rename {BizHawk.Client.ApiHawk/Interfaces/Api => BizHawk.Client.Common/Api/Interfaces}/IUserData.cs (84%) diff --git a/BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj b/BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj index 69b52c2561..d057484c40 100644 --- a/BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj +++ b/BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj @@ -56,17 +56,7 @@ - - - - - - - - - - @@ -82,25 +72,9 @@ - - - - - - - - - - - - - - - - diff --git a/BizHawk.Client.ApiHawk/Classes/Api/PluginBase.cs b/BizHawk.Client.ApiHawk/Classes/Api/PluginBase.cs index 24bf62c727..3c190c6a15 100644 --- a/BizHawk.Client.ApiHawk/Classes/Api/PluginBase.cs +++ b/BizHawk.Client.ApiHawk/Classes/Api/PluginBase.cs @@ -1,4 +1,5 @@ -using BizHawk.Emulation.Common; +using BizHawk.Client.Common; +using BizHawk.Emulation.Common; namespace BizHawk.Client.ApiHawk { diff --git a/BizHawk.Client.ApiHawk/Classes/BasicApiProvider.cs b/BizHawk.Client.ApiHawk/Classes/BasicApiProvider.cs index 01166a6496..1d35d3cb54 100644 --- a/BizHawk.Client.ApiHawk/Classes/BasicApiProvider.cs +++ b/BizHawk.Client.ApiHawk/Classes/BasicApiProvider.cs @@ -2,6 +2,8 @@ using System.Collections.Generic; using System.Linq; +using BizHawk.Client.Common; + namespace BizHawk.Client.ApiHawk { /// diff --git a/BizHawk.Client.ApiHawk/Interfaces/IExternalApiProvider.cs b/BizHawk.Client.ApiHawk/Interfaces/IExternalApiProvider.cs index d44299f7b1..fb90507cc7 100644 --- a/BizHawk.Client.ApiHawk/Interfaces/IExternalApiProvider.cs +++ b/BizHawk.Client.ApiHawk/Interfaces/IExternalApiProvider.cs @@ -1,6 +1,8 @@ using System; using System.Collections.Generic; +using BizHawk.Client.Common; + namespace BizHawk.Client.ApiHawk { /// diff --git a/BizHawk.Client.ApiHawk/Interfaces/IPlugin.cs b/BizHawk.Client.ApiHawk/Interfaces/IPlugin.cs index 444ecec8b2..b7dbb2ac98 100644 --- a/BizHawk.Client.ApiHawk/Interfaces/IPlugin.cs +++ b/BizHawk.Client.ApiHawk/Interfaces/IPlugin.cs @@ -1,4 +1,6 @@ -namespace BizHawk.Client.ApiHawk +using BizHawk.Client.Common; + +namespace BizHawk.Client.ApiHawk { interface IPlugin { diff --git a/BizHawk.Client.ApiHawk/Classes/Api/EmuApi.cs b/BizHawk.Client.Common/Api/Classes/EmuApi.cs similarity index 99% rename from BizHawk.Client.ApiHawk/Classes/Api/EmuApi.cs rename to BizHawk.Client.Common/Api/Classes/EmuApi.cs index b1508fe8dd..ea5524e1af 100644 --- a/BizHawk.Client.ApiHawk/Classes/Api/EmuApi.cs +++ b/BizHawk.Client.Common/Api/Classes/EmuApi.cs @@ -13,7 +13,7 @@ using BizHawk.Emulation.Cores.Sega.MasterSystem; using BizHawk.Emulation.Cores.WonderSwan; using BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES; -namespace BizHawk.Client.ApiHawk +namespace BizHawk.Client.Common { [Description("A library for interacting with the currently loaded emulator core")] public sealed class EmuApi : IEmu diff --git a/BizHawk.Client.ApiHawk/Classes/Api/GameInfoApi.cs b/BizHawk.Client.Common/Api/Classes/GameInfoApi.cs similarity index 97% rename from BizHawk.Client.ApiHawk/Classes/Api/GameInfoApi.cs rename to BizHawk.Client.Common/Api/Classes/GameInfoApi.cs index e005b28a1d..f6bd4848df 100644 --- a/BizHawk.Client.ApiHawk/Classes/Api/GameInfoApi.cs +++ b/BizHawk.Client.Common/Api/Classes/GameInfoApi.cs @@ -3,7 +3,7 @@ using BizHawk.Client.Common; using BizHawk.Emulation.Common; -namespace BizHawk.Client.ApiHawk +namespace BizHawk.Client.Common { public sealed class GameInfoApi : IGameInfo { diff --git a/BizHawk.Client.ApiHawk/Classes/Api/JoypadApi.cs b/BizHawk.Client.Common/Api/Classes/JoypadApi.cs similarity index 99% rename from BizHawk.Client.ApiHawk/Classes/Api/JoypadApi.cs rename to BizHawk.Client.Common/Api/Classes/JoypadApi.cs index dc08dc95fa..fc55cc59b1 100644 --- a/BizHawk.Client.ApiHawk/Classes/Api/JoypadApi.cs +++ b/BizHawk.Client.Common/Api/Classes/JoypadApi.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using BizHawk.Client.Common; -namespace BizHawk.Client.ApiHawk +namespace BizHawk.Client.Common { public sealed class JoypadApi : IJoypad { diff --git a/BizHawk.Client.ApiHawk/Classes/Api/MemApi.cs b/BizHawk.Client.Common/Api/Classes/MemApi.cs similarity index 99% rename from BizHawk.Client.ApiHawk/Classes/Api/MemApi.cs rename to BizHawk.Client.Common/Api/Classes/MemApi.cs index 8176787b75..3dd1b524ac 100644 --- a/BizHawk.Client.ApiHawk/Classes/Api/MemApi.cs +++ b/BizHawk.Client.Common/Api/Classes/MemApi.cs @@ -5,7 +5,7 @@ using BizHawk.Emulation.Common; using BizHawk.Emulation.Common.IEmulatorExtensions; using BizHawk.Common.BufferExtensions; -namespace BizHawk.Client.ApiHawk +namespace BizHawk.Client.Common { public sealed class MemApi : MemApiBase, IMem { diff --git a/BizHawk.Client.ApiHawk/Classes/Api/MemApiBase.cs b/BizHawk.Client.Common/Api/Classes/MemApiBase.cs similarity index 99% rename from BizHawk.Client.ApiHawk/Classes/Api/MemApiBase.cs rename to BizHawk.Client.Common/Api/Classes/MemApiBase.cs index 523b6384f3..ca05d34ac5 100644 --- a/BizHawk.Client.ApiHawk/Classes/Api/MemApiBase.cs +++ b/BizHawk.Client.Common/Api/Classes/MemApiBase.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using BizHawk.Emulation.Common; using BizHawk.Emulation.Common.IEmulatorExtensions; -namespace BizHawk.Client.ApiHawk +namespace BizHawk.Client.Common { /// /// Base class for the Memory and MainMemory plugin libraries diff --git a/BizHawk.Client.ApiHawk/Classes/Api/MemEventsApi.cs b/BizHawk.Client.Common/Api/Classes/MemEventsApi.cs similarity index 97% rename from BizHawk.Client.ApiHawk/Classes/Api/MemEventsApi.cs rename to BizHawk.Client.Common/Api/Classes/MemEventsApi.cs index 05993e866a..03baca4a93 100644 --- a/BizHawk.Client.ApiHawk/Classes/Api/MemEventsApi.cs +++ b/BizHawk.Client.Common/Api/Classes/MemEventsApi.cs @@ -3,7 +3,7 @@ using BizHawk.Emulation.Common; using BizHawk.Emulation.Common.IEmulatorExtensions; -namespace BizHawk.Client.ApiHawk +namespace BizHawk.Client.Common { public sealed class MemEventsApi : IMemEvents { diff --git a/BizHawk.Client.ApiHawk/Classes/Api/MemorySaveStateApi.cs b/BizHawk.Client.Common/Api/Classes/MemorySaveStateApi.cs similarity index 97% rename from BizHawk.Client.ApiHawk/Classes/Api/MemorySaveStateApi.cs rename to BizHawk.Client.Common/Api/Classes/MemorySaveStateApi.cs index 39635ef4b9..fb0352ff6b 100644 --- a/BizHawk.Client.ApiHawk/Classes/Api/MemorySaveStateApi.cs +++ b/BizHawk.Client.Common/Api/Classes/MemorySaveStateApi.cs @@ -4,7 +4,7 @@ using System.IO; using BizHawk.Emulation.Common; -namespace BizHawk.Client.ApiHawk +namespace BizHawk.Client.Common { public sealed class MemorySaveStateApi : IMemorySaveState { diff --git a/BizHawk.Client.ApiHawk/Classes/Api/MovieApi.cs b/BizHawk.Client.Common/Api/Classes/MovieApi.cs similarity index 99% rename from BizHawk.Client.ApiHawk/Classes/Api/MovieApi.cs rename to BizHawk.Client.Common/Api/Classes/MovieApi.cs index 119d54f568..1463b0d498 100644 --- a/BizHawk.Client.ApiHawk/Classes/Api/MovieApi.cs +++ b/BizHawk.Client.Common/Api/Classes/MovieApi.cs @@ -4,7 +4,7 @@ using System.IO; using BizHawk.Client.Common; -namespace BizHawk.Client.ApiHawk +namespace BizHawk.Client.Common { public sealed class MovieApi : IInputMovie { diff --git a/BizHawk.Client.ApiHawk/Classes/Api/SqlApi.cs b/BizHawk.Client.Common/Api/Classes/SqlApi.cs similarity index 98% rename from BizHawk.Client.ApiHawk/Classes/Api/SqlApi.cs rename to BizHawk.Client.Common/Api/Classes/SqlApi.cs index 0ee9bd451b..069c4dcf26 100644 --- a/BizHawk.Client.ApiHawk/Classes/Api/SqlApi.cs +++ b/BizHawk.Client.Common/Api/Classes/SqlApi.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Data.SQLite; -namespace BizHawk.Client.ApiHawk +namespace BizHawk.Client.Common { public sealed class SqlApi : ISql { diff --git a/BizHawk.Client.ApiHawk/Classes/Api/UserDataApi.cs b/BizHawk.Client.Common/Api/Classes/UserDataApi.cs similarity index 95% rename from BizHawk.Client.ApiHawk/Classes/Api/UserDataApi.cs rename to BizHawk.Client.Common/Api/Classes/UserDataApi.cs index a41b073c22..a366ff3dc4 100644 --- a/BizHawk.Client.ApiHawk/Classes/Api/UserDataApi.cs +++ b/BizHawk.Client.Common/Api/Classes/UserDataApi.cs @@ -1,7 +1,7 @@ using System; using BizHawk.Client.Common; -namespace BizHawk.Client.ApiHawk +namespace BizHawk.Client.Common { public sealed class UserDataApi : IUserData { diff --git a/BizHawk.Client.ApiHawk/Interfaces/Api/IApiContainer.cs b/BizHawk.Client.Common/Api/Interfaces/IApiContainer.cs similarity index 82% rename from BizHawk.Client.ApiHawk/Interfaces/Api/IApiContainer.cs rename to BizHawk.Client.Common/Api/Interfaces/IApiContainer.cs index ec169fee9d..112dabf79f 100644 --- a/BizHawk.Client.ApiHawk/Interfaces/Api/IApiContainer.cs +++ b/BizHawk.Client.Common/Api/Interfaces/IApiContainer.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace BizHawk.Client.ApiHawk +namespace BizHawk.Client.Common { public interface IApiContainer { diff --git a/BizHawk.Client.ApiHawk/Interfaces/Api/IComm.cs b/BizHawk.Client.Common/Api/Interfaces/IComm.cs similarity index 96% rename from BizHawk.Client.ApiHawk/Interfaces/Api/IComm.cs rename to BizHawk.Client.Common/Api/Interfaces/IComm.cs index e3fe09b68a..d6cf3b1eaf 100644 --- a/BizHawk.Client.ApiHawk/Interfaces/Api/IComm.cs +++ b/BizHawk.Client.Common/Api/Interfaces/IComm.cs @@ -1,4 +1,4 @@ -namespace BizHawk.Client.ApiHawk +namespace BizHawk.Client.Common { public interface IComm : IExternalApi { diff --git a/BizHawk.Client.ApiHawk/Interfaces/Api/IEmu.cs b/BizHawk.Client.Common/Api/Interfaces/IEmu.cs similarity index 96% rename from BizHawk.Client.ApiHawk/Interfaces/Api/IEmu.cs rename to BizHawk.Client.Common/Api/Interfaces/IEmu.cs index 5d7c706931..f14d0cd9cc 100644 --- a/BizHawk.Client.ApiHawk/Interfaces/Api/IEmu.cs +++ b/BizHawk.Client.Common/Api/Interfaces/IEmu.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace BizHawk.Client.ApiHawk +namespace BizHawk.Client.Common { public interface IEmu : IExternalApi { diff --git a/BizHawk.Client.ApiHawk/Interfaces/Api/IExternalApi.cs b/BizHawk.Client.Common/Api/Interfaces/IExternalApi.cs similarity index 86% rename from BizHawk.Client.ApiHawk/Interfaces/Api/IExternalApi.cs rename to BizHawk.Client.Common/Api/Interfaces/IExternalApi.cs index 1a2b40030b..88f1929117 100644 --- a/BizHawk.Client.ApiHawk/Interfaces/Api/IExternalApi.cs +++ b/BizHawk.Client.Common/Api/Interfaces/IExternalApi.cs @@ -1,4 +1,4 @@ -namespace BizHawk.Client.ApiHawk +namespace BizHawk.Client.Common { /// /// This interface specifies that a client exposes a given interface, such as , diff --git a/BizHawk.Client.ApiHawk/Interfaces/Api/IGameInfo.cs b/BizHawk.Client.Common/Api/Interfaces/IGameInfo.cs similarity index 89% rename from BizHawk.Client.ApiHawk/Interfaces/Api/IGameInfo.cs rename to BizHawk.Client.Common/Api/Interfaces/IGameInfo.cs index 814a6d268c..2c9feeb036 100644 --- a/BizHawk.Client.ApiHawk/Interfaces/Api/IGameInfo.cs +++ b/BizHawk.Client.Common/Api/Interfaces/IGameInfo.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace BizHawk.Client.ApiHawk +namespace BizHawk.Client.Common { public interface IGameInfo : IExternalApi { diff --git a/BizHawk.Client.ApiHawk/Interfaces/Api/IGui.cs b/BizHawk.Client.Common/Api/Interfaces/IGui.cs similarity index 98% rename from BizHawk.Client.ApiHawk/Interfaces/Api/IGui.cs rename to BizHawk.Client.Common/Api/Interfaces/IGui.cs index 03e3247e51..6447cd8cd2 100644 --- a/BizHawk.Client.ApiHawk/Interfaces/Api/IGui.cs +++ b/BizHawk.Client.Common/Api/Interfaces/IGui.cs @@ -2,7 +2,7 @@ using System.Drawing.Imaging; using System.Windows.Forms; -namespace BizHawk.Client.ApiHawk +namespace BizHawk.Client.Common { public interface IGui : IExternalApi { diff --git a/BizHawk.Client.ApiHawk/Interfaces/Api/IInput.cs b/BizHawk.Client.Common/Api/Interfaces/IInput.cs similarity index 83% rename from BizHawk.Client.ApiHawk/Interfaces/Api/IInput.cs rename to BizHawk.Client.Common/Api/Interfaces/IInput.cs index 507bb024bf..22440ef771 100644 --- a/BizHawk.Client.ApiHawk/Interfaces/Api/IInput.cs +++ b/BizHawk.Client.Common/Api/Interfaces/IInput.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace BizHawk.Client.ApiHawk +namespace BizHawk.Client.Common { public interface IInput : IExternalApi { diff --git a/BizHawk.Client.ApiHawk/Interfaces/Api/IInputMovie.cs b/BizHawk.Client.Common/Api/Interfaces/IInputMovie.cs similarity index 95% rename from BizHawk.Client.ApiHawk/Interfaces/Api/IInputMovie.cs rename to BizHawk.Client.Common/Api/Interfaces/IInputMovie.cs index 7c428f1861..8bb1f206d3 100644 --- a/BizHawk.Client.ApiHawk/Interfaces/Api/IInputMovie.cs +++ b/BizHawk.Client.Common/Api/Interfaces/IInputMovie.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -namespace BizHawk.Client.ApiHawk +namespace BizHawk.Client.Common { public interface IInputMovie : IExternalApi { diff --git a/BizHawk.Client.ApiHawk/Interfaces/Api/IJoypad.cs b/BizHawk.Client.Common/Api/Interfaces/IJoypad.cs similarity index 94% rename from BizHawk.Client.ApiHawk/Interfaces/Api/IJoypad.cs rename to BizHawk.Client.Common/Api/Interfaces/IJoypad.cs index 1a8ce3340a..eacd3b6618 100644 --- a/BizHawk.Client.ApiHawk/Interfaces/Api/IJoypad.cs +++ b/BizHawk.Client.Common/Api/Interfaces/IJoypad.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace BizHawk.Client.ApiHawk +namespace BizHawk.Client.Common { public interface IJoypad : IExternalApi { diff --git a/BizHawk.Client.ApiHawk/Interfaces/Api/IMem.cs b/BizHawk.Client.Common/Api/Interfaces/IMem.cs similarity index 98% rename from BizHawk.Client.ApiHawk/Interfaces/Api/IMem.cs rename to BizHawk.Client.Common/Api/Interfaces/IMem.cs index 7c8961ac5f..b636b449ea 100644 --- a/BizHawk.Client.ApiHawk/Interfaces/Api/IMem.cs +++ b/BizHawk.Client.Common/Api/Interfaces/IMem.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace BizHawk.Client.ApiHawk +namespace BizHawk.Client.Common { public interface IMem : IExternalApi { diff --git a/BizHawk.Client.ApiHawk/Interfaces/Api/IMemEvents.cs b/BizHawk.Client.Common/Api/Interfaces/IMemEvents.cs similarity index 89% rename from BizHawk.Client.ApiHawk/Interfaces/Api/IMemEvents.cs rename to BizHawk.Client.Common/Api/Interfaces/IMemEvents.cs index ef0f5ef0bc..73f831751e 100644 --- a/BizHawk.Client.ApiHawk/Interfaces/Api/IMemEvents.cs +++ b/BizHawk.Client.Common/Api/Interfaces/IMemEvents.cs @@ -2,7 +2,7 @@ using BizHawk.Emulation.Common; -namespace BizHawk.Client.ApiHawk +namespace BizHawk.Client.Common { public interface IMemEvents : IExternalApi { diff --git a/BizHawk.Client.ApiHawk/Interfaces/Api/IMemorySavestate.cs b/BizHawk.Client.Common/Api/Interfaces/IMemorySavestate.cs similarity index 85% rename from BizHawk.Client.ApiHawk/Interfaces/Api/IMemorySavestate.cs rename to BizHawk.Client.Common/Api/Interfaces/IMemorySavestate.cs index e3444c7bb5..bb00f01989 100644 --- a/BizHawk.Client.ApiHawk/Interfaces/Api/IMemorySavestate.cs +++ b/BizHawk.Client.Common/Api/Interfaces/IMemorySavestate.cs @@ -1,4 +1,4 @@ -namespace BizHawk.Client.ApiHawk +namespace BizHawk.Client.Common { public interface IMemorySaveState : IExternalApi { diff --git a/BizHawk.Client.ApiHawk/Interfaces/Api/ISaveState.cs b/BizHawk.Client.Common/Api/Interfaces/ISaveState.cs similarity index 82% rename from BizHawk.Client.ApiHawk/Interfaces/Api/ISaveState.cs rename to BizHawk.Client.Common/Api/Interfaces/ISaveState.cs index 8f595610fe..067ee87543 100644 --- a/BizHawk.Client.ApiHawk/Interfaces/Api/ISaveState.cs +++ b/BizHawk.Client.Common/Api/Interfaces/ISaveState.cs @@ -1,4 +1,4 @@ -namespace BizHawk.Client.ApiHawk +namespace BizHawk.Client.Common { public interface ISaveState : IExternalApi { diff --git a/BizHawk.Client.ApiHawk/Interfaces/Api/ISql.cs b/BizHawk.Client.Common/Api/Interfaces/ISql.cs similarity index 85% rename from BizHawk.Client.ApiHawk/Interfaces/Api/ISql.cs rename to BizHawk.Client.Common/Api/Interfaces/ISql.cs index 99407ac1c2..c9c49429eb 100644 --- a/BizHawk.Client.ApiHawk/Interfaces/Api/ISql.cs +++ b/BizHawk.Client.Common/Api/Interfaces/ISql.cs @@ -1,4 +1,4 @@ -namespace BizHawk.Client.ApiHawk +namespace BizHawk.Client.Common { public interface ISql : IExternalApi { diff --git a/BizHawk.Client.ApiHawk/Interfaces/Api/ITool.cs b/BizHawk.Client.Common/Api/Interfaces/ITool.cs similarity index 90% rename from BizHawk.Client.ApiHawk/Interfaces/Api/ITool.cs rename to BizHawk.Client.Common/Api/Interfaces/ITool.cs index ce4cdce516..979be4d928 100644 --- a/BizHawk.Client.ApiHawk/Interfaces/Api/ITool.cs +++ b/BizHawk.Client.Common/Api/Interfaces/ITool.cs @@ -1,5 +1,5 @@ using System; -namespace BizHawk.Client.ApiHawk +namespace BizHawk.Client.Common { public interface ITool : IExternalApi { diff --git a/BizHawk.Client.ApiHawk/Interfaces/Api/IUserData.cs b/BizHawk.Client.Common/Api/Interfaces/IUserData.cs similarity index 84% rename from BizHawk.Client.ApiHawk/Interfaces/Api/IUserData.cs rename to BizHawk.Client.Common/Api/Interfaces/IUserData.cs index 234a7d4695..fc4ca78013 100644 --- a/BizHawk.Client.ApiHawk/Interfaces/Api/IUserData.cs +++ b/BizHawk.Client.Common/Api/Interfaces/IUserData.cs @@ -1,4 +1,4 @@ -namespace BizHawk.Client.ApiHawk +namespace BizHawk.Client.Common { public interface IUserData : IExternalApi { diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj index 602220cc5c..aa174c9a4a 100644 --- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj +++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj @@ -82,7 +82,33 @@ VersionInfo.cs + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BizHawk.Client.EmuHawk/Api/ApiContainer.cs b/BizHawk.Client.EmuHawk/Api/ApiContainer.cs index 6bc83be76c..67ae26a448 100644 --- a/BizHawk.Client.EmuHawk/Api/ApiContainer.cs +++ b/BizHawk.Client.EmuHawk/Api/ApiContainer.cs @@ -4,6 +4,7 @@ using System.Reflection; using System.Linq; using BizHawk.Client.ApiHawk; +using BizHawk.Client.Common; namespace BizHawk.Client.EmuHawk { diff --git a/BizHawk.Client.EmuHawk/Api/ApiManager.cs b/BizHawk.Client.EmuHawk/Api/ApiManager.cs index fdb3f836f7..e7d733e26e 100644 --- a/BizHawk.Client.EmuHawk/Api/ApiManager.cs +++ b/BizHawk.Client.EmuHawk/Api/ApiManager.cs @@ -7,6 +7,7 @@ using System.Reflection; using BizHawk.Common.ReflectionExtensions; using BizHawk.Emulation.Common; using BizHawk.Client.ApiHawk; +using BizHawk.Client.Common; namespace BizHawk.Client.EmuHawk diff --git a/BizHawk.Client.EmuHawk/Api/Libraries/CommApi.cs b/BizHawk.Client.EmuHawk/Api/Libraries/CommApi.cs index 997615ffdf..37eaeac9ce 100644 --- a/BizHawk.Client.EmuHawk/Api/Libraries/CommApi.cs +++ b/BizHawk.Client.EmuHawk/Api/Libraries/CommApi.cs @@ -8,6 +8,8 @@ using System.Collections.Generic; using System.Net.Http; using System.Windows.Forms; +using BizHawk.Client.Common; + namespace BizHawk.Client.EmuHawk { diff --git a/BizHawk.Client.EmuHawk/Api/Libraries/GuiApi.cs b/BizHawk.Client.EmuHawk/Api/Libraries/GuiApi.cs index 76f16d9f17..54803d375f 100644 --- a/BizHawk.Client.EmuHawk/Api/Libraries/GuiApi.cs +++ b/BizHawk.Client.EmuHawk/Api/Libraries/GuiApi.cs @@ -6,6 +6,7 @@ using System.Windows.Forms; using System.IO; using BizHawk.Client.ApiHawk; +using BizHawk.Client.Common; using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk diff --git a/BizHawk.Client.EmuHawk/Api/Libraries/SaveStateAPI.cs b/BizHawk.Client.EmuHawk/Api/Libraries/SaveStateAPI.cs index d4b1cdbe2f..ca51cb0dd0 100644 --- a/BizHawk.Client.EmuHawk/Api/Libraries/SaveStateAPI.cs +++ b/BizHawk.Client.EmuHawk/Api/Libraries/SaveStateAPI.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using BizHawk.Client.ApiHawk; +using BizHawk.Client.Common; namespace BizHawk.Client.EmuHawk {