Skip to content

Commit a80435e

Browse files
XLittleLeftXLittleLeft
committed
Update For LabAPI
1 parent d59b476 commit a80435e

34 files changed

Lines changed: 833 additions & 963 deletions

‎HelpSense/API/API.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using HelpSense.API.Serialization;
1+
using HelpSense.API.Events;
2+
using HelpSense.API.Serialization;
23
using LiteDB;
34
using System.Collections.Generic;
45

@@ -15,7 +16,7 @@ public static bool TryGetLog(string id, out PlayerLog log)
1516
{
1617
return true;
1718
}
18-
using LiteDatabase database = new(Plugin.Instance.Config.SavePath);
19+
using LiteDatabase database = new(CustomEventHandler.Config.SavePath);
1920
log = database.GetCollection<PlayerLog>("Players")?.FindById(id);
2021
if (log != null)
2122
{

HelpSense/Plugin.cs renamed to HelpSense/API/Events/CustomEventHandler.cs

Lines changed: 418 additions & 310 deletions
Large diffs are not rendered by default.

‎HelpSense/API/InfoExtension.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ namespace HelpSense.API
66
using HelpSense.Helper;
77
using LiteDB;
88
using MEC;
9-
using PluginAPI.Core;
9+
using LabApi.Features.Wrappers;
1010
using System;
11+
using HelpSense.API.Events;
1112

1213
public static class InfoExtension
1314
{
@@ -30,7 +31,7 @@ public static PlayerLog GetLog(this Player ply)
3031
RolePlayed = 0,
3132
PlayerShot = 0,
3233
};
33-
using LiteDatabase database = new(Plugin.Instance.Config.SavePath);
34+
using LiteDatabase database = new(CustomEventHandler.Config.SavePath);
3435
database.GetCollection<PlayerLog>("Players").Insert(toInsert);
3536
}
3637

@@ -59,7 +60,7 @@ public static PlayerLog GetLog(this ReferenceHub ply)
5960
RolePlayed = 0,
6061
PlayerShot = 0,
6162
};
62-
using LiteDatabase database = new(Plugin.Instance.Config.SavePath);
63+
using LiteDatabase database = new(CustomEventHandler.Config.SavePath);
6364
database.GetCollection<PlayerLog>("Players").Insert(toInsert);
6465
}
6566

@@ -70,7 +71,7 @@ public static PlayerLog GetLog(this ReferenceHub ply)
7071

7172
public static void UpdateLog(this PlayerLog log)
7273
{
73-
using LiteDatabase database = new(Plugin.Instance.Config.SavePath);
74+
using LiteDatabase database = new(CustomEventHandler.Config.SavePath);
7475
database.GetCollection<PlayerLog>("Players").Update(log);
7576
}
7677

‎HelpSense/Commands/ChatCommand/AcCommand.cs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
using CommandSystem;
22
using HelpSense.Helper.Chat;
33
using HelpSense.ConfigSystem;
4-
using PluginAPI.Core;
4+
using LabApi.Features.Wrappers;
55
using System;
66

