Changeset 436

Timestamp:

May 18, 2023, 3:09:12 PM (19 months ago)

Author:

alloc

Message:

Added Bloodmoon API
Removed WebUiUpdates API

Location:

binary-improvements2

Files:

• WebServer/ModInfo.xml (modified) (1 diff)
• WebServer/WebServer.csproj (modified) (2 diffs)
• WebServer/src/WebAPI/APIs/Bloodmoon.cs (added)
• WebServer/src/WebAPI/APIs/ServerStats.cs (modified) (2 diffs)
• WebServer/src/WebAPI/APIs/WebUiUpdates.cs (deleted)
• WebServer/src/WebAPI/JsonCommons.cs (modified) (1 diff)
• bin/Mods/TFP_CommandExtensions/CommandExtensions.dll (modified) ( previous)
• bin/Mods/TFP_CommandExtensions/CommandExtensions.pdb (modified) ( previous)
• bin/Mods/TFP_MapRendering/MapRendering.dll (modified) ( previous)
• bin/Mods/TFP_MapRendering/MapRendering.pdb (modified) ( previous)
• 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)

binary-improvements2/WebServer/ModInfo.xml

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

binary-improvements2/WebServer/WebServer.csproj

@@ -120 +120 @@
     <Compile Include="src\WebAPI\AbsRestApi.cs" />
     <Compile Include="src\WebAPI\AbsWebAPI.cs" />
+    <Compile Include="src\WebAPI\APIs\Bloodmoon.cs" />
     <Compile Include="src\WebAPI\APIs\Command.cs" />
     <Compile Include="src\WebAPI\APIs\GameData\Item.cs" />
@@ -135 +136 @@
     <Compile Include="src\WebAPI\APIs\ServerInfo.cs" />
     <Compile Include="src\WebAPI\APIs\ServerStats.cs" />
-    <Compile Include="src\WebAPI\APIs\WebUiUpdates.cs" />
     <Compile Include="src\WebAPI\APIs\WorldState\Animal.cs" />
     <Compile Include="src\WebAPI\APIs\WorldState\GetLandClaims.cs" />

binary-improvements2/WebServer/src/WebAPI/APIs/ServerStats.cs

@@ -12 +12 @@
                 private static readonly byte[] jsonKeyAnimals = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("animals");
                 
-                private static readonly byte[] jsonKeyDays = JsonWriter.GetEncodedPropertyNameWithBeginObject ("days");
-                private static readonly byte[] jsonKeyHours = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("hours");
-                private static readonly byte[] jsonKeyMinutes = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("minutes");
 
                 protected override void HandleRestGet (RequestContext _context) {
@@ -20 +17 @@
                         
                         writer.WriteRaw (jsonKeyGameTime);
-
                         (int days, int hours, int minutes) = GameUtils.WorldTimeToElements (GameManager.Instance.World.worldTime);
-                        
-                        writer.WriteRaw (jsonKeyDays);
-                        writer.WriteInt32 (days);
-                        
-                        writer.WriteRaw (jsonKeyHours);
-                        writer.WriteInt32 (hours);
-                        
-                        writer.WriteRaw (jsonKeyMinutes);
-                        writer.WriteInt32 (minutes);
-                        
-                        writer.WriteEndObject ();
+                        JsonCommons.WriteGameTimeObject (ref writer, days, hours, minutes);
 
                         writer.WriteRaw (jsonKeyPlayers);

binary-improvements2/WebServer/src/WebAPI/JsonCommons.cs

@@ -33 +33 @@
                         _writer.WriteRaw (jsonKeyPositionZ);
                         _writer.WriteSingle (_position.z);
+                        
+                        _writer.WriteEndObject ();
+                }
+
+                private static readonly byte[] jsonKeyDays = JsonWriter.GetEncodedPropertyNameWithBeginObject ("days");
+                private static readonly byte[] jsonKeyHours = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("hours");
+                private static readonly byte[] jsonKeyMinutes = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("minutes");
+
+                public static void WriteGameTimeObject (ref JsonWriter _writer, int _days, int _hours, int _minutes) {
+                        _writer.WriteRaw (jsonKeyDays);
+                        _writer.WriteInt32 (_days);
+                        
+                        _writer.WriteRaw (jsonKeyHours);
+                        _writer.WriteInt32 (_hours);
+                        
+                        _writer.WriteRaw (jsonKeyMinutes);
+                        _writer.WriteInt32 (_minutes);
                         
                         _writer.WriteEndObject ();

binary-improvements2/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="21.0.289.0" />
+        <Version value="21.0.289.1" />
         <Website value="" />
 </xml>