Merge pull request #6 from GoatG33k/master

v1.5.2 - GitHub CI, Bugfixes, and Performance Improvements

Author: DevBlocky

.github/workflows/ci.yml

@@ -0,0 +1,20 @@
+name: CI
+on: [push, pull_request]
+jobs:
+  lint:
+    name: Lint Lua Scripts
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Lint
+        uses: GoatG33k/fivem-lua-lint-action@v1
+        with:
+          capture: "junit.xml"
+          args: "-t --formatter JUnit"
+      - name: Publish Test Report
+        uses: mikepenz/action-junit-report@v2
+        if: always()
+        with:
+          report_paths: "**/junit.xml"
+          fail_on_failure: 0

cl_dev.lua

@@ -1,6 +1,9 @@
+local insert = table.insert
+local remove = table.remove
+
 --- [[ Development shit ]]
 
-local devLocal = json.decode(raw)
+local devLocal = {}
 local next = 0
 
 RegisterCommand('setnext', function(_, args)
@@ -43,7 +46,7 @@ RegisterCommand('remove', function(_, args)
     else
         for i, d in ipairs(devLocal) do
             if d.code == args[1] then
-                table.remove(devLocal, i)
+                remove(devLocal, i)
                 print('remove ' .. d.code)
                 return
             end

cl_render.lua

@@ -1,12 +1,11 @@
 -- optimizations
 local vec = vec
-local Wait = Wait
+local Wait = Citizen.Wait
 local format = string.format
 local RemoveBlip = RemoveBlip
 local PlayerPedId = PlayerPedId
 local IsHudHidden = IsHudHidden
 local SetTextFont = SetTextFont
-local CreateThread = CreateThread
 local SetTextScale = SetTextScale
 local SetTextOutline = SetTextOutline
 local GetEntityCoords = GetEntityCoords
@@ -60,7 +59,7 @@ Citizen.CreateThread(function()
         local _code = postals[_nearestIndex].code
         nearest = { code = _code, dist = _nearestD }
         nearestPostalText = format(formatTemplate, _code, _nearestD)
-        Citizen.Wait(delay)
+        Wait(delay)
     end
 end)
 
@@ -80,6 +79,6 @@ Citizen.CreateThread(function()
             AddTextComponentSubstringPlayerName(nearestPostalText)
             EndTextCommandDisplayText(posX, posY)
         end
-        Citizen.Wait(0)
+        Wait(0)
     end
 end)

fxmanifest.lua

@@ -10,10 +10,10 @@ fx_version 'cerulean'
 games { 'gta5' }
 lua54 "yes"
 
-author 'blockba5her'
+author 'DevBlocky'
 description 'This script displays the nearest postal next to map, and allows you to navigate to specific postal codes'
-version '1.5.1'
-url 'https://github.com/blockba5her/nearest-postal'
+version '1.5.2'
+url 'https://github.com/DevBlocky/nearest-postal'
 
 client_scripts {
     'config.lua',

sv.lua

@@ -3,7 +3,7 @@ Citizen.CreateThread(function()
     local vRaw = LoadResourceFile(GetCurrentResourceName(), 'version.json')
     if vRaw and config.versionCheck then
         local v = json.decode(vRaw)
-        local url = 'https://raw.githubusercontent.com/blockba5her/nearest-postal/master/version.json'
+        local url = 'https://raw.githubusercontent.com/DevBlocky/nearest-postal/master/version.json'
         PerformHttpRequest(url, function(code, res)
             if code == 200 then
                 local rv = json.decode(res)

version.json

@@ -1,4 +1,4 @@
 {
-	"version": "1.5.1",
-	"changelog": "Fix Threads and add destination text"
+	"version": "1.5.2",
+	"changelog": "Bugfixes and performance improvements"
 }