Merge c5e219b445 into a1fa8f37c7

Website fix

Commands.cs

@@ -181,7 +181,7 @@ public partial class WeaponPaints
 			.Where(pair => pair.Key.StartsWith("weapon_knife") || pair.Key.StartsWith("weapon_bayonet"))
 			.ToDictionary(pair => pair.Key, pair => pair.Value);
 
-		var giveItemMenu = MenuApi?.NewMenu(Localizer["wp_knife_menu_title"]);
+		var giveItemMenu = Utility.CreateMenu(Localizer["wp_knife_menu_title"]);
 			
 		var handleGive = (CCSPlayerController player, ChatMenuOption option) =>
 		{
@@ -265,7 +265,7 @@ public partial class WeaponPaints
 			.Except([new KeyValuePair<string, string>("weapon_knife", "Default Knife")])
 			.ToDictionary(kvp => kvp.Value, kvp => kvp.Key);
 
-		var weaponSelectionMenu = MenuApi?.NewMenu(Localizer["wp_skin_menu_weapon_title"]);
+		var weaponSelectionMenu = Utility.CreateMenu(Localizer["wp_skin_menu_weapon_title"]);
 
 		// Function to handle skin selection for a specific weapon
 		var handleWeaponSelection = (CCSPlayerController? player, ChatMenuOption option) =>
@@ -280,7 +280,7 @@ public partial class WeaponPaints
 				weaponName?.ToString() == selectedWeaponClassname
 			)?.ToList();
 
-			var skinSubMenu = MenuApi?.NewMenu(Localizer["wp_skin_menu_skin_title", selectedWeapon]);
+			var skinSubMenu = Utility.CreateMenu(Localizer["wp_skin_menu_skin_title", selectedWeapon]);
 
 			// Function to handle skin selection for the chosen weapon
 			var handleSkinSelection = (CCSPlayerController p, ChatMenuOption opt) =>
