Fix merge conflicts and ref

extracommands/ExtraCommands.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
 
@@ -10,92 +10,98 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Reference Include="GamecraftModdingAPI">
+      <HintPath>..\ref\Plugins\GamecraftModdingAPI.dll</HintPath>
+    </Reference>
     <Reference Include="CommandLine">
-      <HintPath>..\ref\CommandLine.dll</HintPath>
+      <HintPath>..\ref\Gamecraft_Data\Managed\CommandLine.dll</HintPath>
     </Reference>
     <Reference Include="Facepunch.Steamworks.Win64">
-      <HintPath>..\ref\Facepunch.Steamworks.Win64.dll</HintPath>
+      <HintPath>..\ref\Gamecraft_Data\Managed\Facepunch.Steamworks.Win64.dll</HintPath>
     </Reference>
     <Reference Include="FullGame">
-      <HintPath>..\ref\FullGame.dll</HintPath>
+      <HintPath>..\ref\Gamecraft_Data\Managed\FullGame.dll</HintPath>
     </Reference>
     <Reference Include="IllusionPlugin">
-      <HintPath>..\IllusionPlugin.dll</HintPath>
+      <HintPath>..\ref\Gamecraft_Data\Managed\IllusionPlugin.dll</HintPath>
     </Reference>
     <Reference Include="RobocraftX.Character">
-      <HintPath>..\ref\RobocraftX.Character.dll</HintPath>
+      <HintPath>..\ref\Gamecraft_Data\Managed\RobocraftX.Character.dll</HintPath>
     </Reference>
     <Reference Include="CommandLine">
-      <HintPath>..\ref\RobocraftX.Common.dll</HintPath>
+      <HintPath>..\ref\Gamecraft_Data\Managed\RobocraftX.Common.dll</HintPath>
     </Reference>
     <Reference Include="RobocraftX.Blocks">
-      <HintPath>..\ref\RobocraftX.Blocks.dll</HintPath>
+      <HintPath>..\ref\Gamecraft_Data\Managed\RobocraftX.Blocks.dll</HintPath>
+    </Reference>
+    <Reference Include="RobocraftX.Blocks.Ghost">
+      <HintPath>..\ref\Gamecraft_Data\Managed\RobocraftX.Blocks.Ghost.dll</HintPath>
     </Reference>
     <Reference Include="RobocraftX.Character">
-      <HintPath>..\ref\RobocraftX.Character.dll</HintPath>
+      <HintPath>..\ref\Gamecraft_Data\Managed\RobocraftX.Character.dll</HintPath>
     </Reference>
     <Reference Include="RobocraftX.Input">
-      <HintPath>..\ref\RobocraftX.Input.dll</HintPath>
+      <HintPath>..\ref\Gamecraft_Data\Managed\RobocraftX.Input.dll</HintPath>
     </Reference>
     <Reference Include="RobocraftX.MainGame">
-      <HintPath>..\ref\RobocraftX.MainGame.dll</HintPath>
+      <HintPath>..\ref\Gamecraft_Data\Managed\RobocraftX.MainGame.dll</HintPath>
     </Reference>
     <Reference Include="RobocraftX.Multiplayer">
-      <HintPath>..\ref\RobocraftX.Multiplayer.dll</HintPath>
+      <HintPath>..\ref\Gamecraft_Data\Managed\RobocraftX.Multiplayer.dll</HintPath>
     </Reference>
     <Reference Include="RobocraftX.Multiplayer.NetworkEntityStream">
-      <HintPath>..\ref\RobocraftX.Multiplayer.NetworkEntityStream.dll</HintPath>
+      <HintPath>..\ref\Gamecraft_Data\Managed\RobocraftX.Multiplayer.NetworkEntityStream.dll</HintPath>
     </Reference>
     <Reference Include="RobocraftX.MultiplayerInput">
-      <HintPath>..\ref\RobocraftX.MultiplayerInput.dll</HintPath>
+      <HintPath>..\ref\Gamecraft_Data\Managed\RobocraftX.MultiplayerInput.dll</HintPath>
     </Reference>
     <Reference Include="RobocraftX.Physics">
-      <HintPath>..\ref\RobocraftX.Physics.dll</HintPath>
+      <HintPath>..\ref\Gamecraft_Data\Managed\RobocraftX.Physics.dll</HintPath>
     </Reference>
     <Reference Include="RobocraftX.StateSync">
