feat: overall QOL improvements

+ Updated to latest server artifacts
+ Updated vMenu to the latest v3.6
+ Replaced Discord Weapon restrictions with a better fork of the repository.
+ Restructured the server config, and updated the dlc build to the latest San Andreas Mercenaries dlc.
+ Attempted to fix missing radios in the wheel.

resources/Custom-Commands/client.lua

@@ -11,7 +11,7 @@
 --------------------RESPONSE COMMANDS--------------------------
 
 RegisterCommand("discord", function(source, args, rawCommand) -------- replace "discord" with any other command you want **DON'T INCLUDE /**
-    TriggerEvent("chatMessage", "^*^8[Our Discord:] ^7discord.eguk.me") ------- change message in the ""
+    TriggerEvent("chatMessage", "^*^8[Our Discord:] ^7discord.elite-gaming.gg") ------- change message in the ""
 end)
 
 --RegisterCommand("cad", function(source, args, rawCommand) ------- replace "cad" with any other command you want DON'T INCLUDE /
@@ -19,11 +19,11 @@ end)
 --end)
 
 RegisterCommand("website", function(source, args, rawCommand) ------- replace "website" with any other command you want DON'T INCLUDE /
-    TriggerEvent("chatMessage", "^*^8[Our Website:] ^7https://elite-gaming.co.uk/") ------- change message in the ""
+    TriggerEvent("chatMessage", "^*^8[Our Website:] ^7elite-gaming.gg") ------- change message in the ""
 end)
 
 RegisterCommand("forum", function(source, args, rawCommand) ------- replace "website" with any other command you want DON'T INCLUDE /
-    TriggerEvent("chatMessage", "^*^8[Our Forum:] ^7https://forum.elite-gaming.co.uk/") ------- change message in the ""
+    TriggerEvent("chatMessage", "^*^8[Our Forum:] ^7forum.elite-gaming.gg") ------- change message in the ""
 end)
 
 --RegisterCommand("commands", function(source, args, rawCommand) ------- replace "commands" with any other command you want DON'T INCLUDE /

resources/Fire-Script/whitelist.json

@@ -1 +1 @@
-{"steam:110000131ff8eae":true,"steam:110000112db6102":true,"steam:110000147619e76":true}
+{"steam:110000112db6102":true,"steam:110000147619e76":true,"steam:110000131ff8eae":true,"steam:11000010e6980a7":true}

resources/Holograms/holograms.lua

@@ -32,15 +32,15 @@ function Holograms()
 			Citizen.Wait(0)			
 				-- Spawn - Welcome to EGRP
 		if GetDistanceBetweenCoords( -868.95, -429.17, 37.14, GetEntityCoords(GetPlayerPed(-1))) < 27.5 then
-			Draw3DText( -868.95, -429.17, 37.14  -1.400, "Welcome to Elite Gaming RP!", 4, 0.2, 0.2)
+			Draw3DText( -868.95, -429.17, 37.14  -1.400, "Welcome to Elite Gaming!", 4, 0.2, 0.2)
 			Draw3DText( -868.95, -429.17, 37.14  -1.800, "Use F7 to find our rules and info.", 4, 0.15, 0.15)
 		end		
 				-- Spawn - Links
 		if GetDistanceBetweenCoords( -857.60, -411.40, 37.64, GetEntityCoords(GetPlayerPed(-1))) < 32.5 then
 			Draw3DText( -857.60, -411.40, 37.64  -1.400, "Our Socials:", 4, 0.2, 0.2)
-			Draw3DText( -857.60, -411.40, 37.64  -1.750, "Discord: discord.elitegami.ng", 4, 0.15, 0.15)
+			Draw3DText( -857.60, -411.40, 37.64  -1.750, "Discord: discord.elite-gaming.gg", 4, 0.15, 0.15)
 			Draw3DText( -857.60, -411.40, 37.64  -2.050, "Website: elite-gaming.gg", 4, 0.15, 0.15)
-			Draw3DText( -857.60, -411.40, 37.64  -2.350, "CAD: cad.elite-gaming.gg", 4, 0.15, 0.15)
+			--Draw3DText( -857.60, -411.40, 37.64  -2.350, "CAD: cad.elite-gaming.gg", 4, 0.15, 0.15)
 			--Draw3DText( -857.60, -411.40, 37.64  -2.650, "Forum: forum.elite-gaming.gg", 4, 0.15, 0.15)
 			--Draw3DText( -857.60, -411.40, 37.64  -2.950, "Twitter: @EliteGamingUK_", 4, 0.15, 0.15)
 			--Draw3DText( -857.60, -411.40, 37.64  -3.250, "Instagram: @EliteGaming_UK", 4, 0.15, 0.15)

resources/[EGRP-Discord-Integration]/Discord-Presence/config.lua

@@ -31,7 +31,7 @@ Config.EnableLargeImage = true -- Large Image enabled. Replace true with false t
 Config.LargeImageName = "eg-blurple" -- Image Name without .png, .jpg, or .jpeg --> https://discord.com/developers/applications/YOUR_APPLICATION_ID/rich-presence/assets
 
 Config.EnableLargeImageText = true -- Text which shows up if you hover large image. Replace true with false to disable.
-Config.LargeImageText = "Elite Gaming RP" -- Text which shows up if you hover image. 
+Config.LargeImageText = "Elite Gaming FiveM" -- Text which shows up if you hover image. 
 
 
 
@@ -59,7 +59,7 @@ Config.Buttons = {
 	{
         Index = 1,
         Label = "Connect",
-        URL = "fivem://connect/play.elitegami.ng:30120"
+        URL = "fivem://connect/play.elite-gaming.gg:30120"
 	}
 }
 

resources/[EGRP-Discord-Integration]/Discord-WepRestriction-Legacy/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Jared Scarito
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

resources/[EGRP-Discord-Integration]/Discord-WepRestriction-Legacy/README.md

@@ -0,0 +1,67 @@
+# DiscordWeaponPerms
+## Continued Documentation
+https://docs.badger.store/fivem-discord-scripts/discordweaponperms
+## Discontinued Documentation
+**Version 1.0** 
+
+Another discord script of course! With this script, you can restrict weapons to certain roles on your discord server! This script also allows restricting certain attachments to different groups as well (however, it'll remove the weapon if they have the attachment, I'll eventually update it to just remove the attachment from the weapon).
+
+https://i.gyazo.com/52a7106f1db9c309c28ff012b8127ae2.gif
+
+You must set up IllusiveTea's discord_perms script for this to work properly. --> https://forum.fivem.net/t/discord-roles-for-permissions-im-creative-i-know/233805
+
+**How it works**
+```
+roleList = {
+1, -- Trusted Civ (1)
+1, -- Donator (2)
+1, -- Personal (3)
+}
+```
+responds to it's respective number within the other list:
+```
+restrictedWeapons = {
+{}, -- Trusted Civ (1)
+{}, -- Donator (2)
+{
+"WEAPON_RPG",
+}, -- Personal (3)
+}
+```
+
+The RPG weapon would then be restricted to only people with personal discord role within your discord server. 
+
+It's quite simple :slight_smile:
+
+ 
+**Installation**
+1. Download DiscordWeaponPerms
+2. Extract the .zip and place the folder in your /resources/ of your Fivem server
+3. Make sure you add “start DiscordWeaponPerms” in your server.cfg
+4. Enjoy :slight_smile:
+
+**Download**
+[DiscordWeaponPerms](https://github.com/TheWolfBadger/DiscordWeaponPerms)
+
+
+
+**My Other Work**
+
+[DiscordChatRoles](https://forum.fivem.net/t/discordchatroles-release/566338)
+
+[DiscordAcePerms](https://forum.fivem.net/t/discordaceperms-release/573044)
+
+[SandyVehiclesRestrict](https://forum.fivem.net/t/release-sandy-vehicles-restrict/564929)
+
+[DiscordTagIDs](https://forum.fivem.net/t/discordtagids-i-know-i-know-i-only-make-discord-based-scripts/582513)
+
+[DiscordVehiclesRestrict](https://forum.fivem.net/t/discordvehiclesrestrict/599594)
+
+[DiscordPedPerms](https://forum.fivem.net/t/release-discordpedperms/642866)
+
+[BadgerAnims](https://forum.fivem.net/t/release-badgeranims/650517)
+
+[DiscordWeaponPerms](https://forum.fivem.net/t/release-discordweaponperms/664774)
+
+**Version 2.0**
+- Removing restricted weapon attachments from weapon instead of whole weapon?

resources/[EGRP-Discord-Integration]/Discord-WepRestriction-Legacy/client.lua

@@ -0,0 +1,82 @@
+--------------------------
+--- DiscordWeaponPerms ---
+--------------------------
+restrictedWeapons = {
+{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 1
+{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 3
+{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 4
+{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 5
+{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 6
+{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 7
+{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 8
+{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 9
+{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 10
+{}, -- 11
+{}, -- 12
+{}, -- 13
+{}, -- 14
+{}, -- 15
+}
+--[[
+Weapon components list: https://wiki.rage.mp/index.php?title=Weapons_Components
+Weapon list: https://runtime.fivem.net/doc/natives/#_0xBF0FD6E56C964FCB
+]]--
+isAllowed = {}
+RegisterNetEvent('DiscordWeaponPerms:CheckPerms:Return')
+AddEventHandler('DiscordWeaponPerms:CheckPerms:Return', function(hasPerms)
+	isAllowed = hasPerms
+end)
+function has_value (tab, val)
+    for index, value in ipairs(tab) do
+        if value == val then
+            return true
+        end
+    end
+    return false
+end
+alreadyRan = false
+Citizen.CreateThread(function()
+    while true do
+        Citizen.Wait(1000)
+		if not alreadyRan then
+			TriggerServerEvent("DiscordWeaponPerms:CheckPerms")
+			alreadyRan = true
+		end
+		--TriggerServerEvent("Print:PrintDebug", "It gets here 1") -- DEBUG - GET RID OF
+		local ped = GetPlayerPed(-1)
+		local weapon = GetSelectedPedWeapon(ped)
+		local restrictedStr = ""
+		local requiredPerm = nil
+		for i=1, #restrictedWeapons do
+			local weaponArr = restrictedWeapons[i]
+			for j=1, #weaponArr do
+				-- Check if the weapon is restricted and for what group, or if it's the attachment
+				if weapon == GetHashKey(weaponArr[j]) then
+					-- This weapon is restricted unless they have this role perm
+					requiredPerm = i
+					restrictedStr = weaponArr[j]
+					break
+				elseif (HasPedGotWeaponComponent(ped, weapon, GetHashKey(weaponArr[j]))) then
+					-- It's restricted unless they have this role perm
+					requiredPerm = i
+					restrictedStr = weaponArr[j]
+					break
+				end
+			end
+		end
+		--TriggerServerEvent("Print:PrintDebug", "It gets here 2") -- DEBUG - GET RID OF
+		-- Check their perms
+		if not has_value(isAllowed, requiredPerm) and requiredPerm ~= nil then
+			-- Does not have perms to use this
+			RemoveWeaponFromPed(ped, weapon)
+			DisplayNotification("~r~Weapon Restricted! \n~w~You aren't a high enough rank to use this!\n" .. restrictedStr)
+		end
+		--TriggerServerEvent("Print:PrintDebug", "It gets here 3") -- DEBUG - GET RID OF
+	end
+end)
+
+function DisplayNotification( text )
+    SetNotificationTextEntry( "STRING" )
+    AddTextComponentString( text )
+    DrawNotification( false, false )
+end

resources/[EGRP-Discord-Integration]/Discord-WepRestriction-Legacy/server.lua

@@ -0,0 +1,53 @@
+--------------------------
+--- DiscordWeaponPerms ---
+--------------------------
+roleList = {
+"Civilian I",  -- Civilian I (1)
+"Civilian II",      -- Civilian II (2)
+"Civilian III",     -- Civilian III (3)
+"Civilian IV", 	    -- Civilian IV (4)
+"Civilian V",	    -- Civilian V (5)
+"EG | Helper", 			-- Mod (6)
+"EG | Staff", 		-- Admin (7)
+"EG | Sr. Staff",   -- Management (8)
+"EG | Moderator", 		-- Owner (9)
+"EG | Sr. Moderator", 		-- Owner (10)
+"EG | Admin", 		-- Owner (11)
+"EG | Sr. Admin", 		-- Owner (12)
+"EG | Head of Staff", 		-- Owner (13)
+"EG | Server Developer", 		-- Owner (14)
+"EG | Owner", 		-- Owner (15)
+}
+
+
+RegisterNetEvent('Print:PrintDebug')
+AddEventHandler('Print:PrintDebug', function(msg)
+	print(msg)
+	TriggerClientEvent('chatMessage', -1, "^7[^1Badger's Scripts^7] ^1DEBUG ^7" .. msg)
+end)
+
+RegisterNetEvent("DiscordWeaponPerms:CheckPerms")
+AddEventHandler("DiscordWeaponPerms:CheckPerms", function()
+	local src = source
+	for k, v in ipairs(GetPlayerIdentifiers(src)) do
+		if string.sub(v, 1, string.len("discord:")) == "discord:" then
+			identifierDiscord = v
+		end
+	end
+	local hasPerms = {} -- Has perms for indexes:
+	if identifierDiscord then
+		local roleIDs = exports.Badger_Discord_API:GetDiscordRoles(src)
+		if not (roleIDs == false) then
+			for i = 1, #roleList do
+				for j = 1, #roleIDs do
+					if exports.Badger_Discord_API:CheckEqual(roleList[i], roleIDs[j]) then
+						table.insert(hasPerms, i)
+					end
+				end
+			end
+		else
+		print(GetPlayerName(src) .. " has not gotten their permissions cause roleIDs == false")
+		end
+	end
+	TriggerClientEvent('DiscordWeaponPerms:CheckPerms:Return', src, hasPerms)
+end)

resources/[EGRP-Discord-Integration]/Discord-WepRestriction/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Jared Scarito
+Copyright (c) 2022 IC-Technologies
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

resources/[EGRP-Discord-Integration]/Discord-WepRestriction/README.md

@@ -1,67 +1,64 @@
-# DiscordWeaponPerms
+# ImprovedDiscordWeaponPerms
-## Continued Documentation
-https://docs.badger.store/fivem-discord-scripts/discordweaponperms
-## Discontinued Documentation
-**Version 1.0** 
 
-Another discord script of course! With this script, you can restrict weapons to certain roles on your discord server! This script also allows restricting certain attachments to different groups as well (however, it'll remove the weapon if they have the attachment, I'll eventually update it to just remove the attachment from the weapon).
+## What is it?
+ImprovedDiscordWeaponPerms is a Discord based weapon restriction script. It is a fork of [JaredScar's original DiscordWeaponPerms](https://github.com/JaredScar/DiscordWeaponPerms) - I have rewritten it and added inheritances for roles and also added t-notify integration, as well as more config options and seperate messages for components and weapons with model names.
 
-https://i.gyazo.com/52a7106f1db9c309c28ff012b8127ae2.gif
+## Requirement
+https://forum.cfx.re/t/release-badger-discord-api/1698464
 
-You must set up IllusiveTea's discord_perms script for this to work properly. --> https://forum.fivem.net/t/discord-roles-for-permissions-im-creative-i-know/233805
+## Configuration
+* It should be noted that for `Config.Inheritances`, the roleNames and roleIDs should match up with the ones specified in `Config.WeaponRestrictions`.
 
-**How it works**
+* Also, inheritance only inherits the role groups listed. Inheriting `RoleName2` which inherits `RoleName1` would not be inherited for `RoleName3`.
-```
+```lua
-roleList = {
+Config = {
-1, -- Trusted Civ (1)
+	WeaponRestrictedMessage = "~r~This Weapon is restricted",
-1, -- Donator (2)
+	ComponentRestrictedMessage = "~r~This Component is restricted",
-1, -- Personal (3)
+	InheritanceEnabled = true,
+	-- Set to true if you use the t-notify plugin for notifications.
+	usingTnotify = false,
+	-- How often the script checks for restricted weapons (in milliseconds)
+	updateTime = 2000,
+	-- Whether or not the script shows the name of the model being restricted. If true, it will append the weapon/component name to the end of the message.
+	showWeaponOrComponentName = true
+}
+
+--[[
+Weapon components list: https://wiki.rage.mp/index.php?title=Weapons_Components
+Weapon list: https://runtime.fivem.net/doc/natives/#_0xBF0FD6E56C964FCB
+]]--
+
+-- This Script uses the nicknames for roles listed in Badger_Discord_API. 
+Config.WeaponRestrictions = {
+	--['RoleName or ID'] = {
+	--	"Weapon1/Component1",
+	--	"Weapon2/Component2",
+	--	"Weapon3/Component3",
+	--	"Weapon4/Component4"
+	--},
+
+	['RoleName1'] = {
+		""
+	},
+	['RoleName2'] = {
+		""
+	},
+	['RoleName3'] = {
+		""
+	},
+	['RoleName4'] = {
+		""
+	}
+}
+
+-- Requires Config.InheritanceEnabled to be = true
+Config.Inheritances = {
+	--['RoleName or ID'] = {'RoleName2', 'RoleName3', 'RoleName4'},
+	['RoleName1'] = {'RoleName2', 'RoleName3', 'RoleName4'},
+	['RoleName2'] = {'RoleName3', 'RoleName4'},
+	['RoleName3'] = {'RoleName4'},
+	['RoleName4'] = {}
 }
 ```
-responds to it's respective number within the other list:
+## Download
-```
+https://github.com/IC-Technologies/ImprovedDiscordWeaponPerms/releases
-restrictedWeapons = {
-{}, -- Trusted Civ (1)
-{}, -- Donator (2)
-{
-"WEAPON_RPG",
-}, -- Personal (3)
-}
-```
-
-The RPG weapon would then be restricted to only people with personal discord role within your discord server. 
-
-It's quite simple :slight_smile:
-
- 
-**Installation**
-1. Download DiscordWeaponPerms
-2. Extract the .zip and place the folder in your /resources/ of your Fivem server
-3. Make sure you add “start DiscordWeaponPerms” in your server.cfg
-4. Enjoy :slight_smile:
-
-**Download**
-[DiscordWeaponPerms](https://github.com/TheWolfBadger/DiscordWeaponPerms)
-
-
-
-**My Other Work**
-
-[DiscordChatRoles](https://forum.fivem.net/t/discordchatroles-release/566338)
-
-[DiscordAcePerms](https://forum.fivem.net/t/discordaceperms-release/573044)
-
-[SandyVehiclesRestrict](https://forum.fivem.net/t/release-sandy-vehicles-restrict/564929)
-
-[DiscordTagIDs](https://forum.fivem.net/t/discordtagids-i-know-i-know-i-only-make-discord-based-scripts/582513)
-
-[DiscordVehiclesRestrict](https://forum.fivem.net/t/discordvehiclesrestrict/599594)
-
-[DiscordPedPerms](https://forum.fivem.net/t/release-discordpedperms/642866)
-
-[BadgerAnims](https://forum.fivem.net/t/release-badgeranims/650517)
-
-[DiscordWeaponPerms](https://forum.fivem.net/t/release-discordweaponperms/664774)
-
-**Version 2.0**
-- Removing restricted weapon attachments from weapon instead of whole weapon?

resources/[EGRP-Discord-Integration]/Discord-WepRestriction/client.lua

@@ -1,82 +1,93 @@
---------------------------
+-------------------------------
---- DiscordWeaponPerms ---
+-- ImprovedDiscordWeaponPerms -
---------------------------
+--------IC-Technologies--------
-restrictedWeapons = {
+-------------------------------
-{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 1
+
-{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 3
+restrictedWeapons = Config.WeaponRestrictions;
-{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 4
+myRoles = nil;
-{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 5
+
-{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 6
+RegisterNetEvent('ImprovedDiscordWeaponPerms:CheckPerms:Return')
-{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 7
+AddEventHandler('ImprovedDiscordWeaponPerms:CheckPerms:Return', function(roles)
-{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 8
+	myRoles = roles;
-{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 9
-{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 10
-{}, -- 11
-{}, -- 12
-{}, -- 13
-{}, -- 14
-{}, -- 15
-}
---[[
-Weapon components list: https://wiki.rage.mp/index.php?title=Weapons_Components
-Weapon list: https://runtime.fivem.net/doc/natives/#_0xBF0FD6E56C964FCB
-]]--
-isAllowed = {}
-RegisterNetEvent('DiscordWeaponPerms:CheckPerms:Return')
-AddEventHandler('DiscordWeaponPerms:CheckPerms:Return', function(hasPerms)
-	isAllowed = hasPerms
 end)
-function has_value (tab, val)
+
-    for index, value in ipairs(tab) do
-        if value == val then
-            return true
-        end
-    end
-    return false
-end
-alreadyRan = false
 Citizen.CreateThread(function()
+	TriggerServerEvent("ImprovedDiscordWeaponPerms:CheckPerms")
     while true do
-        Citizen.Wait(1000)
+        Citizen.Wait(Config.updateTime)
-		if not alreadyRan then
+		local PlayerPED = PlayerPedId()
-			TriggerServerEvent("DiscordWeaponPerms:CheckPerms")
+		local playerWeapon = GetSelectedPedWeapon(PlayerPED)
-			alreadyRan = true
+		local playerComponentHash = nil;
-		end
+		local playerComponentName = nil;
-		--TriggerServerEvent("Print:PrintDebug", "It gets here 1") -- DEBUG - GET RID OF
+		local playerWeaponName = nil;
-		local ped = GetPlayerPed(-1)
+		local requiredPerm = nil;
-		local weapon = GetSelectedPedWeapon(ped)
+		hasPerm = false;
-		local restrictedStr = ""
+
-		local requiredPerm = nil
+		for role, val in pairs(myRoles) do
-		for i=1, #restrictedWeapons do
+			if (val == true) then
-			local weaponArr = restrictedWeapons[i]
+				local weapons = Config.WeaponRestrictions[role];
-			for j=1, #weaponArr do
+				for i = 1, #weapons do
-				-- Check if the weapon is restricted and for what group, or if it's the attachment
+					if (weapons[i] ~= nil) then
-				if weapon == GetHashKey(weaponArr[j]) then
+						if (playerWeapon == GetHashKey(tostring(weapons[i]))) then
-					-- This weapon is restricted unless they have this role perm
+							requiredPerm = true;
-					requiredPerm = i
+							hasPerm = true;
-					restrictedStr = weaponArr[j]
+						elseif HasPedGotWeaponComponent(PlayerPED, playerWeapon, GetHashKey(tostring(weapons[i]))) then 
-					break
+							requiredPerm = true;
-				elseif (HasPedGotWeaponComponent(ped, weapon, GetHashKey(weaponArr[j]))) then
+							hasPerm = true;
-					-- It's restricted unless they have this role perm
+						end
-					requiredPerm = i
+					end
-					restrictedStr = weaponArr[j]
-					break
 				end
 			end
 		end
-		--TriggerServerEvent("Print:PrintDebug", "It gets here 2") -- DEBUG - GET RID OF
+
-		-- Check their perms
+		if not hasPerm then
-		if not has_value(isAllowed, requiredPerm) and requiredPerm ~= nil then
+			local weapons = Config.WeaponRestrictions;
-			-- Does not have perms to use this
+			for role, weaponList in pairs(weapons) do
-			RemoveWeaponFromPed(ped, weapon)
+				for i = 1, #weaponList do
-			DisplayNotification("~r~Weapon Restricted! \n~w~You aren't a high enough rank to use this!\n" .. restrictedStr)
+					if (playerWeapon == GetHashKey(tostring(weaponList[i]))) then
+						requiredPerm = true;
+						playerWeaponName = weaponList[i];
+					elseif HasPedGotWeaponComponent(PlayerPED, playerWeapon, GetHashKey(tostring(weaponList[i]))) then 
+						requiredPerm = true;
+						playerComponentHash = GetHashKey(tostring(weaponList[i]));
+						playerComponentName = tostring(weaponList[i]);
+					end
+				end
+			end
+		end
+
+		-- If doesn't have permission, it's a restricted weapon/component to them
+		if not hasPerm and (requiredPerm ~= nil) then
+			if playerComponentHash ~= nil then
+				RemoveWeaponComponentFromPed(PlayerPED, playerWeapon, playerComponentHash)
+				if Config.showWeaponOrComponentName then
+					DisplayNotification(Config.ComponentRestrictedMessage .. " (" .. playerComponentName .. ")")
+				else
+					DisplayNotification(Config.ComponentRestrictedMessage)
+				end
+			else
+				if (playerWeapon ~= nil) and (playerWeapon ~= 0) then
+					RemoveWeaponFromPed(PlayerPED, playerWeapon)
+					if Config.showWeaponOrComponentName then
+						DisplayNotification(Config.WeaponRestrictedMessage .. " (" .. playerWeaponName .. ")")
+					else
+						DisplayNotification(Config.WeaponRestrictedMessage)
+					end
+				end
+			end
 		end
-		--TriggerServerEvent("Print:PrintDebug", "It gets here 3") -- DEBUG - GET RID OF
 	end
 end)
 
 function DisplayNotification( text )
-    SetNotificationTextEntry( "STRING" )
+	if Config.usingTnotify then
-    AddTextComponentString( text )
+		exports['t-notify']:Alert({
-    DrawNotification( false, false )
+			style = 'error',
+			message = text
+		})
+	else
+		SetNotificationTextEntry( "STRING" )
+		AddTextComponentString( text )
+		DrawNotification( false, false )
+	end
 end

resources/[EGRP-Discord-Integration]/Discord-WepRestriction/config.lua

@@ -0,0 +1,71 @@
+Config = {
+	WeaponRestrictedMessage = "~r~This Weapon is restricted",
+	ComponentRestrictedMessage = "~r~This Component is restricted",
+	InheritanceEnabled = false,
+	-- Set to true if you use the t-notify plugin for notifications.
+	usingTnotify = false,
+	-- How often the script checks for restricted weapons (in milliseconds)
+	updateTime = 2000,
+	-- Whether or not the script shows the name of the model being restricted. If true, it will append the weapon/component name to the end of the message.
+	showWeaponOrComponentName = true
+}
+
+--[[
+Weapon components list: https://wiki.rage.mp/index.php?title=Weapons_Components
+Weapon list: https://runtime.fivem.net/doc/natives/#_0xBF0FD6E56C964FCB
+]]--
+
+-- This Script uses the nicknames for roles listed in Badger_Discord_API. 
+Config.WeaponRestrictions = {
+	['EG | Helper'] = {
+
+	},
+	['EG | Staff'] = {
+
+	},
+	['EG | Sr. Staff'] = {
+
+	},
+	['EG | Moderator'] = {
+
+	},
+	['EG | Sr. Moderator'] = {
+
+	},
+	['EG | Admin'] = {
+		"WEAPON_PROXMINE", 
+		"WEAPON_GRENADELAUNCHER",
+		"WEAPON_RPG",
+		"WEAPON_MINIGUN",
+		"WEAPON_FIREWORK",
+		"WEAPON_RAILGUN", 
+		"WEAPON_HOMINGLAUNCHER",
+		"WEAPON_STICKYBOMB",
+		"WEAPON_COMPACTLAUNCHER",
+		"WEAPON_RAYPISTOL", 
+		"WEAPON_RAYCARBINE",
+		"WEAPON_RAYMINIGUN",
+		"WEAPON_PIPEBOMB",
+	},
+	['EG | Sr. Admin'] = {
+
+	},
+	['EG | Head of Staff'] = {
+
+	},
+	['EG | Server Developer'] = {
+
+	},
+	['EG | Owner'] = {
+
+	},
+}
+
+-- Requires Config.InheritanceEnabled to be = true
+Config.Inheritances = {
+	--['RoleName or ID'] = {'RoleName2', 'RoleName3', 'RoleName4'},
+	['RoleName1'] = {'RoleName2', 'RoleName3', 'RoleName4'},
+	['RoleName2'] = {'RoleName3', 'RoleName4'},
+	['RoleName3'] = {'RoleName4'},
+	['RoleName4'] = {}
+}

resources/[EGRP-Discord-Integration]/Discord-WepRestriction/fxmanifest.lua

@@ -0,0 +1,24 @@
+-------------------------------
+--- ImprovedDiscordWeaponPerms ---
+--------IC-Technologies--------
+-------------------------------
+
+fx_version 'cerulean'
+game 'gta5'
+
+author 'IC-Technologies --> Original script by JaredScar on GitHub'
+description 'ImprovedDiscordWeaponPerms by IC-Technologies on Github'
+version '1.0.2'
+
+shared_script {
+  "config.lua"
+}
+
+client_scripts { 
+  "client.lua"
+}
+
+server_scripts {
+  "server.lua",
+  "version-check.lua"
+}

resources/[EGRP-Discord-Integration]/Discord-WepRestriction/server.lua

@@ -1,53 +1,46 @@
---------------------------
+-------------------------------
---- DiscordWeaponPerms ---
+-- ImprovedDiscordWeaponPerms -
---------------------------
+--------IC-Technologies--------
-roleList = {
+-------------------------------
-"Civilian I",  -- Civilian I (1)
-"Civilian II",      -- Civilian II (2)
-"Civilian III",     -- Civilian III (3)
-"Civilian IV", 	    -- Civilian IV (4)
-"Civilian V",	    -- Civilian V (5)
-"EG | Helper", 			-- Mod (6)
-"EG | Staff", 		-- Admin (7)
-"EG | Sr. Staff",   -- Management (8)
-"EG | Moderator", 		-- Owner (9)
-"EG | Sr. Moderator", 		-- Owner (10)
-"EG | Admin", 		-- Owner (11)
-"EG | Sr. Admin", 		-- Owner (12)
-"EG | Head of Staff", 		-- Owner (13)
-"EG | Server Developer", 		-- Owner (14)
-"EG | Owner", 		-- Owner (15)
-}
 
-
+RegisterNetEvent("ImprovedDiscordWeaponPerms:CheckPerms")
-RegisterNetEvent('Print:PrintDebug')
+AddEventHandler("ImprovedDiscordWeaponPerms:CheckPerms", function()
-AddEventHandler('Print:PrintDebug', function(msg)
-	print(msg)
-	TriggerClientEvent('chatMessage', -1, "^7[^1Badger's Scripts^7] ^1DEBUG ^7" .. msg)
-end)
-
-RegisterNetEvent("DiscordWeaponPerms:CheckPerms")
-AddEventHandler("DiscordWeaponPerms:CheckPerms", function()
 	local src = source
+	local userRoles = {}
+
 	for k, v in ipairs(GetPlayerIdentifiers(src)) do
 		if string.sub(v, 1, string.len("discord:")) == "discord:" then
 			identifierDiscord = v
 		end
 	end
-	local hasPerms = {} -- Has perms for indexes:
+
 	if identifierDiscord then
 		local roleIDs = exports.Badger_Discord_API:GetDiscordRoles(src)
+
 		if not (roleIDs == false) then
-			for i = 1, #roleList do
+			for i = 1, #roleIDs do
-				for j = 1, #roleIDs do
+				for role, PEDs in pairs(Config.WeaponRestrictions) do
-					if exports.Badger_Discord_API:CheckEqual(roleList[i], roleIDs[j]) then
+					if exports.Badger_Discord_API:CheckEqual(role, roleIDs[i]) then
-						table.insert(hasPerms, i)
+						userRoles[role] = true;
+						print("[ImprovedDiscordWeaponPerms] " .. GetPlayerName(src) .. " has received permission for role: " .. tostring(role) );
+						if Config.InheritanceEnabled then
+							local inheritedRoles = Config.Inheritances[role];
+							if inheritedRoles ~= nil then
+								--There are inherited roles
+								for j = 1, #inheritedRoles do
+									userRoles[ inheritedRoles[j] ] = true;
+									print("[ImprovedDiscordWeaponPerms] " .. GetPlayerName(src) .. " has inherited role: " .. tostring(inheritedRoles[j]));
+								end
+							end
+						end
 					end
 				end
 			end
 		else
-		print(GetPlayerName(src) .. " has not gotten their permissions cause roleIDs == false")
+		print("[ImprovedDiscordWeaponPerms] " .. GetPlayerName(src) .. " has not gotten their permissions because roleIDs == false")
 		end
+	elseif identifierDiscord == nil then
+		print("[ImprovedDiscordWeaponPerms] " .. "identifierDiscord == nil")
 	end
-	TriggerClientEvent('DiscordWeaponPerms:CheckPerms:Return', src, hasPerms)
+	TriggerClientEvent('ImprovedDiscordWeaponPerms:CheckPerms:Return', src, userRoles)
-end)
+end)

resources/[EGRP-Discord-Integration]/Discord-WepRestriction/version-check.lua

@@ -0,0 +1,19 @@
+function GetCurrentVersion()
+	return GetResourceMetadata(GetCurrentResourceName(), "version")
+end 
+
+PerformHttpRequest("https://raw.githubusercontent.com/IC-Technologies/ImprovedDiscordWeaponPerms/master/version.txt", function(error, updatedVersion, headers)
+	Citizen.Wait(2500)
+	local currentVersion = GetCurrentVersion()
+	if (updatedVersion ~= nil) and (currentVersion ~= nil) then 
+		print("Current Version: " .. currentVersion)
+		print("Latest Version: " .. updatedVersion)
+		if (updatedVersion ~= currentVersion) then
+			print('ImprovedDiscordWeaponPerms is outdated, go to https://github.com/IC-Technologies/RP_Commands/releases to get the latest version.')
+		else
+			print('ImprovedDiscordWeaponPerms is up to date!')
+		end
+	else 
+		print('There was an error in the checks for the latest version, if the issue persists open an issue @ https://github.com/IC-Technologies/ImprovedDiscordWeaponPerms/issues.')
+	end 
+end)

resources/[EGRP-Discord-Integration]/Discord-WepRestriction/version.txt

@@ -0,0 +1 @@
+1.0.2

resources/generic/__resource.lua

@@ -1 +0,0 @@
-resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937'

resources/ptelevision/config.lua

@@ -130,7 +130,8 @@ Config.Locations = { -- REMOVE ALL IF NOT USING ONESYNC, OR IT SHALL BREAK.
 }
 
 Config.Channels = { -- These channels are default channels and cannot be overriden.
-    {name = "Twitch", url = "twitch.tv/twitch"},
+    {name = "Twitch", url = "twitch.tv/thatguyjacobee"},
+	{name = "YouTube", url = "youtube.com/thatguyjacobee"},
 }
 
 Config.BannedWords = {

resources/radio/__resource.lua

@@ -1,15 +0,0 @@
-resource_manifest_version "44febabe-d386-4d18-afbe-5e627f4af937"
-
--- Example custom radios
-supersede_radio "RADIO_21_DLC_XM17" { url = "https://live.truckers.fm/", volume = 0.40 }
-
-files {
-	"index.html"
-}
-
-ui_page "index.html"
-
-client_scripts {
-	"data.js",
-	"client.js"
-}

resources/radio/client.js

@@ -86,4 +86,4 @@ setTick(() => {
         SendNuiMessage(JSON.stringify({ "type": "volume", "volume": volume }));
         previousVolume = volume;
     }
-});
+});

resources/radio/data.js

@@ -8,6 +8,7 @@ const availableRadios = [
     "RADIO_07_DANCE_01",                // Soulwax FM
     "RADIO_08_MEXICAN",                 // East Los FM
     "RADIO_09_HIPHOP_OLD",              // West Coast Classics
+    "RADIO_11_TALK_02",                 // Blaine County Radio
     "RADIO_12_REGGAE",                  // Blue Ark
     "RADIO_13_JAZZ",                    // Worldwide FM
     "RADIO_14_DANCE_02",                // FlyLo FM
@@ -17,9 +18,12 @@ const availableRadios = [
     "RADIO_18_90S_ROCK",                // Vinewood Boulevard Radio
     "RADIO_19_USER",                    // Self Radio
     "RADIO_20_THELAB",                  // The Lab
-    "RADIO_11_TALK_02",                 // Blaine County Radio
     "RADIO_21_DLC_XM17",                // Blonded Los Santos 97.8 FM
     "RADIO_22_DLC_BATTLE_MIX1_RADIO",   // Los Santos Underground Radio
+    "RADIO_23_DLC_XM19_RADIO",          // iFruit Radio
+    "RADIO_27_DLC_PRHEI4",              // Still Slipping Los Santos
     "RADIO_34_DLC_HEI4_KULT",           // Kult FM
-    "RADIO_35_DLC_HEI4_MLR"             // The Music Locker
+    "RADIO_35_DLC_HEI4_MLR",            // The Music Locker
-];
+    "RADIO_36_AUDIOPLAYER",             // Media Player
+    "RADIO_37_MOTOMAMI"                 // MOTOMAMI Los Santos
+];

resources/radio/fxmanifest.lua

@@ -0,0 +1,20 @@
+fx_version 'bodacious'
+game 'gta5'
+
+author 'Hellslicer'
+description 'This resource allows you to integrate your own radios in place of the original radios'
+version '2.0.0'
+
+-- Example custom radios
+supersede_radio 'RADIO_21_DLC_XM17' { url = 'https://live.truckers.fm/', volume = 0.2, name = 'Truckers FM Live' }
+
+files {
+	'index.html'
+}
+
+ui_page 'index.html'
+
+client_scripts {
+	'data.js',
+	'client.js'
+}

resources/radio/index.html

@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/howler/2.1.2/howler.core.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/howler/2.2.3/howler.core.min.js"></script>
     <script>
         let customRadios;
 
@@ -123,4 +123,4 @@
 </head>
 <body>
 </body>
-</html>
+</html>

resources/vMenu/LICENSE.md

@@ -1,8 +1,7 @@
 Tom Grobbe - https://www.vespura.com/
 
-Copyright © 2017-2019
+Copyright © 2017-2023
 
-----
+You can use and edit this code to your liking as long as you don't ever claim it to be your own code and always provide proper credit. 
-
+You're **not** allowed to sell vMenu or any code you take from it.
-You can use and edit this code to your liking. However don't ever claim it to be your own code and always provide proper credit.
+If you want to release your own version of vMenu, you have to link the original GitHub repo, or release it via a Forked repo.
-I will, however, not help you if you want to modify my code.

resources/vMenu/README.md

@@ -73,12 +73,10 @@ vMenu v2.0.0 and earlier was [using a modified version of NativeUI](https://gith
 ## License
 **For an updated license, check the license.md file. That file will always overrule anything mentioned in the readme.md**
 
-
 Tom Grobbe - https://www.vespura.com/
 
-Copyright © 2017-2020
+Copyright © 2017-2023
 
-----
+You can use and edit this code to your liking as long as you don't ever claim it to be your own code and always provide proper credit. 
-
+You're **not** allowed to sell vMenu or any code you take from it.
-You can use and edit this code to your liking. However don't ever claim it to be your own code and always provide proper credit.
+If you want to release your own version of vMenu, you have to link the original GitHub repo, or release it via a Forked repo.
-I will, however, not help you if you want to modify my code.

resources/vMenu/bans.json

@@ -1,201 +0,0 @@
-[
-  {
-    "playerName": "SgtCarson1",
-    "identifiers": [
-      "steam:11000010e0916d9",
-      "license:c5119240be8978d13145c05e86c73b78ee8de969",
-      "ip:173.19.22.94"
-    ],
-    "bannedUntil": "3000-01-01T00:00:00",
-    "banReason": "FailRP-Blowing stuff up in a tank and refusing to delete the tank.",
-    "bannedBy": "ThatGuyJacobee"
-  },
-  {
-    "playerName": "baby",
-    "identifiers": [
-      "steam:11000013e28a3fd",
-      "license:c26074b264a3c96af1f4333d25f84ea61c895cd4",
-      "xbl:2535450674966295",
-      "live:985154088699507",
-      "discord:508605831571308554",
-      "ip:84.55.82.142"
-    ],
-    "bannedUntil": "3000-01-01T00:00:00",
-    "banReason": "Banned by staff. Spamming planes",
-    "bannedBy": "ThatGuyJacobee"
-  },
-  {
-    "playerName": "koekjesraps",
-    "identifiers": [
-      "steam:11000013bcfea3b",
-      "license:61c03a6b7d17f376544be7aa9f93d0b268ee172a",
-      "xbl:2535455005666334",
-      "live:1055521382261558",
-      "discord:396731212225445888",
-      "ip:86.95.168.83"
-    ],
-    "bannedUntil": "2020-05-17T14:40:12",
-    "banReason": "Banned by staff. No intention to RP",
-    "bannedBy": "ThatGuyJacobee"
-  },
-  {
-    "playerName": "Gijs",
-    "identifiers": [
-      "steam:11000013cca32d1",
-      "license:c57cd3aa1b28fe27497e86328096d1368942aa8e",
-      "discord:547841311735283722",
-      "ip:185.10.82.135"
-    ],
-    "bannedUntil": "2020-06-09T14:40:25",
-    "banReason": "Banned by staff. No intention to RP.",
-    "bannedBy": "ThatGuyJacobee"
-  },
-  {
-    "playerName": "yannick.basters",
-    "identifiers": [
-      "steam:11000011b2aeba6",
-      "license:32e99f222169341195ca3488c2989d19594073da",
-      "xbl:2535471773739869",
-      "live:1055521820292815",
-      "discord:311482080481509377",
-      "ip:84.24.159.193"
-    ],
-    "bannedUntil": "2020-06-09T14:40:34",
-    "banReason": "Banned by staff. Same thing",
-    "bannedBy": "ThatGuyJacobee"
-  },
-  {
-    "playerName": "(H-103) (H-627) J.Owens",
-    "identifiers": [
-      "steam:110000136aa4813",
-      "license:c5679e96620f1844da4c583ee373d09de93f20be",
-      "xbl:2535414589025480",
-      "live:844425273945257",
-      "discord:523902685855088683",
-      "ip:86.153.97.39"
-    ],
-    "bannedUntil": "3000-01-01T00:00:00",
-    "banReason": "Banned by staff. Impersonation",
-    "bannedBy": "ThatGuyJacobee"
-  },
-  {
-    "playerName": "r(I-114)(K-72) J.Scott",
-    "identifiers": [
-      "steam:110000141208a43",
-      "license:1c1b1d289cb7dd433ac11b7ade9046f2c96800ac",
-      "xbl:2533274852584957",
-      "live:1055520486691716",
-      "discord:521297645143326722",
-      "ip:109.148.195.154"
-    ],
-    "bannedUntil": "3000-01-01T00:00:00",
-    "banReason": "Banned by staff. Impersonaton",
-    "bannedBy": "ThatGuyJacobee"
-  },
-  {
-    "playerName": "(E-149) Sergeant L. Myers",
-    "identifiers": [
-      "steam:11000013ec2aba3",
-      "license:ef2fa09f68d707b7861046fe794c2a8a8439e109",
-      "discord:683254498801877023",
-      "ip:82.30.239.214"
-    ],
-    "bannedUntil": "3000-01-01T00:00:00",
-    "banReason": "Banned by staff. Spamming Tugs and FAILRP at its finest...",
-    "bannedBy": "ThatGuyJacobee"
-  },
-  {
-    "playerName": "r Jerald",
-    "identifiers": [
-      "steam:11000010bd03001",
-      "license:3e2cdeafb7763e5a645c3edd03f2f36bd715ad69",
-      "xbl:2535462029302936",
-      "live:1055521810913630",
-      "discord:525685433351536652",
-      "ip:77.101.206.144"
-    ],
-    "bannedUntil": "3000-01-01T00:00:00",
-    "banReason": "Banned by staff. FailRP at it's finest.",
-    "bannedBy": "ThatGuyJacobee"
-  },
-  {
-    "playerName": "icecoob",
-    "identifiers": [
-      "steam:110000135a86d90",
-      "license:7a0f169391a114439e89486c65027e24cab67430",
-      "discord:492321577627811840",
-      "ip:85.75.77.14"
-    ],
-    "bannedUntil": "2020-08-05T17:46:07",
-    "banReason": "Banned by staff. Mass RDM",
-    "bannedBy": "ThatGuyJacobee"
-  },
-  {
-    "playerName": "PAK1MEZ",
-    "identifiers": [
-      "steam:11000013ed59c40",
-      "license:04a7a73c695b77179c391b8e28e96b23bed5b383",
-      "xbl:2535451426090981",
-      "live:985154618780221",
-      "discord:716008335513485395",
-      "fivem:1154014",
-      "ip:82.42.113.96"
-    ],
-    "bannedUntil": "3000-01-01T00:00:00",
-    "banReason": "Banned by staff. FUCK OF BITCH",
-    "bannedBy": "ThatGuyJacobee"
-  },
-  {
-    "playerName": "Zhon",
-    "identifiers": [
-      "steam:11000013495941d",
-      "license:5418daaf262dabadd2c57268b9cae7b9ff25809a",
-      "xbl:2535431302464018",
-      "live:844425038985140",
-      "ip:31.13.189.90"
-    ],
-    "bannedUntil": "3000-01-01T00:00:00",
-    "banReason": "Banned by staff.goodbye sir",
-    "bannedBy": "King Rodriguez ]"
-  },
-  {
-    "playerName": "hellboy",
-    "identifiers": [
-      "steam:1100001169a3f72",
-      "license:6b19d10ca89b4429977c68e8fe585d0a6c8b6068",
-      "xbl:2533274918578844",
-      "live:985156704844869",
-      "ip:209.126.88.164"
-    ],
-    "bannedUntil": "3000-01-01T00:00:00",
-    "banReason": "Banned by staff.get help goodbye sr",
-    "bannedBy": "King Rodriguez ]"
-  },
-  {
-    "playerName": "B. Lawrence",
-    "identifiers": [
-      "steam:11000011c9219ce",
-      "license:53ca9891772841ff30650100d59152feffc68529",
-      "xbl:2535446364345304",
-      "live:985154220310247",
-      "discord:329740832418824203",
-      "ip:196.53.0.113"
-    ],
-    "bannedUntil": "3000-01-01T00:00:00",
-    "banReason": "Banned by staff.goodbye sir",
-    "bannedBy": "King Rodriguez ]"
-  },
-  {
-    "playerName": "DEVIL",
-    "identifiers": [
-      "steam:11000014616f9f8",
-      "license:b278e366a57319009838d3cfe4f56bb9fd68d1c2",
-      "discord:783816526532837418",
-      "license2:b278e366a57319009838d3cfe4f56bb9fd68d1c2",
-      "ip:5.108.145.23"
-    ],
-    "bannedUntil": "3000-01-01T00:00:00",
-    "banReason": "Banned by staff.bye",
-    "bannedBy": "DR-KingRodriguez"
-  }
-]

resources/vMenu/config/permissions.cfg

@@ -24,8 +24,8 @@ setr vmenu_keep_spawned_vehicles_persistent false
 
 # Automatically ban cheaters? This feature is not 100% reliable so that's why it's disabled 
 # by default.
-setr vmenu_auto_ban_cheaters true
+setr vmenu_auto_ban_cheaters false
-setr vmenu_auto_ban_cheaters_ban_message "SYSTEM: You have been automatically banned. If you believe this was done by error, please contact a staff member on our discord or forum."
+setr vmenu_auto_ban_cheaters_ban_message "You have been automatically banned for cheating. If you believe this was done by error, please head over to our Discord server @ discord.elite-gaming.gg for support."
 
 # Log ban actions to the "vmenu.log" file?
 setr vmenu_log_ban_actions true
@@ -50,8 +50,8 @@ setr vmenu_quit_session_in_rockstar_editor false
 # Keep it short though, because the description box's size is limited.
 # The second convar is for the url/domain name of your community, which will be displayed as a label on
 # the right side of the info button. examples: https://www.vespura.com/hi/i/2018-12-09_23-43_9b003_349.png
-setr vmenu_server_info_message "About this server, Discord: discord.eguk.me"
+setr vmenu_server_info_message "Join our Discord Community today! @ discord.elite-gaming.gg"
-setr vmenu_server_info_website_url "www.elite-gaming.co.uk"
+setr vmenu_server_info_website_url "elite-gaming.gg"
 
 # Set the keybind that will be used for the 'teleport to waypoint' keybind 
 # Only used if enabled in the menu by the user, and if the user has permission
@@ -74,19 +74,24 @@ setr vmenu_enable_animals_spawn_menu false
 # Default: 0
 setr vmenu_pvp_mode 0
 
+# Sets whether or not players can lose their head props when they are hit/pushed.
+# true = Props will stay on player (default vMenu and GTA Online behavior)
+# false = vMenu will not touch this feature, by default this means that head props will fall off when the player is hit, which is the default behavior for GTA V Single Player peds.
+setr keep_player_head_props true
+
 # Set this to true if you don't want vMenu to use any server information convars.
 setr vmenu_disable_server_info_convars false
 
 # Distance for playerblips to showup. This is using "game units" as measurement. It's unknown
 # what this is in relation to meters or something similar, but 500.0 seems fine in most cases.
-setr vmenu_player_names_distance 500.0
+setr vmenu_player_names_distance 750.0
 
 # Disables the entity model outlines, model hashes, entity handles development tools section.
 setr vmenu_disable_entity_outlines_tool false
 
 # This message gets added at the end of all ban messages, use this to show users where they can contact the server staff team in case
 # they want to appeal it or if they have any questions.
-setr vmenu_default_ban_message_information "Please contact the staff team by going to (support url) if you want to appeal this ban"
+setr vmenu_default_ban_message_information "Please contact the staff team by going to discord.elite-gaming.gg if you want to appeal this ban"
 
 ### Weather options ###
 # Set this to false to disable weather sync from vMenu globally.
@@ -123,6 +128,11 @@ setr vmenu_current_minute 0
 # Enabling this will prevent you from setting a custom time, freezing the time and changing the time duration.
 setr vmenu_sync_to_machine_time false
 
+### Vehicle options ###
+# Setting this to true will enable the chameleon colour vehicle paints category in the primary colours menu.
+# You must be streaming the chameleon colours in order for this to function properly.
+setr vmenu_using_chameleon_colours true
+
 
 #############################################################################################
 #                                    vMenu PERMISSIONS                                      #
@@ -181,7 +191,6 @@ add_ace builtin.everyone "vMenu.OnlinePlayers.Menu" allow
 #add_ace builtin.everyone "vMenu.OnlinePlayers.All" allow
 add_ace builtin.everyone "vMenu.OnlinePlayers.Teleport" allow
 add_ace builtin.everyone "vMenu.OnlinePlayers.Waypoint" allow
-#add_ace builtin.everyone "vMenu.OnlinePlayers.Spectate" allow
 add_ace group.helper "vMenu.OnlinePlayers.Spectate" allow
 
 # Moderators & admins only:
@@ -206,21 +215,14 @@ add_ace group.admin "vMenu.OnlinePlayers.SeePrivateMessages" allow
 #       PLAYER OPTIONS MENU        #
 ####################################
 add_ace builtin.everyone "vMenu.PlayerOptions.Menu" allow
-#add_ace builtin.everyone "vMenu.PlayerOptions.All" allow
+add_ace group.admin "vMenu.PlayerOptions.All" allow
-add_ace builtin.superadmin "vMenu.PlayerOptions.All" allow
-#add_ace builtin.everyone "vMenu.PlayerOptions.God" allow
 add_ace group.moderator "vMenu.PlayerOptions.God" allow
-#add_ace builtin.everyone "vMenu.PlayerOptions.Invisible" allow
+add_ace group.moderator "vMenu.PlayerOptions.Invisible" allow
-add_ace group.staff "vMenu.PlayerOptions.Invisible" allow
 add_ace builtin.everyone "vMenu.PlayerOptions.UnlimitedStamina" allow
-#add_ace builtin.everyone "vMenu.PlayerOptions.FastRun" allow
+add_ace group.moderator "vMenu.PlayerOptions.FastRun" allow
-add_ace group.admin "vMenu.PlayerOptions.FastRun" allow
+add_ace group.moderator "vMenu.PlayerOptions.FastSwim" allow
-#add_ace builtin.everyone "vMenu.PlayerOptions.FastSwim" allow
+add_ace group.moderator "vMenu.PlayerOptions.Superjump" allow
-add_ace group.admin "vMenu.PlayerOptions.FastSwim" allow
+add_ace group.moderator "vMenu.PlayerOptions.NoRagdoll" allow
-#add_ace builtin.everyone "vMenu.PlayerOptions.Superjump" allow
-add_ace group.admin "vMenu.PlayerOptions.Superjump" allow
-#add_ace builtin.everyone "vMenu.PlayerOptions.NoRagdoll" allow
-add_ace group.admin "vMenu.PlayerOptions.Admin" allow
 #add_ace builtin.everyone "vMenu.PlayerOptions.NeverWanted" allow
 #add_ace builtin.everyone "vMenu.PlayerOptions.SetWanted" allow
 #add_ace builtin.everyone "vMenu.PlayerOptions.Ignored" allow
@@ -231,7 +233,6 @@ add_ace builtin.everyone "vMenu.PlayerOptions.CleanPlayer" allow
 add_ace builtin.everyone "vMenu.PlayerOptions.DryPlayer" allow
 add_ace builtin.everyone "vMenu.PlayerOptions.WetPlayer" allow
 add_ace builtin.everyone "vMenu.PlayerOptions.VehicleAutoPilotMenu" allow
-#add_ace builtin.everyone "vMenu.PlayerOptions.Freeze" allow
 add_ace group.moderator "vMenu.PlayerOptions.Freeze" allow
 add_ace builtin.everyone "vMenu.PlayerOptions.Scenarios" allow
 
@@ -239,14 +240,13 @@ add_ace builtin.everyone "vMenu.PlayerOptions.Scenarios" allow
 #       VEHICLE OPTIONS MENU       #
 ####################################
 add_ace builtin.everyone "vMenu.VehicleOptions.Menu" allow
-#add_ace builtin.everyone "vMenu.VehicleOptions.All" allow
+add_ace group.admin "vMenu.VehicleOptions.All" allow
-add_ace group.superadmin "vMenu.VehicleOptions.All" allow
+add_ace group.moderator "vMenu.VehicleOptions.God" allow
-#add_ace builtin.everyone "vMenu.VehicleOptions.God" allow
-add_ace builtin.moderator "vMenu.VehicleOptions.God" allow
 add_ace builtin.everyone "vMenu.VehicleOptions.KeepClean" allow
 add_ace builtin.everyone "vMenu.VehicleOptions.Repair" allow
 add_ace builtin.everyone "vMenu.VehicleOptions.Wash" allow
 add_ace builtin.everyone "vMenu.VehicleOptions.Engine" allow
+add_ace builtin.everyone "vMenu.VehicleOptions.DestroyEngine" allow
 add_ace builtin.everyone "vMenu.VehicleOptions.BikeSeatbelt" allow
 add_ace builtin.everyone "vMenu.VehicleOptions.SpeedLimiter" allow
 add_ace builtin.everyone "vMenu.VehicleOptions.ChangePlate" allow
@@ -256,14 +256,10 @@ add_ace builtin.everyone "vMenu.VehicleOptions.Liveries" allow
 add_ace builtin.everyone "vMenu.VehicleOptions.Components" allow
 add_ace builtin.everyone "vMenu.VehicleOptions.Doors" allow
 add_ace builtin.everyone "vMenu.VehicleOptions.Windows" allow
-#add_ace builtin.everyone "vMenu.VehicleOptions.Freeze" allow
 add_ace group.moderator "vMenu.VehicleOptions.Freeze" allow
-#add_ace builtin.everyone "vMenu.VehicleOptions.Invisible" allow
 add_ace group.staff "vMenu.VehicleOptions.Invisible" allow
-#add_ace builtin.everyone "vMenu.VehicleOptions.TorqueMultiplier" allow
+add_ace group.moderator "vMenu.VehicleOptions.TorqueMultiplier" allow
-add_ace group.admin "vMenu.VehicleOptions.TorqueMultiplier" allow
+add_ace group.moderator "vMenu.VehicleOptions.PowerMultiplier" allow
-#add_ace builtin.everyone "vMenu.VehicleOptions.PowerMultiplier" allow
-add_ace group.admin "vMenu.VehicleOptions.PowerMultiplier" allow
 add_ace builtin.everyone "vMenu.VehicleOptions.Flip" allow
 add_ace builtin.everyone "vMenu.VehicleOptions.Alarm" allow
 add_ace builtin.everyone "vMenu.VehicleOptions.CycleSeats" allow
@@ -276,10 +272,9 @@ add_ace builtin.everyone "vMenu.VehicleOptions.Delete" allow
 add_ace builtin.everyone "vMenu.VehicleOptions.Underglow" allow
 add_ace builtin.everyone "vMenu.VehicleOptions.FlashHighbeamsOnHonk" allow
 add_ace builtin.everyone "vMenu.VehicleOptions.DisableTurbulence" allow
-#add_ace builtin.everyone "vMenu.VehicleOptions.InfiniteFuel" allow
+add_ace group.staff "vMenu.VehicleOptions.InfiniteFuel" allow
-add_ace group.helper "vMenu.VehicleOptions.InfiniteFuel" allow
+add_ace group.moderator "vMenu.VehicleOptions.VOFlares" allow
-add_ace builtin.everyone "vMenu.VehicleOptions.VOFlares" allow
+add_ace group.moderator "vMenu.VehicleOptions.VOPlaneBombs" allow
-#add_ace builtin.everyone "vMenu.VehicleOptions.VOPlaneBombs" allow
 
 ####################################
 #       VEHICLE SPAWNER MENU       #
@@ -327,6 +322,7 @@ add_ace builtin.everyone "vMenu.PersonalVehicle.Menu" allow
 add_ace builtin.everyone "vMenu.PersonalVehicle.All" allow
 #add_ace builtin.everyone "vMenu.PersonalVehicle.ToggleEngine" allow
 #add_ace builtin.everyone "vMenu.PersonalVehicle.ToggleLights" allow
+#add_ace builtin.everyone "vMenu.PersonalVehicle.ToggleStance" allow
 #add_ace builtin.everyone "vMenu.PersonalVehicle.KickPassengers" allow
 #add_ace builtin.everyone "vMenu.PersonalVehicle.LockDoors" allow # This grants both locking and unlocking the doors.
 #add_ace builtin.everyone "vMenu.PersonalVehicle.Doors" allow
@@ -370,14 +366,11 @@ add_ace group.admin "vMenu.WeatherOptions.All" allow
 #       WEAPON OPTIONS MENU        #
 ####################################
 add_ace builtin.everyone "vMenu.WeaponOptions.Menu" allow
-#add_ace builtin.everyone "vMenu.WeaponOptions.All" allow
+add_ace group.admin "vMenu.WeaponOptions.All" allow
-add_ace builtin.admin "vMenu.WeaponOptions.All" allow
+add_ace group.staff "vMenu.WeaponOptions.GetAll" allow
-add_ace builtin.everyone "vMenu.WeaponOptions.GetAll" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.RemoveAll" allow
-#add_ace builtin.everyone "vMenu.WeaponOptions.UnlimitedAmmo" allow
+add_ace builtin.everyone "vMenu.WeaponOptions.UnlimitedAmmo" allow
-add_ace group.moderator "vMenu.WeaponOptions.UnlimitedAmmo" allow
+add_ace group.admin "vMenu.WeaponOptions.NoReload" allow
-#add_ace builtin.everyone "vMenu.WeaponOptions.NoReload" allow
-add_ace group.moderator "vMenu.WeaponOptions.NoReload" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.Spawn" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.SpawnByName" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.SetAllAmmo" allow
@@ -407,23 +400,21 @@ add_ace builtin.everyone "vMenu.WeaponOptions.CombatMG" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.CombatMGMk2" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.CombatPDW" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.CombatPistol" allow
-# add_ace builtin.everyone "vMenu.WeaponOptions.CompactGrenadeLauncher" allow
+add_ace group.admin "vMenu.WeaponOptions.CompactGrenadeLauncher" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.CompactRifle" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.Crowbar" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.Dagger" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.DoubleAction" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.DoubleBarrelShotgun" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.FireExtinguisher" allow
-# add_ace builtin.everyone "vMenu.WeaponOptions.Firework" allow
 add_ace group.moderator "vMenu.WeaponOptions.Firework" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.Flare" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.FlareGun" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.Flashlight" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.GolfClub" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.Grenade" allow
-# add_ace builtin.everyone "vMenu.WeaponOptions.GrenadeLauncher" allow
 add_ace group.moderator "vMenu.WeaponOptions.GrenadeLauncher" allow
-# add_ace builtin.everyone "vMenu.WeaponOptions.GrenadeLauncherSmoke" allow
+add_ace group.moderator "vMenu.WeaponOptions.GrenadeLauncherSmoke" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.Gusenberg" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.Hammer" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.Hatchet" allow
@@ -431,7 +422,7 @@ add_ace builtin.everyone "vMenu.WeaponOptions.HeavyPistol" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.HeavyShotgun" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.HeavySniper" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.HeavySniperMk2" allow
-# add_ace builtin.everyone "vMenu.WeaponOptions.HomingLauncher" allow
+add_ace group.admin "vMenu.WeaponOptions.HomingLauncher" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.Knife" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.KnuckleDuster" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.MG" allow
@@ -442,25 +433,24 @@ add_ace builtin.everyone "vMenu.WeaponOptions.MarksmanRifle" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.MarksmanRifleMk2" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.MicroSMG" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.MiniSMG" allow
-# add_ace builtin.everyone "vMenu.WeaponOptions.Minigun" allow
+add_ace group.admin "vMenu.WeaponOptions.Minigun" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.Molotov" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.Musket" allow
-# add_ace builtin.everyone "vMenu.WeaponOptions.NightVision" allow
 add_ace group.moderator "vMenu.WeaponOptions.NightVision" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.Nightstick" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.Parachute" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.PetrolCan" allow
-# add_ace builtin.everyone "vMenu.WeaponOptions.PipeBomb" allow
+add_ace group.admin "vMenu.WeaponOptions.PipeBomb" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.Pistol" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.Pistol50" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.PistolMk2" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.PoolCue" allow
-# add_ace builtin.everyone "vMenu.WeaponOptions.ProximityMine" allow
+add_ace group.admin "vMenu.WeaponOptions.ProximityMine" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.PumpShotgun" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.PumpShotgunMk2" allow
-# add_ace builtin.everyone "vMenu.WeaponOptions.RPG" allow
+add_ace group.admin "vMenu.WeaponOptions.RPG" allow
 add_ace group.moderator "vMenu.WeaponOptions.RPG" allow
-# add_ace builtin.everyone "vMenu.WeaponOptions.Railgun" allow
+add_ace group.admin "vMenu.WeaponOptions.Railgun" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.Revolver" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.RevolverMk2" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.SMG" allow
@@ -473,22 +463,33 @@ add_ace builtin.everyone "vMenu.WeaponOptions.SniperRifle" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.Snowball" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.SpecialCarbine" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.SpecialCarbineMk2" allow
-# add_ace builtin.everyone "vMenu.WeaponOptions.StickyBomb" allow
+add_ace group.moderator "vMenu.WeaponOptions.StickyBomb" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.StunGun" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.SweeperShotgun" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.SwitchBlade" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.Unarmed" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.VintagePistol" allow
 add_ace builtin.everyone "vMenu.WeaponOptions.Wrench" allow
-# add_ace builtin.everyone "vMenu.WeaponOptions.PlasmaPistol" allow  # xmas 2018 dlc (1604)
+add_ace group.moderator "vMenu.WeaponOptions.PlasmaPistol" allow  # xmas 2018 dlc (1604)
-# add_ace builtin.everyone "vMenu.WeaponOptions.PlasmaCarbine" allow # xmas 2018 dlc (1604)
+add_ace group.moderator "vMenu.WeaponOptions.PlasmaCarbine" allow # xmas 2018 dlc (1604)
-# add_ace builtin.everyone "vMenu.WeaponOptions.PlasmaMinigun" allow # xmas 2018 dlc (1604)
+add_ace group.moderator "vMenu.WeaponOptions.PlasmaMinigun" allow # xmas 2018 dlc (1604)
 add_ace builtin.everyone "vMenu.WeaponOptions.StoneHatchet" allow # xmas 2018 dlc (1604)
 add_ace builtin.everyone "vMenu.WeaponOptions.CeramicPistol" allow # xmas 2019 dlc (1868)
 add_ace builtin.everyone "vMenu.WeaponOptions.NavyRevolver" allow # xmas 2019 dlc (1868)
 add_ace builtin.everyone "vMenu.WeaponOptions.PericoPistol" allow # xmas 2020 dlc (2189)
 add_ace builtin.everyone "vMenu.WeaponOptions.MilitaryRifle" allow # xmas 2020 dlc (2189)
 add_ace builtin.everyone "vMenu.WeaponOptions.CombatShotgun" allow # xmas 2020 dlc (2189)
+add_ace group.admin "vMenu.WeaponOptions.EMPLauncher" allow # mpsecurity dlc (2545)
+add_ace builtin.everyone "vMenu.WeaponOptions.HeavyRifle" allow # mpsecurity dlc (2545)
+add_ace builtin.everyone "vMenu.WeaponOptions.FertilizerCan" allow # mpsecurity dlc (2545)
+add_ace group.staff "vMenu.WeaponOptions.StunGunMP" allow # mpsecurity dlc (2545)
+add_ace group.moderator "vMenu.WeaponOptions.PrecisionRifle" allow # mpsum2 dlc (2699)
+add_ace group.moderator "vMenu.WeaponOptions.TacticalRifle" allow # mpsum2 dlc (2699)
+add_ace group.moderator "vMenu.WeaponOptions.PistolXM3" allow # mpchristmas3 dlc (2802)
+add_ace builtin.everyone "vMenu.WeaponOptions.CandyCane" allow # mpchristmas3 dlc (2802)
+add_ace group.admin "vMenu.WeaponOptions.RailgunXM3" allow # mpchristmas3 dlc (2802)
+add_ace builtin.everyone "vMenu.WeaponOptions.AcidPackage" allow # mpchristmas3 dlc (2802)
+add_ace builtin.everyone "vMenu.WeaponOptions.TecPistol" allow # mp2023_01 dlc (2944)
 
 ####################################
 #       WEAPON LOADOUTS MENU       #
@@ -503,24 +504,19 @@ add_ace builtin.everyone "vMenu.WeaponLoadouts.All" allow
 ####################################
 # There is no vMenu.MiscSettings.Menu permission on purpose, some options in the misc settings menu
 # should *ALWAYS* be allowed, so you can't restrict the opening of this menu!
-#add_ace builtin.everyone "vMenu.MiscSettings.All" allow
 add_ace group.admin "vMenu.MiscSettings.All" allow
-#add_ace builtin.everyone "vMenu.MiscSettings.ClearArea" allow
+add_ace group.staff "vMenu.MiscSettings.ClearArea" allow
-add_ace group.helper "vMenu.MiscSettings.ClearArea" allow
+add_ace group.staff "vMenu.MiscSettings.TeleportToWp" allow
-add_ace builtin.everyone "vMenu.MiscSettings.TeleportToWp" allow
+add_ace group.staff "vMenu.MiscSettings.TeleportToCoord" allow
-add_ace builtin.everyone "vMenu.MiscSettings.TeleportToCoord" allow
 add_ace builtin.everyone "vMenu.MiscSettings.ShowCoordinates" allow
 add_ace builtin.everyone "vMenu.MiscSettings.ShowLocation" allow
 add_ace builtin.everyone "vMenu.MiscSettings.JoinQuitNotifs" allow
 add_ace builtin.everyone "vMenu.MiscSettings.DeathNotifs" allow
-#add_ace builtin.everyone "vMenu.MiscSettings.NightVision" allow
+add_ace group.staff "vMenu.MiscSettings.NightVision" allow
-add_ace group.moderator "vMenu.MiscSettings.NightVision" allow
+add_ace group.staff "vMenu.MiscSettings.ThermalVision" allow
-#add_ace builtin.everyone "vMenu.MiscSettings.ThermalVision" allow
-add_ace group.moderator "vMenu.MiscSettings.ThermalVision" allow
 add_ace builtin.everyone "vMenu.MiscSettings.LocationBlips" allow
 #add_ace builtin.everyone "vMenu.MiscSettings.OverheadNames" allow
-#add_ace builtin.everyone "vMenu.MiscSettings.PlayerBlips" allow
+add_ace builtin.everyone "vMenu.MiscSettings.PlayerBlips" allow
-add_ace group.staff "vMenu.MiscSettings.PlayerBlips" allow
 add_ace builtin.everyone "vMenu.MiscSettings.TeleportLocations" allow
 add_ace group.admin "vMenu.MiscSettings.TeleportSaveLocation" allow # Only allowed for moderators by default
 add_ace builtin.everyone "vMenu.MiscSettings.ConnectionMenu" allow

resources/vMenu/fxmanifest.lua

@@ -6,7 +6,7 @@ games {'gta5'}
 -- Resource stuff
 name 'vMenu'
 description 'Server sided trainer for FiveM with custom permissions, using a custom MenuAPI. More info can be found at www.vespura.com/fivem'
-version 'v3.4.0'
+version 'v3.6.0'
 author 'Tom Grobbe'
 url 'https://github.com/TomGrobbe/vMenu/'
 ui_page 'storage.html'

resources/vMenu/vmenu.log

@@ -1,30 +0,0 @@
-[	30-05-2021 22:53:51	] [BAN ACTION] A new ban record has been added. Player: 'dcapone00' was banned by 'King Rodriguez' for 'Banned by staff. 2
-Your ban id: c1b26b6d-64f1-439c-981c-0a0100d65ba8' until '05/31/2021 00:23:51'.
-[	30-05-2021 22:54:32	] [BAN ACTION] The following ban record has been removed (player unbanned). [Player: dcapone00 was banned by King Rodriguez for Banned by staff. 2
-Your ban id: c1b26b6d-64f1-439c-981c-0a0100d65ba8 until 05/31/2021 00:23:51.]
-[	01-06-2021 02:08:19	] [KICK ACTION] Player: choxie has kicked: voidrxp for: You have been kicked. Reason: RDM, ignored staff, spawning cop car when not a cop.
-[	15-07-2021 10:34:34	] [BAN ACTION] A new ban record has been added. Player: 'DurakiiPR' was banned by '[YJ-09]Max Rodriguez' for 'Banned by staff.rdm driving gta car with guns
-Your ban id: d41a4d65-705c-4162-8838-666c84d92dcd' until '07/15/2021 12:04:34'.
-[	15-07-2021 10:52:01	] [BAN ACTION] The following ban record has been removed (player unbanned). [Player: DurakiiPR was banned by [YJ-09]Max Rodriguez for Banned by staff.rdm driving gta car with guns
-Your ban id: d41a4d65-705c-4162-8838-666c84d92dcd until 07/15/2021 12:04:34.]
-[	15-08-2021 20:42:12	] [KICK ACTION] Player: [S-95] S. Smith |Jonny Ticklenut has kicked:  for: You have been kicked. Reason: shooting a tank at npc.
-[	15-08-2021 20:46:48	] [KICK ACTION] Player: [S-95] S. Smith |Jonny Ticklenut has kicked: B. LAO for: You have been kicked. Reason: server dis.
-[	15-08-2021 21:03:33	] [BAN ACTION] A new ban record has been added. Player: 'breezy' was banned by 'King Rodriguez' for 'Banned by staff.rdm
-Your ban id: 159baddd-0dfe-4fe7-b35d-7c5b054d8552' until '08/17/2021 03:03:33'.
-[	16-08-2021 23:58:41	] [KICK ACTION] Player: [G6-59] SOGGYBEAN has kicked: [S-73] S. Smith |Jonny Ticklenut for: You have been kicked. Reason: bitch.
-[	17-08-2021 23:43:04	] [KICK ACTION] Player: [S-73] S. Smith |Jonny Ticklenut has kicked: AnySpiderBat for: You have been kicked. Reason: running from staff RDM.
-[	18-08-2021 01:59:52	] [KICK ACTION] Player: [S-73] S. Smith |Jonny Ticklenut has kicked: [c-193]D. cricket-Meangee_pc for: You have been kicked. Reason: RDM .
-[	18-08-2021 02:00:31	] [KICK ACTION] Player: [G6-59] SOGGYBEAN has kicked: [S-73] S. Smith |Jonny Ticklenut for: You have been kicked. Reason: dont kick daddy.
-[	18-08-2021 05:44:15	] [KICK ACTION] Player: [S-73] S. Smith |Jonny Ticklenut has kicked: [C-81][GCF-145] R. Freeman for: You have been kicked. Reason: running from staff cumming on people.
-[	18-08-2021 06:00:02	] [KICK ACTION] Player: [S-73] S. Smith |Jonny Ticklenut has kicked: Rylock29 for: You have been kicked. Reason: restart.
-[	18-08-2021 06:00:08	] [KICK ACTION] Player: [S-73] S. Smith |Jonny Ticklenut has kicked: [S-118] S. Grant for: You have been kicked. Reason: restart.
-[	18-08-2021 06:00:15	] [KICK ACTION] Player: [S-73] S. Smith |Jonny Ticklenut has kicked: [G6-59] SOGGYBEAN for: You have been kicked. Reason: restart.
-[	18-08-2021 06:00:22	] [KICK ACTION] Player: [S-73] S. Smith |Jonny Ticklenut has kicked:  for: You have been kicked. Reason: restart.
-[	19-08-2021 22:20:36	] [KICK ACTION] Player: SOGGYBEAN has kicked: [S-73] S. Smith |Jonny Ticklenut for: You have been kicked. Reason: Killing on peace time.
-[	22-08-2021 02:18:25	] [KICK ACTION] Player: King Rodriguez has kicked: SOGGYBEAN for: You have been kicked. Reason: why.
-[	22-08-2021 02:20:27	] [KICK ACTION] Player: jonny has kicked: TheStevieGames for: You have been kicked. Reason: stevies a bitch.
-[	24-08-2021 04:10:13	] [KICK ACTION] Player: Jonny Ticklenut has kicked: Gavin Is Hot for: You have been kicked. Reason: ..
-[	24-08-2021 05:17:02	] [KICK ACTION] Player: TheStevieGames has kicked: SOGGYBEAN for: You have been kicked. Reason: staff skjtsi.
-[	24-08-2021 05:19:27	] [KICK ACTION] Player: Jonny Ticklenut has kicked: TheStevieGames for: You have been kicked. Reason: FAILRP.
-[	24-08-2021 05:28:47	] [KICK ACTION] Player: TheStevieGames has kicked: Jonny Ticklenut for: You have been kicked. Reason: boat.
-[	31-08-2021 02:35:29	] [KICK ACTION] Player: Jonny Ticklenut has kicked: [MS-40] Callahan for: You have been kicked. Reason: VDM.

server.cfg

@@ -1,11 +1,37 @@
 #Force to load permission.cfg
 exec resources/vMenu/config/permissions.cfg
 
-# you probably don't want to change these!
+## Proxy
-# only change them if you're using a server with multiple network interfaces
+sv_forceIndirectListing true
+sv_listingHostOverride "fivem.elite-gaming.gg"
+sv_proxyIPPranges "193.23.161.198/32"
+set sv_endpoints "api.elite-gaming.gg:30120"
+
+## Server Secret Information
 endpoint_add_tcp "0.0.0.0:30120"
 endpoint_add_udp "0.0.0.0:30120"
+sv_maxclients 64
+set sv_enforceGameBuild 2944 #mp2023_01 - San Andreas Mercenaries
+set steam_webApiKey 0C034D20C57C8D6C5A8EED855916981F
+sv_licenseKey cfxk_QiCs7LK9l1BlziZvCuQc_1awY0v
+#sv_endpointprivacy true
+sv_tebexSecret 764abb9ee3e77517439e4f6a268318cb05c33fb9
+sv_scriptHookAllowed 0
 
+## Server Listing Details
+sv_hostname "^1Elite Gaming ^0|^8 Become a First Responder! 🚨 ^0|^6 vMenu FivePD Server ^0|^4 Police & EMS 👮🚑 ^0|^2 Custom Scripts 📜 ^0|^9 300+ Vehicles 🚘 ^0|^5 EUP & CAD System ✅ ^0|^5 Onesync 64+ Players"
+sets sv_projectName "Elite Gaming"
+sets sv_projectDesc "Become a first responder today! elite-gaming.gg"
+load_server_icon egrplogo.png
+sets tags "Roleplay, Addons, Custom Peds, Sandy Shores, Police, CAD, EMS, Fire, vMenu, Lambda, LambdaMenu, RP, FivePD, CADvanced, Menu, Menu-Based, Elite, Elite Gaming, EGRP, Elite Gaming RP, EUP"
+sets "Discord 📲" "discord.elite-gaming.gg"
+sets "Website 🔗" "elite-gaming.gg"
+sets locale "en-GB"
+sets banner_detail "https://i.imgur.com/JdhxvVJ.png"
+sets banner_connecting "https://i.imgur.com/JdhxvVJ.png"
+sets activitypubFeed EGRP@mstdn.social
+
+## Resources
 ensure mapmanager
 ensure chat
 ensure spawnmanager
@@ -18,7 +44,6 @@ ensure EGRP-Playerlist
 //ensure AboveTags
 ensure Head-Tags
 
-set steam_webApiKey 0C034D20C57C8D6C5A8EED855916981F
 setr SCREENSHOT_BASIC_TOKEN 9dfc22d9d7a9ff2
 
 ensure ghmattimysql
@@ -130,7 +155,7 @@ ensure Location-Alarms
 ensure Cayo-TP
 //ensure FPS-Boost
 ensure radio
-ensure assets
+ensure radio-assets
 ensure Slash-Tyres
 //ensure Animated-Banners
 ensure Hypnonema
@@ -185,18 +210,17 @@ ensure eup-stream
 ensure eup-ui
 //ensure Halloween
 ensure firehydrant
-ensure generic
+
-ensure generic_texture_renderer_gfx
 ensure JPets
-ensure ptelevision
 ensure ServerSidedSoundsSirens
 ensure wm-serversirens
 ensure vstancer
-ensure ox_lib
 ensure vbrims3
 ensure WheelPackC
-ensure 
 
+ensure generic_texture_renderer_gfx
+ensure ox_lib
+ensure ptelevision
 
 #[-----Discord Perms-----]
 ensure Discord-Presence
@@ -416,48 +440,7 @@ ensure JohnWick
 ensure RareBane
 ensure Joker
 
-sets locale "en-GB" 
+## Permissions
-
-sv_scriptHookAllowed 0
-
-# change this
-#rcon_password yay
-
-# a comma-separated list of tags for your server
-# for example: sets tags "drifting, cars, racing" or sets tags "roleplay, military, tanks"
-sets tags "Roleplay, Addons, Custom Peds, Sandy Shores, Police, CAD, EMS, Fire, vMenu, Lambda, LambdaMenu, RP, FivePD, CADvanced, Menu, Menu-Based, Elite, Elite Gaming, EGRP, Elite Gaming RP, EUP"
-
-# set an optional server info and connecting banner image url.
-# size doesn't matter, any banner sized image will be fine.
-sets banner_detail "https://i.imgur.com/JdhxvVJ.png"
-sets banner_connecting "https://i.imgur.com/JdhxvVJ.png"
-
-# set additional parameters
-sets "Discord 📲" "discord.elitegami.ng"
-sets "Website 🔗" "elite-gaming.gg"
-
-sv_hostname "^1Elite Gaming ^0|^8 Become a First Responder! 🚨 ^0|^6 vMenu FivePD Server ^0|^4 Police & EMS 👮🚑 ^0|^2 Custom Scripts 📜 ^0|^9 300+ Vehicles 🚘 ^0|^5 CAD System & EUP ✅ ^0|^3 FivePD 🚓🚒🚑"
-sets sv_projectName "Elite Gaming"
-sets sv_projectDesc "Become a first responder today! elite-gaming.gg"
-
-# nested configs!
-#exec server_internal.cfg
-
-# loading a server icon (96x96 PNG file)
-load_server_icon egrplogo.png
-
-# convars for use from script
-set temp_convar "Welcome!"
-sets activitypubFeed EGRP@mstdn.social
-
-# disable announcing? clear out the master by uncommenting this (your server will not be listed in the serverlist if you uncomment this!)
-#sv_master1 "Elite Gaming RP"
-
-# want to only allow players authenticated with a third-party provider like Steam (don't forget, Social Club is a third party provider too!)?
-#sv_authMaxVariance 1
-#sv_authMinTrust 5
-
-# add system admins
 add_ace group.superadmin command allow # allow all commands
 
 add_ace resource.DiscordAcePerms command.add_principal allow
@@ -526,19 +509,4 @@ add_ace group.helper jd.staff allow
 add_ace group.superadmin hypnonema allow
 add_ace group.admin hypnonema allow
 add_ace group.moderator hypnonema allow
-add_ace group.helper hypnonema allow
+add_ace group.helper hypnonema allow
-
-# remove the # to hide player endpoints in external log output
-sv_endpointprivacy true
-
-# server slots limit (must be between 1 and 31)
-sv_maxclients 64
-
-# license key for server (https://keymaster.fivem.net)
-sv_licenseKey cfxk_QiCs7LK9l1BlziZvCuQc_1awY0v
-
-# Tebex Monitization
-sv_tebexSecret 764abb9ee3e77517439e4f6a268318cb05c33fb9
-
-#The Criminal Enterprises DLC Update
-set sv_enforceGameBuild 2699