Update to Gamecraft 2020.05.14.16.20

GCDC/DiscordEngineInjectionPatch.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Reflection;
 using Gamecraft.Blocks.ConsoleBlock;
-using Harmony;
+using HarmonyLib;
 using RobocraftX;
 using RobocraftX.GUI.CommandLine;
 using RobocraftX.Multiplayer;
@@ -27,7 +27,7 @@ namespace GCDC
                 Debug.Log("Not authoritative, not adding Discord engine");
         }
 
-        static MethodBase TargetMethod(HarmonyInstance instance)
+        static MethodBase TargetMethod()
         {
             return _ComposeMethodInfo(ConsoleBlockCompositionRoot.Compose);
         }

GCDC/GCDC.csproj

@@ -9,7 +9,7 @@
         <AppDesignerFolder>Properties</AppDesignerFolder>
         <RootNamespace>GCDC</RootNamespace>
         <AssemblyName>GCDC</AssemblyName>
-        <TargetFramework>netstandard20</TargetFramework>
+        <TargetFramework>net472</TargetFramework>
         <FileAlignment>512</FileAlignment>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -33,179 +33,170 @@
     </PropertyGroup>
     <ItemGroup>
         <Reference Include="BlockEntityFactory, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\BlockEntityFactory.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\BlockEntityFactory.dll</HintPath>
         </Reference>
         <Reference Include="CommandLine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\CommandLine.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\CommandLine.dll</HintPath>
         </Reference>
         <Reference Include="DataLoader, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\DataLoader.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\DataLoader.dll</HintPath>
         </Reference>
         <Reference Include="FullGame, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\FullGame.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\FullGame.dll</HintPath>
         </Reference>
         <Reference Include="Gamecraft.Blocks.ConsoleBlock, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\Gamecraft.Blocks.ConsoleBlock.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\Gamecraft.Blocks.ConsoleBlock.dll</HintPath>
         </Reference>
-        <Reference Include="GamecraftModdingAPI, Version=0.2.0.0, Culture=neutral, PublicKeyToken=null">
+        <Reference Include="GamecraftModdingAPI, Version=1.1.0.0, Culture=neutral, PublicKeyToken=null">
           <HintPath>..\..\GamecraftModdingAPI\GamecraftModdingAPI\bin\Debug\net472\GamecraftModdingAPI.dll</HintPath>
         </Reference>
         <Reference Include="IllusionPlugin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
           <HintPath>IllusionPlugin.dll</HintPath>
         </Reference>
         <Reference Include="MultiplayerNetworking, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\MultiplayerNetworking.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\MultiplayerNetworking.dll</HintPath>
         </Reference>
         <Reference Include="Newtonsoft.Json, Version=12.0.1.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\Newtonsoft.Json.dll</HintPath>
-        </Reference>
-        <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\Newtonsoft.Json.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\Newtonsoft.Json.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.AccountPreferences, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.AccountPreferences.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.AccountPreferences.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.Blocks, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.Blocks.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.Blocks.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.Blocks.Ghost, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.Blocks.Ghost.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.Blocks.Ghost.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.Blocks.Triggers, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.Blocks.Triggers.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.Blocks.Triggers.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.Character, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.Character.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.Character.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.Common, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.Common.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.Common.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.Crosshair, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.Crosshair.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.Crosshair.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.FrontEnd, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.FrontEnd.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.FrontEnd.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.GUI, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.GUI.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.GUI.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.GUI.DebugDisplay, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.GUI.DebugDisplay.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.GUI.DebugDisplay.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.GUI.RemoveBlock, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.GUI.RemoveBlock.dll</HintPath>
+          <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\RobocraftX.GUI.ScaleGhost.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.GUI.ScaleGhost.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.GUIs.WorkshopPrefabs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.GUIs.WorkshopPrefabs.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.GUIs.WorkshopPrefabs.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.Input, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.Input.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.Input.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.MachineEditor, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.MachineEditor.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.MachineEditor.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.MainGame, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.MainGame.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.MainGame.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.MainSimulation, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.MainSimulation.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.MainSimulation.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.Multiplayer, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.Multiplayer.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.Multiplayer.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.Multiplayer.NetworkEntityStream, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.Multiplayer.NetworkEntityStream.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.Multiplayer.NetworkEntityStream.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.MultiplayerInput, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.MultiplayerInput.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.MultiplayerInput.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.Party, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.Party.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.Party.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.PartyGui, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.PartyGui.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.PartyGui.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.Physics, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.Physics.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.Physics.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.PilotSeat, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.PilotSeat.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.PilotSeat.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.Player, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.Player.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.Player.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.Rendering, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.Rendering.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.Rendering.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.Rendering.Mock, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.Rendering.Mock.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.Rendering.Mock.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.SaveAndLoad, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.SaveAndLoad.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.SaveAndLoad.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.SaveGameDialog, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.SaveGameDialog.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.SaveGameDialog.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.Serializers, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.Serializers.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.Serializers.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.Services, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.Services.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.Services.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.SignalHandling, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.SignalHandling.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.SignalHandling.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX.StateSync, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX.StateSync.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX.StateSync.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX_SpawnPoints, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX_SpawnPoints.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX_SpawnPoints.dll</HintPath>
         </Reference>
         <Reference Include="RobocraftX_TextBlock, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocraftX_TextBlock.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocraftX_TextBlock.dll</HintPath>
         </Reference>
         <Reference Include="RobocratX.SimulationCompositionRoot, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\RobocratX.SimulationCompositionRoot.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\RobocratX.SimulationCompositionRoot.dll</HintPath>
         </Reference>
         <Reference Include="Svelto.ECS, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\Svelto.ECS.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\Svelto.ECS.dll</HintPath>
         </Reference>
         <Reference Include="Svelto.Tasks, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\Svelto.Tasks.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\Svelto.Tasks.dll</HintPath>
         </Reference>
