From 54f04a7cf01f0784c3e8525115b795c227bb96d1 Mon Sep 17 00:00:00 2001 From: annabunches Date: Fri, 14 Feb 2025 16:20:50 -0500 Subject: [PATCH] Oops, interface implementations on Program don't carry over into the compiled game script. IConsoleProgram will have to just stand as a compile-time checking convenience. --- AirMonitor/AirZone.cs | 4 ++-- Airlock/Airlock.cs | 5 +++-- Mixins/Console/Console.cs | 9 ++------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/AirMonitor/AirZone.cs b/AirMonitor/AirZone.cs index fdb4dd3..080b13c 100644 --- a/AirMonitor/AirZone.cs +++ b/AirMonitor/AirZone.cs @@ -38,7 +38,7 @@ namespace IngameScript public List Vents { get; } = new List(); - private IConsoleProgram _program; + private Program _program; // private List _displays = new List(); // TODO: add single-zone displays private List _lights = new List(); @@ -48,7 +48,7 @@ namespace IngameScript private const float TriggerLevel = 0.75F; - public AirZone(IConsoleProgram program, string zoneName) + public AirZone(Program program, string zoneName) { Name = zoneName; _program = program; diff --git a/Airlock/Airlock.cs b/Airlock/Airlock.cs index 0fcf437..5e9205d 100644 --- a/Airlock/Airlock.cs +++ b/Airlock/Airlock.cs @@ -86,7 +86,7 @@ namespace IngameScript private const int CooldownTicks = 12; private const int SealTimeoutTicks = 30; - public Airlock(string name, IConsoleProgram _program) + public Airlock(string name, Program _program) { _ini = _program.Ini; _name = name; @@ -121,7 +121,8 @@ namespace IngameScript // Precondition: _ini.TryParse() should be called on the block before calling this function. private void addVent(IMyAirVent vent) { - if (_airVent == null) { + if (_airVent == null) + { _airVent = vent; return; } diff --git a/Mixins/Console/Console.cs b/Mixins/Console/Console.cs index d280d7f..7dcd8ea 100644 --- a/Mixins/Console/Console.cs +++ b/Mixins/Console/Console.cs @@ -23,11 +23,6 @@ namespace IngameScript // Properties that should be defined by the implementer. MyIni Ini { get; } Program.IConsole Console { get; } - - // Inherited properties that we need access to - IMyGridProgramRuntimeInfo Runtime { get; } - IMyProgrammableBlock Me { get; } - Action Echo { get; } } partial class Program @@ -46,13 +41,13 @@ namespace IngameScript private List _buffer = new List(); private StringBuilder _builder = new StringBuilder(); private int _tickCount = 0; - private IConsoleProgram _program; + private Program _program; private string _programName; private int _maxLines = 10; private const int DefaultMaxLines = 10; - public MainConsole(IConsoleProgram program, string programName) + public MainConsole(Program program, string programName) { _program = program; _programName = programName;