-      <HintPath>..\ref\RobocraftX.StateSync.dll</HintPath>
+      <HintPath>..\ref\Gamecraft_Data\Managed\RobocraftX.StateSync.dll</HintPath>
     </Reference>
     <Reference Include="Svelto.Common">
-      <HintPath>..\ref\Svelto.Common.dll</HintPath>
+      <HintPath>..\ref\Gamecraft_Data\Managed\Svelto.Common.dll</HintPath>
     </Reference>
     <Reference Include="Svelto.ECS">
-      <HintPath>..\ref\Svelto.ECS.dll</HintPath>
+      <HintPath>..\ref\Gamecraft_Data\Managed\Svelto.ECS.dll</HintPath>
     </Reference>
     <Reference Include="Svelto.Tasks">
-      <HintPath>..\ref\Svelto.Tasks.dll</HintPath>
+      <HintPath>..\ref\Gamecraft_Data\Managed\Svelto.Tasks.dll</HintPath>
     </Reference>
     <Reference Include="Unity.Entities">
-      <HintPath>..\ref\Unity.Entities.dll</HintPath>
+      <HintPath>..\ref\Gamecraft_Data\Managed\Unity.Entities.dll</HintPath>
     </Reference>
     <Reference Include="Unity.Entities.Hybrid">
-      <HintPath>..\ref\Unity.Entities.Hybrid.dll</HintPath>
+      <HintPath>..\ref\Gamecraft_Data\Managed\Unity.Entities.Hybrid.dll</HintPath>
     </Reference>
     <Reference Include="Unity.Entities.Properties">
-      <HintPath>..\ref\Unity.Entities.Properties.dll</HintPath>
+      <HintPath>..\ref\Gamecraft_Data\Managed\Unity.Entities.Properties.dll</HintPath>
     </Reference>
     <Reference Include="Unity.Entities.StaticTypeRegistry">
-      <HintPath>..\ref\Unity.Entities.StaticTypeRegistry.dll</HintPath>
+      <HintPath>..\ref\Gamecraft_Data\Managed\Unity.Entities.StaticTypeRegistry.dll</HintPath>
     </Reference>
     <Reference Include="Unity.Mathematics">
-      <HintPath>..\ref\Unity.Mathematics.dll</HintPath>
+      <HintPath>..\ref\Gamecraft_Data\Managed\Unity.Mathematics.dll</HintPath>
     </Reference>
     <Reference Include="Unity.Mathematics.Extensions">
-      <HintPath>..\ref\Unity.Mathematics.Extensions.dll</HintPath>
+      <HintPath>..\ref\Gamecraft_Data\Managed\Unity.Mathematics.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="Unity.Mathematics.Extensions.Hybrid">
-      <HintPath>..\ref\Unity.Mathematics.Extensions.Hybrid.dll</HintPath>
+      <HintPath>..\ref\Gamecraft_Data\Managed\Unity.Mathematics.Extensions.Hybrid.dll</HintPath>
     </Reference>
     <Reference Include="Unity.Transforms">
-      <HintPath>..\ref\Unity.Transforms.dll</HintPath>
+      <HintPath>..\ref\Gamecraft_Data\Managed\Unity.Transforms.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine">
-      <HintPath>..\ref\UnityEngine.dll</HintPath>
+      <HintPath>..\ref\Gamecraft_Data\Managed\UnityEngine.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.CoreModule">
-      <HintPath>..\ref\UnityEngine.CoreModule.dll</HintPath>
+      <HintPath>..\ref\Gamecraft_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
     </Reference>
     <Reference Include="uREPL">
-      <HintPath>..\ref\uREPL.dll</HintPath>
+      <HintPath>..\ref\Gamecraft_Data\Managed\uREPL.dll</HintPath>
     </Reference>
   </ItemGroup>
 

extracommands/MoveBlocksCommandEngine.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using RobocraftX.Multiplayer;
 using RobocraftX.Common;
 using RobocraftX.Blocks;
+using RobocraftX.Blocks.Ghost;
 using Svelto.ECS;
 using Svelto.ECS.EntityStructs;
 using Unity.Entities;
@@ -13,6 +14,7 @@ using RobocraftX.SimulationModeState;
 using RobocraftX.UECS;
 using Unity.Transforms;
 using Unity.Mathematics;
+using UnityEngine;
 
 using GamecraftModdingAPI.Blocks;
 using GamecraftModdingAPI.Commands;