Add remaining cores to CoreNames, manually changing Designer files

This commit is contained in:
YoshiRulz 2021-04-09 14:00:10 +10:00
parent fb1d507220
commit a9e78488ac
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
35 changed files with 73 additions and 41 deletions

View File

@ -3,6 +3,7 @@ using System.Linq;
using BizHawk.Common;
using BizHawk.Emulation.Common;
using BizHawk.Emulation.Cores;
using BizHawk.Emulation.Cores.Consoles.Nintendo.NDS;
namespace BizHawk.Client.Common
@ -76,7 +77,7 @@ namespace BizHawk.Client.Common
Result.Movie.SyncSettingsJson = ConfigService.SaveWithType(syncSettings);
}
Result.Movie.HeaderEntries[HeaderKeys.Core] = "MelonDS";
Result.Movie.HeaderEntries[HeaderKeys.Core] = CoreNames.MelonDS;
}
private readonly string[] _buttons = { "Left", "Right", "Up", "Down", "A", "B", "X", "Y", "L", "R", "Start", "Select" };

View File

@ -309,7 +309,7 @@ namespace BizHawk.Client.EmuHawk
this.ForumsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.FeaturesMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.AboutMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.Atari7800HawkCoreMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.A7800HawkCoreMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.MainStatusBar = new BizHawk.WinForms.Controls.StatusStripEx();
this.DumpStatusButton = new System.Windows.Forms.ToolStripDropDownButton();
this.EmuStatus = new BizHawk.WinForms.Controls.StatusLabelEx();
@ -2001,9 +2001,9 @@ namespace BizHawk.Client.EmuHawk
this.AboutMenuItem.Text = "&About";
this.AboutMenuItem.Click += new System.EventHandler(this.AboutMenuItem_Click);
//
// Atari7800HawkCoreMenuItem
// A7800HawkCoreMenuItem
//
this.Atari7800HawkCoreMenuItem.Text = "Atari7800Hawk";
this.A7800HawkCoreMenuItem.Text = "A7800Hawk";
//
// MainStatusBar
//
@ -2772,7 +2772,7 @@ namespace BizHawk.Client.EmuHawk
private BizHawk.WinForms.Controls.ToolStripMenuItemEx SNESControllerConfigurationMenuItem;
private BizHawk.WinForms.Controls.ToolStripMenuItemEx C64DisksSubMenu;
private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator36;
private BizHawk.WinForms.Controls.ToolStripMenuItemEx Atari7800HawkCoreMenuItem;
private BizHawk.WinForms.Controls.ToolStripMenuItemEx A7800HawkCoreMenuItem;
private BizHawk.WinForms.Controls.ToolStripMenuItemEx zXSpectrumToolStripMenuItem;
private BizHawk.WinForms.Controls.ToolStripMenuItemEx ZXSpectrumControllerConfigurationMenuItem;
private BizHawk.WinForms.Controls.ToolStripMenuItemEx ZXSpectrumCoreEmulationSettingsMenuItem;

View File

@ -104,8 +104,8 @@
this.lblAutoLoadText.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblAutoLoadText.Location = new System.Drawing.Point(155, 373);
this.lblAutoLoadText.Name = "lblAutoLoadText";
this.lblAutoLoadText.Text = "When enabled CPCHawk will automatically start and stop the tape whenever the tape" +
" motor state changes";
this.lblAutoLoadText.Text = "When enabled, the tape will be started and stopped automatically whenever the " +
"tape motor state changes";
this.lblAutoLoadText.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// autoLoadcheckBox1

View File

@ -130,8 +130,8 @@
this.lblAutoLoadText.Font = new System.Drawing.Font("Courier New", 8F);
this.lblAutoLoadText.Location = new System.Drawing.Point(124, 388);
this.lblAutoLoadText.Name = "lblAutoLoadText";
this.lblAutoLoadText.Text = "When enabled ZXHawk will attempt to control the tape device automatically when th" +
"e correct traps are detected";
this.lblAutoLoadText.Text = "When enabled, will attempt to control the tape device automatically when the " +
"correct traps are detected";
this.lblAutoLoadText.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// autoLoadcheckBox1

View File

