Changeset 402 for binary-improvements2/7dtd-server-fixes

Timestamp:

Jan 27, 2023, 7:28:00 PM (22 months ago)

Author:

alloc

Message:

• Major refactoring
• Using Utf8Json for (de)serialization
• Moving APIs to REST
• Removing dependencies from WebServer and MapRenderer to ServerFixes

Location:

binary-improvements2/7dtd-server-fixes

Files:

• 7dtd-server-fixes.csproj (modified) (3 diffs)
• ModInfo.xml (modified) (1 diff)
• src/AllocsUtils.cs (deleted)
• src/JSON (deleted)
• src/ModApi.cs (modified) (2 diffs)
• src/PersistentData/Inventory.cs (modified) (2 diffs)
• src/PersistentData/PersistentContainer.cs (modified) (2 diffs)
• src/PersistentData/Player.cs (modified) (2 diffs)
• src/PersistentData/Players.cs (modified) (1 diff)

binary-improvements2/7dtd-server-fixes/7dtd-server-fixes.csproj

@@ -89 +89 @@
   <ItemGroup>
     <Compile Include="src\AssemblyInfo.cs" />
-    <Compile Include="src\FileCache\InvalidateCachesCmd.cs" />
-    <Compile Include="src\JSON\JsonManualBuilder.cs" />
-    <Compile Include="src\LiveData\Animals.cs" />
-    <Compile Include="src\LiveData\Hostiles.cs" />
     <Compile Include="src\PersistentData\PersistentContainer.cs" />
     <Compile Include="src\PersistentData\InvItem.cs" />
@@ -98 +94 @@
     <Compile Include="src\PersistentData\Players.cs" />
     <Compile Include="src\PersistentData\Player.cs" />
-    <Compile Include="src\JSON\JsonNode.cs" />
-    <Compile Include="src\JSON\JsonArray.cs" />
-    <Compile Include="src\JSON\JsonObject.cs" />
-    <Compile Include="src\JSON\JsonNumber.cs" />
-    <Compile Include="src\JSON\JsonString.cs" />
-    <Compile Include="src\JSON\JsonBoolean.cs" />
-    <Compile Include="src\JSON\Parser.cs" />
-    <Compile Include="src\JSON\JsonNull.cs" />
-    <Compile Include="src\JSON\MalformedJSONException.cs" />
-    <Compile Include="src\FileCache\AbstractCache.cs" />
-    <Compile Include="src\FileCache\DirectAccess.cs" />
-    <Compile Include="src\FileCache\SimpleCache.cs" />
-    <Compile Include="src\FileCache\MapTileCache.cs" />
     <Compile Include="src\ModApi.cs" />
-    <Compile Include="src\AllocsUtils.cs" />
     <Compile Include="src\LandClaimList.cs" />
     <Compile Include="src\PersistentData\Attributes.cs" />
-    <Compile Include="src\JSON\JsonValue.cs" />
-    <Compile Include="src\LiveData\EntityFilterList.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
@@ -122 +102 @@
     <Folder Include="src\" />
     <Folder Include="src\PersistentData\" />
-    <Folder Include="src\FileCache\" />
   </ItemGroup>
   <ItemGroup>

binary-improvements2/7dtd-server-fixes/ModInfo.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <xml>
-        <ModInfo>
-                <Name value="Server extensions" />
-                <Description value="Common functions" />
-                <Author value="The Fun Pimps LLC" />
-                <Version value="1" />
-                <Website value="" />
-        </ModInfo>
+        <Name value="TFP_ServerExtensions" />
+        <DisplayName value="Server Extensions (base)" />
+        <Description value="Common functions for other mods" />
+        <Author value="The Fun Pimps LLC" />
+        <Version value="21.0" />
+        <Website value="" />
 </xml>

binary-improvements2/7dtd-server-fixes/src/ModApi.cs

@@ -30 +30 @@
                         }
 
