@armoury/fivem-framework-client 1.0.53 → 1.0.55

package/dist/cjs/client/client-action-points.js

@@ -35,16 +35,15 @@ let ClientActionPoints = class ClientActionPoints extends client_entities_1.Clie
             pos: marker.pos,
             range: marker.renderDistance,
             action: async () => {
-                var _a, _b, _c, _d, _e, _f, _g;
                 if (marker.textureDict && !Cfx.Client.HasStreamedTextureDictLoaded(marker.textureDict)) {
                     Cfx.Client.RequestStreamedTextureDict(marker.textureDict, true);
                     while (!Cfx.Client.HasStreamedTextureDictLoaded(marker.textureDict)) {
                         await (0, fivem_framework_common_1.Delay)(100);
                     }
                 }
-                Cfx.Client.DrawMarker(marker.marker, marker.pos[0], marker.pos[1], marker.pos[2], 0.0, 0.0, 0.0, ((_a = marker.rotation) === null || _a === void 0 ? void 0 : _a[0]) || 0.0, ((_b = marker.rotation) === null || _b === void 0 ? void 0 : _b[1]) || 0.0, ((_c = marker.rotation) === null || _c === void 0 ? void 0 : _c[2]) || 0.0, marker.scale, marker.scale, marker.scale, marker.rgba[0], marker.rgba[1], marker.rgba[2], marker.rgba[3], false, true, 2, false, (marker.textureDict || null), (marker.textureName || null), false);
+                Cfx.Client.DrawMarker(marker.marker, marker.pos[0], marker.pos[1], marker.pos[2], 0.0, 0.0, 0.0, marker.rotation?.[0] || 0.0, marker.rotation?.[1] || 0.0, marker.rotation?.[2] || 0.0, marker.scale, marker.scale, marker.scale, marker.rgba[0], marker.rgba[1], marker.rgba[2], marker.rgba[3], false, true, 2, false, (marker.textureDict || null), (marker.textureName || null), false);
                 if (marker.underlyingCircle) {
-                    Cfx.Client.DrawMarker(marker.underlyingCircle.marker, marker.pos[0], marker.pos[1], marker.pos[2] - 0.9, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, marker.underlyingCircle.scale, marker.underlyingCircle.scale, marker.underlyingCircle.scale, ((_d = marker.underlyingCircle.rgba) === null || _d === void 0 ? void 0 : _d[0]) || marker.rgba[0], ((_e = marker.underlyingCircle.rgba) === null || _e === void 0 ? void 0 : _e[1]) || marker.rgba[1], ((_f = marker.underlyingCircle.rgba) === null || _f === void 0 ? void 0 : _f[2]) || marker.rgba[2], ((_g = marker.underlyingCircle.rgba) === null || _g === void 0 ? void 0 : _g[3]) || marker.rgba[3], false, true, 2, false, null, null, false);
+                    Cfx.Client.DrawMarker(marker.underlyingCircle.marker, marker.pos[0], marker.pos[1], marker.pos[2] - 0.9, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, marker.underlyingCircle.scale, marker.underlyingCircle.scale, marker.underlyingCircle.scale, marker.underlyingCircle.rgba?.[0] || marker.rgba[0], marker.underlyingCircle.rgba?.[1] || marker.rgba[1], marker.underlyingCircle.rgba?.[2] || marker.rgba[2], marker.underlyingCircle.rgba?.[3] || marker.rgba[3], false, true, 2, false, null, null, false);
                 }
             }
         })));
