ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge ApiHawk project into Client.Common and EmuHawk

This commit is contained in:
YoshiRulz 2020-04-12 17:26:07 +10:00
parent ceef1f4489
commit 1ee131ed78
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
28 changed files with 24 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj
View File

@ -1,25 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(SolutionDir)MainSlnCommon.props" />
<PropertyGroup>
<TargetFramework>net48</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
<Reference Include="Microsoft.CSharp" />
<!--<Reference Include="System" />-->
<!--<Reference Include="System.Core" />-->
<!--<Reference Include="System.Data" />-->
<!--<Reference Include="System.Data.DataSetExtensions" />-->
<!--<Reference HintPath="../../Users/uptho/Documents/BizHawk-2.3/dll/System.Data.SQLite.dll" Include="System.Data.SQLite, Version=1.0.105.2, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=AMD64" SpecificVersion="false" />-->
<!--<Reference Include="System.Drawing" />-->
<Reference Include="System.Windows.Forms" />
<!--<Reference Include="System.Xml" />-->
<!--<Reference Include="System.Xml.Linq" />-->
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(SolutionDir)BizHawk.Client.Common/BizHawk.Client.Common.csproj" />
<Compile Include="$(SolutionDir)Version/svnrev.cs" />
<Compile Include="$(SolutionDir)Version/VersionInfo.cs" />
</ItemGroup>
<Import Project="$(SolutionDir)NamespaceAliasHack.targets" />
</Project>

2
BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj.DotSettings
View File

@ -1,2 +0,0 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp80</s:String></wpf:ResourceDictionary>

22
BizHawk.Client.ApiHawk/Properties/AssemblyInfo.cs
View File

@ -1,22 +0,0 @@
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("BizHawk.Client.ApiHawk")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("BizHawk.Client.ApiHawk")]
[assembly: AssemblyCopyright("Copyright © 2015")]
[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("8e2f11f2-3955-4382-8c3a-ceba1276caea")]

191
BizHawk.Client.ApiHawk/Resources/ApiClassDiagram.cd
View File

