diff --git a/GamecraftModdingAPI/Blocks/MovementEngine.cs b/GamecraftModdingAPI/Blocks/MovementEngine.cs index 7fe10d4..ffb8dde 100644 --- a/GamecraftModdingAPI/Blocks/MovementEngine.cs +++ b/GamecraftModdingAPI/Blocks/MovementEngine.cs @@ -20,6 +20,7 @@ using Unity.Mathematics; using UnityEngine; using GamecraftModdingAPI.Utility; +using Svelto.DataStructures; namespace GamecraftModdingAPI.Blocks { @@ -69,9 +70,9 @@ namespace GamecraftModdingAPI.Blocks public float3 MoveConnectedBlocks(uint blockID, float3 vector) { Stack cubeStack = new Stack(); - Gamecraft.DataStructures.FasterList cubesToMove = new Gamecraft.DataStructures.FasterList(); + FasterList cubesToMove = new FasterList(); ConnectedCubesUtility.TreeTraversal.GetConnectedCubes(entitiesDB, blockID, cubeStack, cubesToMove, (in GridConnectionsEntityStruct g) => { return false; }); - for (int i = 0; i < cubesToMove.Count; i++) + for (int i = 0; i < cubesToMove.count; i++) { MoveBlock(cubesToMove[i], vector); entitiesDB.QueryEntity(cubesToMove[i], CommonExclusiveGroups.OWNED_BLOCKS_GROUP).isProcessed = false; diff --git a/GamecraftModdingAPI/Blocks/SignalEngine.cs b/GamecraftModdingAPI/Blocks/SignalEngine.cs index 5dde022..62006e3 100644 --- a/GamecraftModdingAPI/Blocks/SignalEngine.cs +++ b/GamecraftModdingAPI/Blocks/SignalEngine.cs @@ -13,6 +13,7 @@ using RobocraftX.SimulationModeState; using RobocraftX.UECS; using Unity.Entities; using Svelto.Context; +using Svelto.DataStructures; using Svelto.ECS; using Svelto.ECS.EntityStructs; using Unity.Transforms; @@ -37,7 +38,7 @@ namespace GamecraftModdingAPI.Blocks private Stack cubesStack = new Stack(); private bool stackInUse = false; - private Gamecraft.DataStructures.FasterList cubesList = new Gamecraft.DataStructures.FasterList(); + private FasterList cubesList = new FasterList(); private bool listInUse = false; public void Dispose() @@ -171,7 +172,7 @@ namespace GamecraftModdingAPI.Blocks else { Stack cubeStack = new Stack(); - Gamecraft.DataStructures.FasterList cubeList = new Gamecraft.DataStructures.FasterList(); + FasterList cubeList = new FasterList(); ConnectedCubesUtility.TreeTraversal.GetConnectedCubes(entitiesDB, blockID, cubesStack, cubesList, (in GridConnectionsEntityStruct g) => { return g.isIsolator; }); uint[] res = cubesList.ToArray(); foreach (var id in res) diff --git a/GamecraftModdingAPI/GamecraftModdingAPI.csproj b/GamecraftModdingAPI/GamecraftModdingAPI.csproj index 395e42e..db285e6 100644 --- a/GamecraftModdingAPI/GamecraftModdingAPI.csproj +++ b/GamecraftModdingAPI/GamecraftModdingAPI.csproj @@ -253,9 +253,6 @@ ..\ref\Gamecraft_Data\Managed\Unity.Addressables.dll - - ..\ref\Gamecraft_Data\Managed\Unity.Animation.Rigging.dll - ..\ref\Gamecraft_Data\Managed\Unity.Burst.dll @@ -307,9 +304,6 @@ ..\ref\Gamecraft_Data\Managed\Unity.Properties.dll - - ..\ref\Gamecraft_Data\Managed\Unity.Rendering.Hybrid.dll - ..\ref\Gamecraft_Data\Managed\Unity.RenderPipelines.Core.Runtime.dll diff --git a/GamecraftModdingAPI/Utility/Logging.cs b/GamecraftModdingAPI/Utility/Logging.cs index 28cc6fc..0f22c0a 100644 --- a/GamecraftModdingAPI/Utility/Logging.cs +++ b/GamecraftModdingAPI/Utility/Logging.cs @@ -89,15 +89,9 @@ namespace GamecraftModdingAPI.Utility /// The extra data to pass to the ILogger. /// This is automatically populated with "OuterException#" and "OuterStacktrace#" entries [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void LogException(Exception e, Dictionary extraData = null) + public static void LogException(Exception e, string msg = null, Dictionary extraData = null) { - Svelto.Console.LogException(e, extraData); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void LogException(string msg, Exception e, Dictionary extraData = null) - { - Svelto.Console.LogException(msg, e, extraData); + Svelto.Console.LogException(e, msg, extraData); } /// @@ -108,9 +102,9 @@ namespace GamecraftModdingAPI.Utility /// The extra data to pass to the ILogger. /// This is implemented similar to LogException(Exception e, Dictionary extraData)'s extraData [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void LogException(object obj, Exception e, Dictionary extraData = null) + public static void LogException(Exception e, object obj, Dictionary extraData = null) { - Svelto.Console.LogException(obj.ToString(), e, extraData); + Svelto.Console.LogException(e, obj.ToString(), extraData); } [MethodImpl(MethodImplOptions.AggressiveInlining)]