Migrate SnesLuaLibrary to ApiHawk delegation

BizHawk.Client.Common/lua/EmuLuaLibrary.SNES.cs

@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel;
-using BizHawk.Emulation.Common;
 using NLua;
 using BizHawk.Emulation.Cores.Nintendo.SNES;
 
@@ -9,11 +8,8 @@ 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 : LuaLibraryBase
+	public sealed class SnesLuaLibrary : DelegatingLuaLibrary
 	{
-		[OptionalService]
-		private LibsnesCore Snes { get; set; }
-
 		public SnesLuaLibrary(Lua lua)
 			: base(lua) { }
 
@@ -22,144 +18,138 @@ namespace BizHawk.Client.Common
 
 		public override string Name => "snes";
 
-		private LibsnesCore.SnesSettings GetSettings()
+		private LibsnesCore.SnesSettings Settings
 		{
-			return Snes != null
+			get => APIs.Emu.GetSettings() as LibsnesCore.SnesSettings ?? new LibsnesCore.SnesSettings();
-				? Snes.GetSettings()
+			set => APIs.Emu.PutSettings(value);
-				: new LibsnesCore.SnesSettings();
-		}
-
-		private void PutSettings(LibsnesCore.SnesSettings settings)
-		{
-			Snes?.PutSettings(settings);
 		}
 
 		[LuaMethodExample("if ( snes.getlayer_bg_1( ) ) then\r\n\tconsole.log( \"Returns whether the bg 1 layer is displayed\" );\r\nend;")]
 		[LuaMethod("getlayer_bg_1", "Returns whether the bg 1 layer is displayed")]
 		public bool GetLayerBg1()
 		{
-			return GetSettings().ShowBG1_1;
+			return Settings.ShowBG1_1;
 		}
 
 		[LuaMethodExample("if ( snes.getlayer_bg_2( ) ) then\r\n\tconsole.log( \"Returns whether the bg 2 layer is displayed\" );\r\nend;")]
 		[LuaMethod("getlayer_bg_2", "Returns whether the bg 2 layer is displayed")]
 		public bool GetLayerBg2()
 		{
-			return GetSettings().ShowBG2_1;
+			return Settings.ShowBG2_1;
 		}
 
 		[LuaMethodExample("if ( snes.getlayer_bg_3( ) ) then\r\n\tconsole.log( \"Returns whether the bg 3 layer is displayed\" );\r\nend;")]
 		[LuaMethod("getlayer_bg_3", "Returns whether the bg 3 layer is displayed")]
 		public bool GetLayerBg3()
 		{
-			return GetSettings().ShowBG3_1;
+			return Settings.ShowBG3_1;
 		}
 
 		[LuaMethodExample("if ( snes.getlayer_bg_4( ) ) then\r\n\tconsole.log( \"Returns whether the bg 4 layer is displayed\" );\r\nend;")]
 		[LuaMethod("getlayer_bg_4", "Returns whether the bg 4 layer is displayed")]
 		public bool GetLayerBg4()
 		{
-			return GetSettings().ShowBG4_1;
+			return Settings.ShowBG4_1;
 		}
 
 		[LuaMethodExample("if ( snes.getlayer_obj_1( ) ) then\r\n\tconsole.log( \"Returns whether the obj 1 layer is displayed\" );\r\nend;")]
 		[LuaMethod("getlayer_obj_1", "Returns whether the obj 1 layer is displayed")]
 		public bool GetLayerObj1()
 		{
-			return GetSettings().ShowOBJ_0;
+			return Settings.ShowOBJ_0;
 		}
 
 		[LuaMethodExample("if ( snes.getlayer_obj_2( ) ) then\r\n\tconsole.log( \"Returns whether the obj 2 layer is displayed\" );\r\nend;")]
 		[LuaMethod("getlayer_obj_2", "Returns whether the obj 2 layer is displayed")]
 		public bool GetLayerObj2()
 		{
-			return GetSettings().ShowOBJ_1;
+			return Settings.ShowOBJ_1;
 		}
 
 		[LuaMethodExample("if ( snes.getlayer_obj_3( ) ) then\r\n\tconsole.log( \"Returns whether the obj 3 layer is displayed\" );\r\nend;")]
 		[LuaMethod("getlayer_obj_3", "Returns whether the obj 3 layer is displayed")]
 		public bool GetLayerObj3()
 		{
-			return GetSettings().ShowOBJ_2;
+			return Settings.ShowOBJ_2;
 		}
 
 		[LuaMethodExample("if ( snes.getlayer_obj_4( ) ) then\r\n\tconsole.log( \"Returns whether the obj 4 layer is displayed\" );\r\nend;")]
 		[LuaMethod("getlayer_obj_4", "Returns whether the obj 4 layer is displayed")]
 		public bool GetLayerObj4()
 		{
-			return GetSettings().ShowOBJ_3;
+			return Settings.ShowOBJ_3;
 		}
 
 		[LuaMethodExample("snes.setlayer_bg_1( true );")]
 		[LuaMethod("setlayer_bg_1", "Sets whether the bg 1 layer is displayed")]
 		public void SetLayerBg1(bool value)
 		{
-			var s = GetSettings();
+			var s = Settings;
 			s.ShowBG1_1 = s.ShowBG1_0 = value;
-			PutSettings(s);
+			Settings = s;
 		}
 
 		[LuaMethodExample("snes.setlayer_bg_2( true );")]
 		[LuaMethod("setlayer_bg_2", "Sets whether the bg 2 layer is displayed")]
 		public void SetLayerBg2(bool value)
 		{
-			var s = GetSettings();
+			var s = Settings;
 			s.ShowBG2_1 = s.ShowBG2_0 = value;
-			PutSettings(s);
+			Settings = s;
 		}
 
 		[LuaMethodExample("snes.setlayer_bg_3( true );")]
 		[LuaMethod("setlayer_bg_3", "Sets whether the bg 3 layer is displayed")]
 		public void SetLayerBg3(bool value)
 		{
-			var s = GetSettings();
+			var s = Settings;
 			s.ShowBG3_1 = s.ShowBG3_0 = value;
-			PutSettings(s);
+			Settings = s;
 		}
 
 		[LuaMethodExample("snes.setlayer_bg_4( true );")]
 		[LuaMethod("setlayer_bg_4", "Sets whether the bg 4 layer is displayed")]
 		public void SetLayerBg4(bool value)
 		{
-			var s = GetSettings();
+			var s = Settings;
 			s.ShowBG4_1 = s.ShowBG4_0 = value;
-			PutSettings(s);
+			Settings = s;
 		}
 
 		[LuaMethodExample("snes.setlayer_obj_1( true );")]
 		[LuaMethod("setlayer_obj_1", "Sets whether the obj 1 layer is displayed")]
 		public void SetLayerObj1(bool value)
 		{
-			var s = GetSettings();
+			var s = Settings;
 			s.ShowOBJ_0 = value;
-			PutSettings(s);
+			Settings = s;
 		}
 
 		[LuaMethodExample("snes.setlayer_obj_2( true );")]
 		[LuaMethod("setlayer_obj_2", "Sets whether the obj 2 layer is displayed")]
 		public void SetLayerObj2(bool value)
 		{
-			var s = GetSettings();
+			var s = Settings;
 			s.ShowOBJ_1 = value;
-			PutSettings(s);
+			Settings = s;
 		}
 
 		[LuaMethodExample("snes.setlayer_obj_3( true );")]
 		[LuaMethod("setlayer_obj_3", "Sets whether the obj 3 layer is displayed")]
 		public void SetLayerObj3(bool value)
 		{
-			var s = GetSettings();
+			var s = Settings;
 			s.ShowOBJ_2 = value;
-			PutSettings(s);
+			Settings = s;
 		}
 
 		[LuaMethodExample("snes.setlayer_obj_4( true );")]
 		[LuaMethod("setlayer_obj_4", "Sets whether the obj 4 layer is displayed")]
 		public void SetLayerObj4(bool value)
 		{
-			var s = GetSettings();
+			var s = Settings;
 			s.ShowOBJ_3 = value;
-			PutSettings(s);
+			Settings = s;
 		}
 	}
 }