Changeset 402 for binary-improvements2/CommandExtensions/src

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/CommandExtensions/src

Files:

• ChatHelpers.cs (modified) (1 diff)
• Commands/Give.cs (modified) (1 diff)
• Commands/ListItems.cs (modified) (1 diff)
• Commands/ListLandProtection.cs (modified) (4 diffs)
• Commands/RemoveLandProtection.cs (modified) (3 diffs)
• Commands/ShowInventory.cs (modified) (7 diffs)
• Commands/TestLogSpam.cs (added)

binary-improvements2/CommandExtensions/src/ChatHelpers.cs

@@ -10 +10 @@
                         }
 
-                        _receiver.SendPackage (NetPackageManager.GetPackage<NetPackageChat> ().Setup (EChatType.Whisper, -1, _message, senderName + " (PM)", false, null));
+                        _receiver.SendPackage (NetPackageManager.GetPackage<NetPackageChat> ().Setup (EChatType.Whisper, -1, _message,
+                                $"{senderName} (PM)", false, null));
                         string receiverName = _receiver.playerName;
-                        SdtdConsole.Instance.Output (
-                                $"Message to player {(receiverName != null ? "\"" + receiverName + "\"" : "unknownName")} sent with sender \"{senderName}\"");
+                        receiverName = receiverName != null ? $"\"{receiverName}\"" : "unknownName";
+                        SdtdConsole.Instance.Output ($"Message to player {receiverName} sent with sender \"{senderName}\"");
                 }
         }

binary-improvements2/CommandExtensions/src/Commands/Give.cs

@@ -27 +27 @@
                 public override void Execute (List<string> _params, CommandSenderInfo _senderInfo) {
                         if (_params.Count != 3 && _params.Count != 4) {
-                                SdtdConsole.Instance.Output ("Wrong number of arguments, expected 3 or 4, found " + _params.Count +
-                                                             ".");
+                                SdtdConsole.Instance.Output ($"Wrong number of arguments, expected 3 or 4, found {_params.Count}.");
                                 return;
                         }

binary-improvements2/CommandExtensions/src/Commands/ListItems.cs

@@ -39 +39 @@
                                 }
 
-                                SdtdConsole.Instance.Output ("    " + s);
+                                SdtdConsole.Instance.Output ($"    {s}");
                                 listed++;
                         }
 
-                        SdtdConsole.Instance.Output ("Listed " + listed + " matching items.");
+                        SdtdConsole.Instance.Output ($"Listed {listed} matching items.");
                 }
         }

binary-improvements2/CommandExtensions/src/Commands/ListLandProtection.cs

@@ -60 +60 @@
                                                 userIdFilter = ci.InternalId;
                                         } else {
-                                                SdtdConsole.Instance.Output ("Player name or entity id \"" + _params [0] + "\" not found.");
+                                                SdtdConsole.Instance.Output ($"Player name or entity id \"{_params [0]}\" not found.");
                                                 return;
                                         }
@@ -82 +82 @@
                                         } catch (Exception e) {
                                                 SdtdConsole.Instance.Output ("Error getting current player's position");
-                                                Log.Out ("Error in ListLandProtection.Run: " + e);
+                                                Log.Out ($"Error in ListLandProtection.Run: {e}");
                                                 return;
                                         }
@@ -114 +114 @@
                                 foreach (Vector3i v in claimPositions) {
                                         if (parseableOutput) {
-                                                SdtdConsole.Instance.Output ("LandProtectionOf: id=" + claimOwner.PlatformId +
-                                                                             ", playerName=" + claimOwner.Name + ", location=" + v);
+                                                SdtdConsole.Instance.Output (
+                                                        $"LandProtectionOf: id={claimOwner.PlatformId}, playerName={claimOwner.Name}, location={v}");
                                         } else {
-                                                SdtdConsole.Instance.Output ("   (" + v + ")");
+                                                SdtdConsole.Instance.Output ($"   ({v})");
                                         }
                                 }
@@ -123 +123 @@
 
                         if (userIdFilter == null) {
-                                SdtdConsole.Instance.Output ("Total of " + ppl.m_lpBlockMap.Count + " keystones in the game");
+                                SdtdConsole.Instance.Output ($"Total of {ppl.m_lpBlockMap.Count} keystones in the game");
                         }
                 }

binary-improvements2/CommandExtensions/src/Commands/RemoveLandProtection.cs

@@ -50 +50 @@
                                 GameManager.Instance.SetBlocksRPC (changes);
 
