@nativewrappers/fivem 0.0.88 → 0.0.90

package/Model.js

@@ -1,5 +1,6 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { Delay } from "./common/utils/Delay";
 import { Vector3 } from "./common/utils/Vector";
 import { VehicleHash } from "./hashes/VehicleHash";
 class Model {
@@ -192,7 +193,7 @@ class Model {
     RequestModel(this.hash);
     const timeout = GetGameTimer() + timeoutMs;
     while (!this.IsLoaded && GetGameTimer() < timeout) {
-      await Wait(0);
+      await Delay(0);
     }
     this.requestedModel = true;
     return this.IsLoaded;

package/World.d.ts

@@ -12,6 +12,7 @@ import type { MarkerType } from "./enums/MarkerType";
 import type { PickupType } from "./enums/PickupType";
 import { IntersectFlags } from "./enums/RaycastEnums";
 import type { RopeType } from "./enums/RopeType";
+import type { VehicleSeat } from "./enums/Vehicle";
 import { Weather } from "./enums/Weather";
 import type { BaseEntity } from "./models/BaseEntity";
 import { Ped } from "./models/Ped";
@@ -185,10 +186,21 @@ export declare abstract class World {
      * @param model Ped model to be spawned.
      * @param position World position (coordinates) of Ped spawn.
      * @param heading Heading of Ped when spawning.
-     * @param isNetwork
+     * @param shouldNetwork if the created ped should be networked to other clients
      * @returns Ped object.
      */
-    static createPed(model: Model, position: Vector3, heading?: number, isNetwork?: boolean, pinToScript?: boolean): Promise<Ped | null>;
+    static createPed(model: Model, position: Vector3, heading?: number, shouldNetwork?: boolean, pinToScript?: boolean): Promise<Ped | null>;
+    /**
+     * Created a ped in the specified vehicle
+     *
+     * @param vehicle the vehicle to create the ped in
+     * @param model Ped model to be spawned.
+     * @param seat the seat to spawn the ped into
+     * @param heading Heading of Ped when spawning.
+     * @param shouldNetwork if the created ped should be networked
+     * @returns the ped that was created, or null if it doesn't exist.
+     */
+    static createPedInsideVehicle(vehicle: Vehicle, model: Model, seat: VehicleSeat, shouldNetwork?: boolean, pinToScript?: boolean): Promise<Ped | null>;
     /**
      * Creates a [[`Ped`]] with a random model.
      *

package/World.js

@@ -1,5 +1,6 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { Delay } from "./common/utils/Delay";
 import { Vector3 } from "./common/utils/Vector";
 import { Blip } from "./Blip";
 import { Camera } from "./Camera";
@@ -333,14 +334,32 @@ class World {
    * @param model Ped model to be spawned.
    * @param position World position (coordinates) of Ped spawn.
    * @param heading Heading of Ped when spawning.
-   * @param isNetwork
+   * @param shouldNetwork if the created ped should be networked to other clients
    * @returns Ped object.
    */
-  static async createPed(model, position, heading = 0, isNetwork = true, pinToScript = true) {
+  static async createPed(model, position, heading = 0, shouldNetwork = true, pinToScript = true) {
+    if (!model.IsPed || !await model.request(1e3)) {
+      return null;
+    }
+    const ped = CreatePed(-1, model.Hash, position.x, position.y, position.z, heading, shouldNetwork, pinToScript);
+    model.markAsNoLongerNeeded();
+    return Ped.fromHandle(ped);
+  }
+  /**
+   * Created a ped in the specified vehicle
+   *
+   * @param vehicle the vehicle to create the ped in
+   * @param model Ped model to be spawned.
+   * @param seat the seat to spawn the ped into
+   * @param heading Heading of Ped when spawning.
+   * @param shouldNetwork if the created ped should be networked
+   * @returns the ped that was created, or null if it doesn't exist.
+   */
+  static async createPedInsideVehicle(vehicle, model, seat, shouldNetwork = true, pinToScript = true) {
     if (!model.IsPed || !await model.request(1e3)) {
       return null;
     }
-    const ped = CreatePed(-1, model.Hash, position.x, position.y, position.z, heading, isNetwork, pinToScript);
+    const ped = CreatePedInsideVehicle(vehicle.Handle, -1, model.Hash, seat, shouldNetwork, pinToScript);
     model.markAsNoLongerNeeded();
     return Ped.fromHandle(ped);
   }
@@ -378,9 +397,7 @@ class World {
       return null;
     }
     const vehicle = CreateVehicle(model.Hash, position.x, position.y, position.z, heading, isNetwork, pinToScript);
-    if (vehicle === 0) {
-      return null;
-    }
+    model.markAsNoLongerNeeded();
     return new Vehicle(vehicle);
   }
   /**
@@ -422,7 +439,7 @@ class World {
         RopeLoadTextures();
       }
       while (!RopeAreTexturesLoaded()) {
-        await Wait(0);
+        await Delay(0);
       }
     }
     const [ropeHandle] = AddRope(
@@ -815,10 +832,7 @@ class World {
    */
   static getClosestObject(model, coords, radius = 25, isMission = false) {
     const prop = GetClosestObjectOfType(coords.x, coords.y, coords.z, radius, model.Hash, isMission, false, false);
-    if (prop !== 0) {
-      return new Prop(prop);
-    }
-    return null;
+    return Prop.fromHandle(prop);
   }
   /**
    * Get all [[`Prop`]] entities in your own scope.
@@ -827,9 +841,7 @@ class World {
    */
   static getAllProps() {
     const handles = GetGamePool("CObject");
-    const props = [];
-    handles.forEach((handle) => props.push(new Prop(handle)));
-    return props;
+    return handles.map((handle) => new Prop(handle));
   }
   /**
    * Get all [[`Rope`]] entities in your own scope.
@@ -838,9 +850,7 @@ class World {
    */
   static getAllRopes() {
     const handles = GetAllRopes();
-    const props = [];
-    handles.forEach((handle) => props.push(new Rope(handle)));
-    return props;
+    return handles.map((handle) => new Rope(handle));
   }
   /**
    * Get all [[`Ped`]] entities in your own scope.
@@ -849,9 +859,7 @@ class World {
    */
   static getAllPeds() {
     const handles = GetGamePool("CPed");
-    const peds = [];
-    handles.forEach((handle) => peds.push(new Ped(handle)));
-    return peds;
+    return handles.map((handle) => new Ped(handle));
   }
   /**
    * Get all [[`Vehicle`]] entities in your own scope.
@@ -860,9 +868,7 @@ class World {
    */
   static getAllVehicles() {
     const handles = GetGamePool("CVehicle");
-    const vehicles = [];
-    handles.forEach((handle) => vehicles.push(new Vehicle(handle)));
-    return vehicles;
+    return handles.map((handle) => new Vehicle(handle));
   }
   /**
    * Gets the cloest [[`Vehicle`]] to the current coords, or null if none are found
@@ -892,9 +898,7 @@ class World {
    */
   static getAllPickups() {
     const handles = GetGamePool("CPickup");
-    const pickups = [];
-    handles.forEach((handle) => pickups.push(new Pickup(handle)));
-    return pickups;
+    return handles.map((handle) => new Pickup(handle));
   }
   static currentCloudHat = CloudHat.Clear;
   static cloudHatDict = /* @__PURE__ */ new Map([

package/package.json

@@ -8,7 +8,7 @@
   ],
   "license": "MIT",
   "type": "module",
-  "version": "0.0.88",
+  "version": "0.0.90",
   "repository": {
     "type": "git",
     "url": "https://github.com/nativewrappers/nativewrappers.git"

package/ui/menu/Menu.d.ts

@@ -4,9 +4,9 @@ import { MenuAlignment } from "../../enums/MenuAlignment";
 import { LiteEvent } from "../../utils/LiteEvent";
 import { Point } from "../../utils/Point";
 import { Size } from "../../utils/Size";
-import { UIMenuItem } from "./items/UIMenuItem";
 import { MenuControls } from "./MenuControls";
 import { MenuSettings } from "./MenuSettings";
+import { UIMenuItem } from "./items/UIMenuItem";
 export declare class Menu {
     static screenAspectRatio: number;
     static screenHeight: number;

package/ui/menu/Menu.js

@@ -1,15 +1,16 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 import { Color } from "../../common/utils/Color";
+import { Delay } from "../../common/utils/Delay";
 import { Audio } from "../../Audio";
+import { Game } from "../../Game";
+import { GameplayCamera } from "../../GameplayCamera";
 import { Alignment } from "../../enums/Alignment";
 import { Control } from "../../enums/Control";
 import { CursorSprite } from "../../enums/CursorSprite";
 import { Font } from "../../enums/Font";
 import { InputMode } from "../../enums/InputMode";
 import { MenuAlignment } from "../../enums/MenuAlignment";
-import { Game } from "../../Game";
-import { GameplayCamera } from "../../GameplayCamera";
 import { Crypto } from "../../utils/Crypto";
 import { LiteEvent } from "../../utils/LiteEvent";
 import { Point } from "../../utils/Point";
@@ -20,13 +21,13 @@ import { Rectangle } from "../Rectangle";
 import { Screen } from "../Screen";
 import { Sprite } from "../Sprite";
 import { Text } from "../Text";
+import { MenuControls } from "./MenuControls";
+import { MenuSettings } from "./MenuSettings";
 import { UIMenuCheckboxItem } from "./items/UIMenuCheckboxItem";
 import { UIMenuItem } from "./items/UIMenuItem";
 import { UIMenuListItem } from "./items/UIMenuListItem";
 import { UIMenuSeparatorItem } from "./items/UIMenuSeparatorItem";
 import { UIMenuSliderItem } from "./items/UIMenuSliderItem";
-import { MenuControls } from "./MenuControls";
-import { MenuSettings } from "./MenuSettings";
 class Menu {
   static {
     __name(this, "Menu");
@@ -573,7 +574,7 @@ class Menu {
           this.CurrentSelection = hoveredItemIndex;
           this.indexChange.emit(this.CurrentSelection);
         }
-        await Wait(this._navigationDelay);
+        await Delay(this._navigationDelay);
         while (Game.isDisabledControlPressed(0, Control.Attack) && hoveredItem.IsMouseInBounds) {
           if (hoveredItem.selected) {
             if (hoveredItem.enabled) {
@@ -592,7 +593,7 @@ class Menu {
             this.CurrentSelection = hoveredItemIndex;
             this.indexChange.emit(this.CurrentSelection);
           }
-          await Wait(125);
+          await Delay(125);
         }
         this._mousePressed = false;
       })();
@@ -606,10 +607,10 @@ class Menu {
         (async () => {
           this._mousePressed = true;
           this.goUp();
-          await Wait(this._navigationDelay);
+          await Delay(this._navigationDelay);
           while (Game.isDisabledControlPressed(0, Control.Attack)) {
             this.goUp();
-            await Wait(125);
+            await Delay(125);
           }
           this._mousePressed = false;
         })();
@@ -626,10 +627,10 @@ class Menu {
         (async () => {
           this._mousePressed = true;
           this.goDown();
-          await Wait(this._navigationDelay);
+          await Delay(this._navigationDelay);
           while (Game.isDisabledControlPressed(0, Control.Attack)) {
             this.goDown();
-            await Wait(125);
+            await Delay(125);
           }
           this._mousePressed = false;
         })();

package/weapon/WeaponAsset.js

@@ -1,5 +1,6 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { Delay } from "../common/utils/Delay";
 import { Game } from "../Game";
 import { Weapon } from "./Weapon";
 class WeaponAsset {
@@ -50,7 +51,7 @@ class WeaponAsset {
     this.request();
     const start = GetGameTimer();
     while (!this.IsLoaded) {
-      await Wait(100);
+      await Delay(100);
       const now = GetGameTimer();
       if (now - start >= timeout) {
         return false;