Merge pull request #311 from daffyyyy/main

2.6a

.github/workflows/build.yml

@@ -58,14 +58,8 @@ jobs:
           ${{ env.OUTPUT_PATH }}/McMaster.NETCore.Plugins.dll \
           ${{ env.OUTPUT_PATH }}/Microsoft.DotNet.PlatformAbstractions.dll \
           ${{ env.OUTPUT_PATH }}/Microsoft.Extensions.DependencyModel.dll \
-    - name: Copy skins.json
-      run: cp website/data/skins.json ${{ env.OUTPUT_PATH }}/skins.json
-    - name: Copy gloves.json
-      run: cp website/data/gloves.json ${{ env.OUTPUT_PATH }}/gloves.json
-    - name: Copy agents.json
-      run: cp website/data/agents.json ${{ env.OUTPUT_PATH }}/agents.json
-    - name: Copy music.json
-      run: cp website/data/music.json ${{ env.OUTPUT_PATH }}/music.json
+    - name: Copy skins
+      run: cp -R website/data ${{ env.OUTPUT_PATH }}
     - name: Zip
       run: zip -r "${{ env.PROJECT_NAME }}.zip" "${{ env.OUTPUT_PATH }}" gamedata/
     - name: Clean files Website

Config.cs

@@ -27,28 +27,28 @@ public class Additional
 		public bool CommandKillEnabled { get; set; } = true;
 
 		[JsonPropertyName("CommandKnife")]
-		public string CommandKnife { get; set; } = "knife";
+		public List<string> CommandKnife { get; set; } = ["knife"];
 
 		[JsonPropertyName("CommandMusic")]
-		public string CommandMusic { get; set; } = "music";
+		public List<string> CommandMusic { get; set; } = ["music"];
 
 		[JsonPropertyName("CommandGlove")]
-		public string CommandGlove { get; set; } = "gloves";
+		public List<string> CommandGlove { get; set; } = ["gloves"];
 
 		[JsonPropertyName("CommandAgent")]
-		public string CommandAgent { get; set; } = "agents";
+		public List<string> CommandAgent { get; set; } = ["agents"];
 
 		[JsonPropertyName("CommandSkin")]
-		public string CommandSkin { get; set; } = "ws";
+		public List<string> CommandSkin { get; set; } = ["ws"];
 
 		[JsonPropertyName("CommandSkinSelection")]
-		public string CommandSkinSelection { get; set; } = "skins";
+		public List<string> CommandSkinSelection { get; set; } = ["skins"];
 
 		[JsonPropertyName("CommandRefresh")]
-		public string CommandRefresh { get; set; } = "wp";
+		public List<string> CommandRefresh { get; set; } = ["wp"];
 
 		[JsonPropertyName("CommandKill")]
-		public string CommandKill { get; set; } = "kill";
+		public List<string> CommandKill { get; set; } = ["kill"];
 
 		[JsonPropertyName("GiveRandomKnife")]
 		public bool GiveRandomKnife { get; set; } = false;
@@ -62,7 +62,10 @@ public class Additional
 
 	public class WeaponPaintsConfig : BasePluginConfig
 	{
-		public override int Version { get; set; } = 6;
+        [JsonPropertyName("ConfigVersion")] public override int Version { get; set; } = 7;
+
+        [JsonPropertyName("SkinsLanguage")]
+		public string SkinsLanguage { get; set; } = "en";
 
 		[JsonPropertyName("DatabaseHost")]
 		public string DatabaseHost { get; set; } = "";
@@ -80,15 +83,12 @@ public class WeaponPaintsConfig : BasePluginConfig
 		public string DatabaseName { get; set; } = "";
 
 		[JsonPropertyName("CmdRefreshCooldownSeconds")]
-		public int CmdRefreshCooldownSeconds { get; set; } = 60;
-
-		[JsonPropertyName("Prefix")]
-		public string Prefix { get; set; } = "[WeaponPaints]";
+		public int CmdRefreshCooldownSeconds { get; set; } = 10;
 
 		[JsonPropertyName("Website")]
 		public string Website { get; set; } = "example.com/skins";
 
-		[JsonPropertyName("Additional")]
+		[JsonPropertyName("Additionalss")]
 		public Additional Additional { get; set; } = new();
 	}
 }

Database.cs

