annabunches/space_engineers
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace ConfigParser with SDK-provided MyIni

Browse Source
This commit is contained in:
Anna Rose 2025-02-09 21:18:58 -05:00
parent 37511ac473
commit e82303ff00
9 changed files with 30 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MechanicalDoor/MechanicalDoor.csproj
View File

@ -24,7 +24,6 @@
<AdditionalFiles Include="thumb.png" />
</ItemGroup>
<Import Project="..\Mixins\Console\Console.projitems" Label="shared" />
<Import Project="..\Mixins\ConfigParser\ConfigParser.projitems" Label="shared" />
<Import Project="..\Mixins\Sequencer\Sequencer.projitems" Label="shared" />
<Import Project="..\Mixins\Utils\Utils.projitems" Label="shared" />
</Project>

12
MechanicalDoor/Program.cs
View File

@ -8,6 +8,7 @@ namespace IngameScript
public partial class Program : MyGridProgram
{
private MyCommandLine _cli;
private MyIni _ini;
private Console _console;
private List<IEnumerator<bool>> _jobs;
private Dictionary<string, Sequencer> _doors;
@ -17,13 +18,14 @@ namespace IngameScript
{
_tickCount = 0;
_cli = new MyCommandLine();
_console = new Console(this);
_ini = new MyIni();
_console = new Console(this, _ini);
_jobs = new List<IEnumerator<bool>>();
_doors = new Dictionary<string, Sequencer>();
List<IMyTerminalBlock> doorParts = Utils.GetBlocksNameContains(GridTerminalSystem, "!Door");
foreach (IMyTerminalBlock block in doorParts)
List<IMyTerminalBlock> doorBlocks = new List<IMyTerminalBlock>();
GridTerminalSystem.GetBlocksOfType<IMyTerminalBlock>(doorBlocks, block => block.CustomName.Contains("!Door"));
foreach (IMyTerminalBlock block in doorBlocks)
{
string doorName = Utils.ExtractTag(block, "!Door");
@ -36,7 +38,7 @@ namespace IngameScript
// Add the part; the Door object handles typing and sequencing.
int defaultStep = 1;
if (block is IMyShipMergeBlock) defaultStep = 0;
ISequenceable wrapped = SequenceableFactory.MakeSequenceable(block, defaultStep);
ISequenceable wrapped = SequenceableFactory.MakeSequenceable(block, _ini, defaultStep);
if (wrapped == null) { _console.Print($"Tried to add incompatible block '{block.CustomName}'"); continue; }
_doors[doorName].AddBlock(wrapped);
}

47
Mixins/ConfigParser/ConfigParser.cs
View File

@ -1,47 +0,0 @@
using Sandbox.ModAPI.Ingame;
using System;
using System.Collections.Generic;
namespace IngameScript
{
partial class Program
{
public class ConfigParser
{
private Dictionary<string, string> _config;
private IMyTerminalBlock _input;
public ConfigParser(IMyTerminalBlock input)
{
_input = input;
_config = new Dictionary<string, string>();
Parse();
}
// Get a config value, or a default value.
// that also does type inference, but the type of `defaultValue` must contain a `Parse()` method.
public T GetValue<T>(string key, T defaultValue)
{
if (!_config.ContainsKey(key))
{
return defaultValue;
}
return (T)Convert.ChangeType(_config[key], typeof(T));
}
// Only call this method manually if you are monitoring CustomData for changes.
public void Parse()
{
_config.Clear();
string[] lines = _input.CustomData.Split('\n');
foreach (string line in lines)
{
string[] tokens = line.Split('=');
if (tokens.Length != 2) continue;
_config[tokens[0]] = tokens[1];
}
}
}
}
}

11
Mixins/ConfigParser/ConfigParser.projitems
View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<HasSharedItems>true</HasSharedItems>
<SharedGUID>8a3cdcc5-4b55-4d87-a415-698a0e1ff06f</SharedGUID>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)/**/*.cs" Visible=" '$(ShowCommonFiles)' == 'true' " />
</ItemGroup>
</Project>

19
Mixins/ConfigParser/ConfigParser.shproj
View File

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Globals">
<ProjectGuid>8a3cdcc5-4b55-4d87-a415-698a0e1ff06f</ProjectGuid>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"/>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props"/>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props"/>
<PropertyGroup/>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
</PropertyGroup>
<Import Project="ConfigParser.projitems" Label="Shared"/>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets"/>
</Project>

7
Mixins/Console/Console.cs
View File

@ -5,6 +5,7 @@
using Sandbox.ModAPI.Ingame;
using System.Collections.Generic;
using System.Text;
using VRage.Game.ModAPI.Ingame.Utilities;
namespace IngameScript
{
@ -24,14 +25,14 @@ namespace IngameScript
private const int DefaultMaxLines = 10;
public Console(MyGridProgram program)
public Console(MyGridProgram program, MyIni ini)
{
_program = program;
_buffer = new List<string>();
// Check the PB's custom data for a maxlines directive.
ConfigParser config = new ConfigParser(_program.Me);
_maxLines = config.GetValue("ConsoleMaxLines", DefaultMaxLines);
ini.TryParse(program.Me.CustomData);
_maxLines = ini.Get("console", "maxLines").ToInt32(DefaultMaxLines);
}
public PrefixedConsole CreatePrefixedConsole(string prefix)

8
Mixins/Sequencer/SequenceableFactory.cs
View File

@ -2,6 +2,7 @@
using Sandbox.ModAPI.Ingame;
using SpaceEngineers.Game.ModAPI.Ingame;
using VRage.Game.ModAPI.Ingame.Utilities;
namespace IngameScript
{
@ -9,11 +10,14 @@ namespace IngameScript
{
public class SequenceableFactory
{
public static ISequenceable MakeSequenceable(IMyTerminalBlock block, int step = 0)
public static ISequenceable MakeSequenceable(
IMyTerminalBlock block,
MyIni ini,
int step = 0)
{
if (block is IMyMotorStator)
{
return new SequenceableRotor(block as IMyMotorStator, step);
return new SequenceableRotor(block as IMyMotorStator, ini, step);
}
if (block is IMyPistonBase)
{

17
Mixins/Sequencer/SequenceableRotor.cs
View File

@ -1,6 +1,6 @@
using Sandbox.ModAPI.Ingame;
using System.Collections.Generic;
using System;
using VRage.Game.ModAPI.Ingame.Utilities;
namespace IngameScript
{
@ -19,15 +19,18 @@ namespace IngameScript
private float _closedAngle;
private IMyMotorStator _rotor;
public SequenceableRotor(IMyMotorStator rotor, int defaultStep = 0)
public SequenceableRotor(
IMyMotorStator rotor,
MyIni ini,
int defaultStep = 0)
{
_rotor = rotor;
ConfigParser config = new ConfigParser(_rotor);
_openAngle = config.GetValue("OpenAngle", 90F);
_closedAngle = config.GetValue("ClosedAngle", 0F);
_velocity = config.GetValue("Velocity", 5F);
Step = config.GetValue("Step", defaultStep);
ini.TryParse(rotor.CustomData);
_openAngle = ini.Get("sequencer", "openAngle").ToSingle(90F);
_closedAngle = ini.Get("sequencer", "closedAngle").ToSingle(0F);
_velocity = ini.Get("sequencer", "velocity").ToSingle(5F);
Step = ini.Get("sequencer", "step").ToInt32(defaultStep);
}
public void Start(bool reverse)

6
Mixins/Utils/Utils.cs
View File

@ -48,9 +48,9 @@ namespace IngameScript
public static string ExtractTag(IMyTerminalBlock block, string tag)
{
Regex r = new Regex($@"({tag}\w*?)\s");
Match m = r.Match(block.CustomName);
if (m.Success) return m.Groups[0].Captures[0].ToString();
foreach (string token in block.CustomName.Split(' ')) {
if (token.StartsWith(tag)) return token;
}
return "";
}
}