From f289e423400c4f48bf21f7d0a2cbb658dabe6a50 Mon Sep 17 00:00:00 2001
From: Mycroft <kaseyfitton@hotmail.co.uk>
Date: Sun, 18 Sep 2022 05:55:56 +0100
Subject: [PATCH] tweak(es_extended): better prints + esx:getSharedObject
 deprecation

https://docs.esx-framework.org/tutorials/sharedevent
---
 [esx]/es_extended/client/common.lua |  4 +++-
 [esx]/es_extended/server/common.lua |  2 ++
 [esx]/es_extended/server/main.lua   | 12 ++++++------
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/[esx]/es_extended/client/common.lua b/[esx]/es_extended/client/common.lua
index 8f12d0fd..c3fc1c36 100644
--- a/[esx]/es_extended/client/common.lua
+++ b/[esx]/es_extended/client/common.lua
@@ -1,5 +1,7 @@
 AddEventHandler('esx:getSharedObject', function(cb)
-	cb(ESX)
+  local Invoke = GetInvokingResource()
+  print(('[^3WARNING^7] ^5%s^7 used ^5esx:getSharedObject^7, this method is deprecated and should not be used! Refer to ^5https://docs.esx-framework.org/tutorials/sharedevent^7 for more info!'):format(Invoke))
+  cb(ESX)
 end)
 
 exports('getSharedObject', function()
diff --git a/[esx]/es_extended/server/common.lua b/[esx]/es_extended/server/common.lua
index 4a78d2cc..fb0b2cdd 100644
--- a/[esx]/es_extended/server/common.lua
+++ b/[esx]/es_extended/server/common.lua
@@ -13,6 +13,8 @@ Core.PickupId = 0
 Core.PlayerFunctionOverrides = {}
 
 AddEventHandler('esx:getSharedObject', function(cb)
+  local Invoke = GetInvokingResource()
+  print(('[^3WARNING^7] ^5%s^7 used ^5esx:getSharedObject^7, this method is deprecated and should not be used! Refer to ^5https://docs.esx-framework.org/tutorials/sharedevent^7 for more info!'):format(Invoke))
   cb(ESX)
 end)
 
diff --git a/[esx]/es_extended/server/main.lua b/[esx]/es_extended/server/main.lua
index 135cf5e0..16f2c26a 100644
--- a/[esx]/es_extended/server/main.lua
+++ b/[esx]/es_extended/server/main.lua
@@ -72,7 +72,7 @@ function createESXPlayer(identifier, playerId, data)
   end
 
   if Core.IsPlayerAdmin(playerId) then
-    print(('^2[INFO] ^0 Player ^5%s ^0Has been granted admin permissions via ^5Ace Perms.^7'):format(playerId))
+    print(('[^2INFO^0] Player ^5%s^0 Has been granted admin permissions via ^5Ace Perms^7.'):format(playerId))
     defaultGroup = "admin"
   else
     defaultGroup = "user"
@@ -145,7 +145,7 @@ function loadESXPlayer(identifier, playerId, isNew)
   if ESX.DoesJobExist(job, grade) then
     jobObject, gradeObject = ESX.Jobs[job], ESX.Jobs[job].grades[grade]
   else
-    print(('[^3WARNING^7] Ignoring invalid job for %s [job: %s, grade: %s]'):format(identifier, job, grade))
+    print(('[^3WARNING^7] Ignoring invalid job for ^5%s^7 [job: ^5%s^7, grade: ^5%s^7]'):format(identifier, job, grade))
     job, grade = 'unemployed', '0'
     jobObject, gradeObject = ESX.Jobs[job], ESX.Jobs[job].grades[grade]
   end
@@ -180,7 +180,7 @@ function loadESXPlayer(identifier, playerId, isNew)
         if item then
           foundItems[name] = count
         else
-          print(('[^3WARNING^7] Ignoring invalid item "%s" for "%s"'):format(name, identifier))
+          print(('[^3WARNING^7] Ignoring invalid item ^5"%s"^7 for ^5"%s^7"'):format(name, identifier))
         end
       end
     end
@@ -211,7 +211,7 @@ function loadESXPlayer(identifier, playerId, isNew)
   if result.group then
     if result.group == "superadmin" then
       userData.group = "admin"
-      print("[^3WARNING^7] Superadmin detected, setting group to admin")
+      print("[^3WARNING^7] ^5Superadmin^7 detected, setting group to ^5admin^7")
     else
       userData.group = result.group
     end
@@ -319,7 +319,7 @@ function loadESXPlayer(identifier, playerId, isNew)
   end
 
   xPlayer.triggerEvent('esx:registerSuggestions', Core.RegisteredCommands)
-  print(('[^2INFO^0] Player ^5"%s" ^0has connected to the server. ID: ^5%s^7'):format(xPlayer.getName(), playerId))
+  print(('[^2INFO^0] Player ^5"%s"^0 has connected to the server. ID: ^5%s^7'):format(xPlayer.getName(), playerId))
 end
 
 AddEventHandler('chatMessage', function(playerId, author, message)
@@ -386,7 +386,7 @@ if not Config.OxInventory then
     local targetXPlayer = ESX.GetPlayerFromId(target)
     local distance = #(GetEntityCoords(GetPlayerPed(playerId)) - GetEntityCoords(GetPlayerPed(target)))
     if not sourceXPlayer or not targetXPlayer or distance > Config.DistanceGive then
-      print("[WARNING] Player Detected Cheating: " .. GetPlayerName(playerId))
+      print("[^3WARNING^7] Player Detected Cheating: ^5" .. GetPlayerName(playerId) .. "^7")
       return
     end