From 4b38e186270c6b07e293d8895316173e33302d0c Mon Sep 17 00:00:00 2001 From: schwarper <75811921+schwarper@users.noreply.github.com> Date: Mon, 10 Jun 2024 21:44:50 +0300 Subject: [PATCH] Database api added --- Store/src/api/api.cs | 5 +++++ .../src/menu/WASDMenu/Classes/WasdMenuPlayer.cs | 1 - Store/src/menu/menu.cs | 16 +++++++--------- StoreApi/IStoreApi.cs | 1 + 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Store/src/api/api.cs b/Store/src/api/api.cs index 8598238..8ce27d4 100644 --- a/Store/src/api/api.cs +++ b/Store/src/api/api.cs @@ -11,6 +11,11 @@ public StoreAPI() { } + public string GetDatabaseString() + { + return Database.GlobalDatabaseConnectionString; + } + public int GetPlayerCredits(CCSPlayerController player) { return Credits.Get(player); diff --git a/Store/src/menu/WASDMenu/Classes/WasdMenuPlayer.cs b/Store/src/menu/WASDMenu/Classes/WasdMenuPlayer.cs index 9dd68b7..990ec56 100644 --- a/Store/src/menu/WASDMenu/Classes/WasdMenuPlayer.cs +++ b/Store/src/menu/WASDMenu/Classes/WasdMenuPlayer.cs @@ -1,6 +1,5 @@ using CounterStrikeSharp.API; using CounterStrikeSharp.API.Core; -using Microsoft.Extensions.Localization; using System.Text; using static Store.Store; diff --git a/Store/src/menu/menu.cs b/Store/src/menu/menu.cs index b0ff090..0f674aa 100644 --- a/Store/src/menu/menu.cs +++ b/Store/src/menu/menu.cs @@ -1,8 +1,6 @@ using CounterStrikeSharp.API; using CounterStrikeSharp.API.Core; -using CounterStrikeSharp.API.Core.Capabilities; using CounterStrikeSharp.API.Core.Translations; -using CounterStrikeSharp.API.Modules.Menu; using System.Globalization; using System.Text; using static CounterStrikeSharp.API.Core.Listeners; @@ -19,7 +17,7 @@ public static void SetSettings(bool hotReload) { Instance.RegisterEventHandler((@event, info) => { - var player = @event.Userid; + CCSPlayerController? player = @event.Userid; if (player == null) { @@ -37,7 +35,7 @@ public static void SetSettings(bool hotReload) Instance.RegisterEventHandler((@event, info) => { - var player = @event.Userid; + CCSPlayerController? player = @event.Userid; if (player == null) { @@ -82,7 +80,7 @@ public static void DisplayStore(CCSPlayerController player, bool inventory) StringBuilder builder = new(); builder.AppendFormat(Instance.Localizer["menu_store", Credits.Get(player)]); - var menu = WasdManager.CreateMenu(builder.ToString()); + IWasdMenu menu = WasdManager.CreateMenu(builder.ToString()); foreach (KeyValuePair<string, Dictionary<string, Dictionary<string, string>>> category in Instance.Config.Items) { @@ -110,8 +108,8 @@ public static void DisplayItems(CCSPlayerController player, string key, Dictiona if (playerSkinItems.Count != 0) { - var menu = WasdManager.CreateMenu(key); - if(prev != null) + IWasdMenu menu = WasdManager.CreateMenu(key); + if (prev != null) menu.Prev = prev.Parent?.Options?.Find(prev); foreach (int Slot in new[] { 2, 3 }) @@ -143,7 +141,7 @@ public static void DisplayItems(CCSPlayerController player, string key, Dictiona public static void DisplayItem(CCSPlayerController player, bool inventory, string key, Dictionary<string, Dictionary<string, string>> items, IWasdMenuOption? prev = null) { - var menu = WasdManager.CreateMenu(key); + IWasdMenu menu = WasdManager.CreateMenu(key); if (prev != null) menu.Prev = prev.Parent?.Options?.Find(prev); @@ -190,7 +188,7 @@ public static void DisplayItem(CCSPlayerController player, bool inventory, strin public static void DisplayItemOption(CCSPlayerController player, Dictionary<string, string> item, IWasdMenuOption? prev = null) { - var menu = WasdManager.CreateMenu(item["name"]); + IWasdMenu menu = WasdManager.CreateMenu(item["name"]); if (prev != null) menu.Prev = prev.Parent?.Options?.Find(prev); diff --git a/StoreApi/IStoreApi.cs b/StoreApi/IStoreApi.cs index b130700..575112d 100644 --- a/StoreApi/IStoreApi.cs +++ b/StoreApi/IStoreApi.cs @@ -9,6 +9,7 @@ public interface IStoreApi { public static readonly PluginCapability<IStoreApi?> Capability = new("store:api"); + public string GetDatabaseString(); public int GetPlayerCredits(CCSPlayerController player); public int SetPlayerCredits(CCSPlayerController player, int credits); public int GetPlayerOriginalCredits(CCSPlayerController player);