@@ -416,7 +416,7 @@ public partial class WeaponPaints
 
 	private void SetupGlovesMenu()
 	{
-		var glovesSelectionMenu = MenuApi?.NewMenu(Localizer["wp_glove_menu_title"]);
+		var glovesSelectionMenu = Utility.CreateMenu(Localizer["wp_glove_menu_title"]);
 		if (glovesSelectionMenu == null) return;
 		glovesSelectionMenu.PostSelectAction = PostSelectAction.Close;
 			
@@ -625,7 +625,7 @@ public partial class WeaponPaints
 				if (!CommandsCooldown.TryGetValue(player.Slot, out DateTime cooldownEndTime) ||
 				    DateTime.UtcNow >= (CommandsCooldown.TryGetValue(player.Slot, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
 				{
-					var agentsSelectionMenu = MenuApi?.NewMenu(Localizer["wp_agent_menu_title"]);
+					var agentsSelectionMenu = Utility.CreateMenu(Localizer["wp_agent_menu_title"]);
 					if (agentsSelectionMenu == null) return;
 					agentsSelectionMenu.PostSelectAction = PostSelectAction.Close;
 
@@ -665,7 +665,7 @@ public partial class WeaponPaints
 
 	private void SetupMusicMenu()
 	{
-		var musicSelectionMenu = MenuApi?.NewMenu(Localizer["wp_music_menu_title"]);
+		var musicSelectionMenu = Utility.CreateMenu(Localizer["wp_music_menu_title"]);
 		if (musicSelectionMenu == null) return;
 		musicSelectionMenu.PostSelectAction = PostSelectAction.Close;
 
@@ -800,7 +800,7 @@ public partial class WeaponPaints
 	
 	private void SetupPinsMenu()
 	{
-		var pinsSelectionMenu = MenuApi?.NewMenu(Localizer["wp_pins_menu_title"]);
+		var pinsSelectionMenu = Utility.CreateMenu(Localizer["wp_pins_menu_title"]);
 		if (pinsSelectionMenu == null) return;
 		pinsSelectionMenu.PostSelectAction = PostSelectAction.Close;
 

Config.cs

@@ -99,5 +99,8 @@ namespace WeaponPaints
 
 		[JsonPropertyName("Additional")]
 		public Additional Additional { get; set; } = new();
+		
+		[JsonPropertyName("MenuType")]
+		public string MenuType { get; set; } = "selectable";
 	}
 }

Utility.cs

@@ -1,6 +1,8 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Translations;
+using CounterStrikeSharp.API.Modules.Menu;
 using Dapper;
+using MenuManager;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -189,9 +191,31 @@ namespace WeaponPaints
 			Console.ResetColor();
 		}
 		
-		internal static string ReplaceTags(string message)
+		internal static IMenu? CreateMenu(string title)
 		{
-			return message.ReplaceColorTags();
+			var menuType = WeaponPaints.Instance.Config.MenuType.ToLower();
+        
+			var menu = menuType switch
+			{
+				_ when menuType.Equals("selectable", StringComparison.CurrentCultureIgnoreCase) =>
+					WeaponPaints.MenuApi?.NewMenu(title),
+
+				_ when menuType.Equals("dynamic", StringComparison.CurrentCultureIgnoreCase) =>
+					WeaponPaints.MenuApi?.NewMenuForcetype(title, MenuType.ButtonMenu),
+
+				_ when menuType.Equals("center", StringComparison.CurrentCultureIgnoreCase) =>
+					WeaponPaints.MenuApi?.NewMenuForcetype(title, MenuType.CenterMenu),
+
+				_ when menuType.Equals("chat", StringComparison.CurrentCultureIgnoreCase) =>
+					WeaponPaints.MenuApi?.NewMenuForcetype(title, MenuType.ChatMenu),
+
+				_ when menuType.Equals("console", StringComparison.CurrentCultureIgnoreCase) =>
+					WeaponPaints.MenuApi?.NewMenuForcetype(title, MenuType.ConsoleMenu),
+
+				_ => WeaponPaints.MenuApi?.NewMenu(title)
+			};
+
+			return menu;
 		}
 
 		internal static async Task CheckVersion(string version, ILogger logger)

VERSION

@@ -1 +1 @@
-3.0c
+3.1b

WeaponAction.cs

@@ -20,8 +20,10 @@ namespace WeaponPaints
 
 			bool isKnife = weapon.DesignerName.Contains("knife") || weapon.DesignerName.Contains("bayonet");
 
-			if (isKnife && !GPlayersKnife.ContainsKey(player.Slot) ||
-			    isKnife && GPlayersKnife[player.Slot][player.Team] == "weapon_knife") return;
+			if (isKnife && (!GPlayersKnife.ContainsKey(player.Slot) ||
+			                !GPlayersKnife[player.Slot].ContainsKey(player.Team) ||
+			                GPlayersKnife[player.Slot][player.Team] == "weapon_knife"))
+				return;
 
 			if (isKnife)
 			{
@@ -52,7 +54,9 @@ namespace WeaponPaints
 			bool isLegacyModel;
 
 			if (_config.Additional.GiveRandomSkin &&
-				 !GPlayerWeaponsInfo[player.Slot][player.Team].ContainsKey(weaponDefIndex))
+			    GPlayerWeaponsInfo.ContainsKey(player.Slot) &&
+			    (!GPlayerWeaponsInfo[player.Slot].ContainsKey(player.Team) ||
+			     !GPlayerWeaponsInfo[player.Slot][player.Team].ContainsKey(weaponDefIndex)))
 			{
 				// Random skins
 				weapon.FallbackPaintKit = GetRandomPaint(weaponDefIndex);
@@ -103,14 +107,7 @@ namespace WeaponPaints
 			weapon.AttributeManager.Item.CustomName = weaponInfo.Nametag;
 			weapon.FallbackPaintKit = weaponInfo.Paint;
 			
-			if (weaponInfo is { Paint: 38, Seed: 0 })
-			{
-				weapon.FallbackSeed = _fadeSeed++;
-			}
-			else
-			{
-				weapon.FallbackSeed = weaponInfo.Seed;
-			}
+			weapon.FallbackSeed = weaponInfo is { Paint: 38, Seed: 0 } ? _fadeSeed++ : weaponInfo.Seed;
 			
 			weapon.FallbackWear = weaponInfo.Wear;
 			CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle, "set item texture prefab", weapon.FallbackPaintKit);
@@ -186,15 +183,13 @@ namespace WeaponPaints
 				
 				CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle,
 					$"sticker slot {stickerSlot} id", ViewAsFloat(sticker.Id));
-				// CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle,
-				// 	$"sticker slot {stickerSlot} schema", stickerSlot);
-				// if (stickerSlot == 5)
-				// {
+				if (sticker.OffsetX != 0 || sticker.OffsetY != 0)
+					CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle,
+						$"sticker slot {stickerSlot} schema", 0);
 				CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle,
 					$"sticker slot {stickerSlot} offset x", sticker.OffsetX);
 				CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle,
 					$"sticker slot {stickerSlot} offset y", sticker.OffsetY);
