Moved GameConnectionManager.cs to the embedded folder

vchelaru · Apr 24, 2024 · 61778b4 · 61778b4
1 parent 68354ea
commit 61778b4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/FRBDK/Glue/GameCommunicationPlugin/GameCommunicationPlugin.csproj b/FRBDK/Glue/GameCommunicationPlugin/GameCommunicationPlugin.csproj
@@ -97,7 +97,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Embedded\GameConnectionManager.cs" />
+    <EmbeddedResource Include="GlueControl\Embedded\GameConnectionManager.cs" />
     <EmbeddedResource Include="Embedded\Json\GlueJsonManager.cs" />
     <EmbeddedResource Include="Embedded\Json\JsonContainer.cs" />
     <EmbeddedResource Include="Embedded\Json\JsonManager.cs" />

diff --git a/FRBDK/Glue/GameCommunicationPlugin/GlueControl/CodeGeneration/EmbeddedCodeManager.cs b/FRBDK/Glue/GameCommunicationPlugin/GlueControl/CodeGeneration/EmbeddedCodeManager.cs
@@ -18,6 +18,7 @@ public static class EmbeddedCodeManager
             "CommandReceiver.cs",
 
             "Dtos.cs",
+            "GameConnectionManager.cs",
             "GlueCallsClassGenerationManager.cs",
 
             "Editing.CameraLogic.cs",
@@ -91,6 +92,12 @@ public static void EmbedAll(bool fullyGenerate)
 
             // This was a typo in old projects:
             RemoveEmbeddedFile("Runtime/DynamicEntitys.Generated.cs", saveAfterRemoving:true);
+
+            // this was moved:
+            FilePath oldGameConnectionManagerLocation = GlueState.Self.CurrentGlueProjectDirectory + "GlueCommunication/GameConnectionManager.Generated.cs";
+            GlueCommands.Self.ProjectCommands.RemoveFromProjects(oldGameConnectionManagerLocation);
+
+
         }
 
         public static void RemoveAll()

diff --git a/...nPlugin/Embedded/GameConnectionManager.cs → ...Control/Embedded/GameConnectionManager.cs b/...nPlugin/Embedded/GameConnectionManager.cs → ...Control/Embedded/GameConnectionManager.cs
diff --git a/FRBDK/Glue/GameCommunicationPlugin/MainGameCommunicationPlugin.cs b/FRBDK/Glue/GameCommunicationPlugin/MainGameCommunicationPlugin.cs
@@ -11,7 +11,6 @@
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 using GameCommunicationPlugin.CodeGeneration;
-using EmbeddedCodeManager = GameCommunicationPlugin.CodeGeneration.EmbeddedCodeManager;
 using ToolsUtilities;
 using GameCommunicationPlugin.GlueControl.ViewModels;
 using OfficialPluginsCore.Compiler.CommandReceiving;
@@ -38,7 +37,6 @@ public class MainGameCommunicationPlugin : PluginBase
 
         public override bool ShutDown(PluginShutDownReason shutDownReason)
         {
-            ReactToLoadedGlux -= HandleGluxLoaded;
             _gameCommunicationManager.OnPacketReceived -= HandleOnPacketReceived;
             _gameCommunicationManager.Dispose();
             _gameCommunicationManager = null;
@@ -54,8 +52,6 @@ public override void StartUp()
             _gameCommunicationManager.OnPacketReceived += HandleOnPacketReceived;
             GameConnectionManager.Self = _gameCommunicationManager;
 
-            ReactToLoadedGlux += HandleGluxLoaded;
-
             game1GlueCommunicationGenerator = new Game1GlueCommunicationGenerator(true, 8888);
             RegisterCodeGenerator(game1GlueCommunicationGenerator);
 
@@ -96,15 +92,5 @@ private async Task<object> HandleOnPacketReceived(GameConnectionManager.Packet p
             return toReturn;
         }
 
-        private void HandleGluxLoaded()
-        {
-            if (GameCommunicationHelper.IsFrbNewEnough())
-            {
-                EmbeddedCodeManager.Embed(new System.Collections.Generic.List<string>
-                {
-                    "GameConnectionManager.cs"
-                });
-            }
-        }
     }
 }