@nativewrappers/fivem 0.0.135 → 0.0.137

package/Pickup.d.ts

@@ -2,6 +2,10 @@ import { Vector3 } from "./common/utils/Vector";
 export declare class Pickup {
     private handle;
     constructor(handle: number);
+    /**
+     * @returns `true` if the current entity is networked, false otherwise
+     */
+    get IsNetworked(): boolean;
     get Position(): Vector3;
     get IsCollected(): boolean;
     delete(): void;

package/Pickup.js

@@ -9,6 +9,12 @@ class Pickup {
   constructor(handle) {
     this.handle = handle;
   }
+  /**
+   * @returns `true` if the current entity is networked, false otherwise
+   */
+  get IsNetworked() {
+    return NetworkGetEntityIsNetworked(this.handle);
+  }
   get Position() {
     return Vector3.fromArray(GetPickupCoords(this.handle));
   }

package/World.d.ts

@@ -1,5 +1,5 @@
 import type { Color } from "./common/utils/Color";
-import { Vector3 } from "./common/utils/Vector";
+import { Vector3, Vector4 } from "./common/utils/Vector";
 import { Blip } from "./Blip";
 import { Camera } from "./Camera";
 import { Model } from "./Model";
@@ -178,18 +178,35 @@ export declare abstract class World {
      * Create a ped at a desired location.
      *
      * ```typescript
-     * const position = new Vector3(-802.311, 175.056, 72.8446);
+     * const position = new Vector3(-802.31, 175.06, 72.84);
      * const model = new Model("a_f_m_beach_01");
      * const myPed = await World.createPed(model, position);
      * ```
      *
      * @param model Ped model to be spawned.
      * @param position World position (coordinates) of Ped spawn.
-     * @param heading Heading of Ped when spawning.
-     * @param shouldNetwork if the created ped should be networked to other clients
+     * @param [heading=0] Heading of Ped when spawning.
+     * @param [shouldNetwork=false] if the created ped should be networked to other clients
+     * @param [pinToScript=true] if the ped should be pinned to the script.
      * @returns Ped object.
      */
     static createPed(model: Model, position: Vector3, heading?: number, shouldNetwork?: boolean, pinToScript?: boolean): Promise<Ped | null>;
+    /**
+     * Create a ped at a desired location.
+     *
+     * ```typescript
+     * const position = new Vector4(-802.31, 175.05, 72.84, 122.75);
+     * const model = new Model("a_f_m_beach_01");
+     * const myPed = await World.createPed(model, position);
+     * ```
+     *
+     * @param model Ped model to be spawned.
+     * @param position World position (coordinates) of Ped spawn, note that the `w` section of Vector4 is used for heading.
+     * @param [shouldNetwork=false] if the created ped should be networked to other clients
+     * @param [pinToScript=true] if the ped should be pinned to the script.
+     * @returns Ped object.
+     */
+    static createPed(model: Model, position: Vector4, shouldNetwork?: boolean, pinToScript?: boolean): Promise<Ped | null>;
     /**
      * Created a ped in the specified vehicle
      *

package/World.js

@@ -1,7 +1,7 @@
 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 { Vector3, Vector4 } from "./common/utils/Vector";
 import { Blip } from "./Blip";
 import { Camera } from "./Camera";
 import { GameplayCamera } from "./GameplayCamera";
@@ -322,26 +322,30 @@ class World {
       )
     );
   }
-  /**
-   * Create a ped at a desired location.
-   *
-   * ```typescript
-   * const position = new Vector3(-802.311, 175.056, 72.8446);
-   * const model = new Model("a_f_m_beach_01");
-   * const myPed = await World.createPed(model, position);
-   * ```
-   *
-   * @param model Ped model to be spawned.
-   * @param position World position (coordinates) of Ped spawn.
-   * @param heading Heading of Ped when spawning.
-   * @param shouldNetwork if the created ped should be networked to other clients
-   * @returns Ped object.
-   */
-  static async createPed(model, position, heading = 0, shouldNetwork = true, pinToScript = true) {
+  static async createPed(model, position, headingOrNetwork, shouldNetworkOrPin, pinToScript) {
     if (!model.IsPed || !await model.request(1e3)) {
       return null;
     }
-    const ped = CreatePed(-1, model.Hash, position.x, position.y, position.z, heading, shouldNetwork, pinToScript);
+    if (position instanceof Vector4) {
+      const shouldNetwork2 = headingOrNetwork ?? false;
+      const pinToScriptValue2 = shouldNetworkOrPin ?? true;
+      const ped2 = CreatePed(
+        -1,
+        model.Hash,
+        position.x,
+        position.y,
+        position.z,
+        position.w,
+        shouldNetwork2,
+        pinToScriptValue2
+      );
+      model.markAsNoLongerNeeded();
+      return Ped.fromHandle(ped2);
+    }
+    const heading = headingOrNetwork ?? 0;
+    const shouldNetwork = shouldNetworkOrPin ?? false;
+    const pinToScriptValue = pinToScript ?? true;
+    const ped = CreatePed(-1, model.Hash, position.x, position.y, position.z, heading, shouldNetwork, pinToScriptValue);
     model.markAsNoLongerNeeded();
     return Ped.fromHandle(ped);
   }

package/common/GlobalData.d.ts

@@ -1,3 +1,11 @@
+export declare enum ErrorType {
+    Event = 0,
+    NetEvent = 1,
+    Export = 2,
+    Nui = 3,
+    Tick = 4,
+    Immediate = 5
+}
 export declare class GlobalData {
     static CurrentResource: string;
     static GameName: string;
@@ -9,4 +17,5 @@ export declare class GlobalData {
     static NetworkTick: number | null;
     static NetworkedTicks: any[];
     static EnablePrettyPrint: boolean;
+    static OnError: (type: ErrorType, err: Error) => void;
 }

package/common/GlobalData.js

@@ -1,5 +1,14 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var ErrorType = /* @__PURE__ */ ((ErrorType2) => {
+  ErrorType2[ErrorType2["Event"] = 0] = "Event";
+  ErrorType2[ErrorType2["NetEvent"] = 1] = "NetEvent";
+  ErrorType2[ErrorType2["Export"] = 2] = "Export";
+  ErrorType2[ErrorType2["Nui"] = 3] = "Nui";
+  ErrorType2[ErrorType2["Tick"] = 4] = "Tick";
+  ErrorType2[ErrorType2["Immediate"] = 5] = "Immediate";
+  return ErrorType2;
+})(ErrorType || {});
 class GlobalData {
   static {
     __name(this, "GlobalData");
@@ -14,7 +23,13 @@ class GlobalData {
   static NetworkTick = null;
   static NetworkedTicks = [];
   static EnablePrettyPrint = true;
+  /*
+   * Called when one of the decors errors
+   */
+  static OnError = /* @__PURE__ */ __name((type, err) => {
+  }, "OnError");
 }
 export {
+  ErrorType,
   GlobalData
 };

package/common/collections/CircularBuffer.d.ts

@@ -0,0 +1,18 @@
+export declare class CircularBuffer<T> {
+    private buffer;
+    private tail;
+    private count;
+    private max_size;
+    constructor(max_size: number);
+    push(item: T): void;
+    pop(): T | undefined;
+    peek(): T | undefined;
+    [Symbol.iterator](): Iterator<T>;
+    for_each(callback: (item: T, index: number) => void): void;
+    average(this: CircularBuffer<number>): number;
+    is_empty(): boolean;
+    is_full(): boolean;
+    size(): number;
+    capacity(): number;
+    clear(): void;
+}

package/common/collections/CircularBuffer.js

@@ -0,0 +1,92 @@
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+class CircularBuffer {
+  static {
+    __name(this, "CircularBuffer");
+  }
+  buffer;
+  tail = 0;
+  count = 0;
+  max_size;
+  constructor(max_size) {
+    if (max_size <= 0) {
+      throw new Error("Buffer size must be greater than 0");
+    }
+    this.max_size = max_size;
+    this.buffer = new Array(max_size);
+  }
+  push(item) {
+    this.buffer[this.tail] = item;
+    this.tail++;
+    if (this.tail >= this.max_size) {
+      this.tail = 0;
+    }
+    if (this.count < this.max_size) {
+      this.count++;
+    }
+  }
+  pop() {
+    if (this.is_empty()) {
+      return void 0;
+    }
+    this.tail--;
+    if (this.tail < 0) {
+      this.tail = this.max_size - 1;
+    }
+    const item = this.buffer[this.tail];
+    this.buffer[this.tail] = void 0;
+    this.count--;
+    return item;
+  }
+  peek() {
+    if (this.is_empty()) {
+      return void 0;
+    }
+    let peek_index = this.tail - 1;
+    if (peek_index < 0) {
+      peek_index = this.max_size - 1;
+    }
+    return this.buffer[peek_index];
+  }
+  *[Symbol.iterator]() {
+    for (let i = 0; i < this.count; i++) {
+      yield this.buffer[i];
+    }
+  }
+  for_each(callback) {
+    let i = 0;
+    for (const item of this) {
+      callback(item, i++);
+    }
+  }
+  average() {
+    if (this.is_empty()) {
+      return 0;
+    }
+    let sum = 0;
+    for (const item of this) {
+      sum += item;
+    }
+    return sum / this.count;
+  }
+  is_empty() {
+    return this.count === 0;
+  }
+  is_full() {
+    return this.count === this.max_size;
+  }
+  size() {
+    return this.count;
+  }
+  capacity() {
+    return this.max_size;
+  }
+  clear() {
+    this.buffer = new Array(this.max_size);
+    this.tail = 0;
+    this.count = 0;
+  }
+}
+export {
+  CircularBuffer
+};

package/common/collections/Stack.d.ts

@@ -0,0 +1,9 @@
+declare class Stack<T> {
+    private items;
+    push(item: T): void;
+    pop(): T | undefined;
+    peek(): T | undefined;
+    is_empty(): boolean;
+    size(): number;
+    clear(): void;
+}

package/common/decors/Events.js

@@ -1,6 +1,6 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-import { GlobalData } from "../GlobalData";
+import { ErrorType, GlobalData } from "../GlobalData";
 const DisablePrettyPrint = /* @__PURE__ */ __name(() => GlobalData.EnablePrettyPrint = false, "DisablePrettyPrint");
 const AsyncFunction = (async () => {
 }).constructor;
@@ -14,6 +14,7 @@ function OnEvent(eventName) {
         try {
           return await originalMethod.call(this, ...args);
         } catch (e) {
+          GlobalData.OnError(ErrorType.Event, e);
           REMOVE_EVENT_LOG: {
             if (!GlobalData.EnablePrettyPrint) return;
             console.error("------- EVENT ERROR --------");
@@ -62,6 +63,7 @@ function OnNetEvent(eventName, remoteOnly = true) {
           }
           return await originalMethod.call(this, ...args);
         } catch (e) {
+          GlobalData.OnError(ErrorType.NetEvent, e);
           REMOVE_NET_EVENT_LOG: {
             if (!GlobalData.EnablePrettyPrint) return;
             console.error("------- NET EVENT ERROR --------");
@@ -90,7 +92,13 @@ function OnNuiEvent(eventName, dontErrorWhenCbIsntInvoked = false) {
           wasInvoked = true;
           cb(args);
         }, "cbWrapper");
-        const retData = await originalMethod.call(this, data, cbWrapper);
+        let retData;
+        try {
+          retData = await originalMethod.call(this, data, cbWrapper);
+        } catch (e) {
+          GlobalData.OnError(ErrorType.Nui, e);
+          return;
+        }
         if (!wasInvoked && !retData) {
           if (dontErrorWhenCbIsntInvoked) return;
           throw new Error(

package/common/decors/Exports.js

@@ -1,6 +1,6 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-import { GlobalData } from "../GlobalData";
+import { ErrorType, GlobalData } from "../GlobalData";
 const AsyncFunction = (async () => {
 }).constructor;
 function Exports(exportName) {
@@ -15,6 +15,7 @@ function Exports(exportName) {
           try {
             return await originalMethod.call(this, ...args);
           } catch (err) {
+            GlobalData.OnError(ErrorType.Export, err);
             REMOVE_EVENT_LOG: {
               if (!GlobalData.EnablePrettyPrint) return;
               console.error("------- EXPORT ERROR --------");
@@ -31,6 +32,7 @@ function Exports(exportName) {
           try {
             return originalMethod.call(this, ...args);
           } catch (err) {
+            GlobalData.OnError(ErrorType.Export, err);
             REMOVE_EVENT_LOG: {
               if (!GlobalData.EnablePrettyPrint) return;
               console.error("------- EXPORT ERROR --------");

package/common/decors/Ticks.js

@@ -1,5 +1,6 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { ErrorType, GlobalData } from "../GlobalData";
 function SetTick() {
   return /* @__PURE__ */ __name(function actualDecorator(originalMethod, context) {
     if (context.private) {
@@ -7,7 +8,11 @@ function SetTick() {
     }
     context.addInitializer(function() {
       setTick(async () => {
-        await originalMethod.call(this);
+        try {
+          await originalMethod.call(this);
+        } catch (e) {
+          GlobalData.OnError(ErrorType.Tick, e);
+        }
       });
     });
   }, "actualDecorator");
@@ -20,7 +25,11 @@ function SetImmediate() {
     }
     context.addInitializer(function() {
       setImmediate(async () => {
-        await originalMethod.call(this);
+        try {
+          await originalMethod.call(this);
+        } catch (e) {
+          GlobalData.OnError(ErrorType.Immediate, e);
+        }
       });
     });
   }, "actualDecorator");

package/common-game/entities/CommonBaseEntityBoneCollection.d.ts

@@ -5,5 +5,6 @@ export declare abstract class CommonBaseEntityBoneCollection {
     constructor(owner: IHandle);
     hasBone(name: string): boolean;
     abstract getBone(boneIndex?: number, boneName?: string): CommonBaseEntityBone;
+    abstract getBoneFromName(boneName: string): CommonBaseEntityBone;
     abstract get Core(): CommonBaseEntityBone;
 }

package/common-game/entities/CommonEntityBoneCollection.d.ts

@@ -1,8 +1,11 @@
+import type { CommonBaseEntityBone } from "./CommonBaseEntityBone";
 import { CommonBaseEntityBoneCollection } from "./CommonBaseEntityBoneCollection";
 import { CommonEntityBone } from "./CommonEntityBone";
 import type { IHandle } from "./IHandle";
 export declare class CommonEntityBoneCollection extends CommonBaseEntityBoneCollection {
     constructor(owner: IHandle);
+    getBoneFromName(boneName: string): CommonBaseEntityBone;
+    getBoneFromIndex(boneIndex: number): CommonBaseEntityBone;
     getBone(boneIndex: number): CommonEntityBone;
     getBone(boneName: string): CommonEntityBone;
     get Core(): CommonEntityBone;

package/common-game/entities/CommonEntityBoneCollection.js

@@ -9,6 +9,12 @@ class CommonEntityBoneCollection extends CommonBaseEntityBoneCollection {
   constructor(owner) {
     super(owner);
   }
+  getBoneFromName(boneName) {
+    return new CommonEntityBone(this.owner, GetEntityBoneIndexByName(this.owner.Handle, boneName));
+  }
+  getBoneFromIndex(boneIndex) {
+    return new CommonEntityBone(this.owner, boneIndex);
+  }
   getBone(bone) {
     return new CommonEntityBone(
       this.owner,

package/common-game/entities/CommonPedBoneCollection.d.ts

@@ -6,5 +6,8 @@ export declare class CommonPedBoneCollection extends CommonBaseEntityBoneCollect
     get Core(): CommonPedBone;
     get LastDamaged(): CommonPedBone;
     clearLastDamaged(): void;
-    getBone(boneIndex?: number, boneName?: string): CommonPedBone;
+    getBoneFromId(boneId: number): CommonPedBone;
+    getBoneFromName(boneName: string): CommonPedBone;
+    getBone(boneIndex: number): CommonPedBone;
+    getBone(boneName: string): CommonPedBone;
 }

package/common-game/entities/CommonPedBoneCollection.js

@@ -19,10 +19,16 @@ class CommonPedBoneCollection extends CommonBaseEntityBoneCollection {
   clearLastDamaged() {
     ClearPedLastDamageBone(this.owner.Handle);
   }
-  getBone(boneIndex, boneName) {
+  getBoneFromId(boneId) {
+    return new CommonPedBone(this.owner, GetPedBoneIndex(this.owner.Handle, boneId));
+  }
+  getBoneFromName(boneName) {
+    return new CommonPedBone(this.owner, GetEntityBoneIndexByName(this.owner.Handle, boneName));
+  }
+  getBone(bone) {
     return new CommonPedBone(
       this.owner,
-      boneIndex ? boneIndex : GetEntityBoneIndexByName(this.owner.Handle, boneName ?? "")
+      typeof bone === "number" ? bone : GetEntityBoneIndexByName(this.owner.Handle, bone ?? "")
     );
   }
 }

package/index.d.ts

@@ -16,6 +16,7 @@ export * from "./Rope";
 export * from "./TaskSequence";
 export * from "./Tasks";
 export * from "./World";
+export * from "./world/getGamePool";
 export * from "./weaponComponent/ComponentAttachmentPoint";
 export * from "./weaponComponent/ComponentAttachmentPointByHash";
 export * from "./weaponComponent/ComponentDisplayNameByHash";
@@ -197,5 +198,7 @@ export * from "./common/decors/Exports";
 export * from "./common/decors/Permissions";
 export * from "./common/decors/Resources";
 export * from "./common/decors/Ticks";
+export * from "./common/collections/CircularBuffer";
+export * from "./common/collections/Stack";
 export * from "./cfx/StateBagChangeHandler";
 export * from "./cfx/index";

package/index.js

@@ -16,6 +16,7 @@ export * from "./Rope";
 export * from "./TaskSequence";
 export * from "./Tasks";
 export * from "./World";
+export * from "./world/getGamePool";
 export * from "./weaponComponent/ComponentAttachmentPoint";
 export * from "./weaponComponent/ComponentAttachmentPointByHash";
 export * from "./weaponComponent/ComponentDisplayNameByHash";
@@ -197,5 +198,7 @@ export * from "./common/decors/Exports";
 export * from "./common/decors/Permissions";
 export * from "./common/decors/Resources";
 export * from "./common/decors/Ticks";
+export * from "./common/collections/CircularBuffer";
+export * from "./common/collections/Stack";
 export * from "./cfx/StateBagChangeHandler";
 export * from "./cfx/index";

package/package.json

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

package/world/getGamePool.d.ts

@@ -0,0 +1,14 @@
+import { Pickup } from "../Pickup";
+import { Ped, Prop, Vehicle } from "../models";
+declare const constructorMap: {
+    CObject: typeof Prop;
+    CPed: typeof Ped;
+    CVehicle: typeof Vehicle;
+    CPickup: typeof Pickup;
+    CNetObject: typeof Prop;
+};
+type PoolTypeMap = {
+    [K in keyof typeof constructorMap]: InstanceType<(typeof constructorMap)[K]>;
+};
+export declare function getGamePool<T extends keyof typeof constructorMap>(type: T, networkOnly?: boolean): PoolTypeMap[T][];
+export {};

package/world/getGamePool.js

@@ -0,0 +1,30 @@
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { Pickup } from "../Pickup";
+import { BaseEntity, Ped, Prop, Vehicle } from "../models";
+const constructorMap = {
+  CObject: Prop,
+  CPed: Ped,
+  CVehicle: Vehicle,
+  CPickup: Pickup,
+  CNetObject: Prop
+};
+function getGamePool(type, networkOnly = false) {
+  const pool = GetGamePool(type);
+  const entityConstructor = constructorMap[type];
+  let poolMap = pool.map((v) => {
+    const p = new entityConstructor(v);
+    if (networkOnly && !p.IsNetworked) {
+      return null;
+    }
+    return p;
+  });
+  if (networkOnly) {
+    poolMap = poolMap.filter((v) => v !== null);
+  }
+  return poolMap;
+}
+__name(getGamePool, "getGamePool");
+export {
+  getGamePool
+};