-				// }
 				CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle,
 					$"sticker slot {stickerSlot} wear", sticker.Wear);
 				CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle,
@@ -217,8 +212,11 @@ namespace WeaponPaints
 			int weaponDefIndex = weapon.AttributeManager.Item.ItemDefinitionIndex;
 
 			if (!GPlayerWeaponsInfo.TryGetValue(player.Slot, out var playerWeaponsInfo) ||
-			    !playerWeaponsInfo[player.Team].TryGetValue(weaponDefIndex, out var value) ||
-			    value.KeyChain == null) return;
+			    !playerWeaponsInfo.TryGetValue(player.Team, out var teamWeaponsInfo) ||
+			    !teamWeaponsInfo.TryGetValue(weaponDefIndex, out var value) ||
+			    value.KeyChain == null)
+				return;
+			
 			var keyChain = value.KeyChain;
 
 			CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle,
@@ -406,9 +404,12 @@ namespace WeaponPaints
 						return;
 
 					if (!GPlayersGlove.TryGetValue(player.Slot, out var gloveInfo) ||
-					    !gloveInfo.TryGetValue(player.Team, out var gloveId) || gloveId == 0) return; 
-
-					WeaponInfo weaponInfo = GPlayerWeaponsInfo[player.Slot][player.Team][gloveId];
+					    !gloveInfo.TryGetValue(player.Team, out var gloveId) ||
+					    gloveId == 0 ||
+					    !GPlayerWeaponsInfo.TryGetValue(player.Slot, out var playerWeaponsInfo) ||
+					    !playerWeaponsInfo.TryGetValue(player.Team, out var teamWeaponsInfo) ||
+					    !teamWeaponsInfo.TryGetValue(gloveId, out var weaponInfo))
+						return;
 
 					item.ItemDefinitionIndex = gloveId;
 					item.ItemIDLow = 16384 & 0xFFFFFFFF;
@@ -542,7 +543,6 @@ namespace WeaponPaints
 				var weapon = handle.Value;
 			
 				if (weapon == null || !weapon.IsValid) continue;
