Merge pull request #91 from exababy/patch-1

Wear & Seed Support
Merge pull request #96 from snowhp/main
2026-02-18 02:41:54 +00:00 · 2023-12-13 19:22:20 +01:00 · 2023-12-13 08:28:33 +01:00 · 2023-12-13 08:27:23 +01:00 · 2023-12-13 08:26:35 +01:00 · 2023-12-12 23:02:44 +00:00
18 changed files with 363 additions and 121 deletions
--- a/Commands.cs
+++ b/Commands.cs
@@ -1,7 +1,5 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Commands;
-using CounterStrikeSharp.API.Modules.Entities.Constants;
-using CounterStrikeSharp.API.Modules.Memory;
 using CounterStrikeSharp.API.Modules.Menu;

 namespace WeaponPaints
@@ -12,7 +10,6 @@ namespace WeaponPaints
 		{
 			if (!Config.Additional.CommandWpEnabled || !Config.Additional.SkinEnabled || !g_bCommandsAllowed) return;
 			if (!Utility.IsPlayerValid(player)) return;
-			string temp = "";
 			if (player == null || player.Index <= 0) return;
 			int playerIndex = (int)player!.Index;

@@ -37,17 +34,15 @@ namespace WeaponPaints

 					RefreshWeapons(player);
 				}
-				if (!string.IsNullOrEmpty(Config.Messages.SuccessRefreshCommand))
+				if (!string.IsNullOrEmpty(Localizer["wp_command_refresh_done"]))
 				{
-					temp = $" {Config.Prefix} {Config.Messages.SuccessRefreshCommand}";
-					player!.PrintToChat(Utility.ReplaceTags(temp));
+					player!.Print(Localizer["wp_command_refresh_done"]);
 				}
 				return;
 			}
-			if (!string.IsNullOrEmpty(Config.Messages.CooldownRefreshCommand))
+			if (!string.IsNullOrEmpty(Localizer["wp_command_cooldown"]))
 			{
-				temp = $" {Config.Prefix} {Config.Messages.CooldownRefreshCommand}";
-				player!.PrintToChat(Utility.ReplaceTags(temp));
+				player!.Print(Localizer["wp_command_cooldown"]);
 			}
 		}

@@ -56,22 +51,18 @@ namespace WeaponPaints
 			if (!Config.Additional.SkinEnabled) return;
 			if (!Utility.IsPlayerValid(player)) return;

-			string temp;
-			if (!string.IsNullOrEmpty(Config.Messages.WebsiteMessageCommand))
+			if (!string.IsNullOrEmpty(Localizer["wp_info_website"]))
 			{
-				temp = $" {Config.Prefix} {Config.Messages.WebsiteMessageCommand}";
-				player!.PrintToChat(Utility.ReplaceTags(temp));
+				player!.Print(Localizer["wp_info_website", Config.Website]);
 			}
-			if (!string.IsNullOrEmpty(Config.Messages.SynchronizeMessageCommand))
+			if (!string.IsNullOrEmpty(Localizer["wp_info_refresh"]))
 			{
-				temp = $" {Config.Prefix} {Config.Messages.SynchronizeMessageCommand}";
-				player!.PrintToChat(Utility.ReplaceTags(temp));
+				player!.Print(Localizer["wp_info_refresh"]);
 			}
 			if (!Config.Additional.KnifeEnabled) return;
-			if (!string.IsNullOrEmpty(Config.Messages.KnifeMessageCommand))
+			if (!string.IsNullOrEmpty(Localizer["wp_info_knife"]))
 			{
-				temp = $" {Config.Prefix} {Config.Messages.KnifeMessageCommand}";
-				player!.PrintToChat(Utility.ReplaceTags(temp));
+				player!.Print(Localizer["wp_info_knife"]);
 			}
 		}

@@ -106,7 +97,7 @@ namespace WeaponPaints
 				.Where(pair => pair.Key.StartsWith("weapon_knife") || pair.Key.StartsWith("weapon_bayonet"))
 				.ToDictionary(pair => pair.Key, pair => pair.Value);

-			var giveItemMenu = new ChatMenu(Utility.ReplaceTags($" {Config.Messages.KnifeMenuTitle}"));
+			var giveItemMenu = new ChatMenu(Localizer["wp_knife_menu_title"]);
 			var handleGive = (CCSPlayerController? player, ChatMenuOption option) =>
 			{
 				if (Utility.IsPlayerValid(player))
@@ -116,18 +107,14 @@ namespace WeaponPaints
 					var knifeKey = knivesOnly.FirstOrDefault(x => x.Value == knifeName).Key;
 					if (!string.IsNullOrEmpty(knifeKey))
 					{
-						string temp = "";
-
-						if (!string.IsNullOrEmpty(Config.Messages.ChosenKnifeMenu))
+						if (!string.IsNullOrEmpty(Localizer["wp_knife_menu_select"]))
 						{
-							temp = $" {Config.Prefix} {Config.Messages.ChosenKnifeMenu}".Replace("{KNIFE}", knifeName);
-							player!.PrintToChat(Utility.ReplaceTags(temp));
+							player!.Print(Localizer["wp_knife_menu_select", knifeName]);
 						}

-						if (!string.IsNullOrEmpty(Config.Messages.ChosenKnifeMenuKill) && Config.Additional.CommandKillEnabled)
+						if (!string.IsNullOrEmpty(Localizer["wp_knife_menu_kill"]) && Config.Additional.CommandKillEnabled)
 						{
-							temp = $" {Config.Prefix} {Config.Messages.ChosenKnifeMenuKill}";
-							player!.PrintToChat(Utility.ReplaceTags(temp));
+							player!.Print(Localizer["wp_knife_menu_kill"]);
 						}

 						PlayerInfo playerInfo = new PlayerInfo
@@ -166,10 +153,9 @@ namespace WeaponPaints
 					ChatMenus.OpenMenu(player, giveItemMenu);
 					return;
 				}
-				if (!string.IsNullOrEmpty(Config.Messages.CooldownRefreshCommand))
+				if (!string.IsNullOrEmpty(Localizer["wp_command_cooldown"]))
 				{
-					string temp = $" {Config.Prefix} {Config.Messages.CooldownRefreshCommand}";
-					player.PrintToChat(Utility.ReplaceTags(temp));
+					player!.Print(Localizer["wp_command_cooldown"]);
 				}
 			});
 		}
