From 19bf8fbe18915fecdf1957143c22d04d33bd3de7 Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Wed, 18 Nov 2020 16:08:32 +0100
Subject: [PATCH] Fix issues with the Blueprints update

---
 BuildingTools/BuildingTools.cs     |   3 -
 BuildingTools/BuildingTools.csproj | 253 +++++++++++++++++++++++------
 BuildingTools/CommandUtils.cs      |  14 +-
 BuildingTools/NoClipCommand.cs     |  15 +-
 4 files changed, 217 insertions(+), 68 deletions(-)

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 @@
         <TargetFramework>net48</TargetFramework>
         <FileAlignment>512</FileAlignment>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <Version>1.0.0</Version>
+        <Version>1.0.1</Version>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
         <PlatformTarget>AnyCPU</PlatformTarget>
@@ -37,6 +37,9 @@
         <HintPath>..\packages\Lib.Harmony.2.0.1\lib\net48\0Harmony.dll</HintPath>
         <Private>True</Private>
       </Reference>
+      <Reference Include="Accessibility, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Accessibility.dll</HintPath>
+      </Reference>
       <Reference Include="Analytics, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Analytics.dll</HintPath>
       </Reference>
@@ -55,8 +58,14 @@
       <Reference Include="CommandLine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\CommandLine.dll</HintPath>
       </Reference>
+      <Reference Include="CommandLineCompositionRoot, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\CommandLineCompositionRoot.dll</HintPath>
+      </Reference>
+      <Reference Include="ConsoleBlockComposotionRoot, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\ConsoleBlockComposotionRoot.dll</HintPath>
+      </Reference>
       <Reference Include="ConsoleCommand, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-        <HintPath>D:\Games\SteamLibrary\steamapps\common\RobocraftX\Gamecraft_Data\Managed\ConsoleCommand.dll</HintPath>
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\ConsoleCommand.dll</HintPath>
       </Reference>
       <Reference Include="DataLoader, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\DataLoader.dll</HintPath>
@@ -64,42 +73,126 @@
       <Reference Include="DDNA, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\DDNA.dll</HintPath>
       </Reference>
+      <Reference Include="Facepunch.Steamworks.Win64, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Facepunch.Steamworks.Win64.dll</HintPath>
+      </Reference>
       <Reference Include="FMOD, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\FMOD.dll</HintPath>
       </Reference>
       <Reference Include="FullGame, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\FullGame.dll</HintPath>
       </Reference>
+      <Reference Include="Gamecraft.AudioBlocks, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.AudioBlocks.dll</HintPath>
+      </Reference>
+      <Reference Include="Gamecraft.BlockEntityFactory, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.BlockEntityFactory.dll</HintPath>
+      </Reference>
+      <Reference Include="Gamecraft.BlockGroups, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.BlockGroups.dll</HintPath>
+      </Reference>
       <Reference Include="Gamecraft.Blocks.ConsoleBlock, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.Blocks.ConsoleBlock.dll</HintPath>
       </Reference>
+      <Reference Include="Gamecraft.Blocks.DamagingSurfaceBlock, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.Blocks.DamagingSurfaceBlock.dll</HintPath>
+      </Reference>
+      <Reference Include="Gamecraft.Blocks.DestructionBlocks, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.Blocks.DestructionBlocks.dll</HintPath>
+      </Reference>
       <Reference Include="Gamecraft.Blocks.GenericPhysicsBlocks, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.Blocks.GenericPhysicsBlocks.dll</HintPath>
       </Reference>
+      <Reference Include="Gamecraft.Blocks.LightBlock, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.Blocks.LightBlock.dll</HintPath>
+      </Reference>
       <Reference Include="Gamecraft.Blocks.LogicBlock, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.Blocks.LogicBlock.dll</HintPath>
       </Reference>
+      <Reference Include="GameCraft.Blocks.ProjectileBlock, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\GameCraft.Blocks.ProjectileBlock.dll</HintPath>
+      </Reference>
+      <Reference Include="Gamecraft.Blocks.TextBlock.CompositionRoot, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.Blocks.TextBlock.CompositionRoot.dll</HintPath>
+      </Reference>
       <Reference Include="Gamecraft.Blocks.TimerBlock, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.Blocks.TimerBlock.dll</HintPath>
       </Reference>
