From 532a8a795bbf9de5e4d8521eae92883ceab3023b Mon Sep 17 00:00:00 2001 From: hzhang Date: Sun, 19 Jan 2025 13:54:30 +0000 Subject: [PATCH] move to new git server --- Nocturnis.csproj | 7 ++++--- .../BracketSystem/EInstructionArrowEnd.cs | 2 +- .../BracketSystem/EInstructionArrowStart.cs | 2 +- src/{Hermeteus => }/BracketSystem/IBracketLine.cs | 2 +- src/{Hermeteus => }/BracketSystem/IBracketTopic.cs | 2 +- .../BracketSystem/IInstructionAgent.cs | 3 +-- .../BracketSystem/IInstructionArrowEnd.cs | 2 +- .../BracketSystem/IInstructionArrowManager.cs | 2 +- .../BracketSystem/IInstructionArrowStart.cs | 2 +- .../BracketSystem/Processors/IBracketProcessor.cs | 2 +- src/DataStructures/VariantWithType.cs | 2 +- src/GlobalManagement/Controls/EnigmosControl.cs | 14 ++++++++++++-- src/GlobalManagement/Controls/TopicControl.cs | 2 +- .../Providers/IConstructorProvider.cs | 2 +- .../Providers/IPositionProvider.cs | 2 +- src/Hermeteus/QuerySystem/IQueryEngine.cs | 8 -------- src/Scenes/IRootScene.cs | 1 - src/UIElements/ICorePanel.cs | 2 +- src/UIElements/IEngineSwitch.cs | 2 +- src/UIElements/Layers/IInstructionLayer.cs | 6 +++--- 20 files changed, 34 insertions(+), 33 deletions(-) rename src/{Hermeteus => }/BracketSystem/EInstructionArrowEnd.cs (84%) rename src/{Hermeteus => }/BracketSystem/EInstructionArrowStart.cs (84%) rename src/{Hermeteus => }/BracketSystem/IBracketLine.cs (89%) rename src/{Hermeteus => }/BracketSystem/IBracketTopic.cs (87%) rename src/{Hermeteus => }/BracketSystem/IInstructionAgent.cs (79%) rename src/{Hermeteus => }/BracketSystem/IInstructionArrowEnd.cs (66%) rename src/{Hermeteus => }/BracketSystem/IInstructionArrowManager.cs (82%) rename src/{Hermeteus => }/BracketSystem/IInstructionArrowStart.cs (67%) rename src/{Hermeteus => }/BracketSystem/Processors/IBracketProcessor.cs (88%) delete mode 100644 src/Hermeteus/QuerySystem/IQueryEngine.cs diff --git a/Nocturnis.csproj b/Nocturnis.csproj index ce52fee..7485105 100644 --- a/Nocturnis.csproj +++ b/Nocturnis.csproj @@ -1,13 +1,14 @@ - + - net8.0 + true + net9.0 enable disable - + diff --git a/src/Hermeteus/BracketSystem/EInstructionArrowEnd.cs b/src/BracketSystem/EInstructionArrowEnd.cs similarity index 84% rename from src/Hermeteus/BracketSystem/EInstructionArrowEnd.cs rename to src/BracketSystem/EInstructionArrowEnd.cs index d6ded25..000bc33 100644 --- a/src/Hermeteus/BracketSystem/EInstructionArrowEnd.cs +++ b/src/BracketSystem/EInstructionArrowEnd.cs @@ -1,6 +1,6 @@ using Godot; -namespace Nocturnis.Hermeteus.BracketSystem; +namespace Nocturnis.BracketSystem; public static class EInstructionArrowEnd { diff --git a/src/Hermeteus/BracketSystem/EInstructionArrowStart.cs b/src/BracketSystem/EInstructionArrowStart.cs similarity index 84% rename from src/Hermeteus/BracketSystem/EInstructionArrowStart.cs rename to src/BracketSystem/EInstructionArrowStart.cs index 583665e..d627bfb 100644 --- a/src/Hermeteus/BracketSystem/EInstructionArrowStart.cs +++ b/src/BracketSystem/EInstructionArrowStart.cs @@ -1,6 +1,6 @@ using Godot; -namespace Nocturnis.Hermeteus.BracketSystem; +namespace Nocturnis.BracketSystem; public static class EInstructionArrowStart { diff --git a/src/Hermeteus/BracketSystem/IBracketLine.cs b/src/BracketSystem/IBracketLine.cs similarity index 89% rename from src/Hermeteus/BracketSystem/IBracketLine.cs rename to src/BracketSystem/IBracketLine.cs index f326999..0630e38 100644 --- a/src/Hermeteus/BracketSystem/IBracketLine.cs +++ b/src/BracketSystem/IBracketLine.cs @@ -1,4 +1,4 @@ -namespace Nocturnis.Hermeteus.BracketSystem; +namespace Nocturnis.BracketSystem; public interface IBracketLine { diff --git a/src/Hermeteus/BracketSystem/IBracketTopic.cs b/src/BracketSystem/IBracketTopic.cs similarity index 87% rename from src/Hermeteus/BracketSystem/IBracketTopic.cs rename to src/BracketSystem/IBracketTopic.cs index 54f6d69..fb26878 100644 --- a/src/Hermeteus/BracketSystem/IBracketTopic.cs +++ b/src/BracketSystem/IBracketTopic.cs @@ -1,4 +1,4 @@ -namespace Nocturnis.Hermeteus.BracketSystem; +namespace Nocturnis.BracketSystem; public interface IBracketTopic { diff --git a/src/Hermeteus/BracketSystem/IInstructionAgent.cs b/src/BracketSystem/IInstructionAgent.cs similarity index 79% rename from src/Hermeteus/BracketSystem/IInstructionAgent.cs rename to src/BracketSystem/IInstructionAgent.cs index e709f75..bbc1d51 100644 --- a/src/Hermeteus/BracketSystem/IInstructionAgent.cs +++ b/src/BracketSystem/IInstructionAgent.cs @@ -1,8 +1,7 @@ -using Godot; using Nocturnis.Godot; using Nocturnis.UIElements.Layers; -namespace Nocturnis.Hermeteus.BracketSystem; +namespace Nocturnis.BracketSystem; public interface IInstructionAgent : INode { diff --git a/src/Hermeteus/BracketSystem/IInstructionArrowEnd.cs b/src/BracketSystem/IInstructionArrowEnd.cs similarity index 66% rename from src/Hermeteus/BracketSystem/IInstructionArrowEnd.cs rename to src/BracketSystem/IInstructionArrowEnd.cs index b09983f..3cbc893 100644 --- a/src/Hermeteus/BracketSystem/IInstructionArrowEnd.cs +++ b/src/BracketSystem/IInstructionArrowEnd.cs @@ -1,6 +1,6 @@ using Godot; -namespace Nocturnis.Hermeteus.BracketSystem; +namespace Nocturnis.BracketSystem; public interface IInstructionArrowEnd { diff --git a/src/Hermeteus/BracketSystem/IInstructionArrowManager.cs b/src/BracketSystem/IInstructionArrowManager.cs similarity index 82% rename from src/Hermeteus/BracketSystem/IInstructionArrowManager.cs rename to src/BracketSystem/IInstructionArrowManager.cs index fad0c42..2b6d9f8 100644 --- a/src/Hermeteus/BracketSystem/IInstructionArrowManager.cs +++ b/src/BracketSystem/IInstructionArrowManager.cs @@ -1,6 +1,6 @@ using Nocturnis.UIElements.Layers; -namespace Nocturnis.Hermeteus.BracketSystem; +namespace Nocturnis.BracketSystem; public interface IInstructionArrowManager : IInstructionArrowStart { diff --git a/src/Hermeteus/BracketSystem/IInstructionArrowStart.cs b/src/BracketSystem/IInstructionArrowStart.cs similarity index 67% rename from src/Hermeteus/BracketSystem/IInstructionArrowStart.cs rename to src/BracketSystem/IInstructionArrowStart.cs index db2beab..6f308af 100644 --- a/src/Hermeteus/BracketSystem/IInstructionArrowStart.cs +++ b/src/BracketSystem/IInstructionArrowStart.cs @@ -1,6 +1,6 @@ using Godot; -namespace Nocturnis.Hermeteus.BracketSystem; +namespace Nocturnis.BracketSystem; public interface IInstructionArrowStart { diff --git a/src/Hermeteus/BracketSystem/Processors/IBracketProcessor.cs b/src/BracketSystem/Processors/IBracketProcessor.cs similarity index 88% rename from src/Hermeteus/BracketSystem/Processors/IBracketProcessor.cs rename to src/BracketSystem/Processors/IBracketProcessor.cs index a7d45eb..e1de273 100644 --- a/src/Hermeteus/BracketSystem/Processors/IBracketProcessor.cs +++ b/src/BracketSystem/Processors/IBracketProcessor.cs @@ -1,4 +1,4 @@ -namespace Nocturnis.Hermeteus.BracketSystem.Processors; +namespace Nocturnis.BracketSystem.Processors; public interface IBracketProcessor { diff --git a/src/DataStructures/VariantWithType.cs b/src/DataStructures/VariantWithType.cs index 6f511b9..25174e5 100644 --- a/src/DataStructures/VariantWithType.cs +++ b/src/DataStructures/VariantWithType.cs @@ -1,6 +1,6 @@ using Godot; -namespace Alchegos.DataStructure; +namespace Nocturnis.DataStructures; public partial class VariantWithType : Resource { diff --git a/src/GlobalManagement/Controls/EnigmosControl.cs b/src/GlobalManagement/Controls/EnigmosControl.cs index 9a9c2a2..a788fd5 100644 --- a/src/GlobalManagement/Controls/EnigmosControl.cs +++ b/src/GlobalManagement/Controls/EnigmosControl.cs @@ -1,4 +1,5 @@ using Godot; +using Nocturnis.DataStructures.States; using Nocturnis.Enigmos.Modules; using Nocturnis.GlobalManagement.Providers; @@ -8,6 +9,9 @@ public class EnigmosControl { private static EnigmosControl _instance { get; set; } private static object _lock = new(); + public const string StateOff = "Off"; + public const string StateOn = "On"; + public const string StateEngine = "Engine"; public static EnigmosControl Instance { get @@ -19,15 +23,20 @@ public class EnigmosControl private EnigmosControl() { + StateControl.Instance.AddRule( + (path, fromState, toState) => + path.Equals(StateEngine) && ( + toState.Equals(StateOff) || toState.Equals(StateOn) + ) + ); } - public IRootModule RootModule { get; set; } - public void ShutDownEngine() { ((GlobalProvider.SceneProvider.RootScene.EngineSwitch as TextureButton)!).TextureNormal = GlobalProvider.TextureProvider.EngineSwitchOff; EngineUp = false; + StateControl.Instance[StateEngine] = StateOff; } public void PowerUpEngine() @@ -36,6 +45,7 @@ public class EnigmosControl (GlobalProvider.SceneProvider.RootScene.EngineSwitch as TextureButton)!.TextureNormal = GlobalProvider.TextureProvider.EngineSwitchOn; EngineUp = true; + StateControl.Instance[StateEngine] = StateOn; } public double Energy { get; set; } = 1d; diff --git a/src/GlobalManagement/Controls/TopicControl.cs b/src/GlobalManagement/Controls/TopicControl.cs index c36013f..ceecab0 100644 --- a/src/GlobalManagement/Controls/TopicControl.cs +++ b/src/GlobalManagement/Controls/TopicControl.cs @@ -1,6 +1,6 @@ using System.Text.Json; +using Nocturnis.BracketSystem; using Nocturnis.GlobalManagement.Providers; -using Nocturnis.Hermeteus.BracketSystem; namespace Nocturnis.GlobalManagement.Controls; diff --git a/src/GlobalManagement/Providers/IConstructorProvider.cs b/src/GlobalManagement/Providers/IConstructorProvider.cs index fdf9f6d..2454436 100644 --- a/src/GlobalManagement/Providers/IConstructorProvider.cs +++ b/src/GlobalManagement/Providers/IConstructorProvider.cs @@ -1,4 +1,4 @@ -using Nocturnis.Hermeteus.BracketSystem; +using Nocturnis.BracketSystem; namespace Nocturnis.GlobalManagement.Providers; diff --git a/src/GlobalManagement/Providers/IPositionProvider.cs b/src/GlobalManagement/Providers/IPositionProvider.cs index d7d23e4..de07d2f 100644 --- a/src/GlobalManagement/Providers/IPositionProvider.cs +++ b/src/GlobalManagement/Providers/IPositionProvider.cs @@ -1,5 +1,5 @@ using Godot; -using Nocturnis.Hermeteus.BracketSystem; +using Nocturnis.BracketSystem; namespace Nocturnis.GlobalManagement.Providers; diff --git a/src/Hermeteus/QuerySystem/IQueryEngine.cs b/src/Hermeteus/QuerySystem/IQueryEngine.cs deleted file mode 100644 index 1012a7a..0000000 --- a/src/Hermeteus/QuerySystem/IQueryEngine.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Godot; - -namespace Nocturnis.Hermeteus.QuerySystem; - -public interface IQueryEngine -{ - bool Check(string query); -} diff --git a/src/Scenes/IRootScene.cs b/src/Scenes/IRootScene.cs index 9a60056..0917311 100644 --- a/src/Scenes/IRootScene.cs +++ b/src/Scenes/IRootScene.cs @@ -1,6 +1,5 @@ using Godot; using Nocturnis.Godot; -using Nocturnis.Hermeteus; using Nocturnis.UIElements; using Nocturnis.UIElements.Layers; diff --git a/src/UIElements/ICorePanel.cs b/src/UIElements/ICorePanel.cs index 8659a73..15e234b 100644 --- a/src/UIElements/ICorePanel.cs +++ b/src/UIElements/ICorePanel.cs @@ -1,5 +1,5 @@ +using Nocturnis.BracketSystem; using Nocturnis.Godot; -using Nocturnis.Hermeteus.BracketSystem; namespace Nocturnis.UIElements; diff --git a/src/UIElements/IEngineSwitch.cs b/src/UIElements/IEngineSwitch.cs index ae0dd4a..6b2f3d6 100644 --- a/src/UIElements/IEngineSwitch.cs +++ b/src/UIElements/IEngineSwitch.cs @@ -1,5 +1,5 @@ +using Nocturnis.BracketSystem; using Nocturnis.Godot; -using Nocturnis.Hermeteus.BracketSystem; namespace Nocturnis.UIElements; diff --git a/src/UIElements/Layers/IInstructionLayer.cs b/src/UIElements/Layers/IInstructionLayer.cs index 1d11f43..a1c4566 100644 --- a/src/UIElements/Layers/IInstructionLayer.cs +++ b/src/UIElements/Layers/IInstructionLayer.cs @@ -1,7 +1,7 @@ +using Nocturnis.BracketSystem; +using Nocturnis.BracketSystem.Processors; using Nocturnis.Godot; -using Nocturnis.Hermeteus; -using Nocturnis.Hermeteus.BracketSystem; -using Nocturnis.Hermeteus.BracketSystem.Processors; + namespace Nocturnis.UIElements.Layers;