@@ -177,7 +163,7 @@ namespace WeaponPaints
 		private void SetupSkinsMenu()
 		{
 			var classNamesByWeapon = weaponList.ToDictionary(kvp => kvp.Value, kvp => kvp.Key);
-			var weaponSelectionMenu = new ChatMenu(Utility.ReplaceTags($" {Config.Messages.WeaponMenuTitle}"));
+			var weaponSelectionMenu = new ChatMenu(Localizer["wp_skin_menu_weapon_title"]);

 			// Function to handle skin selection for a specific weapon
 			var handleWeaponSelection = (CCSPlayerController? player, ChatMenuOption option) =>
@@ -195,7 +181,7 @@ namespace WeaponPaints
 					weaponName?.ToString() == selectedWeaponClassname
 				)?.ToList();

-					var skinSubMenu = new ChatMenu(Utility.ReplaceTags($" {Config.Messages.SkinMenuTitle}").Replace("{WEAPON}", selectedWeapon));
+					var skinSubMenu = new ChatMenu(Localizer["wp_skin_menu_skin_title", selectedWeapon]);

 					// Function to handle skin selection for the chosen weapon
 					var handleSkinSelection = (CCSPlayerController? p, ChatMenuOption opt) =>
@@ -224,8 +210,7 @@ namespace WeaponPaints
 							int.TryParse(weaponDefIndexObj.ToString(), out var weaponDefIndex) &&
 							int.TryParse(selectedPaintID, out var paintID))
 						{
-							string temp = $" {Config.Prefix} {Config.Messages.ChosenSkinMenu}".Replace("{SKIN}", selectedSkin);
-							p.PrintToChat(Utility.ReplaceTags(temp));
+							p!.Print(Localizer["f", selectedSkin]);

 							if (!gPlayerWeaponsInfo[playerIndex].ContainsKey(weaponDefIndex))
 							{
@@ -294,10 +279,9 @@ namespace WeaponPaints
 					ChatMenus.OpenMenu(player, weaponSelectionMenu);
 					return;
 				}
-				if (!string.IsNullOrEmpty(Config.Messages.CooldownRefreshCommand))
+				if (!string.IsNullOrEmpty(Localizer["wp_command_cooldown"]))
 				{
-					string temp = $"{Config.Prefix} {Config.Messages.CooldownRefreshCommand}";
-					player.PrintToChat(Utility.ReplaceTags(temp));
+					player!.Print(Localizer["wp_command_cooldown"]);
 				}
 			});
 		}
--- a/Config.cs
+++ b/Config.cs
@@ -3,32 +3,6 @@ using System.Text.Json.Serialization;

 namespace WeaponPaints
 {
-	public class Messages
-	{
-		[JsonPropertyName("WebsiteMessageCommand")]
-		public string WebsiteMessageCommand { get; set; } = "Visit {WEBSITE} where you can change skins.";
-		[JsonPropertyName("SynchronizeMessageCommand")]
-		public string SynchronizeMessageCommand { get; set; } = "Type !wp to synchronize chosen skins.";
-		[JsonPropertyName("KnifeMessageCommand")]
-		public string KnifeMessageCommand { get; set; } = "Type !knife to open knife menu.";
-		[JsonPropertyName("CooldownRefreshCommand")]
-		public string CooldownRefreshCommand { get; set; } = "You can't refresh weapon paints right now.";
-		[JsonPropertyName("SuccessRefreshCommand")]
-		public string SuccessRefreshCommand { get; set; } = "Refreshing weapon paints.";
-		[JsonPropertyName("ChosenKnifeMenu")]
-		public string ChosenKnifeMenu { get; set; } = "You have chosen {KNIFE} as your knife.";
-		[JsonPropertyName("ChosenSkinMenu")]
-		public string ChosenSkinMenu { get; set; } = "You have chosen {SKIN} as your skin.";
-		[JsonPropertyName("ChosenKnifeMenuKill")]
-		public string ChosenKnifeMenuKill { get; set; } = "To correctly apply skin for knife, you need to type !kill.";
-		[JsonPropertyName("KnifeMenuTitle")]
-		public string KnifeMenuTitle { get; set; } = "Knife Menu.";
-		[JsonPropertyName("WeaponMenuTitle")]
-		public string WeaponMenuTitle { get; set; } = "Weapon Menu.";
-		[JsonPropertyName("SkinMenuTitle")]
-		public string SkinMenuTitle { get; set; } = "Select skin for {WEAPON}";
-	}
-
 	public class Additional
 	{
 		[JsonPropertyName("SkinVisibilityFix")]
@@ -66,6 +40,8 @@ namespace WeaponPaints

 		[JsonPropertyName("GiveRandomSkin")]
 		public bool GiveRandomSkin { get; set; } = false;
+		[JsonPropertyName("GiveKnifeAfterRemove")]
+		public bool GiveKnifeAfterRemove { get; set; } = false;
 	}

 	public class WeaponPaintsConfig : BasePluginConfig
@@ -99,9 +75,6 @@ namespace WeaponPaints
 		[JsonPropertyName("Website")]
 		public string Website { get; set; } = "example.com/skins";

-		[JsonPropertyName("Messages")]
-		public Messages Messages { get; set; } = new Messages();
-
 		[JsonPropertyName("Additional")]
 		public Additional Additional { get; set; } = new Additional();
 	}
--- a/Events.cs
+++ b/Events.cs
@@ -45,7 +45,7 @@ namespace WeaponPaints
 				gPlayerWeaponsInfo.Remove((int)player.Index);
 		}

