diff --git a/BuildingTools/BuildingTools.cs b/BuildingTools/BuildingTools.cs
index c7a8fff..fbf2ac5 100644
--- a/BuildingTools/BuildingTools.cs
+++ b/BuildingTools/BuildingTools.cs
@@ -1,14 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using Gamecraft.Wires;
using GamecraftModdingAPI;
using GamecraftModdingAPI.Blocks;
using GamecraftModdingAPI.Commands;
-using GamecraftModdingAPI.Players;
using GamecraftModdingAPI.Utility;
using IllusionPlugin;
-using RobocraftX.CommandLine.Custom;
using Unity.Mathematics;
using Main = GamecraftModdingAPI.Main;
diff --git a/BuildingTools/BuildingTools.csproj b/BuildingTools/BuildingTools.csproj
index 53a6b88..08dc538 100644
--- a/BuildingTools/BuildingTools.csproj
+++ b/BuildingTools/BuildingTools.csproj
@@ -11,7 +11,7 @@
net48
512
true
- 1.0.0
+ 1.0.1
AnyCPU
@@ -37,6 +37,9 @@
..\packages\Lib.Harmony.2.0.1\lib\net48\0Harmony.dll
True
+
+ ..\..\ref\Gamecraft_Data\Managed\Accessibility.dll
+
..\..\ref\Gamecraft_Data\Managed\Analytics.dll
@@ -55,8 +58,14 @@
..\..\ref\Gamecraft_Data\Managed\CommandLine.dll
+
+ ..\..\ref\Gamecraft_Data\Managed\CommandLineCompositionRoot.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\ConsoleBlockComposotionRoot.dll
+
- D:\Games\SteamLibrary\steamapps\common\RobocraftX\Gamecraft_Data\Managed\ConsoleCommand.dll
+ ..\..\ref\Gamecraft_Data\Managed\ConsoleCommand.dll
..\..\ref\Gamecraft_Data\Managed\DataLoader.dll
@@ -64,42 +73,126 @@
..\..\ref\Gamecraft_Data\Managed\DDNA.dll
+
+ ..\..\ref\Gamecraft_Data\Managed\Facepunch.Steamworks.Win64.dll
+
..\..\ref\Gamecraft_Data\Managed\FMOD.dll
..\..\ref\Gamecraft_Data\Managed\FullGame.dll
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.AudioBlocks.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.BlockEntityFactory.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.BlockGroups.dll
+
..\..\ref\Gamecraft_Data\Managed\Gamecraft.Blocks.ConsoleBlock.dll
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.Blocks.DamagingSurfaceBlock.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.Blocks.DestructionBlocks.dll
+
..\..\ref\Gamecraft_Data\Managed\Gamecraft.Blocks.GenericPhysicsBlocks.dll
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.Blocks.LightBlock.dll
+
..\..\ref\Gamecraft_Data\Managed\Gamecraft.Blocks.LogicBlock.dll
+
+ ..\..\ref\Gamecraft_Data\Managed\GameCraft.Blocks.ProjectileBlock.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.Blocks.TextBlock.CompositionRoot.dll
+
..\..\ref\Gamecraft_Data\Managed\Gamecraft.Blocks.TimerBlock.dll
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.BlocksEntityDescriptors.dll
+
..\..\ref\Gamecraft_Data\Managed\Gamecraft.CharacterVulnerability.dll
..\..\ref\Gamecraft_Data\Managed\Gamecraft.CharacterVulnerabilityGui.dll
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.ColourPalette.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.Damage.dll
+
..\..\ref\Gamecraft_Data\Managed\Gamecraft.Effects.dll
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.ExplosionFragments.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.GraphicsSettings.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.BlueprintInventory.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.BlueprintInventoryMock.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.Blueprints.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.BlueprintSets.dll
+
..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.ConsoleBlock.dll
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.GameOptionsScreen.dll
+
..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.GraphicsScreen.dll
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.Hotbar.Blocks.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.Hotbar.Colours.dll
+
..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.HUDFeedbackBlocks.dll
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.ModeBar.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.OptionsScreen.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.TabsBar.Blocks.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.TabsBar.Blueprints.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.TabsBar.Colours.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.TabsBar.Common.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.TimeModeClock.dll
+
..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.Tweaks.dll
@@ -112,24 +205,60 @@
..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.WorldSpaceGuis.dll
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUIs.Hotbar.BlueprintsHotbar.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.InventoryTimeRunning.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.JointBlocks.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.Music.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.PerformanceWarnings.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.PickupBlck.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.PickupsCommon.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.PopupMessage.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.Projectiles.dll
+
..\..\ref\Gamecraft_Data\Managed\Gamecraft.Tweaks.dll
..\..\ref\Gamecraft_Data\Managed\Gamecraft.Tweaks.Mockup.dll
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.VisualEffects.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.VisualEffects.Decals.dll
+
..\..\ref\Gamecraft_Data\Managed\Gamecraft.Wires.dll
..\..\ref\Gamecraft_Data\Managed\Gamecraft.Wires.Mockup.dll
-
+
..\..\GamecraftModdingAPI\GamecraftModdingAPI\bin\Debug\net472\GamecraftModdingAPI.dll
..\..\ref\Gamecraft_Data\Managed\GameState.dll
+
+ ..\..\ref\Gamecraft_Data\Managed\GhostShark.Outline.dll
+
..\..\ref\Gamecraft_Data\Managed\GPUInstancer.dll
@@ -143,43 +272,10 @@
..\..\ref\Gamecraft_Data\Managed\IllusionInjector.dll
- ..\..\ref\Gamecraft_Data\Managed\IllusionPlugin.dll
+ ..\..\GamecraftModdingAPI\GamecraftModdingAPI\bin\Debug\net472\IllusionPlugin.dll
-
- ..\..\ref\Gamecraft_Data\Managed\JWT.dll
-
-
- ..\..\ref\Gamecraft_Data\Managed\LZ4.dll
-
-
- ..\..\ref\Gamecraft_Data\Managed\Mono.CSharp.dll
-
-
- ..\..\ref\Gamecraft_Data\Managed\Mono.Posix.dll
-
-
- ..\..\ref\Gamecraft_Data\Managed\Mono.Security.dll
-
-
- ..\..\ref\Gamecraft_Data\Managed\mscorlib.dll
-
-
- ..\..\ref\Gamecraft_Data\Managed\MultiplayerNetworking.dll
-
-
- ..\..\ref\Gamecraft_Data\Managed\MultiplayerTest.dll
-
-
- ..\..\ref\Gamecraft_Data\Managed\Newtonsoft.Json.dll
-
-
- ..\..\ref\Gamecraft_Data\Managed\RCX.ScreenshotTaker.dll
-
-
- ..\..\ref\Gamecraft_Data\Managed\Rewired_Core.dll
-
-
- ..\..\ref\Gamecraft_Data\Managed\Rewired_Windows.dll
+
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftECS.dll
..\..\ref\Gamecraft_Data\Managed\RobocraftX.AccountPreferences.dll
@@ -226,12 +322,27 @@
..\..\ref\Gamecraft_Data\Managed\RobocraftX.GUI.DebugDisplay.dll
+
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.GUI.Hotbar.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.GUI.Inventory.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.GUI.Inventory.BlocksInventory.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.GUI.Inventory.ColourInventory.dll
+
..\..\ref\Gamecraft_Data\Managed\RobocraftX.GUI.RemoveBlock.dll
..\..\ref\Gamecraft_Data\Managed\RobocraftX.GUI.ScaleGhost.dll
+
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.GUI.TabsBar.dll
+
..\..\ref\Gamecraft_Data\Managed\RobocraftX.GUIs.WorkshopPrefabs.dll
@@ -253,6 +364,9 @@
..\..\ref\Gamecraft_Data\Managed\RobocraftX.Multiplayer.dll
+
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.Multiplayer.GUI.dll
+
..\..\ref\Gamecraft_Data\Managed\RobocraftX.Multiplayer.NetworkEntityStream.dll
@@ -310,8 +424,8 @@
..\..\ref\Gamecraft_Data\Managed\StringFormatter.dll
-
- ..\..\ref\Gamecraft_Data\Managed\Svelto.Common_3.dll
+
+ ..\..\ref\Gamecraft_Data\Managed\Svelto.Common.dll
..\..\ref\Gamecraft_Data\Managed\Svelto.ECS.dll
@@ -325,6 +439,30 @@
..\..\ref\Gamecraft_Data\Managed\Unity.Addressables.dll
+
+ ..\..\ref\Gamecraft_Data\Managed\Unity.Animation.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Unity.Animation.Curves.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Unity.Animation.Curves.Hybrid.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Unity.Animation.DefaultGraphPipeline.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Unity.Animation.DefaultGraphPipeline.Hybrid.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Unity.Animation.Graph.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Unity.Animation.Hybrid.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Unity.Build.SlimPlayerRuntime.dll
+
..\..\ref\Gamecraft_Data\Managed\Unity.Burst.dll
@@ -334,6 +472,12 @@
..\..\ref\Gamecraft_Data\Managed\Unity.Collections.dll
+
+ ..\..\ref\Gamecraft_Data\Managed\Unity.Collections.LowLevel.ILSupport.dll
+
+
+ ..\..\ref\Gamecraft_Data\Managed\Unity.DataFlowGraph.dll
+
..\..\ref\Gamecraft_Data\Managed\Unity.Deformations.dll
@@ -343,10 +487,13 @@
..\..\ref\Gamecraft_Data\Managed\Unity.Entities.Hybrid.dll
+
+ ..\..\ref\Gamecraft_Data\Managed\Unity.InternalAPIEngineBridge.002.dll
+
..\..\ref\Gamecraft_Data\Managed\Unity.Jobs.dll
-
+
..\..\ref\Gamecraft_Data\Managed\Unity.Mathematics.dll
@@ -355,6 +502,9 @@
..\..\ref\Gamecraft_Data\Managed\Unity.Mathematics.Extensions.Hybrid.dll
+
+ ..\..\ref\Gamecraft_Data\Managed\Unity.MemoryProfiler.dll
+
..\..\ref\Gamecraft_Data\Managed\Unity.Physics.dll
@@ -397,8 +547,8 @@
..\..\ref\Gamecraft_Data\Managed\Unity.ResourceManager.dll
-
- ..\..\ref\Gamecraft_Data\Managed\Unity.Scenes.Hybrid.dll
+
+ ..\..\ref\Gamecraft_Data\Managed\Unity.Scenes.dll
..\..\ref\Gamecraft_Data\Managed\Unity.ScriptableBuildPipeline.dll
@@ -418,6 +568,9 @@
..\..\ref\Gamecraft_Data\Managed\Unity.Transforms.Hybrid.dll
+
+ ..\..\ref\Gamecraft_Data\Managed\Unity.VisualEffectGraph.Runtime.dll
+
..\..\ref\Gamecraft_Data\Managed\UnityEngine.dll
@@ -550,6 +703,9 @@
..\..\ref\Gamecraft_Data\Managed\UnityEngine.UIElementsModule.dll
+
+ ..\..\ref\Gamecraft_Data\Managed\UnityEngine.UIElementsNativeModule.dll
+
..\..\ref\Gamecraft_Data\Managed\UnityEngine.UIModule.dll
@@ -592,6 +748,9 @@
..\..\ref\Gamecraft_Data\Managed\UnityEngine.VideoModule.dll
+
+ ..\..\ref\Gamecraft_Data\Managed\UnityEngine.VirtualTexturingModule.dll
+
..\..\ref\Gamecraft_Data\Managed\UnityEngine.VRModule.dll
@@ -601,11 +760,5 @@
..\..\ref\Gamecraft_Data\Managed\UnityEngine.XRModule.dll
-
- ..\..\ref\Gamecraft_Data\Managed\uREPL.dll
-
-
- ..\..\ref\Gamecraft_Data\Managed\VisualProfiler.dll
-
diff --git a/BuildingTools/CommandUtils.cs b/BuildingTools/CommandUtils.cs
index 44faf4c..9de6a4b 100644
--- a/BuildingTools/CommandUtils.cs
+++ b/BuildingTools/CommandUtils.cs
@@ -2,8 +2,8 @@
using Gamecraft.Wires;
using GamecraftModdingAPI;
using GamecraftModdingAPI.Commands;
+using GamecraftModdingAPI.Utility;
using RobocraftX.CommandLine.Custom;
-using uREPL;
namespace BuildingTools
{
@@ -37,14 +37,14 @@ namespace BuildingTools
var argsa = args.Split(' ');
if (argsa.Length < 3)
{
- Log.Error("Too few arguments. Needed arguments are: and [id] is optional.");
+ Logging.CommandLogError("Too few arguments. Needed arguments are: and [id] is optional.");
return;
}
if (!float.TryParse(argsa[0], out float x) || !float.TryParse(argsa[1], out float y) ||
!float.TryParse(argsa[2], out float z))
{
- Log.Error("Could not parse arguments as floats.");
+ Logging.CommandLogError("Could not parse arguments as floats.");
return;
}
@@ -52,7 +52,7 @@ namespace BuildingTools
{
if (argsa[3].Length == 0)
{
- Log.Error("Missing object ID.");
+ Logging.CommandLogError("Missing object ID.");
return;
}
@@ -72,13 +72,13 @@ namespace BuildingTools
var argsa = args.Split(' ');
if (argsa.Length < 2)
{
- Log.Error("Too few arguments. Needed arguments are: and [id] is optional.");
+ Logging.CommandLogError("Too few arguments. Needed arguments are: and [id] is optional.");
return;
}
if (!byte.TryParse(argsa[1], out byte darkness))
{
- Log.Error("Could not parse color darkness.");
+ Logging.CommandLogError("Could not parse color darkness.");
return;
}
@@ -86,7 +86,7 @@ namespace BuildingTools
{
if (argsa[2].Length == 0)
{
- Log.Error("Missing channel.");
+ Logging.CommandLogError("Missing channel.");
return;
}
diff --git a/BuildingTools/NoClipCommand.cs b/BuildingTools/NoClipCommand.cs
index 8c6ef59..1acc234 100644
--- a/BuildingTools/NoClipCommand.cs
+++ b/BuildingTools/NoClipCommand.cs
@@ -37,19 +37,19 @@ namespace BuildingTools
private void Enable()
{
if (_entityManager == default) _entityManager = FullGameFields._physicsWorld.EntityManager;
- Logging.CommandLog("Enabling no clip");
+ Logging.CommandLog("Enabling noclip");
_oldCollider = ChangeCollider(_collisionFilter, null);
OnUpdate().RunOn(GamecraftModdingAPI.Tasks.Scheduler.extraLeanRunner);
_enabled = true;
- Logging.CommandLog("No clip enabled");
+ Logging.CommandLog("Noclip enabled");
}
private void Disable()
{
- Logging.CommandLog("Disabling no clip");
+ Logging.CommandLog("Disabling noclip");
ChangeCollider(null, _oldCollider).Dispose(); //Dispose old (cloned) collider
_enabled = false;
- Logging.CommandLog("No clip disabled");
+ Logging.CommandLog("Noclip disabled");
}
public void Toggle()
@@ -103,10 +103,9 @@ namespace BuildingTools
private void EnsureFlying()
{
- foreach (ref var ent in entitiesDB.QueryEntities(CharacterExclusiveGroups.AllCharacters).entities)
- {
- ent.moveState = MovementState.Flying;
- }
+ foreach (var ((coll, count), _) in entitiesDB.QueryEntities(CharacterExclusiveGroups.AllCharacters))
+ for (int i = 0; i < count; i++)
+ coll[i].moveState = MovementState.Flying;
}
public void Ready()