To net8.0

This commit is contained in:
h z
2024-07-13 09:29:45 +01:00
parent 1df3c08a9e
commit f6a8f3e899
31 changed files with 53 additions and 72 deletions

View File

@@ -1,4 +1,3 @@
using Godot;
using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules;

View File

@@ -11,7 +11,7 @@ public abstract partial class ComparisionModule : BinaryComputationalModule,
IDuplicateOutputModule,
IOperationModule
{
private IBoolParameter? Greater { get; set; }
private IBoolParameter Greater { get; set; }
public HashSet<IConfigurableParameter> ConfigurableParameters { get; set; } = new();
public override void Init()
@@ -21,7 +21,7 @@ public abstract partial class ComparisionModule : BinaryComputationalModule,
this.SetInputType(DataTypeConstant.BaseDataTypes.Real);
this.SetOutputType(DataTypeConstant.BaseDataTypes.Real);
Greater = GlobalProvider.DataStructureProvider!.NewBoolParameter("Method", "gt", "lt", true);
ConfigurableParameters = new HashSet<IConfigurableParameter>() { Greater };
ConfigurableParameters = new HashSet<IConfigurableParameter> { Greater };
PostInit();
}

View File

@@ -1,4 +1,3 @@
using Godot;
using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules;

View File

@@ -1,4 +1,3 @@
using Godot;
using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules;

View File

@@ -1,4 +1,3 @@
using Godot;
using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules;

View File

@@ -1,4 +1,3 @@
using Godot;
using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules;

View File

@@ -1,4 +1,3 @@
using Godot;
using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules;

View File

@@ -1,4 +1,3 @@
using Godot;
using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules;

View File

@@ -1,4 +1,3 @@
using Godot;
using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules;

View File

@@ -1,4 +1,3 @@
using Godot;
using Nocturnis.DataStructures.Data;
using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.DataStructures.DataTypes;
@@ -16,8 +15,8 @@ public abstract partial class V2Module : BinaryComputationalModule,
IPolymorphismModule,
IDuplicateOutputModule
{
private IDataPortGroup? ScalarInputGroup { get; set; }
private IDataPortGroup? OutputGroup { get; set; }
private IDataPortGroup ScalarInputGroup { get; set; }
private IDataPortGroup OutputGroup { get; set; }
public override double MaintenanceAlpha => 0.77852142d;
public override double MaintenanceBeta => 0.9544432d;

View File

@@ -1,4 +1,3 @@
using Godot;
using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules;

View File

@@ -1,4 +1,3 @@
using Godot;
using Nocturnis.DataStructures.Data;
using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.DataStructures.DataTypes;

View File

@@ -10,8 +10,7 @@ public abstract partial class AttackActionModule : ActionModule, ITerminalModule
public IDataInPort[] DataInPorts { get; set; } = Array.Empty<IDataInPort>();
public void Drain()
{
foreach (IDataInPort ip in DataInPorts)
_ = ip.GetData.Get;
}
public bool Finished { get; set; }
@@ -28,6 +27,7 @@ public abstract partial class AttackActionModule : ActionModule, ITerminalModule
public override void Act()
{
CreatureControl.Instance.CurrentCharacter!.Action.Attack(DataInPorts[0].GetData.Get!.R2);
Finished = true;
}
}

View File

@@ -1,4 +1,3 @@
using System.Diagnostics;
using Nocturnis.Creatures;
using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Ports.SignalPorts.Directions;

View File

@@ -3,7 +3,6 @@ using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Ports.DataPorts.Directions;
using Nocturnis.Enigmos.Ports.SignalPorts.Directions;
using Nocturnis.GlobalManagement.Constants;
using Nocturnis.GlobalManagement.Controls;
using Nocturnis.GlobalManagement.Providers;
namespace Enigmos.Modules.ControllingModules;
@@ -40,10 +39,8 @@ public abstract partial class SinglePoleDoubleThrowSwitchModule : PiplineModule,
ISignalOutPort selectedPort = (LeftPortForTrue!.ParameterValue && DataInPorts[0].GetData.Get!.Bit)
? SignalOutPorts[0]
: SignalOutPorts[1];
if (selectedPort.Connected)
selectedPort.Route();
else
EnigmosControl.Instance.RootModule.ActionFinished = true;
selectedPort.Route();
}
}

View File

@@ -8,14 +8,14 @@ namespace Enigmos.Modules.InterlayerModules;
public partial class InterlayerSignalInModule : SubModule, IInterlayerSignalInModule
{
public new IProgrammableModule? ParentModule
public new IProgrammableModule ParentModule
{
get => base.ParentModule as IProgrammableModule;
set => base.ParentModule = value;
}
public IBasePort UnderlyingPort => SignalIn!;
public IInterlayerSignalOutModule? DualModule { get; set; }
public ISignalInPort? SignalIn { get; set; }
public IInterlayerSignalOutModule DualModule { get; set; }
public ISignalInPort SignalIn { get; set; }
public ISignalInPort[] SignalInPorts { get; set; } = Array.Empty<ISignalInPort>();
public override void Init()
@@ -28,4 +28,4 @@ public partial class InterlayerSignalInModule : SubModule, IInterlayerSignalInMo
public void Execute() => DualModule!.SignalOut!.Route();
public bool Visited { get; set; }
}
}

View File

@@ -1,4 +1,3 @@
using Enigmos.Boards;
using Enigmos.Modules.InterlayerModules;
using Nocturnis;
using Nocturnis.Enigmos.Boards;

View File

@@ -1,4 +1,3 @@
using Enigmos.Ports.DataPorts;
using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts.Directions;
@@ -9,7 +8,7 @@ using Skeleton.Utils.Helpers;
using VirtualChemistry.Chemistry.Mixtures.Implements;
namespace Enigmos.Modules.TerminalModules;
public abstract partial class EngineModule : TerminalModule
public abstract partial class EngineModule : TerminalModule, IEngineModule
{
protected override bool Draggable => false;
public IDataInPort Throttle { get; set; }

View File

@@ -6,8 +6,8 @@ namespace Enigmos.Modules.TerminalModules.TestingModules;
public abstract partial class R2ReaderModule : TerminalModule
{
private DataInPort? DataIn { get; set; }
private R2Reader? R2Reader { get; set; }
private DataInPort DataIn { get; set; }
private R2Reader R2Reader { get; set; }
public override void Init()
{