-		private void OnEntitySpawned(CEntityInstance entity)
+		private void OnEntityCreated(CEntityInstance entity)
 		{
 			if (!Config.Additional.SkinEnabled) return;
 			var designerName = entity.DesignerName;
@@ -57,6 +57,7 @@ namespace WeaponPaints
 			{
 				isKnife = true;
 			}
+
 			Server.NextFrame(() =>
 			{
 				try
@@ -94,22 +95,65 @@ namespace WeaponPaints
 		{
 			if (@event.Defindex == 42 || @event.Defindex == 59)
 			{
+				Server.PrintToChatAll("test1");
+
 				CCSPlayerController? player = @event.Userid;
-				if (!Utility.IsPlayerValid(player) || !player.PawnIsAlive || g_knifePickupCount[(int)player.Index] >= 1) return HookResult.Continue;
+				if (player == null || !player.IsValid || !g_knifePickupCount.ContainsKey((int)player.Index) || player.IsBot || !g_playersKnife.ContainsKey((int)player.Index))
+					return HookResult.Continue;
+
+				Server.PrintToChatAll("test2");
+
+
+				if (g_knifePickupCount[(int)player.Index] >= 2) return HookResult.Continue;
+				Server.PrintToChatAll("test3");
+

 				if (g_playersKnife.ContainsKey((int)player.Index)
 					&&
 				   g_playersKnife[(int)player.Index] != "weapon_knife")
 				{
+					Server.PrintToChatAll("usuwam noz");
 					g_knifePickupCount[(int)player.Index]++;

 					RemovePlayerKnife(player, true);
-					AddTimer(0.3f, () => GiveKnifeToPlayer(player));
+
+					if (!PlayerHasKnife(player) && Config.Additional.GiveKnifeAfterRemove)
+						AddTimer(0.3f, () => GiveKnifeToPlayer(player));
 				}
 			}
 			return HookResult.Continue;
 		}

+		public HookResult OnPickup(CEntityIOOutput output, string name, CEntityInstance activator, CEntityInstance caller, CVariant value, float delay)
+		{
+			CCSPlayerController? player = Utilities.GetEntityFromIndex<CCSPlayerPawn>((int)activator.Index).OriginalController.Value;
+
+			if (player == null || player.IsBot || player.IsHLTV)
+				return HookResult.Continue;
+
+			if (player == null || !player.IsValid || player.AuthorizedSteamID == null ||
+				!g_knifePickupCount.ContainsKey((int)player.Index) || !g_playersKnife.ContainsKey((int)player.Index))
+				return HookResult.Continue;
+
+			CBasePlayerWeapon weapon = new(caller.Handle);
+
+			if (weapon.AttributeManager.Item.ItemDefinitionIndex != 42 && weapon.AttributeManager.Item.ItemDefinitionIndex != 59)
+				return HookResult.Continue;
+
+			if (g_knifePickupCount[(int)player.Index] >= 2) return HookResult.Continue;
+
+			if (g_playersKnife[(int)player.Index] != "weapon_knife")
+			{
+				g_knifePickupCount[(int)player.Index]++;
+				weapon.Remove();
+				if (!PlayerHasKnife(player) && Config.Additional.GiveKnifeAfterRemove)
+					AddTimer(0.2f, () => GiveKnifeToPlayer(player));
+			}
+
+			return HookResult.Continue;
+		}
+
+
 		private void OnMapStart(string mapName)
 		{
 			if (!Config.Additional.KnifeEnabled) return;
@@ -117,6 +161,7 @@ namespace WeaponPaints
 			// needed for now
 			AddTimer(2.0f, () =>
 			{
+
 				NativeAPI.IssueServerCommand("mp_t_default_melee \"\"");
 				NativeAPI.IssueServerCommand("mp_ct_default_melee \"\"");
 				NativeAPI.IssueServerCommand("mp_equipment_reset_rounds 0");
@@ -133,7 +178,7 @@ namespace WeaponPaints

 				foreach (CCSPlayerController player in players)
 				{
-					if (player == null || !player.IsValid || player.IsBot || player.IsHLTV || player.AuthorizedSteamID == null) continue;
+					if (player.IsBot || player.IsHLTV || player.AuthorizedSteamID == null) continue;
 					if (gPlayerWeaponsInfo.ContainsKey((int)player.Index)) continue;

 					PlayerInfo playerInfo = new PlayerInfo
@@ -151,7 +196,6 @@ namespace WeaponPaints
 						_ = weaponSync.GetKnifeFromDatabase(playerInfo);
 				}
 			}, CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE | CounterStrikeSharp.API.Modules.Timers.TimerFlags.REPEAT);
-
 		}

 		private HookResult OnPlayerConnectFull(EventPlayerConnectFull @event, GameEventInfo info)
@@ -187,7 +231,7 @@ namespace WeaponPaints
 		private HookResult OnPlayerSpawn(EventPlayerSpawn @event, GameEventInfo info)
 		{
 			CCSPlayerController? player = @event.Userid;
-			if (player == null || !player.IsValid)
+			if (player == null || !player.IsValid || player.IsBot)
 			{
 				return HookResult.Continue;
 			}
@@ -195,8 +239,7 @@ namespace WeaponPaints
 			if (Config.Additional.KnifeEnabled)
 			{
 				g_knifePickupCount[(int)player.Index] = 0;
-				if (!PlayerHasKnife(player))
-					GiveKnifeToPlayer(player);
+				AddTimer(0.1f, () => GiveKnifeToPlayer(player));
 			}

 			if (Config.Additional.SkinVisibilityFix)
@@ -207,7 +250,6 @@ namespace WeaponPaints
 			return HookResult.Continue;
 		}

-
 		private HookResult OnRoundEnd(EventRoundEnd @event, GameEventInfo info)
 		{
 			g_bCommandsAllowed = false;
@@ -227,7 +269,7 @@ namespace WeaponPaints

 		private void RegisterListeners()
 		{
-			RegisterListener<Listeners.OnEntitySpawned>(OnEntitySpawned);
+			RegisterListener<Listeners.OnEntityCreated>(OnEntityCreated);
 			RegisterListener<Listeners.OnClientAuthorized>(OnClientAuthorized);
 			RegisterListener<Listeners.OnClientDisconnect>(OnClientDisconnect);
 			RegisterListener<Listeners.OnMapStart>(OnMapStart);
@@ -237,7 +279,8 @@ namespace WeaponPaints
 			RegisterEventHandler<EventRoundStart>(OnRoundStart, HookMode.Pre);
 			RegisterEventHandler<EventRoundEnd>(OnRoundEnd);
 			RegisterEventHandler<EventItemPurchase>(OnEventItemPurchasePost);
-			RegisterEventHandler<EventItemPickup>(OnItemPickup);
+			//RegisterEventHandler<EventItemPickup>(OnItemPickup);
+			HookEntityOutput("weapon_knife", "OnPlayerPickup", OnPickup, HookMode.Pre);
 		}

 		/* WORKAROUND FOR CLIENTS WITHOUT STEAMID ON AUTHORIZATION */
--- a/PlayerExtensions.cs
+++ b/PlayerExtensions.cs
@@ -0,0 +1,14 @@
+using CounterStrikeSharp.API.Core;
+using System.Text;
+
+namespace WeaponPaints;
+
+public static class PlayerExtensions
+{
+	public static void Print(this CCSPlayerController controller, string message)
+	{
+		StringBuilder _message = new(WeaponPaints._localizer["wp_prefix"]);
+		_message.Append(message);
+		controller.PrintToChat(_message.ToString());
+	}
+}
--- a/PluginServices.cs
+++ b/PluginServices.cs
@@ -0,0 +1 @@
+
--- a/Utility.cs
+++ b/Utility.cs
@@ -108,13 +108,13 @@ namespace WeaponPaints
 			return message;
 		}

-		internal static async Task CheckVersion(string version)
+		internal static async Task CheckVersion(string version, ILogger logger)
 		{
 			using (HttpClient client = new HttpClient())
 			{
 				try
 				{
-					HttpResponseMessage response = await client.GetAsync("https://github.com/Nereziel/cs2-WeaponPaints/blob/main/VERSION");
+					HttpResponseMessage response = await client.GetAsync("https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/VERSION");

 					if (response.IsSuccessStatusCode)
 					{
@@ -125,24 +125,25 @@ namespace WeaponPaints

 						if (comparisonResult < 0)
 						{
-							WeaponPaints.logger!.LogWarning("Plugin is outdated! Check https://github.com/Nereziel/cs2-WeaponPaints");
+							logger.LogWarning("Plugin is outdated! Check https://github.com/Nereziel/cs2-WeaponPaints");
 						}
 						else if (comparisonResult > 0)
 						{
-							WeaponPaints.logger!.LogInformation("Probably dev version detected");
+							logger.LogInformation("Probably dev version detected");
 						}
 						else
 						{
-							WeaponPaints.logger!.LogInformation("Plugin is up to date");
+							logger.LogInformation("Plugin is up to date");
 						}
 					}
 					else
 					{
-						WeaponPaints.logger!.LogWarning("Failed to check version");
+						logger.LogWarning("Failed to check version");
 					}
 				}
-				catch (Exception)
+				catch (Exception ex)
 				{
+					Console.WriteLine(ex);
 				}
 			}
 		}
--- a/WeaponAction.cs
+++ b/WeaponAction.cs
@@ -20,6 +20,11 @@ namespace WeaponPaints

 			int weaponDefIndex = weapon.AttributeManager.Item.ItemDefinitionIndex;

+			if (isKnife)
+			{
+				weapon.AttributeManager.Item.EntityQuality = 3;
+			}
+
 			if (_config.Additional.GiveRandomSkin &&
 				 !gPlayerWeaponsInfo[playerIndex].ContainsKey(weaponDefIndex))
 			{
@@ -280,10 +285,10 @@ namespace WeaponPaints
 		}
 		private static int GetRandomPaint(int defindex)
 		{
-			Random rnd = new Random();

-			if (WeaponPaints.skinsList != null)
+			if (skinsList != null)
 			{
+				Random rnd = new Random();
 				// Filter weapons by the provided defindex
 				var filteredWeapons = skinsList.FindAll(w => w["weapon_defindex"]?.ToString() == defindex.ToString());

--- a/WeaponPaints.cs
+++ b/WeaponPaints.cs
@@ -4,13 +4,13 @@ using CounterStrikeSharp.API.Core.Attributes;
 using CounterStrikeSharp.API.Modules.Cvars;
 using Newtonsoft.Json.Linq;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Localization;

 namespace WeaponPaints;

-[MinimumApiVersion(101)]
+[MinimumApiVersion(121)]
 public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 {
-	internal static ILogger? logger;
 	internal static readonly Dictionary<string, string> weaponList = new()
 	{
 		{"weapon_deagle", "Desert Eagle"},
@@ -70,6 +70,7 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 	};

 	internal static WeaponPaintsConfig _config = new WeaponPaintsConfig();
+	internal static IStringLocalizer? _localizer;
 	internal static Dictionary<int, int> g_knifePickupCount = new Dictionary<int, int>();
 	internal static Dictionary<int, string> g_playersKnife = new();
 	internal static Dictionary<int, Dictionary<int, WeaponInfo>> gPlayerWeaponsInfo = new Dictionary<int, Dictionary<int, WeaponInfo>>();
@@ -144,7 +145,8 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 	public override string ModuleAuthor => "Nereziel & daffyy";
 	public override string ModuleDescription => "Skin and knife selector, standalone and web-based";
 	public override string ModuleName => "WeaponPaints";
-	public override string ModuleVersion => "1.3f";
+	public override string ModuleVersion => "1.3g";
+
 	public static WeaponPaintsConfig GetWeaponPaintsConfig()
 	{
 		return _config;
@@ -182,10 +184,13 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 					_ = weaponSync.GetWeaponPaintsFromDatabase(playerInfo);
 				if (Config.Additional.KnifeEnabled && weaponSync != null)
 					_ = weaponSync.GetKnifeFromDatabase(playerInfo);
-			}

+				g_knifePickupCount[(int)player!.Index] = 0;
+			}
+			/*
 			RegisterListeners();
 			RegisterCommands();
+			*/
 		}

 		if (Config.Additional.KnifeEnabled)
@@ -212,9 +217,11 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig

 		Config = config;
 		_config = config;
+		_localizer = Localizer;
+
 		Utility.Config = config;
 		Utility.ShowAd(ModuleVersion);
-		Task.Run(async () => await Utility.CheckVersion(ModuleVersion));
+		Task.Run(async () => await Utility.CheckVersion(ModuleVersion, Logger));
 	}

 	public override void Unload(bool hotReload)
--- a/WeaponPaints.csproj
+++ b/WeaponPaints.csproj
@@ -5,12 +5,17 @@
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>enable</Nullable>
 	<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+	<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="CounterStrikeSharp.API" Version="*" />
+    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.121" />
    <PackageReference Include="Dapper" Version="2.1.24" />
    <PackageReference Include="MySqlConnector" Version="2.3.1" />
    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="lang\**\*.*" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
 </Project>
--- a/WeaponSynchronization.cs
+++ b/WeaponSynchronization.cs
@@ -1,6 +1,4 @@
-using CounterStrikeSharp.API;
-using CounterStrikeSharp.API.Core;
-using Dapper;
+using Dapper;
 using MySqlConnector;
 using Newtonsoft.Json.Linq;

--- a/lang/en.json
+++ b/lang/en.json
@@ -0,0 +1,14 @@
+{
+	"wp_prefix": "{lightblue}[WeaponPaints] {default}",
+	"wp_info_website": "Visit {lime}{0}{default} where you can change skins",
+	"wp_info_refresh": "Type {lime}!wp{default} to synchronize chosen skins",
+	"wp_info_knife": "Type {lime}!knife{default} to open knife menu",
+	"wp_command_cooldown": "{lightred}You can't refresh weapon paints right now",
+	"wp_command_refresh_done": "{lime}Refreshing weapon paints",
+	"wp_knife_menu_select": "You have chosen {lime}{0}{default} as your knife",
+	"wp_knife_menu_kill": "To correctly apply skin for knife, you need to type {lime}!kill{default}",
+	"wp_knife_menu_title": "Knife Menu",
+	"wp_skin_menu_weapon_title": "Weapon Menu",
+	"wp_skin_menu_skin_title": "Select skin for {lime}{0}{default}",
+	"wp_skin_menu_select": "You have chosen {lime}{0}{default} as your skin"
+}
--- a/lang/lv.json
+++ b/lang/lv.json
@@ -0,0 +1,14 @@
+{
+	"wp_prefix": "{lightblue}[Ieroču Ādiņas] {default}",
+	"wp_info_website": "Apmeklē {lime}{0}{default} kur tu vari nomainīt skinus",
+	"wp_info_refresh": "Raksti {lime}!wp{default} lai sinhronizētu izvēlētos skinus",
+	"wp_info_knife": "Raksti {lime}!knife{default} lai atvērtu nažu izvēlni",
+	"wp_command_cooldown": "{lightred} Tu šobrīd nevari atjaunot ieroču skinus...",
+	"wp_command_refresh_done": "{lime}Izvēlētie skini tiek atjaunoti",
+	"wp_knife_menu_select": "Tu esi izvēlējies {lime}{0}{default} nazi",
+	"wp_knife_menu_kill": "Lai pareizi atjaunotu naža skinu, ieraksti čatā {lime}!kill{default}",
+	"wp_knife_menu_title": "Nažu Izvēlne",
+	"wp_skin_menu_weapon_title": "Ieroču Izvēlne",
+	"wp_skin_menu_skin_title": "Izvēlies skinu ierocim: {lime}{0}{default}",
+	"wp_skin_menu_select": "Tu esi izvēlējies {lime}{0}{default} kā savu skinu"
+}
--- a/lang/pl.json
+++ b/lang/pl.json
@@ -0,0 +1,14 @@
+{
+	"wp_prefix": "{lightblue}[WeaponPaints] {default}",
+	"wp_info_website": "Odwiedź {lime}{0}{default} gdzie będziesz mógł ustawić skiny",
+	"wp_info_refresh": "Wpisz {lime}!wp{default} aby zsynchronizować swoje skiny",
+	"wp_info_knife": "Wpisz {lime}!knife{default} aby wy<77>wietlić menu no<6E>y",
+	"wp_command_cooldown": "{lightred}Odczekaj chwilę przed wykonaniem tej komendy...",
+	"wp_command_refresh_done": "{lime}Pomyslnie zsynchronizowano twoje skiny",
+	"wp_knife_menu_select": "Wybrałeś {lime}{0}{default} jako swój nóż",
+	"wp_knife_menu_kill": "Do prawidłowego zastosowania noża użyj {lime}!kill{default}",
+	"wp_knife_menu_title": "Menu noży",
+	"wp_skin_menu_weapon_title": "Menu broni",
+	"wp_skin_menu_skin_title": "Wybierz skin dla {lime}{0}{default}",
+	"wp_skin_menu_select": "Wybrałeś {lime}{0}{default} jako swój skin"
+}
--- a/lang/pt-BR.json
+++ b/lang/pt-BR.json
@@ -0,0 +1,14 @@
+{
+	"wp_prefix": "{lightblue}[WeaponPaints] {default}",
+	"wp_info_website": "Visite {lime}{0}{default} para mudar suas skins e faca",
+	"wp_info_refresh": "Digite {lime}!wp{default} para sincronizar as suas skins",
+	"wp_info_knife": "Digite {lime}!knife{default} para abrir o menu de facas",
+	"wp_command_cooldown": "{lightred}Você não pode atualizar as skins das armas agora",
+	"wp_command_refresh_done": "{lime}Sincronizando as suas skins",
+	"wp_knife_menu_select": "Você escolheu {lime}{0}{default} como sua faca",
+	"wp_knife_menu_kill": "Para aplicar corretamente a skin da faca, você precisa digitar {lime}!kill{default}",
+	"wp_knife_menu_title": "Menu de Facas",
+	"wp_skin_menu_weapon_title": "Menu de Armas",
+	"wp_skin_menu_skin_title": "Selecionou a skin para {lime}{0}{default}",
+	"wp_skin_menu_select": "Você escolheu {lime}{0}{default} como sua skin"
+}
--- a/lang/pt-PT.json
+++ b/lang/pt-PT.json
@@ -0,0 +1,14 @@
+{
+	"wp_prefix": "{lightblue}[WeaponPaints] {default}",
+	"wp_info_website": "Visita {lime}{0}{default} onde podes mudar as tuas skins",
+	"wp_info_refresh": "Digita {lime}!wp{default} para sincronizar as tuas skins",
+	"wp_info_knife": "Digita {lime}!knife{default} para abrir o menu de facas",
+	"wp_command_cooldown": "{lightred}Tu não podes sincronizar agora as tuas skins",
+	"wp_command_refresh_done": "{lime}Sincronizando as tuas skins",
+	"wp_knife_menu_select": "Tu escolheste {lime}{0}{default} como a tua faca",
+	"wp_knife_menu_kill": "Para aplicar corretamente a skins para a tua faca, digita {lime}!kill{default}",
+	"wp_knife_menu_title": "Menu Facas",
+	"wp_skin_menu_weapon_title": "Menu de Armas",
+	"wp_skin_menu_skin_title": "Escolhe a skin para {lime}{0}{default}",
+	"wp_skin_menu_select": "Tu escolheste {lime}{0}{default} como a tua skin"
+}
--- a/lang/ru.json
+++ b/lang/ru.json
@@ -0,0 +1,14 @@
+{
+	"wp_prefix": "{lightblue}[WeaponPaints] {default}",
+	"wp_info_website": "Посетите сайт {lime}{0},{default} чтобы выбрать скин",
+	"wp_info_refresh": "Наберите в чат {lime}!wp{default} для синхронизации выбранных скинов",
+	"wp_info_knife": "Наберите в чат {lime}!knife,{default} чтобы выбрать нож",
+	"wp_command_cooldown": "{lightred}Вы не можете выбрать оружие прямо сейчас",
+	"wp_command_refresh_done": "{lime}Обновление скинов для оружия",
+	"wp_knife_menu_select": "Вы выбрали {lime}{0}{default} скин для ножа",
+	"wp_knife_menu_kill": "Чтобы правильно применить скин для ножа, набери в чат {lime}!kill{default}",
+	"wp_knife_menu_title": "Меню ножей",
+	"wp_skin_menu_weapon_title": "Меню оружия",
+	"wp_skin_menu_skin_title": "Выберите скин для {lime}{0}{default}",
+	"wp_skin_menu_select": "Вы выбрали {lime}{0}{default} скина для оружия"
+}
--- a/lang/tr.json
+++ b/lang/tr.json
@@ -0,0 +1,14 @@
+{
+	"wp_prefix": "{lightblue}[WeaponPaints] {default}",
+	"wp_info_website": "Görünümleri değiştirebileceğiniz {lime}{0}{default} adresini ziyaret edin",
+	"wp_info_refresh": "Seçilen kaplamyı senkronize etmek için {lime}!wp{default} yazın",
+	"wp_info_knife": "Bıçak menüsünü açmak için {lime}!knife{default} yazın",
+	"wp_command_cooldown": "{lightred}Şu anda silah kaplamasını yenileyemezsiniz",
+	"wp_command_refresh_done": "{lime}Silah kaplaması yenileniyor",
+	"wp_knife_menu_select": "Bıçağınız olarak {lime}{0}{default} seçtiniz",
+	"wp_knife_menu_kill": "Bıçak için doğru şekilde kaplama uygulamak için {lime}!kill{default} yazmanız gerekir",
+	"wp_knife_menu_title": "Bıçak Menüsü",
+	"wp_skin_menu_weapon_title": "Silah Menüsü",
+	"wp_skin_menu_skin_title": "Select skin for {lime}{0}{default}",
+	"wp_skin_menu_select": "Teniniz olarak {lime}{0}{default} seçtiniz"
+}
--- a/website/index.php
+++ b/website/index.php
@@ -4,36 +4,37 @@ require_once 'class/database.php';
 require_once 'steamauth/steamauth.php';
 require_once 'class/utils.php';

-
 $db = new DataBase();
 if (isset($_SESSION['steamid'])) {
-	$steamid = $_SESSION['steamid'];

-	$weapons = UtilsClass::getWeaponsFromArray();
-	$skins = UtilsClass::skinsFromJson();
-	$querySelected = $query3 = $db->select("SELECT `weapon_defindex`, `weapon_paint_id` FROM `wp_player_skins` WHERE `wp_player_skins`.`steamid` = :steamid", ["steamid" => $steamid]);
-	$selectedSkins = UtilsClass::getSelectedSkins($querySelected);
-	$selectedKnife = $db->select("SELECT * FROM `wp_player_knife` WHERE `wp_player_knife`.`steamid` = :steamid", ["steamid" => $steamid])[0];
-	$knifes = UtilsClass::getKnifeTypes();
+    include('steamauth/userInfo.php');
+    $steamid = $steamprofile['steamid'];

-	if (isset($_POST['forma'])) {
-		$ex = explode("-", $_POST['forma']);
+    $weapons = UtilsClass::getWeaponsFromArray();
+    $skins = UtilsClass::skinsFromJson();
+    $querySelected = $query3 = $db->select("SELECT `weapon_defindex`, `weapon_paint_id`, `weapon_wear` FROM `wp_player_skins` WHERE `wp_player_skins`.`steamid` = :steamid", ["steamid" => $steamid]);
+    $selectedSkins = UtilsClass::getSelectedSkins($querySelected);
+    $selectedKnife = $db->select("SELECT * FROM `wp_player_knife` WHERE `wp_player_knife`.`steamid` = :steamid", ["steamid" => $steamid])[0];
+    $knifes = UtilsClass::getKnifeTypes();

-		if ($ex[0] == "knife") {
-			$db->query("INSERT INTO `wp_player_knife` (`steamid`, `knife`) VALUES(:steamid, :knife) ON DUPLICATE KEY UPDATE `knife` = :knife", ["steamid" => $steamid, "knife" => $knifes[$ex[1]]['weapon_name']]);
-		} else {
-			if (!is_int($ex[1]))
-				header("Location: index.php");
-			if (array_key_exists($ex[1], $skins[$ex[0]])) {
+    if (isset($_POST['forma'])) {
+        $ex = explode("-", $_POST['forma']);
+
+        if ($ex[0] == "knife") {
+            $db->query("INSERT INTO `wp_player_knife` (`steamid`, `knife`) VALUES(:steamid, :knife) ON DUPLICATE KEY UPDATE `knife` = :knife", ["steamid" => $steamid, "knife" => $knifes[$ex[1]]['weapon_name']]);
+        } else {
+			if (array_key_exists($ex[1], $skins[$ex[0]]) && isset($_POST['wear']) && $_POST['wear'] >= 0.00 && $_POST['wear'] <= 1.00 && isset($_POST['seed'])) {
+				$wear = floatval($_POST['wear']); // wear
+				$seed = intval($_POST['seed']); // seed
 				if (array_key_exists($ex[0], $selectedSkins)) {
-					$db->query("UPDATE wp_player_skins SET weapon_paint_id = :weapon_paint_id WHERE steamid = :steamid AND weapon_defindex = :weapon_defindex", ["steamid" => $steamid, "weapon_defindex" => $ex[0], "weapon_paint_id" => $ex[1]]);
+					$db->query("UPDATE wp_player_skins SET weapon_paint_id = :weapon_paint_id, weapon_wear = :weapon_wear, weapon_seed = :weapon_seed WHERE steamid = :steamid AND weapon_defindex = :weapon_defindex", ["steamid" => $steamid, "weapon_defindex" => $ex[0], "weapon_paint_id" => $ex[1], "weapon_wear" => $wear, "weapon_seed" => $seed]);
 				} else {
-					$db->query("INSERT INTO wp_player_skins (`steamid`, `weapon_defindex`, `weapon_paint_id`) VALUES (:steamid, :weapon_defindex, :weapon_paint_id)", ["steamid" => $steamid, "weapon_defindex" => $ex[0], "weapon_paint_id" => $ex[1]]);
+					$db->query("INSERT INTO wp_player_skins (`steamid`, `weapon_defindex`, `weapon_paint_id`, `weapon_wear`, `weapon_seed`) VALUES (:steamid, :weapon_defindex, :weapon_paint_id, :weapon_wear, :weapon_seed)", ["steamid" => $steamid, "weapon_defindex" => $ex[0], "weapon_paint_id" => $ex[1], "weapon_wear" => $wear, "weapon_seed" => $seed]);
 				}
 			}
-		}
-		header("Location: index.php");
-	}
+        }
+        header("Location: index.php");
+    }
 }
 ?>

@@ -47,6 +48,8 @@ if (isset($_SESSION['steamid'])) {
 	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"
 		integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
 		crossorigin="anonymous"></script>
+	<script src="https://code.jquery.com/jquery-3.6.4.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/js/bootstrap.min.js"></script>
 	<link rel="stylesheet" href="style.css">
 	<title>CS2 Simple Weapon Paints</title>
 </head>
@@ -132,10 +135,120 @@ if (isset($_SESSION['steamid'])) {
 								}
 								?>
 							</select>
-						</form>
-					</div>
-				</div>
-			</div>
+						<br></br>
+<?php
+$selectedSkinInfo = isset($selectedSkins[$defindex]) ? $selectedSkins[$defindex] : null;
+$steamid = $_SESSION['steamid'];
+$defindex = $defindex; // get defindex here, correct if not
+$queryCheck = $db->select("SELECT 1 FROM `wp_player_skins` WHERE `steamid` = :steamid AND `weapon_defindex` = :defindex", ["steamid" => $steamid, "defindex" => $defindex]);
+$hasSkinData = !empty($queryCheck);
+
+if ($selectedSkinInfo && $hasSkinData):
+?>
+    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#weaponModal<?php echo $defindex ?>">
+        Settings
+    </button>
+<?php else: ?>
+    <button type="button" class="btn btn-primary" onclick="showSkinSelectionAlert()">
+        Settings
+    </button>
+    <script>
+        function showSkinSelectionAlert() {
+            alert("You need to select a skin first.");
+        }
+    </script>
+<?php endif; ?>
+							     
+</div>
+							
+ <?php
+// wear value 
+$queryWear = $db->select("SELECT `weapon_wear` FROM `wp_player_skins` WHERE `steamid` = :steamid AND `weapon_defindex` = :weapon_defindex", ["steamid" => $steamid, "weapon_defindex" => $defindex]);
+$selectedSkinInfo = isset($selectedSkins[$defindex]) ? $selectedSkins[$defindex] : null;
+$initialWearValue = isset($selectedSkinInfo['weapon_wear']) ? $selectedSkinInfo['weapon_wear'] : (isset($queryWear[0]['weapon_wear']) ? $queryWear[0]['weapon_wear'] : 0);
+	
+// seed value 
+$querySeed = $db->select("SELECT `weapon_seed` FROM `wp_player_skins` WHERE `steamid` = :steamid AND `weapon_defindex` = :weapon_defindex", ["steamid" => $steamid, "weapon_defindex" => $defindex]);
+$selectedSkinInfo = isset($selectedSkins[$defindex]) ? $selectedSkins[$defindex] : null;
+$initialSeedValue = isset($selectedSkinInfo['weapon_seed']) ? $selectedSkinInfo['weapon_seed'] : (isset($querySeed[0]['weapon_seed']) ? $querySeed[0]['weapon_seed'] : 0);
+?>
+
+							
+		 <div class="modal fade" id="weaponModal<?php echo $defindex ?>" tabindex="-1" role="dialog" aria-labelledby="weaponModalLabel<?php echo $defindex ?>" aria-hidden="true">
+                    <div class="modal-dialog" role="document">
+                        <div class="modal-content">
+                            <div class="modal-header">
+			       <h5 class='card-title item-name'>
+				<?php
+				if (array_key_exists($defindex, $selectedSkins)) {
+                                     echo "{$skins[$defindex][$selectedSkins[$defindex]]["paint_name"]} Settings";
+                                    } else {
+                                     echo "{$default["paint_name"]} Settings";
+                                    }
+			         ?>
+                                </h5>
+                            </div>
+			<div class="modal-body">
+			 <div class="form-group">
+                              <select class="form-select" id="wearSelect<?php echo $defindex ?>" name="wearSelect" onchange="updateWearValue<?php echo $defindex ?>(this.value)">
+                                  <option disabled>Select Wear</option>
+                                  <option value="0.00" <?php echo ($initialWearValue == 0.00) ? 'selected' : ''; ?>>Factory New</option>
+                                  <option value="0.07" <?php echo ($initialWearValue == 0.07) ? 'selected' : ''; ?>>Minimal Wear</option>
+                                  <option value="0.15" <?php echo ($initialWearValue == 0.15) ? 'selected' : ''; ?>>Field-Tested</option>
+                                  <option value="0.38" <?php echo ($initialWearValue == 0.38) ? 'selected' : ''; ?>>Well-Worn</option>
+                                  <option value="0.45" <?php echo ($initialWearValue == 0.45) ? 'selected' : ''; ?>>Battle-Scarred</option>
+                              </select>
+
+                           </div>
+                          <div class="row">
+                            <div class="col-md-6">
+                              <div class="form-group">
+                                   <label for="wear">Wear:</label>
+                                    <input type="text" value="<?php echo $initialWearValue; ?>" class="form-control" id="wear<?php echo $defindex ?>" name="wear">
+                           </div>
+                           </div>
+                           <div class="col-md-6">
+                             <div class="form-group">
+                                   <label for="seed">Seed:</label>
+                                   <input type="text" value="<?php echo $initialSeedValue; ?>" class="form-control" id="seed<?php echo $defindex ?>" name="seed" oninput="validateSeed(this)">
+                         </div>
+                        </div>
+                       </div>
+		       </div>
+                            <div class="modal-footer">
+                                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+                                <button type="submit" class="btn btn-danger">Use</button>
+                         </form>
+                            </div>
+                        </div>
+                       </div>
+                      </div>
+	              </div>
+                   </div>
+		    <script>
+				     //  wear
+                        function updateWearValue<?php echo $defindex ?>(selectedValue) {
+                             var wearInputElement = document.getElementById("wear<?php echo $defindex ?>");
+                             wearInputElement.value = selectedValue;
+                         }
+                          function validateWear(inputElement) {
+                        inputElement.value = inputElement.value.replace(/[^0-9]/g, '');
+                        }
+                     // seed
+		               function validateSeed(input) {
+                         // Check entered value
+                      var inputValue = input.value.replace(/[^0-9]/g, ''); // Just get the numbers
+
+                       if (inputValue === "") {
+                        input.value = 0; // Set to 0 if empty or no numbers
+                       } else {
+                         var numericValue = parseInt(inputValue);
+                       numericValue = Math.min(1000, Math.max(1, numericValue)); // Interval control
+
+                       input.value = numericValue;
+                       }
+                   }	
+                 </script>
 		<?php } ?>
 	<?php } ?>
 	</div>
Author	SHA1	Message	Date
Nereziel	1a9f7ad108	Merge pull request #91 from exababy/patch-1 Wear & Seed Support	2023-12-13 19:22:20 +01:00
Nereziel	6f1a29bb39	Merge pull request #96 from snowhp/main pt-PT and pt-BR translations added	2023-12-13 08:28:33 +01:00
Nereziel	9e64cdcd43	Merge pull request #95 from exababy/patch-2 turkish language	2023-12-13 08:27:23 +01:00
Nereziel	da86756092	Merge pull request #94 from rcon420/patch-2 latvian lang added	2023-12-13 08:26:35 +01:00
Tiago Machado	22880070cd	Merge pull request #1 from crashzk/patch-1 Update pt-BR.json	2023-12-12 23:02:44 +00:00
crashzk	208cbe1aef	Update pt-BR.json	2023-12-12 19:53:34 -03:00
Tiago Machado	c0cf9210dc	Create pt-BR.json	2023-12-12 22:00:51 +00:00
Tiago Machado	5f61254b4e	Create pt-PT.json	2023-12-12 22:00:18 +00:00
Nilsu Derinder	6cd1bb3bf5	fix 2	2023-12-12 23:46:11 +03:00
Nilsu Derinder	4f94b831c2	fix	2023-12-12 23:40:53 +03:00
Nilsu Derinder	969d40b970	Button Update the button will not work if the skin is not selected which fixes possible bugs in the plugin.	2023-12-12 23:33:05 +03:00
Nilsu Derinder	0cd36a7877	turkish language	2023-12-12 23:21:33 +03:00
rcon_password	a3306b5f8f	latvian lang added latvian lang added	2023-12-12 22:13:05 +02:00
Nereziel	379c2f797c	Merge pull request #93 from daffyyyy/some-changes CSS 121, languages and more	2023-12-12 20:55:21 +01:00
Nilsu Derinder	7f41607d54	Update & Fix now selected wear appears and pulls the value from the database.	2023-12-12 22:44:08 +03:00
daffyyyy	fc42190701	CSS 121, languages and more	2023-12-12 20:09:39 +01:00
Nilsu Derinder	928c1e1466	bootstrap update	2023-12-11 18:46:34 +03:00
Nilsu Derinder	78649f5dcf	Update wear has been updated and settings have been moved into modal and added settings button	2023-12-11 11:32:40 +03:00
Nilsu Derinder	4e72f10326	Seed Update seed was converted to box instead of range and only numbers can be entered.	2023-12-08 17:56:28 +03:00
Nilsu Derinder	3ddbf7e11e	Advanced wear	2023-12-06 22:25:19 +03:00
Nilsu Derinder	ee770fd8c2	Seed support	2023-12-06 22:03:52 +03:00
Nilsu Derinder	72c5df53b5	fix	2023-12-06 20:50:39 +03:00
Nilsu Derinder	d0ed0f4c0b	Wear Support	2023-12-06 19:42:18 +03:00