-        <Reference Include="System" />
-        <Reference Include="System.Core" />
-        <Reference Include="System.Data" />
-        <Reference Include="System.Xml" />
         <Reference Include="Unity.Entities, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\Unity.Entities.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.Entities.dll</HintPath>
         </Reference>
         <Reference Include="Unity.Mathematics, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\Unity.Mathematics.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.Mathematics.dll</HintPath>
         </Reference>
         <Reference Include="Unity.Physics, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\Unity.Physics.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\Unity.Physics.dll</HintPath>
         </Reference>
         <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\UnityEngine.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\UnityEngine.dll</HintPath>
         </Reference>
         <Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\UnityEngine.CoreModule.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
         </Reference>
         <Reference Include="uREPL, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>ref\uREPL.dll</HintPath>
+          <HintPath>..\..\ref\Gamecraft_Data\Managed\uREPL.dll</HintPath>
         </Reference>
     </ItemGroup>
     <ItemGroup>
       <Content Include="IllusionPlugin.dll" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Discord.Net.Core" Version="2.1.1" />
-        <PackageReference Include="Discord.Net.WebSocket" Version="2.1.1" />
-        <PackageReference Include="Lib.Harmony" Version="1.2.0.1" />
+        <PackageReference Include="Lib.Harmony" Version="2.0.1" />
     </ItemGroup>
     <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
          Other similar extension points exist, see Microsoft.Common.targets.

GCDC/GCDCPlugin.cs

@@ -1,5 +1,5 @@
 using System.Reflection;
-using Harmony;
+using HarmonyLib;
 using IllusionPlugin;
 using UnityEngine;
 
@@ -9,14 +9,14 @@ namespace GCDC
     {
         public string Name { get; } = "GCDC";
         public string Version { get; } = "v0.0.1";
-        public static HarmonyInstance harmony { get; protected set; }
+        public static Harmony harmony { get; protected set; }
         public const string HarmonyID = "io.github.norbipeti.GCDC";
         
         public void OnApplicationStart()
         {
             if (harmony == null)
             {
-                harmony = HarmonyInstance.Create(HarmonyID);
+                harmony = new Harmony(HarmonyID);
                 harmony.PatchAll(Assembly.GetExecutingAssembly());
             }
 

GCDC/TextBlockUpdateEngine.cs

@@ -4,30 +4,20 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Net.Mime;
-using System.Reflection;
 using System.Threading;
-using System.Threading.Tasks;
-using Discord;
-using Discord.WebSocket;
-using GamecraftModdingAPI.Utility;
+using GamecraftModdingAPI.Engines;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using RobocraftX.Common;
 using RobocraftX.Common.Input;
 using RobocraftX.Common.Utilities;
-using RobocraftX.SimulationModeState;
 using RobocraftX.StateSync;
 using Svelto.ECS;
-using Svelto.ECS.Experimental;
 using Unity.Jobs;
-using UnityEngine.Diagnostics;
 using uREPL;
 
 namespace GCDC
 {
-    public class TextBlockUpdateEngine : IDeterministicSim, IInitializeOnBuildStart, IApiEngine
+    public class TextBlockUpdateEngine : IDeterministicTimeStopped, IDeterministicTimeRunning, IApiEngine, IUnorderedInitializeOnTimeStoppedModeEntered
     {
         private string _token;
         private bool _running;
@@ -172,7 +162,7 @@ namespace GCDC
             updatedTextBlock = false;
         }
 
-        public JobHandle OnInitializeBuildMode()
+        public JobHandle OnInitializeTimeStoppedMode()
         {
             updatedTextBlock = false; //Update text block
             return new JobHandle();
@@ -185,5 +175,6 @@ namespace GCDC
         }
 
         public string Name { get; } = "GCDCEngine";
+        public bool isRemovable { get; } = false;
     }
 }