@@ -102,14 +101,12 @@ let ClientActionPoints = class ClientActionPoints extends client_entities_1.Clie
         return false;
     }
     removeActionPoint(actionPoint) {
-        var _a, _b;
-        if ((_b = (_a = this._actionPoints[this.roundToNearest(actionPoint.pos[0], this.chunkRadius)]) === null || _a === void 0 ? void 0 : _a[this.roundToNearest(actionPoint.pos[1], this.chunkRadius)]) === null || _b === void 0 ? void 0 : _b.length) {
+        if (this._actionPoints[this.roundToNearest(actionPoint.pos[0], this.chunkRadius)]?.[this.roundToNearest(actionPoint.pos[1], this.chunkRadius)]?.length) {
             this._actionPoints[this.roundToNearest(actionPoint.pos[0], this.chunkRadius)][this.roundToNearest(actionPoint.pos[1], this.chunkRadius)] =
                 this._actionPoints[this.roundToNearest(actionPoint.pos[0], this.chunkRadius)][this.roundToNearest(actionPoint.pos[1], this.chunkRadius)].filter((_actionPoint) => _actionPoint.id != actionPoint.id);
         }
     }
     onThreadTriggered(optimizationType) {
-        var _a, _b;
         if (optimizationType === 'chunk-checker') {
             this._cachedPlayerPosition = Cfx.Client.GetEntityCoords(Cfx.Client.PlayerPedId(), true);
             const [nearestX, nearestY] = [this.roundToNearest(this._cachedPlayerPosition[0], this.chunkRadius), this.roundToNearest(this._cachedPlayerPosition[1], this.chunkRadius)];
@@ -118,20 +115,19 @@ let ClientActionPoints = class ClientActionPoints extends client_entities_1.Clie
             }
             this._cachedPlayerRoundedPosition = [nearestX, nearestY];
             this._cachedIsPlayerInAnyVehicle = Cfx.Client.IsPedInAnyVehicle(Cfx.Client.PlayerPedId(), false);
-            if ((_b = (_a = this._actionPoints[this._cachedPlayerRoundedPosition[0]]) === null || _a === void 0 ? void 0 : _a[this._cachedPlayerRoundedPosition[1]]) === null || _b === void 0 ? void 0 : _b.length) {
+            if (this._actionPoints[this._cachedPlayerRoundedPosition[0]]?.[this._cachedPlayerRoundedPosition[1]]?.length) {
                 this.addToTickUnique({
                     id: `${Cfx.Client.GetCurrentResourceName()}_actionpoints`,
                     function: (() => {
-                        var _a, _b, _c, _d;
-                        for (let i = 0; i < ((_b = (_a = this._actionPoints[this._cachedPlayerRoundedPosition[0]]) === null || _a === void 0 ? void 0 : _a[this._cachedPlayerRoundedPosition[1]]) === null || _b === void 0 ? void 0 : _b.length); i++) {
-                            const _actionPoint = (_c = this._actionPoints[this._cachedPlayerRoundedPosition[0]]) === null || _c === void 0 ? void 0 : _c[this._cachedPlayerRoundedPosition[1]][i];
+                        for (let i = 0; i < this._actionPoints[this._cachedPlayerRoundedPosition[0]]?.[this._cachedPlayerRoundedPosition[1]]?.length; i++) {
+                            const _actionPoint = this._actionPoints[this._cachedPlayerRoundedPosition[0]]?.[this._cachedPlayerRoundedPosition[1]][i];
                             if ((0, fivem_framework_common_1.calculateDistance)([_actionPoint.pos[0], _actionPoint.pos[1], _actionPoint.pos[2], this._cachedPlayerPosition[0], this._cachedPlayerPosition[1], _actionPoint.pos[2]]) <= (_actionPoint.range || 1.0) + (this._cachedIsPlayerInAnyVehicle && !_actionPoint.onfootOnly ? 5 : 0)) {
                                 const actionPassed = (!_actionPoint.onceIf || _actionPoint.onceIf()) && (!_actionPoint.onfootOnly || !Cfx.Client.IsPedInAnyVehicle(Cfx.Client.PlayerPedId(), false)) && (!_actionPoint.inVehicleOnly || Cfx.Client.IsPedInAnyVehicle(Cfx.Client.PlayerPedId(), false));
                                 if (actionPassed) {
                                     _actionPoint.action();
                                 }
                                 if ((_actionPoint.once || _actionPoint.onceIf) && actionPassed) {
-                                    (_d = this._actionPoints[this._cachedPlayerRoundedPosition[0]]) === null || _d === void 0 ? void 0 : _d[this._cachedPlayerRoundedPosition[1]].splice(i, 1);
+                                    this._actionPoints[this._cachedPlayerRoundedPosition[0]]?.[this._cachedPlayerRoundedPosition[1]].splice(i, 1);
                                     i--;
                                 }
                             }
@@ -145,9 +141,8 @@ let ClientActionPoints = class ClientActionPoints extends client_entities_1.Clie
         }
     }
     debug_ActionPoints() {
-        var _a, _b;
         let totalActionPoints = 0;
-        const currentAreaActionPoints = ((_b = (_a = this.actionPoints[this.roundToNearest(this._cachedPlayerPosition[0], this.chunkRadius)]) === null || _a === void 0 ? void 0 : _a[this.roundToNearest(this._cachedPlayerPosition[1], this.chunkRadius)]) === null || _b === void 0 ? void 0 : _b.length) || 0;
+        const currentAreaActionPoints = this.actionPoints[this.roundToNearest(this._cachedPlayerPosition[0], this.chunkRadius)]?.[this.roundToNearest(this._cachedPlayerPosition[1], this.chunkRadius)]?.length || 0;
         Object.keys(this.actionPoints).forEach((posXAsStr) => {
             const posX = Number(posXAsStr);
             Object.keys(this.actionPoints[posX]).forEach((posYAsStr) => {

package/dist/cjs/client/client-entities.js

@@ -44,17 +44,16 @@ let ClientEntities = class ClientEntities extends client_base_1.ClientBase {
         this.assignDefaultEntityListeners();
     }
     createBlips(blips) {
-        const _blips = blips.map((blip) => (Object.assign(Object.assign({}, blip), { instance: null })));
+        const _blips = blips.map((blip) => ({ ...blip, instance: null }));
         this._blips.push(..._blips);
         this.refreshBlips();
     }
     createBlip(blip) {
-        var _a;
         const _blip = (!blip.type || blip.type === 'coords'
             ? Cfx.Client.AddBlipForCoord(blip.pos[0], blip.pos[1], blip.pos[2])
             : (blip.type === 'range'
                 ? Cfx.Client.AddBlipForRadius(blip.pos[0], blip.pos[1], blip.pos[2], blip.scale || 1.0)
-                : Cfx.Client.AddBlipForEntity((_a = blip.entityId) !== null && _a !== void 0 ? _a : Cfx.Client.PlayerPedId())));
+                : Cfx.Client.AddBlipForEntity(blip.entityId ?? Cfx.Client.PlayerPedId())));
         if (!blip.type || blip.type !== 'range') {
             Cfx.Client.SetBlipScale(_blip, blip.scale || 1.0);
         }
@@ -98,7 +97,7 @@ let ClientEntities = class ClientEntities extends client_base_1.ClientBase {
             pos,
             longRange: true
         });
-        this.createCheckpoint(2, pos[0], pos[1], pos[2], null, null, null, diameter, color_mappings_1.COLOR_MAPPINGS[color !== null && color !== void 0 ? color : 0][0], color_mappings_1.COLOR_MAPPINGS[color !== null && color !== void 0 ? color : 0][1], color_mappings_1.COLOR_MAPPINGS[color !== null && color !== void 0 ? color : 0][2], 255, 0);
+        this.createCheckpoint(2, pos[0], pos[1], pos[2], null, null, null, diameter, color_mappings_1.COLOR_MAPPINGS[color ?? 0][0], color_mappings_1.COLOR_MAPPINGS[color ?? 0][1], color_mappings_1.COLOR_MAPPINGS[color ?? 0][2], 255, 0);
         if (routeColor !== -1) {
             Cfx.Client.SetBlipRoute(_waypoint, true);
             if (routeColor) {
@@ -143,7 +142,7 @@ let ClientEntities = class ClientEntities extends client_base_1.ClientBase {
     }
     /** Defines permanent markers. Handles draw-per-tick automatically. */
     createMarkers(markers) {
-        const _markers = markers.map((marker) => (Object.assign(Object.assign({}, marker), { instance: null })));
+        const _markers = markers.map((marker) => ({ ...marker, instance: null }));
         this._markers.push(..._markers);
     }
     clearMarkers() {

package/dist/cjs/client/index.js

@@ -20,6 +20,7 @@ exports.bootstrap = bootstrap;
 require("reflect-metadata");
 const services_1 = require("./services");
 const fivem_framework_common_1 = require("@armoury/fivem-framework-common");
+const i18n_changer_1 = require("./services/i18n/i18n.changer");
 exports.CLIENT_PROVIDERS = [
     services_1.ClientActionPointsService,
     services_1.ClientBlipsService,
@@ -34,7 +35,8 @@ exports.CLIENT_PROVIDERS = [
     services_1.ClientWaypointsService,
 ];
 exports.CLIENT_EAGER_PROVIDERS = [
-    services_1.UI
+    services_1.UI,
+    i18n_changer_1.I18nChanger
 ];
 async function bootstrap(_class, options = {}) {
     return (0, fivem_framework_common_1.bootstrapWithProviders)(_class, exports.CLIENT_PROVIDERS, options, fivem_framework_common_1.DecorationType.CLIENT, (key, index) => Cfx.Client.GetResourceMetadata(Cfx.Client.GetCurrentResourceName(), key, index), (resourceName) => Cfx.exports[resourceName], exports.CLIENT_EAGER_PROVIDERS);

package/dist/cjs/client/services/client-action-points.service.js

@@ -52,8 +52,7 @@ let ClientActionPointsService = class ClientActionPointsService {
         this._actionPoints[nearestX][nearestY].push(actionPoint);
     }
     remove(actionPoint) {
-        var _a, _b;
-        if ((_b = (_a = this._actionPoints[this.roundToNearest(actionPoint.pos[0], this.chunkRadius)]) === null || _a === void 0 ? void 0 : _a[this.roundToNearest(actionPoint.pos[1], this.chunkRadius)]) === null || _b === void 0 ? void 0 : _b.length) {
+        if (this._actionPoints[this.roundToNearest(actionPoint.pos[0], this.chunkRadius)]?.[this.roundToNearest(actionPoint.pos[1], this.chunkRadius)]?.length) {
             this._actionPoints[this.roundToNearest(actionPoint.pos[0], this.chunkRadius)][this.roundToNearest(actionPoint.pos[1], this.chunkRadius)] =
                 this._actionPoints[this.roundToNearest(actionPoint.pos[0], this.chunkRadius)][this.roundToNearest(actionPoint.pos[1], this.chunkRadius)].filter((_actionPoint) => _actionPoint.id != actionPoint.id);
         }
@@ -86,7 +85,6 @@ let ClientActionPointsService = class ClientActionPointsService {
         return false;
     }
     onThreadTriggered(optimizationType) {
-        var _a, _b;
         if (optimizationType === 'chunk-checker') {
             this._cachedPlayerPosition = Cfx.Client.GetEntityCoords(Cfx.Client.PlayerPedId(), true);
             const [nearestX, nearestY] = [this.roundToNearest(this._cachedPlayerPosition[0], this.chunkRadius), this.roundToNearest(this._cachedPlayerPosition[1], this.chunkRadius)];
@@ -95,20 +93,19 @@ let ClientActionPointsService = class ClientActionPointsService {
             }
             this._cachedPlayerRoundedPosition = [nearestX, nearestY];
             this._cachedIsPlayerInAnyVehicle = Cfx.Client.IsPedInAnyVehicle(Cfx.Client.PlayerPedId(), false);
-            if ((_b = (_a = this._actionPoints[this._cachedPlayerRoundedPosition[0]]) === null || _a === void 0 ? void 0 : _a[this._cachedPlayerRoundedPosition[1]]) === null || _b === void 0 ? void 0 : _b.length) {
+            if (this._actionPoints[this._cachedPlayerRoundedPosition[0]]?.[this._cachedPlayerRoundedPosition[1]]?.length) {
                 this._ticksService.addUnique({
                     id: `${Cfx.Client.GetCurrentResourceName()}_actionpoints`,
                     function: (() => {
-                        var _a, _b, _c, _d;
-                        for (let i = 0; i < ((_b = (_a = this._actionPoints[this._cachedPlayerRoundedPosition[0]]) === null || _a === void 0 ? void 0 : _a[this._cachedPlayerRoundedPosition[1]]) === null || _b === void 0 ? void 0 : _b.length); i++) {
-                            const _actionPoint = (_c = this._actionPoints[this._cachedPlayerRoundedPosition[0]]) === null || _c === void 0 ? void 0 : _c[this._cachedPlayerRoundedPosition[1]][i];
+                        for (let i = 0; i < this._actionPoints[this._cachedPlayerRoundedPosition[0]]?.[this._cachedPlayerRoundedPosition[1]]?.length; i++) {
+                            const _actionPoint = this._actionPoints[this._cachedPlayerRoundedPosition[0]]?.[this._cachedPlayerRoundedPosition[1]][i];
                             if ((0, fivem_framework_common_1.calculateDistance)([_actionPoint.pos[0], _actionPoint.pos[1], _actionPoint.pos[2], this._cachedPlayerPosition[0], this._cachedPlayerPosition[1], _actionPoint.pos[2]]) <= (_actionPoint.range || 1.0) + (this._cachedIsPlayerInAnyVehicle && !_actionPoint.onfootOnly ? 5 : 0)) {
                                 const actionPassed = (!_actionPoint.onceIf || _actionPoint.onceIf()) && (!_actionPoint.onfootOnly || !Cfx.Client.IsPedInAnyVehicle(Cfx.Client.PlayerPedId(), false)) && (!_actionPoint.inVehicleOnly || Cfx.Client.IsPedInAnyVehicle(Cfx.Client.PlayerPedId(), false));
                                 if (actionPassed) {
                                     _actionPoint.action();
                                 }
                                 if ((_actionPoint.once || _actionPoint.onceIf) && actionPassed) {
-                                    (_d = this._actionPoints[this._cachedPlayerRoundedPosition[0]]) === null || _d === void 0 ? void 0 : _d[this._cachedPlayerRoundedPosition[1]].splice(i, 1);
+                                    this._actionPoints[this._cachedPlayerRoundedPosition[0]]?.[this._cachedPlayerRoundedPosition[1]].splice(i, 1);
                                     i--;
                                 }
                             }
@@ -122,9 +119,8 @@ let ClientActionPointsService = class ClientActionPointsService {
         }
     }
     debug_ActionPoints() {
-        var _a, _b;
         let totalActionPoints = 0;
-        const currentAreaActionPoints = ((_b = (_a = this.actionPoints[this.roundToNearest(this._cachedPlayerPosition[0], this.chunkRadius)]) === null || _a === void 0 ? void 0 : _a[this.roundToNearest(this._cachedPlayerPosition[1], this.chunkRadius)]) === null || _b === void 0 ? void 0 : _b.length) || 0;
+        const currentAreaActionPoints = this.actionPoints[this.roundToNearest(this._cachedPlayerPosition[0], this.chunkRadius)]?.[this.roundToNearest(this._cachedPlayerPosition[1], this.chunkRadius)]?.length || 0;
         Object.keys(this.actionPoints).forEach((posXAsStr) => {
             const posX = Number(posXAsStr);
             Object.keys(this.actionPoints[posX]).forEach((posYAsStr) => {

package/dist/cjs/client/services/client-blips.service.js

@@ -30,17 +30,16 @@ let ClientBlipsService = class ClientBlipsService {
     }
     // TODO: Why is createMultiple() not calling create()?
     createMultiple(...blips) {
-        const _blips = blips.map((blip) => (Object.assign(Object.assign({}, blip), { instance: null })));
+        const _blips = blips.map((blip) => ({ ...blip, instance: null }));
         this._blips.push(..._blips);
         this.refresh();
     }
     create(blip) {
-        var _a;
         const _blip = (!blip.type || blip.type === 'coords'
             ? Cfx.Client.AddBlipForCoord(blip.pos[0], blip.pos[1], blip.pos[2])
             : (blip.type === 'range'
                 ? Cfx.Client.AddBlipForRadius(blip.pos[0], blip.pos[1], blip.pos[2], blip.scale || 1.0)
-                : Cfx.Client.AddBlipForEntity((_a = blip.entityId) !== null && _a !== void 0 ? _a : Cfx.Client.PlayerPedId())));
+                : Cfx.Client.AddBlipForEntity(blip.entityId ?? Cfx.Client.PlayerPedId())));
         if (!blip.type || blip.type !== 'range') {
             Cfx.Client.SetBlipScale(_blip, blip.scale || 1.0);
         }

package/dist/cjs/client/services/client-markers.service.js

@@ -26,23 +26,22 @@ let ClientMarkersService = class ClientMarkersService {
     }
     /** Defines permanent markers. Handles draw-per-tick automatically. */
     create(...markers) {
-        const _markers = markers.map((marker) => (Object.assign(Object.assign({}, marker), { instance: null })));
+        const _markers = markers.map((marker) => ({ ...marker, instance: null }));
         this._markers.push(..._markers);
         this._actionPoints.create(...markers.map((marker) => ({
             id: `${Cfx.Client.GetCurrentResourceName()}_marker_${marker.pos[0]}_${marker.pos[1]}`,
             pos: marker.pos,
             range: marker.renderDistance,
             action: async () => {
-                var _a, _b, _c, _d, _e, _f, _g;
                 if (marker.textureDict && !Cfx.Client.HasStreamedTextureDictLoaded(marker.textureDict)) {
                     Cfx.Client.RequestStreamedTextureDict(marker.textureDict, true);
                     while (!Cfx.Client.HasStreamedTextureDictLoaded(marker.textureDict)) {
                         await (0, fivem_framework_common_1.Delay)(100);
                     }
                 }
-                Cfx.Client.DrawMarker(marker.marker, marker.pos[0], marker.pos[1], marker.pos[2], 0.0, 0.0, 0.0, ((_a = marker.rotation) === null || _a === void 0 ? void 0 : _a[0]) || 0.0, ((_b = marker.rotation) === null || _b === void 0 ? void 0 : _b[1]) || 0.0, ((_c = marker.rotation) === null || _c === void 0 ? void 0 : _c[2]) || 0.0, marker.scale, marker.scale, marker.scale, marker.rgba[0], marker.rgba[1], marker.rgba[2], marker.rgba[3], false, true, 2, false, (marker.textureDict || null), (marker.textureName || null), false);
+                Cfx.Client.DrawMarker(marker.marker, marker.pos[0], marker.pos[1], marker.pos[2], 0.0, 0.0, 0.0, marker.rotation?.[0] || 0.0, marker.rotation?.[1] || 0.0, marker.rotation?.[2] || 0.0, marker.scale, marker.scale, marker.scale, marker.rgba[0], marker.rgba[1], marker.rgba[2], marker.rgba[3], false, true, 2, false, (marker.textureDict || null), (marker.textureName || null), false);
                 if (marker.underlyingCircle) {
-                    Cfx.Client.DrawMarker(marker.underlyingCircle.marker, marker.pos[0], marker.pos[1], marker.pos[2] - 0.9, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, marker.underlyingCircle.scale, marker.underlyingCircle.scale, marker.underlyingCircle.scale, ((_d = marker.underlyingCircle.rgba) === null || _d === void 0 ? void 0 : _d[0]) || marker.rgba[0], ((_e = marker.underlyingCircle.rgba) === null || _e === void 0 ? void 0 : _e[1]) || marker.rgba[1], ((_f = marker.underlyingCircle.rgba) === null || _f === void 0 ? void 0 : _f[2]) || marker.rgba[2], ((_g = marker.underlyingCircle.rgba) === null || _g === void 0 ? void 0 : _g[3]) || marker.rgba[3], false, true, 2, false, null, null, false);
+                    Cfx.Client.DrawMarker(marker.underlyingCircle.marker, marker.pos[0], marker.pos[1], marker.pos[2] - 0.9, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, marker.underlyingCircle.scale, marker.underlyingCircle.scale, marker.underlyingCircle.scale, marker.underlyingCircle.rgba?.[0] || marker.rgba[0], marker.underlyingCircle.rgba?.[1] || marker.rgba[1], marker.underlyingCircle.rgba?.[2] || marker.rgba[2], marker.underlyingCircle.rgba?.[3] || marker.rgba[3], false, true, 2, false, null, null, false);
                 }
             }
         })));

package/dist/cjs/client/services/client-translate.service.js

@@ -28,8 +28,7 @@ let ClientTranslateService = class ClientTranslateService {
         this._language = null;
     }
     instant(key) {
-        var _a;
-        return ((_a = this._translations[this.language]) === null || _a === void 0 ? void 0 : _a[key]) || key;
+        return this._translations[this.language]?.[key] || key;
     }
 };
 exports.ClientTranslateService = ClientTranslateService;

package/dist/cjs/client/services/client-waypoints.service.js

@@ -37,7 +37,7 @@ let ClientWaypointsService = class ClientWaypointsService {
             pos,
             longRange: true
         });
-        this._checkpointsService.create(2, pos[0], pos[1], pos[2], null, null, null, diameter, color_mappings_1.COLOR_MAPPINGS[color !== null && color !== void 0 ? color : 0][0], color_mappings_1.COLOR_MAPPINGS[color !== null && color !== void 0 ? color : 0][1], color_mappings_1.COLOR_MAPPINGS[color !== null && color !== void 0 ? color : 0][2], 255, 0);
+        this._checkpointsService.create(2, pos[0], pos[1], pos[2], null, null, null, diameter, color_mappings_1.COLOR_MAPPINGS[color ?? 0][0], color_mappings_1.COLOR_MAPPINGS[color ?? 0][1], color_mappings_1.COLOR_MAPPINGS[color ?? 0][2], 255, 0);
         if (routeColor !== -1) {
             Cfx.Client.SetBlipRoute(_waypoint, true);
             if (routeColor) {

package/dist/cjs/client/services/i18n/i18n.changer.js

@@ -0,0 +1,32 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.I18nChanger = void 0;
+const fivem_framework_common_1 = require("@armoury/fivem-framework-common");
+const injection_js_1 = require("injection-js");
+const i18n_service_1 = require("./i18n.service");
+let I18nChanger = class I18nChanger {
+    _onLanguageChangedRequestedUnsafe(language) {
+        console.log(`Setting language to ${language}.`);
+        Cfx.Client.SetResourceKvp('armoury:language', language);
+        i18n_service_1.I18n.setLanguage(language);
+    }
+};
+exports.I18nChanger = I18nChanger;
+__decorate([
+    (0, fivem_framework_common_1.EventListener)({ eventName: 'armoury:unsafe:language:change:request', direction: fivem_framework_common_1.EVENT_DIRECTIONS.CLIENT_TO_CLIENT }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", void 0)
+], I18nChanger.prototype, "_onLanguageChangedRequestedUnsafe", null);
+exports.I18nChanger = I18nChanger = __decorate([
+    (0, injection_js_1.Injectable)()
+], I18nChanger);

package/dist/cjs/client/services/i18n/i18n.service.js

@@ -5,23 +5,18 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var I18n_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.I18n = void 0;
 const fivem_framework_common_1 = require("@armoury/fivem-framework-common");
 const node_polyglot_1 = __importDefault(require("node-polyglot"));
 const injection_js_1 = require("injection-js");
-let I18n = I18n_1 = class I18n {
+let I18n = class I18n {
     static withOptions(options = {}) {
-        var _a;
-        const language = (_a = (Cfx.Client.GetResourceKvpString('armoury:language')
-            || options.defaultLanguage)) !== null && _a !== void 0 ? _a : 'en-US';
+        const language = (Cfx.Client.GetResourceKvpString('armoury:language')
+            || options.defaultLanguage) ?? 'en-US';
         return {
             provide: fivem_framework_common_1.APP_INITIALIZER,
             useValue: () => this.loadLanguage(language),
@@ -61,20 +56,9 @@ let I18n = I18n_1 = class I18n {
     static translate(key, params = {}) {
         return this.polyglot.t(key, params);
     }
-    _onLanguageChangedRequestedUnsafe(language) {
-        console.log(`Setting language to ${language}.`);
-        Cfx.Client.SetResourceKvp('armoury:language', language);
-        I18n_1.setLanguage(language);
-    }
 };
 exports.I18n = I18n;
 I18n.polyglot = new node_polyglot_1.default();
-__decorate([
-    (0, fivem_framework_common_1.EventListener)({ eventName: 'armoury:unsafe:language:change:request', direction: fivem_framework_common_1.EVENT_DIRECTIONS.CLIENT_TO_CLIENT }),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
-    __metadata("design:returntype", void 0)
-], I18n.prototype, "_onLanguageChangedRequestedUnsafe", null);
-exports.I18n = I18n = I18n_1 = __decorate([
+exports.I18n = I18n = __decorate([
     (0, injection_js_1.Injectable)()
 ], I18n);

package/dist/cjs/client/services/i18n/index.js

@@ -14,4 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./i18n.changer"), exports);
 __exportStar(require("./i18n.service"), exports);

package/dist/esm/client/client-action-points.js

@@ -32,16 +32,15 @@ let ClientActionPoints = class ClientActionPoints extends ClientEntities {
             pos: marker.pos,
             range: marker.renderDistance,
             action: async () => {
-                var _a, _b, _c, _d, _e, _f, _g;
                 if (marker.textureDict && !Cfx.Client.HasStreamedTextureDictLoaded(marker.textureDict)) {
                     Cfx.Client.RequestStreamedTextureDict(marker.textureDict, true);
                     while (!Cfx.Client.HasStreamedTextureDictLoaded(marker.textureDict)) {
                         await Delay(100);
                     }
                 }
-                Cfx.Client.DrawMarker(marker.marker, marker.pos[0], marker.pos[1], marker.pos[2], 0.0, 0.0, 0.0, ((_a = marker.rotation) === null || _a === void 0 ? void 0 : _a[0]) || 0.0, ((_b = marker.rotation) === null || _b === void 0 ? void 0 : _b[1]) || 0.0, ((_c = marker.rotation) === null || _c === void 0 ? void 0 : _c[2]) || 0.0, marker.scale, marker.scale, marker.scale, marker.rgba[0], marker.rgba[1], marker.rgba[2], marker.rgba[3], false, true, 2, false, (marker.textureDict || null), (marker.textureName || null), false);
+                Cfx.Client.DrawMarker(marker.marker, marker.pos[0], marker.pos[1], marker.pos[2], 0.0, 0.0, 0.0, marker.rotation?.[0] || 0.0, marker.rotation?.[1] || 0.0, marker.rotation?.[2] || 0.0, marker.scale, marker.scale, marker.scale, marker.rgba[0], marker.rgba[1], marker.rgba[2], marker.rgba[3], false, true, 2, false, (marker.textureDict || null), (marker.textureName || null), false);
                 if (marker.underlyingCircle) {
-                    Cfx.Client.DrawMarker(marker.underlyingCircle.marker, marker.pos[0], marker.pos[1], marker.pos[2] - 0.9, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, marker.underlyingCircle.scale, marker.underlyingCircle.scale, marker.underlyingCircle.scale, ((_d = marker.underlyingCircle.rgba) === null || _d === void 0 ? void 0 : _d[0]) || marker.rgba[0], ((_e = marker.underlyingCircle.rgba) === null || _e === void 0 ? void 0 : _e[1]) || marker.rgba[1], ((_f = marker.underlyingCircle.rgba) === null || _f === void 0 ? void 0 : _f[2]) || marker.rgba[2], ((_g = marker.underlyingCircle.rgba) === null || _g === void 0 ? void 0 : _g[3]) || marker.rgba[3], false, true, 2, false, null, null, false);
+                    Cfx.Client.DrawMarker(marker.underlyingCircle.marker, marker.pos[0], marker.pos[1], marker.pos[2] - 0.9, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, marker.underlyingCircle.scale, marker.underlyingCircle.scale, marker.underlyingCircle.scale, marker.underlyingCircle.rgba?.[0] || marker.rgba[0], marker.underlyingCircle.rgba?.[1] || marker.rgba[1], marker.underlyingCircle.rgba?.[2] || marker.rgba[2], marker.underlyingCircle.rgba?.[3] || marker.rgba[3], false, true, 2, false, null, null, false);
                 }
             }
         })));
@@ -99,14 +98,12 @@ let ClientActionPoints = class ClientActionPoints extends ClientEntities {
         return false;
     }
     removeActionPoint(actionPoint) {
-        var _a, _b;
-        if ((_b = (_a = this._actionPoints[this.roundToNearest(actionPoint.pos[0], this.chunkRadius)]) === null || _a === void 0 ? void 0 : _a[this.roundToNearest(actionPoint.pos[1], this.chunkRadius)]) === null || _b === void 0 ? void 0 : _b.length) {
+        if (this._actionPoints[this.roundToNearest(actionPoint.pos[0], this.chunkRadius)]?.[this.roundToNearest(actionPoint.pos[1], this.chunkRadius)]?.length) {
             this._actionPoints[this.roundToNearest(actionPoint.pos[0], this.chunkRadius)][this.roundToNearest(actionPoint.pos[1], this.chunkRadius)] =
                 this._actionPoints[this.roundToNearest(actionPoint.pos[0], this.chunkRadius)][this.roundToNearest(actionPoint.pos[1], this.chunkRadius)].filter((_actionPoint) => _actionPoint.id != actionPoint.id);
         }
     }
     onThreadTriggered(optimizationType) {
-        var _a, _b;
         if (optimizationType === 'chunk-checker') {
             this._cachedPlayerPosition = Cfx.Client.GetEntityCoords(Cfx.Client.PlayerPedId(), true);
             const [nearestX, nearestY] = [this.roundToNearest(this._cachedPlayerPosition[0], this.chunkRadius), this.roundToNearest(this._cachedPlayerPosition[1], this.chunkRadius)];
@@ -115,20 +112,19 @@ let ClientActionPoints = class ClientActionPoints extends ClientEntities {
             }
             this._cachedPlayerRoundedPosition = [nearestX, nearestY];
             this._cachedIsPlayerInAnyVehicle = Cfx.Client.IsPedInAnyVehicle(Cfx.Client.PlayerPedId(), false);
-            if ((_b = (_a = this._actionPoints[this._cachedPlayerRoundedPosition[0]]) === null || _a === void 0 ? void 0 : _a[this._cachedPlayerRoundedPosition[1]]) === null || _b === void 0 ? void 0 : _b.length) {
+            if (this._actionPoints[this._cachedPlayerRoundedPosition[0]]?.[this._cachedPlayerRoundedPosition[1]]?.length) {
                 this.addToTickUnique({
                     id: `${Cfx.Client.GetCurrentResourceName()}_actionpoints`,
                     function: (() => {
-                        var _a, _b, _c, _d;
-                        for (let i = 0; i < ((_b = (_a = this._actionPoints[this._cachedPlayerRoundedPosition[0]]) === null || _a === void 0 ? void 0 : _a[this._cachedPlayerRoundedPosition[1]]) === null || _b === void 0 ? void 0 : _b.length); i++) {
-                            const _actionPoint = (_c = this._actionPoints[this._cachedPlayerRoundedPosition[0]]) === null || _c === void 0 ? void 0 : _c[this._cachedPlayerRoundedPosition[1]][i];
+                        for (let i = 0; i < this._actionPoints[this._cachedPlayerRoundedPosition[0]]?.[this._cachedPlayerRoundedPosition[1]]?.length; i++) {
+                            const _actionPoint = this._actionPoints[this._cachedPlayerRoundedPosition[0]]?.[this._cachedPlayerRoundedPosition[1]][i];
                             if (calculateDistance([_actionPoint.pos[0], _actionPoint.pos[1], _actionPoint.pos[2], this._cachedPlayerPosition[0], this._cachedPlayerPosition[1], _actionPoint.pos[2]]) <= (_actionPoint.range || 1.0) + (this._cachedIsPlayerInAnyVehicle && !_actionPoint.onfootOnly ? 5 : 0)) {
                                 const actionPassed = (!_actionPoint.onceIf || _actionPoint.onceIf()) && (!_actionPoint.onfootOnly || !Cfx.Client.IsPedInAnyVehicle(Cfx.Client.PlayerPedId(), false)) && (!_actionPoint.inVehicleOnly || Cfx.Client.IsPedInAnyVehicle(Cfx.Client.PlayerPedId(), false));
                                 if (actionPassed) {
                                     _actionPoint.action();
                                 }
                                 if ((_actionPoint.once || _actionPoint.onceIf) && actionPassed) {
-                                    (_d = this._actionPoints[this._cachedPlayerRoundedPosition[0]]) === null || _d === void 0 ? void 0 : _d[this._cachedPlayerRoundedPosition[1]].splice(i, 1);
+                                    this._actionPoints[this._cachedPlayerRoundedPosition[0]]?.[this._cachedPlayerRoundedPosition[1]].splice(i, 1);
                                     i--;
                                 }
                             }
@@ -142,9 +138,8 @@ let ClientActionPoints = class ClientActionPoints extends ClientEntities {
         }
     }
     debug_ActionPoints() {
-        var _a, _b;
         let totalActionPoints = 0;
-        const currentAreaActionPoints = ((_b = (_a = this.actionPoints[this.roundToNearest(this._cachedPlayerPosition[0], this.chunkRadius)]) === null || _a === void 0 ? void 0 : _a[this.roundToNearest(this._cachedPlayerPosition[1], this.chunkRadius)]) === null || _b === void 0 ? void 0 : _b.length) || 0;
+        const currentAreaActionPoints = this.actionPoints[this.roundToNearest(this._cachedPlayerPosition[0], this.chunkRadius)]?.[this.roundToNearest(this._cachedPlayerPosition[1], this.chunkRadius)]?.length || 0;
         Object.keys(this.actionPoints).forEach((posXAsStr) => {
             const posX = Number(posXAsStr);
             Object.keys(this.actionPoints[posX]).forEach((posYAsStr) => {

package/dist/esm/client/client-entities.js

@@ -41,17 +41,16 @@ let ClientEntities = class ClientEntities extends ClientBase {
         this.assignDefaultEntityListeners();
     }
     createBlips(blips) {
-        const _blips = blips.map((blip) => (Object.assign(Object.assign({}, blip), { instance: null })));
+        const _blips = blips.map((blip) => ({ ...blip, instance: null }));
         this._blips.push(..._blips);
         this.refreshBlips();
     }
     createBlip(blip) {
-        var _a;
         const _blip = (!blip.type || blip.type === 'coords'
             ? Cfx.Client.AddBlipForCoord(blip.pos[0], blip.pos[1], blip.pos[2])
             : (blip.type === 'range'
                 ? Cfx.Client.AddBlipForRadius(blip.pos[0], blip.pos[1], blip.pos[2], blip.scale || 1.0)
-                : Cfx.Client.AddBlipForEntity((_a = blip.entityId) !== null && _a !== void 0 ? _a : Cfx.Client.PlayerPedId())));
+                : Cfx.Client.AddBlipForEntity(blip.entityId ?? Cfx.Client.PlayerPedId())));
         if (!blip.type || blip.type !== 'range') {
             Cfx.Client.SetBlipScale(_blip, blip.scale || 1.0);
         }
@@ -95,7 +94,7 @@ let ClientEntities = class ClientEntities extends ClientBase {
             pos,
             longRange: true
         });
-        this.createCheckpoint(2, pos[0], pos[1], pos[2], null, null, null, diameter, COLOR_MAPPINGS[color !== null && color !== void 0 ? color : 0][0], COLOR_MAPPINGS[color !== null && color !== void 0 ? color : 0][1], COLOR_MAPPINGS[color !== null && color !== void 0 ? color : 0][2], 255, 0);
+        this.createCheckpoint(2, pos[0], pos[1], pos[2], null, null, null, diameter, COLOR_MAPPINGS[color ?? 0][0], COLOR_MAPPINGS[color ?? 0][1], COLOR_MAPPINGS[color ?? 0][2], 255, 0);
         if (routeColor !== -1) {
             Cfx.Client.SetBlipRoute(_waypoint, true);
             if (routeColor) {
@@ -140,7 +139,7 @@ let ClientEntities = class ClientEntities extends ClientBase {
     }
     /** Defines permanent markers. Handles draw-per-tick automatically. */
     createMarkers(markers) {
-        const _markers = markers.map((marker) => (Object.assign(Object.assign({}, marker), { instance: null })));
+        const _markers = markers.map((marker) => ({ ...marker, instance: null }));
         this._markers.push(..._markers);
     }
     clearMarkers() {

package/dist/esm/client/index.js

@@ -2,6 +2,7 @@
 import 'reflect-metadata';
 import { ClientActionPointsService, ClientBlipsService, ClientCheckpointsService, ClientMarkersService, ClientPedsService, ClientSessionService, ClientTicksService, ClientUIService, ClientVehiclesService, ClientWaypointsService, ClientHudService, UI } from './services';
 import { bootstrapWithProviders, DecorationType } from '@armoury/fivem-framework-common';
+import { I18nChanger } from './services/i18n/i18n.changer';
 export const CLIENT_PROVIDERS = [
     ClientActionPointsService,
     ClientBlipsService,
@@ -16,7 +17,8 @@ export const CLIENT_PROVIDERS = [
     ClientWaypointsService,
 ];
 export const CLIENT_EAGER_PROVIDERS = [
-    UI
+    UI,
+    I18nChanger
 ];
 export async function bootstrap(_class, options = {}) {
     return bootstrapWithProviders(_class, CLIENT_PROVIDERS, options, DecorationType.CLIENT, (key, index) => Cfx.Client.GetResourceMetadata(Cfx.Client.GetCurrentResourceName(), key, index), (resourceName) => Cfx.exports[resourceName], CLIENT_EAGER_PROVIDERS);

package/dist/esm/client/services/client-action-points.service.js

@@ -49,8 +49,7 @@ let ClientActionPointsService = class ClientActionPointsService {
         this._actionPoints[nearestX][nearestY].push(actionPoint);
     }
     remove(actionPoint) {
-        var _a, _b;
-        if ((_b = (_a = this._actionPoints[this.roundToNearest(actionPoint.pos[0], this.chunkRadius)]) === null || _a === void 0 ? void 0 : _a[this.roundToNearest(actionPoint.pos[1], this.chunkRadius)]) === null || _b === void 0 ? void 0 : _b.length) {
+        if (this._actionPoints[this.roundToNearest(actionPoint.pos[0], this.chunkRadius)]?.[this.roundToNearest(actionPoint.pos[1], this.chunkRadius)]?.length) {
             this._actionPoints[this.roundToNearest(actionPoint.pos[0], this.chunkRadius)][this.roundToNearest(actionPoint.pos[1], this.chunkRadius)] =
                 this._actionPoints[this.roundToNearest(actionPoint.pos[0], this.chunkRadius)][this.roundToNearest(actionPoint.pos[1], this.chunkRadius)].filter((_actionPoint) => _actionPoint.id != actionPoint.id);
         }
@@ -83,7 +82,6 @@ let ClientActionPointsService = class ClientActionPointsService {
         return false;
     }
     onThreadTriggered(optimizationType) {
-        var _a, _b;
         if (optimizationType === 'chunk-checker') {
             this._cachedPlayerPosition = Cfx.Client.GetEntityCoords(Cfx.Client.PlayerPedId(), true);
             const [nearestX, nearestY] = [this.roundToNearest(this._cachedPlayerPosition[0], this.chunkRadius), this.roundToNearest(this._cachedPlayerPosition[1], this.chunkRadius)];
@@ -92,20 +90,19 @@ let ClientActionPointsService = class ClientActionPointsService {
             }
             this._cachedPlayerRoundedPosition = [nearestX, nearestY];
             this._cachedIsPlayerInAnyVehicle = Cfx.Client.IsPedInAnyVehicle(Cfx.Client.PlayerPedId(), false);
-            if ((_b = (_a = this._actionPoints[this._cachedPlayerRoundedPosition[0]]) === null || _a === void 0 ? void 0 : _a[this._cachedPlayerRoundedPosition[1]]) === null || _b === void 0 ? void 0 : _b.length) {
+            if (this._actionPoints[this._cachedPlayerRoundedPosition[0]]?.[this._cachedPlayerRoundedPosition[1]]?.length) {
                 this._ticksService.addUnique({
                     id: `${Cfx.Client.GetCurrentResourceName()}_actionpoints`,
                     function: (() => {
-                        var _a, _b, _c, _d;
-                        for (let i = 0; i < ((_b = (_a = this._actionPoints[this._cachedPlayerRoundedPosition[0]]) === null || _a === void 0 ? void 0 : _a[this._cachedPlayerRoundedPosition[1]]) === null || _b === void 0 ? void 0 : _b.length); i++) {
-                            const _actionPoint = (_c = this._actionPoints[this._cachedPlayerRoundedPosition[0]]) === null || _c === void 0 ? void 0 : _c[this._cachedPlayerRoundedPosition[1]][i];
+                        for (let i = 0; i < this._actionPoints[this._cachedPlayerRoundedPosition[0]]?.[this._cachedPlayerRoundedPosition[1]]?.length; i++) {
+                            const _actionPoint = this._actionPoints[this._cachedPlayerRoundedPosition[0]]?.[this._cachedPlayerRoundedPosition[1]][i];
                             if (calculateDistance([_actionPoint.pos[0], _actionPoint.pos[1], _actionPoint.pos[2], this._cachedPlayerPosition[0], this._cachedPlayerPosition[1], _actionPoint.pos[2]]) <= (_actionPoint.range || 1.0) + (this._cachedIsPlayerInAnyVehicle && !_actionPoint.onfootOnly ? 5 : 0)) {
                                 const actionPassed = (!_actionPoint.onceIf || _actionPoint.onceIf()) && (!_actionPoint.onfootOnly || !Cfx.Client.IsPedInAnyVehicle(Cfx.Client.PlayerPedId(), false)) && (!_actionPoint.inVehicleOnly || Cfx.Client.IsPedInAnyVehicle(Cfx.Client.PlayerPedId(), false));
                                 if (actionPassed) {
                                     _actionPoint.action();
                                 }
                                 if ((_actionPoint.once || _actionPoint.onceIf) && actionPassed) {
-                                    (_d = this._actionPoints[this._cachedPlayerRoundedPosition[0]]) === null || _d === void 0 ? void 0 : _d[this._cachedPlayerRoundedPosition[1]].splice(i, 1);
+                                    this._actionPoints[this._cachedPlayerRoundedPosition[0]]?.[this._cachedPlayerRoundedPosition[1]].splice(i, 1);
                                     i--;
                                 }
                             }
@@ -119,9 +116,8 @@ let ClientActionPointsService = class ClientActionPointsService {
         }
     }
     debug_ActionPoints() {
-        var _a, _b;
         let totalActionPoints = 0;
-        const currentAreaActionPoints = ((_b = (_a = this.actionPoints[this.roundToNearest(this._cachedPlayerPosition[0], this.chunkRadius)]) === null || _a === void 0 ? void 0 : _a[this.roundToNearest(this._cachedPlayerPosition[1], this.chunkRadius)]) === null || _b === void 0 ? void 0 : _b.length) || 0;
+        const currentAreaActionPoints = this.actionPoints[this.roundToNearest(this._cachedPlayerPosition[0], this.chunkRadius)]?.[this.roundToNearest(this._cachedPlayerPosition[1], this.chunkRadius)]?.length || 0;
         Object.keys(this.actionPoints).forEach((posXAsStr) => {
             const posX = Number(posXAsStr);
             Object.keys(this.actionPoints[posX]).forEach((posYAsStr) => {

package/dist/esm/client/services/client-blips.service.js

@@ -27,17 +27,16 @@ let ClientBlipsService = class ClientBlipsService {
     }
     // TODO: Why is createMultiple() not calling create()?
     createMultiple(...blips) {
-        const _blips = blips.map((blip) => (Object.assign(Object.assign({}, blip), { instance: null })));
+        const _blips = blips.map((blip) => ({ ...blip, instance: null }));
         this._blips.push(..._blips);
         this.refresh();
     }
     create(blip) {
-        var _a;
         const _blip = (!blip.type || blip.type === 'coords'
             ? Cfx.Client.AddBlipForCoord(blip.pos[0], blip.pos[1], blip.pos[2])
             : (blip.type === 'range'
                 ? Cfx.Client.AddBlipForRadius(blip.pos[0], blip.pos[1], blip.pos[2], blip.scale || 1.0)
-                : Cfx.Client.AddBlipForEntity((_a = blip.entityId) !== null && _a !== void 0 ? _a : Cfx.Client.PlayerPedId())));
+                : Cfx.Client.AddBlipForEntity(blip.entityId ?? Cfx.Client.PlayerPedId())));
         if (!blip.type || blip.type !== 'range') {
             Cfx.Client.SetBlipScale(_blip, blip.scale || 1.0);
         }

package/dist/esm/client/services/client-markers.service.js

@@ -23,23 +23,22 @@ let ClientMarkersService = class ClientMarkersService {
     }
     /** Defines permanent markers. Handles draw-per-tick automatically. */
     create(...markers) {
-        const _markers = markers.map((marker) => (Object.assign(Object.assign({}, marker), { instance: null })));
+        const _markers = markers.map((marker) => ({ ...marker, instance: null }));
         this._markers.push(..._markers);
         this._actionPoints.create(...markers.map((marker) => ({
             id: `${Cfx.Client.GetCurrentResourceName()}_marker_${marker.pos[0]}_${marker.pos[1]}`,
             pos: marker.pos,
             range: marker.renderDistance,
             action: async () => {
-                var _a, _b, _c, _d, _e, _f, _g;
                 if (marker.textureDict && !Cfx.Client.HasStreamedTextureDictLoaded(marker.textureDict)) {
                     Cfx.Client.RequestStreamedTextureDict(marker.textureDict, true);
                     while (!Cfx.Client.HasStreamedTextureDictLoaded(marker.textureDict)) {
                         await Delay(100);
                     }
                 }
-                Cfx.Client.DrawMarker(marker.marker, marker.pos[0], marker.pos[1], marker.pos[2], 0.0, 0.0, 0.0, ((_a = marker.rotation) === null || _a === void 0 ? void 0 : _a[0]) || 0.0, ((_b = marker.rotation) === null || _b === void 0 ? void 0 : _b[1]) || 0.0, ((_c = marker.rotation) === null || _c === void 0 ? void 0 : _c[2]) || 0.0, marker.scale, marker.scale, marker.scale, marker.rgba[0], marker.rgba[1], marker.rgba[2], marker.rgba[3], false, true, 2, false, (marker.textureDict || null), (marker.textureName || null), false);
+                Cfx.Client.DrawMarker(marker.marker, marker.pos[0], marker.pos[1], marker.pos[2], 0.0, 0.0, 0.0, marker.rotation?.[0] || 0.0, marker.rotation?.[1] || 0.0, marker.rotation?.[2] || 0.0, marker.scale, marker.scale, marker.scale, marker.rgba[0], marker.rgba[1], marker.rgba[2], marker.rgba[3], false, true, 2, false, (marker.textureDict || null), (marker.textureName || null), false);
                 if (marker.underlyingCircle) {
-                    Cfx.Client.DrawMarker(marker.underlyingCircle.marker, marker.pos[0], marker.pos[1], marker.pos[2] - 0.9, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, marker.underlyingCircle.scale, marker.underlyingCircle.scale, marker.underlyingCircle.scale, ((_d = marker.underlyingCircle.rgba) === null || _d === void 0 ? void 0 : _d[0]) || marker.rgba[0], ((_e = marker.underlyingCircle.rgba) === null || _e === void 0 ? void 0 : _e[1]) || marker.rgba[1], ((_f = marker.underlyingCircle.rgba) === null || _f === void 0 ? void 0 : _f[2]) || marker.rgba[2], ((_g = marker.underlyingCircle.rgba) === null || _g === void 0 ? void 0 : _g[3]) || marker.rgba[3], false, true, 2, false, null, null, false);
+                    Cfx.Client.DrawMarker(marker.underlyingCircle.marker, marker.pos[0], marker.pos[1], marker.pos[2] - 0.9, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, marker.underlyingCircle.scale, marker.underlyingCircle.scale, marker.underlyingCircle.scale, marker.underlyingCircle.rgba?.[0] || marker.rgba[0], marker.underlyingCircle.rgba?.[1] || marker.rgba[1], marker.underlyingCircle.rgba?.[2] || marker.rgba[2], marker.underlyingCircle.rgba?.[3] || marker.rgba[3], false, true, 2, false, null, null, false);
                 }
             }
         })));

package/dist/esm/client/services/client-translate.service.js

@@ -25,8 +25,7 @@ let ClientTranslateService = class ClientTranslateService {
         this._language = null;
     }
     instant(key) {
-        var _a;
-        return ((_a = this._translations[this.language]) === null || _a === void 0 ? void 0 : _a[key]) || key;
+        return this._translations[this.language]?.[key] || key;
     }
 };
 ClientTranslateService = __decorate([

package/dist/esm/client/services/client-waypoints.service.js

@@ -34,7 +34,7 @@ let ClientWaypointsService = class ClientWaypointsService {
             pos,
             longRange: true
         });
-        this._checkpointsService.create(2, pos[0], pos[1], pos[2], null, null, null, diameter, COLOR_MAPPINGS[color !== null && color !== void 0 ? color : 0][0], COLOR_MAPPINGS[color !== null && color !== void 0 ? color : 0][1], COLOR_MAPPINGS[color !== null && color !== void 0 ? color : 0][2], 255, 0);
+        this._checkpointsService.create(2, pos[0], pos[1], pos[2], null, null, null, diameter, COLOR_MAPPINGS[color ?? 0][0], COLOR_MAPPINGS[color ?? 0][1], COLOR_MAPPINGS[color ?? 0][2], 255, 0);
         if (routeColor !== -1) {
             Cfx.Client.SetBlipRoute(_waypoint, true);
             if (routeColor) {

package/dist/esm/client/services/i18n/i18n.changer.js

@@ -0,0 +1,29 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import { EVENT_DIRECTIONS, EventListener } from '@armoury/fivem-framework-common';
+import { Injectable } from 'injection-js';
+import { I18n } from './i18n.service';
+let I18nChanger = class I18nChanger {
+    _onLanguageChangedRequestedUnsafe(language) {
+        console.log(`Setting language to ${language}.`);
+        Cfx.Client.SetResourceKvp('armoury:language', language);
+        I18n.setLanguage(language);
+    }
+};
+__decorate([
+    EventListener({ eventName: 'armoury:unsafe:language:change:request', direction: EVENT_DIRECTIONS.CLIENT_TO_CLIENT }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", void 0)
+], I18nChanger.prototype, "_onLanguageChangedRequestedUnsafe", null);
+I18nChanger = __decorate([
+    Injectable()
+], I18nChanger);
+export { I18nChanger };

package/dist/esm/client/services/i18n/i18n.service.js

@@ -4,18 +4,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var I18n_1;
-import { APP_INITIALIZER, EVENT_DIRECTIONS, EventListener } from '@armoury/fivem-framework-common';
+import { APP_INITIALIZER } from '@armoury/fivem-framework-common';
 import Polyglot from 'node-polyglot';
 import { Injectable } from 'injection-js';
-let I18n = I18n_1 = class I18n {
+let I18n = class I18n {
     static withOptions(options = {}) {
-        var _a;
-        const language = (_a = (Cfx.Client.GetResourceKvpString('armoury:language')
-            || options.defaultLanguage)) !== null && _a !== void 0 ? _a : 'en-US';
+        const language = (Cfx.Client.GetResourceKvpString('armoury:language')
+            || options.defaultLanguage) ?? 'en-US';
         return {
             provide: APP_INITIALIZER,
             useValue: () => this.loadLanguage(language),
@@ -55,20 +50,9 @@ let I18n = I18n_1 = class I18n {
     static translate(key, params = {}) {
         return this.polyglot.t(key, params);
     }
-    _onLanguageChangedRequestedUnsafe(language) {
-        console.log(`Setting language to ${language}.`);
-        Cfx.Client.SetResourceKvp('armoury:language', language);
-        I18n_1.setLanguage(language);
-    }
 };
 I18n.polyglot = new Polyglot();
-__decorate([
-    EventListener({ eventName: 'armoury:unsafe:language:change:request', direction: EVENT_DIRECTIONS.CLIENT_TO_CLIENT }),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
-    __metadata("design:returntype", void 0)
-], I18n.prototype, "_onLanguageChangedRequestedUnsafe", null);
-I18n = I18n_1 = __decorate([
+I18n = __decorate([
     Injectable()
 ], I18n);
 export { I18n };

package/dist/esm/client/services/i18n/index.js

@@ -1 +1,2 @@
+export * from './i18n.changer';
 export * from './i18n.service';

package/dist/types/client/index.d.ts

@@ -3,8 +3,9 @@ import 'reflect-metadata';
 import { Provider } from 'injection-js';
 import { ClientActionPointsService, ClientBlipsService, ClientCheckpointsService, ClientMarkersService, ClientPedsService, ClientSessionService, ClientTicksService, ClientUIService, ClientVehiclesService, ClientWaypointsService, ClientHudService, UI } from './services';
 import { BootstrapOptions } from '@armoury/fivem-framework-common';
+import { I18nChanger } from './services/i18n/i18n.changer';
 export declare const CLIENT_PROVIDERS: (typeof ClientTicksService | typeof ClientActionPointsService | typeof ClientBlipsService | typeof ClientCheckpointsService | typeof ClientHudService | typeof ClientMarkersService | typeof ClientPedsService | typeof ClientSessionService | typeof ClientVehiclesService | typeof ClientUIService | typeof ClientWaypointsService)[];
-export declare const CLIENT_EAGER_PROVIDERS: (typeof UI)[];
+export declare const CLIENT_EAGER_PROVIDERS: (typeof UI | typeof I18nChanger)[];
 export declare function bootstrap<T extends {
     new (...args: any[]): any;
 } & Provider>(_class: T, options?: BootstrapOptions): Promise<InstanceType<T>>;

package/dist/types/client/services/i18n/i18n.changer.d.ts

@@ -0,0 +1,3 @@
+export declare class I18nChanger {
+    protected _onLanguageChangedRequestedUnsafe(language: string): void;
+}

package/dist/types/client/services/i18n/i18n.service.d.ts

@@ -5,7 +5,6 @@ export declare class I18n {
     static setLanguage(language: string): void;
     private static loadLanguage;
     static translate(key: string, params?: TranslationParams): string;
-    protected _onLanguageChangedRequestedUnsafe(language: string): void;
 }
 type I18nOptions = {
     defaultLanguage?: string;

package/dist/types/client/services/i18n/index.d.ts

@@ -1 +1,2 @@
+export * from './i18n.changer';
 export * from './i18n.service';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@armoury/fivem-framework-client",
-  "version": "1.0.53",
+  "version": "1.0.55",
   "description": "Client APIs for the Armoury FiveM framework",
   "main": "dist/cjs/client/index.js",
   "module": "dist/esm/client/index.js",
@@ -27,7 +27,7 @@
     "rxjs": "^7.8.1"
   },
   "peerDependencies": {
-    "@armoury/fivem-framework-common": "1.0.53",
+    "@armoury/fivem-framework-common": "1.0.55",
     "node-polyglot": "2.6.0"
   },
   "publishConfig": {