+      <Reference Include="Gamecraft.BlocksEntityDescriptors, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.BlocksEntityDescriptors.dll</HintPath>
+      </Reference>
       <Reference Include="Gamecraft.CharacterVulnerability, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.CharacterVulnerability.dll</HintPath>
       </Reference>
       <Reference Include="Gamecraft.CharacterVulnerabilityGui, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.CharacterVulnerabilityGui.dll</HintPath>
       </Reference>
+      <Reference Include="Gamecraft.ColourPalette, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.ColourPalette.dll</HintPath>
+      </Reference>
+      <Reference Include="Gamecraft.Damage, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.Damage.dll</HintPath>
+      </Reference>
       <Reference Include="Gamecraft.Effects, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.Effects.dll</HintPath>
       </Reference>
+      <Reference Include="Gamecraft.ExplosionFragments, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.ExplosionFragments.dll</HintPath>
+      </Reference>
+      <Reference Include="Gamecraft.GraphicsSettings, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.GraphicsSettings.dll</HintPath>
+      </Reference>
+      <Reference Include="Gamecraft.GUI.BlueprintInventory, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.BlueprintInventory.dll</HintPath>
+      </Reference>
+      <Reference Include="Gamecraft.GUI.BlueprintInventoryMock, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.BlueprintInventoryMock.dll</HintPath>
+      </Reference>
+      <Reference Include="Gamecraft.GUI.Blueprints, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.Blueprints.dll</HintPath>
+      </Reference>
+      <Reference Include="Gamecraft.GUI.BlueprintSets, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.BlueprintSets.dll</HintPath>
+      </Reference>
       <Reference Include="Gamecraft.GUI.ConsoleBlock, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.ConsoleBlock.dll</HintPath>
       </Reference>
+      <Reference Include="Gamecraft.GUI.GameOptionsScreen, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.GameOptionsScreen.dll</HintPath>
+      </Reference>
       <Reference Include="Gamecraft.GUI.GraphicsScreen, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.GraphicsScreen.dll</HintPath>
       </Reference>
+      <Reference Include="Gamecraft.GUI.Hotbar.Blocks, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.Hotbar.Blocks.dll</HintPath>
+      </Reference>
+      <Reference Include="Gamecraft.GUI.Hotbar.Colours, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.Hotbar.Colours.dll</HintPath>
+      </Reference>
       <Reference Include="Gamecraft.GUI.HUDFeedbackBlocks, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.HUDFeedbackBlocks.dll</HintPath>
       </Reference>
+      <Reference Include="Gamecraft.GUI.ModeBar, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.ModeBar.dll</HintPath>
+      </Reference>
+      <Reference Include="Gamecraft.GUI.OptionsScreen, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.OptionsScreen.dll</HintPath>
+      </Reference>
+      <Reference Include="Gamecraft.GUI.TabsBar.Blocks, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.TabsBar.Blocks.dll</HintPath>
+      </Reference>
+      <Reference Include="Gamecraft.GUI.TabsBar.Blueprints, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.TabsBar.Blueprints.dll</HintPath>
+      </Reference>
+      <Reference Include="Gamecraft.GUI.TabsBar.Colours, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.TabsBar.Colours.dll</HintPath>
+      </Reference>
+      <Reference Include="Gamecraft.GUI.TabsBar.Common, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.TabsBar.Common.dll</HintPath>
+      </Reference>
+      <Reference Include="Gamecraft.GUI.TimeModeClock, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.TimeModeClock.dll</HintPath>
+      </Reference>
       <Reference Include="Gamecraft.GUI.Tweaks, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.Tweaks.dll</HintPath>
       </Reference>
@@ -112,24 +205,60 @@
       <Reference Include="Gamecraft.GUI.WorldSpaceGuis, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUI.WorldSpaceGuis.dll</HintPath>
       </Reference>
+      <Reference Include="Gamecraft.GUIs.Hotbar.BlueprintsHotbar, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.GUIs.Hotbar.BlueprintsHotbar.dll</HintPath>
+      </Reference>
+      <Reference Include="Gamecraft.InventoryTimeRunning, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.InventoryTimeRunning.dll</HintPath>
+      </Reference>
+      <Reference Include="Gamecraft.JointBlocks, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.JointBlocks.dll</HintPath>
+      </Reference>
+      <Reference Include="Gamecraft.Music, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.Music.dll</HintPath>
+      </Reference>
+      <Reference Include="Gamecraft.PerformanceWarnings, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.PerformanceWarnings.dll</HintPath>
+      </Reference>
+      <Reference Include="Gamecraft.PickupBlck, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.PickupBlck.dll</HintPath>
+      </Reference>
+      <Reference Include="Gamecraft.PickupsCommon, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.PickupsCommon.dll</HintPath>
+      </Reference>
+      <Reference Include="Gamecraft.PopupMessage, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.PopupMessage.dll</HintPath>
+      </Reference>
+      <Reference Include="Gamecraft.Projectiles, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.Projectiles.dll</HintPath>
+      </Reference>
       <Reference Include="Gamecraft.Tweaks, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.Tweaks.dll</HintPath>
       </Reference>
       <Reference Include="Gamecraft.Tweaks.Mockup, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.Tweaks.Mockup.dll</HintPath>
       </Reference>
