Changeset 455 for binary-improvements/7dtd-server-fixes/src/API.cs

Timestamp:

Jul 31, 2023, 4:06:13 PM (16 months ago)

Author:

alloc

Message:

25_30_44

• Got rid (mostly) of custom JSON serialization
• Some code cleanup

File:

• binary-improvements/7dtd-server-fixes/src/API.cs (modified) (5 diffs)

binary-improvements/7dtd-server-fixes/src/API.cs

@@ -1 +1 @@
 using System.Collections.Generic;
 using AllocsFixes.PersistentData;
+using JetBrains.Annotations;
 using Platform.Steam;
 
 namespace AllocsFixes {
+        [UsedImplicitly]
         public class API : IModApi {
                 public void InitMod (Mod _modInstance) {
                         ModEvents.GameStartDone.RegisterHandler (GameAwake);
-                        ModEvents.GameShutdown.RegisterHandler (GameShutdown);
                         ModEvents.SavePlayerData.RegisterHandler (SavePlayerData);
                         ModEvents.PlayerSpawning.RegisterHandler (PlayerSpawning);
@@ -15 +16 @@
                 }
 
-                public void GameAwake () {
+                private static void GameAwake () {
                         PersistentContainer.Load ();
                 }
 
-                public void GameShutdown () {
-                }
-
-                public void SavePlayerData (ClientInfo _cInfo, PlayerDataFile _playerDataFile) {
+                private static void SavePlayerData (ClientInfo _cInfo, PlayerDataFile _playerDataFile) {
                         PersistentContainer.Instance.Players.GetOrCreate (_cInfo.InternalId, _cInfo.PlatformId, _cInfo.CrossplatformId).Update (_cInfo, _playerDataFile);
                 }
 
-                public void PlayerSpawning (ClientInfo _cInfo, int _chunkViewDim, PlayerProfile _playerProfile) {
+                private static void PlayerSpawning (ClientInfo _cInfo, int _chunkViewDim, PlayerProfile _playerProfile) {
                         string owner = null;
                         if (_cInfo.PlatformId is UserIdentifierSteam identifierSteam) {
@@ -32 +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}"
                         );
                 }
 
-                public void PlayerDisconnected (ClientInfo _cInfo, bool _bShutdown) {
+                private static void PlayerDisconnected (ClientInfo _cInfo, bool _bShutdown) {
                         Player p = PersistentContainer.Instance.Players.GetByInternalId (_cInfo.InternalId);
                         if (p != null) {
@@ -53 +46 @@
                 }
 
-                public void PlayerSpawned (ClientInfo _cInfo, RespawnType _respawnReason, Vector3i _spawnPos) {
+                private static void PlayerSpawned (ClientInfo _cInfo, RespawnType _respawnReason, Vector3i _spawnPos) {
                         PersistentContainer.Instance.Players.GetOrCreate (_cInfo.InternalId, _cInfo.PlatformId, _cInfo.CrossplatformId).SetOnline (_cInfo);
                         PersistentContainer.Instance.Save ();
                 }
 
-                private const string ANSWER =
-                        "     [ff0000]I[-] [ff7f00]W[-][ffff00]A[-][80ff00]S[-] [00ffff]H[-][0080ff]E[-][0000ff]R[-][8b00ff]E[-]";
+                private const string ANSWER = "     [ff0000]I[-] [ff7f00]W[-][ffff00]A[-][80ff00]S[-] [00ffff]H[-][0080ff]E[-][0000ff]R[-][8b00ff]E[-]";
 
-                public bool ChatMessage (ClientInfo _cInfo, EChatType _type, int _senderId, string _msg, string _mainName,
+                private static bool ChatMessage (ClientInfo _cInfo, EChatType _type, int _senderId, string _msg, string _mainName,
                         bool _localizeMain, List<int> _recipientEntityIds) {
                         if (string.IsNullOrEmpty (_msg) || !_msg.EqualsCaseInsensitive ("/alloc")) {
@@ -68 +60 @@
 
                         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, ANSWER, "", false, null));
                         } else {
-                                Log.Error ("ChatHookExample: Argument _cInfo null on message: {0}", _msg);
+                                Log.Error ($"ChatHookExample: Argument _cInfo null on message: {_msg}");
                         }