From 0832bbe197c72c5009eb5c2e9777819cf7e27fd6 Mon Sep 17 00:00:00 2001
From: MoskalykA <100430077+MoskalykA@users.noreply.github.com>
Date: Mon, 6 Feb 2023 13:39:32 +0100
Subject: [PATCH 01/70] style(es_extended): run prettier

---
 [core]/es_extended/html/css/app.css   | 19 +++++----
 [core]/es_extended/html/js/app.js     | 60 ++++++++++++++-------------
 [core]/es_extended/html/js/wrapper.js | 59 ++++++++++++--------------
 3 files changed, 67 insertions(+), 71 deletions(-)

diff --git a/[core]/es_extended/html/css/app.css b/[core]/es_extended/html/css/app.css
index 0bdbc9083..cfd2f67b1 100644
--- a/[core]/es_extended/html/css/app.css
+++ b/[core]/es_extended/html/css/app.css
@@ -1,11 +1,11 @@
 @font-face {
-  font-family: 'Pricedown';
-  src: url('../fonts/pdown.ttf');
+  font-family: "Pricedown";
+  src: url("../fonts/pdown.ttf");
 }
 
 @font-face {
-  font-family: 'bankgothic';
-  src: url('../fonts/bankgothic.ttf');
+  font-family: "bankgothic";
+  src: url("../fonts/bankgothic.ttf");
 }
 
 html {
@@ -20,11 +20,12 @@ html {
   font-size: 2em;
   font-weight: bold;
   color: #fff;
-  text-shadow: -1px -1px 0 #000, 1px -1px 0 #000, -1px 1px 0 #000, 1px 1px 0 #000;
+  text-shadow: -1px -1px 0 #000, 1px -1px 0 #000, -1px 1px 0 #000,
+    1px 1px 0 #000;
 }
 
 .menu {
-  font-family: 'Open Sans', sans-serif;
+  font-family: "Open Sans", sans-serif;
   min-width: 400px;
   min-height: 250px;
   color: #fff;
@@ -34,7 +35,7 @@ html {
 }
 
 .menu .head {
-  font-family: 'Open Sans', sans-serif;
+  font-family: "Open Sans", sans-serif;
   font-size: 28px;
   padding: 10px;
   background: #1a1a1a;
@@ -51,14 +52,14 @@ html {
 }
 
 .menu .head span {
-  font-family: 'Pricedown';
+  font-family: "Pricedown";
   font-size: 28px;
   padding-left: 15px;
   padding-top: 6px;
 }
 
 .menu .menu-items .menu-item {
-  font-family: 'Open Sans', sans-serif;
+  font-family: "Open Sans", sans-serif;
   font-size: 14px;
   height: 40px;
   display: block;
diff --git a/[core]/es_extended/html/js/app.js b/[core]/es_extended/html/js/app.js
index 26fb67e4a..029ecc00c 100644
--- a/[core]/es_extended/html/js/app.js
+++ b/[core]/es_extended/html/js/app.js
@@ -1,38 +1,40 @@
 (() => {
-	ESX = {};
+  ESX = {};
 
-	ESX.inventoryNotification = function (add, label, count) {
-		let notif = '';
+  ESX.inventoryNotification = function (add, label, count) {
+    let notif = "";
 
-		if (add) {
-			notif += '+';
-		} else {
-			notif += '-';
-		}
+    if (add) {
+      notif += "+";
+    } else {
+      notif += "-";
+    }
 
-		if (count) {
-			notif += count + ' ' + label;
-		} else {
-			notif += ' ' + label;
-		}
+    if (count) {
+      notif += count + " " + label;
+    } else {
+      notif += " " + label;
+    }
 
-		let elem = $('<div>' + notif + '</div>');
-		$('#inventory_notifications').append(elem);
+    let elem = $("<div>" + notif + "</div>");
+    $("#inventory_notifications").append(elem);
 
-		$(elem).delay(3000).fadeOut(1000, function () {
-			elem.remove();
-		});
-	};
+    $(elem)
+      .delay(3000)
+      .fadeOut(1000, function () {
+        elem.remove();
+      });
+  };
 
-	window.onData = (data) => {
-		if (data.action === 'inventoryNotification') {
-			ESX.inventoryNotification(data.add, data.item, data.count);
-		}
-	};
+  window.onData = (data) => {
+    if (data.action === "inventoryNotification") {
+      ESX.inventoryNotification(data.add, data.item, data.count);
+    }
+  };
 
-	window.onload = function (e) {
-		window.addEventListener('message', (event) => {
-			onData(event.data);
-		});
-	};
+  window.onload = function (e) {
+    window.addEventListener("message", (event) => {
+      onData(event.data);
+    });
+  };
 })();
diff --git a/[core]/es_extended/html/js/wrapper.js b/[core]/es_extended/html/js/wrapper.js
index 0d2087093..92ee2785a 100644
--- a/[core]/es_extended/html/js/wrapper.js
+++ b/[core]/es_extended/html/js/wrapper.js
@@ -1,42 +1,35 @@
 (() => {
+  let ESXWrapper = {};
+  ESXWrapper.MessageSize = 1024;
+  ESXWrapper.messageId = 0;
 
-	let ESXWrapper = {};
-	ESXWrapper.MessageSize = 1024;
-	ESXWrapper.messageId = 0;
+  window.SendMessage = function (namespace, type, msg) {
+    ESXWrapper.messageId =
+      ESXWrapper.messageId < 65535 ? ESXWrapper.messageId + 1 : 0;
+    const str = JSON.stringify(msg);
 
-	window.SendMessage = function (namespace, type, msg) {
+    for (let i = 0; i < str.length; i++) {
+      let count = 0;
+      let chunk = "";
 
-		ESXWrapper.messageId = (ESXWrapper.messageId < 65535) ? ESXWrapper.messageId + 1 : 0;
-		const str = JSON.stringify(msg);
+      while (count < ESXWrapper.MessageSize && i < str.length) {
+        chunk += str[i];
 
-		for (let i = 0; i < str.length; i++) {
+        count++;
+        i++;
+      }
 
-			let count = 0;
-			let chunk = '';
+      i--;
 
-			while (count < ESXWrapper.MessageSize && i < str.length) {
+      const data = {
+        __type: type,
+        id: ESXWrapper.messageId,
+        chunk: chunk,
+      };
 
-				chunk += str[i];
+      if (i == str.length - 1) data.end = true;
 
-				count++;
-				i++;
-			}
-
-			i--;
-
-			const data = {
-				__type: type,
-				id: ESXWrapper.messageId,
-				chunk: chunk
-			}
-
-			if (i == str.length - 1)
-				data.end = true;
-
-			$.post('http://' + namespace + '/__chunk', JSON.stringify(data));
-
-		}
-
-	}
-
-})()
+      $.post("http://" + namespace + "/__chunk", JSON.stringify(data));
+    }
+  };
+})();

From 7cf0ed00c67f0b23e05ec63b5c5bcd87f9d694d6 Mon Sep 17 00:00:00 2001
From: MoskalykA <100430077+MoskalykA@users.noreply.github.com>
Date: Mon, 6 Feb 2023 13:39:56 +0100
Subject: [PATCH 02/70] style(esx_context): run prettier

---
 [core]/esx_context/index.html | 899 +++++++++++++++++-----------------
 1 file changed, 459 insertions(+), 440 deletions(-)

diff --git a/[core]/esx_context/index.html b/[core]/esx_context/index.html
index cba395b1a..676709631 100644
--- a/[core]/esx_context/index.html
+++ b/[core]/esx_context/index.html
@@ -1,443 +1,462 @@
 <!DOCTYPE html>
 <html>
-
-<head>
-	<script src="nui://game/ui/jquery.js" type="text/javascript"></script>
-	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.13.0/css/all.min.css">
-	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.1/css/all.min.css">
-
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<title>ESX Context HUD</title>
-
-	<style type="text/css">
-		:root {
-			--item-main: #242424;
-			--item-unselectable: #161616;
-			--item-hover: #404040;
-			--item-disabled: #393939;
-		}
-
-		html,
-		body {
-			margin: 0;
-			padding: 0;
-			outline: none;
-			border: none;
-		}
-
-		body {
-			position: absolute;
-			top: 0px;
-			left: 0px;
-			width: 100%;
-			height: 100%;
-
-			display: none;
-		}
-
-		#container {
-			position: absolute;
-			width: 280px;
-			max-height: 50%;
-			height: auto;
-			display: flex;
-			flex-direction: column;
-			gap: 10px;
-			overflow-y: auto;
-			padding-right: 5px;
-		}
-
-		.center {
-			top: 50%;
-			left: 50%;
-			transform: translate(-50%, -50%);
-		}
-
-		.left {
-			top: 50%;
-			left: 25%;
-			transform: translate(-50%, -50%);
-		}
-
-		.right {
-			top: 50%;
-			left: 75%;
-			transform: translate(-50%, -50%);
-		}
-
-		.item {
-			display: grid;
-			grid-template-columns: 30px calc(100% - 30px);
-			padding: 15px 10px;
-			border-radius: 5px;
-			background: var(--item-main);
-		}
-
-		.item:hover {
-			background: var(--item-hover);
-		}
-
-		.item>i {
-			text-align: center;
-		}
-
-		.item>div {
-			display: flex;
-			flex-direction: column;
-			gap: 5px;
-		}
-
-		.item>div>i {
-			opacity: 0.5;
-		}
-
-		.input {
-			display: flex;
-			flex-direction: column;
-			gap: 5px;
-			padding: 15px 10px;
-			border-radius: 5px;
-			background: var(--item-main);
-		}
-
-		.input:hover {
-			background: var(--item-hover);
-		}
-
-		input {
-			position: relative;
-			width: auto;
-			padding: 5px;
-			margin: 0;
-			border: none;
-			border: none;
-			background: transparent;
-		}
-
-		.unselectable {
-			background: var(--item-unselectable);
-			pointer-events: none;
-		}
-
-		.disabled {
-			pointer-events: none;
-			background: var(--item-disabled);
-		}
-
-		* {
-			color: white;
-			font-family: Arial;
-			user-select: none;
-			font-size: 14px;
-		}
-
-		::-webkit-scrollbar {
-			width: 5px;
-		}
-
-		::-webkit-scrollbar-thumb {
-			background: rgb(20, 20, 20);
-			border-radius: 5px;
-		}
-
-		::-webkit-scrollbar-thumb:hover {
-			background: rgb(30, 30, 30);
-		}
-
-		.container {
-			display: flex;
-			position: relative;
-			cursor: pointer;
-			font-size: 14px;
-			-webkit-user-select: none;
-			-moz-user-select: none;
-			-ms-user-select: none;
-			user-select: none;
-			flex-direction: row-reverse;
-			align-items: center;
-			justify-content: flex-end;
-			gap: 5px;
-		}
-
-		/* Hide the browser's default checkbox */
-		.container input {
-			position: relative;
-			opacity: 0;
-			cursor: pointer;
-			height: 0;
-			width: 0;
-		}
-
-		/* Create a custom checkbox */
-		.checkmark {
-			position: relative;
-			height: 10px;
-			width: 10px;
-			border-radius: 8px;
-			background-color: #eee;
-		}
-
-		/* On mouse-over, add a grey background color */
-		.container:hover input~.checkmark {
-			background-color: #ccc;
-		}
-
-		/* When the checkbox is checked, add a blue background */
-		.container input:checked~.checkmark {
-			background-color: #2196F3;
-		}
-
-		/* Create the checkmark/indicator (hidden when not checked) */
-		.checkmark:after {
-			content: "";
-			position: relative;
-			display: none;
-		}
-
-		/* Show the checkmark when checked */
-		.container input:checked~.checkmark:after {
-			display: block;
-		}
-	</style>
-</head>
-
-<body>
-
-	<div id="container" class="right">
-		<div class="item unselectable">
-			<i class="fas fa-info-circle"></i>
-			<div>
-				<b>Unselectable Item</b>
-				<i>Testing, testing a description here.</i>
-			</div>
-		</div>
-		<div class="item disabled">
-			<i class="fas fa-times"></i>
-			<div>
-				<b>Disabled Item</b>
-				<i>Testing, testing a description here.</i>
-			</div>
-		</div>
-		<div class="item">
-			<i class="fas fa-check"></i>
-			<div>
-				<b>Item</b>
-				<i>Testing, testing a description here. Generic words to force overflow.</i>
-			</div>
-		</div>
-	</div>
-
-	<script type="text/javascript">
-		const container = document.getElementById("container")
-
-		const CreateElement = (tag = "div", className = "", parent) => {
-			const e = document.createElement(tag)
-			e.className = className
-
-			if (parent) {
-				parent.append(e)
-			}
-
-			return e
-		}
-
-		function Open(eles, position = "right") {
-			container.innerHTML = ""
-			container.className = position
-
-			for (let i = 0; i < eles.length; i++) {
-				let ele = eles[i]
-				let item = CreateElement("div", "item", container)
-
-				let icon = CreateElement("i", ele.icon, item)
-				let div = CreateElement("div", "", item)
-
-				let title = CreateElement("b", "", div)
-				title.innerHTML = ele.title
-
-				if (ele.description) {
-					let desc = CreateElement("i", "", div)
-					desc.innerHTML = ele.description || ""
-				}
-
-				if (ele.input) {
-					if (ele.inputType == "radio") {
-						for (let j = 0; j < ele.inputValues.length; j++) {
-							let v = ele.inputValues[j]
-							let container = CreateElement("label", "container", div)
-							container.innerHTML = v.text
-
-							let input = CreateElement("INPUT", "", container)
-							input.type = "radio"
-							input.name = i + 1
-							input.checked = (ele.inputValue || ele.inputPlaceholder || -1) == v.value
-
-							let span = CreateElement("SPAN", "checkmark", container)
-
-							input.onchange = function () {
-								$.post(`https://${GetParentResourceName()}/changed`, JSON.stringify({
-									index: i + 1,
-									value: v.value
-								}))
-							}
-						}
-					} else {
-						let input = CreateElement("input", "", div)
-						input.type = ele.inputType
-
-						if (ele.inputValue) {
-							input.value = ele.inputValue
-						}
-
-						if (ele.inputPlaceholder) {
-							input.placeholder = ele.inputPlaceholder
-						}
-
-						switch (ele.inputType) {
-							case "number":
-								if (ele.inputMin) input.min = ele.inputMin;
-								if (ele.inputMax) input.max = ele.inputMax;
-
-								input.onchange = function () {
-									let v = Number(input.value)
-
-									if (ele.inputMin) {
-										v = Math.max(ele.inputMin, v)
-									}
-
-									if (ele.inputMax) {
-										v = Math.min(ele.inputMax, v)
-									}
-
-									input.value = v
-
-									$.post(`https://${GetParentResourceName()}/changed`, JSON.stringify({
-										index: i + 1,
-										value: v
-									}))
-								}
-								break
-
-							case "text":
-								input.onchange = function () {
-									$.post(`https://${GetParentResourceName()}/changed`, JSON.stringify({
-										index: i + 1,
-										value: input.value
-									}))
-								}
-								break
-						}
-					}
-				} else {
-					if (ele.disabled) {
-						item.className += " disabled"
-					} else if (ele.unselectable) {
-						item.className += " unselectable"
-					} else if (!ele.input) {
-						item.onclick = function () {
-							$.post(`https://${GetParentResourceName()}/selected`, JSON.stringify({
-								index: i + 1
-							}))
-						}
-					}
-				}
-			}
-
-			document.body.style.display = "block"
-		}
-
-		function Closed() {
-			document.body.style.display = "none"
-		}
-
-		function Close() {
-			$.post(`https://${GetParentResourceName()}/closed`,(retVal)=>{
-				if(retVal){
-					Closed()
-				}
-			})
-		}
-
-		window.addEventListener("message", (e) => {
-			let data = e.data
-
-			if (!data.func || !window[data.func]) {
-				return
-			}
-
-			window[data.func](...data.args)
-		})
-
-		window.addEventListener("keydown", (e) => {
-			if (e.key == "Escape" || e.key == "Backspace") {
-				if (e.target.tagName.toLowerCase() == "input") {
-					return
-				}
-
-				Close()
-			}
-		})
-
-		// Open([
-		// 	{
-		// 		unselectable:true,
-		// 		icon:"fas fa-info-circle",
-		// 		title:"Unselectable Item (Header/Label?)",
-		// 	},
-		// 	{
-		// 		icon:"fas fa-check",
-		// 		title:"Item A",
-		// 		description:"Some description here. Add some words to make the text overflow."
-		// 	},
-		// 	{
-		// 		disabled:true,
-		// 		icon:"fas fa-times",
-		// 		title:"Disabled Item",
-		// 		description:"Some description here. Add some words to make the text overflow."
-		// 	},
-		// 	{
-		// 		icon:"fas fa-check",
-		// 		title:"Item B",
-		// 		description:"Some description here. Add some words to make the text overflow."
-		// 	},
-		// 	{
-		// 		input:true,
-		// 		icon:"fas fa-times",
-		// 		title:"Input Text",
-		// 		inputType:"text",
-		// 		inputPlaceholder:"Placeholder..."
-		// 	},
-		// 	{
-		// 		input:true,
-		// 		icon:"",
-		// 		title:"Input Number",
-		// 		inputType:"number",
-		// 		inputPlaceholder:"Placeholder...",
-		// 		inputValue:0,
-		// 		inputMin:0,
-		// 		inputMax:50
-		// 	},
-		// 	{
-		// 		input:true,
-		// 		icon:"",
-		// 		title:"Input Radio",
-		// 		inputType:"radio",
-		// 		inputPlaceholder:"turbocharger",
-		// 		inputValue:"supercharger",
-		// 		inputValues:[
-		// 			{
-		// 				value:"turbocharger",
-		// 				title:"Turbocharger"
-		// 			},
-		// 			{
-		// 				value:"supercharger",
-		// 				title:"Supercharger"
-		// 			},
-		// 		]
-		// 	}
-		// ])
-	</script>
-</body>
-
+  <head>
+    <script src="nui://game/ui/jquery.js" type="text/javascript"></script>
+    <link
+      rel="stylesheet"
+      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.13.0/css/all.min.css"
+    />
+    <link
+      rel="stylesheet"
+      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.1/css/all.min.css"
+    />
+
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>ESX Context HUD</title>
+
+    <style type="text/css">
+      :root {
+        --item-main: #242424;
+        --item-unselectable: #161616;
+        --item-hover: #404040;
+        --item-disabled: #393939;
+      }
+
+      html,
+      body {
+        margin: 0;
+        padding: 0;
+        outline: none;
+        border: none;
+      }
+
+      body {
+        position: absolute;
+        top: 0px;
+        left: 0px;
+        width: 100%;
+        height: 100%;
+
+        display: none;
+      }
+
+      #container {
+        position: absolute;
+        width: 280px;
+        max-height: 50%;
+        height: auto;
+        display: flex;
+        flex-direction: column;
+        gap: 10px;
+        overflow-y: auto;
+        padding-right: 5px;
+      }
+
+      .center {
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+      }
+
+      .left {
+        top: 50%;
+        left: 25%;
+        transform: translate(-50%, -50%);
+      }
+
+      .right {
+        top: 50%;
+        left: 75%;
+        transform: translate(-50%, -50%);
+      }
+
+      .item {
+        display: grid;
+        grid-template-columns: 30px calc(100% - 30px);
+        padding: 15px 10px;
+        border-radius: 5px;
+        background: var(--item-main);
+      }
+
+      .item:hover {
+        background: var(--item-hover);
+      }
+
+      .item > i {
+        text-align: center;
+      }
+
+      .item > div {
+        display: flex;
+        flex-direction: column;
+        gap: 5px;
+      }
+
+      .item > div > i {
+        opacity: 0.5;
+      }
+
+      .input {
+        display: flex;
+        flex-direction: column;
+        gap: 5px;
+        padding: 15px 10px;
+        border-radius: 5px;
+        background: var(--item-main);
+      }
+
+      .input:hover {
+        background: var(--item-hover);
+      }
+
+      input {
+        position: relative;
+        width: auto;
+        padding: 5px;
+        margin: 0;
+        border: none;
+        border: none;
+        background: transparent;
+      }
+
+      .unselectable {
+        background: var(--item-unselectable);
+        pointer-events: none;
+      }
+
+      .disabled {
+        pointer-events: none;
+        background: var(--item-disabled);
+      }
+
+      * {
+        color: white;
+        font-family: Arial;
+        user-select: none;
+        font-size: 14px;
+      }
+
+      ::-webkit-scrollbar {
+        width: 5px;
+      }
+
+      ::-webkit-scrollbar-thumb {
+        background: rgb(20, 20, 20);
+        border-radius: 5px;
+      }
+
+      ::-webkit-scrollbar-thumb:hover {
+        background: rgb(30, 30, 30);
+      }
+
+      .container {
+        display: flex;
+        position: relative;
+        cursor: pointer;
+        font-size: 14px;
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        -ms-user-select: none;
+        user-select: none;
+        flex-direction: row-reverse;
+        align-items: center;
+        justify-content: flex-end;
+        gap: 5px;
+      }
+
+      /* Hide the browser's default checkbox */
+      .container input {
+        position: relative;
+        opacity: 0;
+        cursor: pointer;
+        height: 0;
+        width: 0;
+      }
+
+      /* Create a custom checkbox */
+      .checkmark {
+        position: relative;
+        height: 10px;
+        width: 10px;
+        border-radius: 8px;
+        background-color: #eee;
+      }
+
+      /* On mouse-over, add a grey background color */
+      .container:hover input ~ .checkmark {
+        background-color: #ccc;
+      }
+
+      /* When the checkbox is checked, add a blue background */
+      .container input:checked ~ .checkmark {
+        background-color: #2196f3;
+      }
+
+      /* Create the checkmark/indicator (hidden when not checked) */
+      .checkmark:after {
+        content: "";
+        position: relative;
+        display: none;
+      }
+
+      /* Show the checkmark when checked */
+      .container input:checked ~ .checkmark:after {
+        display: block;
+      }
+    </style>
+  </head>
+
+  <body>
+    <div id="container" class="right">
+      <div class="item unselectable">
+        <i class="fas fa-info-circle"></i>
+        <div>
+          <b>Unselectable Item</b>
+          <i>Testing, testing a description here.</i>
+        </div>
+      </div>
+      <div class="item disabled">
+        <i class="fas fa-times"></i>
+        <div>
+          <b>Disabled Item</b>
+          <i>Testing, testing a description here.</i>
+        </div>
+      </div>
+      <div class="item">
+        <i class="fas fa-check"></i>
+        <div>
+          <b>Item</b>
+          <i
+            >Testing, testing a description here. Generic words to force
+            overflow.</i
+          >
+        </div>
+      </div>
+    </div>
+
+    <script type="text/javascript">
+      const container = document.getElementById("container");
+
+      const CreateElement = (tag = "div", className = "", parent) => {
+        const e = document.createElement(tag);
+        e.className = className;
+
+        if (parent) {
+          parent.append(e);
+        }
+
+        return e;
+      };
+
+      function Open(eles, position = "right") {
+        container.innerHTML = "";
+        container.className = position;
+
+        for (let i = 0; i < eles.length; i++) {
+          let ele = eles[i];
+          let item = CreateElement("div", "item", container);
+
+          let icon = CreateElement("i", ele.icon, item);
+          let div = CreateElement("div", "", item);
+
+          let title = CreateElement("b", "", div);
+          title.innerHTML = ele.title;
+
+          if (ele.description) {
+            let desc = CreateElement("i", "", div);
+            desc.innerHTML = ele.description || "";
+          }
+
+          if (ele.input) {
+            if (ele.inputType == "radio") {
+              for (let j = 0; j < ele.inputValues.length; j++) {
+                let v = ele.inputValues[j];
+                let container = CreateElement("label", "container", div);
+                container.innerHTML = v.text;
+
+                let input = CreateElement("INPUT", "", container);
+                input.type = "radio";
+                input.name = i + 1;
+                input.checked =
+                  (ele.inputValue || ele.inputPlaceholder || -1) == v.value;
+
+                let span = CreateElement("SPAN", "checkmark", container);
+
+                input.onchange = function () {
+                  $.post(
+                    `https://${GetParentResourceName()}/changed`,
+                    JSON.stringify({
+                      index: i + 1,
+                      value: v.value,
+                    })
+                  );
+                };
+              }
+            } else {
+              let input = CreateElement("input", "", div);
+              input.type = ele.inputType;
+
+              if (ele.inputValue) {
+                input.value = ele.inputValue;
+              }
+
+              if (ele.inputPlaceholder) {
+                input.placeholder = ele.inputPlaceholder;
+              }
+
+              switch (ele.inputType) {
+                case "number":
+                  if (ele.inputMin) input.min = ele.inputMin;
+                  if (ele.inputMax) input.max = ele.inputMax;
+
+                  input.onchange = function () {
+                    let v = Number(input.value);
+
+                    if (ele.inputMin) {
+                      v = Math.max(ele.inputMin, v);
+                    }
+
+                    if (ele.inputMax) {
+                      v = Math.min(ele.inputMax, v);
+                    }
+
+                    input.value = v;
+
+                    $.post(
+                      `https://${GetParentResourceName()}/changed`,
+                      JSON.stringify({
+                        index: i + 1,
+                        value: v,
+                      })
+                    );
+                  };
+                  break;
+
+                case "text":
+                  input.onchange = function () {
+                    $.post(
+                      `https://${GetParentResourceName()}/changed`,
+                      JSON.stringify({
+                        index: i + 1,
+                        value: input.value,
+                      })
+                    );
+                  };
+                  break;
+              }
+            }
+          } else {
+            if (ele.disabled) {
+              item.className += " disabled";
+            } else if (ele.unselectable) {
+              item.className += " unselectable";
+            } else if (!ele.input) {
+              item.onclick = function () {
+                $.post(
+                  `https://${GetParentResourceName()}/selected`,
+                  JSON.stringify({
+                    index: i + 1,
+                  })
+                );
+              };
+            }
+          }
+        }
+
+        document.body.style.display = "block";
+      }
+
+      function Closed() {
+        document.body.style.display = "none";
+      }
+
+      function Close() {
+        $.post(`https://${GetParentResourceName()}/closed`, (retVal) => {
+          if (retVal) {
+            Closed();
+          }
+        });
+      }
+
+      window.addEventListener("message", (e) => {
+        let data = e.data;
+
+        if (!data.func || !window[data.func]) {
+          return;
+        }
+
+        window[data.func](...data.args);
+      });
+
+      window.addEventListener("keydown", (e) => {
+        if (e.key == "Escape" || e.key == "Backspace") {
+          if (e.target.tagName.toLowerCase() == "input") {
+            return;
+          }
+
+          Close();
+        }
+      });
+
+      // Open([
+      // 	{
+      // 		unselectable:true,
+      // 		icon:"fas fa-info-circle",
+      // 		title:"Unselectable Item (Header/Label?)",
+      // 	},
+      // 	{
+      // 		icon:"fas fa-check",
+      // 		title:"Item A",
+      // 		description:"Some description here. Add some words to make the text overflow."
+      // 	},
+      // 	{
+      // 		disabled:true,
+      // 		icon:"fas fa-times",
+      // 		title:"Disabled Item",
+      // 		description:"Some description here. Add some words to make the text overflow."
+      // 	},
+      // 	{
+      // 		icon:"fas fa-check",
+      // 		title:"Item B",
+      // 		description:"Some description here. Add some words to make the text overflow."
+      // 	},
+      // 	{
+      // 		input:true,
+      // 		icon:"fas fa-times",
+      // 		title:"Input Text",
+      // 		inputType:"text",
+      // 		inputPlaceholder:"Placeholder..."
+      // 	},
+      // 	{
+      // 		input:true,
+      // 		icon:"",
+      // 		title:"Input Number",
+      // 		inputType:"number",
+      // 		inputPlaceholder:"Placeholder...",
+      // 		inputValue:0,
+      // 		inputMin:0,
+      // 		inputMax:50
+      // 	},
+      // 	{
+      // 		input:true,
+      // 		icon:"",
+      // 		title:"Input Radio",
+      // 		inputType:"radio",
+      // 		inputPlaceholder:"turbocharger",
+      // 		inputValue:"supercharger",
+      // 		inputValues:[
+      // 			{
+      // 				value:"turbocharger",
+      // 				title:"Turbocharger"
+      // 			},
+      // 			{
+      // 				value:"supercharger",
+      // 				title:"Supercharger"
+      // 			},
+      // 		]
+      // 	}
+      // ])
+    </script>
+  </body>
 </html>

From ea6be461b4dbe952d930c2e913124f5eb1317dbf Mon Sep 17 00:00:00 2001
From: MoskalykA <100430077+MoskalykA@users.noreply.github.com>
Date: Mon, 6 Feb 2023 13:40:26 +0100
Subject: [PATCH 03/70] style(esx_identity): run prettier

---
 [core]/esx_identity/html/css/style.css | 214 ++++++++++++-------------
 [core]/esx_identity/html/index.html    | 154 +++++++++++++-----
 [core]/esx_identity/html/js/script.js  |  32 ++--
 3 files changed, 240 insertions(+), 160 deletions(-)

diff --git a/[core]/esx_identity/html/css/style.css b/[core]/esx_identity/html/css/style.css
index 5915443e8..939753f73 100644
--- a/[core]/esx_identity/html/css/style.css
+++ b/[core]/esx_identity/html/css/style.css
@@ -1,152 +1,152 @@
-@import url('https://fonts.googleapis.com/css2?family=Oswald&display=swap');
+@import url("https://fonts.googleapis.com/css2?family=Oswald&display=swap");
 
 body {
-	font-family: sans-serif;
-	overflow: hidden;
-	display: none;
+  font-family: sans-serif;
+  overflow: hidden;
+  display: none;
 }
 
 .dialog {
-	width: 332px;
-	opacity			: 0.95;
-	position      	: absolute;
-	margin-left: auto;
-	margin-right: auto; 
-	top				: 30.0%;
-	padding: 20px;
-	left            : 50%; /* à 50%/50% du parent référent */
-	transform       : translate(-50%); /* décalage de 50% de sa propre taille */
-	background-color: #152029;
-	border-radius   : 10px;
-	box-shadow: 0 -5px 3px -3px #21303d, 0 5px 3px -3px #21303d;
-	border:none;
-	margin:5px;
-	margin-bottom:20px;
-	color: #ffffff;
+  width: 332px;
+  opacity: 0.95;
+  position: absolute;
+  margin-left: auto;
+  margin-right: auto;
+  top: 30%;
+  padding: 20px;
+  left: 50%; /* à 50%/50% du parent référent */
+  transform: translate(-50%); /* décalage de 50% de sa propre taille */
+  background-color: #152029;
+  border-radius: 10px;
+  box-shadow: 0 -5px 3px -3px #21303d, 0 5px 3px -3px #21303d;
+  border: none;
+  margin: 5px;
+  margin-bottom: 20px;
+  color: #ffffff;
 }
 
 .title {
-	font-family: 'Oswald', sans-serif;
-	font-size: 22px;
-	text-align: center;
-	padding: 5px;
-	margin-bottom: 20px;
+  font-family: "Oswald", sans-serif;
+  font-size: 22px;
+  text-align: center;
+  padding: 5px;
+  margin-bottom: 20px;
 }
 
 input {
-	margin-bottom: 15px;
-	border: none;
-	border-bottom: 2px solid #58636c;
-	width: 100%;
-	outline: none;
-	padding: 10px;
-	padding-left:0;
-	font-family: 'Oswald', sans-serif;
-	color: #ffffff;
-	text-align:left;
-	background-color: #152029;
-}
-
-::placeholder { /* Chrome, Firefox, Opera, Safari 10.1+ */
-	color: rgba(84,97,105,255);
-	font-family: 'Oswald', sans-serif;
-	font-weight: 200;
-	opacity: 1; /* Firefox */
+  margin-bottom: 15px;
+  border: none;
+  border-bottom: 2px solid #58636c;
+  width: 100%;
+  outline: none;
+  padding: 10px;
+  padding-left: 0;
+  font-family: "Oswald", sans-serif;
+  color: #ffffff;
+  text-align: left;
+  background-color: #152029;
+}
+
+::placeholder {
+  /* Chrome, Firefox, Opera, Safari 10.1+ */
+  color: rgba(84, 97, 105, 255);
+  font-family: "Oswald", sans-serif;
+  font-weight: 200;
+  opacity: 1; /* Firefox */
 }
 
 .radio-toolbar input[type="radio"] {
-	opacity: 0;
-	position: absolute;
-	width: 36%;
+  opacity: 0;
+  position: absolute;
+  width: 36%;
 }
 
 .radio-toolbar label {
-	display: inline-block;
-	margin-top: 5px;
-    background-color: rgba(15,15,15,0.9);
-    padding: 10px 20px;
-    font-family: 'Oswald', sans-serif;
-		font-weight: 500;
-	font-size: 16px;
-	color: #FFFFFF;
-    border: none;
-	border-radius: 5px;
-	width: 36%;
+  display: inline-block;
+  margin-top: 5px;
+  background-color: rgba(15, 15, 15, 0.9);
+  padding: 10px 20px;
+  font-family: "Oswald", sans-serif;
+  font-weight: 500;
+  font-size: 16px;
+  color: #ffffff;
+  border: none;
+  border-radius: 5px;
+  width: 36%;
 }
 
 .radio-toolbar input[type="radio"]:checked + label {
-	width: 36%;
-  background-color:rgba(15,15,15,0.9);
-	border: none;
-	border-bottom: 1px solid #93a3b6;
-	border-radius: 5px;
-	color: #ffffff;
+  width: 36%;
+  background-color: rgba(15, 15, 15, 0.9);
+  border: none;
+  border-bottom: 1px solid #93a3b6;
+  border-radius: 5px;
+  color: #ffffff;
 }
 
 .radio-toolbar input[type="radio"]:focus + label {
-	background-color:rgba(15,15,15,0.9);
-	border: none;
-	border-bottom: 1px solid #93a3b6;
-	border-radius: 5px;
-	color: #ffffff;
+  background-color: rgba(15, 15, 15, 0.9);
+  border: none;
+  border-bottom: 1px solid #93a3b6;
+  border-radius: 5px;
+  color: #ffffff;
 }
 
 .radio-toolbar label:hover {
-	background-color: rgba(28, 24, 24, 0.931);
-	width: 36%;
-	color: #ffffff;
+  background-color: rgba(28, 24, 24, 0.931);
+  width: 36%;
+  color: #ffffff;
 }
 
 button {
-	display: block;
-	margin-top: 35px;
-	/*padding: 10px;*/
-	background-color: #4569c6;
-	outline: none;
-    border: 2px double rgba(40, 40, 40, 0.9);
-	color: #FFFFFF;
-	height: 30px;
-	width: 100%;
+  display: block;
+  margin-top: 35px;
+  /*padding: 10px;*/
+  background-color: #4569c6;
+  outline: none;
+  border: 2px double rgba(40, 40, 40, 0.9);
+  color: #ffffff;
+  height: 30px;
+  width: 100%;
 }
 
 h1 {
-	display: block;
-	margin-top: 5px;
-	margin-right: 5px;
-	padding: 10px;
-	background-color: rgba(15,15,15,0.9);
-	color: #ffffff;
-	width: 93%;
-	text-align: center;
+  display: block;
+  margin-top: 5px;
+  margin-right: 5px;
+  padding: 10px;
+  background-color: rgba(15, 15, 15, 0.9);
+  color: #ffffff;
+  width: 93%;
+  text-align: center;
 }
 
 .range-wrap {
-	position: relative;
-	margin: 0 auto 3rem;
+  position: relative;
+  margin: 0 auto 3rem;
 }
 
 .range {
-	width: 100%;
+  width: 100%;
 }
 
 .bubble {
-	background: rgba(15,15,15,0.9);
-	color: #ffffff;
-	padding: 4px 12px;
-	position: absolute;
-	border-radius: 4px;
-	left: 50%;
-	transform: translateX(-50%);
+  background: rgba(15, 15, 15, 0.9);
+  color: #ffffff;
+  padding: 4px 12px;
+  position: absolute;
+  border-radius: 4px;
+  left: 50%;
+  transform: translateX(-50%);
 }
 
-
 .bubble::after {
-	content: "";
-	position: absolute;
-	width: 2px;
-	height: 2px;
-	background: rgba(15,15,15,0.9);
-	color: black;
-	top: -1px;
-	left: 50%;
+  content: "";
+  position: absolute;
+  width: 2px;
+  height: 2px;
+  background: rgba(15, 15, 15, 0.9);
+  color: black;
+  top: -1px;
+  left: 50%;
 }
diff --git a/[core]/esx_identity/html/index.html b/[core]/esx_identity/html/index.html
index d9ca6d934..0e38d430d 100644
--- a/[core]/esx_identity/html/index.html
+++ b/[core]/esx_identity/html/index.html
@@ -1,45 +1,119 @@
 <!DOCTYPE html>
 <html lang="en">
-	<head>
-		<script src="nui://game/ui/jquery.js"></script>
-		<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script>
-		<link href="css/style.css" rel="stylesheet">
+  <head>
+    <script src="nui://game/ui/jquery.js"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script>
+    <link href="css/style.css" rel="stylesheet" />
 
-		<title>ESX Identity</title>
-	</head>
+    <title>ESX Identity</title>
+  </head>
 
-	<body onkeydown="TriggeredKey(this)">
-		<div class="dialog">
-			<div class="title"><b>IDENTITY</b></div>
-			<form id="register" name="register" action="#">
-				<div style="color: rgb(46, 187, 205);font-size: 12px; font-family: 'Gill Sans', sans-serif">First Name</div>
-				<input id="firstname" type="text" class="" name="firstname" placeholder="First Name" minlength="3" maxlength="8" pattern="[a-zA-Z]*"><br>
-				<div style="color: rgb(46, 187, 205);font-size: 12px; font-family: 'Gill Sans', sans-serif">Last Name</div>
-				<input id="lastname" type="text" class="" name="lastname" placeholder="Last Name" minlength="3" maxlength="10" pattern="[a-zA-Z]*"><br>
-				<div style="color: rgb(46, 187, 205);font-size: 12px; font-family: 'Gill Sans', sans-serif">Date of Birth (MM/DD/YYYY)</div>
-				<input id="dateofbirth" type="date" name="dateofbirth" class="" min="1900-01-01" max="2010-01-01" onfocus="(this.type='date')"><br>
-				<div style="color: rgb(46, 187, 205);font-size: 12px; font-family: 'Gill Sans', sans-serif">Height</div>
-				<input id="height" type="number" class="" name="height" min="120" max="220" placeholder="Height (cm)"><br>
-				<center>
-					<div class="radio-toolbar">
-						<input type="radio" id="radiom" name="sex" value="m" checked>
-						<label for="radiom">Male</label>
-					
-						<input type="radio" id="radiof" name="sex" value="f">
-						<label for="radiof">Female</label>
-					</div>
-				</center>
-				<button id="submit" type="submit"><font size="4px">CREATE</font></button>
-			</form>
-			<center><font size="1px" color="green">If the submit button doesn't work, please ensure that you've entered the fields correctly.</font></center>
-		</div>
-		<script>		
-			function TriggeredKey(e) {
-				var keycode;
-				if (window.event) keycode = window.event.keyCode;
-				if (window.event.keyCode == 13 || window.event.keyCode == 27) return false;
-			}
-		</script>
-		<script src="js/script.js"></script>
-	</body>
+  <body onkeydown="TriggeredKey(this)">
+    <div class="dialog">
+      <div class="title"><b>IDENTITY</b></div>
+      <form id="register" name="register" action="#">
+        <div
+          style="
+            color: rgb(46, 187, 205);
+            font-size: 12px;
+            font-family: 'Gill Sans', sans-serif;
+          "
+        >
+          First Name
+        </div>
+        <input
+          id="firstname"
+          type="text"
+          class=""
+          name="firstname"
+          placeholder="First Name"
+          minlength="3"
+          maxlength="8"
+          pattern="[a-zA-Z]*"
+        /><br />
+        <div
+          style="
+            color: rgb(46, 187, 205);
+            font-size: 12px;
+            font-family: 'Gill Sans', sans-serif;
+          "
+        >
+          Last Name
+        </div>
+        <input
+          id="lastname"
+          type="text"
+          class=""
+          name="lastname"
+          placeholder="Last Name"
+          minlength="3"
+          maxlength="10"
+          pattern="[a-zA-Z]*"
+        /><br />
+        <div
+          style="
+            color: rgb(46, 187, 205);
+            font-size: 12px;
+            font-family: 'Gill Sans', sans-serif;
+          "
+        >
+          Date of Birth (MM/DD/YYYY)
+        </div>
+        <input
+          id="dateofbirth"
+          type="date"
+          name="dateofbirth"
+          class=""
+          min="1900-01-01"
+          max="2010-01-01"
+          onfocus="(this.type='date')"
+        /><br />
+        <div
+          style="
+            color: rgb(46, 187, 205);
+            font-size: 12px;
+            font-family: 'Gill Sans', sans-serif;
+          "
+        >
+          Height
+        </div>
+        <input
+          id="height"
+          type="number"
+          class=""
+          name="height"
+          min="120"
+          max="220"
+          placeholder="Height (cm)"
+        /><br />
+        <center>
+          <div class="radio-toolbar">
+            <input type="radio" id="radiom" name="sex" value="m" checked />
+            <label for="radiom">Male</label>
+
+            <input type="radio" id="radiof" name="sex" value="f" />
+            <label for="radiof">Female</label>
+          </div>
+        </center>
+        <button id="submit" type="submit">
+          <font size="4px">CREATE</font>
+        </button>
+      </form>
+      <center>
+        <font size="1px" color="green"
+          >If the submit button doesn't work, please ensure that you've entered
+          the fields correctly.</font
+        >
+      </center>
+    </div>
+    <script>
+      function TriggeredKey(e) {
+        var keycode;
+        if (window.event) keycode = window.event.keyCode;
+        if (window.event.keyCode == 13 || window.event.keyCode == 27)
+          return false;
+      }
+    </script>
+    <script src="js/script.js"></script>
+  </body>
 </html>
diff --git a/[core]/esx_identity/html/js/script.js b/[core]/esx_identity/html/js/script.js
index 5364f8c82..e5ffea115 100644
--- a/[core]/esx_identity/html/js/script.js
+++ b/[core]/esx_identity/html/js/script.js
@@ -1,37 +1,43 @@
 $(document).ready(function () {
-  $.post('http://esx_identity/ready', JSON.stringify({}));
+  $.post("http://esx_identity/ready", JSON.stringify({}));
 
-  window.addEventListener('message', function (event) {
-    if (event.data.type === 'enableui') {
+  window.addEventListener("message", function (event) {
+    if (event.data.type === "enableui") {
       event.data.enable ? $(document.body).show() : $(document.body).hide();
     }
   });
 
-  $('#register').submit(function (event) {
+  $("#register").submit(function (event) {
     event.preventDefault();
 
-    const dofVal = $('#dateofbirth').val();
+    const dofVal = $("#dateofbirth").val();
     if (!dofVal) return;
 
     const dateCheck = new Date(dofVal);
 
-    const year = new Intl.DateTimeFormat('en', { year: 'numeric' }).format(dateCheck);
-    const month = new Intl.DateTimeFormat('en', { month: '2-digit' }).format(dateCheck);
-    const day = new Intl.DateTimeFormat('en', { day: '2-digit' }).format(dateCheck);
+    const year = new Intl.DateTimeFormat("en", { year: "numeric" }).format(
+      dateCheck
+    );
+    const month = new Intl.DateTimeFormat("en", { month: "2-digit" }).format(
+      dateCheck
+    );
+    const day = new Intl.DateTimeFormat("en", { day: "2-digit" }).format(
+      dateCheck
+    );
 
     const formattedDate = `${day}/${month}/${year}`;
 
     $.post(
-      'http://esx_identity/register',
+      "http://esx_identity/register",
       JSON.stringify({
-        firstname: $('#firstname').val(),
-        lastname: $('#lastname').val(),
+        firstname: $("#firstname").val(),
+        lastname: $("#lastname").val(),
         dateofbirth: formattedDate,
         sex: $("input[type='radio'][name='sex']:checked").val(),
-        height: $('#height').val(),
+        height: $("#height").val(),
       })
     );
 
-    $('#register').trigger('reset');
+    $("#register").trigger("reset");
   });
 });

From aa92104550de7e27fec20fa212d1282bab70088d Mon Sep 17 00:00:00 2001
From: MoskalykA <100430077+MoskalykA@users.noreply.github.com>
Date: Mon, 6 Feb 2023 13:41:08 +0100
Subject: [PATCH 04/70] style(esx_menu_default): run prettier

---
 [core]/esx_menu_default/html/css/app.css |   4 +-
 [core]/esx_menu_default/html/js/app.js   | 364 +++++++++++------------
 2 files changed, 184 insertions(+), 184 deletions(-)

diff --git a/[core]/esx_menu_default/html/css/app.css b/[core]/esx_menu_default/html/css/app.css
index a4312dfea..e7f07e2b8 100644
--- a/[core]/esx_menu_default/html/css/app.css
+++ b/[core]/esx_menu_default/html/css/app.css
@@ -1,11 +1,11 @@
-@import url('https://fonts.googleapis.com/css2?family=Poppins:wght@500;600&display=swap');
+@import url("https://fonts.googleapis.com/css2?family=Poppins:wght@500;600&display=swap");
 
 ::-webkit-scrollbar {
   display: none;
 }
 
 .menu {
-  font-family: 'Poppins', sans-serif;
+  font-family: "Poppins", sans-serif;
   min-width: 350px;
   color: #fff;
   position: absolute;
diff --git a/[core]/esx_menu_default/html/js/app.js b/[core]/esx_menu_default/html/js/app.js
index 2ce7a0f97..d53e3de83 100644
--- a/[core]/esx_menu_default/html/js/app.js
+++ b/[core]/esx_menu_default/html/js/app.js
@@ -1,378 +1,378 @@
-;(function () {
+(function () {
   let MenuTpl =
     '<div id="menu_{{_namespace}}_{{_name}}" class="menu{{#align}} align-{{align}}{{/align}}">' +
     '<div class="head"><span>{{{title}}}</span></div>' +
     '<div class="menu-items">' +
-    '{{#elements}}' +
+    "{{#elements}}" +
     '<div class="menu-item {{#selected}}selected{{/selected}}">' +
-    '{{{label}}}{{#isSlider}} : &lt;{{{sliderLabel}}}&gt;{{/isSlider}}' +
-    '</div>' +
-    '{{/elements}}' +
-    '</div>' +
-    '</div>' +
-    '</div>'
-  window.ESX_MENU = {}
-  ESX_MENU.ResourceName = 'esx_menu_default'
-  ESX_MENU.opened = {}
-  ESX_MENU.focus = []
-  ESX_MENU.pos = {}
+    "{{{label}}}{{#isSlider}} : &lt;{{{sliderLabel}}}&gt;{{/isSlider}}" +
+    "</div>" +
+    "{{/elements}}" +
+    "</div>" +
+    "</div>" +
+    "</div>";
+  window.ESX_MENU = {};
+  ESX_MENU.ResourceName = "esx_menu_default";
+  ESX_MENU.opened = {};
+  ESX_MENU.focus = [];
+  ESX_MENU.pos = {};
 
   ESX_MENU.open = function (namespace, name, data) {
-    if (typeof ESX_MENU.opened[namespace] == 'undefined') {
-      ESX_MENU.opened[namespace] = {}
+    if (typeof ESX_MENU.opened[namespace] == "undefined") {
+      ESX_MENU.opened[namespace] = {};
     }
 
-    if (typeof ESX_MENU.opened[namespace][name] != 'undefined') {
-      ESX_MENU.close(namespace, name)
+    if (typeof ESX_MENU.opened[namespace][name] != "undefined") {
+      ESX_MENU.close(namespace, name);
     }
 
-    if (typeof ESX_MENU.pos[namespace] == 'undefined') {
-      ESX_MENU.pos[namespace] = {}
+    if (typeof ESX_MENU.pos[namespace] == "undefined") {
+      ESX_MENU.pos[namespace] = {};
     }
 
     for (let i = 0; i < data.elements.length; i++) {
-      if (typeof data.elements[i].type == 'undefined') {
-        data.elements[i].type = 'default'
+      if (typeof data.elements[i].type == "undefined") {
+        data.elements[i].type = "default";
       }
     }
 
-    data._index = ESX_MENU.focus.length
-    data._namespace = namespace
-    data._name = name
+    data._index = ESX_MENU.focus.length;
+    data._namespace = namespace;
+    data._name = name;
 
     for (let i = 0; i < data.elements.length; i++) {
-      data.elements[i]._namespace = namespace
-      data.elements[i]._name = name
+      data.elements[i]._namespace = namespace;
+      data.elements[i]._name = name;
     }
 
-    ESX_MENU.opened[namespace][name] = data
-    ESX_MENU.pos[namespace][name] = 0
+    ESX_MENU.opened[namespace][name] = data;
+    ESX_MENU.pos[namespace][name] = 0;
 
     for (let i = 0; i < data.elements.length; i++) {
       if (data.elements[i].selected) {
-        ESX_MENU.pos[namespace][name] = i
+        ESX_MENU.pos[namespace][name] = i;
       } else {
-        data.elements[i].selected = false
+        data.elements[i].selected = false;
       }
     }
 
     ESX_MENU.focus.push({
       namespace: namespace,
-      name: name
-    })
+      name: name,
+    });
 
-    ESX_MENU.render()
-    $('#menu_' + namespace + '_' + name)
-      .find('.menu-item.selected')[0]
-      .scrollIntoView()
-  }
+    ESX_MENU.render();
+    $("#menu_" + namespace + "_" + name)
+      .find(".menu-item.selected")[0]
+      .scrollIntoView();
+  };
 
   ESX_MENU.close = function (namespace, name) {
-    delete ESX_MENU.opened[namespace][name]
+    delete ESX_MENU.opened[namespace][name];
 
     for (let i = 0; i < ESX_MENU.focus.length; i++) {
       if (
         ESX_MENU.focus[i].namespace == namespace &&
         ESX_MENU.focus[i].name == name
       ) {
-        ESX_MENU.focus.splice(i, 1)
-        break
+        ESX_MENU.focus.splice(i, 1);
+        break;
       }
     }
 
-    ESX_MENU.render()
-  }
+    ESX_MENU.render();
+  };
 
   ESX_MENU.render = function () {
-    let menuContainer = document.getElementById('menus')
-    let focused = ESX_MENU.getFocused()
-    menuContainer.innerHTML = ''
-    $(menuContainer).hide()
+    let menuContainer = document.getElementById("menus");
+    let focused = ESX_MENU.getFocused();
+    menuContainer.innerHTML = "";
+    $(menuContainer).hide();
 
     for (let namespace in ESX_MENU.opened) {
       for (let name in ESX_MENU.opened[namespace]) {
-        let menuData = ESX_MENU.opened[namespace][name]
-        let view = JSON.parse(JSON.stringify(menuData))
+        let menuData = ESX_MENU.opened[namespace][name];
+        let view = JSON.parse(JSON.stringify(menuData));
 
         for (let i = 0; i < menuData.elements.length; i++) {
-          let element = view.elements[i]
+          let element = view.elements[i];
 
           switch (element.type) {
-            case 'default':
-              break
+            case "default":
+              break;
 
-            case 'slider': {
-              element.isSlider = true
+            case "slider": {
+              element.isSlider = true;
               element.sliderLabel =
-                typeof element.options == 'undefined'
+                typeof element.options == "undefined"
                   ? element.value
-                  : element.options[element.value]
+                  : element.options[element.value];
 
-              break
+              break;
             }
 
             default:
-              break
+              break;
           }
 
           if (i == ESX_MENU.pos[namespace][name]) {
-            element.selected = true
+            element.selected = true;
           }
         }
 
-        let menu = $(Mustache.render(MenuTpl, view))[0]
-        $(menu).hide()
-        menuContainer.appendChild(menu)
+        let menu = $(Mustache.render(MenuTpl, view))[0];
+        $(menu).hide();
+        menuContainer.appendChild(menu);
       }
     }
 
-    if (typeof focused != 'undefined') {
-      $('#menu_' + focused.namespace + '_' + focused.name).show()
+    if (typeof focused != "undefined") {
+      $("#menu_" + focused.namespace + "_" + focused.name).show();
     }
 
-    $(menuContainer).show()
-  }
+    $(menuContainer).show();
+  };
 
   ESX_MENU.submit = function (namespace, name, data) {
     $.post(
-      'http://' + ESX_MENU.ResourceName + '/menu_submit',
+      "http://" + ESX_MENU.ResourceName + "/menu_submit",
       JSON.stringify({
         _namespace: namespace,
         _name: name,
         current: data,
-        elements: ESX_MENU.opened[namespace][name].elements
+        elements: ESX_MENU.opened[namespace][name].elements,
       })
-    )
-  }
+    );
+  };
 
   ESX_MENU.cancel = function (namespace, name) {
     $.post(
-      'http://' + ESX_MENU.ResourceName + '/menu_cancel',
+      "http://" + ESX_MENU.ResourceName + "/menu_cancel",
       JSON.stringify({
         _namespace: namespace,
-        _name: name
+        _name: name,
       })
-    )
-  }
+    );
+  };
 
   ESX_MENU.change = function (namespace, name, data) {
     $.post(
-      'http://' + ESX_MENU.ResourceName + '/menu_change',
+      "http://" + ESX_MENU.ResourceName + "/menu_change",
       JSON.stringify({
         _namespace: namespace,
         _name: name,
         current: data,
-        elements: ESX_MENU.opened[namespace][name].elements
+        elements: ESX_MENU.opened[namespace][name].elements,
       })
-    )
-  }
+    );
+  };
 
   ESX_MENU.getFocused = function () {
-    return ESX_MENU.focus[ESX_MENU.focus.length - 1]
-  }
+    return ESX_MENU.focus[ESX_MENU.focus.length - 1];
+  };
 
-  window.onData = data => {
+  window.onData = (data) => {
     switch (data.action) {
-      case 'openMenu': {
-        ESX_MENU.open(data.namespace, data.name, data.data)
-        break
+      case "openMenu": {
+        ESX_MENU.open(data.namespace, data.name, data.data);
+        break;
       }
 
-      case 'closeMenu': {
-        ESX_MENU.close(data.namespace, data.name)
-        break
+      case "closeMenu": {
+        ESX_MENU.close(data.namespace, data.name);
+        break;
       }
 
-      case 'controlPressed': {
+      case "controlPressed": {
         switch (data.control) {
-          case 'ENTER': {
-            let focused = ESX_MENU.getFocused()
+          case "ENTER": {
+            let focused = ESX_MENU.getFocused();
 
-            if (typeof focused != 'undefined') {
-              let menu = ESX_MENU.opened[focused.namespace][focused.name]
-              let pos = ESX_MENU.pos[focused.namespace][focused.name]
-              let elem = menu.elements[pos]
+            if (typeof focused != "undefined") {
+              let menu = ESX_MENU.opened[focused.namespace][focused.name];
+              let pos = ESX_MENU.pos[focused.namespace][focused.name];
+              let elem = menu.elements[pos];
 
               if (menu.elements.length > 0) {
-                ESX_MENU.submit(focused.namespace, focused.name, elem)
+                ESX_MENU.submit(focused.namespace, focused.name, elem);
               }
             }
 
-            break
+            break;
           }
 
-          case 'BACKSPACE': {
-            let focused = ESX_MENU.getFocused()
+          case "BACKSPACE": {
+            let focused = ESX_MENU.getFocused();
 
-            if (typeof focused != 'undefined') {
-              ESX_MENU.cancel(focused.namespace, focused.name)
+            if (typeof focused != "undefined") {
+              ESX_MENU.cancel(focused.namespace, focused.name);
             }
 
-            break
+            break;
           }
 
-          case 'TOP': {
-            let focused = ESX_MENU.getFocused()
+          case "TOP": {
+            let focused = ESX_MENU.getFocused();
 
-            if (typeof focused != 'undefined') {
-              let menu = ESX_MENU.opened[focused.namespace][focused.name]
-              let pos = ESX_MENU.pos[focused.namespace][focused.name]
+            if (typeof focused != "undefined") {
+              let menu = ESX_MENU.opened[focused.namespace][focused.name];
+              let pos = ESX_MENU.pos[focused.namespace][focused.name];
 
               if (pos > 0) {
-                ESX_MENU.pos[focused.namespace][focused.name]--
+                ESX_MENU.pos[focused.namespace][focused.name]--;
               } else {
                 ESX_MENU.pos[focused.namespace][focused.name] =
-                  menu.elements.length - 1
+                  menu.elements.length - 1;
               }
 
               let elem =
-                menu.elements[ESX_MENU.pos[focused.namespace][focused.name]]
+                menu.elements[ESX_MENU.pos[focused.namespace][focused.name]];
 
               for (let i = 0; i < menu.elements.length; i++) {
                 if (i == ESX_MENU.pos[focused.namespace][focused.name]) {
-                  menu.elements[i].selected = true
+                  menu.elements[i].selected = true;
                 } else {
-                  menu.elements[i].selected = false
+                  menu.elements[i].selected = false;
                 }
               }
 
-              ESX_MENU.change(focused.namespace, focused.name, elem)
-              ESX_MENU.render()
+              ESX_MENU.change(focused.namespace, focused.name, elem);
+              ESX_MENU.render();
 
-              $('#menu_' + focused.namespace + '_' + focused.name)
-                .find('.menu-item.selected')[0]
-                .scrollIntoView()
+              $("#menu_" + focused.namespace + "_" + focused.name)
+                .find(".menu-item.selected")[0]
+                .scrollIntoView();
             }
 
-            break
+            break;
           }
 
-          case 'DOWN': {
-            let focused = ESX_MENU.getFocused()
+          case "DOWN": {
+            let focused = ESX_MENU.getFocused();
 
-            if (typeof focused != 'undefined') {
-              let menu = ESX_MENU.opened[focused.namespace][focused.name]
-              let pos = ESX_MENU.pos[focused.namespace][focused.name]
-              let length = menu.elements.length
+            if (typeof focused != "undefined") {
+              let menu = ESX_MENU.opened[focused.namespace][focused.name];
+              let pos = ESX_MENU.pos[focused.namespace][focused.name];
+              let length = menu.elements.length;
 
               if (pos < length - 1) {
-                ESX_MENU.pos[focused.namespace][focused.name]++
+                ESX_MENU.pos[focused.namespace][focused.name]++;
               } else {
-                ESX_MENU.pos[focused.namespace][focused.name] = 0
+                ESX_MENU.pos[focused.namespace][focused.name] = 0;
               }
 
               let elem =
-                menu.elements[ESX_MENU.pos[focused.namespace][focused.name]]
+                menu.elements[ESX_MENU.pos[focused.namespace][focused.name]];
 
               for (let i = 0; i < menu.elements.length; i++) {
                 if (i == ESX_MENU.pos[focused.namespace][focused.name]) {
-                  menu.elements[i].selected = true
+                  menu.elements[i].selected = true;
                 } else {
-                  menu.elements[i].selected = false
+                  menu.elements[i].selected = false;
                 }
               }
 
-              ESX_MENU.change(focused.namespace, focused.name, elem)
-              ESX_MENU.render()
+              ESX_MENU.change(focused.namespace, focused.name, elem);
+              ESX_MENU.render();
 
-              $('#menu_' + focused.namespace + '_' + focused.name)
-                .find('.menu-item.selected')[0]
-                .scrollIntoView()
+              $("#menu_" + focused.namespace + "_" + focused.name)
+                .find(".menu-item.selected")[0]
+                .scrollIntoView();
             }
 
-            break
+            break;
           }
 
-          case 'LEFT': {
-            let focused = ESX_MENU.getFocused()
+          case "LEFT": {
+            let focused = ESX_MENU.getFocused();
 
-            if (typeof focused != 'undefined') {
-              let menu = ESX_MENU.opened[focused.namespace][focused.name]
-              let pos = ESX_MENU.pos[focused.namespace][focused.name]
-              let elem = menu.elements[pos]
+            if (typeof focused != "undefined") {
+              let menu = ESX_MENU.opened[focused.namespace][focused.name];
+              let pos = ESX_MENU.pos[focused.namespace][focused.name];
+              let elem = menu.elements[pos];
 
               switch (elem.type) {
-                case 'default':
-                  break
+                case "default":
+                  break;
 
-                case 'slider': {
-                  let min = typeof elem.min == 'undefined' ? 0 : elem.min
+                case "slider": {
+                  let min = typeof elem.min == "undefined" ? 0 : elem.min;
 
                   if (elem.value > min) {
-                    elem.value--
-                    ESX_MENU.change(focused.namespace, focused.name, elem)
+                    elem.value--;
+                    ESX_MENU.change(focused.namespace, focused.name, elem);
                   }
 
-                  ESX_MENU.render()
-                  break
+                  ESX_MENU.render();
+                  break;
                 }
 
                 default:
-                  break
+                  break;
               }
 
-              $('#menu_' + focused.namespace + '_' + focused.name)
-                .find('.menu-item.selected')[0]
-                .scrollIntoView()
+              $("#menu_" + focused.namespace + "_" + focused.name)
+                .find(".menu-item.selected")[0]
+                .scrollIntoView();
             }
 
-            break
+            break;
           }
 
-          case 'RIGHT': {
-            let focused = ESX_MENU.getFocused()
+          case "RIGHT": {
+            let focused = ESX_MENU.getFocused();
 
-            if (typeof focused != 'undefined') {
-              let menu = ESX_MENU.opened[focused.namespace][focused.name]
-              let pos = ESX_MENU.pos[focused.namespace][focused.name]
-              let elem = menu.elements[pos]
+            if (typeof focused != "undefined") {
+              let menu = ESX_MENU.opened[focused.namespace][focused.name];
+              let pos = ESX_MENU.pos[focused.namespace][focused.name];
+              let elem = menu.elements[pos];
 
               switch (elem.type) {
-                case 'default':
-                  break
+                case "default":
+                  break;
 
-                case 'slider': {
+                case "slider": {
                   if (
-                    typeof elem.options != 'undefined' &&
+                    typeof elem.options != "undefined" &&
                     elem.value < elem.options.length - 1
                   ) {
-                    elem.value++
-                    ESX_MENU.change(focused.namespace, focused.name, elem)
+                    elem.value++;
+                    ESX_MENU.change(focused.namespace, focused.name, elem);
                   }
 
-                  if (typeof elem.max != 'undefined' && elem.value < elem.max) {
-                    elem.value++
-                    ESX_MENU.change(focused.namespace, focused.name, elem)
+                  if (typeof elem.max != "undefined" && elem.value < elem.max) {
+                    elem.value++;
+                    ESX_MENU.change(focused.namespace, focused.name, elem);
                   }
 
-                  ESX_MENU.render()
-                  break
+                  ESX_MENU.render();
+                  break;
                 }
 
                 default:
-                  break
+                  break;
               }
 
-              $('#menu_' + focused.namespace + '_' + focused.name)
-                .find('.menu-item.selected')[0]
-                .scrollIntoView()
+              $("#menu_" + focused.namespace + "_" + focused.name)
+                .find(".menu-item.selected")[0]
+                .scrollIntoView();
             }
 
-            break
+            break;
           }
 
           default:
-            break
+            break;
         }
 
-        break
+        break;
       }
     }
-  }
+  };
 
   window.onload = function (e) {
-    window.addEventListener('message', event => {
-      onData(event.data)
-    })
-  }
-})()
+    window.addEventListener("message", (event) => {
+      onData(event.data);
+    });
+  };
+})();

From 5b81c1b737eba451c1c672aa6a45a4225c6a0dc6 Mon Sep 17 00:00:00 2001
From: MoskalykA <100430077+MoskalykA@users.noreply.github.com>
Date: Mon, 6 Feb 2023 13:41:31 +0100
Subject: [PATCH 05/70] style(esx_menu_dialog): run prettier

---
 [core]/esx_menu_dialog/html/css/app.css | 100 +++----
 [core]/esx_menu_dialog/html/js/app.js   | 350 ++++++++++++------------
 [core]/esx_menu_dialog/html/ui.html     |  37 ++-
 3 files changed, 254 insertions(+), 233 deletions(-)

diff --git a/[core]/esx_menu_dialog/html/css/app.css b/[core]/esx_menu_dialog/html/css/app.css
index db52551b6..c2f590c4c 100644
--- a/[core]/esx_menu_dialog/html/css/app.css
+++ b/[core]/esx_menu_dialog/html/css/app.css
@@ -1,89 +1,89 @@
-
-@import url('https://fonts.googleapis.com/css?family=Montserrat&display=swap');
+@import url("https://fonts.googleapis.com/css?family=Montserrat&display=swap");
 
 #controls {
-	font-family: montserrat;
-	font-size: 3em;
-	color: #FFF;
-	position: absolute;
-	bottom: 40;
-	right: 40;
+  font-family: montserrat;
+  font-size: 3em;
+  color: #fff;
+  position: absolute;
+  bottom: 40;
+  right: 40;
 }
 
 .controls {
-	display: none;
+  display: none;
 }
 
 .dialog {
-	font-family: montserrat;
-	background: rgba(33, 33, 33, 0.8);
+  font-family: montserrat;
+  background: rgba(33, 33, 33, 0.8);
   color: #fff;
-	position: absolute;
-	border-top-left-radius: 5px;
-	border-top-right-radius: 5px;
-	overflow: hidden;
-	top: 50%;
-	left: 50%;
-	width: 600px;
-	height: 152px;
-	transform: translate(-50%, -50%);
+  position: absolute;
+  border-top-left-radius: 5px;
+  border-top-right-radius: 5px;
+  overflow: hidden;
+  top: 50%;
+  left: 50%;
+  width: 600px;
+  height: 152px;
+  transform: translate(-50%, -50%);
 }
 
 .head {
-	display: flex;
-	flex-basis: 100%;
-	align-items: center;
-	color: #fff;
+  display: flex;
+  flex-basis: 100%;
+  align-items: center;
+  color: #fff;
 }
 
 .dialog.big {
-	height: 200px;
+  height: 200px;
 }
 
 .dialog .head {
-	background: rgba(25, 25, 25, 0.9);
-	text-align: center;
-	height: 40px;
+  background: rgba(25, 25, 25, 0.9);
+  text-align: center;
+  height: 40px;
 }
 
 .dialog .head span::before {
-	content: "";
-	display: inline-block;
-	height: 100%;
-	vertical-align: middle;
+  content: "";
+  display: inline-block;
+  height: 100%;
+  vertical-align: middle;
 }
 
 .dialog input[type="text"] {
-	width: 60%;
-	height: 32px;
+  width: 60%;
+  height: 32px;
   outline: 0;
   background: none;
   text-align: center;
   margin-top: 26px;
   margin-left: 125px;
-	font-size: large;
+  font-size: large;
   transition: all 0.2s ease-in-out;
   color: white;
   border: 0.5px solid #ffffff3b;
   border-radius: 0px;
 }
 
-.dialog input[type="text"]:active, .dialog input[type="text"]:hover {
+.dialog input[type="text"]:active,
+.dialog input[type="text"]:hover {
   color: white;
 }
 
 .dialog textarea {
-	width: 100%;
-	height: 128px;
+  width: 100%;
+  height: 128px;
 }
 
 .dialog button[name="submit"] {
-	width: 17.6%;
-	height: 32px;
+  width: 17.6%;
+  height: 32px;
   margin-left: 160px;
   font-weight: 300;
   color: rgb(37, 34, 53);
-	border-radius: 10px;
+  border-radius: 10px;
   text-transform: uppercase;
   background: rgb(50, 79, 208);
   outline: 0;
@@ -93,17 +93,17 @@
 
 .dialog button {
   z-index: 9999;
-	transform: translate(-0%, 50%);
+  transform: translate(-0%, 50%);
 }
 
 .dialog button[name="cancel"] {
-	width: 17.6%;
-	height: 32px;
+  width: 17.6%;
+  height: 32px;
   margin-left: 60px;
   border: none;
   text-transform: uppercase;
   font-weight: 200;
-	border-radius: 10px;
+  border-radius: 10px;
   color: rgb(53, 34, 34);
   outline: 0;
   background: #c74545;
@@ -124,9 +124,9 @@
 
 .head::before,
 .head::after {
-	content: "";
-	flex-grow: 1;
-	background: #00e1ff;
-	height: 2px;
-	margin: 0px 3px;
+  content: "";
+  flex-grow: 1;
+  background: #00e1ff;
+  height: 2px;
+  margin: 0px 3px;
 }
diff --git a/[core]/esx_menu_dialog/html/js/app.js b/[core]/esx_menu_dialog/html/js/app.js
index 85a172b65..5186bcf70 100644
--- a/[core]/esx_menu_dialog/html/js/app.js
+++ b/[core]/esx_menu_dialog/html/js/app.js
@@ -1,170 +1,184 @@
 (function () {
-	let MenuTpl =
-		'<div id="menu_{{_namespace}}_{{_name}}" class="dialog {{#isBig}}big{{/isBig}}">' +
-			'<div class="head"><span>{{title}}</span></div>' +
-				'{{#isDefault}}<input type="text" name="value" id="inputText"/>{{/isDefault}}' +
-				'{{#isBig}}<textarea name="value"/>{{/isBig}}' +
-				'<button type="button" name="submit">Submit</button>' +
-				'<button type="button" name="cancel">Cancel</button>' +
-			'</div>' +
-		'</div>'
-	;
-
-	window.ESX_MENU = {};
-	ESX_MENU.ResourceName = 'esx_menu_dialog';
-	ESX_MENU.opened = {};
-	ESX_MENU.focus = [];
-	ESX_MENU.pos = {};
-
-	ESX_MENU.open = function (namespace, name, data) {
-		if (typeof ESX_MENU.opened[namespace] == 'undefined') {
-			ESX_MENU.opened[namespace] = {};
-		}
-
-		if (typeof ESX_MENU.opened[namespace][name] != 'undefined') {
-			ESX_MENU.close(namespace, name);
-		}
-
-		if (typeof ESX_MENU.pos[namespace] == 'undefined') {
-			ESX_MENU.pos[namespace] = {};
-		}
-
-		if (typeof data.type == 'undefined') {
-			data.type = 'default';
-		}
-
-		if (typeof data.align == 'undefined') {
-			data.align = 'top-left';
-		}
-
-		data._index = ESX_MENU.focus.length;
-		data._namespace = namespace;
-		data._name = name;
-
-		ESX_MENU.opened[namespace][name] = data;
-		ESX_MENU.pos[namespace][name] = 0;
-
-		ESX_MENU.focus.push({
-			namespace: namespace,
-			name: name
-		});
-
-		document.onkeyup = function (key) {
-			if (key.which == 27) { // Escape key
-				SendMessage(ESX_MENU.ResourceName, 'menu_cancel', data);
-			} else if (key.which == 13) { // Enter key
-				SendMessage(ESX_MENU.ResourceName, 'menu_submit', data);
-			}
-		};
-
-		ESX_MENU.render();
-	};
-
-	ESX_MENU.close = function (namespace, name) {
-		delete ESX_MENU.opened[namespace][name];
-
-		for (let i = 0; i < ESX_MENU.focus.length; i++) {
-			if (ESX_MENU.focus[i].namespace == namespace && ESX_MENU.focus[i].name == name) {
-				ESX_MENU.focus.splice(i, 1);
-				break;
-			}
-		}
-
-		ESX_MENU.render();
-	};
-
-	ESX_MENU.render = function () {
-		let menuContainer = $('#menus')[0];
-		$(menuContainer).find('button[name="submit"]').unbind('click');
-		$(menuContainer).find('button[name="cancel"]').unbind('click');
-		$(menuContainer).find('[name="value"]').unbind('input propertychange');
-		menuContainer.innerHTML = '';
-		$(menuContainer).hide();
-
-		for (let namespace in ESX_MENU.opened) {
-			for (let name in ESX_MENU.opened[namespace]) {
-				let menuData = ESX_MENU.opened[namespace][name];
-				let view = JSON.parse(JSON.stringify(menuData));
-
-				switch (menuData.type) {
-
-					case 'default': {
-						view.isDefault = true;
-						break;
-					}
-
-					case 'big': {
-						view.isBig = true;
-						break;
-					}
-
-					default: break;
-				}
-
-				let menu = $(Mustache.render(MenuTpl, view))[0];
-
-				$(menu).css('z-index', 1000 + view._index);
-
-				$(menu).find('button[name="submit"]').click(function () {
-					ESX_MENU.submit(this.namespace, this.name, this.data);
-				}.bind({ namespace: namespace, name: name, data: menuData }));
-
-				$(menu).find('button[name="cancel"]').click(function () {
-					ESX_MENU.cancel(this.namespace, this.name, this.data);
-				}.bind({ namespace: namespace, name: name, data: menuData }));
-
-				$(menu).find('[name="value"]').bind('input propertychange', function () {
-					this.data.value = $(menu).find('[name="value"]').val();
-					ESX_MENU.change(this.namespace, this.name, this.data);
-				}.bind({ namespace: namespace, name: name, data: menuData }));
-
-				if (typeof menuData.value != 'undefined') {
-					$(menu).find('[name="value"]').val(menuData.value);
-				}
-
-				menuContainer.appendChild(menu);
-			}
-		}
-
-		$(menuContainer).show();
-		$("#inputText").focus();
-	};
-
-	ESX_MENU.submit = function (namespace, name, data) {
-		SendMessage(ESX_MENU.ResourceName, 'menu_submit', data);
-	};
-
-	ESX_MENU.cancel = function (namespace, name, data) {
-		SendMessage(ESX_MENU.ResourceName, 'menu_cancel', data);
-	};
-
-	ESX_MENU.change = function (namespace, name, data) {
-		SendMessage(ESX_MENU.ResourceName, 'menu_change', data);
-	};
-
-	ESX_MENU.getFocused = function () {
-		return ESX_MENU.focus[ESX_MENU.focus.length - 1];
-	};
-
-	window.onData = (data) => {
-		switch (data.action) {
-
-			case 'openMenu': {
-				ESX_MENU.open(data.namespace, data.name, data.data);
-				break;
-			}
-
-			case 'closeMenu': {
-				ESX_MENU.close(data.namespace, data.name);
-				break;
-			}
-		}
-	};
-
-	window.onload = function (e) {
-		window.addEventListener('message', (event) => {
-			onData(event.data);
-		});
-	};
-
+  let MenuTpl =
+    '<div id="menu_{{_namespace}}_{{_name}}" class="dialog {{#isBig}}big{{/isBig}}">' +
+    '<div class="head"><span>{{title}}</span></div>' +
+    '{{#isDefault}}<input type="text" name="value" id="inputText"/>{{/isDefault}}' +
+    '{{#isBig}}<textarea name="value"/>{{/isBig}}' +
+    '<button type="button" name="submit">Submit</button>' +
+    '<button type="button" name="cancel">Cancel</button>' +
+    "</div>" +
+    "</div>";
+  window.ESX_MENU = {};
+  ESX_MENU.ResourceName = "esx_menu_dialog";
+  ESX_MENU.opened = {};
+  ESX_MENU.focus = [];
+  ESX_MENU.pos = {};
+
+  ESX_MENU.open = function (namespace, name, data) {
+    if (typeof ESX_MENU.opened[namespace] == "undefined") {
+      ESX_MENU.opened[namespace] = {};
+    }
+
+    if (typeof ESX_MENU.opened[namespace][name] != "undefined") {
+      ESX_MENU.close(namespace, name);
+    }
+
+    if (typeof ESX_MENU.pos[namespace] == "undefined") {
+      ESX_MENU.pos[namespace] = {};
+    }
+
+    if (typeof data.type == "undefined") {
+      data.type = "default";
+    }
+
+    if (typeof data.align == "undefined") {
+      data.align = "top-left";
+    }
+
+    data._index = ESX_MENU.focus.length;
+    data._namespace = namespace;
+    data._name = name;
+
+    ESX_MENU.opened[namespace][name] = data;
+    ESX_MENU.pos[namespace][name] = 0;
+
+    ESX_MENU.focus.push({
+      namespace: namespace,
+      name: name,
+    });
+
+    document.onkeyup = function (key) {
+      if (key.which == 27) {
+        // Escape key
+        SendMessage(ESX_MENU.ResourceName, "menu_cancel", data);
+      } else if (key.which == 13) {
+        // Enter key
+        SendMessage(ESX_MENU.ResourceName, "menu_submit", data);
+      }
+    };
+
+    ESX_MENU.render();
+  };
+
+  ESX_MENU.close = function (namespace, name) {
+    delete ESX_MENU.opened[namespace][name];
+
+    for (let i = 0; i < ESX_MENU.focus.length; i++) {
+      if (
+        ESX_MENU.focus[i].namespace == namespace &&
+        ESX_MENU.focus[i].name == name
+      ) {
+        ESX_MENU.focus.splice(i, 1);
+        break;
+      }
+    }
+
+    ESX_MENU.render();
+  };
+
+  ESX_MENU.render = function () {
+    let menuContainer = $("#menus")[0];
+    $(menuContainer).find('button[name="submit"]').unbind("click");
+    $(menuContainer).find('button[name="cancel"]').unbind("click");
+    $(menuContainer).find('[name="value"]').unbind("input propertychange");
+    menuContainer.innerHTML = "";
+    $(menuContainer).hide();
+
+    for (let namespace in ESX_MENU.opened) {
+      for (let name in ESX_MENU.opened[namespace]) {
+        let menuData = ESX_MENU.opened[namespace][name];
+        let view = JSON.parse(JSON.stringify(menuData));
+
+        switch (menuData.type) {
+          case "default": {
+            view.isDefault = true;
+            break;
+          }
+
+          case "big": {
+            view.isBig = true;
+            break;
+          }
+
+          default:
+            break;
+        }
+
+        let menu = $(Mustache.render(MenuTpl, view))[0];
+
+        $(menu).css("z-index", 1000 + view._index);
+
+        $(menu)
+          .find('button[name="submit"]')
+          .click(
+            function () {
+              ESX_MENU.submit(this.namespace, this.name, this.data);
+            }.bind({ namespace: namespace, name: name, data: menuData })
+          );
+
+        $(menu)
+          .find('button[name="cancel"]')
+          .click(
+            function () {
+              ESX_MENU.cancel(this.namespace, this.name, this.data);
+            }.bind({ namespace: namespace, name: name, data: menuData })
+          );
+
+        $(menu)
+          .find('[name="value"]')
+          .bind(
+            "input propertychange",
+            function () {
+              this.data.value = $(menu).find('[name="value"]').val();
+              ESX_MENU.change(this.namespace, this.name, this.data);
+            }.bind({ namespace: namespace, name: name, data: menuData })
+          );
+
+        if (typeof menuData.value != "undefined") {
+          $(menu).find('[name="value"]').val(menuData.value);
+        }
+
+        menuContainer.appendChild(menu);
+      }
+    }
+
+    $(menuContainer).show();
+    $("#inputText").focus();
+  };
+
+  ESX_MENU.submit = function (namespace, name, data) {
+    SendMessage(ESX_MENU.ResourceName, "menu_submit", data);
+  };
+
+  ESX_MENU.cancel = function (namespace, name, data) {
+    SendMessage(ESX_MENU.ResourceName, "menu_cancel", data);
+  };
+
+  ESX_MENU.change = function (namespace, name, data) {
+    SendMessage(ESX_MENU.ResourceName, "menu_change", data);
+  };
+
+  ESX_MENU.getFocused = function () {
+    return ESX_MENU.focus[ESX_MENU.focus.length - 1];
+  };
+
+  window.onData = (data) => {
+    switch (data.action) {
+      case "openMenu": {
+        ESX_MENU.open(data.namespace, data.name, data.data);
+        break;
+      }
+
+      case "closeMenu": {
+        ESX_MENU.close(data.namespace, data.name);
+        break;
+      }
+    }
+  };
+
+  window.onload = function (e) {
+    window.addEventListener("message", (event) => {
+      onData(event.data);
+    });
+  };
 })();
diff --git a/[core]/esx_menu_dialog/html/ui.html b/[core]/esx_menu_dialog/html/ui.html
index d05f3bed5..22df83921 100644
--- a/[core]/esx_menu_dialog/html/ui.html
+++ b/[core]/esx_menu_dialog/html/ui.html
@@ -1,19 +1,26 @@
 <html>
+  <head>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="nui://esx_menu_dialog/html/css/app.css" />
+    <link rel="preconnect" href="https://fonts.gstatic.com" />
+    <link
+      href="https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:ital,wght@1,300&family=PT+Sans+Narrow&display=swap"
+      rel="stylesheet"
+    />
+  </head>
 
-<head>
-	<meta charset="utf-8">
-	<link rel="stylesheet" href="nui://esx_menu_dialog/html/css/app.css">
-	<link rel="preconnect" href="https://fonts.gstatic.com">
-	<link href="https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:ital,wght@1,300&family=PT+Sans+Narrow&display=swap" rel="stylesheet">
-</head>
-
-<body>
-	<div id="menus"></div>
-
-	<script src="nui://game/ui/jquery.js" type="text/javascript"></script>
-	<script src="nui://es_extended/html/js/wrapper.js"></script>
-	<script src="nui://esx_menu_dialog/html/js/mustache.min.js" type="text/javascript"></script>
-	<script src="nui://esx_menu_dialog/html/js/app.js" type="text/javascript"></script>
-</body>
+  <body>
+    <div id="menus"></div>
 
+    <script src="nui://game/ui/jquery.js" type="text/javascript"></script>
+    <script src="nui://es_extended/html/js/wrapper.js"></script>
+    <script
+      src="nui://esx_menu_dialog/html/js/mustache.min.js"
+      type="text/javascript"
+    ></script>
+    <script
+      src="nui://esx_menu_dialog/html/js/app.js"
+      type="text/javascript"
+    ></script>
+  </body>
 </html>

From 21e87610b6cf011a2871b0f3d0b5dc29f030de1d Mon Sep 17 00:00:00 2001
From: MoskalykA <100430077+MoskalykA@users.noreply.github.com>
Date: Mon, 6 Feb 2023 13:41:51 +0100
Subject: [PATCH 06/70] style(esx_menu_list): run prettier

---
 [core]/esx_menu_list/html/css/app.css |  65 ++---
 [core]/esx_menu_list/html/js/app.js   | 401 ++++++++++++++------------
 [core]/esx_menu_list/html/ui.html     |  28 +-
 3 files changed, 254 insertions(+), 240 deletions(-)

diff --git a/[core]/esx_menu_list/html/css/app.css b/[core]/esx_menu_list/html/css/app.css
index fc2f712ff..1e7bc9ce3 100644
--- a/[core]/esx_menu_list/html/css/app.css
+++ b/[core]/esx_menu_list/html/css/app.css
@@ -1,56 +1,55 @@
 @font-face {
-	font-family: bankgothic;
-	src: url('../fonts/bankgothic.ttf');
+  font-family: bankgothic;
+  src: url("../fonts/bankgothic.ttf");
 }
 
 @font-face {
-	font-family: pcdown;
-	src: url('../fonts/pdown.ttf');
+  font-family: pcdown;
+  src: url("../fonts/pdown.ttf");
 }
 
 .menu {
-	font-family: bankgothic;
-	position: absolute;
-	left: 50%;
-	top: 40%;
-	transform: translate(-50%, -50%);
-	overflow-y: auto;
-	max-height: 90%;
+  font-family: bankgothic;
+  position: absolute;
+  left: 50%;
+  top: 40%;
+  transform: translate(-50%, -50%);
+  overflow-y: auto;
+  max-height: 90%;
 }
 
 .menu button {
-	font-family: bankgothic;
+  font-family: bankgothic;
 }
 
-.menu>table {
-	border-collapse: separate;
-	border-spacing: 0 5px;
-	min-width: 400px;
-	background: rgba(33, 33, 33, 0.0);
+.menu > table {
+  border-collapse: separate;
+  border-spacing: 0 5px;
+  min-width: 400px;
+  background: rgba(33, 33, 33, 0);
 }
 
-.menu>table>thead {
-	background: rgba(10, 10, 10, 0.9);
-	text-align: center;
-	height: 20px;
-	line-height: 20px;
-	margin-bottom: 20px;
-	color: #fff;
+.menu > table > thead {
+  background: rgba(10, 10, 10, 0.9);
+  text-align: center;
+  height: 20px;
+  line-height: 20px;
+  margin-bottom: 20px;
+  color: #fff;
 }
 
 .menu td {
-	
-	text-align: center;
-	padding: 8px;
-	margin: 20px;
+  text-align: center;
+  padding: 8px;
+  margin: 20px;
 }
 
 .menu tbody tr:nth-child(even) {
-	color: #fff;
-	background: rgba(40, 40, 40, 0.8);
+  color: #fff;
+  background: rgba(40, 40, 40, 0.8);
 }
 
 .menu tbody tr:nth-child(odd) {
-	color: #fff;
-	background: rgba(40, 40, 40, 0.8);
-}
\ No newline at end of file
+  color: #fff;
+  background: rgba(40, 40, 40, 0.8);
+}
diff --git a/[core]/esx_menu_list/html/js/app.js b/[core]/esx_menu_list/html/js/app.js
index fd1138580..72e0e3ee1 100644
--- a/[core]/esx_menu_list/html/js/app.js
+++ b/[core]/esx_menu_list/html/js/app.js
@@ -1,192 +1,209 @@
-(function(){
-
-	let MenuTpl =
-		'<div id="menu_{{_namespace}}_{{_name}}" class="menu">' +
-			'<table>' +
-				'<thead>' +
-					'<tr>' +
-						'{{#head}}<td>{{content}}</td>{{/head}}' +
-					'</tr>' +
-				'</thead>'+
-				'<tbody>' +
-					'{{#rows}}' +
-						'<tr>' +
-							'{{#cols}}<td>{{{content}}}</td>{{/cols}}' +
-						'</tr>' +
-					'{{/rows}}' +
-				'</tbody>' +
-			'</table>' +
-		'</div>'
-	;
-
-	window.ESX_MENU       = {};
-	ESX_MENU.ResourceName = 'esx_menu_list';
-	ESX_MENU.opened       = {};
-	ESX_MENU.focus        = [];
-	ESX_MENU.data         = {};
-
-	ESX_MENU.open = function(namespace, name, data) {
-
-		if (typeof ESX_MENU.opened[namespace] == 'undefined') {
-			ESX_MENU.opened[namespace] = {};
-		}
-
-		if (typeof ESX_MENU.opened[namespace][name] != 'undefined') {
-			ESX_MENU.close(namespace, name);
-		}
-
-		data._namespace = namespace;
-		data._name      = name;
-
-		ESX_MENU.opened[namespace][name] = data;
-
-		ESX_MENU.focus.push({
-			namespace: namespace,
-			name     : name
-		});
-		
-		ESX_MENU.render();
-	};
-
-	ESX_MENU.close = function(namespace, name) {
-		delete ESX_MENU.opened[namespace][name];
-
-		for (let i=0; i<ESX_MENU.focus.length; i++) {
-			if (ESX_MENU.focus[i].namespace == namespace && ESX_MENU.focus[i].name == name) {
-				ESX_MENU.focus.splice(i, 1);
-				break;
-			}
-		}
-
-		ESX_MENU.render();
-	};
-
-	ESX_MENU.render = function() {
-
-		let menuContainer       = document.getElementById('menus');
-		let focused             = ESX_MENU.getFocused();
-		menuContainer.innerHTML = '';
-
-		$(menuContainer).hide();
-
-		for (let namespace in ESX_MENU.opened) {
-			
-			if (typeof ESX_MENU.data[namespace] == 'undefined') {
-				ESX_MENU.data[namespace] = {};
-			}
-
-			for (let name in ESX_MENU.opened[namespace]) {
-
-				ESX_MENU.data[namespace][name] = [];
-
-				let menuData = ESX_MENU.opened[namespace][name];
-				let view = {
-					_namespace: menuData._namespace,
-					_name     : menuData._name,
-					head      : [],
-					rows      : []
-				};
-
-				for (let i=0; i<menuData.head.length; i++) {
-					let item = {content: menuData.head[i]};
-					view.head.push(item);
-				}
-
-				for (let i=0; i<menuData.rows.length; i++) {
-					let row  = menuData.rows[i];
-					let data = row.data;
-
-					ESX_MENU.data[namespace][name].push(data);
-
-					view.rows.push({cols: []});
-
-					for (let j=0; j<row.cols.length; j++) {
-
-						let col     = menuData.rows[i].cols[j];
-						let regex   = /\{\{(.*?)\|(.*?)\}\}/g;
-						let matches = [];
-						let match;
-
-						while ((match = regex.exec(col)) != null) {
-							matches.push(match);
-						}
-
-						for (let k=0; k<matches.length; k++) {
-							col = col.replace('{{' + matches[k][1] + '|' + matches[k][2] + '}}', '<button data-id="' + i + '" data-namespace="' + namespace + '" data-name="' + name + '" data-value="' + matches[k][2] +'">' + matches[k][1] + '</button>');
-						}
-
-						view.rows[i].cols.push({data: data, content: col});
-					}
-				}
-
-				let menu = $(Mustache.render(MenuTpl, view));
-
-				menu.find('button[data-namespace][data-name]').click(function() {
-					ESX_MENU.data[$(this).data('namespace')][$(this).data('name')][parseInt($(this).data('id'))].currentRow = parseInt($(this).data('id')) + 1;
-					ESX_MENU.submit($(this).data('namespace'), $(this).data('name'), {
-						data : ESX_MENU.data[$(this).data('namespace')][$(this).data('name')][parseInt($(this).data('id'))],
-						value: $(this).data('value')
-					});
-				});
-
-				menu.hide();
-
-				menuContainer.appendChild(menu[0]);
-			}
-		}
-
-		if (typeof focused != 'undefined') {
-			$('#menu_' + focused.namespace + '_' + focused.name).show();
-		}
-
-		$(menuContainer).show();
-	};
-
-	ESX_MENU.submit = function(namespace, name, data){
-		$.post('http://' + ESX_MENU.ResourceName + '/menu_submit', JSON.stringify({
-			_namespace: namespace,
-			_name     : name,
-			data      : data.data,
-			value     : data.value
-		}));
-	};
-
-	ESX_MENU.cancel = function(namespace, name){
-		$.post('http://' + ESX_MENU.ResourceName + '/menu_cancel', JSON.stringify({
-			_namespace: namespace,
-			_name     : name
-		}));
-	};
-
-	ESX_MENU.getFocused = function(){
-		return ESX_MENU.focus[ESX_MENU.focus.length - 1];
-	};
-
-	window.onData = (data) => {
-		switch(data.action){
-			case 'openMenu' : {
-				ESX_MENU.open(data.namespace, data.name, data.data);
-				break;
-			}
-
-			case 'closeMenu' : {
-				ESX_MENU.close(data.namespace, data.name);
-				break;
-			}
-		}
-	};
-
-	window.onload = function(e){
-		window.addEventListener('message', (event) => {
-			onData(event.data);
-		});
-	};
-
-	document.onkeyup = function(data) {
-		if(data.which == 27) {
-			let focused = ESX_MENU.getFocused();
-			ESX_MENU.cancel(focused.namespace, focused.name);
-		}
-	};
-
-})();
\ No newline at end of file
+(function () {
+  let MenuTpl =
+    '<div id="menu_{{_namespace}}_{{_name}}" class="menu">' +
+    "<table>" +
+    "<thead>" +
+    "<tr>" +
+    "{{#head}}<td>{{content}}</td>{{/head}}" +
+    "</tr>" +
+    "</thead>" +
+    "<tbody>" +
+    "{{#rows}}" +
+    "<tr>" +
+    "{{#cols}}<td>{{{content}}}</td>{{/cols}}" +
+    "</tr>" +
+    "{{/rows}}" +
+    "</tbody>" +
+    "</table>" +
+    "</div>";
+  window.ESX_MENU = {};
+  ESX_MENU.ResourceName = "esx_menu_list";
+  ESX_MENU.opened = {};
+  ESX_MENU.focus = [];
+  ESX_MENU.data = {};
+
+  ESX_MENU.open = function (namespace, name, data) {
+    if (typeof ESX_MENU.opened[namespace] == "undefined") {
+      ESX_MENU.opened[namespace] = {};
+    }
+
+    if (typeof ESX_MENU.opened[namespace][name] != "undefined") {
+      ESX_MENU.close(namespace, name);
+    }
+
+    data._namespace = namespace;
+    data._name = name;
+
+    ESX_MENU.opened[namespace][name] = data;
+
+    ESX_MENU.focus.push({
+      namespace: namespace,
+      name: name,
+    });
+
+    ESX_MENU.render();
+  };
+
+  ESX_MENU.close = function (namespace, name) {
+    delete ESX_MENU.opened[namespace][name];
+
+    for (let i = 0; i < ESX_MENU.focus.length; i++) {
+      if (
+        ESX_MENU.focus[i].namespace == namespace &&
+        ESX_MENU.focus[i].name == name
+      ) {
+        ESX_MENU.focus.splice(i, 1);
+        break;
+      }
+    }
+
+    ESX_MENU.render();
+  };
+
+  ESX_MENU.render = function () {
+    let menuContainer = document.getElementById("menus");
+    let focused = ESX_MENU.getFocused();
+    menuContainer.innerHTML = "";
+
+    $(menuContainer).hide();
+
+    for (let namespace in ESX_MENU.opened) {
+      if (typeof ESX_MENU.data[namespace] == "undefined") {
+        ESX_MENU.data[namespace] = {};
+      }
+
+      for (let name in ESX_MENU.opened[namespace]) {
+        ESX_MENU.data[namespace][name] = [];
+
+        let menuData = ESX_MENU.opened[namespace][name];
+        let view = {
+          _namespace: menuData._namespace,
+          _name: menuData._name,
+          head: [],
+          rows: [],
+        };
+
+        for (let i = 0; i < menuData.head.length; i++) {
+          let item = { content: menuData.head[i] };
+          view.head.push(item);
+        }
+
+        for (let i = 0; i < menuData.rows.length; i++) {
+          let row = menuData.rows[i];
+          let data = row.data;
+
+          ESX_MENU.data[namespace][name].push(data);
+
+          view.rows.push({ cols: [] });
+
+          for (let j = 0; j < row.cols.length; j++) {
+            let col = menuData.rows[i].cols[j];
+            let regex = /\{\{(.*?)\|(.*?)\}\}/g;
+            let matches = [];
+            let match;
+
+            while ((match = regex.exec(col)) != null) {
+              matches.push(match);
+            }
+
+            for (let k = 0; k < matches.length; k++) {
+              col = col.replace(
+                "{{" + matches[k][1] + "|" + matches[k][2] + "}}",
+                '<button data-id="' +
+                  i +
+                  '" data-namespace="' +
+                  namespace +
+                  '" data-name="' +
+                  name +
+                  '" data-value="' +
+                  matches[k][2] +
+                  '">' +
+                  matches[k][1] +
+                  "</button>"
+              );
+            }
+
+            view.rows[i].cols.push({ data: data, content: col });
+          }
+        }
+
+        let menu = $(Mustache.render(MenuTpl, view));
+
+        menu.find("button[data-namespace][data-name]").click(function () {
+          ESX_MENU.data[$(this).data("namespace")][$(this).data("name")][
+            parseInt($(this).data("id"))
+          ].currentRow = parseInt($(this).data("id")) + 1;
+          ESX_MENU.submit($(this).data("namespace"), $(this).data("name"), {
+            data: ESX_MENU.data[$(this).data("namespace")][
+              $(this).data("name")
+            ][parseInt($(this).data("id"))],
+            value: $(this).data("value"),
+          });
+        });
+
+        menu.hide();
+
+        menuContainer.appendChild(menu[0]);
+      }
+    }
+
+    if (typeof focused != "undefined") {
+      $("#menu_" + focused.namespace + "_" + focused.name).show();
+    }
+
+    $(menuContainer).show();
+  };
+
+  ESX_MENU.submit = function (namespace, name, data) {
+    $.post(
+      "http://" + ESX_MENU.ResourceName + "/menu_submit",
+      JSON.stringify({
+        _namespace: namespace,
+        _name: name,
+        data: data.data,
+        value: data.value,
+      })
+    );
+  };
+
+  ESX_MENU.cancel = function (namespace, name) {
+    $.post(
+      "http://" + ESX_MENU.ResourceName + "/menu_cancel",
+      JSON.stringify({
+        _namespace: namespace,
+        _name: name,
+      })
+    );
+  };
+
+  ESX_MENU.getFocused = function () {
+    return ESX_MENU.focus[ESX_MENU.focus.length - 1];
+  };
+
+  window.onData = (data) => {
+    switch (data.action) {
+      case "openMenu": {
+        ESX_MENU.open(data.namespace, data.name, data.data);
+        break;
+      }
+
+      case "closeMenu": {
+        ESX_MENU.close(data.namespace, data.name);
+        break;
+      }
+    }
+  };
+
+  window.onload = function (e) {
+    window.addEventListener("message", (event) => {
+      onData(event.data);
+    });
+  };
+
+  document.onkeyup = function (data) {
+    if (data.which == 27) {
+      let focused = ESX_MENU.getFocused();
+      ESX_MENU.cancel(focused.namespace, focused.name);
+    }
+  };
+})();
diff --git a/[core]/esx_menu_list/html/ui.html b/[core]/esx_menu_list/html/ui.html
index af5fd03b6..62f6bda96 100644
--- a/[core]/esx_menu_list/html/ui.html
+++ b/[core]/esx_menu_list/html/ui.html
@@ -1,16 +1,14 @@
 <html>
-
-<head>
-	<link rel="stylesheet" href="css/app.css" />
-</head>
-
-<body>
-	<div id="menus"></div>
-
-	<script src="nui://game/ui/jquery.js"></script>
-	<script src="nui://es_extended/html/js/wrapper.js"></script>
-	<script src="js/mustache.min.js"></script>
-	<script src="js/app.js"></script>
-</body>
-
-</html>
\ No newline at end of file
+  <head>
+    <link rel="stylesheet" href="css/app.css" />
+  </head>
+
+  <body>
+    <div id="menus"></div>
+
+    <script src="nui://game/ui/jquery.js"></script>
+    <script src="nui://es_extended/html/js/wrapper.js"></script>
+    <script src="js/mustache.min.js"></script>
+    <script src="js/app.js"></script>
+  </body>
+</html>

From ae2d81d6b1b5f4d24fec59b6bb236bb860dad9b0 Mon Sep 17 00:00:00 2001
From: MoskalykA <100430077+MoskalykA@users.noreply.github.com>
Date: Mon, 6 Feb 2023 13:44:10 +0100
Subject: [PATCH 07/70] style(esx_multicharacter): run prettier

---
 [core]/esx_multicharacter/html/css/main.css | 100 ++++++++++----------
 [core]/esx_multicharacter/html/js/app.js    |  89 +++++++++++------
 [core]/esx_multicharacter/html/ui.html      |  47 +++++----
 3 files changed, 137 insertions(+), 99 deletions(-)

diff --git a/[core]/esx_multicharacter/html/css/main.css b/[core]/esx_multicharacter/html/css/main.css
index c8b969f14..11c38dffc 100644
--- a/[core]/esx_multicharacter/html/css/main.css
+++ b/[core]/esx_multicharacter/html/css/main.css
@@ -1,76 +1,76 @@
-@import url('https://fonts.googleapis.com/css2?family=Raleway:wght@300;600&display=swap');
-@import url('https://fonts.googleapis.com/css2?family=Oswald&display=swap');
+@import url("https://fonts.googleapis.com/css2?family=Raleway:wght@300;600&display=swap");
+@import url("https://fonts.googleapis.com/css2?family=Oswald&display=swap");
 * {
-    margin: 0;
-    padding: 0;
-    user-select: none;
-    color: rgb(255, 255, 255);
-	border-radius: 15px;
-	font-weight: 300;
-	font-size: 1.6vh;
-    font-family: Calibri, "Helvetica", san-serif;
+  margin: 0;
+  padding: 0;
+  user-select: none;
+  color: rgb(255, 255, 255);
+  border-radius: 15px;
+  font-weight: 300;
+  font-size: 1.6vh;
+  font-family: Calibri, "Helvetica", san-serif;
 }
 
 html {
-    overflow: hidden;
+  overflow: hidden;
 }
 
 p {
-    margin: 0 !important;
+  margin: 0 !important;
 }
 
 body {
-	background: transparent;
+  background: transparent;
 }
 
 .main-container {
-    display:none;
-    position: absolute;
-	top: 50%;
-    right: 150;
-    transform: translate(0, -50%);
-	border-radius: 15px;
-	background: rgba(15,15,15, 0.9);
+  display: none;
+  position: absolute;
+  top: 50%;
+  right: 150;
+  transform: translate(0, -50%);
+  border-radius: 15px;
+  background: rgba(15, 15, 15, 0.9);
 }
 
 .header {
-	font-family: 'Oswald', sans-serif;
-	position: absolute;
-	background: rgba(10, 10, 10, 0.9);
-	border-radius: 15px 15px 0px 0px; 
-	height: 10%;
-	width: 100%;
-    left: 50%;
-	text-align: center;
-    transform: translate(-50%);
-	font-weight: 700;
-	padding-bottom: 5px;
-	font-size: 1.6rem;
+  font-family: "Oswald", sans-serif;
+  position: absolute;
+  background: rgba(10, 10, 10, 0.9);
+  border-radius: 15px 15px 0px 0px;
+  height: 10%;
+  width: 100%;
+  left: 50%;
+  text-align: center;
+  transform: translate(-50%);
+  font-weight: 700;
+  padding-bottom: 5px;
+  font-size: 1.6rem;
 }
 
 .footer {
-	position: absolute;
-	font-size: 0rem;
+  position: absolute;
+  font-size: 0rem;
 }
 
 .character-box {
-	display: flex;
-	right: 0;
-	flex-direction: column;
-	justify-content: center;
-	align-items: center;
-	text-align: center;
-	line-height: 1.4rem;
-	height: calc(30rem);
-	width: 17rem;
-	border: 1px rgba(10,10,10,0.7) solid;
-	box-shadow: 2px 1px 9px 3px rgba(10,10,10,0.7);
+  display: flex;
+  right: 0;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  text-align: center;
+  line-height: 1.4rem;
+  height: calc(30rem);
+  width: 17rem;
+  border: 1px rgba(10, 10, 10, 0.7) solid;
+  box-shadow: 2px 1px 9px 3px rgba(10, 10, 10, 0.7);
 }
 
 h1 {
-	font-family: 'Oswald', sans-serif;
-	font-size: 22px;
-	padding-top: 1.3rem;
-	display: block;
-	font-weight: 0;
+  font-family: "Oswald", sans-serif;
+  font-size: 22px;
+  padding-top: 1.3rem;
+  display: block;
+  font-weight: 0;
 }
diff --git a/[core]/esx_multicharacter/html/js/app.js b/[core]/esx_multicharacter/html/js/app.js
index 22b5c92ca..20b2a0b9f 100644
--- a/[core]/esx_multicharacter/html/js/app.js
+++ b/[core]/esx_multicharacter/html/js/app.js
@@ -1,35 +1,68 @@
-var money = Intl.NumberFormat('en-US', {
-	style: 'currency',
-	currency: 'USD',
-	minimumFractionDigits: 0
+var money = Intl.NumberFormat("en-US", {
+  style: "currency",
+  currency: "USD",
+  minimumFractionDigits: 0,
 });
 
 (() => {
-    Kashacter = {};
+  Kashacter = {};
 
-    Kashacter.ShowUI = function(data) {
-        $('body').css({"display":"block"});
-        $('.main-container').css({"display":"block"});
-		$('[data-charid=1]').html('<div class="character-info"><p class="character-info-name"><h1>' + `${translate.name} ` + '</h1><span>' + data.firstname +' '+ data.lastname +'</span></p><p class="character-info-work"><h1>' + `${translate.job} ` + '</h1><span>'+ data.job +' '+ data.job_grade +'</span></p><p class="character-info-money"><h1>' + `${translate.money} ` + '</h1><span> '+ money.format(data.money) +'</span></p><p class="character-info-bank"><h1>' + `${translate.bank} ` + '</h1><span> '+ money.format(data.bank) +'</span></p> <p class="character-info-dateofbirth"><h1>' + `${translate.dob} ` + '</h1><span>'+ data.dateofbirth +'</span></p> <p class="character-info-gender"><h1>' + `${translate.gender} ` + '</h1><span>'+ data.sex +'</span></p></div>').attr("data-ischar", "true");
-    };
+  Kashacter.ShowUI = function (data) {
+    $("body").css({ display: "block" });
+    $(".main-container").css({ display: "block" });
+    $("[data-charid=1]")
+      .html(
+        '<div class="character-info"><p class="character-info-name"><h1>' +
+          `${translate.name} ` +
+          "</h1><span>" +
+          data.firstname +
+          " " +
+          data.lastname +
+          '</span></p><p class="character-info-work"><h1>' +
+          `${translate.job} ` +
+          "</h1><span>" +
+          data.job +
+          " " +
+          data.job_grade +
+          '</span></p><p class="character-info-money"><h1>' +
+          `${translate.money} ` +
+          "</h1><span> " +
+          money.format(data.money) +
+          '</span></p><p class="character-info-bank"><h1>' +
+          `${translate.bank} ` +
+          "</h1><span> " +
+          money.format(data.bank) +
+          '</span></p> <p class="character-info-dateofbirth"><h1>' +
+          `${translate.dob} ` +
+          "</h1><span>" +
+          data.dateofbirth +
+          '</span></p> <p class="character-info-gender"><h1>' +
+          `${translate.gender} ` +
+          "</h1><span>" +
+          data.sex +
+          "</span></p></div>"
+      )
+      .attr("data-ischar", "true");
+  };
 
-    Kashacter.CloseUI = function() {
-        $('body').css({"display":"none"});
-        $('.main-container').css({"display":"none"});
-		$('[data-charid=1]').html('<h3 class="character-fullname"></h3><div class="character-info"><p class="character-info-new"></p></div>');
-    };
-
-    window.onload = function(e) {
-        window.addEventListener('message', function(event) {
-            switch(event.data.action) {
-                case 'openui':
-                    Kashacter.ShowUI(event.data.character);
-                    break;
-				case 'closeui':
-					Kashacter.CloseUI();
-					break;
-            }
-        })
-    }
+  Kashacter.CloseUI = function () {
+    $("body").css({ display: "none" });
+    $(".main-container").css({ display: "none" });
+    $("[data-charid=1]").html(
+      '<h3 class="character-fullname"></h3><div class="character-info"><p class="character-info-new"></p></div>'
+    );
+  };
 
+  window.onload = function (e) {
+    window.addEventListener("message", function (event) {
+      switch (event.data.action) {
+        case "openui":
+          Kashacter.ShowUI(event.data.character);
+          break;
+        case "closeui":
+          Kashacter.CloseUI();
+          break;
+      }
+    });
+  };
 })();
diff --git a/[core]/esx_multicharacter/html/ui.html b/[core]/esx_multicharacter/html/ui.html
index 3ca18eedc..5f6a489cf 100644
--- a/[core]/esx_multicharacter/html/ui.html
+++ b/[core]/esx_multicharacter/html/ui.html
@@ -1,24 +1,29 @@
 <html>
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-        <!-- Custom CSS -->
-        <link rel="stylesheet" type="text/css" href="css/main.css" />
-		<!-- Locales -->
-		<script src="locales/en.js"></script>
-    </head>
-    <body style="display: none;">
-	    <div class="main-container">
-			<div class='header'>Character Info</div>
-            <div class="character-box" data-charid="1">
-                <h3 class="character-fullname"></h3>
-                <div class="character-info"></div>
-            </div>
-			<div class='footer'>Multicharacter</div>
-        </div>
-        </div>
+  <head>
+    <meta charset="utf-8" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, shrink-to-fit=no"
+    />
+    <!-- Custom CSS -->
+    <link rel="stylesheet" type="text/css" href="css/main.css" />
+    <!-- Locales -->
+    <script src="locales/en.js"></script>
+  </head>
+  <body style="display: none">
+    <div class="main-container">
+      <div class="header">Character Info</div>
+      <div class="character-box" data-charid="1">
+        <h3 class="character-fullname"></h3>
+        <div class="character-info"></div>
+      </div>
+      <div class="footer">Multicharacter</div>
     </div>
-    <script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
+    <script
+      src="https://code.jquery.com/jquery-3.3.1.min.js"
+      integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8="
+      crossorigin="anonymous"
+    ></script>
     <script src="js/app.js" type="text/javascript"></script>
-    </body>
-</html>
\ No newline at end of file
+  </body>
+</html>

From 2b981fd7d19a810f882423165885ea220571842c Mon Sep 17 00:00:00 2001
From: MoskalykA <100430077+MoskalykA@users.noreply.github.com>
Date: Mon, 6 Feb 2023 13:44:26 +0100
Subject: [PATCH 08/70] style(esx_notify): run prettier

---
 [core]/esx_notify/nui/css/style.css | 94 ++++++++++++++--------------
 [core]/esx_notify/nui/index.html    | 17 ++---
 [core]/esx_notify/nui/js/script.js  | 96 +++++++++++++++--------------
 3 files changed, 104 insertions(+), 103 deletions(-)

diff --git a/[core]/esx_notify/nui/css/style.css b/[core]/esx_notify/nui/css/style.css
index e86093e32..f1022a6d6 100644
--- a/[core]/esx_notify/nui/css/style.css
+++ b/[core]/esx_notify/nui/css/style.css
@@ -1,88 +1,84 @@
-@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@100&family=Poppins:wght@300;400;500;600;800&display=swap');
+@import url("https://fonts.googleapis.com/css2?family=Montserrat:wght@100&family=Poppins:wght@300;400;500;600;800&display=swap");
 
 :root {
-    --color: #919191;
+  --color: #919191;
 }
 
 * {
-    border: 0;
-    margin: 0;
-    padding: 0;
-    box-sizing: border-box;
+  border: 0;
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
 }
 
 body {
-    width: 100vw;
-    height: 100vh;
-    color: var(--color);
-    font-weight: 100;
-    font-family: 'Poppins', sans-serif;
-    overflow: hidden;
+  width: 100vw;
+  height: 100vh;
+  color: var(--color);
+  font-weight: 100;
+  font-family: "Poppins", sans-serif;
+  overflow: hidden;
 }
 
 #root {
-    display: grid;
-    justify-content: center;
+  display: grid;
+  justify-content: center;
 }
 
 #root .notify {
-    display: flex;
-    position: relative;
-    flex: auto;
-    min-width: 20rem;
-    width: fit-content;
-    height: 3.5rem;
-    background: rgba(5,5, 5, 0.9);
-    border-radius: .5rem;
-    margin-top: .5rem;
-    animation: anim 300ms ease-in-out;
-    align-items: center;
+  display: flex;
+  position: relative;
+  flex: auto;
+  min-width: 20rem;
+  width: fit-content;
+  height: 3.5rem;
+  background: rgba(5, 5, 5, 0.9);
+  border-radius: 0.5rem;
+  margin-top: 0.5rem;
+  animation: anim 300ms ease-in-out;
+  align-items: center;
 }
 
 #root .innerText {
-    padding-left: .4rem;
-    padding-right: .4rem;
-    width: 100%;
+  padding-left: 0.4rem;
+  padding-right: 0.4rem;
+  width: 100%;
 }
 
 #root .icon {
-    float: left;
-    color: #fff;
+  float: left;
+  color: #fff;
 }
 
 #root .text {
-    display: inline-block;
-    margin-left: .5rem;
+  display: inline-block;
+  margin-left: 0.5rem;
 }
 
 #root .error {
-    border-bottom: 3px solid #c0392b;
+  border-bottom: 3px solid #c0392b;
 }
 
 #root .success {
-    border-bottom: 3px solid #2ecc71;
+  border-bottom: 3px solid #2ecc71;
 }
 
 #root .info {
-    border-bottom: 3px solid #2980b9;
+  border-bottom: 3px solid #2980b9;
 }
 
 .material-symbols-outlined {
-    font-variation-settings:
-             'FILL' 0,
-             'wght' 400,
-             'GRAD' 0,
-             'opsz' 48
+  font-variation-settings: "FILL" 0, "wght" 400, "GRAD" 0, "opsz" 48;
 }
 
 @keyframes anim {
-    0% {
-        transform: scaleY(0);
-    }
-    80% {
-        transform: scaleY(1.1)
-    }
-    100% {
-        transform: scaleY(1)
-    }
+  0% {
+    transform: scaleY(0);
+  }
+  80% {
+    transform: scaleY(1.1);
+  }
+  100% {
+    transform: scaleY(1);
+  }
 }
diff --git a/[core]/esx_notify/nui/index.html b/[core]/esx_notify/nui/index.html
index 2852ba798..01c1ff39b 100644
--- a/[core]/esx_notify/nui/index.html
+++ b/[core]/esx_notify/nui/index.html
@@ -1,15 +1,18 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
+  <head>
     <script src="nui://game/ui/jquery.js" type="text/javascript"></script>
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200" />
-    <link rel="stylesheet" href="css/style.css">
+    <link
+      rel="stylesheet"
+      href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200"
+    />
+    <link rel="stylesheet" href="css/style.css" />
     <script src="js/script.js"></script>
     <title>ESX Notify</title>
-</head>
-<body>
+  </head>
+  <body>
     <div id="root">
-        <!-- this is just a template! No touchy touchy -->
+      <!-- this is just a template! No touchy touchy -->
     </div>
-</body>
+  </body>
 </html>
diff --git a/[core]/esx_notify/nui/js/script.js b/[core]/esx_notify/nui/js/script.js
index 55591a8aa..9ca5648c6 100644
--- a/[core]/esx_notify/nui/js/script.js
+++ b/[core]/esx_notify/nui/js/script.js
@@ -1,74 +1,76 @@
-const w = window
+const w = window;
 
 // Gets the current icon it needs to use.
 const types = {
-    ["success"]: {
-        ["icon"]: "check_circle",
-    },
-    ["error"]: {
-        ["icon"]: "error",
-    },
-    ["info"]: {
-        ["icon"]: "info",
-    }
-}
+  ["success"]: {
+    ["icon"]: "check_circle",
+  },
+  ["error"]: {
+    ["icon"]: "error",
+  },
+  ["info"]: {
+    ["icon"]: "info",
+  },
+};
 
 // the color codes example `i ~r~love~s~ donuts`
 const codes = {
-    "~r~": "red",
-    "~b~": "#378cbf",
-    "~g~": "green",
-    "~y~": "yellow",
-    "~p~": "purple",
-    "~c~": "grey",
-    "~m~": "#212121",
-    "~u~": "black",
-    "~o~": "orange"
-}
+  "~r~": "red",
+  "~b~": "#378cbf",
+  "~g~": "green",
+  "~y~": "yellow",
+  "~p~": "purple",
+  "~c~": "grey",
+  "~m~": "#212121",
+  "~u~": "black",
+  "~o~": "orange",
+};
 
 w.addEventListener("message", (event) => {
-    notification({
-        type: event.data.type,
-        message: event.data.message,
-        length: event.data.length,
-    });
+  notification({
+    type: event.data.type,
+    message: event.data.message,
+    length: event.data.length,
+  });
 });
 
 const replaceColors = (str, obj) => {
-    let strToReplace = str;
+  let strToReplace = str;
 
-    for (let id in obj) {
-        strToReplace = strToReplace.replace(new RegExp(id, "g"), obj[id]);
-    }
+  for (let id in obj) {
+    strToReplace = strToReplace.replace(new RegExp(id, "g"), obj[id]);
+  }
 
-    return strToReplace
-}
+  return strToReplace;
+};
 
 notification = (data) => {
-    for (color in codes) {
-        if (data["message"].includes(color)) {
-            let objArr = {};
-            objArr[color] = `<span style="color: ${codes[color]}">`;
-            objArr["~s~"] = "</span>";
+  for (color in codes) {
+    if (data["message"].includes(color)) {
+      let objArr = {};
+      objArr[color] = `<span style="color: ${codes[color]}">`;
+      objArr["~s~"] = "</span>";
 
-            let newStr = replaceColors(data["message"], objArr);
+      let newStr = replaceColors(data["message"], objArr);
 
-            data["message"] = newStr
-        }
+      data["message"] = newStr;
     }
+  }
 
-    const notification = $(`
+  const notification = $(`
         <div class="notify ${data.type}">
             <div class="innerText">
-                <span class="material-symbols-outlined icon">${types[data.type]["icon"]}</span>
+                <span class="material-symbols-outlined icon">${
+                  types[data.type]["icon"]
+                }</span>
                 <p class="text">${data["message"]}</p>
             </div>
         </div>
     `).appendTo(`#root`);
 
-    setTimeout(() => {
-        notification.fadeOut(700);
-    }, data.length);
+  setTimeout(() => {
+    notification.fadeOut(700);
+  }, data.length);
 
-    return notification;
-}
+  return notification;
+};

From 65adc9d87314397f33f0bc2e4f9976b25f9d8ced Mon Sep 17 00:00:00 2001
From: MoskalykA <100430077+MoskalykA@users.noreply.github.com>
Date: Mon, 6 Feb 2023 13:44:45 +0100
Subject: [PATCH 09/70] style(esx_progressbar): run prettier

---
 [core]/esx_progressbar/nui/css/style.css |  14 +--
 [core]/esx_progressbar/nui/index.html    | 142 ++++++++++++-----------
 [core]/esx_progressbar/nui/js/script.js  | 112 +++++++++---------
 3 files changed, 135 insertions(+), 133 deletions(-)

diff --git a/[core]/esx_progressbar/nui/css/style.css b/[core]/esx_progressbar/nui/css/style.css
index 61d24738c..87d0e1356 100644
--- a/[core]/esx_progressbar/nui/css/style.css
+++ b/[core]/esx_progressbar/nui/css/style.css
@@ -1,14 +1,14 @@
 :root {
-    --color: white;
-    --bgColor: #212121;
+  --color: white;
+  --bgColor: #212121;
 }
 
 * {
-    padding: 0;
-    margin: 0;
+  padding: 0;
+  margin: 0;
 }
 
 body {
-    color: var(--color);
-    font-family: sans-serif;
-}
\ No newline at end of file
+  color: var(--color);
+  font-family: sans-serif;
+}
diff --git a/[core]/esx_progressbar/nui/index.html b/[core]/esx_progressbar/nui/index.html
index 390c6c7cd..c29ee5fd4 100644
--- a/[core]/esx_progressbar/nui/index.html
+++ b/[core]/esx_progressbar/nui/index.html
@@ -1,88 +1,90 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
+  <head>
     <script src="https://kit.fontawesome.com/a81368914c.js"></script>
-    <link rel="stylesheet" href="css/style.css">
-</head>
-<body>
+    <link rel="stylesheet" href="css/style.css" />
+  </head>
+  <body>
     <div id="notifyInfo" class="notify">
-        <div class="innerText">
-            <i class="fas fa-info-circle icon info"></i>
-            <p class="text" id="infoMessage"></p>
-        </div>
-        <div id="progline" class="progline">
-        </div>
+      <div class="innerText">
+        <i class="fas fa-info-circle icon info"></i>
+        <p class="text" id="infoMessage"></p>
+      </div>
+      <div id="progline" class="progline"></div>
     </div>
-</body>
-<script src="js/script.js"></script>
+  </body>
+  <script src="js/script.js"></script>
 </html>
 
 <style>
+  .notify {
+    flex: auto;
+    display: none;
+    position: absolute;
+    margin: 0 auto;
+    left: 0;
+    right: 0;
+    bottom: 100px;
+    min-width: 15%;
+    width: fit-content;
+    height: 45px;
+    background-color: rgba(5, 5, 5, 0.8);
+    border-radius: 5px;
+    animation: growDown 300ms ease-in-out;
+    padding-right: 10px;
+  }
 
+  .progline {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    height: 2px;
+    width: 100%;
+    border-radius: 20px;
+    background: linear-gradient(
+      to right,
+      #0052d4,
+      #4364f7,
+      #6fb1fc
+    ); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */
+  }
 
-.notify {
-        flex: auto;
-        display: none;
-        position:absolute;
-        margin: 0 auto;
-        left: 0;
-        right: 0;
-        bottom: 100px;
-        min-width:15%;
-        width:fit-content; 
-        height:45px;
-        background-color:rgba(5, 5, 5, 0.800);
-        border-radius: 5px;
-        animation: growDown 300ms ease-in-out;
-        padding-right: 10px;
-    }
+  .icon {
+    border: 0;
+  }
 
-    .progline {
-        position:absolute;
-        bottom:0;
-        left:0;
-        right:0;
-        height:2px;
-        width:100%;
-        border-radius: 20px;
-        background: linear-gradient(to right, #0052d4, #4364f7, #6fb1fc); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */
-    }
+  .innerText {
+    flex: auto;
+    margin-top: 15px;
+    width: 100%;
+  }
 
-    .icon {
-        border: 0;
-    }
+  .innerText {
+    margin-left: 10px;
+  }
+  p {
+    flex: auto;
+    word-wrap: break-word;
+    margin-left: 30px;
+    margin-top: 15px;
+  }
 
-    .innerText {
-        flex: auto;
-        margin-top: 15px;
-        width:100%;
-    }
+  .innerText .icon {
+    float: left;
+    margin-left: 5px;
+    font-size: 20px;
+  }
 
-    .innerText{
-        margin-left: 10px;
+  @keyframes growDown {
+    0% {
+      transform: scaleY(0);
     }
-    p {
-        flex: auto;
-        word-wrap: break-word;
-        margin-left: 30px; 
-        margin-top: 15px;
+    80% {
+      transform: scaleY(1.1);
     }
-
-    .innerText .icon {
-        float: left;
-        margin-left: 5px;
-        font-size: 20px;
-    }
-
-    @keyframes growDown {
-        0% {
-            transform: scaleY(0);
-        }
-        80% {
-            transform: scaleY(1.1)
-        }
-        100% {
-            transform: scaleY(1)
-        }
+    100% {
+      transform: scaleY(1);
     }
+  }
 </style>
diff --git a/[core]/esx_progressbar/nui/js/script.js b/[core]/esx_progressbar/nui/js/script.js
index ac2fb5925..19152fa8e 100644
--- a/[core]/esx_progressbar/nui/js/script.js
+++ b/[core]/esx_progressbar/nui/js/script.js
@@ -1,69 +1,69 @@
 const codes = {
-    "~r~": "red",
-    "~b~": "#378cbf",
-    "~g~": "green",
-    "~y~": "yellow",
-    "~p~": "purple",
-    "~c~": "grey",
-    "~m~": "#212121",
-    "~u~": "black",
-    "~o~": "orange"
-}
+  "~r~": "red",
+  "~b~": "#378cbf",
+  "~g~": "green",
+  "~y~": "yellow",
+  "~p~": "purple",
+  "~c~": "grey",
+  "~m~": "#212121",
+  "~u~": "black",
+  "~o~": "orange",
+};
 
 const elems = {
-    infoMessage: document.getElementById('infoMessage'),
-    notifyInfo: document.getElementById("notifyInfo"),
-    progline: document.getElementById('progline')
-}
+  infoMessage: document.getElementById("infoMessage"),
+  notifyInfo: document.getElementById("notifyInfo"),
+  progline: document.getElementById("progline"),
+};
 
 const replaceColors = (str, obj) => {
-    let strToReplace = str;
+  let strToReplace = str;
 
-    for (let id in obj) {
-        strToReplace = strToReplace.replace(new RegExp(id, "g"), obj[id]);
-    }
+  for (let id in obj) {
+    strToReplace = strToReplace.replace(new RegExp(id, "g"), obj[id]);
+  }
+
+  return strToReplace;
+};
 
-    return strToReplace
-}
+window.addEventListener("message", function ({ data }) {
+  if (data.type === "Progressbar") {
+    let { message } = data;
 
-window.addEventListener('message', function({data}) {
-    if (data.type === "Progressbar") {
-        let { message } = data
+    for (color in codes) {
+      if (message.includes(color)) {
+        let objArr = {};
+        objArr[color] = `<span style="color: ${codes[color]}">`;
+        objArr["~s~"] = "</span>";
 
-        for (color in codes) {
-            if (message.includes(color)) {
-                let objArr = {};
-                objArr[color] = `<span style="color: ${codes[color]}">`;
-                objArr["~s~"] = "</span>";
-    
-                let newStr = replaceColors(message, objArr);
-    
-                message = newStr
-            }
-        }
+        let newStr = replaceColors(message, objArr);
+
+        message = newStr;
+      }
+    }
 
-        elems.infoMessage.innerHTML = message
-        elems.notifyInfo.style.display = "block";
+    elems.infoMessage.innerHTML = message;
+    elems.notifyInfo.style.display = "block";
 
-        const start = new Date();
-        const maxTime = data.length;
-        const timeoutValue = Math.floor(maxTime / 100);
-        animUpdate();
+    const start = new Date();
+    const maxTime = data.length;
+    const timeoutValue = Math.floor(maxTime / 100);
+    animUpdate();
 
-        function animUpdate() {
-            const now = new Date();
-            const timeoutDiff = now.getTime() - start.getTime();
-            const prc = Math.round((timeoutDiff/maxTime)*100);
-            if (prc <= 100) {
-                elems.progline.style.width = prc + "%"
-                this.timeoutID = setTimeout(animUpdate, timeoutValue);
-            } else {
-                elems.notifyInfo.style.display = "none";
-            }
-        }
-    } else {
-        elems.notifyInfo.style.display = 'none'
-        clearTimeout(this.timeoutID);
-        timeoutValue = 0;
+    function animUpdate() {
+      const now = new Date();
+      const timeoutDiff = now.getTime() - start.getTime();
+      const prc = Math.round((timeoutDiff / maxTime) * 100);
+      if (prc <= 100) {
+        elems.progline.style.width = prc + "%";
+        this.timeoutID = setTimeout(animUpdate, timeoutValue);
+      } else {
+        elems.notifyInfo.style.display = "none";
+      }
     }
-})
+  } else {
+    elems.notifyInfo.style.display = "none";
+    clearTimeout(this.timeoutID);
+    timeoutValue = 0;
+  }
+});

From 2d1debcbd5544b9e279b886eb317acb2f4f60ef9 Mon Sep 17 00:00:00 2001
From: MoskalykA <100430077+MoskalykA@users.noreply.github.com>
Date: Mon, 6 Feb 2023 13:45:20 +0100
Subject: [PATCH 10/70] style(esx_textui): run prettier

---
 [core]/esx_textui/nui/css/style.css |  89 ++++++++++----------
 [core]/esx_textui/nui/index.html    |  56 +++++++------
 [core]/esx_textui/nui/js/script.js  | 124 ++++++++++++++--------------
 3 files changed, 132 insertions(+), 137 deletions(-)

diff --git a/[core]/esx_textui/nui/css/style.css b/[core]/esx_textui/nui/css/style.css
index 5f8d27265..1137b3f2f 100644
--- a/[core]/esx_textui/nui/css/style.css
+++ b/[core]/esx_textui/nui/css/style.css
@@ -1,82 +1,77 @@
 :root {
-    --color: white;
-    --bgColor: #212121;
+  --color: white;
+  --bgColor: #212121;
 }
 
 * {
-    padding: 0;
-    margin: 0;
-    border: 0;
-    box-sizing: border-box;
+  padding: 0;
+  margin: 0;
+  border: 0;
+  box-sizing: border-box;
 }
 
 body {
-    color: var(--color);
-    font-family: sans-serif;
+  color: var(--color);
+  font-family: sans-serif;
 }
 
 .notify {
-    display: none;
-    position: absolute;
-    right: 2%;
-    bottom: 50%;
-    flex: auto;
-    min-width: 15%;
-    width: fit-content;
-    height: 50px;
-    background: rgba(5,5,5,.9);
-    border-radius: .5rem;
-    animation: growDown 300ms ease-in-out;
-    align-items: center;
+  display: none;
+  position: absolute;
+  right: 2%;
+  bottom: 50%;
+  flex: auto;
+  min-width: 15%;
+  width: fit-content;
+  height: 50px;
+  background: rgba(5, 5, 5, 0.9);
+  border-radius: 0.5rem;
+  animation: growDown 300ms ease-in-out;
+  align-items: center;
 }
 
 .error {
-    border-left: 5px solid #c0392b;
+  border-left: 5px solid #c0392b;
 }
 
 .success {
-    border-left: 5px solid #2ecc71;
+  border-left: 5px solid #2ecc71;
 }
 
 .info {
-    border-left: 5px solid #2980b9;
+  border-left: 5px solid #2980b9;
 }
 
 .innerText {
-    padding-left: .4rem;
-    padding-right: .4rem;
-    padding-top: 12.5px;
-    width: 100%;
-    height: 100%;
+  padding-left: 0.4rem;
+  padding-right: 0.4rem;
+  padding-top: 12.5px;
+  width: 100%;
+  height: 100%;
 }
 
 .innerText .icon {
-    float: left;
+  float: left;
 }
 
 .innerText .text {
-    display: inline-block;
-    margin-left: .5rem;
-    margin-top: 4px;
+  display: inline-block;
+  margin-left: 0.5rem;
+  margin-top: 4px;
 }
 
-
 @keyframes growDown {
-    0% {
-        transform: scaleY(0);
-    }
-    80% {
-        transform: scaleY(1.1)
-    }
-    100% {
-        transform: scaleY(1)
-    }
+  0% {
+    transform: scaleY(0);
+  }
+  80% {
+    transform: scaleY(1.1);
+  }
+  100% {
+    transform: scaleY(1);
+  }
 }
 
 .material-symbols-outlined {
-    font-variation-settings:
-            'FILL' 0,
-            'wght' 400,
-            'GRAD' 0,
-            'opsz' 48
+  font-variation-settings: "FILL" 0, "wght" 400, "GRAD" 0, "opsz" 48;
 }
diff --git a/[core]/esx_textui/nui/index.html b/[core]/esx_textui/nui/index.html
index 970028830..13f5a2c87 100644
--- a/[core]/esx_textui/nui/index.html
+++ b/[core]/esx_textui/nui/index.html
@@ -1,30 +1,32 @@
 <!DOCTYPE html>
 <html lang="en">
-    <head>
-        <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200" />
-        <script src="https://kit.fontawesome.com/a81368914c.js"></script>
-        <link rel="stylesheet" href="css/style.css">
-        <script src="js/script.js"></script>
-
-    </head>
-    <body>
-        <div id="notifyInfo" class="notify info">
-            <div class="innerText">
-                <span class="material-symbols-outlined icon">info</span>
-                <p class="text" id="infoMessage"></p>
-            </div>
-        </div>
-        <div id="notifySuccess" class="notify success">
-            <div class="innerText">
-                <span class="material-symbols-outlined icon">check_circle</span>
-                <p class="text" id="successMessage"></p>
-            </div>
-        </div>
-        <div id="notifyError" class="notify error">
-            <div class="innerText">
-                <span class="material-symbols-outlined icon">error</span>
-                <p class="text" id="errorMessage"></p>
-            </div>
-        </div>
-    </body>
+  <head>
+    <link
+      rel="stylesheet"
+      href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200"
+    />
+    <script src="https://kit.fontawesome.com/a81368914c.js"></script>
+    <link rel="stylesheet" href="css/style.css" />
+    <script src="js/script.js"></script>
+  </head>
+  <body>
+    <div id="notifyInfo" class="notify info">
+      <div class="innerText">
+        <span class="material-symbols-outlined icon">info</span>
+        <p class="text" id="infoMessage"></p>
+      </div>
+    </div>
+    <div id="notifySuccess" class="notify success">
+      <div class="innerText">
+        <span class="material-symbols-outlined icon">check_circle</span>
+        <p class="text" id="successMessage"></p>
+      </div>
+    </div>
+    <div id="notifyError" class="notify error">
+      <div class="innerText">
+        <span class="material-symbols-outlined icon">error</span>
+        <p class="text" id="errorMessage"></p>
+      </div>
+    </div>
+  </body>
 </html>
diff --git a/[core]/esx_textui/nui/js/script.js b/[core]/esx_textui/nui/js/script.js
index b83b850d7..8d19977ab 100644
--- a/[core]/esx_textui/nui/js/script.js
+++ b/[core]/esx_textui/nui/js/script.js
@@ -4,82 +4,80 @@ let lastType = "";
 
 // Gets the current icon it needs to use.
 const types = {
-    ["success"]: {
-        ["message"]: "successMessage",
-        ["id"]: "notifySuccess",
-    },
-    ["error"]: {
-        ["message"]: "errorMessage",
-        ["id"]: "notifyError",
-    },
-    ["info"]: {
-        ["message"]: "infoMessage",
-        ["id"]: "notifyInfo",
-    }
-}
+  ["success"]: {
+    ["message"]: "successMessage",
+    ["id"]: "notifySuccess",
+  },
+  ["error"]: {
+    ["message"]: "errorMessage",
+    ["id"]: "notifyError",
+  },
+  ["info"]: {
+    ["message"]: "infoMessage",
+    ["id"]: "notifyInfo",
+  },
+};
 
 // the color codes example `i ~r~love~s~ donuts`
 const codes = {
-    "~r~": "red",
-    "~b~": "#378cbf",
-    "~g~": "green",
-    "~y~": "yellow",
-    "~p~": "purple",
-    "~c~": "grey",
-    "~m~": "#212121",
-    "~u~": "black",
-    "~o~": "orange"
-}
+  "~r~": "red",
+  "~b~": "#378cbf",
+  "~g~": "green",
+  "~y~": "yellow",
+  "~p~": "purple",
+  "~c~": "grey",
+  "~m~": "#212121",
+  "~u~": "black",
+  "~o~": "orange",
+};
 
-w.addEventListener('message', (event) => {
-    if (event.data.action === "show") {
-        if (lastType) {
-            doc.getElementById(lastType).style.display = "none";
-            notification({
-                type: event.data.type,
-                message: event.data.message
-            });
-        } else {
-            notification({
-                type: event.data.type,
-                message: event.data.message
-            });
-        }
-    } else
-    if (event.data.action === "hide") {
-        if (lastType !== "") {
-            doc.getElementById(lastType).style.display = "none"
-        } else {
-            console.log("There isn't a textUI displaying!?")
-        }
+w.addEventListener("message", (event) => {
+  if (event.data.action === "show") {
+    if (lastType) {
+      doc.getElementById(lastType).style.display = "none";
+      notification({
+        type: event.data.type,
+        message: event.data.message,
+      });
+    } else {
+      notification({
+        type: event.data.type,
+        message: event.data.message,
+      });
+    }
+  } else if (event.data.action === "hide") {
+    if (lastType !== "") {
+      doc.getElementById(lastType).style.display = "none";
+    } else {
+      console.log("There isn't a textUI displaying!?");
     }
+  }
 });
 
 const replaceColors = (str, obj) => {
-    let strToReplace = str
+  let strToReplace = str;
 
-    for (let id in obj) {
-        strToReplace = strToReplace.replace(new RegExp(id, 'g'), obj[id])
-    }
+  for (let id in obj) {
+    strToReplace = strToReplace.replace(new RegExp(id, "g"), obj[id]);
+  }
 
-    return strToReplace
-}
+  return strToReplace;
+};
 
 notification = (data) => {
-    for (color in codes) {
-        if (data["message"].includes(color)) {
-            let objArr = {};
-            objArr[color] = `<span style="color: ${codes[color]}">`;
-            objArr["~s~"] = "</span>";
+  for (color in codes) {
+    if (data["message"].includes(color)) {
+      let objArr = {};
+      objArr[color] = `<span style="color: ${codes[color]}">`;
+      objArr["~s~"] = "</span>";
 
-            let newStr = replaceColors(data["message"], objArr);
+      let newStr = replaceColors(data["message"], objArr);
 
-            data["message"] = newStr;
-        }
+      data["message"] = newStr;
     }
+  }
 
-    doc.getElementById(types[data.type]["id"]).style.display = "block";
-    lastType = types[data.type]["id"]
-    doc.getElementById(types[data.type]["message"]).innerHTML = data["message"]
-
-}
+  doc.getElementById(types[data.type]["id"]).style.display = "block";
+  lastType = types[data.type]["id"];
+  doc.getElementById(types[data.type]["message"]).innerHTML = data["message"];
+};

From 48a5c41eb729d1fd658429fec132700b3b1a0d9f Mon Sep 17 00:00:00 2001
From: Csoki <feketetibi71@gmail.com>
Date: Fri, 10 Feb 2023 21:59:43 +0100
Subject: [PATCH 11/70] feat(es_extended/modules): add client callbacks and
 move server callback to modules

---
 [core]/es_extended/client/functions.lua       | 19 --------
 .../es_extended/client/modules/callback.lua   | 40 +++++++++++++++++
 [core]/es_extended/server/common.lua          | 12 -----
 [core]/es_extended/server/functions.lua       | 12 -----
 .../es_extended/server/modules/callback.lua   | 45 +++++++++++++++++++
 5 files changed, 85 insertions(+), 43 deletions(-)
 create mode 100644 [core]/es_extended/client/modules/callback.lua
 create mode 100644 [core]/es_extended/server/modules/callback.lua

diff --git a/[core]/es_extended/client/functions.lua b/[core]/es_extended/client/functions.lua
index 73114156e..2e3e1a932 100644
--- a/[core]/es_extended/client/functions.lua
+++ b/[core]/es_extended/client/functions.lua
@@ -2,8 +2,6 @@ ESX = {}
 Core = {}
 ESX.PlayerData = {}
 ESX.PlayerLoaded = false
-Core.CurrentRequestId = 0
-Core.ServerCallbacks = {}
 Core.Input = {}
 ESX.UI = {}
 ESX.UI.Menu = {}
@@ -187,14 +185,6 @@ ESX.RegisterInput = function(command_name, label, input_group, key, on_press, on
     RegisterKeyMapping(on_release ~= nil and "+" .. command_name or command_name, label, input_group, key)
 end
 
-function ESX.TriggerServerCallback(name, cb, ...)
-    local Invoke = GetInvokingResource() or "unknown"
-    Core.ServerCallbacks[Core.CurrentRequestId] = cb
-
-    TriggerServerEvent('esx:triggerServerCallback', name, Core.CurrentRequestId,Invoke, ...)
-    Core.CurrentRequestId = Core.CurrentRequestId < 65535 and Core.CurrentRequestId + 1 or 0
-end
-
 function ESX.UI.Menu.RegisterType(type, open, close)
     ESX.UI.Menu.RegisteredTypes[type] = {
         open = open,
@@ -1304,15 +1294,6 @@ function ESX.ShowInventory()
     end)
 end
 
-RegisterNetEvent('esx:serverCallback', function(requestId,invoker, ...)
-    if Core.ServerCallbacks[requestId] then
-        Core.ServerCallbacks[requestId](...)
-        Core.ServerCallbacks[requestId] = nil
-    else 
-        print('[^1ERROR^7] Server Callback with requestId ^5'.. requestId ..'^7 Was Called by ^5'.. invoker .. '^7 but does not exist.')
-    end
-end)
-
 RegisterNetEvent('esx:showNotification')
 AddEventHandler('esx:showNotification', function(msg, type, length)
     ESX.ShowNotification(msg, type, length)
diff --git a/[core]/es_extended/client/modules/callback.lua b/[core]/es_extended/client/modules/callback.lua
new file mode 100644
index 000000000..180c92167
--- /dev/null
+++ b/[core]/es_extended/client/modules/callback.lua
@@ -0,0 +1,40 @@
+local RequestId = 0
+local serverRequests = {}
+
+local clientCallbacks = {}
+
+---@param eventName string
+---@param callback function
+---@param ... any
+ESX.TriggerServerCallback = function(eventName, callback, ...)
+  serverRequests[RequestId] = callback
+  
+  TriggerServerEvent('esx:triggerServerCallback', eventName, RequestId, GetInvokingResource() or "unknown", ...)
+
+  RequestId = RequestId + 1
+end
+
+RegisterNetEvent('esx:serverCallback', function(requestId, invoker, ...)
+  if not serverRequests[requestId] then
+    return print(('[^1ERROR^7] Server Callback with requestId ^5%s^7 Was Called by ^5%s^7 but does not exist.'):format(requestId, invoker))
+  end
+
+  serverRequests[requestId](...)
+  serverRequests[requestId] = nil
+end)
+
+---@param eventName string
+---@param callback function
+ESX.RegisterClientCallback = function(eventName, callback)
+  clientCallbacks[eventName] = callback
+end
+
+RegisterNetEvent('esx:triggerClientCallback', function(eventName, requestId, invoker, ...)
+  if not clientCallbacks[eventName] then
+    return print(('[^1ERROR^7] Client Callback not registered, name: ^5%s^7, invoker resource: ^5%s^7'):format(eventName, invoker))
+  end
+
+  clientCallbacks[eventName](function(...)
+    TriggerServerEvent('esx:clientCallback', requestId, invoker, ...)
+  end, ...)
+end)
\ No newline at end of file
diff --git a/[core]/es_extended/server/common.lua b/[core]/es_extended/server/common.lua
index 134ea49e8..3fd6fa93a 100644
--- a/[core]/es_extended/server/common.lua
+++ b/[core]/es_extended/server/common.lua
@@ -4,9 +4,6 @@ ESX.Jobs = {}
 ESX.Items = {}
 Core = {}
 Core.UsableItemsCallbacks = {}
-Core.ServerCallbacks = {}
-Core.ClientCallbacks = {}
-Core.CurrentRequestId = 0
 Core.RegisteredCommands = {}
 Core.Pickups = {}
 Core.PickupId = 0
@@ -76,15 +73,6 @@ AddEventHandler('esx:clientLog', function(msg)
   end
 end)
 
-RegisterServerEvent('esx:triggerServerCallback')
-AddEventHandler('esx:triggerServerCallback', function(name, requestId,Invoke, ...)
-  local source = source
-
-  ESX.TriggerServerCallback(name, requestId, source,Invoke, function(...)
-    TriggerClientEvent('esx:serverCallback', source, requestId,Invoke, ...)
-  end, ...)
-end)
-
 RegisterNetEvent("esx:ReturnVehicleType", function(Type, Request)
   if Core.ClientCallbacks[Request] then
     Core.ClientCallbacks[Request](Type)
diff --git a/[core]/es_extended/server/functions.lua b/[core]/es_extended/server/functions.lua
index 3e10f922f..c5e249a6b 100644
--- a/[core]/es_extended/server/functions.lua
+++ b/[core]/es_extended/server/functions.lua
@@ -143,18 +143,6 @@ function ESX.RegisterCommand(name, group, cb, allowConsole, suggestion)
   end
 end
 
-function ESX.RegisterServerCallback(name, cb)
-  Core.ServerCallbacks[name] = cb
-end
-
-function ESX.TriggerServerCallback(name, requestId, source,Invoke, cb, ...)
-  if Core.ServerCallbacks[name] then
-    Core.ServerCallbacks[name](source, cb, ...)
-  else
-    print(('[^1ERROR^7] Server callback ^5"%s"^0 does not exist. Please Check ^5%s^7 for Errors!'):format(name, Invoke))
-  end
-end
-
 function Core.SavePlayer(xPlayer, cb)
   local parameters <const> = {
     json.encode(xPlayer.getAccounts(true)),
diff --git a/[core]/es_extended/server/modules/callback.lua b/[core]/es_extended/server/modules/callback.lua
new file mode 100644
index 000000000..a758e6e80
--- /dev/null
+++ b/[core]/es_extended/server/modules/callback.lua
@@ -0,0 +1,45 @@
+local serverCallbacks = {}
+
+local clientRequests = {}
+local RequestId = 0
+
+---@param eventName string
+---@param callback function
+ESX.RegisterServerCallback = function(eventName, callback)
+  serverCallbacks[eventName] = callback
+  
+  print(("[^2DEBUG^0] Callback registered - ^5%s^0 - resource: ^5%s^0"):format(eventName, GetInvokingResource()))
+end
+
+RegisterNetEvent('esx:triggerServerCallback', function(eventName, requestId, invoker, ...)
+  if not serverCallbacks[eventName] then
+    return print(('[^1ERROR^7] Server Callback not registered, name: ^5%s^7, invoker resource: ^5%s^7'):format(eventName, invoker))
+  end
+
+  local source = source
+
+  serverCallbacks[eventName](source, function(...)
+    TriggerClientEvent('esx:serverCallback', source, requestId, invoker, ...)
+  end, ...)
+end)
+
+---@param player number playerId
+---@param eventName string
+---@param callback function
+---@param ... any
+ESX.TriggerClientCallback = function(player, eventName, callback, ...)
+  clientRequests[RequestId] = callback
+  
+  TriggerClientEvent('esx:triggerClientCallback', player, eventName, RequestId, GetInvokingResource() or "unknown", ...)
+
+  RequestId = RequestId + 1
+end
+
+RegisterNetEvent('esx:clientCallback', function(requestId, invoker, ...)
+  if not clientRequests[requestId] then
+    return print(('[^1ERROR^7] Client Callback with requestId ^5%s^7 Was Called by ^5%s^7 but does not exist.'):format(requestId, invoker))
+  end
+
+  clientRequests[requestId](...)
+  clientRequests[requestId] = nil
+end)
\ No newline at end of file

From cd563a146851f1ad01b4c538a19452f21d44444c Mon Sep 17 00:00:00 2001
From: Csoki <feketetibi71@gmail.com>
Date: Fri, 10 Feb 2023 22:14:24 +0100
Subject: [PATCH 12/70] feat(modules/callback.lua): remove debug print

---
 [core]/es_extended/server/modules/callback.lua | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/[core]/es_extended/server/modules/callback.lua b/[core]/es_extended/server/modules/callback.lua
index a758e6e80..4c7e17fde 100644
--- a/[core]/es_extended/server/modules/callback.lua
+++ b/[core]/es_extended/server/modules/callback.lua
@@ -7,8 +7,6 @@ local RequestId = 0
 ---@param callback function
 ESX.RegisterServerCallback = function(eventName, callback)
   serverCallbacks[eventName] = callback
-  
-  print(("[^2DEBUG^0] Callback registered - ^5%s^0 - resource: ^5%s^0"):format(eventName, GetInvokingResource()))
 end
 
 RegisterNetEvent('esx:triggerServerCallback', function(eventName, requestId, invoker, ...)
@@ -29,7 +27,7 @@ end)
 ---@param ... any
 ESX.TriggerClientCallback = function(player, eventName, callback, ...)
   clientRequests[RequestId] = callback
-  
+
   TriggerClientEvent('esx:triggerClientCallback', player, eventName, RequestId, GetInvokingResource() or "unknown", ...)
 
   RequestId = RequestId + 1

From 37597112ad534671bbbb6d34c10166e6e4e6f166 Mon Sep 17 00:00:00 2001
From: Csoki <feketetibi71@gmail.com>
Date: Fri, 10 Feb 2023 22:33:16 +0100
Subject: [PATCH 13/70] refactor(es_extended): ESX.GetVehicleType and add
 client side

---
 [core]/es_extended/client/functions.lua | 25 ++++++++++++++++++++++++-
 [core]/es_extended/client/main.lua      | 23 ++---------------------
 [core]/es_extended/server/common.lua    |  2 ++
 [core]/es_extended/server/functions.lua | 19 +++++++++++++++----
 4 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/[core]/es_extended/client/functions.lua b/[core]/es_extended/client/functions.lua
index 2e3e1a932..cd610edca 100644
--- a/[core]/es_extended/client/functions.lua
+++ b/[core]/es_extended/client/functions.lua
@@ -1308,4 +1308,27 @@ AddEventHandler('esx:showAdvancedNotification',
 RegisterNetEvent('esx:showHelpNotification')
 AddEventHandler('esx:showHelpNotification', function(msg, thisFrame, beep, duration)
     ESX.ShowHelpNotification(msg, thisFrame, beep, duration)
-end)
\ No newline at end of file
+end)
+
+---@param model number|string
+---@return string
+function ESX.GetVehicleType(model)
+    model = type(model) == 'string' and joaat(model) or model
+
+	if model == `submersible` or model == `submersible2` then
+        return 'submarine'
+	end
+
+	local vehicleType = GetVehicleClassFromName(model)
+	local types = {
+		[8] = "bike",
+		[11] = "trailer",
+		[13] = "bike",
+		[14] = "boat",
+		[15] = "heli",
+		[16] = "plane",
+		[21] = "train",
+	}
+
+    return types[vehicleType] or "automobile"
+end
\ No newline at end of file
diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua
index 0767cd409..f636d95ca 100644
--- a/[core]/es_extended/client/main.lua
+++ b/[core]/es_extended/client/main.lua
@@ -615,27 +615,8 @@ AddEventHandler("esx:freezePlayer", function(input)
 	end
 end)
 
-RegisterNetEvent("esx:GetVehicleType", function(Model, Request)
-	if not IsModelInCdimage(Model) then
-		return TriggerServerEvent("esx:ReturnVehicleType", false, Request)
-	end
-
-	if Model == `submersible` or Model == `submersible2` then
-		return TriggerServerEvent("esx:ReturnVehicleType", "submarine", Request)
-	end
-
-	local VehicleType = GetVehicleClassFromName(Model)
-	local types = {
-		[8] = "bike",
-		[11] = "trailer",
-		[13] = "bike",
-		[14] = "boat",
-		[15] = "heli",
-		[16] = "plane",
-		[21] = "train",
-	}
-
-	TriggerServerEvent("esx:ReturnVehicleType", types[VehicleType] or "automobile", Request)
+ESX.RegisterClientCallback("esx:GetVehicleType", function(cb, model)
+	cb(ESX.GetVehicleType(model))
 end)
 
 local DoNotUse = {
diff --git a/[core]/es_extended/server/common.lua b/[core]/es_extended/server/common.lua
index 3fd6fa93a..81f856d36 100644
--- a/[core]/es_extended/server/common.lua
+++ b/[core]/es_extended/server/common.lua
@@ -11,6 +11,8 @@ Core.PlayerFunctionOverrides = {}
 
 Core.playersByIdentifier = {}
 
+Core.vehicleTypesByModel = {}
+
 AddEventHandler("esx:getSharedObject", function()
 	local Invoke = GetInvokingResource()
 	print(("[^1ERROR^7] Resource ^5%s^7 Used the ^5getSharedObject^7 Event, this event ^1no longer exists!^7 Visit https://documentation.esx-framework.org/tutorials/sharedevent for how to fix!"):format(Invoke))
diff --git a/[core]/es_extended/server/functions.lua b/[core]/es_extended/server/functions.lua
index c5e249a6b..c4a8d4f4e 100644
--- a/[core]/es_extended/server/functions.lua
+++ b/[core]/es_extended/server/functions.lua
@@ -246,10 +246,21 @@ function ESX.GetIdentifier(playerId)
   end
 end
 
-function ESX.GetVehicleType(Vehicle, Player, cb)
-  Core.CurrentRequestId = Core.CurrentRequestId < 65535 and Core.CurrentRequestId + 1 or 0
-  Core.ClientCallbacks[Core.CurrentRequestId] = cb
-  TriggerClientEvent("esx:GetVehicleType", Player, Vehicle, Core.CurrentRequestId)
+---@param model string|number
+---@param player number playerId
+---@param cb function
+
+function ESX.GetVehicleType(model, player, cb)
+  model = type(model) == 'string' and joaat(model) or model
+  
+  if Core.vehicleTypesByModel[model] then
+    return cb(Core.vehicleTypesByModel[model])
+  end
+
+  ESX.TriggerClientCallback(player, "esx:GetVehicleType", function(vehicleType)
+    Core.vehicleTypesByModel[model] = vehicleType
+    cb(vehicleType)
+  end)
 end
 
 function ESX.DiscordLog(name, title, color, message)

From c7980cd253599f4dcc6220ec3fd295134941a3df Mon Sep 17 00:00:00 2001
From: Csoki <feketetibi71@gmail.com>
Date: Fri, 10 Feb 2023 22:33:57 +0100
Subject: [PATCH 14/70] fix(es_extended/fxmanifest.lua): correct startup order

---
 [core]/es_extended/fxmanifest.lua | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/[core]/es_extended/fxmanifest.lua b/[core]/es_extended/fxmanifest.lua
index b5230338b..244b26dbb 100644
--- a/[core]/es_extended/fxmanifest.lua
+++ b/[core]/es_extended/fxmanifest.lua
@@ -19,30 +19,39 @@ server_scripts {
 	'@oxmysql/lib/MySQL.lua',
 	'config.logs.lua',
 	'server/common.lua',
+	'server/modules/callback.lua',
 	'server/classes/player.lua',
 	'server/classes/overrides/*.lua',
 	'server/functions.lua',
 	'server/onesync.lua',
 	'server/paycheck.lua',
+
 	'server/main.lua',
 	'server/commands.lua',
 
 	'common/modules/*.lua',
 	'common/functions.lua',
-	'server/modules/*.lua'
+	'server/modules/actions.lua',
+	'server/modules/npwd.lua'
 }
 
 client_scripts {
 	'client/common.lua',
 	'client/functions.lua',
 	'client/wrapper.lua',
+	'client/modules/callback.lua',
+
 	'client/main.lua',
 	
 	'common/modules/*.lua',
 	'common/functions.lua',
 
 	'common/functions.lua',
-	'client/modules/*.lua'
+	'client/modules/actions.lua',
+	'client/modules/death.lua',
+	'client/modules/npwd.lua',
+	'client/modules/scaleform.lua',
+	'client/modules/streaming.lua',
 }
 
 ui_page {

From c0783422ffaa04b84263d5492dfe6d2c467321e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=20Gerg=C5=91?= <paldi95@gmail.com>
Date: Tue, 21 Feb 2023 23:18:05 +0100
Subject: [PATCH 15/70] feat: esx:updatePlayerData

---
 [core]/es_extended/client/main.lua | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua
index 4dfff72ce..780347703 100644
--- a/[core]/es_extended/client/main.lua
+++ b/[core]/es_extended/client/main.lua
@@ -646,3 +646,8 @@ for i = 1, #DoNotUse do
 		print("[^1ERROR^7] YOU ARE USING A RESOURCE THAT WILL BREAK ^1ESX^7, PLEASE REMOVE ^5" .. DoNotUse[i] .. "^7")
 	end
 end
+
+RegisterNetEvent('esx:updatePlayerData', function(key, val)
+	if GetInvokingResource() ~= 'es_extended' then return end
+	ESX.SetPlayerData(key, val)
+end)
\ No newline at end of file

From 5a5d4bbe093744c575488fb6211f0530cb252762 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=20Gerg=C5=91?= <paldi95@gmail.com>
Date: Tue, 21 Feb 2023 23:20:05 +0100
Subject: [PATCH 16/70] feat: Metadata

---
 [core]/es_extended/server/classes/player.lua | 65 +++++++++++++++++++-
 [core]/es_extended/server/functions.lua      |  8 ++-
 [core]/es_extended/server/main.lua           | 19 ++++--
 3 files changed, 82 insertions(+), 10 deletions(-)

diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua
index d02757e04..5a8bf3f80 100644
--- a/[core]/es_extended/server/classes/player.lua
+++ b/[core]/es_extended/server/classes/player.lua
@@ -4,7 +4,7 @@ local DoesEntityExist = DoesEntityExist
 local GetEntityCoords = GetEntityCoords
 local GetEntityHeading = GetEntityHeading
 
-function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, weight, job, loadout, name, coords)
+function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, weight, job, loadout, name, coords, meta)
 	local targetOverrides = Config.PlayerFunctionOverride and Core.PlayerFunctionOverrides[Config.PlayerFunctionOverride] or {}
 	
 	local self = {}
@@ -22,6 +22,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 	self.variables = {}
 	self.weight = weight
 	self.maxWeight = Config.MaxWeight
+	self.meta = meta
 	if Config.Multichar then self.license = 'license'.. identifier:sub(identifier:find(':'), identifier:len()) else self.license = 'license:'..identifier end
 
 	ExecuteCommand(('add_principal identifier.%s group.%s'):format(self.license, self.group))
@@ -573,6 +574,68 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 		self.triggerEvent('esx:showHelpNotification', msg, thisFrame, beep, duration)
 	end
 
+	function self.getMeta(index)
+		if index then
+			if self.meta[index] then
+				return self.meta[index]
+			else
+				return print(("[^1ERROR^7] xPlayer.getMeta ^5%s^7 not exist!"):format(index))
+			end
+		end
+
+		return self.meta
+	end
+
+	function self.setMeta(index, value)
+		if not index then
+			return print(("[^1ERROR^7] xPlayer.setMeta ^5%s^7 is Missing!"):format(index))
+		end
+
+		if type(index) == 'table' then
+			for key, val in pairs(index) do
+				self.setMeta(key, val)
+			end
+
+			return
+		end
+
+		if not value then
+			return print(("[^1ERROR^7] xPlayer.setMeta ^5%s^7 is Missing!"):format(value))
+		end
+
+		local _type = type(value)
+
+		if _type ~= "number" and _type ~= "string" and _type ~= "table" then
+			return print("[^1ERROR^7] xPlayer.setMeta ^5value^7 should be ^5number^7 or ^5string^7 or ^5table^7!")
+		end
+
+		self.meta[index] = value
+		self.triggerEvent('esx:updatePlayerData', 'meta', self.meta)
+		Player(self.source).state:set('meta', self.meta, true)
+	end
+
+	function self.clearMeta(index)
+		if not index then
+			return print(("[^1ERROR^7] xPlayer.clearMeta ^5%s^7 is Missing!"):format(index))
+		end
+
+		if type(index) == 'table' then
+			for _, val in pairs(index) do
+				self.clearMeta(val)
+			end
+
+			return
+		end
+
+		if not self.meta[index] then
+			return print(("[^1ERROR^7] xPlayer.clearMeta ^5%s^7 not exist!"):format(index))
+		end
+
+		self.meta[index] = nil
+		self.triggerEvent('esx:updatePlayerData', 'meta', self.meta)
+		Player(self.source).state:set('meta', self.meta, true)
+	end
+
 	for fnName,fn in pairs(targetOverrides) do
 		self[fnName] = fn(self)
 	end
diff --git a/[core]/es_extended/server/functions.lua b/[core]/es_extended/server/functions.lua
index 3e10f922f..b580ff1a9 100644
--- a/[core]/es_extended/server/functions.lua
+++ b/[core]/es_extended/server/functions.lua
@@ -159,16 +159,17 @@ function Core.SavePlayer(xPlayer, cb)
   local parameters <const> = {
     json.encode(xPlayer.getAccounts(true)),
     xPlayer.job.name,
-    xPlayer.job.grade, 
+    xPlayer.job.grade,
     xPlayer.group,
     json.encode(xPlayer.getCoords()),
     json.encode(xPlayer.getInventory(true)), 
     json.encode(xPlayer.getLoadout(true)),
+    json.encode(xPlayer.getMeta()),
     xPlayer.identifier
   }
 
   MySQL.prepare(
-    'UPDATE `users` SET `accounts` = ?, `job` = ?, `job_grade` = ?, `group` = ?, `position` = ?, `inventory` = ?, `loadout` = ? WHERE `identifier` = ?',
+    'UPDATE `users` SET `accounts` = ?, `job` = ?, `job_grade` = ?, `group` = ?, `position` = ?, `inventory` = ?, `loadout` = ?, `meta` = ? WHERE `identifier` = ?',
     parameters,
     function(affectedRows)
       if affectedRows == 1 then
@@ -200,12 +201,13 @@ function Core.SavePlayers(cb)
       json.encode(xPlayer.getCoords()),
       json.encode(xPlayer.getInventory(true)),
       json.encode(xPlayer.getLoadout(true)),
+      json.encode(xPlayer.getMeta()),
       xPlayer.identifier
     }
   end
 
   MySQL.prepare(
-    "UPDATE `users` SET `accounts` = ?, `job` = ?, `job_grade` = ?, `group` = ?, `position` = ?, `inventory` = ?, `loadout` = ? WHERE `identifier` = ?",
+    "UPDATE `users` SET `accounts` = ?, `job` = ?, `job_grade` = ?, `group` = ?, `position` = ?, `inventory` = ?, `loadout` = ?, `meta` = ? WHERE `identifier` = ?",
     parameters, 
     function(results)
       if not results then
diff --git a/[core]/es_extended/server/main.lua b/[core]/es_extended/server/main.lua
index 456004e12..856249522 100644
--- a/[core]/es_extended/server/main.lua
+++ b/[core]/es_extended/server/main.lua
@@ -2,7 +2,7 @@ SetMapName('San Andreas')
 SetGameType('ESX Legacy')
 
 local newPlayer = 'INSERT INTO `users` SET `accounts` = ?, `identifier` = ?, `group` = ?'
-local loadPlayer = 'SELECT `accounts`, `job`, `job_grade`, `group`, `position`, `inventory`, `skin`, `loadout`'
+local loadPlayer = 'SELECT `accounts`, `job`, `job_grade`, `group`, `position`, `inventory`, `skin`, `loadout`, `meta`'
 
 if Config.Multichar then
   newPlayer = newPlayer .. ', `firstname` = ?, `lastname` = ?, `dateofbirth` = ?, `sex` = ?, `height` = ?'
@@ -111,8 +111,9 @@ if not Config.Multichar then
 end
 
 function loadESXPlayer(identifier, playerId, isNew)
-  local userData = {accounts = {}, inventory = {}, job = {}, loadout = {}, playerName = GetPlayerName(playerId), weight = 0}
+  local userData = {accounts = {}, inventory = {}, job = {}, loadout = {}, playerName = GetPlayerName(playerId), weight = 0, meta = {}}
 
+  print(json.encode(loadPlayer,{indent=true}))
   local result = MySQL.prepare.await(loadPlayer, {identifier})
   local job, grade, jobObject, gradeObject = result.job, tostring(result.job_grade)
   local foundAccounts, foundItems = {}, {}
@@ -271,8 +272,13 @@ function loadESXPlayer(identifier, playerId, isNew)
     end
   end
 
+  if result.meta and result.meta ~= '' then
+    local meta = json.decode(result.meta)
+    userData.meta = meta
+  end
+
   local xPlayer = CreateExtendedPlayer(playerId, identifier, userData.group, userData.accounts, userData.inventory, userData.weight, userData.job,
-    userData.loadout, userData.playerName, userData.coords)
+    userData.loadout, userData.playerName, userData.coords, userData.meta)
   ESX.Players[playerId] = xPlayer
   Core.playersByIdentifier[identifier] = xPlayer
 
@@ -307,7 +313,8 @@ function loadESXPlayer(identifier, playerId, isNew)
       lastName = xPlayer.get("lastName") or "Doe",
       dateofbirth = xPlayer.get("dateofbirth") or "01/01/2000",
       height = xPlayer.get("height") or 120,
-      dead = false
+      dead = false,
+      meta = xPlayer.getMeta()
     }, isNew,
     userData.skin)
 
@@ -579,7 +586,7 @@ ESX.RegisterServerCallback('esx:getPlayerData', function(source, cb)
   local xPlayer = ESX.GetPlayerFromId(source)
 
   cb({identifier = xPlayer.identifier, accounts = xPlayer.getAccounts(), inventory = xPlayer.getInventory(), job = xPlayer.getJob(),
-      loadout = xPlayer.getLoadout(), money = xPlayer.getMoney(), position = xPlayer.getCoords(true)})
+      loadout = xPlayer.getLoadout(), money = xPlayer.getMoney(), position = xPlayer.getCoords(true), meta = xPlayer.getMeta()})
 end)
 
 ESX.RegisterServerCallback('esx:isUserAdmin', function(source, cb)
@@ -594,7 +601,7 @@ ESX.RegisterServerCallback('esx:getOtherPlayerData', function(source, cb, target
   local xPlayer = ESX.GetPlayerFromId(target)
 
   cb({identifier = xPlayer.identifier, accounts = xPlayer.getAccounts(), inventory = xPlayer.getInventory(), job = xPlayer.getJob(),
-      loadout = xPlayer.getLoadout(), money = xPlayer.getMoney(), position = xPlayer.getCoords(true)})
+      loadout = xPlayer.getLoadout(), money = xPlayer.getMoney(), position = xPlayer.getCoords(true), meta = xPlayer.getMeta()})
 end)
 
 ESX.RegisterServerCallback('esx:getPlayerNames', function(source, cb, players)

From 3ce044eda21621125784e70c1fb1313324783198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=20Gerg=C5=91?= <paldi95@gmail.com>
Date: Tue, 21 Feb 2023 23:39:10 +0100
Subject: [PATCH 17/70] fix: (Metadata) small fixes

---
 [core]/es_extended/server/classes/player.lua | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua
index 5a8bf3f80..84fc2e9c6 100644
--- a/[core]/es_extended/server/classes/player.lua
+++ b/[core]/es_extended/server/classes/player.lua
@@ -591,12 +591,8 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 			return print(("[^1ERROR^7] xPlayer.setMeta ^5%s^7 is Missing!"):format(index))
 		end
 
-		if type(index) == 'table' then
-			for key, val in pairs(index) do
-				self.setMeta(key, val)
-			end
-
-			return
+		if type(index) ~= "string" then
+			return print(("[^1ERROR^7] xPlayer.setMeta ^5%s^7 should be ^5string^7!")):format(index)
 		end
 
 		if not value then
@@ -606,7 +602,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 		local _type = type(value)
 
 		if _type ~= "number" and _type ~= "string" and _type ~= "table" then
-			return print("[^1ERROR^7] xPlayer.setMeta ^5value^7 should be ^5number^7 or ^5string^7 or ^5table^7!")
+			return print(("[^1ERROR^7] xPlayer.setMeta ^5%s^7 should be ^5number^7 or ^5string^7 or ^5table^7!"):format(value))
 		end
 
 		self.meta[index] = value

From 31a7f022b6f85849ee8b4dd29e7ed1b8f01c6a4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=20Gerg=C5=91?= <paldi95@gmail.com>
Date: Tue, 21 Feb 2023 23:40:14 +0100
Subject: [PATCH 18/70] fix:(Metadata) Remove forgotten debug print

---
 [core]/es_extended/server/main.lua | 2 --
 1 file changed, 2 deletions(-)

diff --git a/[core]/es_extended/server/main.lua b/[core]/es_extended/server/main.lua
index 856249522..603b85d23 100644
--- a/[core]/es_extended/server/main.lua
+++ b/[core]/es_extended/server/main.lua
@@ -112,8 +112,6 @@ end
 
 function loadESXPlayer(identifier, playerId, isNew)
   local userData = {accounts = {}, inventory = {}, job = {}, loadout = {}, playerName = GetPlayerName(playerId), weight = 0, meta = {}}
-
-  print(json.encode(loadPlayer,{indent=true}))
   local result = MySQL.prepare.await(loadPlayer, {identifier})
   local job, grade, jobObject, gradeObject = result.job, tostring(result.job_grade)
   local foundAccounts, foundItems = {}, {}

From c0a151a3680de04190b10bb80b468c4307035bef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=20Gerg=C5=91?= <paldi95@gmail.com>
Date: Tue, 21 Feb 2023 23:49:12 +0100
Subject: [PATCH 19/70] Fix: (Metadata) Forgotten statebag setter

---
 [core]/es_extended/server/classes/player.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua
index 84fc2e9c6..10aa4e5bc 100644
--- a/[core]/es_extended/server/classes/player.lua
+++ b/[core]/es_extended/server/classes/player.lua
@@ -33,6 +33,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 	stateBag:set("job", self.job, true)
 	stateBag:set("group", self.group, true)
 	stateBag:set("name", self.name, true)
+	stateBag:set("meta", self.meta, true)
 
 	function self.triggerEvent(eventName, ...)
 		TriggerClientEvent(eventName, self.source, ...)

From 5dedf4fcde1b5393a03073fcec1cd809b2d9a5fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=20Gerg=C5=91?= <paldi95@gmail.com>
Date: Wed, 22 Feb 2023 12:57:41 +0100
Subject: [PATCH 20/70] Feat: (Metadata) subModule

---
 [core]/es_extended/server/classes/player.lua | 31 ++++++++++++++++----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua
index 10aa4e5bc..9c33f8a7a 100644
--- a/[core]/es_extended/server/classes/player.lua
+++ b/[core]/es_extended/server/classes/player.lua
@@ -575,25 +575,32 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 		self.triggerEvent('esx:showHelpNotification', msg, thisFrame, beep, duration)
 	end
 
-	function self.getMeta(index)
+	function self.getMeta(index, subIndex)
 		if index then
+
 			if self.meta[index] then
+
+				if subIndex and type(self.meta[index]) == "table" and self.meta[index][subIndex] then
+					return self.meta[index][subIndex]
+				end
+
 				return self.meta[index]
 			else
 				return print(("[^1ERROR^7] xPlayer.getMeta ^5%s^7 not exist!"):format(index))
 			end
+
 		end
 
 		return self.meta
 	end
 
-	function self.setMeta(index, value)
+	function self.setMeta(index, value, subValue)
 		if not index then
 			return print(("[^1ERROR^7] xPlayer.setMeta ^5%s^7 is Missing!"):format(index))
 		end
 
 		if type(index) ~= "string" then
-			return print(("[^1ERROR^7] xPlayer.setMeta ^5%s^7 should be ^5string^7!")):format(index)
+			return print("[^1ERROR^7] xPlayer.setMeta ^5index^7 should be ^5string^7!")
 		end
 
 		if not value then
@@ -602,11 +609,23 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 
 		local _type = type(value)
 
-		if _type ~= "number" and _type ~= "string" and _type ~= "table" then
-			return print(("[^1ERROR^7] xPlayer.setMeta ^5%s^7 should be ^5number^7 or ^5string^7 or ^5table^7!"):format(value))
+		if not subValue then
+
+			if _type ~= "number" and _type ~= "string" and _type ~= "table" then
+				return print(("[^1ERROR^7] xPlayer.setMeta ^5%s^7 should be ^5number^7 or ^5string^7 or ^5table^7!"):format(value))
+			end
+
+			self.meta[index] = value
+		else
+
+			if _type ~= "string" then
+				return print(("[^1ERROR^7] xPlayer.setMeta ^5value^7 should be ^5string^7 as a subIndex!"):format(value))
+			end
+
+			self.meta[index][value] = subValue
 		end
 
-		self.meta[index] = value
+
 		self.triggerEvent('esx:updatePlayerData', 'meta', self.meta)
 		Player(self.source).state:set('meta', self.meta, true)
 	end

From cd5b562f838509da7d17e916595d24900370bb33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=20Gerg=C5=91?= <paldi95@gmail.com>
Date: Wed, 22 Feb 2023 13:04:16 +0100
Subject: [PATCH 21/70] fix: (Metadata) string check on getMeta

---
 [core]/.gitignore                            | 1 +
 [core]/es_extended/server/classes/player.lua | 4 ++++
 2 files changed, 5 insertions(+)
 create mode 100644 [core]/.gitignore

diff --git a/[core]/.gitignore b/[core]/.gitignore
new file mode 100644
index 000000000..30d74d258
--- /dev/null
+++ b/[core]/.gitignore
@@ -0,0 +1 @@
+test
\ No newline at end of file
diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua
index 9c33f8a7a..e61517683 100644
--- a/[core]/es_extended/server/classes/player.lua
+++ b/[core]/es_extended/server/classes/player.lua
@@ -578,6 +578,10 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 	function self.getMeta(index, subIndex)
 		if index then
 
+			if type(index) ~= "string" then
+				return print("[^1ERROR^7] xPlayer.getMeta ^5index^7 should be ^5string^7!")
+			end
+
 			if self.meta[index] then
 
 				if subIndex and type(self.meta[index]) == "table" and self.meta[index][subIndex] then

From 13a260f12afe7ea3e6d9df4377b68977d744baf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=20Gerg=C5=91?= <paldi95@gmail.com>
Date: Wed, 22 Feb 2023 13:26:08 +0100
Subject: [PATCH 22/70] feat: (Metadata) Extra table subIndex option

---
 [core]/es_extended/server/classes/player.lua | 26 ++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua
index e61517683..b21868e25 100644
--- a/[core]/es_extended/server/classes/player.lua
+++ b/[core]/es_extended/server/classes/player.lua
@@ -584,8 +584,30 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 
 			if self.meta[index] then
 
-				if subIndex and type(self.meta[index]) == "table" and self.meta[index][subIndex] then
-					return self.meta[index][subIndex]
+				local _type = type(subIndex)
+				if subIndex and type(self.meta[index]) == "table" then
+
+					if _type == "string" then
+						if self.meta[index][subIndex] then
+							return self.meta[index][subIndex]
+						end
+
+						return print(("[^1ERROR^7] xPlayer.getMeta ^5%s^7 not esxist on ^5%s^7!"):format(subIndex, index))
+					end
+
+					if _type == "table" then
+						local returnValues = {}
+						for i = 1, #subIndex do
+							if self.meta[index][subIndex[i]] then
+								returnValues[subIndex[i]] = self.meta[index][subIndex[i]]
+							else
+								print(("[^1ERROR^7] xPlayer.getMeta ^5%s^7 not esxist on ^5%s^7!"):format(subIndex[i], index))
+							end
+						end
+
+						return returnValues
+					end
+
 				end
 
 				return self.meta[index]

From 3d5deda92cf65eaba77a4837fc038bf92dff19ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=20Gerg=C5=91?= <paldi95@gmail.com>
Date: Wed, 22 Feb 2023 14:06:58 +0100
Subject: [PATCH 23/70] Fix: Remove gitignore, and sql update

---
 [core]/.gitignore                  | 1 -
 [core]/es_extended/es_extended.sql | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 [core]/.gitignore

diff --git a/[core]/.gitignore b/[core]/.gitignore
deleted file mode 100644
index 30d74d258..000000000
--- a/[core]/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-test
\ No newline at end of file
diff --git a/[core]/es_extended/es_extended.sql b/[core]/es_extended/es_extended.sql
index bb156c90c..91ffd2259 100644
--- a/[core]/es_extended/es_extended.sql
+++ b/[core]/es_extended/es_extended.sql
@@ -15,6 +15,7 @@ CREATE TABLE `users` (
 	`job` VARCHAR(20) NULL DEFAULT 'unemployed',
 	`job_grade` INT NULL DEFAULT 0,
 	`loadout` LONGTEXT NULL DEFAULT NULL,
+	`meta` LONGTEXT NULL DEFAULT NULL,
 	`position` longtext NULL DEFAULT NULL,
 
 	PRIMARY KEY (`identifier`)

From 9d16575791a4bbb9256a234f488659486b828020 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=20Gerg=C5=91?= <paldi95@gmail.com>
Date: Wed, 22 Feb 2023 14:12:37 +0100
Subject: [PATCH 24/70] Why do we have 2 sql?

---
 [SQL]/legacy.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/[SQL]/legacy.sql b/[SQL]/legacy.sql
index ecf145c73..b081b38d9 100644
--- a/[SQL]/legacy.sql
+++ b/[SQL]/legacy.sql
@@ -389,6 +389,7 @@ CREATE TABLE `users` (
   `job` varchar(20) DEFAULT 'unemployed',
   `job_grade` int(11) DEFAULT 0,
   `loadout` longtext DEFAULT NULL,
+  `meta` LONGTEXT NULL DEFAULT NULL,
   `position` longtext NULL DEFAULT NULL,
   `firstname` varchar(16) DEFAULT NULL,
   `lastname` varchar(16) DEFAULT NULL,

From 9ab108e71f4752a7d972165b7c82a9d210847073 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=20Gerg=C5=91?= <paldi95@gmail.com>
Date: Wed, 22 Feb 2023 22:14:18 +0100
Subject: [PATCH 25/70] Small fixes

---
 [core]/es_extended/server/classes/player.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua
index b21868e25..587799201 100644
--- a/[core]/es_extended/server/classes/player.lua
+++ b/[core]/es_extended/server/classes/player.lua
@@ -584,8 +584,8 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 
 			if self.meta[index] then
 
-				local _type = type(subIndex)
 				if subIndex and type(self.meta[index]) == "table" then
+					local _type = type(subIndex)
 
 					if _type == "string" then
 						if self.meta[index][subIndex] then
@@ -622,7 +622,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 
 	function self.setMeta(index, value, subValue)
 		if not index then
-			return print(("[^1ERROR^7] xPlayer.setMeta ^5%s^7 is Missing!"):format(index))
+			return print("[^1ERROR^7] xPlayer.setMeta ^5index^7 is Missing!")
 		end
 
 		if type(index) ~= "string" then

From 885000dc79cf8fcc0a0d89c326b85a00f8bf5e58 Mon Sep 17 00:00:00 2001
From: nikartik <110419961+NikartikTheBear@users.noreply.github.com>
Date: Sun, 26 Feb 2023 22:19:43 +0100
Subject: [PATCH 26/70] feat(es_extended/locales): Added IT Locale

Added italian translation to the locales
---
 [core]/es_extended/locales/it.lua | 365 ++++++++++++++++++++++++++++++
 1 file changed, 365 insertions(+)
 create mode 100644 [core]/es_extended/locales/it.lua

diff --git a/[core]/es_extended/locales/it.lua b/[core]/es_extended/locales/it.lua
new file mode 100644
index 000000000..0bdc015e7
--- /dev/null
+++ b/[core]/es_extended/locales/it.lua
@@ -0,0 +1,365 @@
+Locales['it'] = {
+  -- Inventory
+  ['inventory'] = 'Inventario ( Peso %s / %s )',
+  ['use'] = 'Usa',
+  ['give'] = 'Dai',
+  ['remove'] = 'Butta',
+  ['return'] = 'Ritorna',
+  ['give_to'] = 'Dai a',
+  ['amount'] = 'Quantità',
+  ['giveammo'] = 'Dai munizioni',
+  ['amountammo'] = 'Quantità munizioni',
+  ['noammo'] = 'Non abbastanza!',
+  ['gave_item'] = 'Dando %sx %s a %s',
+  ['received_item'] = 'Ricevuto %sx %s da %s',
+  ['gave_weapon'] = 'Dando %s a %s',
+  ['gave_weapon_ammo'] = 'Dando ~o~%sx %s for %s to %s',
+  ['gave_weapon_withammo'] = 'Dando %s con ~o~%sx %s a %s',
+  ['gave_weapon_hasalready'] = '%s possiede già %s',
+  ['gave_weapon_noweapon'] = '%s non ha quell\' arma',
+  ['received_weapon'] = 'Ricevuto %s da %s',
+  ['received_weapon_ammo'] = 'Ricevuto ~o~%sx %s per il tuo %s da %s',
+  ['received_weapon_withammo'] = 'Ricevuto %s con ~o~%sx %s per %s',
+  ['received_weapon_hasalready'] = '%s ha tentato di darti %s, ma hai già l\'arma',
+  ['received_weapon_noweapon'] = '%s ha tentato di darti munizioni per %s, ma non hai l\'arma',
+  ['gave_account_money'] = 'Dando $%s (%s) a %s',
+  ['received_account_money'] = 'Ricevuto $%s (%s) da %s',
+  ['amount_invalid'] = 'Quantità non valida',
+  ['players_nearby'] = 'Nessun giocatore vicino',
+  ['ex_inv_lim'] = 'Non puoi farlo, eccedi il peso di %s',
+  ['imp_invalid_quantity'] = 'Non puoi farlo, quantità non valida',
+  ['imp_invalid_amount'] = 'Non puoi farlo, importo non valido',
+  ['threw_standard'] = 'Gettando %sx %s',
+  ['threw_account'] = 'Gettando $%s %s',
+  ['threw_weapon'] = 'Gettando %s',
+  ['threw_weapon_ammo'] = 'Gettando %s con ~o~%sx %s',
+  ['threw_weapon_already'] = 'Hai gia quest\' arma',
+  ['threw_cannot_pickup'] = 'Inventario pieno, non puoi raccogliere!',
+  ['threw_pickup_prompt'] = 'Premi E per raccogliere',
+
+  -- Key mapping
+  ['keymap_showinventory'] = 'Apri inventario',
+
+  -- Salary related
+  ['received_salary'] = 'Sei stato pagato: $%s',
+  ['received_help'] = 'Hai ricevuto il reddito di cittadinanza: $%s',
+  ['company_nomoney'] = 'La tua compagnia è troppo povera per pagarti',
+  ['received_paycheck'] = 'Ricveuto stipendio',
+  ['bank'] = 'Banca',
+  ['account_bank'] = 'Conto',
+  ['account_black_money'] = 'Soldi sporchi',
+  ['account_money'] = 'Contanti',
+
+  ['act_imp'] = 'Non puoi farlo',
+  ['in_vehicle'] = 'Non puoi farlo, il giocatore è in un veicolo',
+
+  -- Commands
+  ['command_bring'] = 'Porta il giocatore da te',
+  ['command_car'] = 'Spawna un veicolo',
+  ['command_car_car'] = 'Modello o hash veicolo',
+  ['command_cardel'] = 'Rimuovi i veicoli nelle prossimità',
+  ['command_cardel_radius'] = 'Rimuovi i veicoli nel raggio specificato',
+  ['command_clear'] = 'Pulisci la chat testuale',
+  ['command_clearall'] = 'Pulisci la chat testuale per tutti i giocatori',
+  ['command_clearinventory'] = 'Rimuovi tutti gli oggetti dall\' inventario del giocatore',
+  ['command_clearloadout'] = 'Rimuovi tutte le armi dal loadout del giocatore',
+  ['command_freeze'] = 'Blocca un giocatore',
+  ['command_unfreeze'] = 'Sblocca un giocatore',
+  ['command_giveaccountmoney'] = 'Dai soldi a un\' account specifico',
+  ['command_giveaccountmoney_account'] = 'Account a cui aggiungere',
+  ['command_giveaccountmoney_amount'] = 'Quantità da aggiungere',
+  ['command_giveaccountmoney_invalid'] = 'Nome account non valido',
+  ['command_giveitem'] = 'Dai un oggetto ad un giocatore',
+  ['command_giveitem_item'] = 'Nome oggetto',
+  ['command_giveitem_count'] = 'Quantità',
+  ['command_giveweapon'] = 'Dai un\' arma ad un giocatore',
+  ['command_giveweapon_weapon'] = 'Nome arma',
+  ['command_giveweapon_ammo'] = 'Quantità munizioni',
+  ['command_giveweapon_hasalready'] = 'Il giocatore ha già l\'arma',
+  ['command_giveweaponcomponent'] = 'Dai un componente arma ad un giocatore',
+  ['command_giveweaponcomponent_component'] = 'Nome componente',
+  ['command_giveweaponcomponent_invalid'] = 'Componente arma non valido',
+  ['command_giveweaponcomponent_hasalready'] = 'Il giocatore ha già questo componente arma',
+  ['command_giveweaponcomponent_missingweapon'] = 'Il giocatore non ha l\'arma',
+  ['command_goto'] = 'Teletrasportati da un giocatore',
+  ['command_kill'] = 'Uccidi un giocatore',
+  ['command_save'] = 'Salva forzatamente i dati di un giocatore',
+  ['command_saveall'] = 'Salva forzatamente i dati di tutti  igiocatoria',
+  ['command_setaccountmoney'] = 'Aggiorna i soldi dentro un account specifico',
+  ['command_setaccountmoney_amount'] = 'Quantità',
+  ['command_setcoords'] = 'Teletrasportati a delle coordinate specifiche',
+  ['command_setcoords_x'] = 'Valore X',
+  ['command_setcoords_y'] = 'Valore Y',
+  ['command_setcoords_z'] = 'Valore Z',
+  ['command_setjob'] = 'Setta lavoro ad un giocatore',
+  ['command_setjob_job'] = 'Nome',
+  ['command_setjob_grade'] = 'Grado lavoro',
+  ['command_setjob_invalid'] = 'Il lavoro, grado o entrambi sono errati',
+  ['command_setgroup'] = 'Setta un gruppo di permessi ad un giocatore',
+  ['command_setgroup_group'] = 'Nome del gruppo',
+  ['commanderror_argumentmismatch'] = 'Conta argomenti non valida (passati %s, richiesti %s)',
+  ['commanderror_argumentmismatch_number'] = 'Argomento #%s di tipologia errata (passato testo, richiesto numero)',
+  ['commanderror_invaliditem'] = 'Oggetto non valido',
+  ['commanderror_invalidweapon'] = 'Arma non valida',
+  ['commanderror_console'] = 'Comando non eseguibile dalla console',
+  ['commanderror_invalidcommand'] = 'Comando non valido - /%s',
+  ['commanderror_invalidplayerid'] = 'Il giocatore specificato non è online',
+  ['commandgeneric_playerid'] = 'Id server del giocatore',
+  ['command_giveammo_noweapon_found'] = '%s non ha quell\' arma',
+  ['command_giveammo_weapon'] = 'Nome arma',
+  ['command_giveammo_ammo'] = 'Quantità munizioni',
+  ['tpm_nowaypoint'] = 'Nessuna meta impostata',
+  ['tpm_success'] = 'Teletrasportato con successo',
+
+  ['noclip_message'] = 'Noclip %s',
+  ['enabled'] = '~g~abilitato~s~',
+  ['disabled'] = '~r~disabilitato~s~',
+
+  -- Locale settings
+  ['locale_digit_grouping_symbol'] = ',',
+  ['locale_currency'] = '$%s',
+
+  -- Weapons
+
+  -- Melee
+  ['weapon_dagger'] = 'Pugnale Antico',
+  ['weapon_bat'] = 'Mazza',
+  ['weapon_battleaxe'] = 'Ascia',
+  ['weapon_bottle'] = 'Bottiglia',
+  ['weapon_crowbar'] = 'Piede di porco',
+  ['weapon_flashlight'] = 'Torcia',
+  ['weapon_golfclub'] = 'Mazza da golf',
+  ['weapon_hammer'] = 'Martello',
+  ['weapon_hatchet'] = 'Accetta',
+  ['weapon_knife'] = 'Coltello',
+  ['weapon_knuckle'] = 'Tirapugni',
+  ['weapon_machete'] = 'Machete',
+  ['weapon_nightstick'] = 'Manganello',
+  ['weapon_wrench'] = 'Tubo',
+  ['weapon_poolcue'] = 'Stecca',
+  ['weapon_stone_hatchet'] = 'Accetta di pietra',
+  ['weapon_switchblade'] = 'Coltello a serramanico',
+
+  -- Handguns
+  ['weapon_appistol'] = 'Pistola AP',
+  ['weapon_ceramicpistol'] = 'Pistola di ceramica',
+  ['weapon_combatpistol'] = 'Pistola da combattimento',
+  ['weapon_doubleaction'] = 'Revolver doppia azione',
+  ['weapon_navyrevolver'] = 'Revolver Marina',
+  ['weapon_flaregun'] = 'Pistola lanciarazzi',
+  ['weapon_gadgetpistol'] = 'Pistola Gadget',
+  ['weapon_heavypistol'] = 'Pistola pesante',
+  ['weapon_revolver'] = 'Revolver pesante',
+  ['weapon_revolver_mk2'] = 'Revolver pesante MK2',
+  ['weapon_marksmanpistol'] = 'Pistola da tiratore',
+  ['weapon_pistol'] = 'Pistola',
+  ['weapon_pistol_mk2'] = 'Pistola MK2',
+  ['weapon_pistol50'] = 'Pistola .50',
+  ['weapon_snspistol'] = 'Pistola SNS',
+  ['weapon_snspistol_mk2'] = 'Pistola SNS MK2',
+  ['weapon_stungun'] = 'Taser',
+  ['weapon_raypistol'] = 'Up-N-Atomizzatore',
+  ['weapon_vintagepistol'] = 'Pistola Vintage',
+
+  -- Shotguns
+  ['weapon_assaultshotgun'] = 'Fucile a pompa d\'assalto',
+  ['weapon_autoshotgun'] = 'Fucile a pompa automatico',
+  ['weapon_bullpupshotgun'] = 'Fucile a pompa Bullup',
+  ['weapon_combatshotgun'] = 'Fucile a pompa da combattimento',
+  ['weapon_dbshotgun'] = 'Fucile a pompa doppia canna',
+  ['weapon_heavyshotgun'] = 'Fucile a pompa pesante',
+  ['weapon_musket'] = 'Moschetto',
+  ['weapon_pumpshotgun'] = 'Fucile a pompa',
+  ['weapon_pumpshotgun_mk2'] = 'Fucile a pompa MK2',
+  ['weapon_sawnoffshotgun'] = 'Fucile a canne mozza',
+
+  -- SMG & LMG
+  ['weapon_assaultsmg'] = 'SMG d\'assalto',
+  ['weapon_combatmg'] = 'MG da combattimento',
+  ['weapon_combatmg_mk2'] = 'MG da combattimento MK2',
+  ['weapon_combatpdw'] = 'PDW da combattimento',
+  ['weapon_gusenberg'] = 'Mitragliatrice Gusenberg',
+  ['weapon_machinepistol'] = 'Pistola mitragliatrice',
+  ['weapon_mg'] = 'MG',
+  ['weapon_microsmg'] = 'Micro SMG',
+  ['weapon_minismg'] = 'Mini SMG',
+  ['weapon_smg'] = 'SMG',
+  ['weapon_smg_mk2'] = 'SMG MK2',
+  ['weapon_raycarbine'] = 'Hellbringer infernale',
+
+  -- Rifles
+  ['weapon_advancedrifle'] = 'Fucile avanzato',
+  ['weapon_assaultrifle'] = 'Fucile d\'assalto',
+  ['weapon_assaultrifle_mk2'] = 'Fucile d\' assalto MK2',
+  ['weapon_bullpuprifle'] = 'Fucile Bullpup',
+  ['weapon_bullpuprifle_mk2'] = 'Fucile Bullpup MK2',
+  ['weapon_carbinerifle'] = 'Carabina',
+  ['weapon_carbinerifle_mk2'] = 'Carbine MK2',
+  ['weapon_compactrifle'] = 'Fucile compatto',
+  ['weapon_militaryrifle'] = 'Fucile militare',
+  ['weapon_specialcarbine'] = 'Carabina speciale',
+  ['weapon_specialcarbine_mk2'] = 'Carabina speciale MK2',
+
+  -- Sniper
+  ['weapon_heavysniper'] = 'Cecchino pesante',
+  ['weapon_heavysniper_mk2'] = 'Cecchino pesante MK2',
+  ['weapon_marksmanrifle'] = 'Fucile da tiratore',
+  ['weapon_marksmanrifle_mk2'] = 'Fucile da tiratore MK2',
+  ['weapon_sniperrifle'] = 'Cecchino',
+
+  -- Heavy / Launchers
+  ['weapon_compactlauncher'] = 'Lanciagranate compatto',
+  ['weapon_firework'] = 'Cannone pirotecnico',
+  ['weapon_grenadelauncher'] = 'Lanciagranate',
+  ['weapon_hominglauncher'] = 'Lanciarazzi a tracciamento',
+  ['weapon_minigun'] = 'Minigun',
+  ['weapon_railgun'] = 'Railgun',
+  ['weapon_rpg'] = 'Lanciarazzi',
+  ['weapon_rayminigun'] = 'Widowmaker',
+
+  -- Criminal Enterprises DLC
+  ['weapon_metaldetector'] = 'Metal Detector',
+  ['weapon_precisionrifle'] = 'Fucile di precisione',
+  ['weapon_tactilerifle'] = 'Carabina di servizio',
+
+  -- Thrown
+  ['weapon_ball'] = 'Palla',
+  ['weapon_bzgas'] = 'BZ Gas',
+  ['weapon_flare'] = 'Flare',
+  ['weapon_grenade'] = 'Granata',
+  ['weapon_petrolcan'] = 'Tanica',
+  ['weapon_hazardcan'] = 'Tanica pericolosa',
+  ['weapon_molotov'] = 'Molotov',
+  ['weapon_proxmine'] = 'Mina di prossimità',
+  ['weapon_pipebomb'] = 'Esplosivo plastico',
+  ['weapon_snowball'] = 'Palla di neve',
+  ['weapon_stickybomb'] = 'Bomba adesiva',
+  ['weapon_smokegrenade'] = 'Gas lacrimogeno',
+
+  -- Special
+  ['weapon_fireextinguisher'] = 'Estintore',
+  ['weapon_digiscanner'] = 'Scanner digitale',
+  ['weapon_garbagebag'] = 'Sacco della spazzatura',
+  ['weapon_handcuffs'] = 'Manette',
+  ['gadget_nightvision'] = 'Visore termico',
+  ['gadget_parachute'] = 'Paracadute',
+
+  -- Weapon Components
+  ['component_knuckle_base'] = 'Modello basa',
+  ['component_knuckle_pimp'] = 'il Pappone',
+  ['component_knuckle_ballas'] = 'i Ballas',
+  ['component_knuckle_dollar'] = 'il Riccone',
+  ['component_knuckle_diamond'] = 'la Roccia',
+  ['component_knuckle_hate'] = 'l\' Hater',
+  ['component_knuckle_love'] = 'l\' Amante',
+  ['component_knuckle_player'] = 'il Giocatore',
+  ['component_knuckle_king'] = 'il Re',
+  ['component_knuckle_vagos'] = 'i Vagos',
+
+  ['component_luxary_finish'] = 'rifinitura di lusso',
+
+  ['component_handle_default'] = 'impugnatura base',
+  ['component_handle_vip'] = 'impugnatura VIP',
+  ['component_handle_bodyguard'] = 'impugnatura guardia del corpo',
+
+  ['component_vip_finish'] = 'rifinitura VIP',
+  ['component_bodyguard_finish'] = 'rifinitura Guardia del corpo',
+
+  ['component_camo_finish'] = 'mimetica Digitale',
+  ['component_camo_finish2'] = 'mimetica Cespuglio',
+  ['component_camo_finish3'] = 'mimetica Legnosa',
+  ['component_camo_finish4'] = 'mimetica Teschio',
+  ['component_camo_finish5'] = 'mimetica Sessanta Nove',
+  ['component_camo_finish6'] = 'mimetica Perseo',
+  ['component_camo_finish7'] = 'mimetica Leopardata',
+  ['component_camo_finish8'] = 'mimetica Zebra',
+  ['component_camo_finish9'] = 'mimetica Geometrica',
+  ['component_camo_finish10'] = 'mimetica Boom',
+  ['component_camo_finish11'] = 'mimetica Patriottica',
+
+  ['component_camo_slide_finish'] = 'mimetica Digitale Slide',
+  ['component_camo_slide_finish2'] = 'mimetica Cespuglio Slide',
+  ['component_camo_slide_finish3'] = 'mimetica Legnosa Slide',
+  ['component_camo_slide_finish4'] = 'mimetica Teschio Slide',
+  ['component_camo_slide_finish5'] = 'mimetica Sessanta Nove Slide',
+  ['component_camo_slide_finish6'] = 'mimetica Perseo Slide',
+  ['component_camo_slide_finish7'] = 'mimetica Leopardata Slide',
+  ['component_camo_slide_finish8'] = 'mimetica Zebra Slide',
+  ['component_camo_slide_finish9'] = 'mimetica Geometrica Slide',
+  ['component_camo_slide_finish10'] = 'mimetica Boom Slide',
+  ['component_camo_slide_finish11'] = 'mimetica Patriottica Slide',
+
+  ['component_clip_default'] = 'caricatore Standard',
+  ['component_clip_extended'] = 'caricatore Esteso',
+  ['component_clip_drum'] = 'caricatore A Batteria',
+  ['component_clip_box'] = 'caricatore A Scatola',
+
+  ['component_scope_holo'] = 'mirino Olografico',
+  ['component_scope_small'] = 'mirino Piccolo',
+  ['component_scope_medium'] = 'mirino Medio',
+  ['component_scope_large'] = 'mirino Largo',
+  ['component_scope'] = 'mirino Montato',
+  ['component_scope_advanced'] = 'mirino Avanzato',
+  ['component_ironsights'] = 'integrato',
+
+  ['component_suppressor'] = 'silenziatore',
+  ['component_compensator'] = 'compensatore',
+
+  ['component_muzzle_flat'] = 'freno Di Bocca Piatto',
+  ['component_muzzle_tactical'] = 'freno Di Bocca Tattico',
+  ['component_muzzle_fat'] = 'freno Di Bocca Grosso',
+  ['component_muzzle_precision'] = 'freno Di Bocca Di Precisione',
+  ['component_muzzle_heavy'] = 'freno Di Bocca Pesante',
+  ['component_muzzle_slanted'] = 'freno Di Bocca Inclinato',
+  ['component_muzzle_split'] = 'freno Di Bocca Diviso',
+  ['component_muzzle_squared'] = 'freno Di Bocca Quadrato',
+
+  ['component_flashlight'] = 'torcia',
+  ['component_grip'] = 'impugnatura',
+
+  ['component_barrel_default'] = 'canna Standard',
+  ['component_barrel_heavy'] = 'canna Pesante',
+
+  ['component_ammo_tracer'] = 'munizioni Traccianti',
+  ['component_ammo_incendiary'] = 'munizioni Incendiarie',
+  ['component_ammo_hollowpoint'] = 'munizioni a Punta Cava',
+  ['component_ammo_fmj'] = 'munizioni fMj',
+  ['component_ammo_armor'] = 'munizioni penetranti',
+  ['component_ammo_explosive'] = 'munizioni penetranti incendiarie',
+
+  ['component_shells_default'] = 'cartucce Standard',
+  ['component_shells_incendiary'] = 'cartucce alito di Drago',
+  ['component_shells_armor'] = 'cartucce a pallettoni',
+  ['component_shells_hollowpoint'] = 'cartucce a freccette',
+  ['component_shells_explosive'] = 'cartucce esplosive',
+
+  -- Weapon Ammo
+  ['ammo_rounds'] = 'colpo(i)',
+  ['ammo_shells'] = 'cartuccia(e)',
+  ['ammo_charge'] = 'carica',
+  ['ammo_petrol'] = 'Litri di carburante',
+  ['ammo_firework'] = 'fuochi d\'artificio',
+  ['ammo_rockets'] = 'razzo(i)',
+  ['ammo_grenadelauncher'] = 'granata(e)',
+  ['ammo_grenade'] = 'granata(e)',
+  ['ammo_stickybomb'] = 'bomba(e)',
+  ['ammo_pipebomb'] = 'bomba(e)',
+  ['ammo_smokebomb'] = 'bomba(e)',
+  ['ammo_molotov'] = 'bottiglia(e)',
+  ['ammo_proxmine'] = 'mina(e)',
+  ['ammo_bzgas'] = 'latta(e)',
+  ['ammo_ball'] = 'palla(e)',
+  ['ammo_snowball'] = 'palle di neve',
+  ['ammo_flare'] = 'razzo(i)',
+  ['ammo_flaregun'] = 'razzo(i)',
+
+  -- Weapon Tints
+  ['tint_default'] = 'Colore standard',
+  ['tint_green'] = 'color verde',
+  ['tint_gold'] = 'color oro',
+  ['tint_pink'] = 'color rosa',
+  ['tint_army'] = 'color army',
+  ['tint_lspd'] = 'color blu',
+  ['tint_orange'] = 'color arancio',
+  ['tint_platinum'] = 'color platino',
+}

From 3d8eaa92d91babf5111bbe4cc9d6cc144cd6df2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=20Gerg=C5=91?= <paldi95@gmail.com>
Date: Mon, 27 Feb 2023 16:50:42 +0100
Subject: [PATCH 27/70] Fix: Metadata update to client side

---
 [core]/es_extended/client/main.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua
index 855437376..11f47390f 100644
--- a/[core]/es_extended/client/main.lua
+++ b/[core]/es_extended/client/main.lua
@@ -629,6 +629,5 @@ for i = 1, #DoNotUse do
 end
 
 RegisterNetEvent('esx:updatePlayerData', function(key, val)
-	if GetInvokingResource() ~= 'es_extended' then return end
 	ESX.SetPlayerData(key, val)
 end)
\ No newline at end of file

From a80f5f952a87969237117957d5c38e62d4294f24 Mon Sep 17 00:00:00 2001
From: MoskalykA <100430077+MoskalykA@users.noreply.github.com>
Date: Wed, 1 Mar 2023 09:54:49 +0100
Subject: [PATCH 28/70] refactor: more logical code

---
 [core]/es_extended/client/functions.lua | 4 ++--
 [core]/esx_context/main.lua             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[core]/es_extended/client/functions.lua b/[core]/es_extended/client/functions.lua
index cd610edca..8e137eca8 100644
--- a/[core]/es_extended/client/functions.lua
+++ b/[core]/es_extended/client/functions.lua
@@ -357,7 +357,7 @@ function ESX.Game.Teleport(entity, coords, cb)
 end
 
 function ESX.Game.SpawnObject(object, coords, cb, networked)
-    networked = networked == nil and true or networked
+    networked = networked or true
     if networked then 
         ESX.TriggerServerCallback('esx:Onesync:SpawnObject', function(NetworkID)
             if cb then
@@ -405,7 +405,7 @@ end
 function ESX.Game.SpawnVehicle(vehicle, coords, heading, cb, networked)
     local model = type(vehicle) == 'number' and vehicle or joaat(vehicle)
     local vector = type(coords) == "vector3" and coords or vec(coords.x, coords.y, coords.z)
-    networked = networked == nil and true or networked
+    networked = networked or true
     CreateThread(function()
         ESX.Streaming.RequestModel(model)
 
diff --git a/[core]/esx_context/main.lua b/[core]/esx_context/main.lua
index 55bfad9c0..b497de6d7 100644
--- a/[core]/esx_context/main.lua
+++ b/[core]/esx_context/main.lua
@@ -13,7 +13,7 @@ function Post(fn,...)
 end
 
 function Open(position,eles,onSelect,onClose,canClose)
-	local canClose = canClose == nil and true or canClose
+	local canClose = canClose or true
 	activeMenu = {
 		position = position,
 		eles = eles,

From b8e29f6538976084da84538995811c8d579d6310 Mon Sep 17 00:00:00 2001
From: MoskalykA <100430077+MoskalykA@users.noreply.github.com>
Date: Wed, 1 Mar 2023 10:04:48 +0100
Subject: [PATCH 29/70] refactor: more logical code

---
 [core]/es_extended/server/functions.lua   | 2 +-
 [core]/esx_menu_list/client/main.lua      | 2 +-
 [core]/esx_multicharacter/client/main.lua | 6 +++---
 [core]/esx_multicharacter/server/main.lua | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[core]/es_extended/server/functions.lua b/[core]/es_extended/server/functions.lua
index 1b48771a9..90bdd48e0 100644
--- a/[core]/es_extended/server/functions.lua
+++ b/[core]/es_extended/server/functions.lua
@@ -103,7 +103,7 @@ function ESX.RegisterCommand(name, group, cb, allowConsole, suggestion)
               end
             end
 
-            if v.validate == false then
+            if not v.validate then
               error = nil
             end
 
diff --git a/[core]/esx_menu_list/client/main.lua b/[core]/esx_menu_list/client/main.lua
index aad1f8d71..4d0af0c93 100644
--- a/[core]/esx_menu_list/client/main.lua
+++ b/[core]/esx_menu_list/client/main.lua
@@ -29,7 +29,7 @@ CreateThread(function()
 		})
 
 		for k,v in pairs(OpenedMenus) do
-			if v == true then
+			if v then
 				OpenedMenuCount = OpenedMenuCount + 1
 			end
 		end
diff --git a/[core]/esx_multicharacter/client/main.lua b/[core]/esx_multicharacter/client/main.lua
index b0ee83dec..4e1357b71 100644
--- a/[core]/esx_multicharacter/client/main.lua
+++ b/[core]/esx_multicharacter/client/main.lua
@@ -95,7 +95,7 @@ if ESX.GetConfig().Multichar then
 	end
 
 	SetupCharacter = function(index)
-		if spawned == false then
+		if not spawned then
 			exports.spawnmanager:spawnPlayer({
 				x = Config.Spawn.x,
 				y = Config.Spawn.y,
@@ -188,7 +188,7 @@ if ESX.GetConfig().Multichar then
 			if not v.model and v.skin then
 				if v.skin.model then v.model = v.skin.model elseif v.skin.sex == 1 then v.model = mp_f_freemode_01 else v.model = mp_m_freemode_01 end
 			end
-			if spawned == false then SetupCharacter(Character) end
+			if not spawned then SetupCharacter(Character) end
 			local label = v.firstname..' '..v.lastname
 			if Characters[k].disabled then
 				elements[#elements+1] = {title = label,icon = "fa-regular fa-user", value = v.id}
@@ -318,7 +318,7 @@ if ESX.GetConfig().Multichar then
 
 	if Config.Relog then
 		RegisterCommand('relog', function(source, args, rawCommand)
-			if canRelog == true then
+			if canRelog then
 				canRelog = false
 				TriggerServerEvent('esx_multicharacter:relog')
 				ESX.SetTimeout(10000, function()
diff --git a/[core]/esx_multicharacter/server/main.lua b/[core]/esx_multicharacter/server/main.lua
index 65d84d461..cce710f03 100644
--- a/[core]/esx_multicharacter/server/main.lua
+++ b/[core]/esx_multicharacter/server/main.lua
@@ -1,6 +1,6 @@
 if not ESX then
 	error('\n^1Unable to start Multicharacter - you must be using ESX Legacy^0')
-elseif ESX.GetConfig().Multichar == true then
+elseif ESX.GetConfig().Multichar then
 	local DATABASE do
 		local connectionString = GetConvar('mysql_connection_string', '');
 		if connectionString == '' then

From eeadbbc6d4d4bb10516c5cf6d27ff2790b344bf1 Mon Sep 17 00:00:00 2001
From: Mycroft <kaseyfitton@hotmail.co.uk>
Date: Wed, 1 Mar 2023 10:15:38 -0800
Subject: [PATCH 30/70] feat(es_extended/client): Onesync range validation for
 client-sided  spawning

a better version of: https://github.com/esx-framework/esx_core/pull/915
---
 [core]/es_extended/client/functions.lua | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/[core]/es_extended/client/functions.lua b/[core]/es_extended/client/functions.lua
index 8e137eca8..3cce91062 100644
--- a/[core]/es_extended/client/functions.lua
+++ b/[core]/es_extended/client/functions.lua
@@ -406,6 +406,12 @@ function ESX.Game.SpawnVehicle(vehicle, coords, heading, cb, networked)
     local model = type(vehicle) == 'number' and vehicle or joaat(vehicle)
     local vector = type(coords) == "vector3" and coords or vec(coords.x, coords.y, coords.z)
     networked = networked or true
+    local player_coords = GetEntityCoords(ESX.PlayerData.ped)
+    local dist = #(player_coords - vector)
+    if dist > 424 then
+        local executing_resource = GetInvokingResource() or "Unknown"
+        return print(("[^1ERROR^7] Resource ^5%s^7 Tried to spawn vehicle on the client but the position is too far away (Out of onesync range)."):format(executing_resource))
+    end
     CreateThread(function()
         ESX.Streaming.RequestModel(model)
 

From 3a7765767926e644f343ea9d4ec3b12afe31315e Mon Sep 17 00:00:00 2001
From: Mycroft <kaseyfitton@hotmail.co.uk>
Date: Wed, 1 Mar 2023 10:27:52 -0800
Subject: [PATCH 31/70] feat(es_extended): Better error messaging to ensure
 onesync infinity is enabled

---
 [core]/es_extended/client/functions.lua | 2 +-
 [core]/es_extended/fxmanifest.lua       | 1 -
 [core]/es_extended/server/main.lua      | 4 ++++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[core]/es_extended/client/functions.lua b/[core]/es_extended/client/functions.lua
index 3cce91062..0a3f2e48e 100644
--- a/[core]/es_extended/client/functions.lua
+++ b/[core]/es_extended/client/functions.lua
@@ -408,7 +408,7 @@ function ESX.Game.SpawnVehicle(vehicle, coords, heading, cb, networked)
     networked = networked or true
     local player_coords = GetEntityCoords(ESX.PlayerData.ped)
     local dist = #(player_coords - vector)
-    if dist > 424 then
+    if dist > 424 then -- Onesync infinity Range (https://docs.fivem.net/docs/scripting-reference/onesync/)
         local executing_resource = GetInvokingResource() or "Unknown"
         return print(("[^1ERROR^7] Resource ^5%s^7 Tried to spawn vehicle on the client but the position is too far away (Out of onesync range)."):format(executing_resource))
     end
diff --git a/[core]/es_extended/fxmanifest.lua b/[core]/es_extended/fxmanifest.lua
index 3312541c8..2899228b7 100644
--- a/[core]/es_extended/fxmanifest.lua
+++ b/[core]/es_extended/fxmanifest.lua
@@ -75,7 +75,6 @@ files {
 
 dependencies {
 	'/server:5949',
-	'/onesync',
 	'oxmysql',
 	'spawnmanager',
 }
diff --git a/[core]/es_extended/server/main.lua b/[core]/es_extended/server/main.lua
index 603b85d23..6988aff2b 100644
--- a/[core]/es_extended/server/main.lua
+++ b/[core]/es_extended/server/main.lua
@@ -1,6 +1,7 @@
 SetMapName('San Andreas')
 SetGameType('ESX Legacy')
 
+local OnesyncState = GetConvar('onesync', 'off')
 local newPlayer = 'INSERT INTO `users` SET `accounts` = ?, `identifier` = ?, `group` = ?'
 local loadPlayer = 'SELECT `accounts`, `job`, `job_grade`, `group`, `position`, `inventory`, `skin`, `loadout`, `meta`'
 
@@ -95,6 +96,9 @@ if not Config.Multichar then
     local playerId = source
     local identifier = ESX.GetIdentifier(playerId)
 
+    if OnesyncState == "off" or OnesyncState == "legacy" then
+      deferrals.done(('[ESX] ESX Requires Onesync Infinity to work. This server currently has Onesync set to: %s'):format(OnesyncState))
+    end
     if identifier then
       if ESX.GetPlayerFromIdentifier(identifier) then
         deferrals.done(

From e4b36d2d4cc2d5ed12650a603a9f4161c996f353 Mon Sep 17 00:00:00 2001
From: Mycroft <kaseyfitton@hotmail.co.uk>
Date: Wed, 1 Mar 2023 11:43:06 -0800
Subject: [PATCH 32/70] feat: Database connection validation

Suggested by tabarra. Instead of throwing them into awaiting scripts with 0 information. stop them from joining and tell them the user
---
 [core]/es_extended/server/common.lua      |  3 ++-
 [core]/es_extended/server/main.lua        | 14 ++++++++++----
 [core]/esx_multicharacter/server/main.lua | 21 ++++++++++++++++++++-
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/[core]/es_extended/server/common.lua b/[core]/es_extended/server/common.lua
index 0867042b3..57f1479e4 100644
--- a/[core]/es_extended/server/common.lua
+++ b/[core]/es_extended/server/common.lua
@@ -8,7 +8,7 @@ Core.RegisteredCommands = {}
 Core.Pickups = {}
 Core.PickupId = 0
 Core.PlayerFunctionOverrides = {}
-
+Core.DatabaseConnected = false
 Core.playersByIdentifier = {}
 
 Core.vehicleTypesByModel = {}
@@ -39,6 +39,7 @@ local function StartDBSync()
 end
 
 MySQL.ready(function()
+  Core.DatabaseConnected = true
   if not Config.OxInventory then
     local items = MySQL.query.await('SELECT * FROM items')
     for k, v in ipairs(items) do
diff --git a/[core]/es_extended/server/main.lua b/[core]/es_extended/server/main.lua
index 6988aff2b..d1d0a3618 100644
--- a/[core]/es_extended/server/main.lua
+++ b/[core]/es_extended/server/main.lua
@@ -56,6 +56,7 @@ function onPlayerJoined(playerId)
       if result then
         loadESXPlayer(identifier, playerId, false)
       else
+        
         createESXPlayer(identifier, playerId)
       end
     end
@@ -97,18 +98,23 @@ if not Config.Multichar then
     local identifier = ESX.GetIdentifier(playerId)
 
     if OnesyncState == "off" or OnesyncState == "legacy" then
-      deferrals.done(('[ESX] ESX Requires Onesync Infinity to work. This server currently has Onesync set to: %s'):format(OnesyncState))
+      return deferrals.done(('[ESX] ESX Requires Onesync Infinity to work. This server currently has Onesync set to: %s'):format(OnesyncState))
     end
+
+    if not Core.DatabaseConnected then
+      return deferrals.done(('[ESX] ESX Cannot Connect to your database. Please make sure it is correctly configured in your server.cfg'):format(OnesyncState))
+    end
+    
     if identifier then
       if ESX.GetPlayerFromIdentifier(identifier) then
-        deferrals.done(
+        return deferrals.done(
           ('[ESX] There was an error loading your character!\nError code: identifier-active\n\nThis error is caused by a player on this server who has the same identifier as you have. Make sure you are not playing on the same account.\n\nYour identifier: %s'):format(
             identifier))
       else
-        deferrals.done()
+        return deferrals.done()
       end
     else
-      deferrals.done(
+      return deferrals.done(
         '[ESX] There was an error loading your character!\nError code: identifier-missing\n\nThe cause of this error is not known, your identifier could not be found. Please come back later or report this problem to the server administration team.')
     end
   end)
diff --git a/[core]/esx_multicharacter/server/main.lua b/[core]/esx_multicharacter/server/main.lua
index cce710f03..1e6b19e9b 100644
--- a/[core]/esx_multicharacter/server/main.lua
+++ b/[core]/esx_multicharacter/server/main.lua
@@ -1,6 +1,10 @@
 if not ESX then
 	error('\n^1Unable to start Multicharacter - you must be using ESX Legacy^0')
 elseif ESX.GetConfig().Multichar then
+	local DatabaseConnected = false
+	local DatabaseFound = false
+	local OnesyncState = GetConvar('onesync', 'off')
+
 	local DATABASE do
 		local connectionString = GetConvar('mysql_connection_string', '');
 		if connectionString == '' then
@@ -8,6 +12,7 @@ elseif ESX.GetConfig().Multichar then
 		elseif connectionString:find('mysql://') then
 			connectionString = connectionString:sub(9, -1)
 			DATABASE = connectionString:sub(connectionString:find('/')+1, -1):gsub('[%?]+[%w%p]*$', '')
+			DatabaseFound = true
 		else
 			connectionString = {string.strsplit(';', connectionString)}
 			for i = 1, #connectionString do
@@ -16,6 +21,7 @@ elseif ESX.GetConfig().Multichar then
 					DATABASE = v:sub(10, #v)
 				end
 			end
+			DatabaseFound = true
 		end
 	end
 
@@ -92,11 +98,23 @@ elseif ESX.GetConfig().Multichar then
 	AddEventHandler('playerConnecting', function(playerName, setKickReason, deferrals)
 		deferrals.defer()
 		local identifier = GetIdentifier(source)
+		if OnesyncState == "off" or OnesyncState == "legacy" then
+			return deferrals.done(('[ESX] ESX Requires Onesync Infinity to work. This server currently has Onesync set to: %s'):format(OnesyncState))
+		end
 
+		if not DatabaseFound then
+			deferrals.done(('[ESX Multicharacter] Cannot Find the servers mysql_connection_string. Please make sure it is correctly configured in your server.cfg'):format(OnesyncState))
+		end
+
+		if not DatabaseConnected then
+			deferrals.done(('[ESX Multicharacter] ESX Cannot Connect to your database. Please make sure it is correctly configured in your server.cfg'):format(OnesyncState))
+		end
+		
 		if identifier then
+			
 			if not ESX.GetConfig().EnableDebug then
 				if ESX.Players[identifier] then
-					deferrals.done(('A player is already connected to the server with this identifier.\nYour identifier: %s:%s'):format(PRIMARY_IDENTIFIER, identifier))
+					deferrals.done(('[ESX Multicharacter] A player is already connected to the server with this identifier.\nYour identifier: %s:%s'):format(PRIMARY_IDENTIFIER, identifier))
 				else
 					deferrals.done()
 				end
@@ -179,6 +197,7 @@ elseif ESX.GetConfig().Multichar then
 			until next(ESX.Jobs)
 
 			FETCH = 'SELECT identifier, accounts, job, job_grade, firstname, lastname, dateofbirth, sex, skin, disabled FROM users WHERE identifier LIKE ? LIMIT ?'
+			DatabaseConnected = true
 		end
 	end)
 

From 0644cbf8991dda066ca98106408800192b344c9e Mon Sep 17 00:00:00 2001
From: Mycroft <kaseyfitton@hotmail.co.uk>
Date: Wed, 1 Mar 2023 11:47:02 -0800
Subject: [PATCH 33/70] fix(esx_multicharacter): store database tables
 correctly

this has been broken for a while. all character data should now delete when deleting a character
---
 [core]/esx_multicharacter/server/main.lua | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/[core]/esx_multicharacter/server/main.lua b/[core]/esx_multicharacter/server/main.lua
index 1e6b19e9b..ce90c665f 100644
--- a/[core]/esx_multicharacter/server/main.lua
+++ b/[core]/esx_multicharacter/server/main.lua
@@ -109,7 +109,7 @@ elseif ESX.GetConfig().Multichar then
 		if not DatabaseConnected then
 			deferrals.done(('[ESX Multicharacter] ESX Cannot Connect to your database. Please make sure it is correctly configured in your server.cfg'):format(OnesyncState))
 		end
-		
+
 		if identifier then
 			
 			if not ESX.GetConfig().EnableDebug then
@@ -159,11 +159,12 @@ elseif ESX.GetConfig().Multichar then
 			local count = 0
 
 			for i = 1, #DB_COLUMNS do
-				local v = DB_COLUMNS[i]
+				local column = DB_COLUMNS[i]
+				DB_TABLES[column.TABLE_NAME] = column.COLUMN_NAME
 
-				if v?.CHARACTER_MAXIMUM_LENGTH ~= length then
+				if column?.CHARACTER_MAXIMUM_LENGTH ~= length then
 					count += 1
-					columns[v.TABLE_NAME] = v.COLUMN_NAME
+					columns[column.TABLE_NAME] = column.COLUMN_NAME
 				end
 			end
 

From d1965696f41dacb41656ff160818ec05e7fc5772 Mon Sep 17 00:00:00 2001
From: Mycroft <kaseyfitton@hotmail.co.uk>
Date: Wed, 1 Mar 2023 22:56:26 +0000
Subject: [PATCH 34/70] tweak: change `OnesyncState` to `oneSyncState`

---
 [core]/es_extended/server/main.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/[core]/es_extended/server/main.lua b/[core]/es_extended/server/main.lua
index d1d0a3618..35dc79518 100644
--- a/[core]/es_extended/server/main.lua
+++ b/[core]/es_extended/server/main.lua
@@ -1,7 +1,7 @@
 SetMapName('San Andreas')
 SetGameType('ESX Legacy')
 
-local OnesyncState = GetConvar('onesync', 'off')
+local oneSyncState = GetConvar('onesync', 'off')
 local newPlayer = 'INSERT INTO `users` SET `accounts` = ?, `identifier` = ?, `group` = ?'
 local loadPlayer = 'SELECT `accounts`, `job`, `job_grade`, `group`, `position`, `inventory`, `skin`, `loadout`, `meta`'
 

From 05b158c57a47cd3f5e6e3e0074e77f10cae57162 Mon Sep 17 00:00:00 2001
From: Mycroft <kaseyfitton@hotmail.co.uk>
Date: Wed, 1 Mar 2023 22:57:16 +0000
Subject: [PATCH 35/70] tweak: change `OnesyncState` to `oneSyncState`

---
 [core]/esx_multicharacter/server/main.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/[core]/esx_multicharacter/server/main.lua b/[core]/esx_multicharacter/server/main.lua
index ce90c665f..8833819de 100644
--- a/[core]/esx_multicharacter/server/main.lua
+++ b/[core]/esx_multicharacter/server/main.lua
@@ -3,7 +3,7 @@ if not ESX then
 elseif ESX.GetConfig().Multichar then
 	local DatabaseConnected = false
 	local DatabaseFound = false
-	local OnesyncState = GetConvar('onesync', 'off')
+	local oneSyncState = GetConvar('onesync', 'off')
 
 	local DATABASE do
 		local connectionString = GetConvar('mysql_connection_string', '');

From 33b68df021714930e12b2c8af9d09c44fa21a391 Mon Sep 17 00:00:00 2001
From: Mycroft <kaseyfitton@hotmail.co.uk>
Date: Thu, 2 Mar 2023 08:13:50 -0800
Subject: [PATCH 36/70] formatting: correct naming scheme

---
 [core]/es_extended/server/main.lua        |  6 +++---
 [core]/esx_multicharacter/server/main.lua | 22 +++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/[core]/es_extended/server/main.lua b/[core]/es_extended/server/main.lua
index 35dc79518..6512c9209 100644
--- a/[core]/es_extended/server/main.lua
+++ b/[core]/es_extended/server/main.lua
@@ -97,12 +97,12 @@ if not Config.Multichar then
     local playerId = source
     local identifier = ESX.GetIdentifier(playerId)
 
-    if OnesyncState == "off" or OnesyncState == "legacy" then
-      return deferrals.done(('[ESX] ESX Requires Onesync Infinity to work. This server currently has Onesync set to: %s'):format(OnesyncState))
+    if oneSyncState == "off" or oneSyncState == "legacy" then
+      return deferrals.done(('[ESX] ESX Requires Onesync Infinity to work. This server currently has Onesync set to: %s'):format(oneSyncState))
     end
 
     if not Core.DatabaseConnected then
-      return deferrals.done(('[ESX] ESX Cannot Connect to your database. Please make sure it is correctly configured in your server.cfg'):format(OnesyncState))
+      return deferrals.done(('[ESX] ESX Cannot Connect to your database. Please make sure it is correctly configured in your server.cfg'):format(oneSyncState))
     end
     
     if identifier then
diff --git a/[core]/esx_multicharacter/server/main.lua b/[core]/esx_multicharacter/server/main.lua
index 8833819de..564c70850 100644
--- a/[core]/esx_multicharacter/server/main.lua
+++ b/[core]/esx_multicharacter/server/main.lua
@@ -1,8 +1,8 @@
 if not ESX then
 	error('\n^1Unable to start Multicharacter - you must be using ESX Legacy^0')
 elseif ESX.GetConfig().Multichar then
-	local DatabaseConnected = false
-	local DatabaseFound = false
+	local databaseConnected = false
+	local databaseFound = false
 	local oneSyncState = GetConvar('onesync', 'off')
 
 	local DATABASE do
@@ -12,7 +12,7 @@ elseif ESX.GetConfig().Multichar then
 		elseif connectionString:find('mysql://') then
 			connectionString = connectionString:sub(9, -1)
 			DATABASE = connectionString:sub(connectionString:find('/')+1, -1):gsub('[%?]+[%w%p]*$', '')
-			DatabaseFound = true
+			databaseFound = true
 		else
 			connectionString = {string.strsplit(';', connectionString)}
 			for i = 1, #connectionString do
@@ -21,7 +21,7 @@ elseif ESX.GetConfig().Multichar then
 					DATABASE = v:sub(10, #v)
 				end
 			end
-			DatabaseFound = true
+			databaseFound = true
 		end
 	end
 
@@ -98,16 +98,16 @@ elseif ESX.GetConfig().Multichar then
 	AddEventHandler('playerConnecting', function(playerName, setKickReason, deferrals)
 		deferrals.defer()
 		local identifier = GetIdentifier(source)
-		if OnesyncState == "off" or OnesyncState == "legacy" then
-			return deferrals.done(('[ESX] ESX Requires Onesync Infinity to work. This server currently has Onesync set to: %s'):format(OnesyncState))
+		if oneSyncState == "off" or oneSyncState == "legacy" then
+			return deferrals.done(('[ESX] ESX Requires Onesync Infinity to work. This server currently has Onesync set to: %s'):format(oneSyncState))
 		end
 
-		if not DatabaseFound then
-			deferrals.done(('[ESX Multicharacter] Cannot Find the servers mysql_connection_string. Please make sure it is correctly configured in your server.cfg'):format(OnesyncState))
+		if not databaseFound then
+			deferrals.done(('[ESX Multicharacter] Cannot Find the servers mysql_connection_string. Please make sure it is correctly configured in your server.cfg'):format(oneSyncState))
 		end
 
-		if not DatabaseConnected then
-			deferrals.done(('[ESX Multicharacter] ESX Cannot Connect to your database. Please make sure it is correctly configured in your server.cfg'):format(OnesyncState))
+		if not databaseConnected then
+			deferrals.done(('[ESX Multicharacter] ESX Cannot Connect to your database. Please make sure it is correctly configured in your server.cfg'):format(oneSyncState))
 		end
 
 		if identifier then
@@ -198,7 +198,7 @@ elseif ESX.GetConfig().Multichar then
 			until next(ESX.Jobs)
 
 			FETCH = 'SELECT identifier, accounts, job, job_grade, firstname, lastname, dateofbirth, sex, skin, disabled FROM users WHERE identifier LIKE ? LIMIT ?'
-			DatabaseConnected = true
+			databaseConnected = true
 		end
 	end)
 

From 30bee9343fa61674d175563af69ef5d7552da052 Mon Sep 17 00:00:00 2001
From: Mycroft <kaseyfitton@hotmail.co.uk>
Date: Thu, 2 Mar 2023 08:34:35 -0800
Subject: [PATCH 37/70] refactor: make Config.Multichar an automatic value

Credit to Fantik for the idea
---
 [core]/es_extended/config.lua             |  2 +-
 [core]/esx_multicharacter/server/main.lua | 49 ++++++++++-------------
 2 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/[core]/es_extended/config.lua b/[core]/es_extended/config.lua
index 1c6da954d..ceca3601d 100644
--- a/[core]/es_extended/config.lua
+++ b/[core]/es_extended/config.lua
@@ -29,7 +29,7 @@ Config.EnableDefaultInventory   = true -- Display the default Inventory ( F2 )
 Config.EnableWantedLevel    	= false -- Use Normal GTA wanted Level?
 Config.EnablePVP                = true -- Allow Player to player combat
 
-Config.Multichar                = true -- Enable support for esx_multicharacter
+Config.Multichar                = GetResourceState("esx_multicharacter") ~= "missing"
 Config.Identity                 = true -- Select a characters identity data before they have loaded in (this happens by default with multichar)
 Config.DistanceGive 			= 4.0 -- Max distance when giving items, weapons etc.
 
diff --git a/[core]/esx_multicharacter/server/main.lua b/[core]/esx_multicharacter/server/main.lua
index 564c70850..12864d99b 100644
--- a/[core]/esx_multicharacter/server/main.lua
+++ b/[core]/esx_multicharacter/server/main.lua
@@ -1,29 +1,26 @@
-if not ESX then
-	error('\n^1Unable to start Multicharacter - you must be using ESX Legacy^0')
-elseif ESX.GetConfig().Multichar then
-	local databaseConnected = false
-	local databaseFound = false
-	local oneSyncState = GetConvar('onesync', 'off')
-
-	local DATABASE do
-		local connectionString = GetConvar('mysql_connection_string', '');
-		if connectionString == '' then
-			error(connectionString..'\n^1Unable to start Multicharacter - unable to determine database from mysql_connection_string^0', 0)
-		elseif connectionString:find('mysql://') then
-			connectionString = connectionString:sub(9, -1)
-			DATABASE = connectionString:sub(connectionString:find('/')+1, -1):gsub('[%?]+[%w%p]*$', '')
-			databaseFound = true
-		else
-			connectionString = {string.strsplit(';', connectionString)}
-			for i = 1, #connectionString do
-				local v = connectionString[i]
-				if v:match('database') then
-					DATABASE = v:sub(10, #v)
-				end
+local databaseConnected = false
+local databaseFound = false
+local oneSyncState = GetConvar('onesync', 'off')
+
+local DATABASE do
+	local connectionString = GetConvar('mysql_connection_string', '');
+	if connectionString == '' then
+		error(connectionString..'\n^1Unable to start Multicharacter - unable to determine database from mysql_connection_string^0', 0)
+	elseif connectionString:find('mysql://') then
+		connectionString = connectionString:sub(9, -1)
+		DATABASE = connectionString:sub(connectionString:find('/')+1, -1):gsub('[%?]+[%w%p]*$', '')
+		databaseFound = true
+	else
+		connectionString = {string.strsplit(';', connectionString)}
+		for i = 1, #connectionString do
+			local v = connectionString[i]
+			if v:match('database') then
+				DATABASE = v:sub(10, #v)
 			end
-			databaseFound = true
 		end
+		databaseFound = true
 	end
+end
 
 	local DB_TABLES = {users = 'identifier'}
 	local FETCH = nil
@@ -239,8 +236,4 @@ elseif ESX.GetConfig().Multichar then
 	RegisterNetEvent('esx_multicharacter:relog', function()
 		local source = source
 		TriggerEvent('esx:playerLogout', source)
-	end)
-
-	else
-		assert(nil, '^3WARNING: Multicharacter is disabled - please check your ESX configuration^0')
-	end
+	end)
\ No newline at end of file

From 9be905588f0246a89284bf54eac76761bd39421a Mon Sep 17 00:00:00 2001
From: Mycroft <kaseyfitton@hotmail.co.uk>
Date: Thu, 2 Mar 2023 08:39:19 -0800
Subject: [PATCH 38/70] tweak(es_extended/client/functions.lua): add more
 validation

---
 [core]/es_extended/client/functions.lua | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/[core]/es_extended/client/functions.lua b/[core]/es_extended/client/functions.lua
index 0a3f2e48e..25d221632 100644
--- a/[core]/es_extended/client/functions.lua
+++ b/[core]/es_extended/client/functions.lua
@@ -406,8 +406,11 @@ function ESX.Game.SpawnVehicle(vehicle, coords, heading, cb, networked)
     local model = type(vehicle) == 'number' and vehicle or joaat(vehicle)
     local vector = type(coords) == "vector3" and coords or vec(coords.x, coords.y, coords.z)
     networked = networked or true
-    local player_coords = GetEntityCoords(ESX.PlayerData.ped)
-    local dist = #(player_coords - vector)
+    local playerCoords = GetEntityCoords(ESX.PlayerData.ped)
+    if not vector or not playerCoords then 
+        return
+    end
+    local dist = #(playerCoords - vector)
     if dist > 424 then -- Onesync infinity Range (https://docs.fivem.net/docs/scripting-reference/onesync/)
         local executing_resource = GetInvokingResource() or "Unknown"
         return print(("[^1ERROR^7] Resource ^5%s^7 Tried to spawn vehicle on the client but the position is too far away (Out of onesync range)."):format(executing_resource))

From 322d268c264f498a3465fca0eb5fab7f685efa5f Mon Sep 17 00:00:00 2001
From: Mycroft <kaseyfitton@hotmail.co.uk>
Date: Thu, 2 Mar 2023 08:42:06 -0800
Subject: [PATCH 39/70] formatting: more camelCase

---
 [core]/es_extended/client/functions.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/[core]/es_extended/client/functions.lua b/[core]/es_extended/client/functions.lua
index 25d221632..b07c76101 100644
--- a/[core]/es_extended/client/functions.lua
+++ b/[core]/es_extended/client/functions.lua
@@ -412,7 +412,7 @@ function ESX.Game.SpawnVehicle(vehicle, coords, heading, cb, networked)
     end
     local dist = #(playerCoords - vector)
     if dist > 424 then -- Onesync infinity Range (https://docs.fivem.net/docs/scripting-reference/onesync/)
-        local executing_resource = GetInvokingResource() or "Unknown"
+        local executingResource = GetInvokingResource() or "Unknown"
         return print(("[^1ERROR^7] Resource ^5%s^7 Tried to spawn vehicle on the client but the position is too far away (Out of onesync range)."):format(executing_resource))
     end
     CreateThread(function()

From 789dc8b49e6d2037e5a916c417e2cff14028e448 Mon Sep 17 00:00:00 2001
From: Mycroft <kaseyfitton@hotmail.co.uk>
Date: Thu, 2 Mar 2023 10:49:22 -0800
Subject: [PATCH 40/70] tweak(es_extended/fxmanifest.lua): change requirement
 to be exact

---
 [core]/es_extended/fxmanifest.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/[core]/es_extended/fxmanifest.lua b/[core]/es_extended/fxmanifest.lua
index 2899228b7..81bb8157c 100644
--- a/[core]/es_extended/fxmanifest.lua
+++ b/[core]/es_extended/fxmanifest.lua
@@ -74,7 +74,7 @@ files {
 }
 
 dependencies {
-	'/server:5949',
+	'/native:0x6AE51D4B',
 	'oxmysql',
 	'spawnmanager',
 }

From d887e19faaa11f9a93d2bce96609249afff7e981 Mon Sep 17 00:00:00 2001
From: BagusCodeStudio <60974759+baguscodestudio@users.noreply.github.com>
Date: Fri, 3 Mar 2023 22:11:40 +0800
Subject: [PATCH 41/70] feat(es_extended/common/modules): TableContains

Example usage:
`ESX.Table.TableContains(category, {'plane', 'helicopter'})`
`ESX.Table.TableContains(category, 'boat')`

Just a small function that might be neat to have
---
 [core]/es_extended/common/modules/table.lua | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/[core]/es_extended/common/modules/table.lua b/[core]/es_extended/common/modules/table.lua
index 3741e01ea..2ad148294 100644
--- a/[core]/es_extended/common/modules/table.lua
+++ b/[core]/es_extended/common/modules/table.lua
@@ -133,6 +133,25 @@ function ESX.Table.Join(t, sep)
 	return str
 end
 
+-- Credits: https://github.com/JonasDev99/qb-garages/blob/b0335d67cb72a6b9ac60f62a87fb3946f5c2f33d/server/main.lua#L5
+function ESX.Table.TableContains(tab, val)
+    if type(val) == "table" then
+        for _, value in ipairs(tab) do
+            if ESX.Table.TableContains(val, value) then
+                return true
+            end
+        end
+        return false
+    else
+        for _, value in ipairs(tab) do
+            if value == val then
+                return true
+            end
+        end
+    end
+    return false
+end
+
 -- Credit: https://stackoverflow.com/a/15706820
 -- Description: sort function for pairs
 function ESX.Table.Sort(t, order)
@@ -162,4 +181,4 @@ function ESX.Table.Sort(t, order)
 			return keys[i], t[keys[i]]
 		end
 	end
-end
\ No newline at end of file
+end

From b2441bf27836d3aa20ef2b65bd012896bba34740 Mon Sep 17 00:00:00 2001
From: BagusCodeStudio <60974759+baguscodestudio@users.noreply.github.com>
Date: Fri, 3 Mar 2023 22:51:49 +0800
Subject: [PATCH 42/70] fix: Change ipairs to pairs for non-numeric keys

---
 [core]/es_extended/common/modules/table.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/[core]/es_extended/common/modules/table.lua b/[core]/es_extended/common/modules/table.lua
index 2ad148294..b2800c576 100644
--- a/[core]/es_extended/common/modules/table.lua
+++ b/[core]/es_extended/common/modules/table.lua
@@ -136,14 +136,14 @@ end
 -- Credits: https://github.com/JonasDev99/qb-garages/blob/b0335d67cb72a6b9ac60f62a87fb3946f5c2f33d/server/main.lua#L5
 function ESX.Table.TableContains(tab, val)
     if type(val) == "table" then
-        for _, value in ipairs(tab) do
+        for _, value in pairs(tab) do
             if ESX.Table.TableContains(val, value) then
                 return true
             end
         end
         return false
     else
-        for _, value in ipairs(tab) do
+        for _, value in pairs(tab) do
             if value == val then
                 return true
             end

From d4f1cbb366306dd568bd8138b2a5feb4b85ca5d3 Mon Sep 17 00:00:00 2001
From: 3869542 <76394290+3869542@users.noreply.github.com>
Date: Sun, 5 Mar 2023 01:06:12 +0800
Subject: [PATCH 43/70] Update player.lua

Fix some cheats use xPlayer.removeInventoryItem(itemName, negative number) to get Item
---
 [core]/es_extended/server/classes/player.lua | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua
index d02757e04..dba0fe5b5 100644
--- a/[core]/es_extended/server/classes/player.lua
+++ b/[core]/es_extended/server/classes/player.lua
@@ -293,14 +293,18 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 
 		if item then
 			count = ESX.Math.Round(count)
-			local newCount = item.count - count
+			if count > 0 then
+				local newCount = item.count - count
 
-			if newCount >= 0 then
-				item.count = newCount
-				self.weight = self.weight - (item.weight * count)
+				if newCount >= 0 then
+					item.count = newCount
+					self.weight = self.weight - (item.weight * count)
 
-				TriggerEvent('esx:onRemoveInventoryItem', self.source, item.name, item.count)
-				self.triggerEvent('esx:removeInventoryItem', item.name, item.count)
+					TriggerEvent('esx:onRemoveInventoryItem', self.source, item.name, item.count)
+					self.triggerEvent('esx:removeInventoryItem', item.name, item.count)
+				end
+			else
+				print(('[^1ERROR^7] Player ID:^5%s Tried remove a Invalid count of name'):format(self.playerId, money))
 			end
 		end
 	end

From 0eeabdb6e034402ed91f920297ce59d75f9eec95 Mon Sep 17 00:00:00 2001
From: 3869542 <76394290+3869542@users.noreply.github.com>
Date: Sun, 5 Mar 2023 01:23:28 +0800
Subject: [PATCH 44/70] Update player.lua

---
 [core]/es_extended/server/classes/player.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua
index dba0fe5b5..af50abb8e 100644
--- a/[core]/es_extended/server/classes/player.lua
+++ b/[core]/es_extended/server/classes/player.lua
@@ -304,7 +304,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 					self.triggerEvent('esx:removeInventoryItem', item.name, item.count)
 				end
 			else
-				print(('[^1ERROR^7] Player ID:^5%s Tried remove a Invalid count of name'):format(self.playerId, money))
+				print(('[^1ERROR^7] Player ID:^5%s Tried remove a Invalid count of name'):format(self.playerId, count))
 			end
 		end
 	end

From afdc384f64d74c03fe6d4ab4983f61c99e60faf2 Mon Sep 17 00:00:00 2001
From: 3869542 <76394290+3869542@users.noreply.github.com>
Date: Sun, 5 Mar 2023 01:26:53 +0800
Subject: [PATCH 45/70] Update player.lua

---
 [core]/es_extended/server/classes/player.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua
index af50abb8e..7404d9442 100644
--- a/[core]/es_extended/server/classes/player.lua
+++ b/[core]/es_extended/server/classes/player.lua
@@ -304,7 +304,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 					self.triggerEvent('esx:removeInventoryItem', item.name, item.count)
 				end
 			else
-				print(('[^1ERROR^7] Player ID:^5%s Tried remove a Invalid count of name'):format(self.playerId, count))
+				print(('[^1ERROR^7] Player ID:^5%s Tried remove a Invalid count -> %s of %s'):format(self.playerId, count,name))
 			end
 		end
 	end

From 5f096f485f98704dc0eec54feaad4a88b39ece8b Mon Sep 17 00:00:00 2001
From: MoskalykA <100430077+MoskalykA@users.noreply.github.com>
Date: Wed, 8 Mar 2023 12:30:11 +0100
Subject: [PATCH 46/70] refactor(playerActive): longer refreshment time

---
 [core]/es_extended/client/main.lua        | 3 ++-
 [core]/esx_multicharacter/client/main.lua | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua
index 4dfff72ce..53fbb5bce 100644
--- a/[core]/es_extended/client/main.lua
+++ b/[core]/es_extended/client/main.lua
@@ -2,7 +2,8 @@ local pickups = {}
 
 CreateThread(function()
 	while not Config.Multichar do
-		Wait(0)
+		Wait(100)
+		
 		if NetworkIsPlayerActive(PlayerId()) then
 			exports.spawnmanager:setAutoSpawn(false)
 			DoScreenFadeOut(0)
diff --git a/[core]/esx_multicharacter/client/main.lua b/[core]/esx_multicharacter/client/main.lua
index b0ee83dec..ac4f8d127 100644
--- a/[core]/esx_multicharacter/client/main.lua
+++ b/[core]/esx_multicharacter/client/main.lua
@@ -4,12 +4,13 @@ if ESX.GetConfig().Multichar then
 
 	CreateThread(function()
 		while not ESX.PlayerLoaded do
-			Wait(0)
+			Wait(100)
+			
 			if NetworkIsPlayerActive(PlayerId()) then
 				exports.spawnmanager:setAutoSpawn(false)
 				DoScreenFadeOut(0)
 				while not GetResourceState('esx_context') == 'started' do
-					Wait(0)
+					Wait(100)
 				end
 				TriggerEvent("esx_multicharacter:SetupCharacters")
 				break

From 9094a66a0ae294ea2426836671b52d0f865e7d1e Mon Sep 17 00:00:00 2001
From: Thekuca <63980591+Thekuca@users.noreply.github.com>
Date: Wed, 8 Mar 2023 19:32:48 +0100
Subject: [PATCH 47/70] feat(es_extended/config.lua): Adding disable seat shuff
 (PART 1)

---
 [core]/es_extended/config.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/[core]/es_extended/config.lua b/[core]/es_extended/config.lua
index 1c6da954d..7f605af0c 100644
--- a/[core]/es_extended/config.lua
+++ b/[core]/es_extended/config.lua
@@ -38,6 +38,7 @@ Config.DisableVehicleRewards      = false -- Disables Player Recieving weapons f
 Config.DisableNPCDrops            = false -- stops NPCs from dropping weapons on death
 Config.DisableWeaponWheel         = false -- Disables default weapon wheel
 Config.DisableAimAssist           = false -- disables AIM assist (mainly on controllers)
+Config.DisableVehicleSeatShuff	  = false -- Disables vehicle seat shuff
 Config.RemoveHudCommonents = {
 	[1] = false, --WANTED_STARS,
 	[2] = false, --WEAPON_ICON

From 84edbd9a54474d7dc07315f9e9e7a014c2869893 Mon Sep 17 00:00:00 2001
From: Thekuca <63980591+Thekuca@users.noreply.github.com>
Date: Wed, 8 Mar 2023 19:35:59 +0100
Subject: [PATCH 48/70] feat(es_extended/client/modules/actions.lua): Added
 disable seat shuff (PART 2)

---
 [core]/es_extended/client/modules/actions.lua | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/[core]/es_extended/client/modules/actions.lua b/[core]/es_extended/client/modules/actions.lua
index 47f3aa4a1..725e32e14 100644
--- a/[core]/es_extended/client/modules/actions.lua
+++ b/[core]/es_extended/client/modules/actions.lua
@@ -56,6 +56,12 @@ CreateThread(function()
                 isEnteringVehicle = true
                 TriggerEvent('esx:enteringVehicle', vehicle, plate, seat, netId)
                 TriggerServerEvent('esx:enteringVehicle', plate, seat, netId)
+				if Config.DisableVehicleSeatShuff then
+					if seat == 0 then
+						SetPedIntoVehicle(playerPed, vehicle, 0)
+						SetPedConfigFlag(playerPed, 184, true)
+					end	
+				end
             elseif not DoesEntityExist(GetVehiclePedIsTryingToEnter(playerPed)) and
                 not IsPedInAnyVehicle(playerPed, true) and isEnteringVehicle then
                 -- vehicle entering aborted
@@ -72,6 +78,12 @@ CreateThread(function()
                 current.displayName, current.netId = GetData(current.vehicle)
                 TriggerEvent('esx:enteredVehicle', current.vehicle, current.plate, current.seat, current.displayName, current.netId)
                 TriggerServerEvent('esx:enteredVehicle', current.plate, current.seat, current.displayName, current.netId)
+				if Config.DisableVehicleSeatShuff then
+					if current.seat == 0 then
+						SetPedIntoVehicle(playerPed, current.vehicle, 0)
+						SetPedConfigFlag(playerPed, 184, true)
+					end	
+				end
             end
         elseif isInVehicle then
             if not IsPedInAnyVehicle(playerPed, false) or IsPlayerDead(PlayerId()) then
@@ -112,4 +124,4 @@ if Config.EnableDebug then
         print('esx:exitedVehicle', 'vehicle', vehicle, 'plate', plate, 'seat', seat, 'displayName', displayName, 'netId', netId)
     end)
 
-end
\ No newline at end of file
+end

From 513dbf7e12fc1eafa5748ab92154a53b7f7888ae Mon Sep 17 00:00:00 2001
From: Thekuca <63980591+Thekuca@users.noreply.github.com>
Date: Wed, 8 Mar 2023 20:22:08 +0100
Subject: [PATCH 49/70] fix(PR): Fixed the PR code

---
 [core]/es_extended/client/modules/actions.lua | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/[core]/es_extended/client/modules/actions.lua b/[core]/es_extended/client/modules/actions.lua
index 725e32e14..4123c4859 100644
--- a/[core]/es_extended/client/modules/actions.lua
+++ b/[core]/es_extended/client/modules/actions.lua
@@ -56,12 +56,6 @@ CreateThread(function()
                 isEnteringVehicle = true
                 TriggerEvent('esx:enteringVehicle', vehicle, plate, seat, netId)
                 TriggerServerEvent('esx:enteringVehicle', plate, seat, netId)
-				if Config.DisableVehicleSeatShuff then
-					if seat == 0 then
-						SetPedIntoVehicle(playerPed, vehicle, 0)
-						SetPedConfigFlag(playerPed, 184, true)
-					end	
-				end
             elseif not DoesEntityExist(GetVehiclePedIsTryingToEnter(playerPed)) and
                 not IsPedInAnyVehicle(playerPed, true) and isEnteringVehicle then
                 -- vehicle entering aborted

From 5bcb72e991a02a1c019e26ddabe9a7112fa4c96f Mon Sep 17 00:00:00 2001
From: TheFantomas <117121911+TheFantomas@users.noreply.github.com>
Date: Fri, 10 Mar 2023 23:13:13 +0100
Subject: [PATCH 50/70] chore(core) Bump manifest version to 1.9.4

---
 [core]/cron/fxmanifest.lua               | 2 +-
 [core]/es_extended/fxmanifest.lua        | 2 +-
 [core]/esx_context/fxmanifest.lua        | 2 +-
 [core]/esx_identity/fxmanifest.lua       | 2 +-
 [core]/esx_loadingscreen/fxmanifest.lua  | 2 +-
 [core]/esx_menu_default/fxmanifest.lua   | 2 +-
 [core]/esx_menu_dialog/fxmanifest.lua    | 2 +-
 [core]/esx_menu_list/fxmanifest.lua      | 2 +-
 [core]/esx_multicharacter/fxmanifest.lua | 2 +-
 [core]/esx_notify/fxmanifest.lua         | 2 +-
 [core]/esx_progressbar/fxmanifest.lua    | 2 +-
 [core]/esx_skin/fxmanifest.lua           | 2 +-
 [core]/esx_textui/fxmanifest.lua         | 2 +-
 [core]/skinchanger/fxmanifest.lua        | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/[core]/cron/fxmanifest.lua b/[core]/cron/fxmanifest.lua
index f1a958375..aef7cbe42 100644
--- a/[core]/cron/fxmanifest.lua
+++ b/[core]/cron/fxmanifest.lua
@@ -4,6 +4,6 @@ game 'gta5'
 author 'ESX-Framework'
 description 'cron'
 lua54 'yes'
-version '1.9.3'
+version '1.9.4'
 
 server_script 'server/main.lua'
diff --git a/[core]/es_extended/fxmanifest.lua b/[core]/es_extended/fxmanifest.lua
index 81bb8157c..2acd5ad24 100644
--- a/[core]/es_extended/fxmanifest.lua
+++ b/[core]/es_extended/fxmanifest.lua
@@ -5,7 +5,7 @@ game 'gta5'
 description 'ES Extended'
 
 lua54 'yes'
-version '1.9.3'
+version '1.9.4'
 
 shared_scripts {
 	'locale.lua',
diff --git a/[core]/esx_context/fxmanifest.lua b/[core]/esx_context/fxmanifest.lua
index 0c1f12b60..ff68b5323 100644
--- a/[core]/esx_context/fxmanifest.lua
+++ b/[core]/esx_context/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 author 'ESX-Framework & Brayden'
 description 'Offical ESX Legacy Context Menu'
 lua54 'yes'
-version '1.9.3'
+version '1.9.4'
 
 ui_page 'index.html'
 
diff --git a/[core]/esx_identity/fxmanifest.lua b/[core]/esx_identity/fxmanifest.lua
index ba7133f24..618224aab 100644
--- a/[core]/esx_identity/fxmanifest.lua
+++ b/[core]/esx_identity/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'ESX Identity'
 lua54 'yes'
-version '1.9.3'
+version '1.9.4'
 
 shared_scripts {
 	'@es_extended/imports.lua',
diff --git a/[core]/esx_loadingscreen/fxmanifest.lua b/[core]/esx_loadingscreen/fxmanifest.lua
index 5333324be..bf772ad67 100644
--- a/[core]/esx_loadingscreen/fxmanifest.lua
+++ b/[core]/esx_loadingscreen/fxmanifest.lua
@@ -1,5 +1,5 @@
 game 'common'
-version '1.9.3'
+version '1.9.4'
 fx_version 'cerulean'
 author 'ESX-Framework'
 lua54 'yes'
diff --git a/[core]/esx_menu_default/fxmanifest.lua b/[core]/esx_menu_default/fxmanifest.lua
index d60daad2a..8bab549c2 100644
--- a/[core]/esx_menu_default/fxmanifest.lua
+++ b/[core]/esx_menu_default/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'ESX Menu Default'
 lua54 'yes'
-version '1.9.3'
+version '1.9.4'
 
 client_scripts {'@es_extended/imports.lua', 'client/main.lua'}
 
diff --git a/[core]/esx_menu_dialog/fxmanifest.lua b/[core]/esx_menu_dialog/fxmanifest.lua
index c765650f0..55ade7e84 100644
--- a/[core]/esx_menu_dialog/fxmanifest.lua
+++ b/[core]/esx_menu_dialog/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'ESX Menu Dialog'
 lua54 'yes'
-version '1.9.3'
+version '1.9.4'
 
 client_scripts {
 	'@es_extended/imports.lua',
diff --git a/[core]/esx_menu_list/fxmanifest.lua b/[core]/esx_menu_list/fxmanifest.lua
index 17e80e956..292f5c81b 100644
--- a/[core]/esx_menu_list/fxmanifest.lua
+++ b/[core]/esx_menu_list/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'ESX Menu List'
 lua54 'yes'
-version '1.9.3'
+version '1.9.4'
 
 client_scripts {
 	'@es_extended/imports.lua',
diff --git a/[core]/esx_multicharacter/fxmanifest.lua b/[core]/esx_multicharacter/fxmanifest.lua
index ebc9bf797..9bf4734c1 100644
--- a/[core]/esx_multicharacter/fxmanifest.lua
+++ b/[core]/esx_multicharacter/fxmanifest.lua
@@ -2,7 +2,7 @@ fx_version 'cerulean'
 game 'gta5'
 author 'ESX-Framework - Linden - KASH'
 description 'Official Multicharacter System For ESX Legacy'
-version '1.9.3'
+version '1.9.4'
 lua54 'yes'
 
 dependencies {'es_extended', 'esx_context', 'esx_identity', 'esx_skin'}
diff --git a/[core]/esx_notify/fxmanifest.lua b/[core]/esx_notify/fxmanifest.lua
index fc60108b3..6128565e5 100644
--- a/[core]/esx_notify/fxmanifest.lua
+++ b/[core]/esx_notify/fxmanifest.lua
@@ -1,7 +1,7 @@
 fx_version 'adamant'
 lua54 'yes'
 game 'gta5'
-version '1.9.3'
+version '1.9.4'
 author 'ESX-Framework'
 description 'Official NUI Notification system for ESX'
 
diff --git a/[core]/esx_progressbar/fxmanifest.lua b/[core]/esx_progressbar/fxmanifest.lua
index fd81e99ff..4ef335b05 100644
--- a/[core]/esx_progressbar/fxmanifest.lua
+++ b/[core]/esx_progressbar/fxmanifest.lua
@@ -2,7 +2,7 @@ fx_version 'adamant'
 game 'gta5'
 author 'ESX-Framework'
 lua54 'yes'
-version '1.9.3'
+version '1.9.4'
 description 'ESX Progressbar'
 
 client_scripts { 'Progress.lua' }
diff --git a/[core]/esx_skin/fxmanifest.lua b/[core]/esx_skin/fxmanifest.lua
index 68dd1dbbd..58e5386c1 100644
--- a/[core]/esx_skin/fxmanifest.lua
+++ b/[core]/esx_skin/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'ESX Skin'
 
-version '1.9.3'
+version '1.9.4'
 lua54 'yes'
 shared_script '@es_extended/imports.lua'
 
diff --git a/[core]/esx_textui/fxmanifest.lua b/[core]/esx_textui/fxmanifest.lua
index c063aed99..549250251 100644
--- a/[core]/esx_textui/fxmanifest.lua
+++ b/[core]/esx_textui/fxmanifest.lua
@@ -1,7 +1,7 @@
 fx_version 'adamant'
 game 'gta5'
 author 'ESX-Framework'
-version '1.9.3'
+version '1.9.4'
 description 'ESX TextUI'
 lua54 'yes'
 client_scripts { 'TextUI.lua' }
diff --git a/[core]/skinchanger/fxmanifest.lua b/[core]/skinchanger/fxmanifest.lua
index 7e27d7d79..abd1ca5a8 100644
--- a/[core]/skinchanger/fxmanifest.lua
+++ b/[core]/skinchanger/fxmanifest.lua
@@ -6,7 +6,7 @@ lua54 'yes'
 
 description 'Official ESX-Legacy resource for handling the Player`s Skin'
 
-version '1.9.3'
+version '1.9.4'
 
 client_scripts {
 	'@es_extended/locale.lua',

From 6b7f50c0333720ebf5ddd88d66fa2542d0198224 Mon Sep 17 00:00:00 2001
From: MoskalykA <100430077+MoskalykA@users.noreply.github.com>
Date: Sat, 11 Mar 2023 14:38:50 +0100
Subject: [PATCH 51/70] fix: could not find file `nui/img/*.png`

---
 [core]/esx_notify/fxmanifest.lua      | 1 -
 [core]/esx_progressbar/fxmanifest.lua | 1 -
 2 files changed, 2 deletions(-)

diff --git a/[core]/esx_notify/fxmanifest.lua b/[core]/esx_notify/fxmanifest.lua
index 6128565e5..62fd61950 100644
--- a/[core]/esx_notify/fxmanifest.lua
+++ b/[core]/esx_notify/fxmanifest.lua
@@ -15,5 +15,4 @@ files {
     'nui/index.html',
     'nui/js/*.js',
     'nui/css/*.css',
-    'nui/img/*.png',
 }
diff --git a/[core]/esx_progressbar/fxmanifest.lua b/[core]/esx_progressbar/fxmanifest.lua
index 4ef335b05..0939b36f5 100644
--- a/[core]/esx_progressbar/fxmanifest.lua
+++ b/[core]/esx_progressbar/fxmanifest.lua
@@ -13,5 +13,4 @@ files {
     'nui/index.html',
     'nui/js/*.js',
     'nui/css/*.css',
-    'nui/img/*.png',
 }

From b2121e293c68b7eab9b104cca34b3f24827875be Mon Sep 17 00:00:00 2001
From: Arctos2win <116841243+Arctos2win@users.noreply.github.com>
Date: Sat, 11 Mar 2023 23:09:21 +0100
Subject: [PATCH 52/70] Update nl.lua

Fixing language mistakes
---
 [core]/esx_identity/locales/nl.lua | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/[core]/esx_identity/locales/nl.lua b/[core]/esx_identity/locales/nl.lua
index baaad8b8c..df7de5c1b 100644
--- a/[core]/esx_identity/locales/nl.lua
+++ b/[core]/esx_identity/locales/nl.lua
@@ -9,16 +9,16 @@ Locales['nl'] = {
   ['thank_you_for_registering'] = 'Succesvol geregistreerd!',
   ['debug_xPlayer_get_first_name'] = 'Stuurt je Voornaam',
   ['debug_xPlayer_get_last_name'] = 'Stuurt je Achternaam',
-  ['debug_xPlayer_get_full_name'] = 'Stuurt je volle naam',
+  ['debug_xPlayer_get_full_name'] = 'Stuurt je volledige naam',
   ['debug_xPlayer_get_sex'] = 'Stuurt je Geslacht',
   ['debug_xPlayer_get_dob'] = 'Stuurt je Geboortedatum ',
   ['debug_xPlayer_get_height'] = 'Stuurt je lengte',
-  ['error_debug_xPlayer_get_first_name'] = 'Er was een probleem tijdens get verzamelen van je Voornaam.',
-  ['error_debug_xPlayer_get_last_name'] = 'Er was een probleem tijdens get verzamelen van je achternaam.',
-  ['error_debug_xPlayer_get_full_name'] = 'Er was een probleem tijdens get verzamelen van je volle naam.',
-  ['error_debug_xPlayer_get_sex'] = 'Er was een probleem tijdens get verzamelen van je Geslacht.',
-  ['error_debug_xPlayer_get_dob'] = 'Er was een probleem tijdens get verzamelen van je Geboortedatum.',
-  ['error_debug_xPlayer_get_height'] = 'Er was een probleem tijdens get verzamelen van je lengte.',
+  ['error_debug_xPlayer_get_first_name'] = 'Er was een probleem tijdens het ophalen van je Voornaam.',
+  ['error_debug_xPlayer_get_last_name'] = 'Er was een probleem tijdens het ophalen van je achternaam.',
+  ['error_debug_xPlayer_get_full_name'] = 'Er was een probleem tijdens het ophalen van je volledige naam.',
+  ['error_debug_xPlayer_get_sex'] = 'Er was een probleem tijdens het ophalen van je Geslacht.',
+  ['error_debug_xPlayer_get_dob'] = 'Er was een probleem tijdens het ophalen van je Geboortedatum.',
+  ['error_debug_xPlayer_get_height'] = 'Er was een probleem tijdens het ophalen van je lengte.',
   ['return_debug_xPlayer_get_first_name'] = 'Voornaam: %s',
   ['return_debug_xPlayer_get_last_name'] = 'Achternaam: %s',
   ['return_debug_xPlayer_get_full_name'] = 'Naam: %s',
@@ -28,7 +28,7 @@ Locales['nl'] = {
   ['data_incorrect'] = 'Verkeerde data, probeer opnieuw.',
   ['invalid_format'] = 'Verkeerde volgorde, probeer opnieuw.',
   ['no_identifier'] = '[ESX Identity]\nEr was een probleem tijdens het laden van je karakter!\nError Code: identifier-missing\n\nDit komt omdat je identifier mist, contacteer het server beheer.',
-  ['missing_identity'] = '[ESX Identity]\nEr was een probleem tijdens het laden van je karakter!\nError Code: identity-missing\n\nHet lijkt erop dat je identiteit mist, reconnect naar de server.',
+  ['missing_identity'] = '[ESX Identity]\nEr was een probleem tijdens het laden van je karakter!\nError Code: identity-missing\n\nHet lijkt erop dat je identiteit mist, reconnect met de server.',
   ['deleted_identity'] = 'Karakter verwijderd, reconnect om een nieuwe te registreren.',
   ['already_registered'] = 'Je bent al geregistreerd.',
   ['invalid_firstname_format'] = 'Ongeldige Volgorde (Voornaam): Probeer het nog een keer.',

From fc687084ebcee3c3f2e3db44a1fa2342cfc5043d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=20Gerg=C5=91?= <paldi95@gmail.com>
Date: Sun, 12 Mar 2023 00:11:05 +0100
Subject: [PATCH 53/70] Feat: Disable config options

---
 [core]/es_extended/client/main.lua | 68 ++++++++++++++++++++++++++++++
 [core]/es_extended/config.lua      |  2 +
 2 files changed, 70 insertions(+)

diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua
index 0e3990184..70869de4e 100644
--- a/[core]/es_extended/client/main.lua
+++ b/[core]/es_extended/client/main.lua
@@ -102,6 +102,74 @@ AddEventHandler('esx:playerLoaded', function(xPlayer, isNew, skin)
 		end)
 	end
 
+	-- Disable Dispatch services
+	if Config.DisableDispatchServices then
+		for i = 1, 15 do
+			EnableDispatchService(i, false)
+		end
+	end
+
+	-- Disable Scenarios
+	if Config.DisableScenarios then
+		local scenarios = {
+			'WORLD_VEHICLE_ATTRACTOR',
+			'WORLD_VEHICLE_AMBULANCE',
+			'WORLD_VEHICLE_BICYCLE_BMX',
+			'WORLD_VEHICLE_BICYCLE_BMX_BALLAS',
+			'WORLD_VEHICLE_BICYCLE_BMX_FAMILY',
+			'WORLD_VEHICLE_BICYCLE_BMX_HARMONY',
+			'WORLD_VEHICLE_BICYCLE_BMX_VAGOS',
+			'WORLD_VEHICLE_BICYCLE_MOUNTAIN',
+			'WORLD_VEHICLE_BICYCLE_ROAD',
+			'WORLD_VEHICLE_BIKE_OFF_ROAD_RACE',
+			'WORLD_VEHICLE_BIKER',
+			'WORLD_VEHICLE_BOAT_IDLE',
+			'WORLD_VEHICLE_BOAT_IDLE_ALAMO',
+			'WORLD_VEHICLE_BOAT_IDLE_MARQUIS',
+			'WORLD_VEHICLE_BOAT_IDLE_MARQUIS',
+			'WORLD_VEHICLE_BROKEN_DOWN',
+			'WORLD_VEHICLE_BUSINESSMEN',
+			'WORLD_VEHICLE_HELI_LIFEGUARD',
+			'WORLD_VEHICLE_CLUCKIN_BELL_TRAILER',
+			'WORLD_VEHICLE_CONSTRUCTION_SOLO',
+			'WORLD_VEHICLE_CONSTRUCTION_PASSENGERS',
+			'WORLD_VEHICLE_DRIVE_PASSENGERS',
+			'WORLD_VEHICLE_DRIVE_PASSENGERS_LIMITED',
+			'WORLD_VEHICLE_DRIVE_SOLO',
+			'WORLD_VEHICLE_FIRE_TRUCK',
+			'WORLD_VEHICLE_EMPTY',
+			'WORLD_VEHICLE_MARIACHI',
+			'WORLD_VEHICLE_MECHANIC',
+			'WORLD_VEHICLE_MILITARY_PLANES_BIG',
+			'WORLD_VEHICLE_MILITARY_PLANES_SMALL',
+			'WORLD_VEHICLE_PARK_PARALLEL',
+			'WORLD_VEHICLE_PARK_PERPENDICULAR_NOSE_IN',
+			'WORLD_VEHICLE_PASSENGER_EXIT',
+			'WORLD_VEHICLE_POLICE_BIKE',
+			'WORLD_VEHICLE_POLICE_CAR',
+			'WORLD_VEHICLE_POLICE',
+			'WORLD_VEHICLE_POLICE_NEXT_TO_CAR',
+			'WORLD_VEHICLE_QUARRY',
+			'WORLD_VEHICLE_SALTON',
+			'WORLD_VEHICLE_SALTON_DIRT_BIKE',
+			'WORLD_VEHICLE_SECURITY_CAR',
+			'WORLD_VEHICLE_STREETRACE',
+			'WORLD_VEHICLE_TOURBUS',
+			'WORLD_VEHICLE_TOURIST',
+			'WORLD_VEHICLE_TANDL',
+			'WORLD_VEHICLE_TRACTOR',
+			'WORLD_VEHICLE_TRACTOR_BEACH',
+			'WORLD_VEHICLE_TRUCK_LOGS',
+			'WORLD_VEHICLE_TRUCKS_TRAILERS',
+			'WORLD_VEHICLE_DISTANT_EMPTY_GROUND',
+			'WORLD_HUMAN_PAPARAZZI'
+		}
+		
+		for i, v in pairs(scenarios) do
+			SetScenarioTypeEnabled(v, false)
+		end
+	end
+
 	SetDefaultVehicleNumberPlateTextPattern(-1, Config.CustomAIPlates)
 	StartServerSyncLoops()
 end)
diff --git a/[core]/es_extended/config.lua b/[core]/es_extended/config.lua
index d7d769f87..8cc4dfd33 100644
--- a/[core]/es_extended/config.lua
+++ b/[core]/es_extended/config.lua
@@ -36,6 +36,8 @@ Config.DistanceGive 			= 4.0 -- Max distance when giving items, weapons etc.
 Config.DisableHealthRegeneration  = false -- Player will no longer regenerate health
 Config.DisableVehicleRewards      = false -- Disables Player Recieving weapons from vehicles
 Config.DisableNPCDrops            = false -- stops NPCs from dropping weapons on death
+Config.DisableDispatchServices	  = true  -- Disable Dispatch services
+Config.DisableScenarios			  = true  -- Disable Scenarios
 Config.DisableWeaponWheel         = false -- Disables default weapon wheel
 Config.DisableAimAssist           = false -- disables AIM assist (mainly on controllers)
 Config.DisableVehicleSeatShuff	  = false -- Disables vehicle seat shuff

From 99c5940f8697d8d4f5260f9bb0399e31b2ebd637 Mon Sep 17 00:00:00 2001
From: Arctos2win <116841243+Arctos2win@users.noreply.github.com>
Date: Sun, 12 Mar 2023 00:40:00 +0100
Subject: [PATCH 54/70] Adding and changing dutch translations

---
 [core]/es_extended/locales/nl.lua        | 189 ++++++++++++-----------
 [core]/esx_identity/locales/nl.lua       |  15 +-
 [core]/esx_multicharacter/locales/nl.lua |  47 +++---
 [core]/skinchanger/locales/nl.lua        | 101 ++++++++++++
 4 files changed, 233 insertions(+), 119 deletions(-)
 create mode 100644 [core]/skinchanger/locales/nl.lua

diff --git a/[core]/es_extended/locales/nl.lua b/[core]/es_extended/locales/nl.lua
index bde39f806..044845e75 100644
--- a/[core]/es_extended/locales/nl.lua
+++ b/[core]/es_extended/locales/nl.lua
@@ -10,108 +10,114 @@ Locales['nl'] = {
     ['giveammo'] = 'Geef munitie',
     ['amountammo'] = 'Hoeveelheid munitie',
     ['noammo'] = 'Niet genoeg!',
-    ['gave_item'] = 'Geeft %sx %s aan %s',
-    ['received_item'] = 'Ontvangen %sx %s van %s',
-    ['gave_weapon'] = 'Geven %s aan %s',
-    ['gave_weapon_ammo'] = 'Geeft ~o~%sx %s voor %s aan %s',
-    ['gave_weapon_withammo'] = 'Geeft %s met ~o~%sx %s aan %s',
+    ['gave_item'] = '%sx %s gegeven aan %s',
+    ['received_item'] = '%sx %s ontvangen van %s',
+    ['gave_weapon'] = '%s gegeven aan %s',
+    ['gave_weapon_ammo'] = '~o~%sx %s gegeven voor een %s aan %s',
+    ['gave_weapon_withammo'] = '%s gegeven met ~o~%sx %s aan %s',
     ['gave_weapon_hasalready'] = '%s heeft al een %s',
-    ['gave_weapon_noweapon'] = '%s heeft geen wapen',
-    ['received_weapon'] = '%s gekregen van %s',
-    ['received_weapon_ammo'] = 'Ontvangen ~o~%sx %s voor uw %s van %s',
-    ['received_weapon_withammo'] = 'Ontvangen %s met ~o~%sx %s van %s',
-    ['received_weapon_hasalready'] = '%s heeft geprobeerd je een %s, te geven, maar je hebt dit wapen al',
-    ['received_weapon_noweapon'] = '%s heeft geprobeerd je munitie te geven voor een %s, maar je hebt dit wapen niet',
-    ['gave_account_money'] = 'Geef $%s (%s) aan %s',
-    ['received_account_money'] = 'Ontvangen $%s (%s) van %s',
+    ['gave_weapon_noweapon'] = '%s heeft dat wapen niet',
+    ['received_weapon'] = '%s ontvangen van %s',
+    ['received_weapon_ammo'] = '~o~%sx %s ontvangen voor je %s van %s',
+    ['received_weapon_withammo'] = '%s ontvangen met ~o~%sx %s van %s',
+    ['received_weapon_hasalready'] = '%s heeft geprobeerd je een %s te geven, maar je hebt dat wapen al.',
+    ['received_weapon_noweapon'] = '%s heeft geprobeerd je ammo te geven voor een %s, maar je hebt dit wapen niet',
+    ['gave_account_money'] = '€%s (%s) gegeven aan %s',
+    ['received_account_money'] = '€%s (%s) ontvangen van %s',
     ['amount_invalid'] = 'Ongeldige hoeveelheid',
     ['players_nearby'] = 'Geen spelers in de buurt',
     ['ex_inv_lim'] = 'Kan actie niet uitvoeren, overschrijdt max. gewicht van %s',
     ['imp_invalid_quantity'] = 'Kan actie niet uitvoeren, de hoeveelheid is ongeldig',
-    ['imp_invalid_amount'] = 'Kan actie niet uitvoeren, het bedrag is ongeldig',
-    ['threw_standard'] = 'Gooien %sx %s',
-    ['threw_account'] = 'Gooien $%s %s',
-    ['threw_weapon'] = 'Gooien %s',
-    ['threw_weapon_ammo'] = 'Gooien %s met ~o~%sx %s',
-    ['threw_weapon_already'] = 'Je hebt dit wapen al',
-    ['threw_cannot_pickup'] = 'Inventaris is vol, kan niet worden opgehaald!',
-    ['threw_pickup_prompt'] = 'Druk op E om op te halen',
+    ['imp_invalid_amount'] = 'Kan actie niet uitvoeren, het aantal is ongeldig',
+    ['threw_standard'] = '%sx %s weggegooid',
+    ['threw_account'] = '€%s %s weggegooid',
+    ['threw_weapon'] = '%s weggegooid',
+    ['threw_weapon_ammo'] = '%s met ~o~%sx %s weggegooid',
+    ['threw_weapon_already'] = 'Je hebt dit wapen al !',
+    ['threw_cannot_pickup'] = 'Inventoraris is vol, Kan niet oppakken!',
+    ['threw_pickup_prompt'] = 'Druk op E om op te pakken',
   
     -- Key mapping
-    ['keymap_showinventory'] = 'Toon inventaris',
+    ['keymap_showinventory'] = 'Laat inventaris zien',
   
     -- Salary related
-    ['received_salary'] = 'U bent betaald: $%s',
-    ['received_help'] = 'U heeft uw bijstandsuitkering ontvangen: $%s',
-    ['company_nomoney'] = 'het bedrijf waar u werkt is te arm om uw salaris uit te betalen',
+    ['received_salary'] = 'Je bent betaald: €%s',
+    ['received_help'] = 'Je hebt je uitkering gekregen: €%s',
+    ['company_nomoney'] = 'Het bedrijf waar je bij werkt heeft te weinig geld om je uit te betalen.',
     ['received_paycheck'] = 'salaris ontvangen',
-    ['bank'] = 'Doolhofbank',
+    ['bank'] = 'Maze Bank',
     ['account_bank'] = 'Bank',
     ['account_black_money'] = 'Zwart geld',
-    ['account_money'] = 'Geld',
+    ['account_money'] = 'Cash',
   
     ['act_imp'] = 'Kan actie niet uitvoeren',
-    ['in_vehicle'] = 'Kan actie niet uitvoeren, speler zit in voertuig',
+    ['in_vehicle'] = 'Kan actie niet uitvoeren, de speler zit in een voertuig.',
   
     -- Commands
-    ['command_bring'] = 'Breng speler naar je toe',
+    ['command_bring'] = 'Breng speler naar jou',
     ['command_car'] = 'Spawn een voertuig',
-    ['command_car_car'] = 'Voertuigmodel of hash',
-    ['command_cardel'] = 'Verwijder voertuigen in de buurt',
-    ['command_cardel_radius'] = 'Verwijdert alle voertuigen binnen de opgegeven straal',
-    ['command_clear'] = 'Chattekst wissen',
-    ['command_clearall'] = 'Clear chattekst voor alle spelers',
-    ['command_clearinventory'] = 'Verwijder alle items uit de spelersinventaris',
-    ['command_clearloadout'] = 'Verwijder alle wapens uit de spelersuitrusting',
-    ['command_freeze'] = 'Bevries een speler',
-    ['command_unfreeze'] = 'Bevries een speler',
-    ['command_giveaccountmoney'] = 'Geef geld aan een gespecificeerde rekening',
+    ['command_car_car'] = 'Voertuig model of hash',
+    ['command_cardel'] = 'Verwijder voertuigen in straal',
+    ['command_cardel_radius'] = 'Verwijderd alle voertuigen in gewenste straal',
+    ['command_clear'] = 'Verwijder chat berichten',
+    ['command_clearall'] = 'Verwijder chat berichten voor alle spelers',
+    ['command_clearinventory'] = 'Verwijder alle items van een speler zijn inventory',
+    ['command_clearloadout'] = 'Verwijder alle wapens die een speler heeft',
+    ['command_freeze'] = 'Freeze een speler',
+    ['command_unfreeze'] = 'Unfreeze een speler',
+    ['command_giveaccountmoney'] = 'Geef geld aan een rekening',
     ['command_giveaccountmoney_account'] = 'Account om aan toe te voegen',
-    ['command_giveaccountmoney_amount'] = 'Toe te voegen bedrag',
-    ['command_giveaccountmoney_invalid'] = 'Accountnaam ongeldig',
-    ['command_giveitem'] = 'Geef de speler een item',
-    ['command_giveitem_item'] = 'Artikelnaam',
-    ['command_giveitem_count'] = 'Aantal',
-    ['command_giveweapon'] = 'Geef speler een wapen',
-    ['command_giveweapon_weapon'] = 'Wapennaam',
-    ['command_giveweapon_ammo'] = 'Hoeveelheid munitie',
+    ['command_giveaccountmoney_amount'] = 'Bedrag om toe te voegen',
+    ['command_giveaccountmoney_invalid'] = 'Account Naam ongeldig',
+    ['command_giveitem'] = 'Geef speler een item',
+    ['command_giveitem_item'] = 'Item naam',
+    ['command_giveitem_count'] = 'Hoeveelheid',
+    ['command_giveweapon'] = 'Geef de speler een wapen',
+    ['command_giveweapon_weapon'] = 'Wapen naam',
+    ['command_giveweapon_ammo'] = 'Ammo Hoeveelheid',
     ['command_giveweapon_hasalready'] = 'Speler heeft dit wapen al',
-    ['command_giveweaponcomponent'] = 'Geef wapencomponent aan speler',
-    ['command_giveweaponcomponent_component'] = 'Componentnaam',
-    ['command_giveweaponcomponent_invalid'] = 'Ongeldige wapencomponent',
-    ['command_giveweaponcomponent_hasalready'] = 'Speler heeft deze wapencomponent al',
-    ['command_giveweaponcomponent_missingweapon'] = 'Speler heeft dit wapen niet',
+    ['command_giveweaponcomponent'] = 'Geef wapen component aan speler',
+    ['command_giveweaponcomponent_component'] = 'Component naam',
+    ['command_giveweaponcomponent_invalid'] = 'Ongeldig wapen component',
+    ['command_giveweaponcomponent_hasalready'] = 'De speler heeft dit wapen component al',
+    ['command_giveweaponcomponent_missingweapon'] = 'De speler heeft dit wapen niet',
     ['command_goto'] = 'Teleporteer jezelf naar een speler',
-    ['command_kill'] = 'Dood een speler',
-    ['command_save'] = 'Geforceerd opslaan van spelersgegevens',
-    ['command_saveall'] = 'Forceer alle spelersgegevens opslaan',
-    ['command_setaccountmoney'] = 'Stel het geld in op een gespecificeerde rekening',
-    ['command_setaccountmoney_amount'] = 'Bedrag',
-    ['command_setcoords'] = 'Teleporteer naar opgegeven coördinaten',
-    ['command_setcoords_x'] = 'X-waarde',
-    ['command_setcoords_y'] = 'Y-waarde',
-    ['command_setcoords_z'] = 'Z-waarde',
-    ['command_setjob'] = 'Stel de taak van een speler in',
+    ['command_kill'] = 'Vermoord een speler',
+    ['command_save'] = 'Slaag een speler zijn spelerdata geforceerd op',
+    ['command_saveall'] = 'Slaag iedereen zijn spelerdata geforceerd op',
+    ['command_setaccountmoney'] = 'Stel geld in op een account',
+    ['command_setaccountmoney_amount'] = 'Amount',
+    ['command_setcoords'] = 'Telepeer naar coordinaten',
+    ['command_setcoords_x'] = 'X waarde',
+    ['command_setcoords_y'] = 'Y waarde',
+    ['command_setcoords_z'] = 'Z waarde',
+    ['command_setjob'] = 'Zet een speler zijn / haar job',
     ['command_setjob_job'] = 'Naam',
-    ['command_setjob_grade'] = 'Functiecijfer',
-    ['command_setjob_invalid'] = 'de baan, het cijfer of beide zijn ongeldig',
+    ['command_setjob_grade'] = 'Job grade',
+    ['command_setjob_invalid'] = 'De job, grade of beide zijn ongeldig',
     ['command_setgroup'] = 'Stel een toestemmingsgroep voor spelers in',
     ['command_setgroup_group'] = 'Naam van groep',
     ['commanderror_argumentmismatch'] = 'Ongeldig aantal argumenten (geslaagd %s, gezocht %s)',
     ['commanderror_argumentmismatch_number'] = 'Ongeldig argument #%s gegevenstype (doorgegeven string, gewenst nummer)',
     ['commanderror_invaliditem'] = 'Ongeldig item',
     ['commanderror_invalidweapon'] = 'Ongeldig wapen',
-    ['commanderror_console'] = 'Opdracht kan niet worden uitgevoerd vanaf console',
-    ['commanderror_invalidcommand'] = 'Ongeldige opdracht - /%s',
+    ['commanderror_console'] = 'Command kan niet worden uitgevoerd vanaf console.',
+    ['commanderror_invalidcommand'] = 'Ongeldig commando - /%s',
     ['commanderror_invalidplayerid'] = 'Opgegeven speler is niet online',
-    ['commandgeneric_playerid'] = 'Server-ID van de speler',
-    ['command_giveammo_noweapon_found'] = '%s does not have that weapon',
-    ['command_giveammo_weapon'] = 'Weapon name',
-    ['command_giveammo_ammo'] = 'Ammo Quantity',
+    ['commandgeneric_playerid'] = 'Speler server id',
+    ['command_giveammo_noweapon_found'] = '%s heeft dat wapen niet',
+    ['command_giveammo_weapon'] = 'Wapen naam',
+    ['command_giveammo_ammo'] = 'Ammo Hoeveelheid',
+    ['tpm_nowaypoint'] = 'Geen waypoint gezet.',
+    ['tpm_success'] = 'Successvol geteleporteerd',
+  
+    ['noclip_message'] = 'Noclip is %s',
+    ['enabled'] = '~g~aangezet~s~',
+    ['disabled'] = '~r~uitgezet~s~',
   
     -- Locale settings
     ['locale_digit_grouping_symbol'] = ',',
-    ['locale_currency'] = '£%s',
+    ['locale_currency'] = '€%s',
   
     -- Weapons
   
@@ -170,8 +176,8 @@ Locales['nl'] = {
     -- SMG & LMG
     ['weapon_assaultsmg'] = 'Aanval SMG',
     ['weapon_combatmg'] = 'Gevecht MG',
-    ['weapon_combatmg_mk2'] = 'Vecht tegen MG MK2',
-    ['weapon_combatpdw'] = 'Vecht tegen PDW',
+    ['weapon_combatmg_mk2'] = 'Combat MG MK2',
+    ['weapon_combatpdw'] = 'Combat PDW',
     ['weapon_gusenberg'] = 'Gusenberg-veger',
     ['weapon_machinepistol'] = 'Machinepistool',
     ['weapon_mg'] = 'MG',
@@ -211,6 +217,11 @@ Locales['nl'] = {
     ['weapon_rpg'] = 'Raketwerper',
     ['weapon_rayminigun'] = 'Weduwemaker',
   
+    -- Criminal Enterprises DLC
+    ['weapon_metaldetector'] = 'Metaal Detector',
+    ['weapon_precisionrifle'] = 'Precisiegeweer',
+    ['weapon_tactilerifle'] = 'Service Carbine',
+  
     -- Thrown
     ['weapon_ball'] = 'Honkbal',
     ['weapon_bzgas'] = 'BZ-gas',
@@ -278,10 +289,10 @@ Locales['nl'] = {
     ['component_camo_slide_finish10'] = 'boom Slide camouflage',
     ['component_camo_slide_finish11'] = 'patriottische diacamouflage',
   
-    ['component_clip_default'] = 'standaard tijdschrift',
-    ['component_clip_extended'] = 'uitgebreid tijdschrift',
-    ['component_clip_drum'] = 'drummagazine',
-    ['component_clip_box'] = 'doos Tijdschrift',
+    ['component_clip_default'] = 'standaard magazijn',
+    ['component_clip_extended'] = 'uitgebreid magazijn',
+    ['component_clip_drum'] = 'drum magazijn',
+    ['component_clip_box'] = 'box magazijn',
   
     ['component_scope_holo'] = 'holografisch bereik',
     ['component_scope_small'] = 'klein bereik',
@@ -306,8 +317,8 @@ Locales['nl'] = {
     ['component_flashlight'] = 'zaklamp',
     ['component_grip'] = 'grip',
   
-    ['component_barrel_default'] = 'standaard vat',
-    ['component_barrel_heavy'] = 'zware vat',
+    ['component_barrel_default'] = 'standaard handvat',
+    ['component_barrel_heavy'] = 'zware handvat',
   
     ['component_ammo_tracer'] = 'tracermunitie',
     ['component_ammo_incendiary'] = 'brandgevaarlijke munitie',
@@ -324,21 +335,21 @@ Locales['nl'] = {
   
     -- Weapon Ammo
     ['ammo_rounds'] = 'ronde(n)',
-    ['ammo_shells'] = 'shell(s)',
+    ['ammo_shells'] = 'huls/(zen)',
     ['ammo_charge'] = 'charge',
     ['ammo_petrol'] = 'liters brandstof',
-    ['ammo_firework'] = 'vuurwerk(en)',
-    ['ammo_rockets'] = 'raket(en)',
+    ['ammo_firework'] = 'vuurwerkpijl(en)',
+    ['ammo_rockets'] = 'raket(ten)',
     ['ammo_grenadelauncher'] = 'granaat(en)',
     ['ammo_grenade'] = 'granaat(en)',
-    ['ammo_stickybomb'] = 'bom(en)',
-    ['ammo_pipebomb'] = 'bom(en)',
-    ['ammo_smokebomb'] = 'bom(en)',
+    ['ammo_stickybomb'] = 'bom(men)',
+    ['ammo_pipebomb'] = 'bom(men)',
+    ['ammo_smokebomb'] = 'bom(men)',
     ['ammo_molotov'] = 'cocktail(s)',
     ['ammo_proxmine'] = 'mijn(en)',
     ['ammo_bzgas'] = 'blik(ken)',
     ['ammo_ball'] = 'bal(len)',
-    ['ammo_snowball'] = 'sneeuwbal(pen)',
+    ['ammo_snowball'] = 'sneeuwbal(len)',
     ['ammo_flare'] = 'flare(s)',
     ['ammo_flaregun'] = 'flare(s)',
   
@@ -351,9 +362,5 @@ Locales['nl'] = {
     ['tint_lspd'] = 'blauwe huid',
     ['tint_orange'] = 'oranje huid',
     ['tint_platinum'] = 'platina huid',
-    
-    -- Duty related
-    ['stopped_duty'] = 'Je hebt je dienst stopgezet.',
-    ['started_duty'] = 'Je bent met je dienst begonnen.',
 }
-  
+  
\ No newline at end of file
diff --git a/[core]/esx_identity/locales/nl.lua b/[core]/esx_identity/locales/nl.lua
index baaad8b8c..de7fefe1b 100644
--- a/[core]/esx_identity/locales/nl.lua
+++ b/[core]/esx_identity/locales/nl.lua
@@ -1,4 +1,3 @@
-
 Locales['nl'] = {
   ['show_active_character'] = 'Actieve karakter laten zien',
   ['active_character'] = 'Actief karakter: %s',
@@ -13,12 +12,12 @@ Locales['nl'] = {
   ['debug_xPlayer_get_sex'] = 'Stuurt je Geslacht',
   ['debug_xPlayer_get_dob'] = 'Stuurt je Geboortedatum ',
   ['debug_xPlayer_get_height'] = 'Stuurt je lengte',
-  ['error_debug_xPlayer_get_first_name'] = 'Er was een probleem tijdens get verzamelen van je Voornaam.',
-  ['error_debug_xPlayer_get_last_name'] = 'Er was een probleem tijdens get verzamelen van je achternaam.',
-  ['error_debug_xPlayer_get_full_name'] = 'Er was een probleem tijdens get verzamelen van je volle naam.',
-  ['error_debug_xPlayer_get_sex'] = 'Er was een probleem tijdens get verzamelen van je Geslacht.',
-  ['error_debug_xPlayer_get_dob'] = 'Er was een probleem tijdens get verzamelen van je Geboortedatum.',
-  ['error_debug_xPlayer_get_height'] = 'Er was een probleem tijdens get verzamelen van je lengte.',
+  ['error_debug_xPlayer_get_first_name'] = 'Er was een probleem tijdens het ophalen van je Voornaam.',
+  ['error_debug_xPlayer_get_last_name'] = 'Er was een probleem tijdens het ophalen van je achternaam.',
+  ['error_debug_xPlayer_get_full_name'] = 'Er was een probleem tijdens het ophalen van je volle naam.',
+  ['error_debug_xPlayer_get_sex'] = 'Er was een probleem tijdens het ophalen van je Geslacht.',
+  ['error_debug_xPlayer_get_dob'] = 'Er was een probleem tijdens het ophalen van je Geboortedatum.',
+  ['error_debug_xPlayer_get_height'] = 'Er was een probleem tijdens het ophalen van je lengte.',
   ['return_debug_xPlayer_get_first_name'] = 'Voornaam: %s',
   ['return_debug_xPlayer_get_last_name'] = 'Achternaam: %s',
   ['return_debug_xPlayer_get_full_name'] = 'Naam: %s',
@@ -28,7 +27,7 @@ Locales['nl'] = {
   ['data_incorrect'] = 'Verkeerde data, probeer opnieuw.',
   ['invalid_format'] = 'Verkeerde volgorde, probeer opnieuw.',
   ['no_identifier'] = '[ESX Identity]\nEr was een probleem tijdens het laden van je karakter!\nError Code: identifier-missing\n\nDit komt omdat je identifier mist, contacteer het server beheer.',
-  ['missing_identity'] = '[ESX Identity]\nEr was een probleem tijdens het laden van je karakter!\nError Code: identity-missing\n\nHet lijkt erop dat je identiteit mist, reconnect naar de server.',
+  ['missing_identity'] = '[ESX Identity]\nEr was een probleem tijdens het laden van je karakter!\nError Code: identity-missing\n\nHet lijkt erop dat je identiteit mist, reconnect met de server.',
   ['deleted_identity'] = 'Karakter verwijderd, reconnect om een nieuwe te registreren.',
   ['already_registered'] = 'Je bent al geregistreerd.',
   ['invalid_firstname_format'] = 'Ongeldige Volgorde (Voornaam): Probeer het nog een keer.',
diff --git a/[core]/esx_multicharacter/locales/nl.lua b/[core]/esx_multicharacter/locales/nl.lua
index 8ccb6cd60..d45872c5b 100644
--- a/[core]/esx_multicharacter/locales/nl.lua
+++ b/[core]/esx_multicharacter/locales/nl.lua
@@ -1,26 +1,33 @@
 Locales["nl"] = {
 	["male"] = "Man",
 	["female"] = "Vrouw",
-	["delete_label"] = "Verwijder %s %s?",
-	["select_char"] = "Kies Karakter",
-	["select_char_description"] = "Select a character to play as.",
-	["create_char"] = "Creeër nieuw karakter",
-	["char_play"] = "Speel dit karakter",
-	["char_disabled"] = "Dit karakter is niet beschikbaar",
-	["char_delete"] = "Verwijder dit karakter",
-	["cancel"] = "Annuleer",
-	["confirm"] = "Bevestig",
-	["command_setslots"] = "Zet multicharacter aantal slots van een speler",
-	["command_remslots"] = "Verwijder multicharacter aantal slots van een speler",
-	["command_enablechar"] = "Zet een karakter van speler aan",
-	["command_disablechar"] = "Zet een karakter van speler uit",
-	["command_charslot"] = "Slot nummer van het karakter",
+	["select_char"] = "Selecteer Karakter",
+	["select_char_description"] = "Selecteer een karakter om mee te spelen.",
+	["create_char"] = "Maak karakter aan",
+	["char_play"] = "Speel",
+	["char_play_description"] = "Ga verder naar de stad.",
+	["char_disabled"] = "Uitgeschakeld",
+	["char_disabled_description"] = "Dit karakter is onbruikbaar.",
+	["char_delete"] = "Verwijder",
+	["char_delete_description"] = "Verwijder dit karakter (PERMANENT).",
+	["char_delete_confirmation"] = "Bevestig",
+	["char_delete_confirmation_description"] = "Ben je zeker dat je het geselecteerde karakter wilt verwijderen?",
+	["char_delete_yes_description"] = "Ja, ik ben zeker dat ik het karakter wil verwijderen",
+	["char_delete_no_description"] = "Nee, ga terug naar karakter opties",
+	["character"] = "Karakter: %s",
+	["return"] = "Ga terug",
+	["return_description"] = "Ga terug naar karakter selectie.",
+	["command_setslots"] = "Multicharacter hoeveelheid slots van een speler instellen",
+	["command_remslots"] = "Verwijder slotnummer van een speler",
+	["command_enablechar"] = "Een bepaald karakter van een speler inschakelen",
+	["command_disablechar"] = "Een bepaald karakter van een speler uitschakelen",
+	["command_charslot"] = "Slotnummer van het personage",
 	["command_identifier"] = "Speler identifier",
-	["command_slots"] = "# aantal slots",
-	["slotsadd"] = "Je hebt %s aantal slots bij %s toegevoegd",
-	["slotsedit"] = "Je hebt %s aantal slots bij %s aangepast",
-	["slotsrem"] = "Je hebt slots bij %s verwijderd",
-	["charenabled"] = "Je hebt karakter #%s van %s aangezet",
-	["chardisabled"] = "Je hebt karakter #%s van %s uitgezet",
+	["command_slots"] = "# van de slots",
+	["slotsadd"] = "Je hebt %s slots toegevoegd aan %s",
+	["slotsedit"] = "Je hebt %s slots gezet naar %s",
+	["slotsrem"] = "Je hebt slots verwijderd naar %s",
+	["charenabled"] = "Je hebt karakter #%s ingeschakeld van %s",
+	["chardisabled"] = "Je hebt karakter #%s uitgeschakeld van %s",
 	["charnotfound"] = "Karakter #%s van %s bestaat niet",
 }
diff --git a/[core]/skinchanger/locales/nl.lua b/[core]/skinchanger/locales/nl.lua
new file mode 100644
index 000000000..f9c6d528e
--- /dev/null
+++ b/[core]/skinchanger/locales/nl.lua
@@ -0,0 +1,101 @@
+Locales['nl'] = {
+    ['sex'] = 'geslacht',
+    ['mom'] = 'gezicht moeder',
+    ['dad'] = 'gezicht vader',
+    ['resemblance'] = 'gelijkenis',
+    ['skin_tone'] = 'huidskleur',
+    ['nose_1'] = 'neusbreedte',
+    ['nose_2'] = 'neuspiek hoogte',
+    ['nose_3'] = 'neuspiek lengte',
+    ['nose_4'] = 'neusbeen hoogte',
+    ['nose_5'] = 'neusbeen verlaging',
+    ['nose_6'] = 'neusbeen verdraaiing',
+    ['cheeks_1'] = 'jukbeenderen hoogte',
+    ['cheeks_2'] = 'jukbeenderen breedte',
+    ['cheeks_3'] = 'wangen breedte',
+    ['lip_fullness'] = 'lipvolheid',
+    ['jaw_bone_width'] = 'kaakbeen breedte',
+    ['jaw_bone_length'] = 'kaakbeen lengte',
+    ['chin_height'] = 'kin hoogte',
+    ['chin_length'] = 'kin lengte',
+    ['chin_width'] = 'kin breedte',
+    ['chin_hole'] = 'grootte van het kin-gat',
+    ['neck_thickness'] = 'nek dikte',
+    ['wrinkles'] = 'rimpels',
+    ['wrinkle_thickness'] = 'rimpels dikte',
+    ['beard_type'] = 'baard type',
+    ['beard_size'] = 'baard grootte',
+    ['beard_color_1'] = 'baard kleur 1',
+    ['beard_color_2'] = 'baard kleur 2',
+    ['hair_1'] = 'haar 1',
+    ['hair_2'] = 'haar 2',
+    ['hair_color_1'] = 'haar kleur 1',
+    ['hair_color_2'] = 'haar kleur 2',
+    ['eye_color'] = 'oogkleur',
+    ['eye_squint'] = 'oog scheelte',
+    ['eyebrow_type'] = 'wenkbrauw type',
+    ['eyebrow_size'] = 'wenkbrauw formaat',
+    ['eyebrow_color_1'] = 'wenkbrauw kleur 1',
+    ['eyebrow_color_2'] = 'wenkbrauw kleur 2',
+    ['eyebrow_depth'] = 'wenkbrauw diepte',
+    ['eyebrow_height'] = 'wenkbrauw hoogte',
+    ['makeup_type'] = 'makeup type',
+    ['makeup_thickness'] = 'makeup dikte',
+    ['makeup_color_1'] = 'makeup kleur 1',
+    ['makeup_color_2'] = 'makeup kleur 2',
+    ['lipstick_type'] = 'lippenstift type',
+    ['lipstick_thickness'] = 'lippenstift dikte',
+    ['lipstick_color_1'] = 'lippenstift kleur 1',
+    ['lipstick_color_2'] = 'lippenstift kleur 2',
+    ['ear_accessories'] = 'ooraccessoires',
+    ['ear_accessories_color'] = 'ooraccessoires kleur',
+    ['tshirt_1'] = 't-shirt 1',
+    ['tshirt_2'] = 't-shirt 2',
+    ['torso_1'] = 'vest 1',
+    ['torso_2'] = 'vest 2',
+    ['decals_1'] = 'stickers 1',
+    ['decals_2'] = 'stickers 2',
+    ['arms'] = 'armen',
+    ['arms_2'] = 'armen 2',
+    ['pants_1'] = 'broek 1',
+    ['pants_2'] = 'broek 2',
+    ['shoes_1'] = 'shoenen 1',
+    ['shoes_2'] = 'shoenen 2',
+    ['mask_1'] = 'masker 1',
+    ['mask_2'] = 'masker 2',
+    ['bproof_1'] = 'kogelvrij vest 1',
+    ['bproof_2'] = 'kogelvrij vest 2',
+    ['chain_1'] = 'ketting 1',
+    ['chain_2'] = 'ketting 2',
+    ['helmet_1'] = 'helm 1',
+    ['helmet_2'] = 'helm 2',
+    ['watches_1'] = 'horloge 1',
+    ['watches_2'] = 'horloge 2',
+    ['bracelets_1'] = 'armband(en) 1',
+    ['bracelets_2'] = 'armband(en) 2',
+    ['glasses_1'] = 'bril 1',
+    ['glasses_2'] = 'bril 2',
+    ['bag'] = 'rugzak',
+    ['bag_color'] = 'rugzak kleur',
+    ['blemishes'] = 'vlekken',
+    ['blemishes_size'] = 'vlekken dikte',
+    ['ageing'] = 'veroudering',
+    ['ageing_1'] = 'veroudering zichtbaarheid',
+    ['blush'] = 'blozen',
+    ['blush_1'] = 'blozen zichtbaarheid',
+    ['blush_color'] = 'blozen kleur',
+    ['complexion'] = 'gelaatskleur',
+    ['complexion_1'] = 'gelaatskleur 1',
+    ['sun'] = 'zon',
+    ['sun_1'] = 'zon dikte',
+    ['freckles'] = 'sproeten',
+    ['freckles_1'] = 'sproeten dikte',
+    ['chest_hair'] = 'borsthaar',
+    ['chest_hair_1'] = 'borsthaar dikte',
+    ['chest_color'] = 'borsthaar kleur',
+    ['bodyb'] = 'lichaamsvlekken',
+    ['bodyb_size'] = 'lichaamsvlekken zichtbaarheid',
+    ['bodyb_extra'] = 'lichaamsvlekken effect',
+    ['bodyb_extra_thickness'] = 'lichaamsvlekken effect zichtbaarheid',
+  }
+  
\ No newline at end of file

From 67150e20a626691510acf4cd0a12e45bd2a74af4 Mon Sep 17 00:00:00 2001
From: TheFantomas <117121911+TheFantomas@users.noreply.github.com>
Date: Sun, 12 Mar 2023 12:22:36 +0100
Subject: [PATCH 55/70] Default false

---
 [core]/es_extended/config.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/[core]/es_extended/config.lua b/[core]/es_extended/config.lua
index 8cc4dfd33..cb13fb33c 100644
--- a/[core]/es_extended/config.lua
+++ b/[core]/es_extended/config.lua
@@ -36,8 +36,8 @@ Config.DistanceGive 			= 4.0 -- Max distance when giving items, weapons etc.
 Config.DisableHealthRegeneration  = false -- Player will no longer regenerate health
 Config.DisableVehicleRewards      = false -- Disables Player Recieving weapons from vehicles
 Config.DisableNPCDrops            = false -- stops NPCs from dropping weapons on death
-Config.DisableDispatchServices	  = true  -- Disable Dispatch services
-Config.DisableScenarios			  = true  -- Disable Scenarios
+Config.DisableDispatchServices	  = false -- Disable Dispatch services
+Config.DisableScenarios			  = false -- Disable Scenarios
 Config.DisableWeaponWheel         = false -- Disables default weapon wheel
 Config.DisableAimAssist           = false -- disables AIM assist (mainly on controllers)
 Config.DisableVehicleSeatShuff	  = false -- Disables vehicle seat shuff

From f225a1c084661e68a8bf1a831e058e9f42911adf Mon Sep 17 00:00:00 2001
From: Arctos2win <116841243+Arctos2win@users.noreply.github.com>
Date: Sun, 12 Mar 2023 12:35:32 +0100
Subject: [PATCH 56/70] Update nl.lua

Removed the whitespace ( requested by Fantik )
changed some weapon tint
---
 [core]/es_extended/locales/nl.lua | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/[core]/es_extended/locales/nl.lua b/[core]/es_extended/locales/nl.lua
index 044845e75..86e8ed349 100644
--- a/[core]/es_extended/locales/nl.lua
+++ b/[core]/es_extended/locales/nl.lua
@@ -355,12 +355,11 @@ Locales['nl'] = {
   
     -- Weapon Tints
     ['tint_default'] = 'standaard skin',
-    ['tint_green'] = 'groene huid',
-    ['tint_gold'] = 'gouden huid',
-    ['tint_pink'] = 'roze huid',
-    ['tint_army'] = 'legerhuid',
-    ['tint_lspd'] = 'blauwe huid',
-    ['tint_orange'] = 'oranje huid',
-    ['tint_platinum'] = 'platina huid',
+    ['tint_green'] = 'groene skin',
+    ['tint_gold'] = 'goude skin',
+    ['tint_pink'] = 'roze skin',
+    ['tint_army'] = 'legerprint',
+    ['tint_lspd'] = 'blauwe skin',
+    ['tint_orange'] = 'oranje skin',
+    ['tint_platinum'] = 'platina skin',
 }
-  
\ No newline at end of file

From e9d99f9e361ed559d99cff5095c97ee5c2bb0340 Mon Sep 17 00:00:00 2001
From: Arctos2win <116841243+Arctos2win@users.noreply.github.com>
Date: Sun, 12 Mar 2023 13:19:33 +0100
Subject: [PATCH 57/70] Removed empty line ( request from Fantik )

.
---
 [core]/skinchanger/locales/nl.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/[core]/skinchanger/locales/nl.lua b/[core]/skinchanger/locales/nl.lua
index f9c6d528e..731b7e79d 100644
--- a/[core]/skinchanger/locales/nl.lua
+++ b/[core]/skinchanger/locales/nl.lua
@@ -98,4 +98,3 @@ Locales['nl'] = {
     ['bodyb_extra'] = 'lichaamsvlekken effect',
     ['bodyb_extra_thickness'] = 'lichaamsvlekken effect zichtbaarheid',
   }
-  
\ No newline at end of file

From a00183deba6a7432ee3898f5dcf665082fa32b93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=20Gerg=C5=91?= <paldi95@gmail.com>
Date: Sun, 12 Mar 2023 18:32:56 +0100
Subject: [PATCH 58/70] Refactor: Metadata. meta to metadata

---
 [SQL]/legacy.sql                             |  2 +-
 [core]/es_extended/es_extended.sql           |  2 +-
 [core]/es_extended/server/classes/player.lua | 38 ++++++++++----------
 [core]/es_extended/server/functions.lua      |  4 +--
 [core]/es_extended/server/main.lua           | 18 +++++-----
 5 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/[SQL]/legacy.sql b/[SQL]/legacy.sql
index b081b38d9..18f4481b3 100644
--- a/[SQL]/legacy.sql
+++ b/[SQL]/legacy.sql
@@ -389,7 +389,7 @@ CREATE TABLE `users` (
   `job` varchar(20) DEFAULT 'unemployed',
   `job_grade` int(11) DEFAULT 0,
   `loadout` longtext DEFAULT NULL,
-  `meta` LONGTEXT NULL DEFAULT NULL,
+  `metadata` LONGTEXT NULL DEFAULT NULL,
   `position` longtext NULL DEFAULT NULL,
   `firstname` varchar(16) DEFAULT NULL,
   `lastname` varchar(16) DEFAULT NULL,
diff --git a/[core]/es_extended/es_extended.sql b/[core]/es_extended/es_extended.sql
index 91ffd2259..c3ef1d54e 100644
--- a/[core]/es_extended/es_extended.sql
+++ b/[core]/es_extended/es_extended.sql
@@ -15,7 +15,7 @@ CREATE TABLE `users` (
 	`job` VARCHAR(20) NULL DEFAULT 'unemployed',
 	`job_grade` INT NULL DEFAULT 0,
 	`loadout` LONGTEXT NULL DEFAULT NULL,
-	`meta` LONGTEXT NULL DEFAULT NULL,
+	`metadata` LONGTEXT NULL DEFAULT NULL,
 	`position` longtext NULL DEFAULT NULL,
 
 	PRIMARY KEY (`identifier`)
diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua
index 738c96d17..333054c97 100644
--- a/[core]/es_extended/server/classes/player.lua
+++ b/[core]/es_extended/server/classes/player.lua
@@ -4,7 +4,7 @@ local DoesEntityExist = DoesEntityExist
 local GetEntityCoords = GetEntityCoords
 local GetEntityHeading = GetEntityHeading
 
-function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, weight, job, loadout, name, coords, meta)
+function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, weight, job, loadout, name, coords, metadata)
 	local targetOverrides = Config.PlayerFunctionOverride and Core.PlayerFunctionOverrides[Config.PlayerFunctionOverride] or {}
 	
 	local self = {}
@@ -22,7 +22,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 	self.variables = {}
 	self.weight = weight
 	self.maxWeight = Config.MaxWeight
-	self.meta = meta
+	self.metadata = metadata
 	if Config.Multichar then self.license = 'license'.. identifier:sub(identifier:find(':'), identifier:len()) else self.license = 'license:'..identifier end
 
 	ExecuteCommand(('add_principal identifier.%s group.%s'):format(self.license, self.group))
@@ -33,7 +33,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 	stateBag:set("job", self.job, true)
 	stateBag:set("group", self.group, true)
 	stateBag:set("name", self.name, true)
-	stateBag:set("meta", self.meta, true)
+	stateBag:set("metadata", self.metadata, true)
 
 	function self.triggerEvent(eventName, ...)
 		TriggerClientEvent(eventName, self.source, ...)
@@ -586,14 +586,14 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 				return print("[^1ERROR^7] xPlayer.getMeta ^5index^7 should be ^5string^7!")
 			end
 
-			if self.meta[index] then
+			if self.metadata[index] then
 
-				if subIndex and type(self.meta[index]) == "table" then
+				if subIndex and type(self.metadata[index]) == "table" then
 					local _type = type(subIndex)
 
 					if _type == "string" then
-						if self.meta[index][subIndex] then
-							return self.meta[index][subIndex]
+						if self.metadata[index][subIndex] then
+							return self.metadata[index][subIndex]
 						end
 
 						return print(("[^1ERROR^7] xPlayer.getMeta ^5%s^7 not esxist on ^5%s^7!"):format(subIndex, index))
@@ -602,8 +602,8 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 					if _type == "table" then
 						local returnValues = {}
 						for i = 1, #subIndex do
-							if self.meta[index][subIndex[i]] then
-								returnValues[subIndex[i]] = self.meta[index][subIndex[i]]
+							if self.metadata[index][subIndex[i]] then
+								returnValues[subIndex[i]] = self.metadata[index][subIndex[i]]
 							else
 								print(("[^1ERROR^7] xPlayer.getMeta ^5%s^7 not esxist on ^5%s^7!"):format(subIndex[i], index))
 							end
@@ -614,14 +614,14 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 
 				end
 
-				return self.meta[index]
+				return self.metadata[index]
 			else
 				return print(("[^1ERROR^7] xPlayer.getMeta ^5%s^7 not exist!"):format(index))
 			end
 
 		end
 
-		return self.meta
+		return self.metadata
 	end
 
 	function self.setMeta(index, value, subValue)
@@ -645,19 +645,19 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 				return print(("[^1ERROR^7] xPlayer.setMeta ^5%s^7 should be ^5number^7 or ^5string^7 or ^5table^7!"):format(value))
 			end
 
-			self.meta[index] = value
+			self.metadata[index] = value
 		else
 
 			if _type ~= "string" then
 				return print(("[^1ERROR^7] xPlayer.setMeta ^5value^7 should be ^5string^7 as a subIndex!"):format(value))
 			end
 
-			self.meta[index][value] = subValue
+			self.metadata[index][value] = subValue
 		end
 
 
-		self.triggerEvent('esx:updatePlayerData', 'meta', self.meta)
-		Player(self.source).state:set('meta', self.meta, true)
+		self.triggerEvent('esx:updatePlayerData', 'metadata', self.metadata)
+		Player(self.source).state:set('metadata', self.metadata, true)
 	end
 
 	function self.clearMeta(index)
@@ -673,13 +673,13 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 			return
 		end
 
-		if not self.meta[index] then
+		if not self.metadata[index] then
 			return print(("[^1ERROR^7] xPlayer.clearMeta ^5%s^7 not exist!"):format(index))
 		end
 
-		self.meta[index] = nil
-		self.triggerEvent('esx:updatePlayerData', 'meta', self.meta)
-		Player(self.source).state:set('meta', self.meta, true)
+		self.metadata[index] = nil
+		self.triggerEvent('esx:updatePlayerData', 'metadata', self.metadata)
+		Player(self.source).state:set('metadata', self.metadata, true)
 	end
 
 	for fnName,fn in pairs(targetOverrides) do
diff --git a/[core]/es_extended/server/functions.lua b/[core]/es_extended/server/functions.lua
index 90bdd48e0..0de1476cd 100644
--- a/[core]/es_extended/server/functions.lua
+++ b/[core]/es_extended/server/functions.lua
@@ -157,7 +157,7 @@ function Core.SavePlayer(xPlayer, cb)
   }
 
   MySQL.prepare(
-    'UPDATE `users` SET `accounts` = ?, `job` = ?, `job_grade` = ?, `group` = ?, `position` = ?, `inventory` = ?, `loadout` = ?, `meta` = ? WHERE `identifier` = ?',
+    'UPDATE `users` SET `accounts` = ?, `job` = ?, `job_grade` = ?, `group` = ?, `position` = ?, `inventory` = ?, `loadout` = ?, `metadata` = ? WHERE `identifier` = ?',
     parameters,
     function(affectedRows)
       if affectedRows == 1 then
@@ -195,7 +195,7 @@ function Core.SavePlayers(cb)
   end
 
   MySQL.prepare(
-    "UPDATE `users` SET `accounts` = ?, `job` = ?, `job_grade` = ?, `group` = ?, `position` = ?, `inventory` = ?, `loadout` = ?, `meta` = ? WHERE `identifier` = ?",
+    "UPDATE `users` SET `accounts` = ?, `job` = ?, `job_grade` = ?, `group` = ?, `position` = ?, `inventory` = ?, `loadout` = ?, `metadata` = ? WHERE `identifier` = ?",
     parameters, 
     function(results)
       if not results then
diff --git a/[core]/es_extended/server/main.lua b/[core]/es_extended/server/main.lua
index 6512c9209..892b5a5ef 100644
--- a/[core]/es_extended/server/main.lua
+++ b/[core]/es_extended/server/main.lua
@@ -3,7 +3,7 @@ SetGameType('ESX Legacy')
 
 local oneSyncState = GetConvar('onesync', 'off')
 local newPlayer = 'INSERT INTO `users` SET `accounts` = ?, `identifier` = ?, `group` = ?'
-local loadPlayer = 'SELECT `accounts`, `job`, `job_grade`, `group`, `position`, `inventory`, `skin`, `loadout`, `meta`'
+local loadPlayer = 'SELECT `accounts`, `job`, `job_grade`, `group`, `position`, `inventory`, `skin`, `loadout`, `metadata`'
 
 if Config.Multichar then
   newPlayer = newPlayer .. ', `firstname` = ?, `lastname` = ?, `dateofbirth` = ?, `sex` = ?, `height` = ?'
@@ -121,7 +121,7 @@ if not Config.Multichar then
 end
 
 function loadESXPlayer(identifier, playerId, isNew)
-  local userData = {accounts = {}, inventory = {}, job = {}, loadout = {}, playerName = GetPlayerName(playerId), weight = 0, meta = {}}
+  local userData = {accounts = {}, inventory = {}, job = {}, loadout = {}, playerName = GetPlayerName(playerId), weight = 0, metadata = {}}
   local result = MySQL.prepare.await(loadPlayer, {identifier})
   local job, grade, jobObject, gradeObject = result.job, tostring(result.job_grade)
   local foundAccounts, foundItems = {}, {}
@@ -280,13 +280,13 @@ function loadESXPlayer(identifier, playerId, isNew)
     end
   end
 
-  if result.meta and result.meta ~= '' then
-    local meta = json.decode(result.meta)
-    userData.meta = meta
+  if result.metadata and result.metadata ~= '' then
+    local metadata = json.decode(result.metadata)
+    userData.metadata = metadata
   end
 
   local xPlayer = CreateExtendedPlayer(playerId, identifier, userData.group, userData.accounts, userData.inventory, userData.weight, userData.job,
-    userData.loadout, userData.playerName, userData.coords, userData.meta)
+    userData.loadout, userData.playerName, userData.coords, userData.metadata)
   ESX.Players[playerId] = xPlayer
   Core.playersByIdentifier[identifier] = xPlayer
 
@@ -322,7 +322,7 @@ function loadESXPlayer(identifier, playerId, isNew)
       dateofbirth = xPlayer.get("dateofbirth") or "01/01/2000",
       height = xPlayer.get("height") or 120,
       dead = false,
-      meta = xPlayer.getMeta()
+      metadata = xPlayer.getMeta()
     }, isNew,
     userData.skin)
 
@@ -594,7 +594,7 @@ ESX.RegisterServerCallback('esx:getPlayerData', function(source, cb)
   local xPlayer = ESX.GetPlayerFromId(source)
 
   cb({identifier = xPlayer.identifier, accounts = xPlayer.getAccounts(), inventory = xPlayer.getInventory(), job = xPlayer.getJob(),
-      loadout = xPlayer.getLoadout(), money = xPlayer.getMoney(), position = xPlayer.getCoords(true), meta = xPlayer.getMeta()})
+      loadout = xPlayer.getLoadout(), money = xPlayer.getMoney(), position = xPlayer.getCoords(true), metadata = xPlayer.getMeta()})
 end)
 
 ESX.RegisterServerCallback('esx:isUserAdmin', function(source, cb)
@@ -609,7 +609,7 @@ ESX.RegisterServerCallback('esx:getOtherPlayerData', function(source, cb, target
   local xPlayer = ESX.GetPlayerFromId(target)
 
   cb({identifier = xPlayer.identifier, accounts = xPlayer.getAccounts(), inventory = xPlayer.getInventory(), job = xPlayer.getJob(),
-      loadout = xPlayer.getLoadout(), money = xPlayer.getMoney(), position = xPlayer.getCoords(true), meta = xPlayer.getMeta()})
+      loadout = xPlayer.getLoadout(), money = xPlayer.getMoney(), position = xPlayer.getCoords(true), metadata = xPlayer.getMeta()})
 end)
 
 ESX.RegisterServerCallback('esx:getPlayerNames', function(source, cb, players)

From 02d496fa6a377f6b526ba37afb1552281da821e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=20Gerg=C5=91?= <paldi95@gmail.com>
Date: Sun, 12 Mar 2023 18:39:07 +0100
Subject: [PATCH 59/70] Remove print

---
 [core]/es_extended/server/classes/player.lua | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua
index 333054c97..e07884249 100644
--- a/[core]/es_extended/server/classes/player.lua
+++ b/[core]/es_extended/server/classes/player.lua
@@ -595,8 +595,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 						if self.metadata[index][subIndex] then
 							return self.metadata[index][subIndex]
 						end
-
-						return print(("[^1ERROR^7] xPlayer.getMeta ^5%s^7 not esxist on ^5%s^7!"):format(subIndex, index))
+						return
 					end
 
 					if _type == "table" then

From e234a898524d4745d88de58ecd7111080cbc765b Mon Sep 17 00:00:00 2001
From: Arctos2win <116841243+Arctos2win@users.noreply.github.com>
Date: Sun, 12 Mar 2023 18:45:26 +0100
Subject: [PATCH 60/70] Create nl.js

.
---
 [core]/esx_multicharacter/html/locales/nl.js | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 [core]/esx_multicharacter/html/locales/nl.js

diff --git a/[core]/esx_multicharacter/html/locales/nl.js b/[core]/esx_multicharacter/html/locales/nl.js
new file mode 100644
index 000000000..44c59000f
--- /dev/null
+++ b/[core]/esx_multicharacter/html/locales/nl.js
@@ -0,0 +1,8 @@
+const translate = new Object();
+
+translate.name = "Naam";
+translate.job = "Job";
+translate.bank = "Bank";
+translate.money = "Cash";
+translate.gender = "Gender";
+translate.dob = "Geboortedatum";

From 1d1c154380567d746ee41cd91a7e7f03f25b55e8 Mon Sep 17 00:00:00 2001
From: Ray <88249929+ChrissisCodeXD@users.noreply.github.com>
Date: Tue, 14 Mar 2023 06:36:37 +0100
Subject: [PATCH 61/70] =?UTF-8?q?Update=20de.lua=20-=20=E5=A4=89=E6=85=8B#?=
 =?UTF-8?q?9999?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changed the translation for the default clip and extended clipddddddd
---
 [core]/es_extended/locales/de.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/[core]/es_extended/locales/de.lua b/[core]/es_extended/locales/de.lua
index 1401ce14c..9a6ea35c8 100644
--- a/[core]/es_extended/locales/de.lua
+++ b/[core]/es_extended/locales/de.lua
@@ -185,8 +185,8 @@ Locales['de'] = {
   ['weapon_doubleaction'] = 'double-Action Revolver',
 
   -- Weapon Components
-  ['component_clip_default'] = 'standart Griff',
-  ['component_clip_extended'] = 'erweiterter Griff',
+  ['component_clip_default'] = 'standart Magazin',
+  ['component_clip_extended'] = 'erweiterters Magazin',
   ['component_clip_drum'] = 'Trommelmagazin',
   ['component_clip_box'] = 'Kastenmagazin',
   ['component_flashlight'] = 'Taschenlampe',

From a7a3b77f05796e2ee10e0d453fdc39d7ca147ff1 Mon Sep 17 00:00:00 2001
From: Thekuca <63980591+Thekuca@users.noreply.github.com>
Date: Tue, 14 Mar 2023 11:24:19 +0100
Subject: [PATCH 62/70] refactor(cron/server/main): Micro change

---
 [core]/cron/server/main.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/[core]/cron/server/main.lua b/[core]/cron/server/main.lua
index 6dc7f8ed2..03d489b70 100644
--- a/[core]/cron/server/main.lua
+++ b/[core]/cron/server/main.lua
@@ -2,7 +2,7 @@ local Jobs = {}
 local LastTime = nil
 
 function RunAt(h, m, cb)
-	table.insert(Jobs, {
+	Jobs[#Jobs + 1] = {
 		h  = h,
 		m  = m,
 		cb = cb

From ddaf99f9a45afb1a75702990b80aff5e67d1601f Mon Sep 17 00:00:00 2001
From: TheFantomas <117121911+TheFantomas@users.noreply.github.com>
Date: Wed, 15 Mar 2023 15:43:55 +0100
Subject: [PATCH 63/70] fix(cron/server/main.lua): Fixed mistake....

---
 [core]/cron/server/main.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/[core]/cron/server/main.lua b/[core]/cron/server/main.lua
index 03d489b70..4228f0892 100644
--- a/[core]/cron/server/main.lua
+++ b/[core]/cron/server/main.lua
@@ -6,7 +6,7 @@ function RunAt(h, m, cb)
 		h  = h,
 		m  = m,
 		cb = cb
-	})
+	}
 end
 
 function GetTime()

From b8111e7b5cc42a786c1711706f65ad0c9c1629ec Mon Sep 17 00:00:00 2001
From: Mycroft <kaseyfitton@hotmail.co.uk>
Date: Thu, 16 Mar 2023 19:33:53 +0000
Subject: [PATCH 64/70] Tweak(esx_multicharacter): update Readme

it had the old UI as well as bad english.
---
 [core]/esx_multicharacter/readme.md | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/[core]/esx_multicharacter/readme.md b/[core]/esx_multicharacter/readme.md
index da200fb68..75e9cdf6c 100644
--- a/[core]/esx_multicharacter/readme.md
+++ b/[core]/esx_multicharacter/readme.md
@@ -1,13 +1,8 @@
-<h1 align='center'>[ESX] Multi-Character</a></h1><p align='center'><b><a href='https://discord.esx-framework.org/'>Discord</a> - <a href='https://esx-framework.org/'>Website</a> - <a href='https://docs.esx-framework.org/legacy/installation'>Documentation</a></b></h5>
+<h1 align='center'>[ESX] Multi-Character</a></h1><p align='center'><b><a href='https://discord.esx-framework.org/'>Discord</a> - <a href='https://esx-framework.org/'>Website</a> - <a href='https://documentation.esx-framework.org/'>Documentation</a></b></h5>
 
-A Simple, Easy to Use resource, that allows Players to have multiple Characters, which can be configured to All players with the `Config.Slots` or To each Player personally using the `setslots`, `remslots`, `enablechar` and `disablechar` Commands :)
+A Simplistic system, that allows Players to have multiple Characters, which can be customised for all player with `Config.Slots` or personally set a players character count using `setslots`, `remslots`, `enablechar` and `disablechar` Commands :)
 
-![Preview](https://i.imgur.com/iAlNnM8.png)
-
-## Relogging
-
-- Do not enable this setting if you do not intend to properly set up relog support
-- Requires the latest update for ESX Status (prevents multiple status ticks from running)
+![Preview](https://i.imgur.com/EAHImD0.png)
 
 ## Notes
 
@@ -16,14 +11,17 @@ A Simple, Easy to Use resource, that allows Players to have multiple Characters,
 
 ## Kashacters
 
-- This project is forked from the [kashacters multicharacter resource](https://github.com/FiveEYZ/esx_kashacter)
+- This project is forked from the [Kashacters resource](https://github.com/FiveEYZ/esx_kashacter)
 - Most of the code has been entirely rewritten
 - KASH has given permission for this resource to use his code and the addition of a license
 - The license obviously does not apply to previous versions and KASH has stated his resource is free to be used however
 
-## Notice
+<br>
+<table><tr><td><h4 align='center'>Legal Notices</h4></tr></td>
+<tr><td>
+Official Multi-Character system for ESX Legacy
 
-Copyright © 2023 [Linden](https://github.com/thelindat/), ESX-Framework (fournier Brice & Jérémie N'gadi) and KASH
+Copyright © 2022-2023 Linden, ESX-Framework and KASH
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -37,3 +35,4 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses>.
+</td></tr></table>

From c4530d89ac1bb3434c067583a7cc95a9508f667c Mon Sep 17 00:00:00 2001
From: TheFantomas <117121911+TheFantomas@users.noreply.github.com>
Date: Fri, 17 Mar 2023 23:03:00 +0100
Subject: [PATCH 65/70] revert "a80f5f952a87969237117957d5c38e62d4294f24"

It does not work as it should, it is impossible to set the value to false.

https://ctrlv.cz/shots/2023/03/17/WWLS.png
---
 [core]/es_extended/client/functions.lua | 6 ++++--
 [core]/esx_context/main.lua             | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[core]/es_extended/client/functions.lua b/[core]/es_extended/client/functions.lua
index b07c76101..901911380 100644
--- a/[core]/es_extended/client/functions.lua
+++ b/[core]/es_extended/client/functions.lua
@@ -357,7 +357,7 @@ function ESX.Game.Teleport(entity, coords, cb)
 end
 
 function ESX.Game.SpawnObject(object, coords, cb, networked)
-    networked = networked or true
+    networked = networked == nil and true or networked
     if networked then 
         ESX.TriggerServerCallback('esx:Onesync:SpawnObject', function(NetworkID)
             if cb then
@@ -405,7 +405,8 @@ end
 function ESX.Game.SpawnVehicle(vehicle, coords, heading, cb, networked)
     local model = type(vehicle) == 'number' and vehicle or joaat(vehicle)
     local vector = type(coords) == "vector3" and coords or vec(coords.x, coords.y, coords.z)
-    networked = networked or true
+    networked = networked == nil and true or networked
+
     local playerCoords = GetEntityCoords(ESX.PlayerData.ped)
     if not vector or not playerCoords then 
         return
@@ -415,6 +416,7 @@ function ESX.Game.SpawnVehicle(vehicle, coords, heading, cb, networked)
         local executingResource = GetInvokingResource() or "Unknown"
         return print(("[^1ERROR^7] Resource ^5%s^7 Tried to spawn vehicle on the client but the position is too far away (Out of onesync range)."):format(executing_resource))
     end
+
     CreateThread(function()
         ESX.Streaming.RequestModel(model)
 
diff --git a/[core]/esx_context/main.lua b/[core]/esx_context/main.lua
index b497de6d7..55bfad9c0 100644
--- a/[core]/esx_context/main.lua
+++ b/[core]/esx_context/main.lua
@@ -13,7 +13,7 @@ function Post(fn,...)
 end
 
 function Open(position,eles,onSelect,onClose,canClose)
-	local canClose = canClose or true
+	local canClose = canClose == nil and true or canClose
 	activeMenu = {
 		position = position,
 		eles = eles,

From 16bb15a8a9f3f37c866934e310e218e5495f0cb5 Mon Sep 17 00:00:00 2001
From: TheFantomas <117121911+TheFantomas@users.noreply.github.com>
Date: Sat, 18 Mar 2023 19:18:31 +0100
Subject: [PATCH 66/70] fix(es_extended/server/functions.lua): Added model
 argument to callback

---
 [core]/es_extended/server/functions.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/[core]/es_extended/server/functions.lua b/[core]/es_extended/server/functions.lua
index 0de1476cd..202e1b5ef 100644
--- a/[core]/es_extended/server/functions.lua
+++ b/[core]/es_extended/server/functions.lua
@@ -262,7 +262,7 @@ function ESX.GetVehicleType(model, player, cb)
   ESX.TriggerClientCallback(player, "esx:GetVehicleType", function(vehicleType)
     Core.vehicleTypesByModel[model] = vehicleType
     cb(vehicleType)
-  end)
+  end, model)
 end
 
 function ESX.DiscordLog(name, title, color, message)

From 16fb845ce3ee3832dffb8d9990d8e998149ce58a Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jean.baptiste.d06@gmail.com>
Date: Sun, 19 Mar 2023 00:07:58 +0100
Subject: [PATCH 67/70] Update readme.md

---
 readme.md | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/readme.md b/readme.md
index ec43d2de4..2fd01e414 100644
--- a/readme.md
+++ b/readme.md
@@ -1,12 +1,17 @@
-<h1 align='center'>ESX Legacy</a></h1>
-<p align='center'><b><a href='https://discord.esx-framework.org/'>Discord</a> - <a href='https://esx-framework.org/'>Website</a> - <a href='https://documentation.esx-framework.org/legacy/installation'>Documentation</a></b></h5>
 
-<p align='center'>Want More resources? You can browse the <a href="https://github.com/esx-community/">ESX Community Github</a> or <a href="https://forum.cfx.re/tag/esx">Cfx.re Releases board</a> for more!
+<p align="center">
+   <img src="https://esx.s3.fr-par.scw.cloud/logo_legacy.png" alt="[ESX legacy logo]"/>
+</p>
+
+
+<p align='center'><a href='https://discord.esx-framework.org/'>Discord</a> - <a href='https://esx-framework.org/'>Website</a> - <a href='https://documentation.esx-framework.org/legacy/installation'>Documentation</a></b></h5>
+
+<p align='center'>Want more resources? You can browse the <a href="https://github.com/esx-community/">ESX Community Github</a> or <a href="https://forum.cfx.re/tag/esx">Cfx.re Releases board</a> for more!
 <p align='center'><b>ESX is the leading framework, trusted By thousands of commmunitys for the heighest quality roleplay servers on FiveM</b></p>
 
 <hr>
 
-### Supporters
+### 💗 Supporters
 
 Interested in helping us? [Take a look at our patreon](https://www.patreon.com/esx "Take a look at our patreon")
 
@@ -18,16 +23,17 @@ Interested in helping us? [Take a look at our patreon](https://www.patreon.com/e
 | CONGRESS KW - Michael Hein - Smery sitbon - daZepelin - CMF Community |
 ------
 
-### License
+### 📌 License
 
 ESX-legacy - ESX framework for FiveM
 
-Copyright (C) 2015-2023 ESX-Framework
-
-This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
+    Copyright (C) 2015-2023 ESX-Framework
+    
+    This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
+    
+    This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details.
+    
+    You should have received a copy Of the GNU General Public License along with this program. If Not, see <http://www.gnu.org/licenses/>.
+---
 
-This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details.
-
-You should have received a copy Of the GNU General Public License along with this program. If Not, see <http://www.gnu.org/licenses/>.
-
-<hr>
+Powered by [Oxygenserv](https://www.oxygenserv.com/)

From 01087c3c5a7a67e65f10d2c7adfbe3a93aa518c3 Mon Sep 17 00:00:00 2001
From: TheFantomas <117121911+TheFantomas@users.noreply.github.com>
Date: Mon, 20 Mar 2023 16:20:01 +0100
Subject: [PATCH 68/70] refactor(es_extended): DisableSeatShuff move

---
 [core]/es_extended/client/main.lua            | 9 +++++++++
 [core]/es_extended/client/modules/actions.lua | 6 ------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua
index 70869de4e..0c851b5f9 100644
--- a/[core]/es_extended/client/main.lua
+++ b/[core]/es_extended/client/main.lua
@@ -75,6 +75,15 @@ AddEventHandler('esx:playerLoaded', function(xPlayer, isNew, skin)
 		end
 	end
 
+	if Config.DisableVehicleSeatShuff then
+		AddEventHandler('esx:enteredVehicle', function(vehicle, plate, seat)
+			if seat == 0 then
+				SetPedIntoVehicle(ESX.PlayerData.ped, vehicle, 0)
+				SetPedConfigFlag(ESX.PlayerData.ped, 184, true)
+			end	
+		end)
+	end
+
 	if Config.DisableHealthRegeneration or Config.DisableWeaponWheel or Config.DisableAimAssist or Config.DisableVehicleRewards then
 		CreateThread(function()
 			while true do
diff --git a/[core]/es_extended/client/modules/actions.lua b/[core]/es_extended/client/modules/actions.lua
index 4123c4859..95e141301 100644
--- a/[core]/es_extended/client/modules/actions.lua
+++ b/[core]/es_extended/client/modules/actions.lua
@@ -72,12 +72,6 @@ CreateThread(function()
                 current.displayName, current.netId = GetData(current.vehicle)
                 TriggerEvent('esx:enteredVehicle', current.vehicle, current.plate, current.seat, current.displayName, current.netId)
                 TriggerServerEvent('esx:enteredVehicle', current.plate, current.seat, current.displayName, current.netId)
-				if Config.DisableVehicleSeatShuff then
-					if current.seat == 0 then
-						SetPedIntoVehicle(playerPed, current.vehicle, 0)
-						SetPedConfigFlag(playerPed, 184, true)
-					end	
-				end
             end
         elseif isInVehicle then
             if not IsPedInAnyVehicle(playerPed, false) or IsPlayerDead(PlayerId()) then

From a94de13987a126314f49021cc798fb343a92f38a Mon Sep 17 00:00:00 2001
From: TheFantomas <117121911+TheFantomas@users.noreply.github.com>
Date: Mon, 20 Mar 2023 18:48:10 +0100
Subject: [PATCH 69/70] Revert "Update readme.md"

This reverts commit 16fb845ce3ee3832dffb8d9990d8e998149ce58a.
---
 readme.md | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/readme.md b/readme.md
index 2fd01e414..ec43d2de4 100644
--- a/readme.md
+++ b/readme.md
@@ -1,17 +1,12 @@
+<h1 align='center'>ESX Legacy</a></h1>
+<p align='center'><b><a href='https://discord.esx-framework.org/'>Discord</a> - <a href='https://esx-framework.org/'>Website</a> - <a href='https://documentation.esx-framework.org/legacy/installation'>Documentation</a></b></h5>
 
-<p align="center">
-   <img src="https://esx.s3.fr-par.scw.cloud/logo_legacy.png" alt="[ESX legacy logo]"/>
-</p>
-
-
-<p align='center'><a href='https://discord.esx-framework.org/'>Discord</a> - <a href='https://esx-framework.org/'>Website</a> - <a href='https://documentation.esx-framework.org/legacy/installation'>Documentation</a></b></h5>
-
-<p align='center'>Want more resources? You can browse the <a href="https://github.com/esx-community/">ESX Community Github</a> or <a href="https://forum.cfx.re/tag/esx">Cfx.re Releases board</a> for more!
+<p align='center'>Want More resources? You can browse the <a href="https://github.com/esx-community/">ESX Community Github</a> or <a href="https://forum.cfx.re/tag/esx">Cfx.re Releases board</a> for more!
 <p align='center'><b>ESX is the leading framework, trusted By thousands of commmunitys for the heighest quality roleplay servers on FiveM</b></p>
 
 <hr>
 
-### 💗 Supporters
+### Supporters
 
 Interested in helping us? [Take a look at our patreon](https://www.patreon.com/esx "Take a look at our patreon")
 
@@ -23,17 +18,16 @@ Interested in helping us? [Take a look at our patreon](https://www.patreon.com/e
 | CONGRESS KW - Michael Hein - Smery sitbon - daZepelin - CMF Community |
 ------
 
-### 📌 License
+### License
 
 ESX-legacy - ESX framework for FiveM
 
-    Copyright (C) 2015-2023 ESX-Framework
-    
-    This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
-    
-    This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details.
-    
-    You should have received a copy Of the GNU General Public License along with this program. If Not, see <http://www.gnu.org/licenses/>.
----
+Copyright (C) 2015-2023 ESX-Framework
+
+This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 
-Powered by [Oxygenserv](https://www.oxygenserv.com/)
+This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details.
+
+You should have received a copy Of the GNU General Public License along with this program. If Not, see <http://www.gnu.org/licenses/>.
+
+<hr>

From cdbe937c1819dfeab39c44c353abe31d51a916c6 Mon Sep 17 00:00:00 2001
From: TheFantomas <117121911+TheFantomas@users.noreply.github.com>
Date: Mon, 20 Mar 2023 18:53:53 +0100
Subject: [PATCH 70/70] Update readme.md

---
 readme.md | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/readme.md b/readme.md
index ec43d2de4..16609cf8c 100644
--- a/readme.md
+++ b/readme.md
@@ -1,12 +1,12 @@
 <h1 align='center'>ESX Legacy</a></h1>
-<p align='center'><b><a href='https://discord.esx-framework.org/'>Discord</a> - <a href='https://esx-framework.org/'>Website</a> - <a href='https://documentation.esx-framework.org/legacy/installation'>Documentation</a></b></h5>
+<p align='center'><a href='https://discord.esx-framework.org/'>Discord</a> - <a href='https://esx-framework.org/'>Website</a> - <a href='https://documentation.esx-framework.org/legacy/installation'>Documentation</a></b></h5>
 
-<p align='center'>Want More resources? You can browse the <a href="https://github.com/esx-community/">ESX Community Github</a> or <a href="https://forum.cfx.re/tag/esx">Cfx.re Releases board</a> for more!
+<p align='center'>Want more resources? You can browse the <a href="https://github.com/esx-community/">ESX Community Github</a> or <a href="https://forum.cfx.re/tag/esx">Cfx.re Releases board</a> for more!
 <p align='center'><b>ESX is the leading framework, trusted By thousands of commmunitys for the heighest quality roleplay servers on FiveM</b></p>
 
 <hr>
 
-### Supporters
+### 💗 Supporters
 
 Interested in helping us? [Take a look at our patreon](https://www.patreon.com/esx "Take a look at our patreon")
 
@@ -18,16 +18,17 @@ Interested in helping us? [Take a look at our patreon](https://www.patreon.com/e
 | CONGRESS KW - Michael Hein - Smery sitbon - daZepelin - CMF Community |
 ------
 
-### License
+### 📌 License
 
 ESX-legacy - ESX framework for FiveM
 
-Copyright (C) 2015-2023 ESX-Framework
+    Copyright (C) 2015-2023 ESX-Framework
 
-This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
+    This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 
-This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details.
+    This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details.
 
-You should have received a copy Of the GNU General Public License along with this program. If Not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy Of the GNU General Public License along with this program. If Not, see <http://www.gnu.org/licenses/>.
+---
 
-<hr>
+Powered by [Oxygenserv](https://www.oxygenserv.com/en/)