From a82f6269e9d51025f544479f4f69bb490f9e56eb Mon Sep 17 00:00:00 2001
From: ElPumpo <samo_kol@hotmail.com>
Date: Sat, 23 Jun 2018 10:51:25 +0200
Subject: [PATCH] Correct native names, readme cleanup

---
 README.md       | 46 +++++++++++++++++++++++++++++++++-------------
 __resource.lua  | 32 +++++++++++++++++---------------
 client/main.lua |  6 +++---
 3 files changed, 53 insertions(+), 31 deletions(-)

diff --git a/README.md b/README.md
index 152a18f6..c1882150 100644
--- a/README.md
+++ b/README.md
@@ -1,27 +1,47 @@
-# fxserver-esx_taxijob
-FXServer ESX Taxi Job
+# esx_taxijob
 
-[REQUIREMENTS]
+## Requirements
 
 * Auto mode
-  * esx_service => https://github.com/FXServer-ESX/fxserver-esx_service
+  * [esx_service](https://github.com/ESX-Org/esx_service)
   
 * Player management (billing and boss actions)
-  * esx_society => https://github.com/FXServer-ESX/fxserver-esx_society
-  * esx_billing => https://github.com/FXServer-ESX/fxserver-esx_billing
+  * [esx_society](https://github.com/ESX-Org/esx_society)
+  * [esx_billing](https://github.com/ESX-Org/esx_billing)
 
-[INSTALLATION]
+## Download & Installation
 
-1) CD in your resources/[esx] folder
-2) Clone the repository
+### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-git clone https://github.com/FXServer-ESX/fxserver-esx_taxijob esx_taxijob
+fvm install --save --folder=esx esx-org/esx_taxijob
 ```
-3) Import esx_taxijob.sql in your database
 
-4) Add this in your server.cfg :
+### Using Git
+```
+cd resources
+git clone https://github.com/ESX-Org/esx_taxijob [esx]/esx_taxijob
+```
 
+### Manually
+- Download https://github.com/ESX-Org/esx_taxijob/archive/master.zip
+- Put it in the `[esx]` directory
+
+## Installation
+- Import `esx_taxijob.sql` in your database
+- If you want player management you have to set `Config.EnablePlayerManagement` to `true` in `config.lua`
+- Add this to your `server.cfg`:
 ```
 start esx_taxijob
 ```
-5) If you want player management you have to set Config.EnablePlayerManagement to true in config.lua
+
+# Legal
+### License
+esx_taxijob
+
+Copyright (C) 2015-2018 Jérémie N'gadi
+
+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/.
diff --git a/__resource.lua b/__resource.lua
index 42e2d08b..8c52762a 100644
--- a/__resource.lua
+++ b/__resource.lua
@@ -2,24 +2,26 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937'
 
 description 'ESX Taxi Job'
 
-version '1.0.1'
+version '1.0.2'
 
 client_scripts {
-  '@es_extended/locale.lua',
-  'locales/de.lua',
-  'locales/br.lua',
-  'locales/en.lua',
-  'locales/fr.lua',
-  'config.lua',
-  'client/main.lua'
+	'@es_extended/locale.lua',
+	'locales/de.lua',
+	'locales/br.lua',
+	'locales/en.lua',
+	'locales/fr.lua',
+	'config.lua',
+	'client/main.lua'
 }
 
 server_scripts {
-  '@es_extended/locale.lua',
-  'locales/de.lua',
-  'locales/br.lua',
-  'locales/en.lua',
-  'locales/fr.lua',
-  'config.lua',
-  'server/main.lua'
+	'@es_extended/locale.lua',
+	'locales/de.lua',
+	'locales/br.lua',
+	'locales/en.lua',
+	'locales/fr.lua',
+	'config.lua',
+	'server/main.lua'
 }
+
+dependency 'es_extended'
\ No newline at end of file
diff --git a/client/main.lua b/client/main.lua
index b4406f17..b265ae91 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -50,11 +50,11 @@ end
 function ShowLoadingPromt(msg, time, type)
   Citizen.CreateThread(function()
     Citizen.Wait(0)
-    N_0xaba17d7ce615adbf("STRING")
+    BeginTextCommandBusyString("STRING")
     AddTextComponentString(msg)
-    N_0xbd12f8228410d9b4(type)
+    EndTextCommandBusyString(type)
     Citizen.Wait(time)
-    N_0x10d373323e5b9c0d()
+    RemoveLoadingPrompt()
   end)
 end