@nativewrappers/fivem 0.0.86 → 0.0.88

package/Blip.d.ts

@@ -1,6 +1,6 @@
 import { Vector3 } from "./common/utils/Vector";
 import type { BlipColor, BlipSprite } from "./enums/Blip";
-import { BaseEntity } from "./models/BaseEntity";
+import type { Entity } from "./models/Entity";
 import type { Player } from "./models/Player";
 export declare class Blip {
     protected handle: number;
@@ -22,7 +22,7 @@ export declare class Blip {
     set Display(display: number);
     set Name(name: string);
     setNameToPlayerName(player: Player): void;
-    get Entity(): BaseEntity | null;
+    get Entity(): Entity | null;
     set ShowHeadingIndicator(show: boolean);
     set ShowRoute(show: boolean);
     set IsFriendly(friendly: boolean);

package/Blip.js

@@ -1,7 +1,7 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 import { Vector3 } from "./common/utils/Vector";
-import { BaseEntity } from "./models/BaseEntity";
+import { GetEntityClassFromId } from "./utils/GetEntityFromEntityIds";
 class Blip {
   static {
     __name(this, "Blip");
@@ -64,7 +64,7 @@ class Blip {
     SetBlipNameToPlayerName(this.handle, player.Handle);
   }
   get Entity() {
-    return new BaseEntity(GetBlipInfoIdEntityIndex(this.handle));
+    return GetEntityClassFromId(GetBlipInfoIdEntityIndex(this.handle));
   }
   set ShowHeadingIndicator(show) {
     ShowHeadingIndicatorOnBlip(this.handle, show);

package/Camera.d.ts

@@ -1,6 +1,6 @@
 import { Vector3 } from "./common/utils/Vector";
 import type { CameraShake } from "./enums/CameraShake";
-import { BaseEntity } from "./models/BaseEntity";
+import type { BaseEntity } from "./models/BaseEntity";
 import { PedBone } from "./models/PedBone";
 export declare class Camera {
     static readonly shakeNames: string[];

package/Camera.js

@@ -2,7 +2,6 @@ var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 import { Vector3 } from "./common/utils/Vector";
 import { GameplayCamera } from "./GameplayCamera";
-import { BaseEntity } from "./models/BaseEntity";
 import { PedBone } from "./models/PedBone";
 import { LoadAnimDict } from "./utils/Animations";
 class Camera {
@@ -151,12 +150,12 @@ class Camera {
     RemoveAnimDict(animDict);
   }
   pointAt(target, offset = new Vector3(0, 0, 0)) {
-    if (target instanceof BaseEntity) {
-      PointCamAtEntity(this.handle, target.Handle, offset.x, offset.y, offset.z, true);
+    if (target instanceof Vector3) {
+      PointCamAtCoord(this.handle, target.x, target.y, target.z);
     } else if (target instanceof PedBone) {
       PointCamAtPedBone(this.handle, target.Owner.Handle, target.Index, offset.x, offset.y, offset.z, true);
     } else {
-      PointCamAtCoord(this.handle, target.x, target.y, target.z);
+      PointCamAtEntity(this.handle, target.Handle, offset.x, offset.y, offset.z, true);
     }
   }
   stopPointing() {
@@ -169,10 +168,10 @@ class Camera {
     return IsCamInterpolating(this.handle);
   }
   attachTo(object, offset) {
-    if (object instanceof BaseEntity) {
-      AttachCamToEntity(this.handle, object.Handle, offset.x, offset.y, offset.z, true);
-    } else if (object instanceof PedBone) {
+    if (object instanceof PedBone) {
       AttachCamToPedBone(this.handle, object.Owner.Handle, object.Index, offset.x, offset.y, offset.z, true);
+    } else {
+      AttachCamToEntity(this.handle, object.Handle, offset.x, offset.y, offset.z, true);
     }
   }
   detach() {

package/GameConstants.d.ts

@@ -0,0 +1,7 @@
+import { Player } from "./models/Player";
+export declare class GameConstants {
+    private static player;
+    static readonly PlayerId: number;
+    static readonly ServerId: number;
+    static get Player(): Player;
+}

package/GameConstants.js

@@ -0,0 +1,24 @@
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { Player } from "./models/Player";
+class GameConstants {
+  static {
+    __name(this, "GameConstants");
+  }
+  // the actual player object that will get initialized on the first call to the `get Player()`
+  static player = null;
+  // The player id of the local client
+  static PlayerId = PlayerId();
+  // The server id of the local client.
+  static ServerId = GetPlayerServerId(GameConstants.PlayerId);
+  // The player class of the local object
+  static get Player() {
+    if (GameConstants.player === null) {
+      GameConstants.player = new Player(GameConstants.PlayerId);
+    }
+    return GameConstants.player;
+  }
+}
+export {
+  GameConstants
+};

package/Model.js

@@ -1,7 +1,6 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 import { Vector3 } from "./common/utils/Vector";
-import { Game } from "./Game";
 import { VehicleHash } from "./hashes/VehicleHash";
 class Model {
   static {
@@ -19,7 +18,7 @@ class Model {
    */
   constructor(hash) {
     if (typeof hash === "string") {
-      this.hash = Game.generateHash(hash);
+      this.hash = GetHashKey(hash);
     } else {
       this.hash = hash;
     }

package/Tasks.d.ts

@@ -1,13 +1,13 @@
 import { Vector3 } from "./common/utils/Vector";
+import type { TaskSequence } from "./TaskSequence";
 import type { AnimationFlags } from "./enums/AnimationFlags";
 import { DrivingStyle } from "./enums/Driving";
 import { FiringPattern } from "./enums/FiringPattern";
-import { VehicleSeat } from "./enums/Vehicle";
 import type { LeaveVehicleFlags } from "./enums/LeaveVehicleFlags";
-import { BaseEntity } from "./models/BaseEntity";
-import { Ped } from "./models/Ped";
+import { VehicleSeat } from "./enums/Vehicle";
+import type { BaseEntity } from "./models/BaseEntity";
+import type { Ped } from "./models/Ped";
 import type { Vehicle } from "./models/Vehicle";
-import type { TaskSequence } from "./TaskSequence";
 export declare class Tasks {
     private ped;
     constructor(ped: Ped | null);

package/Tasks.js

@@ -4,8 +4,6 @@ import { Vector3 } from "./common/utils/Vector";
 import { DrivingStyle } from "./enums/Driving";
 import { FiringPattern } from "./enums/FiringPattern";
 import { VehicleSeat } from "./enums/Vehicle";
-import { BaseEntity } from "./models/BaseEntity";
-import { Ped } from "./models/Ped";
 import { LoadAnimDict } from "./utils/Animations";
 class Tasks {
   static {
@@ -13,7 +11,7 @@ class Tasks {
   }
   ped;
   // we take null because sequences have a null ped, if you pass null to this
-  // you betterk now what you're doing.
+  // you better now what you're doing.
   constructor(ped) {
     const actualPed = ped ?? { handle: null };
     this.ped = actualPed;
@@ -25,8 +23,11 @@ class Tasks {
     TaskSetBlockingOfNonTemporaryEvents(this.ped.Handle, block);
   }
   aimAt(target, duration) {
-    if (target instanceof BaseEntity) TaskAimGunAtEntity(this.ped.Handle, target.Handle, duration, false);
-    else TaskAimGunAtCoord(this.ped.Handle, target.x, target.y, target.z, duration, false, false);
+    if (target instanceof Vector3) {
+      TaskAimGunAtCoord(this.ped.Handle, target.x, target.y, target.z, duration, false, false);
+    } else {
+      TaskAimGunAtEntity(this.ped.Handle, target.Handle, duration, false);
+    }
   }
   arrest(ped) {
     TaskArrestPed(this.ped.Handle, ped.Handle);
@@ -91,9 +92,7 @@ class Tasks {
     }
   }
   fleeFrom(pedOrPosition, duration = -1) {
-    if (pedOrPosition instanceof Ped) {
-      TaskSmartFleePed(this.ped.Handle, pedOrPosition.Handle, 100, duration, false, false);
-    } else {
+    if (pedOrPosition instanceof Vector3) {
       TaskSmartFleeCoord(
         this.ped.Handle,
         pedOrPosition.x,
@@ -104,6 +103,8 @@ class Tasks {
         false,
         false
       );
+    } else {
+      TaskSmartFleePed(this.ped.Handle, pedOrPosition.Handle, 100, duration, false, false);
     }
   }
   followPointRoute(points) {
@@ -191,9 +192,11 @@ class Tasks {
     }
   }
   lookAt(targetOrPosition, duration = -1) {
-    if (targetOrPosition instanceof BaseEntity)
+    if (targetOrPosition instanceof Vector3) {
+      TaskLookAtCoord(this.ped.Handle, targetOrPosition.x, targetOrPosition.y, targetOrPosition.z, duration, 0, 2);
+    } else {
       TaskLookAtEntity(this.ped.Handle, targetOrPosition.Handle, duration, 0, 2);
-    else TaskLookAtCoord(this.ped.Handle, targetOrPosition.x, targetOrPosition.y, targetOrPosition.z, duration, 0, 2);
+    }
   }
   parachuteTo(position) {
     TaskParachuteToTarget(this.ped.Handle, position.x, position.y, position.z);
@@ -242,9 +245,11 @@ class Tasks {
     TaskReloadWeapon(this.ped.Handle, true);
   }
   shootAt(targetOrPosition, duration = -1, pattern = FiringPattern.Default) {
-    if (targetOrPosition instanceof Ped) TaskShootAtEntity(this.ped.Handle, targetOrPosition.Handle, duration, pattern);
-    else
+    if (targetOrPosition instanceof Vector3) {
       TaskShootAtCoord(this.ped.Handle, targetOrPosition.x, targetOrPosition.y, targetOrPosition.z, duration, pattern);
+    } else {
+      TaskShootAtEntity(this.ped.Handle, targetOrPosition.Handle, duration, pattern);
+    }
   }
   shuffleToNextVehicleSeat(vehicle) {
     TaskShuffleToNextVehicleSeat(this.ped.Handle, vehicle.Handle);
@@ -275,9 +280,11 @@ class Tasks {
     TaskSwapWeapon(this.ped.Handle, false);
   }
   turnTo(targetOrPosition, duration = -1) {
-    if (targetOrPosition instanceof BaseEntity)
+    if (targetOrPosition instanceof Vector3) {
+      TaskTurnPedToFaceCoord(this.ped.Handle, targetOrPosition.x, targetOrPosition.y, targetOrPosition.z, duration);
+    } else {
       TaskTurnPedToFaceEntity(this.ped.Handle, targetOrPosition.Handle, duration);
-    else TaskTurnPedToFaceCoord(this.ped.Handle, targetOrPosition.x, targetOrPosition.y, targetOrPosition.z, duration);
+    }
   }
   useParachute() {
     TaskParachute(this.ped.Handle, true);

package/World.d.ts

@@ -1,6 +1,11 @@
 import type { Color } from "./common/utils/Color";
+import { Vector3 } from "./common/utils/Vector";
 import { Blip } from "./Blip";
 import { Camera } from "./Camera";
+import { Model } from "./Model";
+import { Pickup } from "./Pickup";
+import { AsynchronousRaycastResult, SynchronousRaycastResult } from "./Raycast";
+import { Rope } from "./Rope";
 import { CameraTypes } from "./enums/CameraTypes";
 import { CloudHat } from "./enums/CloudHat";
 import type { MarkerType } from "./enums/MarkerType";
@@ -8,15 +13,10 @@ import type { PickupType } from "./enums/PickupType";
 import { IntersectFlags } from "./enums/RaycastEnums";
 import type { RopeType } from "./enums/RopeType";
 import { Weather } from "./enums/Weather";
-import { Model } from "./Model";
 import type { BaseEntity } from "./models/BaseEntity";
 import { Ped } from "./models/Ped";
 import { Prop } from "./models/Prop";
 import { Vehicle } from "./models/Vehicle";
-import { Pickup } from "./Pickup";
-import { AsynchronousRaycastResult, SynchronousRaycastResult } from "./Raycast";
-import { Rope } from "./Rope";
-import { Vector3 } from "./common/utils/Vector";
 /**
  * Class with common world manipulations.
  *

package/World.js

@@ -1,22 +1,22 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { Vector3 } from "./common/utils/Vector";
 import { Blip } from "./Blip";
 import { Camera } from "./Camera";
+import { GameplayCamera } from "./GameplayCamera";
+import { Model } from "./Model";
+import { Pickup } from "./Pickup";
+import { AsynchronousRaycastResult, SynchronousRaycastResult } from "./Raycast";
+import { Rope } from "./Rope";
 import { CameraTypes } from "./enums/CameraTypes";
 import { CloudHat } from "./enums/CloudHat";
 import { IntersectFlags, SHAPE_TEST_DEFAULT } from "./enums/RaycastEnums";
 import { Weather } from "./enums/Weather";
-import { GameplayCamera } from "./GameplayCamera";
 import { VehicleHash } from "./hashes/VehicleHash";
-import { Model } from "./Model";
 import { Ped } from "./models/Ped";
 import { Prop } from "./models/Prop";
 import { Vehicle } from "./models/Vehicle";
-import { Pickup } from "./Pickup";
-import { AsynchronousRaycastResult, SynchronousRaycastResult } from "./Raycast";
-import { Rope } from "./Rope";
 import { Maths } from "./utils/Maths";
-import { Vector3 } from "./common/utils/Vector";
 class World {
   static {
     __name(this, "World");
@@ -342,10 +342,7 @@ class World {
     }
     const ped = CreatePed(-1, model.Hash, position.x, position.y, position.z, heading, isNetwork, pinToScript);
     model.markAsNoLongerNeeded();
-    if (ped === 0) {
-      return null;
-    }
-    return new Ped(ped);
+    return Ped.fromHandle(ped);
   }
   /**
    * Creates a [[`Ped`]] with a random model.

package/common/Command.d.ts

@@ -23,8 +23,33 @@ export declare class Command<T extends Parameter[] = Parameter[]> {
     readonly name: string | string[];
     readonly help: string;
     readonly params?: T | undefined;
+    /**
+     * Registers a new executable command with optional parameter validation and permission restrictions.
+     * @param name The unique identifier(s) for the command, either as a single string or an array of strings.
+     * @param help A description of the command, displayed as a chat suggestion.
+     * @param handler The function to execute when the command is executed.
+     * @param params An optional array of parameter definitions specifying the command's expected arguments,
+     *               including their names, types, and descriptive help text for chat suggestions.
+     * @param restricted Determines the command's access permissions:
+     *                   - Defaults to `true`, restricting usage to users with the "command.commandName" ACE permission.
+     *                   - A string such as `"group.admin"` grants the command permission to the specified principal.
+     *                   - An array of strings grants permission to multiple principals.
+     */
     constructor(name: string | string[], help: string, handler: CommandHandler<T>, params?: T | undefined, restricted?: Restricted);
+    /**
+     * Maps the arguments received from a command call to the defined parameters while validating the argument types.
+     * @param source The client that executed the command, or -1 if executed by the server.
+     * @param args The arguments passed to the command.
+     * @param raw The raw input string passed to the command.
+     * @returns A mapped object containing parsed parameters.
+     */
     private mapArguments;
+    /**
+     * Executes the command with the given arguments and source, validating and mapping the arguments before calling the handler.
+     * @param source The client that executed the command.
+     * @param args The arguments passed to the command.
+     * @param raw The raw input string passed to the command.
+     */
     call(source: number, args: string[], raw?: string): Promise<void>;
 }
 export {};

package/common/Command.js

@@ -1,17 +1,18 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { GlobalData } from "./GlobalData";
 const commands = [];
 $SERVER: {
   on("playerJoining", () => emitNet("chat:addSuggestions", source, commands));
 }
-function registerCommand(name, commandHandler, restricted) {
+function registerCommand(name, commandHandler, restricted = true) {
   if (Array.isArray(name)) {
     for (const command of name) {
       registerCommand(command, commandHandler, restricted);
     }
     return;
   }
-  RegisterCommand(name, commandHandler, !!restricted);
+  RegisterCommand(name, commandHandler, GlobalData.IS_CLIENT ? false : !!restricted);
   $SERVER: {
     const ace = `command.${name}`;
     if (typeof restricted === "string") {
@@ -27,6 +28,18 @@ function registerCommand(name, commandHandler, restricted) {
 }
 __name(registerCommand, "registerCommand");
 class Command {
+  /**
+   * Registers a new executable command with optional parameter validation and permission restrictions.
+   * @param name The unique identifier(s) for the command, either as a single string or an array of strings.
+   * @param help A description of the command, displayed as a chat suggestion.
+   * @param handler The function to execute when the command is executed.
+   * @param params An optional array of parameter definitions specifying the command's expected arguments,
+   *               including their names, types, and descriptive help text for chat suggestions.
+   * @param restricted Determines the command's access permissions:
+   *                   - Defaults to `true`, restricting usage to users with the "command.commandName" ACE permission.
+   *                   - A string such as `"group.admin"` grants the command permission to the specified principal.
+   *                   - An array of strings grants permission to multiple principals.
+   */
   constructor(name, help, handler, params, restricted = true) {
     this.name = name;
     this.help = help;
@@ -55,6 +68,13 @@ class Command {
     __name(this, "Command");
   }
   #handler;
+  /**
+   * Maps the arguments received from a command call to the defined parameters while validating the argument types.
+   * @param source The client that executed the command, or -1 if executed by the server.
+   * @param args The arguments passed to the command.
+   * @param raw The raw input string passed to the command.
+   * @returns A mapped object containing parsed parameters.
+   */
   mapArguments(source2, args, raw) {
     const mapped = {
       source: source2,
@@ -95,6 +115,12 @@ class Command {
     });
     return result ? mapped : null;
   }
+  /**
+   * Executes the command with the given arguments and source, validating and mapping the arguments before calling the handler.
+   * @param source The client that executed the command.
+   * @param args The arguments passed to the command.
+   * @param raw The raw input string passed to the command.
+   */
   async call(source2, args, raw = args.join(" ")) {
     const parsed = this.mapArguments(source2, args, raw);
     if (!parsed) return;

package/index.d.ts

@@ -2,8 +2,8 @@ export * from "./Audio";
 export * from "./Blip";
 export * from "./Camera";
 export * from "./Checkpoint";
-export * from "./Events";
 export * from "./Game";
+export * from "./GameConstants";
 export * from "./GameplayCamera";
 export * from "./Model";
 export * from "./NetworkedScene";
@@ -39,6 +39,7 @@ export * from "./weapon/WeaponLiveryColor";
 export * from "./weapon/WeaponTint";
 export * from "./utils/Animations";
 export * from "./utils/Crypto";
+export * from "./utils/GetEntityFromEntityIds";
 export * from "./utils/LiteEvent";
 export * from "./utils/Maths";
 export * from "./utils/Point";
@@ -76,6 +77,8 @@ export * from "./ui/menu/items/panels/UIMenuStatisticsPanelItem";
 export * from "./ui/interfaces/IButton";
 export * from "./ui/interfaces/IDrawable";
 export * from "./models/BaseEntity";
+export * from "./models/BaseEntityBone";
+export * from "./models/BaseEntityBoneCollection";
 export * from "./models/Entity";
 export * from "./models/EntityBone";
 export * from "./models/EntityBoneCollection";
@@ -94,6 +97,7 @@ export * from "./models/VehicleWheel";
 export * from "./models/VehicleWheelCollection";
 export * from "./models/VehicleWindow";
 export * from "./models/VehicleWindowCollection";
+export * from "./models/index";
 export * from "./interfaces/Dimensions";
 export * from "./hashes/MaterialHash";
 export * from "./hashes/PedHash";

package/index.js

@@ -2,8 +2,8 @@ export * from "./Audio";
 export * from "./Blip";
 export * from "./Camera";
 export * from "./Checkpoint";
-export * from "./Events";
 export * from "./Game";
+export * from "./GameConstants";
 export * from "./GameplayCamera";
 export * from "./Model";
 export * from "./NetworkedScene";
@@ -39,6 +39,7 @@ export * from "./weapon/WeaponLiveryColor";
 export * from "./weapon/WeaponTint";
 export * from "./utils/Animations";
 export * from "./utils/Crypto";
+export * from "./utils/GetEntityFromEntityIds";
 export * from "./utils/LiteEvent";
 export * from "./utils/Maths";
 export * from "./utils/Point";
@@ -76,6 +77,8 @@ export * from "./ui/menu/items/panels/UIMenuStatisticsPanelItem";
 export * from "./ui/interfaces/IButton";
 export * from "./ui/interfaces/IDrawable";
 export * from "./models/BaseEntity";
+export * from "./models/BaseEntityBone";
+export * from "./models/BaseEntityBoneCollection";
 export * from "./models/Entity";
 export * from "./models/EntityBone";
 export * from "./models/EntityBoneCollection";
@@ -94,6 +97,7 @@ export * from "./models/VehicleWheel";
 export * from "./models/VehicleWheelCollection";
 export * from "./models/VehicleWindow";
 export * from "./models/VehicleWindowCollection";
+export * from "./models/index";
 export * from "./interfaces/Dimensions";
 export * from "./hashes/MaterialHash";
 export * from "./hashes/PedHash";

package/models/BaseEntity.d.ts

@@ -1,22 +1,20 @@
-import { ClassTypes } from "../common/utils/ClassTypes";
+import type { ClassTypes } from "../common/utils/ClassTypes";
+import { Quaternion } from "../common/utils/Quaternion";
 import { Vector3 } from "../common/utils/Vector";
+import { Model } from "../Model";
+import { type StateBagChangeHandler } from "../cfx";
 import { ForceType } from "../enums/ForceType";
 import type { MaterialHash } from "../hashes/MaterialHash";
 import type { WeaponHash } from "../hashes/WeaponHash";
-import { Model } from "../Model";
-import type { EntityBone } from "./EntityBone";
 import { Blip } from "../Blip";
-import { EntityBoneCollection } from "./EntityBoneCollection";
-import { type StateBagChangeHandler } from "../cfx";
-import { Quaternion } from "../common/utils/Quaternion";
-export declare class BaseEntity {
-    static fromNetworkId(networkId: number): BaseEntity | null;
-    static fromStateBagName(stateBagName: string): BaseEntity | null;
+import type { BaseEntityBone } from "./BaseEntityBone";
+import type { BaseEntityBoneCollection } from "./BaseEntityBoneCollection";
+export declare abstract class BaseEntity {
     protected handle: number;
-    protected bones: EntityBoneCollection | undefined;
     protected stateBagCookies: number[];
     protected netId: number | null;
-    protected type: ClassTypes;
+    protected abstract type: ClassTypes;
+    protected abstract bones?: BaseEntityBoneCollection;
     constructor(handle: number);
     get Handle(): number;
     /**
@@ -117,7 +115,7 @@ export declare class BaseEntity {
     get IsCollisionEnabled(): boolean;
     set IsCollisionEnabled(value: boolean);
     set IsRecordingCollisions(value: boolean);
-    get Bones(): EntityBoneCollection;
+    abstract get Bones(): BaseEntityBoneCollection;
     get AttachedBlip(): Blip | null;
     attachBlip(): Blip;
     setNoCollision(entity: BaseEntity, toggle: boolean): void;
@@ -165,11 +163,11 @@ export declare class BaseEntity {
      */
     getOffsetPosition(offset: Vector3): Vector3;
     attachTo(entity: BaseEntity, position: Vector3, rotation: Vector3, collisions?: boolean, unk9?: boolean, useSoftPinning?: boolean, rotationOrder?: number): void;
-    attachToBone(entityBone: EntityBone, position: Vector3, rotation: Vector3, collisions?: boolean, unk9?: boolean, useSoftPinning?: boolean, rotationOrder?: number): void;
+    attachToBone(entityBone: BaseEntityBone, position: Vector3, rotation: Vector3, collisions?: boolean, unk9?: boolean, useSoftPinning?: boolean, rotationOrder?: number): void;
     detach(): void;
     isAttached(): boolean;
     isAttachedTo(entity: BaseEntity): boolean;
-    getEntityAttachedTo(): BaseEntity;
+    abstract getEntityAttachedTo(): BaseEntity | null;
     applyForce(direction: Vector3, rotation: Vector3, forceType?: ForceType): void;
     applyForceRelative(direction: Vector3, rotation: Vector3, forceType?: ForceType): void;
     /**

package/models/BaseEntity.js

@@ -1,30 +1,18 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-import { ClassTypes } from "../common/utils/ClassTypes";
+import { Quaternion } from "../common/utils/Quaternion";
 import { Vector3 } from "../common/utils/Vector";
-import { ForceType } from "../enums/ForceType";
 import { Model } from "../Model";
-import { Blip } from "../Blip";
-import { EntityBoneCollection } from "./EntityBoneCollection";
 import cfx from "../cfx";
-import { Quaternion } from "../common/utils/Quaternion";
+import { ForceType } from "../enums/ForceType";
+import { Blip } from "../Blip";
 class BaseEntity {
   static {
     __name(this, "BaseEntity");
   }
-  static fromNetworkId(networkId) {
-    return new BaseEntity(NetworkGetEntityFromNetworkId(networkId));
-  }
-  static fromStateBagName(stateBagName) {
-    const entity = GetEntityFromStateBagName(stateBagName);
-    if (entity === 0) return null;
-    return new BaseEntity(entity);
-  }
   handle;
-  bones;
   stateBagCookies = [];
   netId = null;
-  type = ClassTypes.Entity;
   constructor(handle) {
     this.handle = handle;
     if (this.IsNetworked) {
@@ -314,12 +302,6 @@ class BaseEntity {
   set IsRecordingCollisions(value) {
     SetEntityRecordsCollisions(this.handle, value);
   }
-  get Bones() {
-    if (!this.bones) {
-      this.bones = new EntityBoneCollection(this);
-    }
-    return this.bones;
-  }
   get AttachedBlip() {
     const handle = GetBlipFromEntity(this.handle);
     if (DoesBlipExist(handle)) {
@@ -503,9 +485,6 @@ class BaseEntity {
   isAttachedTo(entity) {
     return IsEntityAttachedToEntity(this.handle, entity.Handle);
   }
-  getEntityAttachedTo() {
-    return new BaseEntity(GetEntityAttachedTo(this.handle));
-  }
   applyForce(direction, rotation, forceType = ForceType.MaxForceRot2) {
     ApplyForceToEntity(
       this.handle,

package/models/BaseEntityBone.d.ts

@@ -0,0 +1,12 @@
+import { Vector3 } from "../common/utils/Vector";
+import type { BaseEntity } from "./BaseEntity";
+export declare abstract class BaseEntityBone {
+    get Index(): number;
+    get Owner(): BaseEntity;
+    get Position(): Vector3;
+    get Rotation(): Vector3;
+    get IsValid(): boolean;
+    protected readonly owner: BaseEntity;
+    protected readonly index: number;
+    constructor(owner: BaseEntity, boneIndex?: number, boneName?: string);
+}

package/models/BaseEntityBone.js

@@ -0,0 +1,32 @@
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { Vector3 } from "../common/utils/Vector";
+class BaseEntityBone {
+  static {
+    __name(this, "BaseEntityBone");
+  }
+  get Index() {
+    return this.index;
+  }
+  get Owner() {
+    return this.owner;
+  }
+  get Position() {
+    return Vector3.fromArray(GetWorldPositionOfEntityBone(this.owner.Handle, this.index));
+  }
+  get Rotation() {
+    return Vector3.fromArray(GetEntityBoneRotation(this.owner.Handle, this.index));
+  }
+  get IsValid() {
+    return this.owner.exists() && this.index !== -1;
+  }
+  owner;
+  index;
+  constructor(owner, boneIndex, boneName) {
+    this.owner = owner;
+    this.index = boneIndex ? boneIndex : GetEntityBoneIndexByName(this.owner.Handle, boneName ?? "");
+  }
+}
+export {
+  BaseEntityBone
+};

package/models/BaseEntityBoneCollection.d.ts

@@ -0,0 +1,9 @@
+import type { BaseEntity } from "./BaseEntity";
+import type { BaseEntityBone } from "./BaseEntityBone";
+export declare abstract class BaseEntityBoneCollection {
+    protected readonly owner: BaseEntity;
+    constructor(owner: BaseEntity);
+    hasBone(name: string): boolean;
+    abstract getBone(boneIndex?: number, boneName?: string): BaseEntityBone;
+    abstract get Core(): BaseEntityBone;
+}