ExMods/extracommands
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix merge conflicts and ref

Browse source
This commit is contained in:
NGnius 2020-01-26 21:41:41 -05:00
commit d9316fa20b
2 changed files with 38 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
extracommands/ExtraCommands.csproj
View file

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

2
extracommands/MoveBlocksCommandEngine.cs
View file

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