+      <Reference Include="Gamecraft.VisualEffects, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.VisualEffects.dll</HintPath>
+      </Reference>
+      <Reference Include="Gamecraft.VisualEffects.Decals, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.VisualEffects.Decals.dll</HintPath>
+      </Reference>
       <Reference Include="Gamecraft.Wires, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.Wires.dll</HintPath>
       </Reference>
       <Reference Include="Gamecraft.Wires.Mockup, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.Wires.Mockup.dll</HintPath>
       </Reference>
-      <Reference Include="GamecraftModdingAPI">
+      <Reference Include="GamecraftModdingAPI, Version=1.7.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\GamecraftModdingAPI\GamecraftModdingAPI\bin\Debug\net472\GamecraftModdingAPI.dll</HintPath>
       </Reference>
       <Reference Include="GameState, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\GameState.dll</HintPath>
       </Reference>
+      <Reference Include="GhostShark.Outline, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\GhostShark.Outline.dll</HintPath>
+      </Reference>
       <Reference Include="GPUInstancer, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\GPUInstancer.dll</HintPath>
       </Reference>
@@ -143,43 +272,10 @@
         <HintPath>..\..\ref\Gamecraft_Data\Managed\IllusionInjector.dll</HintPath>
       </Reference>
       <Reference Include="IllusionPlugin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
-        <HintPath>..\..\ref\Gamecraft_Data\Managed\IllusionPlugin.dll</HintPath>
-      </Reference>
-      <Reference Include="JWT, Version=1.3.4.0, Culture=neutral, PublicKeyToken=null">
-        <HintPath>..\..\ref\Gamecraft_Data\Managed\JWT.dll</HintPath>
-      </Reference>
-      <Reference Include="LZ4, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-        <HintPath>..\..\ref\Gamecraft_Data\Managed\LZ4.dll</HintPath>
-      </Reference>
-      <Reference Include="Mono.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
-        <HintPath>..\..\ref\Gamecraft_Data\Managed\Mono.CSharp.dll</HintPath>
-      </Reference>
-      <Reference Include="Mono.Posix, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
-        <HintPath>..\..\ref\Gamecraft_Data\Managed\Mono.Posix.dll</HintPath>
-      </Reference>
-      <Reference Include="Mono.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
-        <HintPath>..\..\ref\Gamecraft_Data\Managed\Mono.Security.dll</HintPath>
-      </Reference>
-      <Reference Include="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-        <HintPath>..\..\ref\Gamecraft_Data\Managed\mscorlib.dll</HintPath>
+        <HintPath>..\..\GamecraftModdingAPI\GamecraftModdingAPI\bin\Debug\net472\IllusionPlugin.dll</HintPath>
       </Reference>
-      <Reference Include="MultiplayerNetworking, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-        <HintPath>..\..\ref\Gamecraft_Data\Managed\MultiplayerNetworking.dll</HintPath>
-      </Reference>
-      <Reference Include="MultiplayerTest, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-        <HintPath>..\..\ref\Gamecraft_Data\Managed\MultiplayerTest.dll</HintPath>
-      </Reference>
-      <Reference Include="Newtonsoft.Json">
-        <HintPath>..\..\ref\Gamecraft_Data\Managed\Newtonsoft.Json.dll</HintPath>
-      </Reference>
-      <Reference Include="RCX.ScreenshotTaker, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-        <HintPath>..\..\ref\Gamecraft_Data\Managed\RCX.ScreenshotTaker.dll</HintPath>
-      </Reference>
-      <Reference Include="Rewired_Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
-        <HintPath>..\..\ref\Gamecraft_Data\Managed\Rewired_Core.dll</HintPath>
-      </Reference>
-      <Reference Include="Rewired_Windows, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
-        <HintPath>..\..\ref\Gamecraft_Data\Managed\Rewired_Windows.dll</HintPath>
+      <Reference Include="RobocraftECS, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftECS.dll</HintPath>
       </Reference>
       <Reference Include="RobocraftX.AccountPreferences, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.AccountPreferences.dll</HintPath>