@ -1,191 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ClassDiagram MajorVersion="1" MinorVersion="1" MembersFormat="FullSignature">
<Class Name="BizHawk.Client.Common.Watch">
<Position X="17" Y="0.75" Width="10" />
<Compartments>
<Compartment Name="Nested Types" Collapsed="false" />
</Compartments>
<TypeIdentifier />
<Lollipop Orientation="Left" Position="0.1" />
</Class>
<Class Name="BizHawk.Client.Common.SeparatorWatch">
<Position X="9.25" Y="19.25" Width="3.25" />
<TypeIdentifier />
</Class>
<Class Name="BizHawk.Client.Common.ByteWatch">
<Position X="28.5" Y="19" Width="3.25" />
<TypeIdentifier />
</Class>
<Class Name="BizHawk.Client.Common.WordWatch">
<Position X="13.5" Y="19" Width="3.25" />
<TypeIdentifier />
</Class>
<Class Name="BizHawk.Client.Common.DWordWatch">
<Position X="19" Y="19" Width="3.25" />
<TypeIdentifier />
</Class>
<Class Name="BizHawk.Client.Common.WatchList">
<Position X="30.75" Y="1" Width="5" />
<Compartments>
<Compartment Name="Nested Types" Collapsed="false" />
</Compartments>
<TypeIdentifier />
<Lollipop Orientation="Right" Position="0.1" />
</Class>
<Class Name="BizHawk.Client.EmuHawk.ConfigPersistAttribute">
<Position X="11.5" Y="0.75" Width="2" />
<TypeIdentifier />
</Class>
<Class Name="BizHawk.Client.ApiHawk.ExternalToolManager">
<Position X="4.75" Y="6.75" Width="4.75" />
<TypeIdentifier>
<HashCode>AAAAAQAAAAAAAAAAAAAQAAAAAAgBAAAAAAACAAAAAAI=</HashCode>
<FileName>Classes\ExternalToolManager.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="BizHawk.Client.ApiHawk.BizHawkExternalToolAttribute">
<Position X="11" Y="2.25" Width="5.75" />
<TypeIdentifier>
<HashCode>AAAAAAAAAAAgAAAAIAAAIAQAAAAAACAEAAAAAAAAAAA=</HashCode>
<FileName>Attributes\BizHawkExternalToolAttribute.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="BizHawk.Client.ApiHawk.ClientApi">
<Position X="4.75" Y="10" Width="4" />
<TypeIdentifier>
<HashCode>CwEAAAAAgAMAQEAAAAAJQAoAAAEAgWAACCACAAAQAiA=</HashCode>
<FileName>Classes\ClientApi.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="BizHawk.Client.ApiHawk.BizHawkExternalToolUsageAttribute">
<Position X="11" Y="5.75" Width="5.75" />
<TypeIdentifier>
<HashCode>AIAAAAAAEIAAAQAAAAAABABAAAAAAAAAAAAAAAAAAAA=</HashCode>
<FileName>Attributes\BizHawkExternalToolUsageAttribute.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="BizHawk.Client.ApiHawk.BizHawkSystemIdToEnumConverter">
<Position X="10.75" Y="9.75" Width="6" />
<TypeIdentifier>
<HashCode>AAAAAAAAAAAAAAAAAIAAAAAAAAgAAAAAAAAAAAAAAAA=</HashCode>
<FileName>Classes\BizHawkSystemIdToCoreSystemEnumConverter.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="BizHawk.Client.ApiHawk.JoypadStringToEnumConverter">
<Position X="10.75" Y="11.75" Width="6" />
<TypeIdentifier>
<HashCode>AAAAAAAAAAAAAAAAAIAAAAAAAAgAAAAAAAAAAAAAAAA=</HashCode>
<FileName>Classes\JoypadStringToEnumConverter.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="BizHawk.Client.ApiHawk.Joypad">
<Position X="0.75" Y="6.75" Width="3" />
<TypeIdentifier>
<HashCode>AQAACAAAAIAAAACBAAgAAABAEAAAAAAAAAACGAAAAAA=</HashCode>
<FileName>Classes\Joypad.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="BizHawk.Client.Common.SystemInfo">
<Position X="0.5" Y="11" Width="4" />
<TypeIdentifier />
</Class>
<Class Name="BizHawk.Client.ApiHawk.Classes.Events.StateLoadedEventArgs">
<Position X="41.75" Y="2.25" Width="3" />
<TypeIdentifier>
<HashCode>AAAAAAAAAAAAAAAAAAAAIAQAAAAAAAAAAAAAAAAAAAA=</HashCode>
<FileName>Classes\Events\EventArgs\StateLoadedEventArgs.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="BizHawk.Client.ApiHawk.Classes.Events.StateSavedEventArgs">
<Position X="38.25" Y="2.25" Width="3" />
<TypeIdentifier>
<HashCode>AAAAAAAAAAAAAAAAAAAAIAQAAAAAAAAAAAAAAAAAAAA=</HashCode>
<FileName>Classes\Events\EventArgs\StateSavedEventArgs.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="BizHawk.Client.ApiHawk.Classes.Events.BeforeQuickSaveEventArgs">
<Position X="38.25" Y="6.75" Width="3" />
<TypeIdentifier>
<HashCode>AAAAAAAAIAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAgA=</HashCode>
<FileName>Classes\Events\EventArgs\BeforeQuickSaveEventArgs.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="BizHawk.Client.ApiHawk.Classes.Events.BeforeQuickLoadEventArgs">
<Position X="41.75" Y="6.75" Width="3" />
<TypeIdentifier>
<HashCode>AAAAAAAAIAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAgA=</HashCode>
<FileName>Classes\Events\EventArgs\BeforeQuickLoadEventArgs.cs</FileName>
</TypeIdentifier>
</Class>
<Interface Name="BizHawk.Client.EmuHawk.IExternalToolForm">
<Position X="4.5" Y="4.5" Width="2.75" />
<TypeIdentifier>
<HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
<FileName>Interfaces\IExternalToolForm.cs</FileName>
</TypeIdentifier>
</Interface>
<Interface Name="BizHawk.Client.EmuHawk.IToolForm">
<Position X="6" Y="0.75" Width="2.25" />
<TypeIdentifier />
</Interface>
<Interface Name="BizHawk.Client.EmuHawk.IToolFormAutoConfig">
<Position X="8" Y="4.5" Width="1.75" />
<TypeIdentifier />
</Interface>
<Enum Name="BizHawk.Client.Common.WatchSize">
<Position X="28.5" Y="5.5" Width="1.5" />
<TypeIdentifier />
</Enum>
<Enum Name="BizHawk.Client.Common.DisplayType">
<Position X="28.5" Y="2.75" Width="1.5" />
<TypeIdentifier />
</Enum>
<Enum Name="BizHawk.Client.Common.PreviousType">
<Position X="28.5" Y="1" Width="1.5" />
<TypeIdentifier />
</Enum>
<Enum Name="BizHawk.Client.ApiHawk.BizHawkExternalToolUsage">
<Position X="28.25" Y="7.25" Width="2.25" />
<TypeIdentifier>
<HashCode>AAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAgAAAABAAA=</HashCode>
<FileName>Enums\BizHawkExternalToolUsage.cs</FileName>
</TypeIdentifier>
</Enum>
<Enum Name="BizHawk.Client.ApiHawk.JoypadButton">
<Position X="30.25" Y="9.75" Width="1.5" />
<TypeIdentifier />
</Enum>
<Enum Name="BizHawk.Client.ApiHawk.CoreSystem">
<Position X="28.25" Y="9.75" Width="1.5" />
<TypeIdentifier />
</Enum>
<Delegate Name="BizHawk.Client.ApiHawk.Classes.Events.StateLoadedEventHandler">
<Position X="41.75" Y="1" Width="2" />
<TypeIdentifier>
<HashCode>AAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAA=</HashCode>
<FileName>Classes\Events\EventHandlers\StateLoadedEventHandler.cs</FileName>
</TypeIdentifier>
</Delegate>
<Delegate Name="BizHawk.Client.ApiHawk.Classes.Events.StateSavedEventHandler">
<Position X="38.25" Y="1" Width="2" />
<TypeIdentifier>
<HashCode>AAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAgA=</HashCode>
<FileName>Classes\Events\EventHandlers\StateSavedEventHandler.cs</FileName>
</TypeIdentifier>
</Delegate>
<Delegate Name="BizHawk.Client.ApiHawk.Classes.Events.BeforeQuickSaveEventHandler">
<Position X="38.25" Y="5.5" Width="2.25" />
<TypeIdentifier>
<HashCode>AAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAEA=</HashCode>
<FileName>Classes\Events\EventHandlers\BeforeQuickSaveEventhandler.cs</FileName>
</TypeIdentifier>
</Delegate>
<Delegate Name="BizHawk.Client.ApiHawk.Classes.Events.BeforeQuickLoadEventHandler">
<Position X="41.75" Y="5.5" Width="2.25" />
<TypeIdentifier>
<HashCode>AAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAACAAAAA=</HashCode>
<FileName>Classes\Events\EventHandlers\BeforeQuickLoadEventhandler.cs</FileName>
</TypeIdentifier>
</Delegate>
<Font Name="Segoe UI" Size="9" />
</ClassDiagram>