@ -84,7 +84,7 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Arcades.MAME
{
[Core(
name: "MAME",
name: CoreNames.MAME,
author: "MAMEDev",
isPorted: true,
isReleased: false,

View File

@ -7,7 +7,7 @@ using BizHawk.Emulation.Cores.Components.Z80A;
namespace BizHawk.Emulation.Cores.Calculators
{
[Core(
"TI83Hawk",
CoreNames.TI83Hawk,
"zeromus",
isPorted: false,
isReleased: true)]

View File

@ -14,7 +14,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
/// * Main Initialization *
/// </summary>
[Core(
"CPCHawk",
CoreNames.CPCHawk,
"Asnivor",
isPorted: false,
isReleased: false)]

View File

@ -7,7 +7,7 @@ using Jellyfish.Virtu;
namespace BizHawk.Emulation.Cores.Computers.AppleII
{
[Core(
"Virtu",
CoreNames.Virtu,
"fool",
isPorted: true,
isReleased: true)]

View File

@ -10,7 +10,7 @@ using BizHawk.Emulation.Cores.Computers.Commodore64.Media;
namespace BizHawk.Emulation.Cores.Computers.Commodore64
{
[Core(
"C64Hawk",
CoreNames.C64Hawk,
"SaxxonPike",
isPorted: false,
isReleased: true)]

View File

@ -4,7 +4,7 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Computers.MSX
{
[Core("MSXHawk", "", isPorted: false, isReleased: false)]
[Core(CoreNames.MSXHawk, "", isPorted: false, isReleased: false)]
[ServiceNotApplicable(new[] { typeof(IDriveLight) })]
public partial class MSX : IEmulator, IVideoProvider, ISoundProvider, ISaveRam, IInputPollable, IRegionable, ISettable<MSX.MSXSettings, MSX.MSXSyncSettings>
{

View File

@ -15,7 +15,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
/// * Main Initialization *
/// </summary>
[Core(
"ZXHawk",
CoreNames.ZXHawk,
"Asnivor, Alyosha",
isPorted: false,
isReleased: true)]

View File

@ -6,7 +6,7 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Atari.Atari2600
{
[Core("Atari2600Hawk", "Micro500, Alyosha, adelikat, natt", isPorted: false, isReleased: true)]
[Core(CoreNames.Atari2600Hawk, "Micro500, Alyosha, adelikat, natt", isPorted: false, isReleased: true)]
[ServiceNotApplicable(new[] { typeof(IDriveLight), typeof(ISaveRam) })]
public partial class Atari2600 : IEmulator, IDebuggable, IInputPollable, IBoardInfo, IRomInfo,
IRegionable, ICreateGameDBEntries, ISettable<Atari2600.A2600Settings, Atari2600.A2600SyncSettings>

View File

@ -8,7 +8,7 @@ using BizHawk.Common.NumberExtensions;
namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
{
[Core(
"A7800Hawk",
CoreNames.A7800Hawk,
"",
isPorted: false,
isReleased: true)]

View File

@ -7,7 +7,7 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Atari.Lynx
{
[Core("Handy", "K. Wilkins, Mednafen Team", true, true, "mednafen 0-9-34-1", "http://mednafen.sourceforge.net/", false)]
[Core(CoreNames.Handy, "K. Wilkins, Mednafen Team", true, true, "mednafen 0-9-34-1", "http://mednafen.sourceforge.net/", false)]
[ServiceNotApplicable(new[] { typeof(IDriveLight), typeof(IRegionable), typeof(ISettable<,>) })]
public partial class Lynx : IEmulator, IVideoProvider, ISoundProvider, ISaveRam, IStatable, IInputPollable
{

View File

@ -6,7 +6,7 @@ using BizHawk.Common;
namespace BizHawk.Emulation.Cores.Consoles.Belogic
{
[Core("uzem", "David Etherton", true, true, "", "", false)]
[Core(CoreNames.Uzem, "David Etherton", true, true, "", "", false)]
public class Uzem : WaterboxCore
{
private LibUzem _uze;

View File

@ -5,7 +5,7 @@ using System;
namespace BizHawk.Emulation.Cores.ColecoVision
{
[Core(
"ColecoHawk",
CoreNames.ColecoHawk,
"Vecna",
isPorted: false,
isReleased: true)]

View File

@ -4,7 +4,7 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Consoles.ChannelF
{
[Core(
"ChannelFHawk",
CoreNames.ChannelFHawk,
"Asnivor",
isPorted: false,
isReleased: false)]

View File

@ -6,7 +6,7 @@ using BizHawk.Emulation.Cores.Components.MC6809;
namespace BizHawk.Emulation.Cores.Consoles.Vectrex
{
[Core("VectrexHawk", "", isPorted: false, isReleased: true)]
[Core(CoreNames.VectrexHawk, "", isPorted: false, isReleased: true)]
[ServiceNotApplicable(new[] { typeof(IDriveLight) })]
public partial class VectrexHawk : IEmulator, ISaveRam, IDebuggable, IInputPollable, IRegionable,
ISettable<object, VectrexHawk.VectrexSyncSettings>

View File

@ -6,7 +6,7 @@ using BizHawk.Emulation.Cores.Components.CP1610;
namespace BizHawk.Emulation.Cores.Intellivision
{
[Core(
"IntelliHawk",
CoreNames.IntelliHawk,
"BrandonE, Alyosha",
isPorted: false,
isReleased: true)]

View File

@ -6,7 +6,7 @@ using BizHawk.Emulation.Cores.Components.I8048;
namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
{
[Core("O2Hawk", "", isPorted: false, isReleased: true)]
[Core(CoreNames.O2Hawk, "", isPorted: false, isReleased: true)]
[ServiceNotApplicable(new[] { typeof(IDriveLight) })]
public partial class O2Hawk : IEmulator, ISaveRam, IDebuggable, IInputPollable, IRegionable, ISettable<O2Hawk.O2Settings, O2Hawk.O2SyncSettings>, IBoardInfo
{

View File

@ -5,7 +5,7 @@ using System.Collections.Generic;
namespace BizHawk.Emulation.Cores.Consoles.NEC.PCFX
{
[Core("T. S. T.",
[Core(CoreNames.TST,
author: "Mednafen Team",
isPorted: true,
isReleased: true,

View File

@ -3,7 +3,7 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x
{
[Core("GBHawkLink3x", "", isPorted: false, isReleased: true)]
[Core(CoreNames.GBHawkLink3x, "", isPorted: false, isReleased: true)]
[ServiceNotApplicable(new[] { typeof(IDriveLight) })]
public partial class GBHawkLink3x : IEmulator, ISaveRam, IDebuggable, IStatable, IInputPollable, IRegionable,
ISettable<GBHawkLink3x.GBLink3xSettings, GBHawkLink3x.GBLink3xSyncSettings>

View File

@ -3,7 +3,7 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink4x
{
[Core("GBHawkLink4x", "", isPorted: false, isReleased: true)]
[Core(CoreNames.GBHawkLink4x, "", isPorted: false, isReleased: true)]
[ServiceNotApplicable(new[] { typeof(IDriveLight) })]
public partial class GBHawkLink4x : IEmulator, ISaveRam, IDebuggable, IStatable, IInputPollable, IRegionable,
ISettable<GBHawkLink4x.GBLink4xSettings, GBHawkLink4x.GBLink4xSyncSettings>

View File

@ -7,7 +7,7 @@ using BizHawk.Emulation.Cores.Nintendo.N64.NativeApi;
namespace BizHawk.Emulation.Cores.Nintendo.N64
{
[Core(
"Mupen64Plus",
CoreNames.Mupen64Plus,
"",
isPorted: true,
isReleased: true,

View File

@ -7,7 +7,7 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
{
[Core("MelonDS", "Arisotura", false, false, null, null, true)]
[Core(CoreNames.MelonDS, "Arisotura", false, false, null, null, true)]
public unsafe partial class MelonDS : IEmulator
{
private readonly BasicServiceProvider _serviceProvider;

View File

@ -10,7 +10,7 @@ using System.Linq;
namespace BizHawk.Emulation.Cores.Consoles.Nintendo.VB
{
[Core("Virtual Boyee",
[Core(CoreNames.VirtualBoyee,
author: "Mednafen Team",
isPorted: true,
isReleased: true,

View File

@ -5,7 +5,7 @@ using System.Collections.Generic;
namespace BizHawk.Emulation.Cores.Consoles.SNK
{
[Core("NeoPop",
[Core(CoreNames.NeoPop,
author: "Thomas Klausner, Mednafen Team",
isPorted: true,
isReleased: true,

View File

@ -4,7 +4,7 @@ using BizHawk.Emulation.Cores.Sega.MasterSystem;
namespace BizHawk.Emulation.Cores.Sega.GGHawkLink
{
[Core("GGHawkLink", "", isPorted: false, isReleased: false)]
[Core(CoreNames.GGHawkLink, "", isPorted: false, isReleased: false)]
[ServiceNotApplicable(new[] { typeof(IDriveLight) })]
public partial class GGHawkLink : IEmulator, ISaveRam, IDebuggable, IStatable, IInputPollable, IRegionable, ILinkable,
ISettable<GGHawkLink.GGLinkSettings, GGHawkLink.GGLinkSyncSettings>

View File

@ -15,7 +15,7 @@ using BizHawk.Emulation.Cores.Components.Z80A;
namespace BizHawk.Emulation.Cores.Sega.MasterSystem
{
[Core(
"SMSHawk",
CoreNames.SMSHawk,
"Vecna",
isPorted: false,
isReleased: true)]

View File

@ -5,7 +5,7 @@ using System.Collections.Generic;
namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn
{
[Core("Saturnus",
[Core(CoreNames.Saturnus,
author: "Mednafen Team",
isPorted: true,
isReleased: true,

View File

@ -7,7 +7,7 @@ using BizHawk.Emulation.DiscSystem;
namespace BizHawk.Emulation.Cores.Sony.PS2
{
[Core("DobieStation", "PSI", true, false, "fa33778b056aa32", "https://github.com/PSI-Rockin/DobieStation", false)]
[Core(CoreNames.DobieStation, "PSI", true, false, "fa33778b056aa32", "https://github.com/PSI-Rockin/DobieStation", false)]
public unsafe class DobieStation : WaterboxCore, ISettable<object, DobieStation.DobieSyncSettings>
{
private readonly LibDobieStation _core;

View File

@ -30,7 +30,7 @@ using BizHawk.Emulation.DiscSystem;
namespace BizHawk.Emulation.Cores.Sony.PSX
{
[Core(
"Octoshock",
CoreNames.Octoshock,
"Mednafen Team",
isPorted: true,
isReleased: true)]

View File

@ -6,7 +6,7 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.WonderSwan
{
[Core("Cygne/Mednafen", "Dox, Mednafen Team", true, true, "1.24.3", "https://mednafen.github.io/releases/", false)]
[Core(CoreNames.Cygne, "Dox, Mednafen Team", true, true, "1.24.3", "https://mednafen.github.io/releases/", false)]
[ServiceNotApplicable(new[] { typeof(IDriveLight), typeof(IRegionable) })]
public partial class WonderSwan : IEmulator, IVideoProvider, ISoundProvider,
IInputPollable, IDebuggable

View File

@ -3,28 +3,59 @@
namespace BizHawk.Emulation.Cores
{
/// <summary>
/// Constant class for the names of cores, that should be used in every <see cref="CoreAttribute"/><br/>
/// For now we are only including ones that can be picked as a core preference, but all cores should be included here
/// holds the names of ported and Hawk cores as consts,
/// to be used for <see cref="CoreAttribute">[Core]</see> and various front-end needs
/// (though sadly not in Designer files)
/// </summary>
public static class CoreNames
{
public const string A7800Hawk = "A7800Hawk";
public const string Atari2600Hawk = "Atari2600Hawk";
public const string Bsnes = "BSNES";
public const string C64Hawk = "C64Hawk";
public const string ChannelFHawk = "ChannelFHawk";
public const string ColecoHawk = "ColecoHawk";
public const string CPCHawk = "CPCHawk";
public const string Cygne = "Cygne/Mednafen";
public const string DobieStation = "DobieStation";
public const string DualGambatte = "DualGambatte";
public const string Faust = "Faust";
public const string Gambatte = "Gambatte";
public const string GbHawk = "GBHawk";
public const string GBHawkLink = "GBHawkLink";
public const string GBHawkLink3x = "GBHawkLink3x";
public const string GBHawkLink4x = "GBHawkLink4x";
public const string GGHawkLink = "GGHawkLink";
public const string Gpgx = "Genplus-gx";
public const string Handy = "Handy";
public const string HyperNyma = "HyperNyma";
public const string IntelliHawk = "IntelliHawk";
public const string Libretro = "Libretro";
public const string MAME = "MAME";
public const string MelonDS = "MelonDS";
public const string Mgba = "mGBA";
public const string MSXHawk = "MSXHawk";
public const string Mupen64Plus = "Mupen64Plus";
public const string NesHawk = "NesHawk";
public const string NeoPop = "NeoPop";
public const string O2Hawk = "O2Hawk";
public const string Octoshock = "Octoshock";
public const string PceHawk = "PCEHawk";
public const string PicoDrive = "PicoDrive";
public const string QuickNes = "QuickNes";
public const string SameBoy = "SameBoy";
public const string Saturnus = "Saturnus";
public const string SMSHawk = "SMSHawk";
public const string Snes9X = "Snes9x";
public const string SubGbHawk = "SubGBHawk";
public const string SubNesHawk = "SubNESHawk";
public const string TI83Hawk = "TI83Hawk";
public const string TST = "T. S. T.";
public const string TurboNyma = "TurboNyma";
public const string Uzem = "uzem";
public const string VectrexHawk = "VectrexHawk";
public const string Virtu = "Virtu";
public const string VirtualBoyee = "Virtual Boyee";
public const string ZXHawk = "ZXHawk";
}
}

View File

@ -13,7 +13,7 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Libretro
{
[Core("Libretro", "zeromus", isPorted: false, isReleased: false)]
[Core(CoreNames.Libretro, "zeromus", isPorted: false, isReleased: false)]
[ServiceNotApplicable(new[] { typeof(IDriveLight) })]
public unsafe partial class LibretroCore : IEmulator, ISettable<LibretroCore.Settings, LibretroCore.SyncSettings>,
ISaveRam, IStatable, IVideoProvider, IInputPollable