Merge pull request #28 from YongAn404/master

代码优化
XLittleLeft · Dec 10, 2024 · e1d2138 · e1d2138
2 parents b7271bb + ccaac31
commit e1d2138
Show file tree

Hide file tree

Showing 31 changed files with 198 additions and 352 deletions.
diff --git a/HelpSense/API/API.cs b/HelpSense/API/API.cs
@@ -5,7 +5,7 @@ namespace HelpSense.API
 {
     public static class API
     {
-        public static List<string> TimerHidden { get; } = new List<string>();
+        public static List<string> TimerHidden { get; } = [];
 
         public static bool TryGetLog(string id, out PlayerLog log)
         {

diff --git a/HelpSense/API/Extensions/StringBuilderExtensions.cs b/HelpSense/API/Extensions/StringBuilderExtensions.cs
@@ -1,21 +1,4 @@
-using GameCore;
-using HelpSense.API.Features;
-using MapGeneration.Distributors;
-using PlayerRoles;
-using PlayerRoles.PlayableScps.Scp079;
-using PluginAPI.Core;
-using Respawning;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-using static HelpSense.API.Features.TimerView;
-using HelpSense.Helper;
-
-namespace HelpSense.API.Extensions
+namespace HelpSense.API.Extensions
 {
     public static class StringBuilderExtensions
     {

diff --git a/HelpSense/API/Features/Pool/IPool.cs b/HelpSense/API/Features/Pool/IPool.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace HelpSense.API.Features.Pool
+namespace HelpSense.API.Features.Pool
 {
     public interface IPool<T>
     {

diff --git a/HelpSense/API/Features/TimerView.cs b/HelpSense/API/Features/TimerView.cs
@@ -1,14 +1,10 @@
-using HelpSense.API.Extensions;
-using HelpSense.ConfigSystem;
+using HelpSense.ConfigSystem;
 using PluginAPI.Core;
-using Respawning;
 using Serialization;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace HelpSense.API.Features
 {
@@ -64,27 +60,28 @@ public static void GetNew(string name)
             Log.Debug($"{name} 成功加载!", Plugin.Instance.Config.Debug);
         }
 
-       /* public string GetText(int? spectatorCount = null)
-        {
-            StringBuilder.Clear();
-            StringBuilder.Append(
-                RespawnManager.Singleton._curSequence is not RespawnManager.RespawnSequencePhase.PlayingEntryAnimations or RespawnManager.RespawnSequencePhase.SpawningSelectedTeam
-                    ? BeforeRespawnString
-                    : DuringRespawnString);
+        /* public string GetText(int? spectatorCount = null)
+         {
+             StringBuilder.Clear();
+             StringBuilder.Append(
+                 RespawnManager.Singleton._curSequence is not RespawnManager.RespawnSequencePhase.PlayingEntryAnimations or RespawnManager.RespawnSequencePhase.SpawningSelectedTeam
+                     ? BeforeRespawnString
+                     : DuringRespawnString);
 
-            StringBuilder.SetAllProperties(spectatorCount);
-            StringBuilder.Replace('{', '[').Replace('}', ']');
+             StringBuilder.SetAllProperties(spectatorCount);
+             StringBuilder.Replace('{', '[').Replace('}', ']');
 
-            HintInterval++;
-            if (HintInterval == Properties.HintInterval)
-            {
-                HintInterval = 0;
-                IncrementHintIndex();
-            }
+             HintInterval++;
+             if (HintInterval == Properties.HintInterval)
+             {
+                 HintInterval = 0;
+                 IncrementHintIndex();
+             }
 
-            return StringBuilder.ToString();
-        }*/
+             return StringBuilder.ToString();
+         }*/
 
+        [Obsolete("SCP:SL 14.0 Obsolete", false)]
         private void IncrementHintIndex()
         {
             HintIndex++;

diff --git a/HelpSense/API/InfoExtension.cs b/HelpSense/API/InfoExtension.cs
@@ -2,14 +2,11 @@
 
 namespace HelpSense.API
 {
-    using System;
-    using System.Linq;
     using HelpSense.API.Serialization;
-    using HelpSense.ConfigSystem;
     using HelpSense.Helper;
     using MEC;
-    using PlayerRoles;
     using PluginAPI.Core;
+    using System;
 
     public static class InfoExtension
     {

diff --git a/HelpSense/API/Serialization/PlayerLog.cs b/HelpSense/API/Serialization/PlayerLog.cs
@@ -1,5 +1,5 @@
-using System;
-using LiteDB;
+using LiteDB;
+using System;
 
 namespace HelpSense.API.Serialization
 {
@@ -11,7 +11,7 @@ public class PlayerLog
         public DateTime LastLeftTime { get; set; }
         public int PlayedTimes { get; set; }
         public int PlayerKills { get; set; }
-        public int PlayerDeath {  get; set; }
+        public int PlayerDeath { get; set; }
         public int PlayerSCPKills { get; set; }
         public float PlayerDamage { get; set; }
         public int RolePlayed { get; set; }

diff --git a/HelpSense/Commands/ChatCommand/AcCommand.cs b/HelpSense/Commands/ChatCommand/AcCommand.cs
@@ -1,9 +1,7 @@
 using CommandSystem;
-using HelpSense.Helper;
 using HelpSense.Helper.Chat;
 using PluginAPI.Core;
 using System;
-using System.Linq;
 
 namespace HelpSense.Commands.ChatCommand
 {
@@ -12,7 +10,7 @@ public class AcCommand : ICommand
     {
         public string Command => "AC";
 
-        public string[] Aliases => new[]{ "私聊管理" };
+        public string[] Aliases => ["私聊管理"];
 
         public string Description => "私聊管理";
 
@@ -32,13 +30,7 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
                 return false;
             }
 
-            if (arguments.At( 0).Contains("<"))
-            {
-                response = "包含敏感字符";
-                return false;
-            }
-
-            ChatHelper.SendMessage(player, ChatMessage.MessageType.AdminPrivateChat, string.Join(" ", arguments));
+            ChatHelper.SendMessage(player, ChatMessage.MessageType.AdminPrivateChat, $"<noparse>{string.Join(" ", arguments)}</noparse>");
 
             Log.Info(player.Nickname + " 发送了 " + arguments.At(0));
             response = "发送成功";

diff --git a/HelpSense/Commands/ChatCommand/BcCommand.cs b/HelpSense/Commands/ChatCommand/BcCommand.cs
@@ -1,7 +1,5 @@
 using CommandSystem;
-using HelpSense.Helper;
 using HelpSense.Helper.Chat;
-using PlayerRoles;
 using PluginAPI.Core;
 using System;
 
@@ -12,7 +10,7 @@ public class BcCommand : ICommand
     {
         public string Command => "BC";
 
-        public string[] Aliases => new[]{"广播"};
+        public string[] Aliases => ["广播"];
 
         public string Description => "全服聊天";
 
@@ -32,13 +30,7 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
                 return false;
             }
 
-            if (arguments.At(0).Contains("<"))
-            {
-                response = "包含敏感字符";
-                return false;
-            }
-
-            ChatHelper.SendMessage(player, ChatMessage.MessageType.BroadcastChat, string.Join(" ", arguments));
+            ChatHelper.SendMessage(player, ChatMessage.MessageType.BroadcastChat, $"<noparse>{string.Join(" ", arguments)}</noparse>");
 
             Log.Info(player.Nickname + " 发送了 " + arguments.At(0));
             response = "发送成功";

diff --git a/HelpSense/Commands/ChatCommand/CCommand.cs b/HelpSense/Commands/ChatCommand/CCommand.cs
@@ -1,7 +1,5 @@
 using CommandSystem;
-using HelpSense.Helper;
 using HelpSense.Helper.Chat;
-using PlayerRoles;
 using PluginAPI.Core;
 using System;
 
@@ -12,7 +10,7 @@ public class CCommand : ICommand
     {
         public string Command => "C";
 
-        public string[] Aliases => new[]{"队伍广播"};
+        public string[] Aliases => ["CC", "队伍广播"];
 
         public string Description => "队伍聊天";
 
@@ -32,13 +30,7 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
                 return false;
             }
 
-            if (arguments.At(0).Contains("<"))
-            {
-                response = "包含敏感字符";
-                return false;
-            }
-
-            ChatHelper.SendMessage(player, ChatMessage.MessageType.TeamChat, string.Join(" ", arguments));
+            ChatHelper.SendMessage(player, ChatMessage.MessageType.TeamChat, $"<noparse>{string.Join(" ", arguments)}</noparse>");
 
             Log.Info(player.Nickname + " 发送了 " + arguments.At(0));
 

diff --git a/HelpSense/Commands/InfoCommand.cs b/HelpSense/Commands/InfoCommand.cs
@@ -11,15 +11,15 @@ public class InfoCommand : ICommand
     {
         public string Command => "Info";
 
-        public string[] Aliases => new[] { "info" };
+        public string[] Aliases => ["info"];
 
         public string Description => "查询在本服务器游玩的时间和击杀人数";
 
         public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
         {
             Player player;
 
-            if(sender is null || (player = Player.Get(sender)) is null)
+            if (sender is null || (player = Player.Get(sender)) is null)
             {
                 response = "执行指令时发生错误，请稍后重试";
                 return false;

diff --git a/HelpSense/Commands/RescueCommand.cs b/HelpSense/Commands/RescueCommand.cs
@@ -12,23 +12,23 @@ public class RescueCommand : ICommand
     {
         public string Command => "ZiJiu";
 
-        public string[] Aliases => new[] { "Rescue", "ZJ" };
+        public string[] Aliases => ["Rescue", "ZJ"];
 
         public string Description => "卡虚空自救";
 
         public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
         {
             Player player;
 
-            if(sender is null || (player = Player.Get(sender)) is null)
+            if (sender is null || (player = Player.Get(sender)) is null)
             {
                 response = "执行指令时发生错误，请稍后再试";
                 return false;
             }
 
             WaypointBase.GetRelativePosition(player.Position, out byte id, out _);
 
-            if (!player.IsAlive || 
+            if (!player.IsAlive ||
                 player.Zone is not MapGeneration.FacilityZone.None ||
                 !WaypointBase.TryGetWaypoint(id, out WaypointBase waypoint) ||
                 waypoint is ElevatorWaypoint)
@@ -50,7 +50,7 @@ player.Zone is not MapGeneration.FacilityZone.None ||
                     player.IsGodModeEnabled = false;
                 });
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 player.IsGodModeEnabled = false;
                 Log.Error(ex.ToString());

diff --git a/HelpSense/Commands/Timer.cs b/HelpSense/Commands/Timer.cs
@@ -8,7 +8,7 @@ public class Timer : ICommand
     {
         public string Command => "timer";
 
-        public string[] Aliases => Array.Empty<string>();
+        public string[] Aliases => [];
 
         public string Description => "显示或者关闭刷新时间";
 

diff --git a/HelpSense/Commands/VersionCommand.cs b/HelpSense/Commands/VersionCommand.cs
@@ -9,14 +9,14 @@ public class VersionCommand : ICommand
     {
         public string Command => "Version";
 
-        public string[] Aliases => new[]{"VersionInfo", "VI"};
+        public string[] Aliases => ["VersionInfo", "VI"];
 
         public string Description => "查询HelpSense插件版本和信息";
 
         public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
         {
             var config = Plugin.Instance.Config;
-            
+
             var sb = StringBuilderPool.Pool.Get();
 
             //Version and update time
@@ -47,10 +47,10 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
 
             response = sb.ToString();
             StringBuilderPool.Pool.Return(sb);
-            
+
             return true;
         }
 
-        public string BoolTranslate(bool value) => value? "✔":"✖";
+        public string BoolTranslate(bool value) => value ? "✔" : "✖";
     }
 }
diff --git a/HelpSense/ConfigSystem/Config.cs b/HelpSense/ConfigSystem/Config.cs
@@ -1,11 +1,10 @@
-using System.ComponentModel;
+using HelpSense.Helper.Lobby;
 using PlayerRoles;
-using System.Collections.Generic;
-using HelpSense.Helper;
 using PluginAPI.Helpers;
-using System.IO;
 using System;
-using HelpSense.Helper.Lobby;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
 
 namespace HelpSense.ConfigSystem
 {
@@ -92,7 +91,7 @@ public class Config
         [Description("启用修改SCP血量系统")]
         public bool EnableChangeSCPHPSystem { get; set; } = true;
         [Description("SCP173,SCP939,SCP049,SCP049-2,SCP096,SCP106血量")]
-        public List<float> SCPsHP { get; set; } = new List<float> { 4200,2700,2200,400,2500,2200};
+        public List<float> SCPsHP { get; set; } = new List<float> { 4200, 2700, 2200, 400, 2500, 2200 };
 
         // /////////////////////////////////////////////////
         [Description("启用.bc和.c聊天系统")]
@@ -191,7 +190,7 @@ public class Config
 
         /// //////////////////////////////////////////////////////////
         [Description("SCP-191")]
-        public bool SCP191 { get;set; } = true;
+        public bool SCP191 { get; set; } = true;
         [Description("子弹对SCP-191造成的单发伤害")]
         public float SCP191Ammo { get; set; } = 10;
         [Description("SCP-073")]

diff --git a/HelpSense/ConfigSystem/TranslateConfig.cs b/HelpSense/ConfigSystem/TranslateConfig.cs
@@ -1,12 +1,7 @@
-using HelpSense.Helper;
-using HelpSense.Helper.Chat;
+using HelpSense.Helper.Chat;
 using PlayerRoles;
-using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace HelpSense.ConfigSystem
 {