From 03b4ae18e0e11e29ff2ad145427f66ba7ab8c58b Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Tue, 22 Dec 2020 18:37:27 +1000 Subject: [PATCH] Move Virtual Pads schemata to Cores --- .../tools/VirtualPads/VirtualpadsTool.cs | 2 +- .../vpads_schemata}/IVirtualPadSchema.cs | 2 +- .../vpads_schemata}/PadSchema.cs | 2 +- .../vpads_schemata}/PadSchemaControl.cs | 2 +- .../vpads_schemata}/SchemaAttribute.cs | 2 +- .../vpads_schemata}/A26Schema.cs | 2 +- .../vpads_schemata}/A78Schema.cs | 2 +- .../vpads_schemata}/AppleIISchema.cs | 2 +- .../vpads_schemata}/C64Schema.cs | 2 +- .../vpads_schemata}/ColecoSchema.cs | 4 ++-- .../vpads_schemata}/DualGBSchema.cs | 2 +- .../vpads_schemata}/GBASchema.cs | 2 +- .../vpads_schemata}/GBSchema.cs | 2 +- .../vpads_schemata}/GGLSchema.cs | 2 +- .../vpads_schemata}/GenSchema.cs | 2 +- .../vpads_schemata}/IntvSchema.cs | 4 ++-- .../vpads_schemata}/LynxSchema.cs | 2 +- .../vpads_schemata}/N64Schema.cs | 2 +- .../vpads_schemata}/NdsSchema.cs | 2 +- .../vpads_schemata}/NesSchema.cs | 2 +- .../vpads_schemata}/NgpSchema.cs | 2 +- .../vpads_schemata}/O2Schema.cs | 2 +- .../vpads_schemata}/PSXSchema.cs | 2 +- .../vpads_schemata}/PceSchema.cs | 6 +++--- .../vpads_schemata}/PcfxSchema.cs | 2 +- .../vpads_schemata}/SGBSchema.cs | 2 +- .../vpads_schemata}/SaturnSchema.cs | 2 +- .../vpads_schemata}/SmsSchema.cs | 2 +- .../vpads_schemata}/SnesSchema.cs | 2 +- .../vpads_schemata}/VECSchema.cs | 2 +- .../vpads_schemata}/VirtualBoySchema.cs | 2 +- .../vpads_schemata}/WonderSwanSchema.cs | 2 +- .../vpads_schemata}/ZXSpectrumSchema.cs | 2 +- 33 files changed, 37 insertions(+), 37 deletions(-) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Common/vpads_schemata}/IVirtualPadSchema.cs (82%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Common/vpads_schemata}/PadSchema.cs (90%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Common/vpads_schemata}/PadSchemaControl.cs (99%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Common/vpads_schemata}/SchemaAttribute.cs (82%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Cores/vpads_schemata}/A26Schema.cs (95%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Cores/vpads_schemata}/A78Schema.cs (95%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Cores/vpads_schemata}/AppleIISchema.cs (96%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Cores/vpads_schemata}/C64Schema.cs (95%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Cores/vpads_schemata}/ColecoSchema.cs (93%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Cores/vpads_schemata}/DualGBSchema.cs (93%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Cores/vpads_schemata}/GBASchema.cs (94%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Cores/vpads_schemata}/GBSchema.cs (94%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Cores/vpads_schemata}/GGLSchema.cs (96%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Cores/vpads_schemata}/GenSchema.cs (96%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Cores/vpads_schemata}/IntvSchema.cs (97%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Cores/vpads_schemata}/LynxSchema.cs (92%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Cores/vpads_schemata}/N64Schema.cs (95%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Cores/vpads_schemata}/NdsSchema.cs (96%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Cores/vpads_schemata}/NesSchema.cs (96%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Cores/vpads_schemata}/NgpSchema.cs (92%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Cores/vpads_schemata}/O2Schema.cs (98%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Cores/vpads_schemata}/PSXSchema.cs (96%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Cores/vpads_schemata}/PceSchema.cs (92%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Cores/vpads_schemata}/PcfxSchema.cs (98%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Cores/vpads_schemata}/SGBSchema.cs (93%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Cores/vpads_schemata}/SaturnSchema.cs (99%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Cores/vpads_schemata}/SmsSchema.cs (94%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Cores/vpads_schemata}/SnesSchema.cs (95%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Cores/vpads_schemata}/VECSchema.cs (98%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Cores/vpads_schemata}/VirtualBoySchema.cs (93%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Cores/vpads_schemata}/WonderSwanSchema.cs (95%) rename src/{BizHawk.Client.EmuHawk/tools/VirtualPads/schema => BizHawk.Emulation.Cores/vpads_schemata}/ZXSpectrumSchema.cs (99%) diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs index 7be8f479b2..905cc5ada9 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs @@ -77,7 +77,7 @@ namespace BizHawk.Client.EmuHawk Type schemaType; try { - schemaType = EmuHawk.ReflectionCache.Types.Where(typeof(IVirtualPadSchema).IsAssignableFrom) + schemaType = Emulation.Cores.ReflectionCache.Types.Where(typeof(IVirtualPadSchema).IsAssignableFrom) .Select(t => (SchemaType: t, Attr: t.GetCustomAttributes(false).OfType().FirstOrDefault())) .First(tuple => tuple.Attr?.SystemId == Emulator.SystemId) .SchemaType; diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IVirtualPadSchema.cs b/src/BizHawk.Emulation.Common/vpads_schemata/IVirtualPadSchema.cs similarity index 82% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IVirtualPadSchema.cs rename to src/BizHawk.Emulation.Common/vpads_schemata/IVirtualPadSchema.cs index 9fd0512cb4..e5072fa039 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IVirtualPadSchema.cs +++ b/src/BizHawk.Emulation.Common/vpads_schemata/IVirtualPadSchema.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using BizHawk.Emulation.Common; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Common { public interface IVirtualPadSchema { diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PadSchema.cs b/src/BizHawk.Emulation.Common/vpads_schemata/PadSchema.cs similarity index 90% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PadSchema.cs rename to src/BizHawk.Emulation.Common/vpads_schemata/PadSchema.cs index 6743b569ff..39c343d150 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PadSchema.cs +++ b/src/BizHawk.Emulation.Common/vpads_schemata/PadSchema.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Drawing; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Common { public class PadSchema { diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PadSchemaControl.cs b/src/BizHawk.Emulation.Common/vpads_schemata/PadSchemaControl.cs similarity index 99% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PadSchemaControl.cs rename to src/BizHawk.Emulation.Common/vpads_schemata/PadSchemaControl.cs index 02669bca88..dbff310468 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PadSchemaControl.cs +++ b/src/BizHawk.Emulation.Common/vpads_schemata/PadSchemaControl.cs @@ -5,7 +5,7 @@ using System.Drawing; using BizHawk.Emulation.Common; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Common { public abstract class PadSchemaControl { diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SchemaAttribute.cs b/src/BizHawk.Emulation.Common/vpads_schemata/SchemaAttribute.cs similarity index 82% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SchemaAttribute.cs rename to src/BizHawk.Emulation.Common/vpads_schemata/SchemaAttribute.cs index d46e013a1c..5cb6603850 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SchemaAttribute.cs +++ b/src/BizHawk.Emulation.Common/vpads_schemata/SchemaAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Common { [AttributeUsage(AttributeTargets.Class)] public sealed class SchemaAttribute : Attribute diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A26Schema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/A26Schema.cs similarity index 95% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A26Schema.cs rename to src/BizHawk.Emulation.Cores/vpads_schemata/A26Schema.cs index 19d9414aa8..1bfb0be085 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A26Schema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/A26Schema.cs @@ -5,7 +5,7 @@ using System.Drawing; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Atari.Atari2600; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Cores { [Schema("A26")] // ReSharper disable once UnusedMember.Global diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/A78Schema.cs similarity index 95% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs rename to src/BizHawk.Emulation.Cores/vpads_schemata/A78Schema.cs index b33fd8dc03..d020c83fad 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/A78Schema.cs @@ -6,7 +6,7 @@ using BizHawk.Emulation.Common; using BizHawk.Common.ReflectionExtensions; using BizHawk.Emulation.Cores.Atari.A7800Hawk; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Cores { [Schema("A78")] // ReSharper disable once UnusedMember.Global diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/AppleIISchema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/AppleIISchema.cs similarity index 96% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/AppleIISchema.cs rename to src/BizHawk.Emulation.Cores/vpads_schemata/AppleIISchema.cs index 6cc61eecca..6fe9dd2c87 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/AppleIISchema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/AppleIISchema.cs @@ -4,7 +4,7 @@ using System.Drawing; using BizHawk.Emulation.Common; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Cores { [Schema("AppleII")] // ReSharper disable once UnusedMember.Global diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/C64Schema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/C64Schema.cs similarity index 95% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/C64Schema.cs rename to src/BizHawk.Emulation.Cores/vpads_schemata/C64Schema.cs index 5fb419ba65..c2131c6264 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/C64Schema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/C64Schema.cs @@ -4,7 +4,7 @@ using System.Drawing; using BizHawk.Emulation.Common; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Cores { [Schema("C64")] // ReSharper disable once UnusedMember.Global diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ColecoSchema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/ColecoSchema.cs similarity index 93% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ColecoSchema.cs rename to src/BizHawk.Emulation.Cores/vpads_schemata/ColecoSchema.cs index 4e57204a8a..19f8f00b33 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ColecoSchema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/ColecoSchema.cs @@ -5,7 +5,7 @@ using System.Linq; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.ColecoVision; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Cores { [Schema("Coleco")] // ReSharper disable once UnusedMember.Global @@ -13,7 +13,7 @@ namespace BizHawk.Client.EmuHawk { public IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { - var deck = ((ColecoVision)core).ControllerDeck; + var deck = ((ColecoVision.ColecoVision) core).ControllerDeck; var ports = new[] { deck.Port1.GetType(), deck.Port2.GetType() }; for (int i = 0; i < 2; i++) diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/DualGBSchema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/DualGBSchema.cs similarity index 93% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/DualGBSchema.cs rename to src/BizHawk.Emulation.Cores/vpads_schemata/DualGBSchema.cs index 5391c76a84..99958aa6da 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/DualGBSchema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/DualGBSchema.cs @@ -4,7 +4,7 @@ using System.Drawing; using BizHawk.Emulation.Common; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Cores { [Schema("DGB")] // ReSharper disable once UnusedMember.Global diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBASchema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/GBASchema.cs similarity index 94% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBASchema.cs rename to src/BizHawk.Emulation.Cores/vpads_schemata/GBASchema.cs index dee8ba02cc..861f029df8 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBASchema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/GBASchema.cs @@ -5,7 +5,7 @@ using System.Drawing; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Nintendo.GBA; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Cores { [Schema("GBA")] // ReSharper disable once UnusedMember.Global diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBSchema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/GBSchema.cs similarity index 94% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBSchema.cs rename to src/BizHawk.Emulation.Cores/vpads_schemata/GBSchema.cs index fb327c2f3f..922301725c 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBSchema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/GBSchema.cs @@ -4,7 +4,7 @@ using System.Drawing; using BizHawk.Emulation.Common; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Cores { [Schema("GB")] // ReSharper disable once UnusedMember.Global diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GGLSchema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/GGLSchema.cs similarity index 96% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GGLSchema.cs rename to src/BizHawk.Emulation.Cores/vpads_schemata/GGLSchema.cs index 9d5c409aa8..12b70abb43 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GGLSchema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/GGLSchema.cs @@ -4,7 +4,7 @@ using System.Drawing; using BizHawk.Emulation.Common; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Cores { [Schema("GGL")] // ReSharper disable once UnusedMember.Global diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/GenSchema.cs similarity index 96% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs rename to src/BizHawk.Emulation.Cores/vpads_schemata/GenSchema.cs index 5509eb2205..4010410848 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/GenSchema.cs @@ -6,7 +6,7 @@ using System.Linq; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Consoles.Sega.gpgx; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Cores { [Schema("GEN")] // ReSharper disable once UnusedMember.Global diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IntvSchema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/IntvSchema.cs similarity index 97% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IntvSchema.cs rename to src/BizHawk.Emulation.Cores/vpads_schemata/IntvSchema.cs index db53c73cbc..7e97778ed2 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IntvSchema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/IntvSchema.cs @@ -7,7 +7,7 @@ using BizHawk.Common.ReflectionExtensions; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Intellivision; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Cores { [Schema("INTV")] // ReSharper disable once UnusedMember.Global @@ -18,7 +18,7 @@ namespace BizHawk.Client.EmuHawk public IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) { - var intvSyncSettings = ((Intellivision)core).GetSyncSettings().Clone(); + var intvSyncSettings = ((Intellivision.Intellivision) core).GetSyncSettings().Clone(); var port1 = intvSyncSettings.Port1; var port2 = intvSyncSettings.Port2; diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/LynxSchema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/LynxSchema.cs similarity index 92% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/LynxSchema.cs rename to src/BizHawk.Emulation.Cores/vpads_schemata/LynxSchema.cs index 9e22f95e39..81716d3e76 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/LynxSchema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/LynxSchema.cs @@ -4,7 +4,7 @@ using System.Drawing; using BizHawk.Emulation.Common; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Cores { [Schema("Lynx")] // ReSharper disable once UnusedMember.Global diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/N64Schema.cs similarity index 95% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs rename to src/BizHawk.Emulation.Cores/vpads_schemata/N64Schema.cs index 85f398a1d8..5ae774d06a 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/N64Schema.cs @@ -6,7 +6,7 @@ using BizHawk.Common; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Nintendo.N64; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Cores { [Schema("N64")] // ReSharper disable once UnusedMember.Global diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NdsSchema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/NdsSchema.cs similarity index 96% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NdsSchema.cs rename to src/BizHawk.Emulation.Cores/vpads_schemata/NdsSchema.cs index 599909e86c..8ef48851f4 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NdsSchema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/NdsSchema.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Drawing; using BizHawk.Emulation.Common; -namespace BizHawk.Client.EmuHawk.tools.VirtualPads.schema +namespace BizHawk.Emulation.Cores { [Schema("NDS")] // ReSharper disable once UnusedMember.Global diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NesSchema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/NesSchema.cs similarity index 96% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NesSchema.cs rename to src/BizHawk.Emulation.Cores/vpads_schemata/NesSchema.cs index 05dced89e8..07541c0690 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NesSchema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/NesSchema.cs @@ -8,7 +8,7 @@ using BizHawk.Emulation.Cores.Nintendo.NES; using BizHawk.Emulation.Cores.Nintendo.SubNESHawk; using BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Cores { [Schema("NES")] // ReSharper disable once UnusedMember.Global diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NgpSchema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/NgpSchema.cs similarity index 92% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NgpSchema.cs rename to src/BizHawk.Emulation.Cores/vpads_schemata/NgpSchema.cs index 2a444097ec..048b032a3c 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NgpSchema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/NgpSchema.cs @@ -4,7 +4,7 @@ using System.Drawing; using BizHawk.Emulation.Common; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Cores { [Schema("NGP")] // ReSharper disable once UnusedMember.Global diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/O2Schema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/O2Schema.cs similarity index 98% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/O2Schema.cs rename to src/BizHawk.Emulation.Cores/vpads_schemata/O2Schema.cs index db8ecb96b6..d417ff6049 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/O2Schema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/O2Schema.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Drawing; using BizHawk.Emulation.Common; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Cores { [Schema("O2")] // ReSharper disable once UnusedMember.Global diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/PSXSchema.cs similarity index 96% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs rename to src/BizHawk.Emulation.Cores/vpads_schemata/PSXSchema.cs index 5e128209ef..503fa0a6f9 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/PSXSchema.cs @@ -6,7 +6,7 @@ using BizHawk.Common; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Sony.PSX; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Cores { [Schema("PSX")] // ReSharper disable once UnusedMember.Global diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/PceSchema.cs similarity index 92% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs rename to src/BizHawk.Emulation.Cores/vpads_schemata/PceSchema.cs index 5c3fc03089..0d129db0a0 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/PceSchema.cs @@ -8,7 +8,7 @@ using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.PCEngine; using BizHawk.Emulation.Cores.Waterbox; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Cores { [Schema("PCECD")] // ReSharper disable once UnusedMember.Global @@ -25,13 +25,13 @@ namespace BizHawk.Client.EmuHawk { return core switch { - PCEngine pce => PceHawkSchemas(pce, showMessageBox), + PCEngine.PCEngine pce => PceHawkSchemas(pce, showMessageBox), NymaCore nyma => NymaSchemas(nyma, showMessageBox), _ => Enumerable.Empty() }; } - private static IEnumerable PceHawkSchemas(PCEngine core, Action showMessageBox) + private static IEnumerable PceHawkSchemas(PCEngine.PCEngine core, Action showMessageBox) { var ss = core.GetSyncSettings(); diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PcfxSchema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/PcfxSchema.cs similarity index 98% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PcfxSchema.cs rename to src/BizHawk.Emulation.Cores/vpads_schemata/PcfxSchema.cs index 905eec0a25..964a9d5887 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PcfxSchema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/PcfxSchema.cs @@ -7,7 +7,7 @@ using BizHawk.Common; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Waterbox; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Cores { [Schema("PCFX")] // ReSharper disable once UnusedMember.Global diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SGBSchema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/SGBSchema.cs similarity index 93% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SGBSchema.cs rename to src/BizHawk.Emulation.Cores/vpads_schemata/SGBSchema.cs index afd956b4be..77bffb1e95 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SGBSchema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/SGBSchema.cs @@ -4,7 +4,7 @@ using System.Drawing; using BizHawk.Emulation.Common; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Cores { [Schema("SGB")] // ReSharper disable once UnusedMember.Global diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/SaturnSchema.cs similarity index 99% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs rename to src/BizHawk.Emulation.Cores/vpads_schemata/SaturnSchema.cs index 49a178c3c9..b3a0698644 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/SaturnSchema.cs @@ -7,7 +7,7 @@ using BizHawk.Common; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Waterbox; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Cores { [Schema("SAT")] // ReSharper disable once UnusedMember.Global diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SmsSchema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/SmsSchema.cs similarity index 94% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SmsSchema.cs rename to src/BizHawk.Emulation.Cores/vpads_schemata/SmsSchema.cs index 7c9dc13eff..824bc1a2ec 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SmsSchema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/SmsSchema.cs @@ -4,7 +4,7 @@ using System.Drawing; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Sega.MasterSystem; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Cores { [Schema("SMS")] // ReSharper disable once UnusedMember.Global diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/SnesSchema.cs similarity index 95% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs rename to src/BizHawk.Emulation.Cores/vpads_schemata/SnesSchema.cs index 7458ac14f5..afde157d12 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/SnesSchema.cs @@ -7,7 +7,7 @@ using BizHawk.Emulation.Cores.Nintendo.SNES; using BizHawk.Emulation.Cores.Nintendo.SNES9X; using BizHawk.Emulation.Cores.Waterbox; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Cores { [Schema("SNES")] // ReSharper disable once UnusedMember.Global diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VECSchema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/VECSchema.cs similarity index 98% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VECSchema.cs rename to src/BizHawk.Emulation.Cores/vpads_schemata/VECSchema.cs index 083233a509..72778e60db 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VECSchema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/VECSchema.cs @@ -5,7 +5,7 @@ using System.Drawing; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Consoles.Vectrex; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Cores { [Schema("VEC")] // ReSharper disable once UnusedMember.Global diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VirtualBoySchema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/VirtualBoySchema.cs similarity index 93% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VirtualBoySchema.cs rename to src/BizHawk.Emulation.Cores/vpads_schemata/VirtualBoySchema.cs index 6ef975d2ed..e9c26415bd 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VirtualBoySchema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/VirtualBoySchema.cs @@ -4,7 +4,7 @@ using System.Drawing; using BizHawk.Emulation.Common; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Cores { [Schema("VB")] // ReSharper disable once UnusedMember.Global diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/WonderSwanSchema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/WonderSwanSchema.cs similarity index 95% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/WonderSwanSchema.cs rename to src/BizHawk.Emulation.Cores/vpads_schemata/WonderSwanSchema.cs index f30f67b1bb..5443f63b6a 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/WonderSwanSchema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/WonderSwanSchema.cs @@ -4,7 +4,7 @@ using System.Drawing; using BizHawk.Emulation.Common; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Cores { [Schema("WSWAN")] // ReSharper disable once UnusedMember.Global diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ZXSpectrumSchema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/ZXSpectrumSchema.cs similarity index 99% rename from src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ZXSpectrumSchema.cs rename to src/BizHawk.Emulation.Cores/vpads_schemata/ZXSpectrumSchema.cs index a5e00faeb4..68fb83de28 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ZXSpectrumSchema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/ZXSpectrumSchema.cs @@ -4,7 +4,7 @@ using System.Drawing; using BizHawk.Emulation.Common; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Emulation.Cores { [Schema("ZXSpectrum")] // ReSharper disable once UnusedMember.Global