chore: bump version to v3.31.2

fxmanifest.lua

@@ -6,7 +6,7 @@ rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aw
 
 name 'ox_lib'
 author 'Overextended'
-version '3.31.0'
+version '3.31.2'
 license 'LGPL-3.0-or-later'
 repository 'https://github.com/communityox/ox_lib'
 description 'A library of shared functions to utilise in other resources.'

imports/points/client.lua

@@ -39,10 +39,14 @@ local function removePoint(self)
     points[self.id] = nil
 end
 
+local function hasRemovePoint(entry)
+    return entry.remove == removePoint
+end
+
 CreateThread(function()
     while true do
         local coords = GetEntityCoords(cache.ped)
-        local newPoints = lib.grid.getNearbyEntries(coords, function(entry) return entry.remove == removePoint end) --[[@as CPoint[] ]]
+        local newPoints = lib.grid.getNearbyEntries(coords, hasRemovePoint) --[[@as CPoint[] ]]
         local cellX, cellY = lib.grid.getCellPosition(coords)
         cache.coords = coords
         closestPoint = nil
@@ -89,9 +93,11 @@ CreateThread(function()
                 nearbyCount += 1
                 nearbyPoints[nearbyCount] = point
 
-                if point.onEnter and not point.inside then
+                if not point.inside then
                     point.inside = true
-                    point:onEnter()
+                    if point.onEnter then
+                        point:onEnter()
+                    end
                 end
             elseif point.currentDistance then
                 if point.onExit then point:onExit() end

imports/table/shared.lua

@@ -123,11 +123,24 @@ local function shuffle(tbl)
     return tbl
 end
 
+
+---@param tbl table
+---@param fn function(value: any, key: any): any
+---@return table
+local function map(tbl, fn)
+    local result = {}
+    for k, v in pairs(tbl) do
+        result[k] = fn(v, k)
+    end
+    return result
+end
+
 table.contains = contains
 table.matches = table_matches
 table.deepclone = table_deepclone
 table.merge = table_merge
 table.shuffle = shuffle
+table.map = map
 
 local frozenNewIndex = function(self) error(('cannot set values on a frozen table (%s)'):format(self), 2) end
 local _rawset = rawset

locales/fr.json

@@ -7,27 +7,27 @@
     "confirm": "Confirmer",
     "more": "Plus...",
     "settings": {
-      "locale": "Change locale",
+      "locale": "Changer la langue",
-      "locale_description": "Current language: ${language} (%s)",
+      "locale_description": "Langue actuelle : ${language} (%s)",
-      "notification_audio": "Notification audio",
+      "notification_audio": "Audio des notifications",
-      "notification_position": "Notification position"
+      "notification_position": "Position des notifications"
     },
     "position": {
-      "bottom": "Bottom",
+      "bottom": "Bas",
-      "bottom-left": "Bottom-left",
+      "bottom-left": "Bas-gauche",
-      "bottom-right": "Bottom-right",
+      "bottom-right": "Bas-droite",
-      "center-left": "Center-left",
+      "center-left": "Centre-gauche",
-      "center-right": "Center-right",
+      "center-right": "Centre-droite",
-      "top": "Top",
+      "top": "Haut",
-      "top-left": "Top-left",
+      "top-left": "Haut-gauche",
-      "top-right": "Top-right"
+      "top-right": "Haut-droite"
     }
   },
-  "open_radial_menu": "Open radial menu",
+  "open_radial_menu": "Ouvrir le menu radial",
-  "cancel_progress": "Cancel current progress bar",
+  "cancel_progress": "Annuler la barre de progression actuelle",
-  "txadmin_announcement": "Server announcement by %s",
+  "txadmin_announcement": "Annonce serveur par %s",
-  "txadmin_dm": "Direct Message from %s",
+  "txadmin_dm": "Message privé de %s",
-  "txadmin_warn": "You have been warned by %s",
+  "txadmin_warn": "Vous avez été averti par %s",
-  "txadmin_warn_content": "%s  \nAction ID: %s",
+  "txadmin_warn_content": "%s\nID de l'action : %s",
-  "txadmin_scheduledrestart": "Scheduled Restart"
+  "txadmin_scheduledrestart": "Redémarrage programmé"
 }