-                        Log.Out ("Player connected" +
-                                 ", entityid=" + _cInfo.entityId +
-                                 ", name=" + _cInfo.playerName +
-                                 ", pltfmid=" + (_cInfo.PlatformId?.CombinedString ?? "<unknown>") +
-                                 ", crossid=" + (_cInfo.CrossplatformId?.CombinedString ?? "<unknown/none>") +
-                                 ", steamOwner=" + (owner ?? "<unknown/none>") +
-                                 ", ip=" + _cInfo.ip
+                        Log.Out (
+                                $"Player connected, entityid={_cInfo.entityId}, name={_cInfo.playerName}, pltfmid={_cInfo.PlatformId?.CombinedString ?? "<unknown>"}, crossid={_cInfo.CrossplatformId?.CombinedString ?? "<unknown/none>"}, steamOwner={owner ?? "<unknown/none>"}, ip={_cInfo.ip}"
                         );
                 }
@@ -66 +61 @@
 
                         if (_cInfo != null) {
-                                Log.Out ("Sent chat hook reply to {0}", _cInfo.InternalId);
+                                Log.Out ($"Sent chat hook reply to {_cInfo.InternalId}");
                                 _cInfo.SendPackage (NetPackageManager.GetPackage<NetPackageChat> ().Setup (EChatType.Whisper, -1, testChatAnswer, "", false, null));
                         } else {
-                                Log.Error ("ChatHookExample: Argument _cInfo null on message: {0}", _msg);
+                                Log.Error ($"ChatHookExample: Argument _cInfo null on message: {_msg}");
                         }
 

binary-improvements2/7dtd-server-fixes/src/PersistentData/Inventory.cs

@@ -67 +67 @@
 
                         if (_count > maxAllowed) {
-                                Log.Out ("Player with ID " + _playerId + " has stack for \"" + name + "\" greater than allowed (" +
-                                         _count + " > " + maxAllowed + ")");
+                                Log.Out ($"Player with ID {_playerId} has stack for \"{name}\" greater than allowed ({_count} > {maxAllowed})");
                         }
 
@@ -80 +79 @@
                         item.icon = itemClass.GetIconName ();
 
-                        item.iconcolor = AllocsUtils.ColorToHex (itemClass.GetIconTint ());
+                        item.iconcolor = itemClass.GetIconTint ().ToHexCode ();
 
                         return item;

binary-improvements2/7dtd-server-fixes/src/PersistentData/PersistentContainer.cs

@@ -22 +22 @@
 
                 public void Save () {
-                        Stream stream = File.Open (GameIO.GetSaveGameDir () + "/AllocsPeristentData.bin", FileMode.Create);
+                        Stream stream = File.Open ($"{GameIO.GetSaveGameDir ()}/AllocsPeristentData.bin", FileMode.Create);
                         BinaryFormatter bFormatter = new BinaryFormatter ();
                         bFormatter.Serialize (stream, this);
@@ -29 +29 @@
 
                 public static bool Load () {
-                        if (!File.Exists (GameIO.GetSaveGameDir () + "/AllocsPeristentData.bin")) {
+                        if (!File.Exists ($"{GameIO.GetSaveGameDir ()}/AllocsPeristentData.bin")) {
                                 return false;
                         }
 
                         try {
-                                Stream stream = File.Open (GameIO.GetSaveGameDir () + "/AllocsPeristentData.bin", FileMode.Open);
+                                Stream stream = File.Open ($"{GameIO.GetSaveGameDir ()}/AllocsPeristentData.bin", FileMode.Open);
                                 BinaryFormatter bFormatter = new BinaryFormatter ();
                                 PersistentContainer obj = (PersistentContainer) bFormatter.Deserialize (stream);

binary-improvements2/7dtd-server-fixes/src/PersistentData/Player.cs

@@ -117 +117 @@
                         }
 
-                        Log.Out ("Player set to offline: " + platformId);
+                        Log.Out ($"Player set to offline: {platformId}");
                         lastOnline = DateTime.Now;
                         try {
@@ -133 +133 @@
 
                 public void SetOnline (ClientInfo _ci) {
-                        Log.Out ("Player set to online: " + platformId);
+                        Log.Out ($"Player set to online: {platformId}");
                         clientInfo = _ci;
             entityId = _ci.entityId;

binary-improvements2/7dtd-server-fixes/src/PersistentData/Players.cs

@@ -22 +22 @@
                                 }
 
-                                Log.Out ("Created new player entry for ID: " + _platformId);
+                                Log.Out ($"Created new player entry for ID: {_platformId}");
                                 Player p = new Player (_platformId);
                                 Dict.Add (_platformId, p);