From 1cbe252727979c5cbe3f467a64cf0fb980b952d3 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Thu, 20 May 2021 23:37:10 +0200 Subject: [PATCH] Move block engines into their own namespace --- TechbloxModdingAPI/Block.cs | 1 + TechbloxModdingAPI/BlockGroup.cs | 2 ++ .../Blocks/{ => Engines}/BlockCloneEngine.cs | 3 +-- .../Blocks/{ => Engines}/BlockEngine.cs | 5 ++--- .../Blocks/{ => Engines}/BlockEventsEngine.cs | 6 +++--- .../Blocks/{ => Engines}/BlueprintEngine.cs | 2 +- .../Blocks/{ => Engines}/CustomBlockEngine.cs | 12 +----------- .../Blocks/{ => Engines}/MovementEngine.cs | 5 +++-- .../Blocks/{ => Engines}/PlacementEngine.cs | 10 +++------- .../Blocks/{ => Engines}/RemovalEngine.cs | 3 ++- .../Blocks/{ => Engines}/RotationEngine.cs | 3 ++- .../Blocks/{ => Engines}/ScalingEngine.cs | 3 ++- .../Blocks/{ => Engines}/SignalEngine.cs | 8 +++++--- TechbloxModdingAPI/Blocks/Wire.cs | 2 +- 14 files changed, 29 insertions(+), 36 deletions(-) rename TechbloxModdingAPI/Blocks/{ => Engines}/BlockCloneEngine.cs (98%) rename TechbloxModdingAPI/Blocks/{ => Engines}/BlockEngine.cs (99%) rename TechbloxModdingAPI/Blocks/{ => Engines}/BlockEventsEngine.cs (95%) rename TechbloxModdingAPI/Blocks/{ => Engines}/BlueprintEngine.cs (99%) rename TechbloxModdingAPI/Blocks/{ => Engines}/CustomBlockEngine.cs (87%) rename TechbloxModdingAPI/Blocks/{ => Engines}/MovementEngine.cs (98%) rename TechbloxModdingAPI/Blocks/{ => Engines}/PlacementEngine.cs (96%) rename TechbloxModdingAPI/Blocks/{ => Engines}/RemovalEngine.cs (97%) rename TechbloxModdingAPI/Blocks/{ => Engines}/RotationEngine.cs (98%) rename TechbloxModdingAPI/Blocks/{ => Engines}/ScalingEngine.cs (97%) rename TechbloxModdingAPI/Blocks/{ => Engines}/SignalEngine.cs (99%) diff --git a/TechbloxModdingAPI/Block.cs b/TechbloxModdingAPI/Block.cs index a36c2a9..432938c 100644 --- a/TechbloxModdingAPI/Block.cs +++ b/TechbloxModdingAPI/Block.cs @@ -11,6 +11,7 @@ using Unity.Mathematics; using Gamecraft.Blocks.GUI; using TechbloxModdingAPI.Blocks; +using TechbloxModdingAPI.Blocks.Engines; using TechbloxModdingAPI.Tests; using TechbloxModdingAPI.Utility; diff --git a/TechbloxModdingAPI/BlockGroup.cs b/TechbloxModdingAPI/BlockGroup.cs index 6e4f42f..39233e8 100644 --- a/TechbloxModdingAPI/BlockGroup.cs +++ b/TechbloxModdingAPI/BlockGroup.cs @@ -6,7 +6,9 @@ using Gamecraft.Blocks.BlockGroups; using Svelto.ECS; using Unity.Mathematics; using UnityEngine; + using TechbloxModdingAPI.Blocks; +using TechbloxModdingAPI.Blocks.Engines; using TechbloxModdingAPI.Utility; namespace TechbloxModdingAPI diff --git a/TechbloxModdingAPI/Blocks/BlockCloneEngine.cs b/TechbloxModdingAPI/Blocks/Engines/BlockCloneEngine.cs similarity index 98% rename from TechbloxModdingAPI/Blocks/BlockCloneEngine.cs rename to TechbloxModdingAPI/Blocks/Engines/BlockCloneEngine.cs index e1501e8..01f2d05 100644 --- a/TechbloxModdingAPI/Blocks/BlockCloneEngine.cs +++ b/TechbloxModdingAPI/Blocks/Engines/BlockCloneEngine.cs @@ -6,12 +6,11 @@ using HarmonyLib; using RobocraftX.Blocks; using RobocraftX.Character; using RobocraftX.Common; -using RobocraftX.Common.Players; using Svelto.DataStructures; using Svelto.ECS; using TechbloxModdingAPI.Engines; -namespace TechbloxModdingAPI.Blocks +namespace TechbloxModdingAPI.Blocks.Engines { public class BlockCloneEngine : IApiEngine { diff --git a/TechbloxModdingAPI/Blocks/BlockEngine.cs b/TechbloxModdingAPI/Blocks/Engines/BlockEngine.cs similarity index 99% rename from TechbloxModdingAPI/Blocks/BlockEngine.cs rename to TechbloxModdingAPI/Blocks/Engines/BlockEngine.cs index 87d7326..39ab2fb 100644 --- a/TechbloxModdingAPI/Blocks/BlockEngine.cs +++ b/TechbloxModdingAPI/Blocks/Engines/BlockEngine.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; using System.Linq; @@ -10,16 +9,16 @@ using RobocraftX.Common; using RobocraftX.Physics; using RobocraftX.Rendering; using RobocraftX.Rendering.GPUI; -using Svelto.ECS.EntityStructs; using Svelto.DataStructures; using Svelto.ECS; +using Svelto.ECS.EntityStructs; using Svelto.ECS.Hybrid; using Unity.Mathematics; using TechbloxModdingAPI.Engines; using TechbloxModdingAPI.Utility; -namespace TechbloxModdingAPI.Blocks +namespace TechbloxModdingAPI.Blocks.Engines { /// /// Engine for executing general block actions diff --git a/TechbloxModdingAPI/Blocks/BlockEventsEngine.cs b/TechbloxModdingAPI/Blocks/Engines/BlockEventsEngine.cs similarity index 95% rename from TechbloxModdingAPI/Blocks/BlockEventsEngine.cs rename to TechbloxModdingAPI/Blocks/Engines/BlockEventsEngine.cs index a1ecd7f..776f162 100644 --- a/TechbloxModdingAPI/Blocks/BlockEventsEngine.cs +++ b/TechbloxModdingAPI/Blocks/Engines/BlockEventsEngine.cs @@ -1,12 +1,12 @@ using System; -using RobocraftX.Common; -using Svelto.ECS; using RobocraftX.Blocks; +using Svelto.ECS; + using TechbloxModdingAPI.Engines; using TechbloxModdingAPI.Utility; -namespace TechbloxModdingAPI.Blocks +namespace TechbloxModdingAPI.Blocks.Engines { public class BlockEventsEngine : IReactionaryEngine { diff --git a/TechbloxModdingAPI/Blocks/BlueprintEngine.cs b/TechbloxModdingAPI/Blocks/Engines/BlueprintEngine.cs similarity index 99% rename from TechbloxModdingAPI/Blocks/BlueprintEngine.cs rename to TechbloxModdingAPI/Blocks/Engines/BlueprintEngine.cs index eece947..c6ba686 100644 --- a/TechbloxModdingAPI/Blocks/BlueprintEngine.cs +++ b/TechbloxModdingAPI/Blocks/Engines/BlueprintEngine.cs @@ -20,7 +20,7 @@ using Unity.Mathematics; using UnityEngine; using Allocator = Svelto.Common.Allocator; -namespace TechbloxModdingAPI.Blocks +namespace TechbloxModdingAPI.Blocks.Engines { public class BlueprintEngine : IFactoryEngine { diff --git a/TechbloxModdingAPI/Blocks/CustomBlockEngine.cs b/TechbloxModdingAPI/Blocks/Engines/CustomBlockEngine.cs similarity index 87% rename from TechbloxModdingAPI/Blocks/CustomBlockEngine.cs rename to TechbloxModdingAPI/Blocks/Engines/CustomBlockEngine.cs index b8132a2..16a8312 100644 --- a/TechbloxModdingAPI/Blocks/CustomBlockEngine.cs +++ b/TechbloxModdingAPI/Blocks/Engines/CustomBlockEngine.cs @@ -1,14 +1,4 @@ -using System; -using System.Collections.Generic; -using TechbloxModdingAPI.Engines; -using TechbloxModdingAPI.Persistence; -using TechbloxModdingAPI.Utility; -using RobocraftX.Common; -using Svelto.ECS; -using Svelto.ECS.Experimental; -using Svelto.ECS.Serialization; - -namespace TechbloxModdingAPI.Blocks +namespace TechbloxModdingAPI.Blocks.Engines { /*public class CustomBlockEngine : IFactoryEngine { diff --git a/TechbloxModdingAPI/Blocks/MovementEngine.cs b/TechbloxModdingAPI/Blocks/Engines/MovementEngine.cs similarity index 98% rename from TechbloxModdingAPI/Blocks/MovementEngine.cs rename to TechbloxModdingAPI/Blocks/Engines/MovementEngine.cs index 7ecf934..48e3a23 100644 --- a/TechbloxModdingAPI/Blocks/MovementEngine.cs +++ b/TechbloxModdingAPI/Blocks/Engines/MovementEngine.cs @@ -2,12 +2,13 @@ using RobocraftX.UECS; using Svelto.ECS; using Svelto.ECS.EntityStructs; -using Unity.Transforms; using Unity.Mathematics; +using Unity.Transforms; + using TechbloxModdingAPI.Engines; using TechbloxModdingAPI.Utility; -namespace TechbloxModdingAPI.Blocks +namespace TechbloxModdingAPI.Blocks.Engines { /// /// Engine which executes block movement actions diff --git a/TechbloxModdingAPI/Blocks/PlacementEngine.cs b/TechbloxModdingAPI/Blocks/Engines/PlacementEngine.cs similarity index 96% rename from TechbloxModdingAPI/Blocks/PlacementEngine.cs rename to TechbloxModdingAPI/Blocks/Engines/PlacementEngine.cs index e1bbb09..b076d96 100644 --- a/TechbloxModdingAPI/Blocks/PlacementEngine.cs +++ b/TechbloxModdingAPI/Blocks/Engines/PlacementEngine.cs @@ -1,4 +1,3 @@ -using System; using System.Reflection; using DataLoader; @@ -6,21 +5,18 @@ using Gamecraft.Blocks.BlockGroups; using Gamecraft.Wires; using HarmonyLib; using RobocraftX.Blocks; -using RobocraftX.Blocks.Scaling; using RobocraftX.Character; using RobocraftX.Common; -using RobocraftX.CR.MachineEditing; using RobocraftX.Rendering; +using RobocraftX.Rendering.GPUI; using Svelto.ECS; using Svelto.ECS.EntityStructs; using Unity.Mathematics; -using UnityEngine; -using TechbloxModdingAPI.Players; -using RobocraftX.Rendering.GPUI; + using TechbloxModdingAPI.Engines; using TechbloxModdingAPI.Utility; -namespace TechbloxModdingAPI.Blocks +namespace TechbloxModdingAPI.Blocks.Engines { /// /// Engine which executes block placement actions diff --git a/TechbloxModdingAPI/Blocks/RemovalEngine.cs b/TechbloxModdingAPI/Blocks/Engines/RemovalEngine.cs similarity index 97% rename from TechbloxModdingAPI/Blocks/RemovalEngine.cs rename to TechbloxModdingAPI/Blocks/Engines/RemovalEngine.cs index 858cb8f..4d4897f 100644 --- a/TechbloxModdingAPI/Blocks/RemovalEngine.cs +++ b/TechbloxModdingAPI/Blocks/Engines/RemovalEngine.cs @@ -4,10 +4,11 @@ using HarmonyLib; using RobocraftX.Blocks; using RobocraftX.Common; using Svelto.ECS; + using TechbloxModdingAPI.Engines; using TechbloxModdingAPI.Utility; -namespace TechbloxModdingAPI.Blocks +namespace TechbloxModdingAPI.Blocks.Engines { public class RemovalEngine : IApiEngine { diff --git a/TechbloxModdingAPI/Blocks/RotationEngine.cs b/TechbloxModdingAPI/Blocks/Engines/RotationEngine.cs similarity index 98% rename from TechbloxModdingAPI/Blocks/RotationEngine.cs rename to TechbloxModdingAPI/Blocks/Engines/RotationEngine.cs index b1e54e5..12a8b56 100644 --- a/TechbloxModdingAPI/Blocks/RotationEngine.cs +++ b/TechbloxModdingAPI/Blocks/Engines/RotationEngine.cs @@ -4,10 +4,11 @@ using Svelto.ECS; using Svelto.ECS.EntityStructs; using Unity.Mathematics; using UnityEngine; + using TechbloxModdingAPI.Engines; using TechbloxModdingAPI.Utility; -namespace TechbloxModdingAPI.Blocks +namespace TechbloxModdingAPI.Blocks.Engines { /// /// Engine which executes block movement actions diff --git a/TechbloxModdingAPI/Blocks/ScalingEngine.cs b/TechbloxModdingAPI/Blocks/Engines/ScalingEngine.cs similarity index 97% rename from TechbloxModdingAPI/Blocks/ScalingEngine.cs rename to TechbloxModdingAPI/Blocks/Engines/ScalingEngine.cs index 7485f7e..5ab84f2 100644 --- a/TechbloxModdingAPI/Blocks/ScalingEngine.cs +++ b/TechbloxModdingAPI/Blocks/Engines/ScalingEngine.cs @@ -5,10 +5,11 @@ using RobocraftX.Common; using RobocraftX.UECS; using Svelto.ECS; using Unity.Entities; + using TechbloxModdingAPI.Engines; using TechbloxModdingAPI.Utility; -namespace TechbloxModdingAPI.Blocks +namespace TechbloxModdingAPI.Blocks.Engines { public class ScalingEngine : IApiEngine { diff --git a/TechbloxModdingAPI/Blocks/SignalEngine.cs b/TechbloxModdingAPI/Blocks/Engines/SignalEngine.cs similarity index 99% rename from TechbloxModdingAPI/Blocks/SignalEngine.cs rename to TechbloxModdingAPI/Blocks/Engines/SignalEngine.cs index f486463..b5d2083 100644 --- a/TechbloxModdingAPI/Blocks/SignalEngine.cs +++ b/TechbloxModdingAPI/Blocks/Engines/SignalEngine.cs @@ -1,11 +1,13 @@ using System; -using Svelto.ECS; -using Svelto.DataStructures; + using Gamecraft.Wires; +using Svelto.DataStructures; +using Svelto.ECS; + using TechbloxModdingAPI.Engines; using TechbloxModdingAPI.Utility; -namespace TechbloxModdingAPI.Blocks +namespace TechbloxModdingAPI.Blocks.Engines { /// /// Engine which executes signal actions diff --git a/TechbloxModdingAPI/Blocks/Wire.cs b/TechbloxModdingAPI/Blocks/Wire.cs index 6cbfdb9..10b880d 100644 --- a/TechbloxModdingAPI/Blocks/Wire.cs +++ b/TechbloxModdingAPI/Blocks/Wire.cs @@ -4,7 +4,7 @@ using Gamecraft.Wires; using Svelto.ECS; using Svelto.ECS.Experimental; -using TechbloxModdingAPI.Utility; +using TechbloxModdingAPI.Blocks.Engines; namespace TechbloxModdingAPI.Blocks {