package/client/resource/addKeybind/index.ts

@@ -0,0 +1,120 @@
+interface CKeybind extends KeybindProps {
+  currentKey: string;
+  disabled: boolean;
+  isPressed: boolean;
+  hash: number;
+  getCurrentKey(): string;
+  isControlPressed(): boolean;
+}
+
+interface KeybindProps {
+  name: string;
+  description: string;
+  defaultMapper?: string;
+  defaultKey?: string;
+  disabled?: boolean;
+  disable?(this: CKeybind, toggle: boolean): void;
+  onPressed?(this: CKeybind): void;
+  onReleased?(this: CKeybind): void;
+  [key: string]: any;
+}
+
+const keybinds: Record<string, CKeybind> = {};
+
+class Keybind implements CKeybind {
+  name: string;
+  description: string;
+  defaultMapper?: string;
+  defaultKey?: string;
+  onPressed?: (this: CKeybind) => void;
+  onReleased?: (this: CKeybind) => void;
+  secondaryKey?: string;
+  secondaryMapper?: string;
+  [key: string]: any;
+
+  disabled: boolean = false;
+  isPressed: boolean = false;
+  hash: number;
+
+  constructor(data: KeybindProps) {
+    this.name = data.name;
+    this.description = data.description;
+    this.defaultMapper = data.defaultMapper ?? "keyboard";
+    this.defaultKey = data.defaultKey ?? "";
+    this.secondaryKey = data.secondaryKey;
+    this.secondaryMapper = data.secondaryMapper;
+
+    if (typeof data.disabled === "boolean") this.disabled = data.disabled;
+    this.onPressed = data.onPressed;
+    this.onReleased = data.onReleased;
+
+    this.hash = GetHashKey("+" + this.name) | 0x80000000;
+  }
+
+  get currentKey(): string {
+    return this.getCurrentKey();
+  }
+
+  getCurrentKey(): string {
+    const label = GetControlInstructionalButton(0, this.hash, true);
+    return label.substring(2);
+  }
+
+  isControlPressed(): boolean {
+    return this.isPressed;
+  }
+
+  disable(toggle: boolean): void {
+    this.disabled = toggle;
+  }
+}
+
+
+export function addKeybind(data: KeybindProps): CKeybind {
+  const kb = new Keybind(data);
+
+  keybinds[kb.name] = kb;
+
+  RegisterCommand("+" + kb.name, () => {
+    if (kb.disabled || IsPauseMenuActive()) return;
+    kb.isPressed = true;
+    kb.onPressed?.call(kb);
+  }, false);
+
+  RegisterCommand("-" + kb.name, () => {
+    if (kb.disabled || IsPauseMenuActive()) return;
+    kb.isPressed = false;
+    kb.onReleased?.call(kb);
+  }, false);
+
+  RegisterKeyMapping(
+    "+" + kb.name,
+    kb.description,
+    kb.defaultMapper ?? "keyboard",
+    kb.defaultKey ?? ""
+  );
+
+  if (kb.secondaryKey) {
+    RegisterKeyMapping(
+      "~!+" + kb.name,
+      kb.description,
+      kb.secondaryMapper ?? kb.defaultMapper ?? "keyboard",
+      kb.secondaryKey
+    );
+  }
+
+  setTimeout(() => {
+    emit("chat:removeSuggestion", `/+${kb.name}`);
+    emit("chat:removeSuggestion", `/-${kb.name}`);
+  }, 500);
+
+  return kb;
+}
+
+export function getKeybind(name: string): CKeybind | undefined {
+  return keybinds[name];
+}
+
+export function getAllKeybinds(): Readonly<Record<string, CKeybind>> {
+  return keybinds;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@communityox/ox_lib",
   "author": "Overextended",
-  "version": "3.31.0",
+  "version": "3.31.2",
   "description": "JS/TS wrapper for ox_lib exports",
   "main": "./shared/index.js",
   "types": "./shared/index.d.ts",