@@ -226,12 +322,27 @@
       <Reference Include="RobocraftX.GUI.DebugDisplay, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.GUI.DebugDisplay.dll</HintPath>
       </Reference>
+      <Reference Include="RobocraftX.GUI.Hotbar, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.GUI.Hotbar.dll</HintPath>
+      </Reference>
+      <Reference Include="RobocraftX.GUI.Inventory, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.GUI.Inventory.dll</HintPath>
+      </Reference>
+      <Reference Include="RobocraftX.GUI.Inventory.BlocksInventory, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.GUI.Inventory.BlocksInventory.dll</HintPath>
+      </Reference>
+      <Reference Include="RobocraftX.GUI.Inventory.ColourInventory, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.GUI.Inventory.ColourInventory.dll</HintPath>
+      </Reference>
       <Reference Include="RobocraftX.GUI.RemoveBlock, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.GUI.RemoveBlock.dll</HintPath>
       </Reference>
       <Reference Include="RobocraftX.GUI.ScaleGhost, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.GUI.ScaleGhost.dll</HintPath>
       </Reference>
+      <Reference Include="RobocraftX.GUI.TabsBar, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.GUI.TabsBar.dll</HintPath>
+      </Reference>
       <Reference Include="RobocraftX.GUIs.WorkshopPrefabs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.GUIs.WorkshopPrefabs.dll</HintPath>
       </Reference>
@@ -253,6 +364,9 @@
       <Reference Include="RobocraftX.Multiplayer, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.Multiplayer.dll</HintPath>
       </Reference>
+      <Reference Include="RobocraftX.Multiplayer.GUI, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.Multiplayer.GUI.dll</HintPath>
+      </Reference>
       <Reference Include="RobocraftX.Multiplayer.NetworkEntityStream, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.Multiplayer.NetworkEntityStream.dll</HintPath>
       </Reference>
@@ -310,8 +424,8 @@
       <Reference Include="StringFormatter, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\StringFormatter.dll</HintPath>
       </Reference>
-      <Reference Include="Svelto.Common_3, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-        <HintPath>..\..\ref\Gamecraft_Data\Managed\Svelto.Common_3.dll</HintPath>
+      <Reference Include="Svelto.Common, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Svelto.Common.dll</HintPath>
       </Reference>
       <Reference Include="Svelto.ECS, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Svelto.ECS.dll</HintPath>
@@ -325,6 +439,30 @@
       <Reference Include="Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.Addressables.dll</HintPath>
       </Reference>
+      <Reference Include="Unity.Animation, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.Animation.dll</HintPath>
+      </Reference>
+      <Reference Include="Unity.Animation.Curves, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.Animation.Curves.dll</HintPath>
+      </Reference>
+      <Reference Include="Unity.Animation.Curves.Hybrid, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.Animation.Curves.Hybrid.dll</HintPath>
+      </Reference>
+      <Reference Include="Unity.Animation.DefaultGraphPipeline, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.Animation.DefaultGraphPipeline.dll</HintPath>
+      </Reference>
+      <Reference Include="Unity.Animation.DefaultGraphPipeline.Hybrid, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.Animation.DefaultGraphPipeline.Hybrid.dll</HintPath>
+      </Reference>
+      <Reference Include="Unity.Animation.Graph, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.Animation.Graph.dll</HintPath>
+      </Reference>
+      <Reference Include="Unity.Animation.Hybrid, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.Animation.Hybrid.dll</HintPath>
+      </Reference>
+      <Reference Include="Unity.Build.SlimPlayerRuntime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.Build.SlimPlayerRuntime.dll</HintPath>
+      </Reference>
       <Reference Include="Unity.Burst, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.Burst.dll</HintPath>
       </Reference>
@@ -334,6 +472,12 @@
       <Reference Include="Unity.Collections, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.Collections.dll</HintPath>
       </Reference>
+      <Reference Include="Unity.Collections.LowLevel.ILSupport, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.Collections.LowLevel.ILSupport.dll</HintPath>
+      </Reference>
+      <Reference Include="Unity.DataFlowGraph, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.DataFlowGraph.dll</HintPath>
+      </Reference>
       <Reference Include="Unity.Deformations, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.Deformations.dll</HintPath>
       </Reference>
