From e514dfd117464c369a1b0a031efc7641740e1396 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Mon, 13 Apr 2020 19:42:14 +1000 Subject: [PATCH] Move/rename Lua library classes --- .../EmulationLuaLibrary.cs} | 6 +++--- .../GameInfoLuaLibrary.cs} | 0 .../JoypadLuaLibrary.cs} | 0 .../MemoryLuaLibrary.cs} | 0 .../MemorySavestateLuaLibrary.cs} | 6 +++--- .../MovieLuaLibrary.cs} | 0 .../SQLiteLuaLibrary.cs} | 6 +++--- .../UserDataLuaLibrary.cs} | 6 +++--- .../BitLuaLibrary.cs} | 0 .../EventsLuaLibrary.cs} | 6 +++--- .../GenesisLuaLibrary.cs} | 0 .../MainMemoryLuaLibrary.cs} | 0 .../NESLuaLibrary.cs} | 6 +++--- .../SNESLuaLibrary.cs} | 6 +++--- .../StringLuaLibrary.cs} | 0 BizHawk.Client.EmuHawk/MainForm.cs | 4 ++-- .../Lua/{Libraries => }/DelegatingLuaLibraryEmu.cs | 0 .../tools/Lua/{Libraries => }/EmuLuaLibrary.cs | 12 ++++++------ .../{EmuLuaLibrary.Client.cs => ClientLuaLibrary.cs} | 6 +++--- ...LuaLibrary.Communication.cs => CommLuaLibrary.cs} | 8 ++++---- ...EmuLuaLibrary.Console.cs => ConsoleLuaLibrary.cs} | 0 .../{EmuLuaLibrary.Forms.cs => FormsLuaLibrary.cs} | 0 .../{EmuLuaLibrary.Gui.cs => GuiLuaLibrary.cs} | 0 .../{EmuLuaLibrary.Input.cs => InputLuaLibrary.cs} | 0 ...uaLibrary.Savestate.cs => SavestateLuaLibrary.cs} | 0 ...uLuaLibrary.Tastudio.cs => TAStudioLuaLibrary.cs} | 6 +++--- .../tools/Lua/{Libraries => }/NotReallyLuaLibrary.cs | 0 .../Lua/{Libraries => }/PlatformEmuLuaLibrary.cs | 0 28 files changed, 39 insertions(+), 39 deletions(-) rename BizHawk.Client.Common/lua/{EmuLuaLibrary.Emu.cs => CommonLibs/EmulationLuaLibrary.cs} (94%) rename BizHawk.Client.Common/lua/{EmuLuaLibrary.GameInfo.cs => CommonLibs/GameInfoLuaLibrary.cs} (100%) rename BizHawk.Client.Common/lua/{EmuLuaLibrary.Joypad.cs => CommonLibs/JoypadLuaLibrary.cs} (100%) rename BizHawk.Client.Common/lua/{EmuLuaLibrary.Memory.cs => CommonLibs/MemoryLuaLibrary.cs} (100%) rename BizHawk.Client.Common/lua/{EmuLuaLibrary.MemorySavestate.cs => CommonLibs/MemorySavestateLuaLibrary.cs} (86%) rename BizHawk.Client.Common/lua/{EmuLuaLibrary.Movie.cs => CommonLibs/MovieLuaLibrary.cs} (100%) rename BizHawk.Client.Common/lua/{EmuLuaLibrary.SQL.cs => CommonLibs/SQLiteLuaLibrary.cs} (91%) rename BizHawk.Client.Common/lua/{EmuLuaLibrary.UserData.cs => CommonLibs/UserDataLuaLibrary.cs} (91%) rename BizHawk.Client.Common/lua/{EmuLuaLibrary.Bit.cs => LuaHelperLibs/BitLuaLibrary.cs} (100%) rename BizHawk.Client.Common/lua/{EmuLuaLibrary.Events.cs => LuaHelperLibs/EventsLuaLibrary.cs} (96%) rename BizHawk.Client.Common/lua/{EmuLuaLibrary.Genesis.cs => LuaHelperLibs/GenesisLuaLibrary.cs} (100%) rename BizHawk.Client.Common/lua/{EmuLuaLibrary.MainMemory.cs => LuaHelperLibs/MainMemoryLuaLibrary.cs} (100%) rename BizHawk.Client.Common/lua/{EmuLuaLibrary.NES.cs => LuaHelperLibs/NESLuaLibrary.cs} (95%) rename BizHawk.Client.Common/lua/{EmuLuaLibrary.SNES.cs => LuaHelperLibs/SNESLuaLibrary.cs} (93%) rename BizHawk.Client.Common/lua/{EmuLuaLibrary.String.cs => LuaHelperLibs/StringLuaLibrary.cs} (100%) rename BizHawk.Client.EmuHawk/tools/Lua/{Libraries => }/DelegatingLuaLibraryEmu.cs (100%) rename BizHawk.Client.EmuHawk/tools/Lua/{Libraries => }/EmuLuaLibrary.cs (90%) rename BizHawk.Client.EmuHawk/tools/Lua/Libraries/{EmuLuaLibrary.Client.cs => ClientLuaLibrary.cs} (96%) rename BizHawk.Client.EmuHawk/tools/Lua/Libraries/{EmuLuaLibrary.Communication.cs => CommLuaLibrary.cs} (92%) rename BizHawk.Client.EmuHawk/tools/Lua/Libraries/{EmuLuaLibrary.Console.cs => ConsoleLuaLibrary.cs} (100%) rename BizHawk.Client.EmuHawk/tools/Lua/Libraries/{EmuLuaLibrary.Forms.cs => FormsLuaLibrary.cs} (100%) rename BizHawk.Client.EmuHawk/tools/Lua/Libraries/{EmuLuaLibrary.Gui.cs => GuiLuaLibrary.cs} (100%) rename BizHawk.Client.EmuHawk/tools/Lua/Libraries/{EmuLuaLibrary.Input.cs => InputLuaLibrary.cs} (100%) rename BizHawk.Client.EmuHawk/tools/Lua/Libraries/{EmuLuaLibrary.Savestate.cs => SavestateLuaLibrary.cs} (100%) rename BizHawk.Client.EmuHawk/tools/Lua/Libraries/{EmuLuaLibrary.Tastudio.cs => TAStudioLuaLibrary.cs} (96%) rename BizHawk.Client.EmuHawk/tools/Lua/{Libraries => }/NotReallyLuaLibrary.cs (100%) rename BizHawk.Client.EmuHawk/tools/Lua/{Libraries => }/PlatformEmuLuaLibrary.cs (100%) diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Emu.cs b/BizHawk.Client.Common/lua/CommonLibs/EmulationLuaLibrary.cs similarity index 94% rename from BizHawk.Client.Common/lua/EmuLuaLibrary.Emu.cs rename to BizHawk.Client.Common/lua/CommonLibs/EmulationLuaLibrary.cs index 5e5e2519d7..d8457b82d6 100644 --- a/BizHawk.Client.Common/lua/EmuLuaLibrary.Emu.cs +++ b/BizHawk.Client.Common/lua/CommonLibs/EmulationLuaLibrary.cs @@ -8,15 +8,15 @@ using NLua; namespace BizHawk.Client.Common { [Description("A library for interacting with the currently loaded emulator core")] - public sealed class EmulatorLuaLibrary : DelegatingLuaLibrary + public sealed class EmulationLuaLibrary : DelegatingLuaLibrary { public Action FrameAdvanceCallback { get; set; } public Action YieldCallback { get; set; } - public EmulatorLuaLibrary(Lua lua) + public EmulationLuaLibrary(Lua lua) : base(lua) { } - public EmulatorLuaLibrary(Lua lua, Action logOutputCallback) + public EmulationLuaLibrary(Lua lua, Action logOutputCallback) : base(lua, logOutputCallback) { } public override string Name => "emu"; diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.GameInfo.cs b/BizHawk.Client.Common/lua/CommonLibs/GameInfoLuaLibrary.cs similarity index 100% rename from BizHawk.Client.Common/lua/EmuLuaLibrary.GameInfo.cs rename to BizHawk.Client.Common/lua/CommonLibs/GameInfoLuaLibrary.cs diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs b/BizHawk.Client.Common/lua/CommonLibs/JoypadLuaLibrary.cs similarity index 100% rename from BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs rename to BizHawk.Client.Common/lua/CommonLibs/JoypadLuaLibrary.cs diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Memory.cs b/BizHawk.Client.Common/lua/CommonLibs/MemoryLuaLibrary.cs similarity index 100% rename from BizHawk.Client.Common/lua/EmuLuaLibrary.Memory.cs rename to BizHawk.Client.Common/lua/CommonLibs/MemoryLuaLibrary.cs diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.MemorySavestate.cs b/BizHawk.Client.Common/lua/CommonLibs/MemorySavestateLuaLibrary.cs similarity index 86% rename from BizHawk.Client.Common/lua/EmuLuaLibrary.MemorySavestate.cs rename to BizHawk.Client.Common/lua/CommonLibs/MemorySavestateLuaLibrary.cs index f856e3e748..5a24d4466f 100644 --- a/BizHawk.Client.Common/lua/EmuLuaLibrary.MemorySavestate.cs +++ b/BizHawk.Client.Common/lua/CommonLibs/MemorySavestateLuaLibrary.cs @@ -5,12 +5,12 @@ using NLua; // ReSharper disable UnusedAutoPropertyAccessor.Local namespace BizHawk.Client.Common { - public sealed class MemorySavestateEmuLuaLibrary : DelegatingLuaLibrary + public sealed class MemorySavestateLuaLibrary : DelegatingLuaLibrary { - public MemorySavestateEmuLuaLibrary(Lua lua) + public MemorySavestateLuaLibrary(Lua lua) : base(lua) { } - public MemorySavestateEmuLuaLibrary(Lua lua, Action logOutputCallback) + public MemorySavestateLuaLibrary(Lua lua, Action logOutputCallback) : base(lua, logOutputCallback) { } public override string Name => "memorysavestate"; diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Movie.cs b/BizHawk.Client.Common/lua/CommonLibs/MovieLuaLibrary.cs similarity index 100% rename from BizHawk.Client.Common/lua/EmuLuaLibrary.Movie.cs rename to BizHawk.Client.Common/lua/CommonLibs/MovieLuaLibrary.cs diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.SQL.cs b/BizHawk.Client.Common/lua/CommonLibs/SQLiteLuaLibrary.cs similarity index 91% rename from BizHawk.Client.Common/lua/EmuLuaLibrary.SQL.cs rename to BizHawk.Client.Common/lua/CommonLibs/SQLiteLuaLibrary.cs index 3f1ca10839..b4768d416f 100644 --- a/BizHawk.Client.Common/lua/EmuLuaLibrary.SQL.cs +++ b/BizHawk.Client.Common/lua/CommonLibs/SQLiteLuaLibrary.cs @@ -8,12 +8,12 @@ using NLua; namespace BizHawk.Client.Common { [Description("A library for performing SQLite operations.")] - public sealed class SqlLuaLibrary : DelegatingLuaLibrary + public sealed class SQLiteLuaLibrary : DelegatingLuaLibrary { - public SqlLuaLibrary(Lua lua) + public SQLiteLuaLibrary(Lua lua) : base(lua) { } - public SqlLuaLibrary(Lua lua, Action logOutputCallback) + public SQLiteLuaLibrary(Lua lua, Action logOutputCallback) : base(lua, logOutputCallback) { } public override string Name => "SQL"; diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.UserData.cs b/BizHawk.Client.Common/lua/CommonLibs/UserDataLuaLibrary.cs similarity index 91% rename from BizHawk.Client.Common/lua/EmuLuaLibrary.UserData.cs rename to BizHawk.Client.Common/lua/CommonLibs/UserDataLuaLibrary.cs index 5a3a4a3475..25419bfb48 100644 --- a/BizHawk.Client.Common/lua/EmuLuaLibrary.UserData.cs +++ b/BizHawk.Client.Common/lua/CommonLibs/UserDataLuaLibrary.cs @@ -6,12 +6,12 @@ using NLua; namespace BizHawk.Client.Common { [Description("A library for setting and retrieving dynamic data that will be saved and loaded with savestates")] - public sealed class UserDataLibrary : DelegatingLuaLibrary + public sealed class UserDataLuaLibrary : DelegatingLuaLibrary { - public UserDataLibrary(Lua lua) + public UserDataLuaLibrary(Lua lua) : base(lua) { } - public UserDataLibrary(Lua lua, Action logOutputCallback) + public UserDataLuaLibrary(Lua lua, Action logOutputCallback) : base(lua, logOutputCallback) { } public override string Name => "userdata"; diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Bit.cs b/BizHawk.Client.Common/lua/LuaHelperLibs/BitLuaLibrary.cs similarity index 100% rename from BizHawk.Client.Common/lua/EmuLuaLibrary.Bit.cs rename to BizHawk.Client.Common/lua/LuaHelperLibs/BitLuaLibrary.cs diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs b/BizHawk.Client.Common/lua/LuaHelperLibs/EventsLuaLibrary.cs similarity index 96% rename from BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs rename to BizHawk.Client.Common/lua/LuaHelperLibs/EventsLuaLibrary.cs index 2f6b08f671..3bd3b03e67 100644 --- a/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs +++ b/BizHawk.Client.Common/lua/LuaHelperLibs/EventsLuaLibrary.cs @@ -10,7 +10,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.Common { [Description("A library for registering lua functions to emulator events.\n All events support multiple registered methods.\nAll registered event methods can be named and return a Guid when registered")] - public sealed class EventLuaLibrary : LuaLibraryBase + public sealed class EventsLuaLibrary : LuaLibraryBase { [OptionalService] private IInputPollable InputPollableCore { get; set; } @@ -24,10 +24,10 @@ namespace BizHawk.Client.Common [OptionalService] private IMemoryDomains Domains { get; set; } - public EventLuaLibrary(Lua lua) + public EventsLuaLibrary(Lua lua) : base(lua) { } - public EventLuaLibrary(Lua lua, Action logOutputCallback) + public EventsLuaLibrary(Lua lua, Action logOutputCallback) : base(lua, logOutputCallback) { } public override string Name => "event"; diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Genesis.cs b/BizHawk.Client.Common/lua/LuaHelperLibs/GenesisLuaLibrary.cs similarity index 100% rename from BizHawk.Client.Common/lua/EmuLuaLibrary.Genesis.cs rename to BizHawk.Client.Common/lua/LuaHelperLibs/GenesisLuaLibrary.cs diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.MainMemory.cs b/BizHawk.Client.Common/lua/LuaHelperLibs/MainMemoryLuaLibrary.cs similarity index 100% rename from BizHawk.Client.Common/lua/EmuLuaLibrary.MainMemory.cs rename to BizHawk.Client.Common/lua/LuaHelperLibs/MainMemoryLuaLibrary.cs diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.NES.cs b/BizHawk.Client.Common/lua/LuaHelperLibs/NESLuaLibrary.cs similarity index 95% rename from BizHawk.Client.Common/lua/EmuLuaLibrary.NES.cs rename to BizHawk.Client.Common/lua/LuaHelperLibs/NESLuaLibrary.cs index c5998bfa2f..106be83afc 100644 --- a/BizHawk.Client.Common/lua/EmuLuaLibrary.NES.cs +++ b/BizHawk.Client.Common/lua/LuaHelperLibs/NESLuaLibrary.cs @@ -14,7 +14,7 @@ using BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES; namespace BizHawk.Client.Common { [Description("Functions related specifically to Nes Cores")] - public sealed class NesLuaLibrary : DelegatingLuaLibrary + public sealed class NESLuaLibrary : DelegatingLuaLibrary { // TODO: // perhaps with the new core config system, one could @@ -23,10 +23,10 @@ namespace BizHawk.Client.Common [OptionalService] private IMemoryDomains MemoryDomains { get; set; } - public NesLuaLibrary(Lua lua) + public NESLuaLibrary(Lua lua) : base(lua) { } - public NesLuaLibrary(Lua lua, Action logOutputCallback) + public NESLuaLibrary(Lua lua, Action logOutputCallback) : base(lua, logOutputCallback) { } public override string Name => "nes"; diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.SNES.cs b/BizHawk.Client.Common/lua/LuaHelperLibs/SNESLuaLibrary.cs similarity index 93% rename from BizHawk.Client.Common/lua/EmuLuaLibrary.SNES.cs rename to BizHawk.Client.Common/lua/LuaHelperLibs/SNESLuaLibrary.cs index 2ba9c759b1..aa1c405c86 100644 --- a/BizHawk.Client.Common/lua/EmuLuaLibrary.SNES.cs +++ b/BizHawk.Client.Common/lua/LuaHelperLibs/SNESLuaLibrary.cs @@ -8,12 +8,12 @@ using BizHawk.Emulation.Cores.Nintendo.SNES; namespace BizHawk.Client.Common { [Description("Functions specific to SNESHawk (functions may not run when an SNES game is not loaded)")] - public sealed class SnesLuaLibrary : DelegatingLuaLibrary + public sealed class SNESLuaLibrary : DelegatingLuaLibrary { - public SnesLuaLibrary(Lua lua) + public SNESLuaLibrary(Lua lua) : base(lua) { } - public SnesLuaLibrary(Lua lua, Action logOutputCallback) + public SNESLuaLibrary(Lua lua, Action logOutputCallback) : base(lua, logOutputCallback) { } public override string Name => "snes"; diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.String.cs b/BizHawk.Client.Common/lua/LuaHelperLibs/StringLuaLibrary.cs similarity index 100% rename from BizHawk.Client.Common/lua/EmuLuaLibrary.String.cs rename to BizHawk.Client.Common/lua/LuaHelperLibs/StringLuaLibrary.cs diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index cd30608709..21ac08b7b0 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -701,8 +701,8 @@ namespace BizHawk.Client.EmuHawk /// The most common use case is CamHack for Sonic games. /// Accessing this from Lua allows to keep internal code hacks to minimum. /// - /// - /// + /// + /// /// /// public bool InvisibleEmulation { get; set; } diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/DelegatingLuaLibraryEmu.cs b/BizHawk.Client.EmuHawk/tools/Lua/DelegatingLuaLibraryEmu.cs similarity index 100% rename from BizHawk.Client.EmuHawk/tools/Lua/Libraries/DelegatingLuaLibraryEmu.cs rename to BizHawk.Client.EmuHawk/tools/Lua/DelegatingLuaLibraryEmu.cs diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs b/BizHawk.Client.EmuHawk/tools/Lua/EmuLuaLibrary.cs similarity index 90% rename from BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs rename to BizHawk.Client.EmuHawk/tools/Lua/EmuLuaLibrary.cs index 6192ab01d2..debad552c0 100644 --- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs +++ b/BizHawk.Client.EmuHawk/tools/Lua/EmuLuaLibrary.cs @@ -68,9 +68,9 @@ namespace BizHawk.Client.EmuHawk // TODO: make EmuHawk libraries have a base class with common properties such as this // and inject them here - if (instance is EmuHawkLuaLibrary emuHawkLibrary) + if (instance is ClientLuaLibrary clientLib) { - emuHawkLibrary.MainForm = _mainForm; + clientLib.MainForm = _mainForm; } ApiContainerInstance = InitApiContainer(serviceProvider, ConsoleLuaLibrary.LogOutput); @@ -83,8 +83,8 @@ namespace BizHawk.Client.EmuHawk _lua.RegisterFunction("print", this, GetType().GetMethod("Print")); - EmulatorLuaLibrary.FrameAdvanceCallback = Frameadvance; - EmulatorLuaLibrary.YieldCallback = EmuYield; + EmulationLuaLibrary.FrameAdvanceCallback = Frameadvance; + EmulationLuaLibrary.YieldCallback = EmuYield; // Add LuaCanvas to Docs Type luaCanvas = typeof(LuaCanvas); @@ -106,9 +106,9 @@ namespace BizHawk.Client.EmuHawk private FormsLuaLibrary FormsLibrary => (FormsLuaLibrary)Libraries[typeof(FormsLuaLibrary)]; - private EventLuaLibrary EventsLibrary => (EventLuaLibrary)Libraries[typeof(EventLuaLibrary)]; + private EventsLuaLibrary EventsLibrary => (EventsLuaLibrary)Libraries[typeof(EventsLuaLibrary)]; - private EmulatorLuaLibrary EmulatorLuaLibrary => (EmulatorLuaLibrary)Libraries[typeof(EmulatorLuaLibrary)]; + private EmulationLuaLibrary EmulationLuaLibrary => (EmulationLuaLibrary)Libraries[typeof(EmulationLuaLibrary)]; public override void Restart(IEmulatorServiceProvider newServiceProvider) { diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/ClientLuaLibrary.cs similarity index 96% rename from BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs rename to BizHawk.Client.EmuHawk/tools/Lua/Libraries/ClientLuaLibrary.cs index 02f03c8091..f67cd557d3 100644 --- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs +++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/ClientLuaLibrary.cs @@ -16,7 +16,7 @@ using BizHawk.Common; namespace BizHawk.Client.EmuHawk { [Description("A library for manipulating the EmuHawk client UI")] - public sealed class EmuHawkLuaLibrary : DelegatingLuaLibraryEmu + public sealed class ClientLuaLibrary : DelegatingLuaLibraryEmu { [RequiredService] private IEmulator Emulator { get; set; } @@ -26,10 +26,10 @@ namespace BizHawk.Client.EmuHawk public MainForm MainForm { get; set; } - public EmuHawkLuaLibrary(Lua lua) + public ClientLuaLibrary(Lua lua) : base(lua) { } - public EmuHawkLuaLibrary(Lua lua, Action logOutputCallback) + public ClientLuaLibrary(Lua lua, Action logOutputCallback) : base(lua, logOutputCallback) { } public override string Name => "client"; diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Communication.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/CommLuaLibrary.cs similarity index 92% rename from BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Communication.cs rename to BizHawk.Client.EmuHawk/tools/Lua/Libraries/CommLuaLibrary.cs index 1a09d50b0f..e6ff7eea16 100644 --- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Communication.cs +++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/CommLuaLibrary.cs @@ -7,12 +7,12 @@ using System.Text; namespace BizHawk.Client.EmuHawk { [Description("A library for communicating with other programs")] - public sealed class CommunicationLuaLibrary : LuaLibraryBase + public sealed class CommLuaLibrary : LuaLibraryBase { - public CommunicationLuaLibrary(Lua lua) + public CommLuaLibrary(Lua lua) : base(lua) { } - public CommunicationLuaLibrary(Lua lua, Action logOutputCallback) + public CommLuaLibrary(Lua lua, Action logOutputCallback) : base(lua, logOutputCallback) { } public override string Name => "comm"; @@ -22,7 +22,7 @@ namespace BizHawk.Client.EmuHawk public static string GetLuaFunctionsList() { var list = new StringBuilder(); - foreach (var function in typeof(CommunicationLuaLibrary).GetMethods()) + foreach (var function in typeof(CommLuaLibrary).GetMethods()) { list.AppendLine(function.ToString()); } diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Console.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/ConsoleLuaLibrary.cs similarity index 100% rename from BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Console.cs rename to BizHawk.Client.EmuHawk/tools/Lua/Libraries/ConsoleLuaLibrary.cs diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Forms.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/FormsLuaLibrary.cs similarity index 100% rename from BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Forms.cs rename to BizHawk.Client.EmuHawk/tools/Lua/Libraries/FormsLuaLibrary.cs diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/GuiLuaLibrary.cs similarity index 100% rename from BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs rename to BizHawk.Client.EmuHawk/tools/Lua/Libraries/GuiLuaLibrary.cs diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Input.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/InputLuaLibrary.cs similarity index 100% rename from BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Input.cs rename to BizHawk.Client.EmuHawk/tools/Lua/Libraries/InputLuaLibrary.cs diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Savestate.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/SavestateLuaLibrary.cs similarity index 100% rename from BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Savestate.cs rename to BizHawk.Client.EmuHawk/tools/Lua/Libraries/SavestateLuaLibrary.cs diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Tastudio.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/TAStudioLuaLibrary.cs similarity index 96% rename from BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Tastudio.cs rename to BizHawk.Client.EmuHawk/tools/Lua/Libraries/TAStudioLuaLibrary.cs index b6587f30a5..72f6ec6061 100644 --- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Tastudio.cs +++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/TAStudioLuaLibrary.cs @@ -14,12 +14,12 @@ namespace BizHawk.Client.EmuHawk { [Description("A library for manipulating the Tastudio dialog of the EmuHawk client")] [LuaLibrary(released: true)] - public sealed class TastudioLuaLibrary : LuaLibraryBase + public sealed class TAStudioLuaLibrary : LuaLibraryBase { - public TastudioLuaLibrary(Lua lua) + public TAStudioLuaLibrary(Lua lua) : base(lua) { } - public TastudioLuaLibrary(Lua lua, Action logOutputCallback) + public TAStudioLuaLibrary(Lua lua, Action logOutputCallback) : base(lua, logOutputCallback) { } public override string Name => "tastudio"; diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/NotReallyLuaLibrary.cs b/BizHawk.Client.EmuHawk/tools/Lua/NotReallyLuaLibrary.cs similarity index 100% rename from BizHawk.Client.EmuHawk/tools/Lua/Libraries/NotReallyLuaLibrary.cs rename to BizHawk.Client.EmuHawk/tools/Lua/NotReallyLuaLibrary.cs diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/PlatformEmuLuaLibrary.cs b/BizHawk.Client.EmuHawk/tools/Lua/PlatformEmuLuaLibrary.cs similarity index 100% rename from BizHawk.Client.EmuHawk/tools/Lua/Libraries/PlatformEmuLuaLibrary.cs rename to BizHawk.Client.EmuHawk/tools/Lua/PlatformEmuLuaLibrary.cs