From 817c4b7381166259f5813b708b822ec47ac6563d Mon Sep 17 00:00:00 2001
From: "NGnius (Graham)" <ngniusness@gmail.com>
Date: Sat, 11 Jan 2025 16:16:39 -0500
Subject: [PATCH] Get things building again on modern monodevelop

---
 CLre.sln                                  |  62 +++++++-------
 CLre/API/Synergy/ClientMessagingEngine.cs |   3 +-
 CLre/CLre.csproj                          |  91 +++++++++++++++++---
 CLre/packages.config                      |   4 +
 CLre_server/API/Engines/ServerEngines.cs  |  17 +++-
 CLre_server/CLre_server.csproj            | 100 ++++++++++++++++++----
 CLre_server/packages.config               |   4 +
 7 files changed, 217 insertions(+), 64 deletions(-)
 create mode 100644 CLre/packages.config
 create mode 100644 CLre_server/packages.config

diff --git a/CLre.sln b/CLre.sln
index 02426c3..b576201 100644
--- a/CLre.sln
+++ b/CLre.sln
@@ -1,31 +1,31 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29609.76
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CLre", "CLre\CLre.csproj", "{E0EEA15D-AB3C-4C73-A000-C49B5AE9EA66}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CLre_server", "CLre_server\CLre_server.csproj", "{89B354CF-C654-4E48-8166-5E20BC6E4836}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E0EEA15D-AB3C-4C73-A000-C49B5AE9EA66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E0EEA15D-AB3C-4C73-A000-C49B5AE9EA66}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E0EEA15D-AB3C-4C73-A000-C49B5AE9EA66}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E0EEA15D-AB3C-4C73-A000-C49B5AE9EA66}.Release|Any CPU.Build.0 = Release|Any CPU
-		{89B354CF-C654-4E48-8166-5E20BC6E4836}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{89B354CF-C654-4E48-8166-5E20BC6E4836}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89B354CF-C654-4E48-8166-5E20BC6E4836}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{89B354CF-C654-4E48-8166-5E20BC6E4836}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {588EB8B7-9ADA-4723-BAC9-04B676A88771}
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+VisualStudioVersion = 16.0.29609.76
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CLre", "CLre\CLre.csproj", "{E0EEA15D-AB3C-4C73-A000-C49B5AE9EA66}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CLre_server", "CLre_server\CLre_server.csproj", "{89B354CF-C654-4E48-8166-5E20BC6E4836}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{89B354CF-C654-4E48-8166-5E20BC6E4836}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{89B354CF-C654-4E48-8166-5E20BC6E4836}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{89B354CF-C654-4E48-8166-5E20BC6E4836}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{89B354CF-C654-4E48-8166-5E20BC6E4836}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E0EEA15D-AB3C-4C73-A000-C49B5AE9EA66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E0EEA15D-AB3C-4C73-A000-C49B5AE9EA66}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E0EEA15D-AB3C-4C73-A000-C49B5AE9EA66}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E0EEA15D-AB3C-4C73-A000-C49B5AE9EA66}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {588EB8B7-9ADA-4723-BAC9-04B676A88771}
+	EndGlobalSection
+EndGlobal
diff --git a/CLre/API/Synergy/ClientMessagingEngine.cs b/CLre/API/Synergy/ClientMessagingEngine.cs
index 1bbb632..a904590 100644
--- a/CLre/API/Synergy/ClientMessagingEngine.cs
+++ b/CLre/API/Synergy/ClientMessagingEngine.cs
@@ -1,4 +1,3 @@
-using System.Collections;
 using System.Collections.Generic;
 using GameNetworkLayer.Shared;
 using Svelto.Context;
@@ -59,7 +58,7 @@ namespace CLre.API.Synergy
             App.Client.GameJoin += (_, __) => { MessageSender().Run(); };
         }
         