7+
using Log = LabApi.Features.Console.Logger;
8+
using HelpSense.API.Events;
9+
710
namespace HelpSense.Commands.ChatCommand
811
{
912
[CommandHandler(typeof(ClientCommandHandler))]
@@ -17,7 +20,7 @@ public class AcCommand : ICommand
1720

1821
public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
1922
{
20-
CommandTranslateConfig CommandTranslateConfig = Plugin.Instance.CommandTranslateConfig;
23+
CommandTranslateConfig CommandTranslateConfig = CustomEventHandler.CommandTranslateConfig;
2124
Player player;
2225

2326
if (sender is null || (player = Player.Get(sender)) is null)
@@ -26,7 +29,7 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
2629
return false;
2730
}
2831

29-
if (arguments.Count == 0 || player.IsMuted || !Plugin.Instance.Config.EnableAcSystem)
32+
if (arguments.Count == 0 || player.IsMuted || !CustomEventHandler.Config.EnableAcSystem)
3033
{
3134
response = CommandTranslateConfig.ChatCommandFailed;
3235
return false;

‎HelpSense/Commands/ChatCommand/BcCommand.cs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
using CommandSystem;
22
using HelpSense.Helper.Chat;
33
using HelpSense.ConfigSystem;
4-
using PluginAPI.Core;
4+
using LabApi.Features.Wrappers;
55
using System;
66

7+
using Log = LabApi.Features.Console.Logger;
8+
using HelpSense.API.Events;
9+
710
namespace HelpSense.Commands.ChatCommand
811
{
912
[CommandHandler(typeof(ClientCommandHandler))]
@@ -17,7 +20,7 @@ public class BcCommand : ICommand
1720

1821
public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
1922
{
20-
CommandTranslateConfig CommandTranslateConfig = Plugin.Instance.CommandTranslateConfig;
23+
CommandTranslateConfig CommandTranslateConfig = CustomEventHandler.CommandTranslateConfig;
2124
Player player;
2225

2326
if (sender is null || (player = Player.Get(sender)) is null)
@@ -26,7 +29,7 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
2629
return false;
2730
}
2831

29-
if (arguments.Count == 0 || player.IsMuted || !Plugin.Instance.Config.EnableChatSystem)
32+
if (arguments.Count == 0 || player.IsMuted || !CustomEventHandler.Config.EnableChatSystem)
3033
{
3134
response = CommandTranslateConfig.ChatCommandFailed;
3235
return false;

‎HelpSense/Commands/ChatCommand/CCommand.cs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
using CommandSystem;
22
using HelpSense.Helper.Chat;
33
using HelpSense.ConfigSystem;
4-
using PluginAPI.Core;
4+
using LabApi.Features.Wrappers;
55
using System;
66

7+
using Log = LabApi.Features.Console.Logger;
8+
using HelpSense.API.Events;
9+
710
namespace HelpSense.Commands.ChatCommand
811
{
912
[CommandHandler(typeof(ClientCommandHandler))]
@@ -17,7 +20,7 @@ public class CCommand : ICommand
1720

1821
public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
1922
{
20-
CommandTranslateConfig CommandTranslateConfig = Plugin.Instance.CommandTranslateConfig;
23+
CommandTranslateConfig CommandTranslateConfig = CustomEventHandler.CommandTranslateConfig;
2124
Player player;
2225

2326
if (sender is null || (player = Player.Get(sender)) is null)
@@ -26,7 +29,7 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
2629
return false;
2730
}
2831

29-
if (arguments.Count == 0 || player.IsMuted || !Plugin.Instance.Config.EnableChatSystem)
32+
if (arguments.Count == 0 || player.IsMuted || !CustomEventHandler.Config.EnableChatSystem)
3033
{
3134
response = CommandTranslateConfig.ChatCommandFailed;
3235
return false;

‎HelpSense/Commands/InfoCommand.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
using HelpSense.API.Serialization;
55
using HelpSense.ConfigSystem;
66
using PlayerRoles;
7-
using PluginAPI.Core;
7+
using LabApi.Features.Wrappers;
88
using System;
9+
using HelpSense.API.Events;
910

1011
namespace HelpSense.Commands
1112
{
@@ -21,15 +22,15 @@ public class InfoCommand : ICommand
2122
public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
2223
{
2324
Player player;
24-
CommandTranslateConfig CommandTranslateConfig = Plugin.Instance.CommandTranslateConfig;
25+
CommandTranslateConfig CommandTranslateConfig = CustomEventHandler.CommandTranslateConfig;
2526

2627
if (sender is null || (player = Player.Get(sender)) is null)
2728
{
2829
response = CommandTranslateConfig.InfoCommandFailed;
2930
return false;
3031
}
3132

32-
if (player.DoNotTrack || !Plugin.Instance.Config.SavePlayersInfo)
33+
if (player.DoNotTrack || !CustomEventHandler.Config.SavePlayersInfo)
3334
{
3435
response = CommandTranslateConfig.InfoCommandFailed;
3536
return false;

‎HelpSense/Commands/RescueCommand.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
using HelpSense.ConfigSystem;
33
using HelpSense.Helper;
44
using MEC;
5-
using PluginAPI.Core;
5+
using LabApi.Features.Wrappers;
66
using RelativePositioning;
77
using System;
88

9+
using Log = LabApi.Features.Console.Logger;
10+
using HelpSense.API.Events;
11+
912
namespace HelpSense.Commands
1013
{
1114
[CommandHandler(typeof(ClientCommandHandler))]
@@ -20,7 +23,7 @@ public class RescueCommand : ICommand
2023
public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
2124
{
2225
Player player;
23-
CommandTranslateConfig CommandTranslateConfig = Plugin.Instance.CommandTranslateConfig;
26+
CommandTranslateConfig CommandTranslateConfig = CustomEventHandler.CommandTranslateConfig;
2427

2528
if (sender is null || (player = Player.Get(sender)) is null)
2629
{

‎HelpSense/Commands/VersionCommand.cs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using CommandSystem;
2+
using HelpSense.API.Events;
23
using HelpSense.API.Features.Pool;
34
using HelpSense.ConfigSystem;
45
using System;
@@ -16,14 +17,14 @@ public class VersionCommand : ICommand
1617

1718
public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
1819
{
19-
var config = Plugin.Instance.Config;
20-
CommandTranslateConfig CommandTranslateConfig = Plugin.Instance.CommandTranslateConfig;
20+
var config = CustomEventHandler.Config;
21+
CommandTranslateConfig CommandTranslateConfig = CustomEventHandler.CommandTranslateConfig;
2122
var sb = StringBuilderPool.Pool.Get();
2223

2324
//Version and update time
24-
sb.AppendFormat(CommandTranslateConfig.VersionCommand["PluginVersion"], Plugin.PluginVersion).AppendLine();
25-
sb.AppendFormat(CommandTranslateConfig.VersionCommand["LastUpdateTime"], Plugin.LastUpdateTime).AppendLine();
26-
sb.AppendFormat(CommandTranslateConfig.VersionCommand["RequiredGameVersion"], Plugin.RequiredGameVersion).AppendLine();
25+
sb.AppendFormat(CommandTranslateConfig.VersionCommand["PluginVersion"], Plugins.Instance.Version).AppendLine();
26+
sb.AppendFormat(CommandTranslateConfig.VersionCommand["LastUpdateTime"], Plugins.LastUpdateTime).AppendLine();
27+
sb.AppendFormat(CommandTranslateConfig.VersionCommand["RequiredGameVersion"], Plugins.RequiredGameVersion).AppendLine();
2728

2829
//Function list
2930
sb.AppendLine(CommandTranslateConfig.VersionCommand["Text"]);
@@ -41,7 +42,7 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
4142
sb.AppendFormat(CommandTranslateConfig.VersionCommand["SCP2936"], BoolTranslate(config.SCP2936)).AppendLine();
4243
sb.AppendFormat(CommandTranslateConfig.VersionCommand["SCP1093"], BoolTranslate(config.SCP1093)).AppendLine();
4344
sb.AppendFormat(CommandTranslateConfig.VersionCommand["InfiniteAmmo"], BoolTranslate(config.InfiniteAmmo)).AppendLine();
44-
sb.AppendFormat(CommandTranslateConfig.VersionCommand["InfiniteAmmoType"], Plugin.Instance.Config.InfiniteAmmoType).AppendLine();
45+
sb.AppendFormat(CommandTranslateConfig.VersionCommand["InfiniteAmmoType"], CustomEventHandler.Config.InfiniteAmmoType).AppendLine();
4546

4647
//Copyright
4748
sb.AppendLine("-Made By X小左(XLittleLeft)-");

‎HelpSense/ConfigSystem/Config.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using HelpSense.Helper.Lobby;
22
using PlayerRoles;
3-
using PluginAPI.Helpers;
43
using System;
54
using System.Collections.Generic;
65
using System.ComponentModel;
76
using System.IO;
7+
using LabApi.Loader.Features.Paths;
88

99
namespace HelpSense.ConfigSystem
1010
{
@@ -15,7 +15,7 @@ public class Config
1515
[Description("玩家信息储存")]
1616
public bool SavePlayersInfo { get; set; } = true;
1717
[Description("保存位置")]
18-
public string SavePath { get; set; } = Path.Combine(Paths.Configs ?? Environment.CurrentDirectory, @"HelpSense_玩家信息储存.Database");
18+
public string SavePath { get; set; } = Path.Combine(PathManager.Configs.FullName ?? Environment.CurrentDirectory, @"HelpSense_玩家信息储存.Database");
1919
[Description("是否打开开局给D级人员一张卡")]
2020
public bool EnableRoundSupplies { get; set; } = true;
2121
[Description("给D级人员什么卡？")]
@@ -170,8 +170,6 @@ public class Config
170170
public bool AdminLogShow { get; set; } = false;
171171
[Description("记录管理日志地址")]
172172
public string AdminLogPath { get; set; } = $"{Environment.GetFolderPath(Environment.SpecialFolder.Desktop)}\\管理记录.txt";
173-
[Description("隐藏教程角色")]
174-
public bool HideTutorials { get; set; } = false;
175173
[Description("自救指令")]
176174
public bool ZiJiuCommand { get; set; } = true;
177175

0 commit comments

Comments
 (0)