@@ -5,13 +5,11 @@ namespace WeaponPaints
 {
 	public class Database(string dbConnectionString)
 	{
-		private readonly string _dbConnectionString = dbConnectionString;
-
 		public async Task<MySqlConnection> GetConnectionAsync()
 		{
 			try
 			{
-				var connection = new MySqlConnection(_dbConnectionString);
+				var connection = new MySqlConnection(dbConnectionString);
 				await connection.OpenAsync();
 				return connection;
 			}

Events.cs

@@ -16,9 +16,9 @@ public HookResult OnClientFullConnect(EventPlayerConnectFull @event, GameEventIn
 			CCSPlayerController? player = @event.Userid;
 
 			if (player is null || !player.IsValid || player.IsBot ||
-				weaponSync == null || _database == null) return HookResult.Continue;
+				WeaponSync == null || Database == null) return HookResult.Continue;
 
-			PlayerInfo playerInfo = new PlayerInfo
+			var playerInfo = new PlayerInfo
 			{
 				UserId = player.UserId,
 				Slot = player.Slot,
@@ -30,7 +30,7 @@ public HookResult OnClientFullConnect(EventPlayerConnectFull @event, GameEventIn
 
 			try
 			{
-				_ = Task.Run(async () => await weaponSync.GetPlayerData(playerInfo));
+				_ = Task.Run(async () => await WeaponSync.GetPlayerData(playerInfo));
 				/*
 				if (Config.Additional.SkinEnabled)
 				{
@@ -70,28 +70,28 @@ public HookResult OnPlayerDisconnect(EventPlayerDisconnect @event, GameEventInfo
 
 			if (Config.Additional.SkinEnabled)
 			{
-				gPlayerWeaponsInfo.TryRemove(player.Slot, out _);
+				GPlayerWeaponsInfo.TryRemove(player.Slot, out _);
 			}
 			if (Config.Additional.KnifeEnabled)
 			{
-				g_playersKnife.TryRemove(player.Slot, out _);
+				GPlayersKnife.TryRemove(player.Slot, out _);
 			}
 			if (Config.Additional.GloveEnabled)
 			{
-				g_playersGlove.TryRemove(player.Slot, out _);
+				GPlayersGlove.TryRemove(player.Slot, out _);
 			}
 			if (Config.Additional.AgentEnabled)
 			{
-				g_playersAgent.TryRemove(player.Slot, out _);
+				GPlayersAgent.TryRemove(player.Slot, out _);
 			}
 			if (Config.Additional.MusicEnabled)
 			{
-				g_playersMusic.TryRemove(player.Slot, out _);
+				GPlayersMusic.TryRemove(player.Slot, out _);
 			}
 
-			temporaryPlayerWeaponWear.TryRemove(player.Slot, out _);
+			_temporaryPlayerWeaponWear.TryRemove(player.Slot, out _);
 
-			commandsCooldown.Remove(player.Slot);
+			CommandsCooldown.Remove(player.Slot);
 
 			return HookResult.Continue;
 		}
@@ -100,8 +100,8 @@ private void OnMapStart(string mapName)
 		{
 			if (Config.Additional is { KnifeEnabled: false, SkinEnabled: false, GloveEnabled: false }) return;
 
-			if (_database != null)
-				weaponSync = new WeaponSynchronization(_database, Config);
+			if (Database != null)
+				WeaponSync = new WeaponSynchronization(Database, Config);
 		}
 
 		private HookResult OnPlayerSpawn(EventPlayerSpawn @event, GameEventInfo info)
@@ -116,8 +116,6 @@ private HookResult OnPlayerSpawn(EventPlayerSpawn @event, GameEventInfo info)
 			if (pawn == null || !pawn.IsValid)
 				return HookResult.Continue;
 
-			g_knifePickupCount[player.Slot] = 0;
-
 			GivePlayerMusicKit(player);
 			GivePlayerAgent(player);
 			GivePlayerGloves(player);
@@ -127,14 +125,14 @@ private HookResult OnPlayerSpawn(EventPlayerSpawn @event, GameEventInfo info)
 
 		private HookResult OnRoundEnd(EventRoundEnd @event, GameEventInfo info)
 		{
-			g_bCommandsAllowed = false;
+			_gBCommandsAllowed = false;
 
 			return HookResult.Continue;
 		}
 
 		private HookResult OnRoundStart(EventRoundStart @event, GameEventInfo info)
 		{
-			g_bCommandsAllowed = true;
+			_gBCommandsAllowed = true;
 			return HookResult.Continue;
 		}
 
@@ -169,16 +167,16 @@ public void OnEntityCreated(CEntityInstance entity)
 
 					try
 					{
-						SteamID? _steamid = null;
+						SteamID? steamid = null;
 
 						if (weapon.OriginalOwnerXuidLow > 0)
-							_steamid = new(weapon.OriginalOwnerXuidLow);
+							steamid = new SteamID(weapon.OriginalOwnerXuidLow);
 
-						CCSPlayerController? player = null;
+						CCSPlayerController? player;
 
-						if (_steamid != null && _steamid.IsValid())
+						if (steamid != null && steamid.IsValid())
 						{
-							player = Utilities.GetPlayers().FirstOrDefault(p => p.IsValid && p.SteamID == _steamid.SteamId64);
+							player = Utilities.GetPlayers().FirstOrDefault(p => p.IsValid && p.SteamID == steamid.SteamId64);
 
 							if (player == null)
 								player = Utilities.GetPlayerFromSteamId(weapon.OriginalOwnerXuidLow);
@@ -196,7 +194,6 @@ public void OnEntityCreated(CEntityInstance entity)
 					}
 					catch (Exception)
 					{
-						return;
 					}
 				});
 			}
@@ -213,7 +210,7 @@ private void OnTick()
 							)
 				)
 			{
-				if (PlayerWeaponImage.TryGetValue(player.Slot, out var value) && !string.IsNullOrEmpty(value))
+				if (_playerWeaponImage.TryGetValue(player.Slot, out var value) && !string.IsNullOrEmpty(value))
 				{
 					player.PrintToCenterHtml("<img src='{PATH}'</img>".Replace("{PATH}", value));
 				}

README.md

@@ -19,6 +19,14 @@ Unfinished, unoptimized and not fully functional ugly demo weapon paints plugin
 - Added command **`!agents`** to show menu with agents
 - Translations support, submit a PR if you want to share your translation
 
+## ⚙️ Requirements
+**Ensure all the following dependencies are installed before proceeding**
+- [CounterStrikeSharp](https://github.com/roflmuffin/CounterStrikeSharp)
+- [PlayerSettings](https://github.com/NickFox007/PlayerSettingsCS2) - Required by MenuManagerCS2
+- [AnyBaseLibCS2](https://github.com/NickFox007/AnyBaseLibCS2) - Required by PlayerSettings
+- [MenuManagerCS2](https://github.com/NickFox007/MenuManagerCS2)
+- MySQL database
+
 ## CS2 Server
 - Have working CounterStrikeSharp (**with RUNTIME!**)
 - Download from Release and copy plugin to plugins
@@ -66,9 +74,7 @@ Unfinished, unoptimized and not fully functional ugly demo weapon paints plugin
 	"GiveRandomKnife": false,  // Give random knife to players if they didn't choose
 	"GiveRandomSkins": false  // Give random skins to players if they didn't choose
 },
-
-"ConfigVersion": 4  // Don't touch
-}</pre></code>
+</pre></code>
 </details>
 
 ## Web install

Utility.cs

@@ -13,11 +13,11 @@ internal static class Utility
 
 		internal static async Task CheckDatabaseTables()
 		{
-			if (WeaponPaints._database is null) return;
+			if (WeaponPaints.Database is null) return;
 
 			try
 			{
-				await using var connection = await WeaponPaints._database.GetConnectionAsync();
+				await using var connection = await WeaponPaints.Database.GetConnectionAsync();
 
 				await using var transaction = await connection.BeginTransactionAsync();
 
@@ -91,7 +91,7 @@ internal static async Task CheckDatabaseTables()
 
 		internal static bool IsPlayerValid(CCSPlayerController? player)
 		{
-			if (player is null || WeaponPaints.weaponSync is null) return false;
+			if (player is null || WeaponPaints.WeaponSync is null) return false;
 
 			return player is { IsValid: true, IsBot: false, IsHLTV: false, UserId: not null };
 		}
@@ -102,7 +102,7 @@ internal static void LoadSkinsFromFile(string filePath, ILogger logger)
 			try
 			{
 				var deserializedSkins = JsonConvert.DeserializeObject<List<JObject>>(json);
-				WeaponPaints.skinsList = deserializedSkins ?? [];
+				WeaponPaints.SkinsList = deserializedSkins ?? [];
 			}
 			catch (FileNotFoundException)
 			{
@@ -116,7 +116,7 @@ internal static void LoadGlovesFromFile(string filePath, ILogger logger)
 			{
 				var json = File.ReadAllText(filePath);
 				var deserializedSkins = JsonConvert.DeserializeObject<List<JObject>>(json);
-				WeaponPaints.glovesList = deserializedSkins ?? [];
+				WeaponPaints.GlovesList = deserializedSkins ?? [];
 			}
 			catch (FileNotFoundException)
 			{
@@ -130,7 +130,7 @@ internal static void LoadAgentsFromFile(string filePath, ILogger logger)
 			{
 				var json = File.ReadAllText(filePath);
 				var deserializedSkins = JsonConvert.DeserializeObject<List<JObject>>(json);
-				WeaponPaints.agentsList = deserializedSkins ?? [];
+				WeaponPaints.AgentsList = deserializedSkins ?? [];
 			}
 			catch (FileNotFoundException)
 			{
@@ -144,7 +144,7 @@ internal static void LoadMusicFromFile(string filePath, ILogger logger)
 			{
 				var json = File.ReadAllText(filePath);
 				var deserializedSkins = JsonConvert.DeserializeObject<List<JObject>>(json);
-				WeaponPaints.musicList = deserializedSkins ?? [];
+				WeaponPaints.MusicList = deserializedSkins ?? [];
 			}
 			catch (FileNotFoundException)
 			{

VERSION

@@ -1 +1 @@
-2.5a
+2.6a