From ce48aa26c9242e25eb362b078bb6721bf9e6d47e Mon Sep 17 00:00:00 2001
From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com>
Date: Fri, 15 May 2020 17:14:08 -0500
Subject: [PATCH 1/2] Update for es_extended

Merged Config option into normal code due to it not affecting any compatibility anywhere
---
 client/main.lua  |  9 ++++++++-
 config.lua       | 14 +-------------
 html/css/app.css |  1 +
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/client/main.lua b/client/main.lua
index 3f1e9c30..1ab413e2 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -71,12 +71,15 @@ AddEventHandler('esx:playerLoaded', function(playerData)
 		TriggerEvent('playerSpawned') -- compatibility with old scripts, will be removed soon
 		TriggerEvent('esx:restoreLoadout')
 
-		Citizen.Wait(3000)
+		Citizen.Wait(4000)
 		ShutdownLoadingScreen()
+		ShutdownLoadingScreenNui()
 		FreezeEntityPosition(PlayerPedId(), false)
 		DoScreenFadeIn(10000)
 		StartServerSyncLoops()
 	end)
+
+	TriggerEvent('esx:loadingScreenOff')
 end)
 
 RegisterNetEvent('esx:setMaxWeight')
@@ -379,6 +382,10 @@ if Config.EnableHud then
 			end
 		end
 	end)
+
+	AddEventHandler('esx:loadingScreenOff', function()
+		ESX.UI.HUD.SetDisplay(1.0)
+	end)
 end
 
 function StartServerSyncLoops()
diff --git a/config.lua b/config.lua
index 8f6134ff..8bf546f3 100644
--- a/config.lua
+++ b/config.lua
@@ -15,16 +15,4 @@ Config.MaxWeight            = 24   -- the max inventory weight without backpack
 Config.PaycheckInterval     = 7 * 60000 -- how often to recieve pay checks in milliseconds
 Config.EnableDebug          = false
 
-Config.IncompatibleResourcesToStop = {
-	['essentialmode'] = 'ES for short, the performance heavy RP framework no one uses - and source for the random unwanted ZAP ads you\'re seeing',
-	['es_admin2'] = 'Adminstration tool for the ancient ES framework that wont work with ESX',
-	['esplugin_mysql'] = 'MySQL "plugin" for the ancient ES framework that has a SQL injection vulnerability',
-	['es_ui'] = 'Money HUD for ES',
-	['spawnmanager'] = 'Default resource that takes care of spawning players, ESX does this already',
-	['mapmanager'] = 'Default resource that was required by spawnmanager, but neither are used',
-	['basic-gamemode'] = 'Resource that is solely for choosing the default game type',
-	['fivem'] = 'Resource that is solely for choosing the default game type',
-	['fivem-map-hipster'] = 'Default spawn locations for mapmanager',
-	['fivem-map-skater'] = 'Default spawn locations for mapmanager',
-	['baseevents'] = 'Default resource for handling death events, ESX does this already'
-}
+Config.IncompatibleResourcesToStop = {}
diff --git a/html/css/app.css b/html/css/app.css
index b487523f..7c4c63f1 100644
--- a/html/css/app.css
+++ b/html/css/app.css
@@ -13,6 +13,7 @@ html {
 }
 
 #hud {
+	opacity: 0.0;
 	position: absolute;
 	font-family: 'Pricedown';
 	font-size: 35px;

From 241b7f13461bab246134223d32024b7ee884439a Mon Sep 17 00:00:00 2001
From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com>
Date: Fri, 15 May 2020 17:16:31 -0500
Subject: [PATCH 2/2] Remove config option that wasn't used anymore

---
 config.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config.lua b/config.lua
index fce1b345..8bf546f3 100644
--- a/config.lua
+++ b/config.lua
@@ -14,6 +14,5 @@ Config.EnableHud            = true -- enable the default hud? Display current jo
 Config.MaxWeight            = 24   -- the max inventory weight without backpack
 Config.PaycheckInterval     = 7 * 60000 -- how often to recieve pay checks in milliseconds
 Config.EnableDebug          = false
-Config.UseESXIdentity       = false -- Enable support for ESX Identity features, and support for custom loading screens
 
 Config.IncompatibleResourcesToStop = {}