Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added custom server commands #67

Merged
merged 6 commits into from
Mar 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CS2-SimpleAdmin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
public override string ModuleName => "CS2-SimpleAdmin";
public override string ModuleDescription => "Simple admin plugin for Counter-Strike 2 :)";
public override string ModuleAuthor => "daffyy & Dliix66";
public override string ModuleVersion => "1.3.3a";
public override string ModuleVersion => "1.3.4a";

public CS2_SimpleAdminConfig Config { get; set; } = new();

Expand Down
15 changes: 14 additions & 1 deletion Config.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,19 @@ public class Discord
public string DiscordPenaltyWebhook { get; set; } = "";
}

public class CustomServerCommandData
{
[JsonPropertyName("Flag")]
public string Flag { get; set; } = "@css/generic";
[JsonPropertyName("DisplayName")]
public string DisplayName { get; set; } = "";
[JsonPropertyName("Command")]
public string Command { get; set; } = "";
}

public class CS2_SimpleAdminConfig : BasePluginConfig
{
public override int Version { get; set; } = 6;
[JsonPropertyName("ConfigVersion")] public override int Version { get; set; } = 7;

[JsonPropertyName("DatabaseHost")]
public string DatabaseHost { get; set; } = "";
Expand Down Expand Up @@ -54,5 +64,8 @@ public class CS2_SimpleAdminConfig : BasePluginConfig

[JsonPropertyName("WorkshopMaps")]
public List<string> WorkshopMaps { get; set; } = new List<string>();

[JsonPropertyName("CustomServerCommands")]
public List<CustomServerCommandData> CustomServerCommands { get; set; } = new List<CustomServerCommandData>();
}
}
16 changes: 15 additions & 1 deletion Menus/ManageServerMenu.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using CounterStrikeSharp.API;
using CounterStrikeSharp.API.Core;
using CounterStrikeSharp.API.Modules.Admin;
using CounterStrikeSharp.API.Modules.Menu;
Expand Down Expand Up @@ -34,6 +35,19 @@ public static void OpenMenu(CCSPlayerController admin)

options.Add(new ChatMenuOptionData("Restart Game", () => CS2_SimpleAdmin.RestartGame(admin)));

List<CustomServerCommandData> customCommands = CS2_SimpleAdmin.Instance.Config.CustomServerCommands;
foreach (CustomServerCommandData customCommand in customCommands)
{
if (string.IsNullOrEmpty(customCommand.DisplayName) || string.IsNullOrEmpty(customCommand.Command))
continue;

bool hasRights = AdminManager.PlayerHasPermissions(admin, customCommand.Flag);
if (!hasRights)
continue;

options.Add(new ChatMenuOptionData(customCommand.DisplayName, () => Server.ExecuteCommand(customCommand.Command)));
}

foreach (ChatMenuOptionData menuOptionData in options)
{
string menuName = menuOptionData.name;
Expand All @@ -48,7 +62,7 @@ public static void ChangeMapMenu(CCSPlayerController admin)
BaseMenu menu = AdminMenu.CreateMenu($"Change Map");
List<ChatMenuOptionData> options = new();

List<string> maps = CS2_SimpleAdmin.Instance.Config.DefaultMaps;//Server.GetMapList();
List<string> maps = CS2_SimpleAdmin.Instance.Config.DefaultMaps;
foreach (string map in maps)
{
options.Add(new ChatMenuOptionData(map, () => ExecuteChangeMap(admin, map, false)));
Expand Down
Loading