Changeset 455 for binary-improvements/AllocsCommands/Commands/ListLandProtection.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/AllocsCommands/Commands/ListLandProtection.cs (modified) (5 diffs)

binary-improvements/AllocsCommands/Commands/ListLandProtection.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using AllocsFixes.PersistentData;
+using JetBrains.Annotations;
 
 namespace AllocsFixes.CustomCommands {
+        [UsedImplicitly]
         public class ListLandProtection : ConsoleCmdAbstract {
                 protected override string getDescription () {
@@ -57 +59 @@
                                                 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;
                                         }
@@ -79 +81 @@
                                         } 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;
                                         }
@@ -102 +104 @@
 
                         foreach (KeyValuePair<Player, List<Vector3i>> kvp in claims) {
-                                SdtdConsole.Instance.Output (string.Format (
-                                        "Player \"{0} ({1})\" owns {4} keystones (protected: {2}, current hardness multiplier: {3})",
-                                        kvp.Key.Name,
-                                        kvp.Key.InternalId,
-                                        kvp.Key.LandProtectionActive,
-                                        kvp.Key.LandProtectionMultiplier,
-                                        kvp.Value.Count));
-                                if (!summaryOnly) {
-                                        foreach (Vector3i v in kvp.Value) {
-                                                if (parseableOutput) {
-                                                        SdtdConsole.Instance.Output ("LandProtectionOf: id=" + kvp.Key.InternalId +
-                                                                                     ", playerName=" + kvp.Key.Name + ", location=" + v);
-                                                } else {
-                                                        SdtdConsole.Instance.Output ("   (" + v + ")");
-                                                }
+                                SdtdConsole.Instance.Output (
+                                        $"Player \"{kvp.Key.Name} ({kvp.Key.InternalId})\" owns {kvp.Value.Count} keystones (protected: {kvp.Key.LandProtectionActive}, current hardness multiplier: {kvp.Key.LandProtectionMultiplier})");
+                                if (summaryOnly) {
+                                        continue;
+                                }
+
+                                foreach (Vector3i v in kvp.Value) {
+                                        if (parseableOutput) {
+                                                SdtdConsole.Instance.Output ($"LandProtectionOf: id={kvp.Key.InternalId}, playerName={kvp.Key.Name}, location={v}");
+                                        } else {
+                                                SdtdConsole.Instance.Output ($"   ({v})");
                                         }
                                 }
@@ -122 +120 @@
 
                         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");
                         }
                 }