-				
 				if (myWeapons.Count == 1)
 				{
 					var newWeapon = new CBasePlayerWeapon(player.GiveNamedItem(CsItem.USP));

WeaponPaints.cs

@@ -17,7 +17,7 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
     public override string ModuleAuthor => "Nereziel & daffyy";
 	public override string ModuleDescription => "Skin, gloves, agents and knife selector, standalone and web-based";
 	public override string ModuleName => "WeaponPaints";
-	public override string ModuleVersion => "3.0c";
+	public override string ModuleVersion => "3.1b";
 
 	public override void Load(bool hotReload)
 	{

WeaponSynchronization.cs

@@ -49,7 +49,7 @@ internal class WeaponSynchronization
 			if (!_config.Additional.KnifeEnabled || string.IsNullOrEmpty(player?.SteamId))
 				return;
 
-			const string query = "SELECT `knife`, `weapon_team` FROM `wp_player_knife` WHERE `steamid` = @steamid";
+			const string query = "SELECT `knife`, `weapon_team` FROM `wp_player_knife` WHERE `steamid` = @steamid ORDER BY `weapon_team` ASC";
 			var rows = connection.Query<dynamic>(query, new { steamid = player.SteamId }); // Retrieve all records for the player
 
 			foreach (var row in rows)
@@ -60,9 +60,9 @@ internal class WeaponSynchronization
 				// Determine the weapon team based on the query result
 				CsTeam weaponTeam = (int)row.weapon_team switch
 				{
-					0 => CsTeam.None,
 					2 => CsTeam.Terrorist,
-					_ => CsTeam.CounterTerrorist
+					3 => CsTeam.CounterTerrorist,
+					_ => CsTeam.None,
 				};
 
 				// Get or create entries for the player’s slot
@@ -94,7 +94,7 @@ internal class WeaponSynchronization
 			if (!_config.Additional.GloveEnabled || string.IsNullOrEmpty(player?.SteamId))
 				return;
 
-			const string query = "SELECT `weapon_defindex`, `weapon_team` FROM `wp_player_gloves` WHERE `steamid` = @steamid";
+			const string query = "SELECT `weapon_defindex`, `weapon_team` FROM `wp_player_gloves` WHERE `steamid` = @steamid ORDER BY `weapon_team` ASC";
 			var rows = connection.Query<dynamic>(query, new { steamid = player.SteamId }); // Retrieve all records for the player
 
 			foreach (var row in rows)
@@ -105,9 +105,9 @@ internal class WeaponSynchronization
 				var playerGloves = WeaponPaints.GPlayersGlove.GetOrAdd(player.Slot, _ => new ConcurrentDictionary<CsTeam, ushort>());
 				CsTeam weaponTeam = (int)row.weapon_team switch
 				{
-					0 => CsTeam.None,
 					2 => CsTeam.Terrorist,
-					_ => CsTeam.CounterTerrorist
+					3 => CsTeam.CounterTerrorist,
+					_ => CsTeam.None,
 				};
 
 				// Get or create entries for the player’s slot
@@ -171,28 +171,27 @@ internal class WeaponSynchronization
 
 			// var weaponInfos = new ConcurrentDictionary<int, WeaponInfo>();
 
-			const string query = "SELECT * FROM `wp_player_skins` WHERE `steamid` = @steamid";
+			const string query = "SELECT * FROM `wp_player_skins` WHERE `steamid` = @steamid ORDER BY `weapon_team` ASC";
 			var playerSkins = connection.Query<dynamic>(query, new { steamid = player.SteamId });
 
 			foreach (var row in playerSkins)
 			{
-				int weaponDefIndex = row?.weapon_defindex ?? 0;
-				int weaponPaintId = row?.weapon_paint_id ?? 0;
-				float weaponWear = row?.weapon_wear ?? 0f;
-				int weaponSeed = row?.weapon_seed ?? 0;
-				string weaponNameTag = row?.weapon_nametag ?? "";
-				bool weaponStatTrak = row?.weapon_stattrak ?? false;
-				int weaponStatTrakCount = row?.weapon_stattrak_count ?? 0;
+				int weaponDefIndex = row.weapon_defindex ?? 0;
+				int weaponPaintId = row.weapon_paint_id ?? 0;
+				float weaponWear = row.weapon_wear ?? 0f;
+				int weaponSeed = row.weapon_seed ?? 0;
+				string weaponNameTag = row.weapon_nametag ?? "";
+				bool weaponStatTrak = row.weapon_stattrak ?? false;
+				int weaponStatTrakCount = row.weapon_stattrak_count ?? 0;
 				
-				CsTeam weaponTeam = row?.weapon_team switch
+				CsTeam weaponTeam = row.weapon_team switch
 				{
-					null => CsTeam.None,
-					0 => CsTeam.None,
 					2 => CsTeam.Terrorist,
-					_ => CsTeam.CounterTerrorist
+					3 => CsTeam.CounterTerrorist,
+					_ => CsTeam.None,
 				};
 						
-				string[]? keyChainParts = row?.weapon_keychain?.ToString().Split(';');
+				string[]? keyChainParts = row.weapon_keychain?.ToString().Split(';');
 
 				KeyChainInfo keyChainInfo = new KeyChainInfo();
 
@@ -302,7 +301,7 @@ internal class WeaponSynchronization
 			if (!_config.Additional.MusicEnabled || string.IsNullOrEmpty(player?.SteamId))
 				return;
 
-			const string query = "SELECT `music_id`, `weapon_team` FROM `wp_player_music` WHERE `steamid` = @steamid";
+			const string query = "SELECT `music_id`, `weapon_team` FROM `wp_player_music` WHERE `steamid` = @steamid ORDER BY `weapon_team` ASC";
 			var rows = connection.Query<dynamic>(query, new { steamid = player.SteamId }); // Retrieve all records for the player
 
 			foreach (var row in rows)
@@ -313,9 +312,9 @@ internal class WeaponSynchronization
 				// Determine the weapon team based on the query result
 				CsTeam weaponTeam = (int)row.weapon_team switch
 				{
-					0 => CsTeam.None,
 					2 => CsTeam.Terrorist,
-					_ => CsTeam.CounterTerrorist
+					3 => CsTeam.CounterTerrorist,
+					_ => CsTeam.None,
 				};
 
 				// Get or create entries for the player’s slot
@@ -347,7 +346,7 @@ internal class WeaponSynchronization
 			if (string.IsNullOrEmpty(player?.SteamId))
 				return;
 
-			const string query = "SELECT `id`, `weapon_team` FROM `wp_player_pins` WHERE `steamid` = @steamid";
+			const string query = "SELECT `id`, `weapon_team` FROM `wp_player_pins` WHERE `steamid` = @steamid ORDER BY `weapon_team` ASC";
 			var rows = connection.Query<dynamic>(query, new { steamid = player.SteamId }); // Retrieve all records for the player
 
 			foreach (var row in rows)
@@ -358,9 +357,9 @@ internal class WeaponSynchronization
 				// Determine the weapon team based on the query result
 				CsTeam weaponTeam = (int)row.weapon_team switch
 				{
-					0 => CsTeam.None,
 					2 => CsTeam.Terrorist,
-					_ => CsTeam.CounterTerrorist
+					3 => CsTeam.CounterTerrorist,
+					_ => CsTeam.None,
 				};
 
 				// Get or create entries for the player’s slot

lang/zh-Hans.json

@@ -0,0 +1,25 @@
+{
+	"wp_prefix": "{lightblue}[WeaponPaints] {default}",
+	"wp_info_website": "您可以在浏览器访问 {lime}{0}{default} 来更改您的饰品",
+	"wp_info_refresh": "输入 {lime}!wp{default} 来刷新武器皮肤",
+	"wp_info_knife": "输入 {lime}!knife{default} 来打开选刀菜单",
+	"wp_info_glove": "输入 {lime}!gloves{default} 来打开手套菜单",
+	"wp_info_agent": "输入 {lime}!agents{default} 来打开探员菜单",
+	"wp_info_music": "输入 {lime}!music{default} 来打开音乐盒菜单",
+	"wp_command_cooldown": "{lightred}饰品刷新冷却中！请稍后再试！",
+	"wp_command_refresh_done": "{lime}饰品已刷新",
+	"wp_knife_menu_select": "您的刀已更改为 {lime}{0}{default}",
+	"wp_knife_menu_kill": "",
+	"wp_knife_menu_title": "选刀菜单",
+	"wp_glove_menu_select": "您的手套已更改为 {lime}{0}{default}",
+	"wp_glove_menu_title": "手套菜单",
+	"wp_agent_menu_select": "您的探员已更改为 {lime}{0}{default}",
+	"wp_agent_menu_title": "探员菜单",
+	"wp_music_menu_title": "音乐盒菜单",
+	"wp_music_menu_select": "您的音乐盒已更改为 {lime}{0}{default}",
+	"wp_skin_menu_weapon_title": "武器菜单",
+	"wp_skin_menu_skin_title": "为 {lime}{0}{default} 更换皮肤",
+	"wp_skin_menu_select": "皮肤已更换为 {lime}{0}{default} ",
+
+	"None": "无"
+}