-                                SdtdConsole.Instance.Output ("Tried to remove #" + changes.Count +
-                                                             " land protection blocks for player \"" + _id + "\". Note " +
-                                                             "that only blocks in chunks that are currently loaded (close to any player) could be removed. " +
-                                                             "Please check for remaining blocks by running:");
-                                SdtdConsole.Instance.Output ("  listlandprotection " + _id);
+                                SdtdConsole.Instance.Output (
+                                        $"Tried to remove #{changes.Count} land protection blocks for player \"{_id}\". Note that only blocks in chunks that are currently loaded (close to any player) could be removed. Please check for remaining blocks by running:");
+                                SdtdConsole.Instance.Output ($"  listlandprotection {_id}");
                         } catch (Exception e) {
-                                Log.Out ("Error in RemoveLandProtection.removeById: " + e);
+                                Log.Out ($"Error in RemoveLandProtection.removeById: {e}");
                         }
                 }
@@ -87 +85 @@
                         GameManager.Instance.SetBlocksRPC (changes);
 
-                        SdtdConsole.Instance.Output ("Land protection block at (" + v + ") removed");
+                        SdtdConsole.Instance.Output ($"Land protection block at ({v}) removed");
                 }
 
@@ -128 +126 @@
                                         } catch (Exception e) {
                                                 SdtdConsole.Instance.Output ("Error removing claims");
-                                                Log.Out ("Error in RemoveLandProtection.Run: " + e);
+                                                Log.Out ($"Error in RemoveLandProtection.Run: {e}");
                                         }
                                 } catch (Exception e) {
                                         SdtdConsole.Instance.Output ("Error getting current player's position");
-                                        Log.Out ("Error in RemoveLandProtection.Run: " + e);
+                                        Log.Out ($"Error in RemoveLandProtection.Run: {e}");
                                 }
                         } else if (_params.Count == 1) {

binary-improvements2/CommandExtensions/src/Commands/ShowInventory.cs

@@ -47 +47 @@
 
                         if (tag == null) {
-                                SdtdConsole.Instance.Output ("Belt of player " + p.Name + ":");
+                                SdtdConsole.Instance.Output ($"Belt of player {p.Name}:");
                         }
 
@@ -56 +56 @@
 
                         if (tag == null) {
-                                SdtdConsole.Instance.Output ("Bagpack of player " + p.Name + ":");
+                                SdtdConsole.Instance.Output ($"Bagpack of player {p.Name}:");
                         }
 
@@ -65 +65 @@
 
                         if (tag == null) {
-                                SdtdConsole.Instance.Output ("Equipment of player " + p.Name + ":");
+                                SdtdConsole.Instance.Output ($"Equipment of player {p.Name}:");
                         }
 
@@ -71 +71 @@
 
                         if (tag != null) {
-                                SdtdConsole.Instance.Output ("tracker_item id=" + p.EntityID + ", tag=" + tag +
-                                                             ", SHOWINVENTORY DONE");
+                                SdtdConsole.Instance.Output ($"tracker_item id={p.EntityID}, tag={tag}, SHOWINVENTORY DONE");
                         }
                 }
@@ -94 +93 @@
                                         // Tag defined -> parseable output
                                         string partsMsg = DoParts (_inv [i].parts, 1, "");
-                                        string msg = "tracker_item id=" + _entityId + ", tag=" + _tag + ", location=" + _location +
-                                                     ", slot=" + i + ", item=" + _inv [i].itemName + ", qnty=" + _inv [i].count +
-                                                     ", quality=" + _inv [i].quality + ", parts=(" + partsMsg + ")";
+                                        string msg =
+                                                $"tracker_item id={_entityId}, tag={_tag}, location={_location}, slot={i}, item={_inv [i].itemName}, qnty={_inv [i].count}, quality={_inv [i].quality}, parts=({partsMsg})";
                                         SdtdConsole.Instance.Output (msg);
                                 }
@@ -140 +138 @@
                                         // Tag defined -> parseable output
                                         string partsMsg = DoParts (_items [slotindices [i]].parts, 1, "");
-                                        string msg = "tracker_item id=" + _entityId + ", tag=" + _tag + ", location=" + _location +
-                                                     ", slot=" + _slotname + ", item=" + item.itemName + ", qnty=1, quality=" +
-                                                     item.quality + ", parts=(" + partsMsg + ")";
+                                        string msg =
+                                                $"tracker_item id={_entityId}, tag={_tag}, location={_location}, slot={_slotname}, item={item.itemName}, qnty=1, quality={item.quality}, parts=({partsMsg})";
                                         SdtdConsole.Instance.Output (msg);
                                 }
@@ -176 +173 @@
                                         }
 
-                                        _currentMessage += _parts [i].itemName + "@" + _parts [i].quality;
+                                        _currentMessage += $"{_parts [i].itemName}@{_parts [i].quality}";
                                         _currentMessage = DoParts (_parts [i].parts, _indent + 1, _currentMessage);
                                 }