@@ -343,10 +487,13 @@
       <Reference Include="Unity.Entities.Hybrid, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.Entities.Hybrid.dll</HintPath>
       </Reference>
+      <Reference Include="Unity.InternalAPIEngineBridge.002, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.InternalAPIEngineBridge.002.dll</HintPath>
+      </Reference>
       <Reference Include="Unity.Jobs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.Jobs.dll</HintPath>
       </Reference>
-      <Reference Include="Unity.Mathematics, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <Reference Include="Unity.Mathematics, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.Mathematics.dll</HintPath>
       </Reference>
       <Reference Include="Unity.Mathematics.Extensions, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
@@ -355,6 +502,9 @@
       <Reference Include="Unity.Mathematics.Extensions.Hybrid, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.Mathematics.Extensions.Hybrid.dll</HintPath>
       </Reference>
+      <Reference Include="Unity.MemoryProfiler, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.MemoryProfiler.dll</HintPath>
+      </Reference>
       <Reference Include="Unity.Physics, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.Physics.dll</HintPath>
       </Reference>
@@ -397,8 +547,8 @@
       <Reference Include="Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.ResourceManager.dll</HintPath>
       </Reference>
-      <Reference Include="Unity.Scenes.Hybrid, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-        <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.Scenes.Hybrid.dll</HintPath>
+      <Reference Include="Unity.Scenes, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.Scenes.dll</HintPath>
       </Reference>
       <Reference Include="Unity.ScriptableBuildPipeline, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.ScriptableBuildPipeline.dll</HintPath>
@@ -418,6 +568,9 @@
       <Reference Include="Unity.Transforms.Hybrid, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.Transforms.Hybrid.dll</HintPath>
       </Reference>
+      <Reference Include="Unity.VisualEffectGraph.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.VisualEffectGraph.Runtime.dll</HintPath>
+      </Reference>
       <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\UnityEngine.dll</HintPath>
       </Reference>
@@ -550,6 +703,9 @@
       <Reference Include="UnityEngine.UIElementsModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\UnityEngine.UIElementsModule.dll</HintPath>
       </Reference>
+      <Reference Include="UnityEngine.UIElementsNativeModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\UnityEngine.UIElementsNativeModule.dll</HintPath>
+      </Reference>
       <Reference Include="UnityEngine.UIModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\UnityEngine.UIModule.dll</HintPath>
       </Reference>
@@ -592,6 +748,9 @@
       <Reference Include="UnityEngine.VideoModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\UnityEngine.VideoModule.dll</HintPath>
       </Reference>
+      <Reference Include="UnityEngine.VirtualTexturingModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <HintPath>..\..\ref\Gamecraft_Data\Managed\UnityEngine.VirtualTexturingModule.dll</HintPath>
+      </Reference>
       <Reference Include="UnityEngine.VRModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\UnityEngine.VRModule.dll</HintPath>
       </Reference>
@@ -601,11 +760,5 @@
       <Reference Include="UnityEngine.XRModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\ref\Gamecraft_Data\Managed\UnityEngine.XRModule.dll</HintPath>
       </Reference>
-      <Reference Include="uREPL, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-        <HintPath>..\..\ref\Gamecraft_Data\Managed\uREPL.dll</HintPath>
-      </Reference>
-      <Reference Include="VisualProfiler, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-        <HintPath>..\..\ref\Gamecraft_Data\Managed\VisualProfiler.dll</HintPath>
-      </Reference>
     </ItemGroup>
 </Project>
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: <x> <y> <z> and [id] is optional.");
+                    Logging.CommandLogError("Too few arguments. Needed arguments are: <x> <y> <z> 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: <color> <darkness> and [id] is optional.");
+                    Logging.CommandLogError("Too few arguments. Needed arguments are: <color> <darkness> 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<CharacterMovementEntityStruct>(CharacterExclusiveGroups.AllCharacters).entities)
-            {
-                ent.moveState = MovementState.Flying;
-            }
+            foreach (var ((coll, count), _) in entitiesDB.QueryEntities<CharacterMovementEntityStruct>(CharacterExclusiveGroups.AllCharacters))
+                for (int i = 0; i < count; i++)
+                    coll[i].moveState = MovementState.Flying;
         }
 
         public void Ready()