-        public IEnumerator MessageSender()
+		public System.Collections.IEnumerator MessageSender()
         {
             while (!_isRunning)
             {
diff --git a/CLre/CLre.csproj b/CLre/CLre.csproj
index 314259a..1b52db9 100644
--- a/CLre/CLre.csproj
+++ b/CLre/CLre.csproj
@@ -1,7 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
+    <AssemblyName>CLre</AssemblyName>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Version>0.0.3</Version>
     <Authors>NGnius</Authors>
@@ -9,18 +11,38 @@
     <PackageProjectUrl>https://git.exmods.org/NGnius/CLre</PackageProjectUrl>
     <NeutralLanguage>en-CA</NeutralLanguage>
   </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Lib.Harmony" Version="2.1.1" />
-  </ItemGroup>
-  
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{E0EEA15D-AB3C-4C73-A000-C49B5AE9EA66}</ProjectGuid>
+    <OutputType>Library</OutputType>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>none</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="0Harmony">
+      <HintPath>..\packages\Lib.Harmony.2.3.3\lib\net35\0Harmony.dll</HintPath>
+    </Reference>
   </ItemGroup>
-
-
-
-<!--Start Dependencies-->
+  <!--Start Dependencies-->
   <ItemGroup>
     <Reference Include="Accessibility">
       <HintPath>..\..\cl\Cardlife_Data\Managed\Accessibility.dll</HintPath>
@@ -76,6 +98,9 @@
     <Reference Include="Svelto.Tasks">
       <HintPath>..\..\cl\Cardlife_Data\Managed\Svelto.Tasks.dll</HintPath>
     </Reference>
+    <Reference Include="System">
+      <HintPath>..\..\cl\Cardlife_Data\Managed\System.dll</HintPath>
+    </Reference>
     <Reference Include="Unity.Postprocessing.Runtime">
       <HintPath>..\..\cl\Cardlife_Data\Managed\Unity.Postprocessing.Runtime.dll</HintPath>
     </Reference>
@@ -281,6 +306,46 @@
       <HintPath>..\..\cl\Cardlife_Data\Managed\IllusionPlugin.dll</HintPath>
     </Reference>
   </ItemGroup>
-<!--End Dependencies-->
-
+  <!--End Dependencies-->
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="CLre.cs" />
+    <Compile Include="API\App\Client.cs" />
+    <Compile Include="API\App\ClientEngines.cs" />
+    <Compile Include="API\App\ClientEventArgs.cs" />
+    <Compile Include="API\Characters\AccountUtilityPatches.cs" />
+    <Compile Include="API\Characters\Character.cs" />
+    <Compile Include="API\Engines\FrontEndEngines.cs" />
+    <Compile Include="API\Engines\GameEngines.cs" />
+    <Compile Include="API\Engines\ICLreEngine.cs" />
+    <Compile Include="API\Synergy\Tweaks\SerializedCLreTerrainModifyRejection.cs" />
+    <Compile Include="API\Synergy\ClientHandshakeEngine.cs" />
+    <Compile Include="API\Synergy\ClientMessagingEngine.cs" />
+    <Compile Include="API\Synergy\Message.cs" />
+    <Compile Include="API\Synergy\SerializedCLreHandshake.cs" />
+    <Compile Include="API\Synergy\SerializedCLreMessage.cs" />
+    <Compile Include="API\Tools\AccessToolsWarnings.cs" />
+    <Compile Include="API\Tools\NetClientListener.cs" />
+    <Compile Include="API\Tools\NetClientSender.cs" />
+    <Compile Include="API\Utility\Logging.cs" />
+    <Compile Include="API\Utility\Reflection.cs" />
+    <Compile Include="Fixes\BugfixAttribute.cs" />
+    <Compile Include="Fixes\ClientDurabilityNodeErrorRemover.cs" />
+    <Compile Include="Fixes\CooldownCrossSlotSync.cs" />
+    <Compile Include="Fixes\EnchantmentTableFloatParseFix.cs" />
+    <Compile Include="Fixes\ExclusionImprovement.cs" />
+    <Compile Include="Fixes\FloatLanguageFix.cs" />
+    <Compile Include="Fixes\InitLogSooner.cs" />
+    <Compile Include="Fixes\InventoryPanelScrollEngineFix.cs" />
+    <Compile Include="Fixes\MapPinPointsFloatFix.cs" />
+    <Compile Include="Fixes\MiniScreenEmbiggener.cs" />
+    <Compile Include="Fixes\OfflineGameTimeSavingFloatFix.cs" />
+    <Compile Include="Fixes\OfflineSpawnpointSavingFloatFix.cs" />
+    <Compile Include="Fixes\StartupSpeedup.cs" />
+    <Compile Include="Fixes\TerrainModifyReset.cs" />
+    <Compile Include="Fixes\UnderStructureCollider.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/CLre/packages.config b/CLre/packages.config
new file mode 100644
index 0000000..2607937
--- /dev/null
+++ b/CLre/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Lib.Harmony" version="2.3.3" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/CLre_server/API/Engines/ServerEngines.cs b/CLre_server/API/Engines/ServerEngines.cs
index fabc9ed..be6e2ed 100644
--- a/CLre_server/API/Engines/ServerEngines.cs
+++ b/CLre_server/API/Engines/ServerEngines.cs
@@ -38,23 +38,34 @@ namespace CLre_server.API.Engines
         
         internal static FasterList<ICLreEngine> afterBuildEngines = new FasterList<ICLreEngine>();
 
+		private delegate IEngine MainGameServer_AddEngine(IEngine engine);
+
         [HarmonyPrefix]
-        public static void BeforeMethodCall(GameServer.GameFramework.MainGameServer __instance, IEntityFactory ____entityFactory)
+		public static void BeforeMethodCall(GameServer.GameFramework.MainGameServer __instance, IEntityFactory ____entityFactory)
         {
+			var addEngine = Utility.Reflection.MethodAsDelegate<MainGameServer_AddEngine>(typeof(GameServer.GameFramework.MainGameServer),
+				"AddEngine",
+				//parameters: new [] {typeof(int), typeof(string)},
+				instance: __instance);
             foreach (ICLreEngine e in beforeBuildEngines)
             {
                 e.entityFactory = ____entityFactory;
-                __instance.AddEngine(e);
+
+                addEngine(e);
             }
         }
         
         [HarmonyPostfix]
         public static void AfterMethodCall(GameServer.GameFramework.MainGameServer __instance, IEntityFactory ____entityFactory)
         {
+			var addEngine = Utility.Reflection.MethodAsDelegate<MainGameServer_AddEngine>(typeof(GameServer.GameFramework.MainGameServer),
+				"AddEngine",
+				//parameters: new [] {typeof(int), typeof(string)},
+				instance: __instance);
             foreach (ICLreEngine e in afterBuildEngines)
             {
                 e.entityFactory = ____entityFactory;
-                __instance.AddEngine(e);
+                addEngine(e);
             }
         }
     }
diff --git a/CLre_server/CLre_server.csproj b/CLre_server/CLre_server.csproj
index d5bc888..1ffcbd3 100644
--- a/CLre_server/CLre_server.csproj
+++ b/CLre_server/CLre_server.csproj
@@ -1,5 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -8,19 +9,40 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://git.exmods.org/NGnius/CLre</PackageProjectUrl>
     <NeutralLanguage>en-CA</NeutralLanguage>
+    <AssemblyName>CLre_server</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{89B354CF-C654-4E48-8166-5E20BC6E4836}</ProjectGuid>
+    <OutputType>Library</OutputType>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>none</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Lib.Harmony" Version="2.1.1" />
-  </ItemGroup>
-  
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="0Harmony">
+      <HintPath>..\packages\Lib.Harmony.2.3.3\lib\net35\0Harmony.dll</HintPath>
+    </Reference>
   </ItemGroup>
-
-
-
-<!--Start Dependencies-->
+  <!--Start Dependencies-->
   <ItemGroup>
     <Reference Include="Accessibility">
       <HintPath>..\..\cl\CardlifeGameServer_Data\Managed\Accessibility.dll</HintPath>
@@ -76,6 +98,9 @@
     <Reference Include="Svelto.Tasks">
       <HintPath>..\..\cl\CardlifeGameServer_Data\Managed\Svelto.Tasks.dll</HintPath>
     </Reference>
+    <Reference Include="System">
+      <HintPath>..\..\cl\Cardlife_Data\Managed\System.dll</HintPath>
+    </Reference>
     <Reference Include="Unity.Postprocessing.Runtime">
       <HintPath>..\..\cl\CardlifeGameServer_Data\Managed\Unity.Postprocessing.Runtime.dll</HintPath>
     </Reference>
@@ -282,11 +307,56 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <None Remove="WebStatus\Assets\index.html" />
+    <!---<None Remove="WebStatus\Assets\index.html" />-->
     <EmbeddedResource Include="WebStatus\Assets\index.html" />
-    <None Remove="WebStatus\Assets\error404.html" />
+    <!---<None Remove="WebStatus\Assets\error404.html" />-->
     <EmbeddedResource Include="WebStatus\Assets\error404.html" />
+    <None Include="packages.config" />
   </ItemGroup>
-<!--End Dependencies-->
-
+  <!--End Dependencies-->
+  <ItemGroup>
+    <Compile Include="API\Config\CLreConfig.cs" />
+    <Compile Include="API\Engines\ICLreEngine.cs" />
+    <Compile Include="API\Engines\ServerEngines.cs" />
+    <Compile Include="API\MainServer\ModerationEngine.cs" />
+    <Compile Include="API\MainServer\Moderator.cs" />
+    <Compile Include="API\MainServer\Server.cs" />
+    <Compile Include="API\MainServer\ServerEngines.cs" />
+    <Compile Include="API\MainServer\ServerEventArgs.cs" />
+    <Compile Include="API\MainServer\UserVerification.cs" />
+    <Compile Include="API\Synergy\Tweaks\SerializedCLreTerrainModifyRejection.cs" />
+    <Compile Include="API\Synergy\Clients.cs" />
+    <Compile Include="API\Synergy\CLreEnforcer.cs" />
+    <Compile Include="API\Synergy\Message.cs" />
+    <Compile Include="API\Synergy\SerializedCLreHandshake.cs" />
+    <Compile Include="API\Synergy\SerializedCLreMessage.cs" />
+    <Compile Include="API\Synergy\ServerHandshakeEngine.cs" />
+    <Compile Include="API\Synergy\ServerMessagingEngine.cs" />
+    <Compile Include="API\Tools\AccessToolsWarnings.cs" />
+    <Compile Include="API\Tools\NetServerListener.cs" />
+    <Compile Include="API\Tools\NetServerSender.cs" />
+    <Compile Include="API\Utility\CardLifeUserAuthentication.cs" />
+    <Compile Include="API\Utility\Logging.cs" />
+    <Compile Include="API\Utility\Reflection.cs" />
+    <Compile Include="WebStatus\AssetEndpoints.cs" />
+    <Compile Include="WebStatus\Attributes.cs" />
+    <Compile Include="WebStatus\ConfigurationEndpoints.cs" />
+    <Compile Include="WebStatus\DebugEndpoints.cs" />
+    <Compile Include="WebStatus\LogEndpoints.cs" />
+    <Compile Include="WebStatus\StatusEndpoints.cs" />
+    <Compile Include="WebStatus\WebServer.cs" />
+    <Compile Include="CLre_server.cs" />
+    <Compile Include="Fixes\BugfixAttribute.cs" />
+    <Compile Include="Fixes\InitLogSooner.cs" />
+    <Compile Include="Tweaks\Chat\Attributes.cs" />
+    <Compile Include="Tweaks\Chat\AuthenticationEngine.cs" />
+    <Compile Include="Tweaks\Chat\ChatConfig.cs" />
+    <Compile Include="Tweaks\Chat\ChatConnectionEngine.cs" />
+    <Compile Include="Tweaks\Chat\ChatHandler.cs" />
+    <Compile Include="Tweaks\Chat\ChatListener.cs" />
+    <Compile Include="Tweaks\Chat\ModeratorCommands.cs" />
+    <Compile Include="Tweaks\Chat\UserCommands.cs" />
+    <Compile Include="Tweaks\TerrainModificationExclusionZone.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/CLre_server/packages.config b/CLre_server/packages.config
new file mode 100644
index 0000000..2607937
--- /dev/null
+++ b/CLre_server/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Lib.Harmony" version="2.3.3" targetFramework="net40" />
+</packages>
\ No newline at end of file