diff --git a/GCDC/DiscordEngineInjectionPatch.cs b/GCDC/DiscordEngineInjectionPatch.cs
index 763eb2b..e72d042 100644
--- a/GCDC/DiscordEngineInjectionPatch.cs
+++ b/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);
}
diff --git a/GCDC/GCDC.csproj b/GCDC/GCDC.csproj
index 517b897..bc2c644 100644
--- a/GCDC/GCDC.csproj
+++ b/GCDC/GCDC.csproj
@@ -9,7 +9,7 @@
Properties
GCDC
GCDC
- netstandard20
+ net472
512
@@ -33,179 +33,170 @@
- ref\BlockEntityFactory.dll
+ ..\..\ref\Gamecraft_Data\Managed\BlockEntityFactory.dll
- ref\CommandLine.dll
+ ..\..\ref\Gamecraft_Data\Managed\CommandLine.dll
- ref\DataLoader.dll
+ ..\..\ref\Gamecraft_Data\Managed\DataLoader.dll
- ref\FullGame.dll
+ ..\..\ref\Gamecraft_Data\Managed\FullGame.dll
- ref\Gamecraft.Blocks.ConsoleBlock.dll
+ ..\..\ref\Gamecraft_Data\Managed\Gamecraft.Blocks.ConsoleBlock.dll
-
+
..\..\GamecraftModdingAPI\GamecraftModdingAPI\bin\Debug\net472\GamecraftModdingAPI.dll
IllusionPlugin.dll
- ref\MultiplayerNetworking.dll
+ ..\..\ref\Gamecraft_Data\Managed\MultiplayerNetworking.dll
- ref\Newtonsoft.Json.dll
-
-
- ref\Newtonsoft.Json.dll
+ ..\..\ref\Gamecraft_Data\Managed\Newtonsoft.Json.dll
- ref\RobocraftX.AccountPreferences.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.AccountPreferences.dll
- ref\RobocraftX.Blocks.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.Blocks.dll
- ref\RobocraftX.Blocks.Ghost.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.Blocks.Ghost.dll
- ref\RobocraftX.Blocks.Triggers.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.Blocks.Triggers.dll
- ref\RobocraftX.Character.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.Character.dll
- ref\RobocraftX.Common.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.Common.dll
- ref\RobocraftX.Crosshair.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.Crosshair.dll
- ref\RobocraftX.FrontEnd.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.FrontEnd.dll
- ref\RobocraftX.GUI.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.GUI.dll
- ref\RobocraftX.GUI.DebugDisplay.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.GUI.DebugDisplay.dll
- ref\RobocraftX.GUI.RemoveBlock.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.GUI.RemoveBlock.dll
- ref\RobocraftX.GUI.ScaleGhost.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.GUI.ScaleGhost.dll
- ref\RobocraftX.GUIs.WorkshopPrefabs.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.GUIs.WorkshopPrefabs.dll
- ref\RobocraftX.Input.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.Input.dll
- ref\RobocraftX.MachineEditor.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.MachineEditor.dll
- ref\RobocraftX.MainGame.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.MainGame.dll
- ref\RobocraftX.MainSimulation.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.MainSimulation.dll
- ref\RobocraftX.Multiplayer.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.Multiplayer.dll
- ref\RobocraftX.Multiplayer.NetworkEntityStream.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.Multiplayer.NetworkEntityStream.dll
- ref\RobocraftX.MultiplayerInput.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.MultiplayerInput.dll
- ref\RobocraftX.Party.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.Party.dll
- ref\RobocraftX.PartyGui.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.PartyGui.dll
- ref\RobocraftX.Physics.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.Physics.dll
- ref\RobocraftX.PilotSeat.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.PilotSeat.dll
- ref\RobocraftX.Player.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.Player.dll
- ref\RobocraftX.Rendering.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.Rendering.dll
- ref\RobocraftX.Rendering.Mock.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.Rendering.Mock.dll
- ref\RobocraftX.SaveAndLoad.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.SaveAndLoad.dll
- ref\RobocraftX.SaveGameDialog.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.SaveGameDialog.dll
- ref\RobocraftX.Serializers.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.Serializers.dll
- ref\RobocraftX.Services.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.Services.dll
- ref\RobocraftX.SignalHandling.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.SignalHandling.dll
- ref\RobocraftX.StateSync.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX.StateSync.dll
- ref\RobocraftX_SpawnPoints.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX_SpawnPoints.dll
- ref\RobocraftX_TextBlock.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocraftX_TextBlock.dll
- ref\RobocratX.SimulationCompositionRoot.dll
+ ..\..\ref\Gamecraft_Data\Managed\RobocratX.SimulationCompositionRoot.dll
- ref\Svelto.ECS.dll
+ ..\..\ref\Gamecraft_Data\Managed\Svelto.ECS.dll
- ref\Svelto.Tasks.dll
+ ..\..\ref\Gamecraft_Data\Managed\Svelto.Tasks.dll
-
-
-
-
- ref\Unity.Entities.dll
+ ..\..\ref\Gamecraft_Data\Managed\Unity.Entities.dll
- ref\Unity.Mathematics.dll
+ ..\..\ref\Gamecraft_Data\Managed\Unity.Mathematics.dll
- ref\Unity.Physics.dll
+ ..\..\ref\Gamecraft_Data\Managed\Unity.Physics.dll
- ref\UnityEngine.dll
+ ..\..\ref\Gamecraft_Data\Managed\UnityEngine.dll
- ref\UnityEngine.CoreModule.dll
+ ..\..\ref\Gamecraft_Data\Managed\UnityEngine.CoreModule.dll
- ref\uREPL.dll
+ ..\..\ref\Gamecraft_Data\Managed\uREPL.dll
-
-
-
+