Changeset 503

Timestamp:

Jan 27, 2025, 4:29:28 PM (38 hours ago)

Author:

alloc

Message:

Compatibility fixes for 2.0

Location:

TFP-WebServer

Files:

• CommandExtensions/ModInfo.xml (modified) (1 diff)
• CommandExtensions/src/ChatHelpers.cs (modified) (1 diff)
• MapRendering/ModInfo.xml (modified) (1 diff)
• MapRendering/src/ModApi.cs (modified) (1 diff)
• WebServer/ModInfo.xml (modified) (1 diff)
• WebServer/src/ModApi.cs (modified) (2 diffs)
• bin/Mods/TFP_CommandExtensions/CommandExtensions.dll (modified) ( previous)
• bin/Mods/TFP_CommandExtensions/CommandExtensions.pdb (modified) ( previous)
• bin/Mods/TFP_CommandExtensions/ModInfo.xml (modified) (1 diff)
• bin/Mods/TFP_MapRendering/MapRendering.dll (modified) ( previous)
• bin/Mods/TFP_MapRendering/MapRendering.pdb (modified) ( previous)
• bin/Mods/TFP_MapRendering/ModInfo.xml (modified) (1 diff)
• bin/Mods/TFP_WebServer/ModInfo.xml (modified) (1 diff)
• bin/Mods/TFP_WebServer/SpaceWizards.HttpListener.dll (modified) ( previous)
• bin/Mods/TFP_WebServer/SpaceWizards.HttpListener.pdb (modified) ( previous)
• bin/Mods/TFP_WebServer/WebServer.dll (modified) ( previous)
• bin/Mods/TFP_WebServer/WebServer.pdb (modified) ( previous)
• bin/Mods/Xample_MarkersMod/MarkersMod.dll (modified) ( previous)
• bin/Mods/Xample_MarkersMod/MarkersMod.pdb (modified) ( previous)

TFP-WebServer/CommandExtensions/ModInfo.xml

@@ -5 +5 @@
         <Description value="Additional commands for server operation" />
         <Author value="The Fun Pimps LLC" />
-        <Version value="1.1.0.1" />
+        <Version value="2.0.0.0" />
         <Website value="" />
 </xml>

TFP-WebServer/CommandExtensions/src/ChatHelpers.cs

@@ -6 +6 @@
                                 PrivateMessageConnections.SetLastPMSender (_sender, _receiver);
                                 senderName = _sender.playerName;
+                                
+                                _receiver.SendPackage (NetPackageManager.GetPackage<NetPackageChat> ().Setup (EChatType.Whisper, _sender.entityId,
+                                        _message, null, EMessageSender.SenderIdAsPlayer, GeneratedTextManager.BbCodeSupportMode.SupportedAndAddEscapes));
                         } else {
                                 senderName = "Server";
+                                
+                                _receiver.SendPackage (NetPackageManager.GetPackage<NetPackageChat> ().Setup (EChatType.Whisper, -1,
+                                        _message, null, EMessageSender.Server, GeneratedTextManager.BbCodeSupportMode.Supported));
                         }
 
-                        _receiver.SendPackage (NetPackageManager.GetPackage<NetPackageChat> ().Setup (EChatType.Whisper, -1,
-                                $"{senderName} (PM): {_message}", null,
-                                EMessageSender.None));
                         string receiverName = _receiver.playerName;
                         receiverName = receiverName != null ? $"\"{receiverName}\"" : "unknownName";

TFP-WebServer/MapRendering/ModInfo.xml

@@ -5 +5 @@
         <Description value="Render the game map to image map tiles as it is uncovered" />
         <Author value="The Fun Pimps LLC" />
-        <Version value="1.1.0.0" />
+        <Version value="2.0.0.0" />
         <Website value="" />
 </xml>

TFP-WebServer/MapRendering/src/ModApi.cs

@@ -27 +27 @@
                 }
 
-                private void GameStartDone () {
+                private ModEvents.EModEventResult GameStartDone (ref ModEvents.SGameStartDoneData _data) {
                         if (!MapRenderer.Enabled) {
-                                return;
+                                return ModEvents.EModEventResult.Continue;
                         }
 
                         ModEvents.GameShutdown.RegisterHandler (GameShutdown);
                         ModEvents.CalcChunkColorsDone.RegisterHandler (CalcChunkColorsDone);
+
+                        return ModEvents.EModEventResult.Continue;
                 }
 
-                private void GameShutdown () {
+                private ModEvents.EModEventResult GameShutdown (ref ModEvents.SGameShutdownData _data) {
                         MapRenderer.Shutdown ();
+
+                        return ModEvents.EModEventResult.Continue;
                 }
 
-                private void CalcChunkColorsDone (Chunk _chunk) {
-                        MapRenderer.RenderSingleChunk (_chunk);
+                private ModEvents.EModEventResult CalcChunkColorsDone (ref ModEvents.SCalcChunkColorsDoneData _data) {
+                        MapRenderer.RenderSingleChunk (_data.Chunk);
+
+                        return ModEvents.EModEventResult.Continue;
                 }
         }

TFP-WebServer/WebServer/ModInfo.xml

@@ -5 +5 @@
         <Description value="Integrated Webserver for the Web Dashboard and server APIs" />
         <Author value="The Fun Pimps LLC" />
-        <Version value="1.1.0.4" />
+        <Version value="2.0.0.0" />
         <Website value="" />
 </xml>

TFP-WebServer/WebServer/src/ModApi.cs

@@ -18 +18 @@
                 }
 
-                private void GameStartDone () {
+                private ModEvents.EModEventResult GameStartDone (ref ModEvents.SGameStartDoneData _data) {
                         if (!ConnectionManager.Instance.IsServer) {
-                                return;
+                                return ModEvents.EModEventResult.Continue;
                         }
                         
@@ -29 +29 @@
                                 ItemIconHandler.Instance.LoadIcons ();
                         }
+
+                        return ModEvents.EModEventResult.Continue;
                 }
 
-                private void WorldShuttingDown () {
+                private ModEvents.EModEventResult WorldShuttingDown (ref ModEvents.SWorldShuttingDownData _data) {
                         webInstance?.Disconnect ();
+
+                        return ModEvents.EModEventResult.Continue;
                 }
         }

TFP-WebServer/bin/Mods/TFP_CommandExtensions/ModInfo.xml

@@ -5 +5 @@
         <Description value="Additional commands for server operation" />
         <Author value="The Fun Pimps LLC" />
-        <Version value="1.1.0.1" />
+        <Version value="2.0.0.0" />
         <Website value="" />
 </xml>

TFP-WebServer/bin/Mods/TFP_MapRendering/ModInfo.xml

@@ -5 +5 @@
         <Description value="Render the game map to image map tiles as it is uncovered" />
         <Author value="The Fun Pimps LLC" />
-        <Version value="1.1.0.0" />
+        <Version value="2.0.0.0" />
         <Website value="" />
 </xml>

TFP-WebServer/bin/Mods/TFP_WebServer/ModInfo.xml

@@ -5 +5 @@
         <Description value="Integrated Webserver for the Web Dashboard and server APIs" />
         <Author value="The Fun Pimps LLC" />
-        <Version value="1.1.0.4" />
+        <Version value="2.0.0.0" />
         <Website value="" />
 </xml>