2
BizHawk.Client.ApiHawk/Classes/ApiInjector.cs → BizHawk.Client.Common/Api/ApiInjector.cs
View File

@ -3,7 +3,7 @@ using System.Linq;
using BizHawk.Common.ReflectionExtensions; using BizHawk.Common.ReflectionExtensions;
namespace BizHawk.Client.ApiHawk namespace BizHawk.Client.Common
{ {
/// <summary> /// <summary>
/// injects Apis into other classes /// injects Apis into other classes

2
BizHawk.Client.ApiHawk/Classes/BasicApiProvider.cs → BizHawk.Client.Common/Api/BasicApiProvider.cs
View File

@ -4,7 +4,7 @@ using System.Linq;
using BizHawk.Client.Common; using BizHawk.Client.Common;
namespace BizHawk.Client.ApiHawk namespace BizHawk.Client.Common
{ {
/// <summary> /// <summary>
/// A generic implementation of IExternalApi provider that provides /// A generic implementation of IExternalApi provider that provides

2
BizHawk.Client.ApiHawk/Attributes/BizHawkExternalToolAttribute.cs → BizHawk.Client.Common/Api/BizHawkExternalToolAttribute.cs
View File

@ -2,7 +2,7 @@
using BizHawk.Client.Common; using BizHawk.Client.Common;
namespace BizHawk.Client.ApiHawk namespace BizHawk.Client.Common
{ {
/// <remarks>This class needs to be in the assembly or old tools will throw on load instead of being recognised as old.</remarks> /// <remarks>This class needs to be in the assembly or old tools will throw on load instead of being recognised as old.</remarks>
[AttributeUsage(AttributeTargets.Assembly)] [AttributeUsage(AttributeTargets.Assembly)]

2
BizHawk.Client.ApiHawk/Enums/BizHawkExternalToolUsage.cs → BizHawk.Client.Common/Api/BizHawkExternalToolUsage.cs
View File

@ -1,4 +1,4 @@
namespace BizHawk.Client.ApiHawk namespace BizHawk.Client.Common
{ {
/// <summary> /// <summary>
/// This enum describe how an external tool is handled /// This enum describe how an external tool is handled

2
BizHawk.Client.ApiHawk/Classes/BizHawkSystemIdToCoreSystemEnumConverter.cs → BizHawk.Client.Common/Api/BizHawkSystemIdToCoreSystemEnumConverter.cs
View File

@ -3,7 +3,7 @@ using System.Globalization;
using BizHawk.Client.Common; using BizHawk.Client.Common;
namespace BizHawk.Client.ApiHawk namespace BizHawk.Client.Common
{ {
/// <summary> /// <summary>
/// This class holds a converter for BizHawk SystemId (which is a simple <see cref="string"/> /// This class holds a converter for BizHawk SystemId (which is a simple <see cref="string"/>

2
BizHawk.Client.ApiHawk/Interfaces/IExternalApiProvider.cs → BizHawk.Client.Common/Api/IExternalApiProvider.cs
View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using BizHawk.Client.Common; using BizHawk.Client.Common;
namespace BizHawk.Client.ApiHawk namespace BizHawk.Client.Common
{ {
/// <summary> /// <summary>
/// This interface defines the mechanism by which External tools can retrieve <seealso cref="IExternalApi" /> /// This interface defines the mechanism by which External tools can retrieve <seealso cref="IExternalApi" />

2
BizHawk.Client.ApiHawk/Interfaces/IExternalToolForm.cs → BizHawk.Client.Common/Api/IExternalToolForm.cs
View File

@ -1,6 +1,6 @@
using BizHawk.Client.Common; using BizHawk.Client.Common;
namespace BizHawk.Client.ApiHawk namespace BizHawk.Client.Common
{ {
/// <summary> /// <summary>
/// Interface to implements in order to make a custom tool /// Interface to implements in order to make a custom tool

2
BizHawk.Client.ApiHawk/Classes/JoypadStringToEnumConverter.cs → BizHawk.Client.Common/Api/JoypadStringToEnumConverter.cs
View File

@ -2,7 +2,7 @@
using System.Globalization; using System.Globalization;
using BizHawk.Client.Common; using BizHawk.Client.Common;
namespace BizHawk.Client.ApiHawk namespace BizHawk.Client.Common
{ {
/// <summary> /// <summary>
/// This class holds a converter for BizHawk joypad buttons (which is a simple <see cref="string"/> /// This class holds a converter for BizHawk joypad buttons (which is a simple <see cref="string"/>

4
BizHawk.Client.EmuHawk/Api/ApiManager.cs
View File

@ -4,7 +4,6 @@ using System.Linq;
using System.Reflection; using System.Reflection;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
using BizHawk.Client.ApiHawk;
using BizHawk.Client.Common; using BizHawk.Client.Common;
namespace BizHawk.Client.EmuHawk namespace BizHawk.Client.EmuHawk
@ -15,8 +14,7 @@ namespace BizHawk.Client.EmuHawk
private static ApiContainer _container; private static ApiContainer _container;
private static IExternalApiProvider Register(IEmulatorServiceProvider serviceProvider) private static IExternalApiProvider Register(IEmulatorServiceProvider serviceProvider)
{ {
foreach (var api in Assembly.Load("BizHawk.Client.Common").GetTypes() foreach (var api in Assembly.GetAssembly(typeof(ApiSubsetContainer)).GetTypes()
.Concat(Assembly.Load("BizHawk.Client.ApiHawk").GetTypes())
.Concat(Assembly.GetAssembly(typeof(ApiContainer)).GetTypes()) .Concat(Assembly.GetAssembly(typeof(ApiContainer)).GetTypes())
.Where(t => typeof(IExternalApi).IsAssignableFrom(t) && t.IsSealed && ServiceInjector.IsAvailable(serviceProvider, t))) .Where(t => typeof(IExternalApi).IsAssignableFrom(t) && t.IsSealed && ServiceInjector.IsAvailable(serviceProvider, t)))
{ {

2
BizHawk.Client.ApiHawk/Classes/ClientApi.cs → BizHawk.Client.EmuHawk/Api/ClientApi.cs
View File

@ -14,7 +14,7 @@ using BizHawk.Emulation.Cores.PCEngine;
using BizHawk.Emulation.Cores.Sega.MasterSystem; using BizHawk.Emulation.Cores.Sega.MasterSystem;
// ReSharper disable UnusedMember.Global // ReSharper disable UnusedMember.Global
namespace BizHawk.Client.ApiHawk namespace BizHawk.Client.EmuHawk
{ {
/// <summary> /// <summary>
/// This class contains some methods that /// This class contains some methods that

2
BizHawk.Client.ApiHawk/Classes/EventTypes.cs → BizHawk.Client.EmuHawk/Api/EventTypes.cs
View File

@ -1,6 +1,6 @@
using System; using System;
namespace BizHawk.Client.ApiHawk namespace BizHawk.Client.EmuHawk
{ {
/// <summary> /// <summary>
/// This class holds event data for BeforeQuickLoad event /// This class holds event data for BeforeQuickLoad event

2
BizHawk.Client.ApiHawk/Classes/Joypad.cs → BizHawk.Client.EmuHawk/Api/Joypad.cs
View File

@ -2,7 +2,7 @@
using BizHawk.Client.Common; using BizHawk.Client.Common;
using BizHawk.Common; using BizHawk.Common;
namespace BizHawk.Client.ApiHawk namespace BizHawk.Client.EmuHawk
{ {
/// <summary> /// <summary>
/// This class holds a joypad for any type of console /// This class holds a joypad for any type of console

3
BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
View File

@ -144,9 +144,6 @@
<!--<Reference Include="WindowsBase" />--> <!--<Reference Include="WindowsBase" />-->
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj"
Name="BizHawk.Client.ApiHawk"
Project="{8e2f11f2-3955-4382-8c3a-ceba1276caea}" />
<ProjectReference Include="$(SolutionDir)BizHawk.Client.Common/BizHawk.Client.Common.csproj" <ProjectReference Include="$(SolutionDir)BizHawk.Client.Common/BizHawk.Client.Common.csproj"
Name="BizHawk.Client.Common" Name="BizHawk.Client.Common"
Project="{24A0AA3C-B25F-4197-B23D-476D6462DBA0}" /> Project="{24A0AA3C-B25F-4197-B23D-476D6462DBA0}" />

1
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -17,7 +17,6 @@ using BizHawk.Client.Common;
using BizHawk.Client.EmuHawk.ToolExtensions; using BizHawk.Client.EmuHawk.ToolExtensions;
using BizHawk.Emulation.Cores.Computers.AppleII; using BizHawk.Emulation.Cores.Computers.AppleII;
using BizHawk.Client.ApiHawk;
using BizHawk.Common; using BizHawk.Common;
using BizHawk.Common.PathExtensions; using BizHawk.Common.PathExtensions;
using BizHawk.Emulation.Cores.Atari.A7800Hawk; using BizHawk.Emulation.Cores.Atari.A7800Hawk;

1
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -26,7 +26,6 @@ using BizHawk.Emulation.Cores.Nintendo.GBHawkLink;
using BizHawk.Client.EmuHawk.ToolExtensions; using BizHawk.Client.EmuHawk.ToolExtensions;
using BizHawk.Client.EmuHawk.CoreExtensions; using BizHawk.Client.EmuHawk.CoreExtensions;
using BizHawk.Client.ApiHawk;
using BizHawk.Common.PathExtensions; using BizHawk.Common.PathExtensions;
using BizHawk.Emulation.Common.Base_Implementations; using BizHawk.Emulation.Common.Base_Implementations;
using BizHawk.Emulation.Cores.Nintendo.SNES9X; using BizHawk.Emulation.Cores.Nintendo.SNES9X;

2
BizHawk.Client.ApiHawk/Classes/ExternalToolManager.cs → BizHawk.Client.EmuHawk/tools/ExternalToolManager.cs
View File

@ -10,7 +10,7 @@ using System.Windows.Forms;
using BizHawk.Client.Common; using BizHawk.Client.Common;
using BizHawk.Common; using BizHawk.Common;
namespace BizHawk.Client.ApiHawk namespace BizHawk.Client.EmuHawk
{ {
/// <summary> /// <summary>
/// This static class handle all ExternalTools /// This static class handle all ExternalTools

1
BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs
View File

@ -10,7 +10,6 @@ using System.Threading;
using System.Diagnostics; using System.Diagnostics;
using BizHawk.Common; using BizHawk.Common;
using BizHawk.Client.ApiHawk;
// ReSharper disable StringLiteralTypo // ReSharper disable StringLiteralTypo
// ReSharper disable UnusedMember.Global // ReSharper disable UnusedMember.Global

12
BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs
View File

@ -27,7 +27,7 @@ namespace BizHawk.Client.EmuHawk
{ {
_mainForm = mainForm; _mainForm = mainForm;
static ApiContainer InitApiHawkContainerInstance(IEmulatorServiceProvider sp, Action<string> logCallback) static ApiContainer InitApiContainer(IEmulatorServiceProvider sp, Action<string> logCallback)
{ {
var ctorParamTypes = new[] { typeof(Action<string>) }; var ctorParamTypes = new[] { typeof(Action<string>) };
var ctorParams = new object[] { logCallback }; var ctorParams = new object[] { logCallback };
@ -41,7 +41,7 @@ namespace BizHawk.Client.EmuHawk
ServiceInjector.UpdateServices(sp, instance); ServiceInjector.UpdateServices(sp, instance);
libDict.Add(api, instance); libDict.Add(api, instance);
} }
return ApiHawkContainerInstance = new ApiContainer(libDict); return ApiContainerInstance = new ApiContainer(libDict);
} }
LuaWait = new AutoResetEvent(false); LuaWait = new AutoResetEvent(false);
@ -73,9 +73,9 @@ namespace BizHawk.Client.EmuHawk
emuHawkLibrary.MainForm = _mainForm; emuHawkLibrary.MainForm = _mainForm;
} }
ApiHawkContainerInstance = InitApiHawkContainerInstance(serviceProvider, ConsoleLuaLibrary.LogOutput); ApiContainerInstance = InitApiContainer(serviceProvider, ConsoleLuaLibrary.LogOutput);
if (instance is DelegatingLuaLibraryEmu dlgInstanceEmu) dlgInstanceEmu.APIs = ApiHawkContainerInstance; // this is necessary as the property has the `new` modifier if (instance is DelegatingLuaLibraryEmu dlgInstanceEmu) dlgInstanceEmu.APIs = ApiContainerInstance; // this is necessary as the property has the `new` modifier
else if (instance is DelegatingLuaLibrary dlgInstance) dlgInstance.APIs = ApiHawkContainerInstance; else if (instance is DelegatingLuaLibrary dlgInstance) dlgInstance.APIs = ApiContainerInstance;
Libraries.Add(lib, instance); Libraries.Add(lib, instance);
} }
@ -99,7 +99,7 @@ namespace BizHawk.Client.EmuHawk
} }
/// <remarks>lazily instantiated</remarks> /// <remarks>lazily instantiated</remarks>
private static ApiContainer ApiHawkContainerInstance; private static ApiContainer ApiContainerInstance;
private Lua _lua = new Lua(); private Lua _lua = new Lua();
private Lua _currThread; private Lua _currThread;

3
BizHawk.Client.EmuHawk/tools/ToolManager.cs
View File

@ -8,7 +8,6 @@ using System.Reflection;
using System.ComponentModel; using System.ComponentModel;
using System.Windows.Forms; using System.Windows.Forms;
using BizHawk.Client.ApiHawk;
using BizHawk.Client.Common; using BizHawk.Client.Common;
using BizHawk.Client.EmuHawk.CoreExtensions; using BizHawk.Client.EmuHawk.CoreExtensions;
using BizHawk.Common; using BizHawk.Common;
@ -762,7 +761,7 @@ namespace BizHawk.Client.EmuHawk
} }
private static readonly Lazy<List<string>> LazyAsmTypes = new Lazy<List<string>>(() => private static readonly Lazy<List<string>> LazyAsmTypes = new Lazy<List<string>>(() =>
Assembly.GetAssembly(typeof(ToolManager)) // Confining the search to only EmuHawk, for now at least, we may want to broaden for ApiHawk one day Assembly.GetAssembly(typeof(ToolManager)) // Confining the search to only EmuHawk, for now at least, we may want to broaden for external tools one day
.GetTypes() .GetTypes()
.Select(t => t.AssemblyQualifiedName) .Select(t => t.AssemblyQualifiedName)
.ToList()); .ToList());

7
BizHawk.sln
View File

@ -47,8 +47,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Bizware", "Bizware", "{0540
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Bizware.BizwareGL", "Bizware\BizHawk.Bizware.BizwareGL\BizHawk.Bizware.BizwareGL.csproj", "{9F84A0B2-861E-4EF4-B89B-5E2A3F38A465}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Bizware.BizwareGL", "Bizware\BizHawk.Bizware.BizwareGL\BizHawk.Bizware.BizwareGL.csproj", "{9F84A0B2-861E-4EF4-B89B-5E2A3F38A465}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Client.ApiHawk", "BizHawk.Client.ApiHawk\BizHawk.Client.ApiHawk.csproj", "{8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.BizInvoke", "BizHawk.BizInvoke\BizHawk.BizInvoke.csproj", "{E5D76DC1-84A8-47AF-BE25-E76F06D2FBBC}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.BizInvoke", "BizHawk.BizInvoke\BizHawk.BizInvoke.csproj", "{E5D76DC1-84A8-47AF-BE25-E76F06D2FBBC}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.WinForms.Controls", "BizHawk.WinForms.Controls\BizHawk.WinForms.Controls.csproj", "{B5A2214B-3CB0-48C4-8DB1-98B38D48AC4A}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.WinForms.Controls", "BizHawk.WinForms.Controls\BizHawk.WinForms.Controls.csproj", "{B5A2214B-3CB0-48C4-8DB1-98B38D48AC4A}"
@ -95,10 +93,6 @@ Global
{9F84A0B2-861E-4EF4-B89B-5E2A3F38A465}.Debug|Any CPU.Build.0 = Debug|Any CPU {9F84A0B2-861E-4EF4-B89B-5E2A3F38A465}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9F84A0B2-861E-4EF4-B89B-5E2A3F38A465}.Release|Any CPU.ActiveCfg = Release|Any CPU {9F84A0B2-861E-4EF4-B89B-5E2A3F38A465}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9F84A0B2-861E-4EF4-B89B-5E2A3F38A465}.Release|Any CPU.Build.0 = Release|Any CPU {9F84A0B2-861E-4EF4-B89B-5E2A3F38A465}.Release|Any CPU.Build.0 = Release|Any CPU
{8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}.Release|Any CPU.Build.0 = Release|Any CPU
{E5D76DC1-84A8-47AF-BE25-E76F06D2FBBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E5D76DC1-84A8-47AF-BE25-E76F06D2FBBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E5D76DC1-84A8-47AF-BE25-E76F06D2FBBC}.Debug|Any CPU.Build.0 = Debug|Any CPU {E5D76DC1-84A8-47AF-BE25-E76F06D2FBBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E5D76DC1-84A8-47AF-BE25-E76F06D2FBBC}.Release|Any CPU.ActiveCfg = Release|Any CPU {E5D76DC1-84A8-47AF-BE25-E76F06D2FBBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -119,7 +113,6 @@ Global
{E1A23168-B571-411C-B360-2229E7225E0E} = {3627C08B-3E43-4224-9DA4-40BD69495FBC} {E1A23168-B571-411C-B360-2229E7225E0E} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
{197D4314-8A9F-49BA-977D-54ACEFAEB6BA} = {3627C08B-3E43-4224-9DA4-40BD69495FBC} {197D4314-8A9F-49BA-977D-54ACEFAEB6BA} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
{9F84A0B2-861E-4EF4-B89B-5E2A3F38A465} = {0540A9A6-977E-466D-8BD3-1D8590BD5282} {9F84A0B2-861E-4EF4-B89B-5E2A3F38A465} = {0540A9A6-977E-466D-8BD3-1D8590BD5282}
{8E2F11F2-3955-4382-8C3A-CEBA1276CAEA} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
{B5A2214B-3CB0-48C4-8DB1-98B38D48AC4A} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA} {B5A2214B-3CB0-48C4-8DB1-98B38D48AC4A} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution

1
ExternalToolProjects/AutoGenConfig/AutoGenConfigForm.cs
View File

@ -4,7 +4,6 @@ using System.Drawing;
using System.Linq; using System.Linq;
using System.Windows.Forms; using System.Windows.Forms;
using BizHawk.Client.ApiHawk;
using BizHawk.Client.Common; using BizHawk.Client.Common;
using static BizHawk.Experiment.AutoGenConfig.ConfigEditorUIGenerators; using static BizHawk.Experiment.AutoGenConfig.ConfigEditorUIGenerators;

1
ExternalToolProjects/DBMan/CustomMainForm.cs
View File

@ -2,7 +2,6 @@
using System.Drawing; using System.Drawing;
using System.Windows.Forms; using System.Windows.Forms;
using BizHawk.Client.ApiHawk;
using BizHawk.Client.Common; using BizHawk.Client.Common;
using BizHawk.Common; using BizHawk.Common;

2
ExternalToolProjects/HelloWorld/CustomMainForm.cs
View File

@ -2,8 +2,8 @@
using System.Windows.Forms; using System.Windows.Forms;
using System.IO; using System.IO;
using BizHawk.Client.ApiHawk;
using BizHawk.Client.Common; using BizHawk.Client.Common;
using BizHawk.Client.EmuHawk;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
using DisplayType = BizHawk.Client.Common.DisplayType; using DisplayType = BizHawk.Client.Common.DisplayType;

6
ExternalToolProjects/NET48ExternalToolForm.targets
View File

@ -5,12 +5,12 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" /> <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="BizHawk.Client.ApiHawk"
HintPath="$(ProjectDir)../../output/BizHawk.Client.ApiHawk.dll"
Private="true" />
<Reference Include="BizHawk.Client.Common" <Reference Include="BizHawk.Client.Common"
HintPath="$(ProjectDir)../../output/BizHawk.Client.Common.dll" HintPath="$(ProjectDir)../../output/BizHawk.Client.Common.dll"
Private="true" /> Private="true" />
<Reference Include="BizHawk.Client.EmuHawk"
HintPath="$(ProjectDir)../../output/EmuHawk.exe"
Private="true" />
<Reference Include="BizHawk.Common" <Reference Include="BizHawk.Common"
HintPath="$(ProjectDir)../../output/BizHawk.Common.dll" HintPath="$(ProjectDir)../../output/BizHawk.Common.dll"
Private="true" /> Private="true" />