@infernus/core 0.13.0 → 0.13.2

package/dist/bundle.d.ts

@@ -767,6 +767,8 @@ declare function withTriggerOptions(options: ExecMiddlewareOptions): ExecMiddlew
     __trigger__: boolean;
 };
 
+declare function GetPlayerMarkerForPlayer(playerId: number, targetId: number): number;
+
 declare class Vehicle {
     private sourceInfo;
     private readonly isStatic;
@@ -929,10 +931,10 @@ declare class Vehicle {
     show(): boolean;
     hide(): boolean;
     isHidden(): boolean;
-    getVehicleOccupant(seatId: number): number;
-    getVehicleMaxPassengers(): number;
-    countVehicleOccupants(): number;
-    static getVehicleMaxPassengers(modelId: number): number;
+    getOccupant(seatId: number): number;
+    getMaxPassengers(): number;
+    countOccupants(): number;
+    static getMaxPassengers(modelId: number): number;
     static getRandomColorPair(modelId: number): {
         color: [number, number, number, number];
         ret: number;
@@ -944,148 +946,149 @@ declare class Vehicle {
     static getModelCount(modelId: number): number;
     static getInstance(id: number): Vehicle | undefined;
     static getInstances(): Vehicle[];
-    static __inject__AddStaticVehicle: (modelId: number, spawnX: number, spawnY: number, spawnZ: number, zAngle: number, color1: string | number, color2: string | number) => number;
-    static __inject__AddStaticVehicleEx: (modelId: number, spawnX: number, spawnY: number, spawnZ: number, zAngle: number, color1: string | number, color2: string | number, respawnDelay: number, addSiren: boolean) => number;
-    static __inject__CreateVehicle: (vehicleType: number, x: number, y: number, z: number, rotation: number, color1: string | number, color2: string | number, respawnDelay: number, addSiren: boolean) => number;
-    static __inject__DestroyVehicle: (vehicleId: number) => number;
-    static __inject__AddVehicleComponent: (vehicleId: number, componentId: number) => number;
-    static __inject__RemoveVehicleComponent: (vehicleId: number, componentId: number) => number;
-    static __inject__GetVehicleComponentInSlot: (vehicleId: number, slot: CarModTypeEnum) => number;
-    static __inject__LinkVehicleToInterior: (vehicleId: number, interiorId: number) => number;
-    static __inject__SetVehicleVirtualWorld: (vehicleId: number, worldId: number) => number;
-    static __inject__GetVehicleVirtualWorld: (vehicleId: number) => number;
-    static __inject__RepairVehicle: (vehicleId: number) => number;
-    static __inject__SetVehiclePos: (vehicleId: number, x: number, y: number, z: number) => boolean;
-    static __inject__GetVehiclePos: (vehicleId: number) => {
-        x: number;
-        y: number;
-        z: number;
-        ret: number;
-    };
-    static __inject__GetVehicleHealth: (vehicleId: number) => {
-        health: number;
-        ret: number;
-    };
-    static __inject__SetVehicleHealth: (vehicleId: number, health: number) => number;
-    static __inject__IsPlayerInVehicle: (playerId: number, vehicleId: number) => boolean;
-    static __inject__PutPlayerInVehicle: (playerId: number, vehicleId: number, seatId: number) => boolean;
-    static __inject__GetVehicleZAngle: (vehicleId: number) => {
-        angle: number;
-        ret: number;
-    };
-    static __inject__SetVehicleZAngle: (vehicleId: number, zAngle: number) => number;
-    static __inject__SetVehicleNumberPlate: (vehicleId: number, numberplate: string) => number;
-    static __inject__ChangeVehicleColors: (vehicleId: number, color1: string | number, color2: string | number) => number;
-    static __inject__SetVehicleVelocity: (vehicleId: number, x: number, y: number, z: number) => boolean;
-    static __inject__GetVehicleVelocity: (vehicleId: number) => {
-        x: number;
-        y: number;
-        z: number;
-        ret: number;
-    };
-    static __inject__SetVehicleAngularVelocity: (vehicleId: number, x: number, y: number, z: number) => boolean;
-    static __inject__GetVehicleDamageStatus: (vehicleId: number) => {
-        panels: number;
-        doors: number;
-        lights: number;
-        tires: number;
-        ret: number;
-    };
-    static __inject__UpdateVehicleDamageStatus: (vehicleId: number, panels: number, doors: number, lights: number, tires: number) => number;
-    static __inject__GetVehicleDistanceFromPoint: (vehicleId: number, x: number, y: number, z: number) => number;
-    static __inject__GetVehicleModel: (vehicleId: number) => number;
-    static __inject__GetVehicleModelInfo: (vehicleModel: number, infoType: VehicleModelInfoEnum) => {
-        x: number;
-        y: number;
-        z: number;
-        ret: number;
-    };
-    static __inject__GetVehicleRotation: (vehicleId: number) => {
-        x: number;
-        y: number;
-        z: number;
-        ret: number;
-    };
-    static __inject__GetVehicleRotationQuat: (vehicleId: number) => {
-        w: number;
-        x: number;
-        y: number;
-        z: number;
-        ret: number;
-    };
-    static __inject__SetVehicleToRespawn: (vehicleId: number) => number;
-    static __inject__IsVehicleStreamedIn: (vehicleId: number, forPlayerId: number) => boolean;
-    static __inject__SetVehicleParamsCarDoors: (vehicleId: number, driver: boolean, passenger: boolean, backLeft: boolean, backRight: boolean) => number;
-    static __inject__SetVehicleParamsCarWindows: (vehicleId: number, driver: boolean, passenger: boolean, backLeft: boolean, backRight: boolean) => number;
-    static __inject__GetVehicleParamsCarDoors: (vehicleId: number) => {
-        driver: 0 | 1 | -1;
-        passenger: 0 | 1 | -1;
-        backLeft: 0 | 1 | -1;
-        backRight: 0 | 1 | -1;
-        ret: number;
-    };
-    static __inject__GetVehicleParamsCarWindows: (vehicleId: number) => {
-        driver: 0 | 1 | -1;
-        passenger: 0 | 1 | -1;
-        backLeft: 0 | 1 | -1;
-        backRight: 0 | 1 | -1;
-        ret: number;
-    };
-    static __inject__SetVehicleParamsEx: (vehicleId: number, engine: boolean | VehicleParamsEnum, lights: boolean | VehicleParamsEnum, alarm: boolean | VehicleParamsEnum, doors: boolean | VehicleParamsEnum, bonnet: boolean | VehicleParamsEnum, boot: boolean | VehicleParamsEnum, objective: boolean | VehicleParamsEnum) => number;
-    static __inject__GetVehicleParamsEx: (vehicleId: number) => [VehicleParamsEnum, VehicleParamsEnum, VehicleParamsEnum, VehicleParamsEnum, VehicleParamsEnum, VehicleParamsEnum, VehicleParamsEnum, number];
-    static __inject__GetVehicleParamsSirenState: (vehicleId: number) => number;
-    static __inject__SetVehicleParamsForPlayer: (vehicleId: number, playerId: number, objective: boolean, doorsLocked: boolean) => number;
-    static __inject__IsTrailerAttachedToVehicle: (vehicleId: number) => boolean;
-    static __inject__ChangeVehiclePaintjob: (vehicleId: number, paintjobId: number) => number;
-    static __inject__AttachTrailerToVehicle: (trailerid: number, vehicleId: number) => number;
-    static __inject__DetachTrailerFromVehicle: (vehicleId: number) => number;
-    static __inject__GetVehicleTrailer: (vehicleId: number) => number;
-    static __inject__GetVehicleMatrix: (vehicleId: number) => IVehMatrix & ICommonRetVal;
-    static __inject__GetVehicleTrainSpeed: (vehicleId: number) => number;
-    static __inject__GetVehicleHydraReactorAngle: (vehicleId: number) => number;
-    static __inject__GetVehicleLandingGearState: (vehicleId: number) => number;
-    static __inject__GetVehicleSirenState: (vehicleId: number) => number;
-    static __inject__GetVehicleDriver: (vehicleId: number) => number;
-    static __inject__GetVehicleLastDriver: (vehicleId: number) => number;
-    static __inject__IsVehicleSirenEnabled: (vehicleId: number) => boolean;
-    static __inject__ToggleVehicleSirenEnabled: (vehicleId: number, enabled: boolean) => number;
-    static __inject__SetVehicleParamsSirenState: (vehicleId: number, enabled: boolean) => number;
-    static __inject__IsVehicleDead: (vehicleId: number) => boolean;
-    static __inject__SetVehicleDead: (vehicleId: number, dead: boolean) => boolean;
-    static __inject__SetVehicleBeenOccupied: (vehicleId: number, occupied: boolean) => boolean;
-    static __inject__GetVehicleRespawnTick: (vehicleId: number) => number;
-    static __inject__SetVehicleRespawnTick: (vehicleId: number, ticks: number) => number;
-    static __inject__IsVehicleOccupied: (vehicleId: number) => boolean;
-    static __inject__HasVehicleBeenOccupied: (vehicleId: number) => boolean;
-    static __inject__GetVehicleOccupiedTick: (vehicleId: number) => number;
-    static __inject__SetVehicleOccupiedTick: (vehicleId: number, ticks: number) => number;
-    static __inject__GetVehicleCab: (vehicleId: number) => number;
-    static __inject__GetVehicleRespawnDelay: (vehicleId: number) => number;
-    static __inject__SetVehicleRespawnDelay: (vehicleId: number, delay: number) => number;
-    static __inject__GetVehicleNumberPlate: (vehicleId: number) => {
-        plate: string;
-        ret: number;
-    };
-    static __inject__GetVehicleInterior: (vehicleId: number) => number;
-    static __inject__GetVehiclePaintjob: (vehicleId: number) => number;
-    static __inject__GetVehicleColors: (vehicleId: number) => IVehColor & ICommonRetVal;
-    static __inject__SetVehicleSpawnInfo: (vehicleId: number, modelId: number, fX: number, fY: number, fZ: number, fAngle: number, color1: number, color2: number, respawnTime?: number, interior?: number) => number;
-    static __inject__GetVehicleSpawnInfo: (vehicleId: number) => IVehSpawnInfo & ICommonRetVal;
-    static __inject__GetRandomVehicleColorPair: (modelId: number) => {
-        color: [number, number, number, number];
-        ret: number;
+    static __inject__: {
+        addStatic: (modelId: number, spawnX: number, spawnY: number, spawnZ: number, zAngle: number, color1: string | number, color2: string | number) => number;
+        addStaticEx: (modelId: number, spawnX: number, spawnY: number, spawnZ: number, zAngle: number, color1: string | number, color2: string | number, respawnDelay: number, addSiren: boolean) => number;
+        create: (vehicleType: number, x: number, y: number, z: number, rotation: number, color1: string | number, color2: string | number, respawnDelay: number, addSiren: boolean) => number;
+        destroy: (vehicleId: number) => number;
+        addComponent: (vehicleId: number, componentId: number) => number;
+        removeComponent: (vehicleId: number, componentId: number) => number;
+        getComponentInSlot: (vehicleId: number, slot: CarModTypeEnum) => number;
+        linkToInterior: (vehicleId: number, interiorId: number) => number;
+        setVirtualWorld: (vehicleId: number, worldId: number) => number;
+        getVirtualWorld: (vehicleId: number) => number;
+        repair: (vehicleId: number) => number;
+        setPos: (vehicleId: number, x: number, y: number, z: number) => boolean;
+        getPos: (vehicleId: number) => {
+            x: number;
+            y: number;
+            z: number;
+            ret: number;
+        };
+        getHealth: (vehicleId: number) => {
+            health: number;
+            ret: number;
+        };
+        setHealth: (vehicleId: number, health: number) => number;
+        isPlayerIn: (playerId: number, vehicleId: number) => boolean;
+        putPlayerIn: (playerId: number, vehicleId: number, seatId: number) => boolean;
+        getZAngle: (vehicleId: number) => {
+            angle: number;
+            ret: number;
+        };
+        setZAngle: (vehicleId: number, zAngle: number) => number;
+        setNumberPlate: (vehicleId: number, numberplate: string) => number;
+        changeColors: (vehicleId: number, color1: string | number, color2: string | number) => number;
+        setVelocity: (vehicleId: number, x: number, y: number, z: number) => boolean;
+        getVelocity: (vehicleId: number) => {
+            x: number;
+            y: number;
+            z: number;
+            ret: number;
+        };
+        setAngularVelocity: (vehicleId: number, x: number, y: number, z: number) => boolean;
+        getDamageStatus: (vehicleId: number) => {
+            panels: number;
+            doors: number;
+            lights: number;
+            tires: number;
+            ret: number;
+        };
+        updateDamageStatus: (vehicleId: number, panels: number, doors: number, lights: number, tires: number) => number;
+        getDistanceFromPoint: (vehicleId: number, x: number, y: number, z: number) => number;
+        getModel: (vehicleId: number) => number;
+        getModelInfo: (vehicleModel: number, infoType: VehicleModelInfoEnum) => {
+            x: number;
+            y: number;
+            z: number;
+            ret: number;
+        };
+        getRotation: (vehicleId: number) => {
+            x: number;
+            y: number;
+            z: number;
+            ret: number;
+        };
+        getRotationQuat: (vehicleId: number) => {
+            w: number;
+            x: number;
+            y: number;
+            z: number;
+            ret: number;
+        };
+        setRespawn: (vehicleId: number) => number;
+        isStreamedIn: (vehicleId: number, forPlayerId: number) => boolean;
+        setParamsCarDoors: (vehicleId: number, driver: boolean, passenger: boolean, backLeft: boolean, backRight: boolean) => number;
+        setParamsCarWindows: (vehicleId: number, driver: boolean, passenger: boolean, backLeft: boolean, backRight: boolean) => number;
+        getParamsCarDoors: (vehicleId: number) => {
+            driver: 0 | 1 | -1;
+            passenger: 0 | 1 | -1;
+            backLeft: 0 | 1 | -1;
+            backRight: 0 | 1 | -1;
+            ret: number;
+        };
+        getParamsCarWindows: (vehicleId: number) => {
+            driver: 0 | 1 | -1;
+            passenger: 0 | 1 | -1;
+            backLeft: 0 | 1 | -1;
+            backRight: 0 | 1 | -1;
+            ret: number;
+        };
+        setParamsEx: (vehicleId: number, engine: boolean | VehicleParamsEnum, lights: boolean | VehicleParamsEnum, alarm: boolean | VehicleParamsEnum, doors: boolean | VehicleParamsEnum, bonnet: boolean | VehicleParamsEnum, boot: boolean | VehicleParamsEnum, objective: boolean | VehicleParamsEnum) => number;
+        getParamsEx: (vehicleId: number) => [VehicleParamsEnum, VehicleParamsEnum, VehicleParamsEnum, VehicleParamsEnum, VehicleParamsEnum, VehicleParamsEnum, VehicleParamsEnum, number];
+        getParamsSirenState: (vehicleId: number) => number;
+        setParamsForPlayer: (vehicleId: number, playerId: number, objective: boolean, doorsLocked: boolean) => number;
+        isTrailerAttached: (vehicleId: number) => boolean;
+        changePaintjob: (vehicleId: number, paintjobId: number) => number;
+        attachTrailer: (trailerid: number, vehicleId: number) => number;
+        detachTrailer: (vehicleId: number) => number;
+        getMatrix: (vehicleId: number) => IVehMatrix & ICommonRetVal;
+        getTrainSpeed: (vehicleId: number) => number;
+        getHydraReactorAngle: (vehicleId: number) => number;
+        getLandingGearState: (vehicleId: number) => number;
+        getSirenState: (vehicleId: number) => number;
+        getDriver: (vehicleId: number) => number;
+        getLastDriver: (vehicleId: number) => number;
+        isSirenEnabled: (vehicleId: number) => boolean;
+        toggleSirenEnabled: (vehicleId: number, enabled: boolean) => number;
+        setParamsSirenState: (vehicleId: number, enabled: boolean) => number;
+        isDead: (vehicleId: number) => boolean;
+        setDead: (vehicleId: number, dead: boolean) => boolean;
+        setBeenOccupied: (vehicleId: number, occupied: boolean) => boolean;
+        getRespawnTick: (vehicleId: number) => number;
+        setRespawnTick: (vehicleId: number, ticks: number) => number;
+        isOccupied: (vehicleId: number) => boolean;
+        hasBeenOccupied: (vehicleId: number) => boolean;
+        getOccupiedTick: (vehicleId: number) => number;
+        setOccupiedTick: (vehicleId: number, ticks: number) => number;
+        getCab: (vehicleId: number) => number;
+        getRespawnDelay: (vehicleId: number) => number;
+        setRespawnDelay: (vehicleId: number, delay: number) => number;
+        getNumberPlate: (vehicleId: number) => {
+            plate: string;
+            ret: number;
+        };
+        getInterior: (vehicleId: number) => number;
+        getPaintjob: (vehicleId: number) => number;
+        getColors: (vehicleId: number) => IVehColor & ICommonRetVal;
+        setSpawnInfo: (vehicleId: number, modelId: number, fX: number, fY: number, fZ: number, fAngle: number, color1: number, color2: number, respawnTime?: number, interior?: number) => number;
+        getSpawnInfo: (vehicleId: number) => IVehSpawnInfo & ICommonRetVal;
+        getRandomColorPair: (modelId: number) => {
+            color: [number, number, number, number];
+            ret: number;
+        };
+        show: (vehicleId: number) => boolean;
+        hide: (vehicleId: number) => boolean;
+        isHidden: (vehicleId: number) => boolean;
+        getOccupant: (vehicleId: number, seatId: number) => number;
+        getMaxPassengers: (modelId: number) => number;
+        countOccupants: (vehicleId: number) => number;
+        getComponentType: (component: number) => CarModTypeEnum;
+        colorIndexToColor: (index: number, alpha?: number) => number;
+        isValid: (vehicleId: number) => boolean;
+        getModelsUsed: () => number;
+        getModelCount: (modelId: number) => number;
     };
-    static __inject__ShowVehicle: (vehicleId: number) => boolean;
-    static __inject__HideVehicle: (vehicleId: number) => boolean;
-    static __inject__IsVehicleHidden: (vehicleId: number) => boolean;
-    static __inject__GetVehicleOccupant: (vehicleId: number, seatId: number) => number;
-    static __inject__GetVehicleMaxPassengers: (modelId: number) => number;
-    static __inject__CountVehicleOccupants: (vehicleId: number) => number;
-    static __inject__GetVehicleComponentType: (component: number) => CarModTypeEnum;
-    static __inject__VehicleColorIndexToColor: (index: number, alpha?: number) => number;
-    static __inject__IsValidVehicle: (vehicleId: number) => boolean;
-    static __inject__GetVehicleModelsUsed: () => number;
-    static __inject__GetVehicleModelCount: (modelId: number) => number;
 }
 
 interface CmdBusCallback {
@@ -1145,7 +1148,10 @@ declare class Dialog {
     private static delDialogTask;
     show(player: Player): Promise<IDialogResCommon>;
     static close(player: Player): void;
-    static __inject__ShowPlayerDialog: (player: Player, id: number, dialog: IDialog) => boolean;
+    static __inject__: {
+        show: (player: Player, id: number, dialog: IDialog) => boolean;
+        hide: (playerId: number) => boolean;
+    };
 }
 
 declare const PlayerEvent: Readonly<{
@@ -1594,12 +1600,17 @@ declare const PlayerEvent: Readonly<{
 }>;
 
 declare class GangZone {
-    readonly sourceInfo: IGangZone;
+    readonly sourceInfo: IGangZone | null;
+    private _player;
     private _id;
     get id(): number;
-    constructor(gangZone: IGangZone);
+    constructor(gangZoneOrId: IGangZone | number, player?: Player);
     create(): this;
     destroy(): void;
+    isGlobal(): boolean;
+    isPlayer(): boolean;
+    getPlayer(): Player | null;
+    getPlayerId(): number;
     showForAll(color: string | number): this;
     showForPlayer(color: string | number, player?: Player): this;
     hideForAll(): this;
@@ -1621,70 +1632,53 @@ declare class GangZone {
     static getInstance(gangZoneId: number, player?: Player): GangZone | undefined;
     static getInstances(player?: Player): GangZone[];
     static getPlayersInstances(): [Player, GangZone[]][];
-    static __inject__GangZoneCreate: (minX: number, minY: number, maxX: number, maxY: number) => number;
-    static __inject__GangZoneDestroy: (zone: number) => number;
-    static __inject__GangZoneShowForAll: (zone: number, color: string | number) => number;
-    static __inject__GangZoneHideForAll: (zone: number) => number;
-    static __inject__GangZoneFlashForAll: (zone: number, flashColor: string | number) => number;
-    static __inject__GangZoneStopFlashForAll: (zone: number) => number;
-    static __inject__GangZoneGetPos: (zoneId: number) => IGangZonePos & ICommonRetVal;
-    static __inject__UseGangZoneCheck: (zoneId: number, toggle: boolean) => void;
-    static __inject__CreatePlayerGangZone: (playerId: number, minX: number, minY: number, maxX: number, maxY: number) => number;
-    static __inject__PlayerGangZoneDestroy: (playerId: number, zoneId: number) => number;
-    static __inject__PlayerGangZoneShow: (playerId: number, zoneId: number, color: number) => number;
-    static __inject__GangZoneShowForPlayer: (playerId: number, zone: number, color: string | number) => number;
-    static __inject__PlayerGangZoneHide: (playerId: number, zoneId: number) => number;
-    static __inject__GangZoneHideForPlayer: (playerId: number, zone: number) => number;
-    static __inject__PlayerGangZoneFlash: (playerId: number, zoneId: number, color: number) => number;
-    static __inject__GangZoneFlashForPlayer: (playerId: number, zone: number, flashColor: string | number) => number;
-    static __inject__PlayerGangZoneStopFlash: (playerId: number, zoneId: number) => number;
-    static __inject__GangZoneStopFlashForPlayer: (playerId: number, zone: number) => number;
-    static __inject__PlayerGangZoneGetPos: (playerId: number, zoneId: number) => IGangZonePos & ICommonRetVal;
-    static __inject__UsePlayerGangZoneCheck: (playerId: number, zoneId: number, use: boolean) => void;
-    static __inject__IsPlayerInGangZone: (playerId: number, zoneId: number) => boolean;
-    static __inject__IsPlayerInPlayerGangZone: (playerId: number, zoneId: number) => boolean;
-    static __inject__IsGangZoneVisibleForPlayer: (playerId: number, zoneId: number) => boolean;
-    static __inject__IsPlayerGangZoneVisible: (playerId: number, zoneId: number) => boolean;
-    static __inject__GangZoneGetColorForPlayer: (playerId: number, zoneId: number) => number;
-    static __inject__PlayerGangZoneGetColor: (playerId: number, zoneId: number) => number;
-    static __inject__GangZoneGetFlashColorForPlayer: (playerId: number, zoneId: number) => number;
-    static __inject__PlayerGangZoneGetFlashColor: (playerId: number, zoneId: number) => number;
-    static __inject__IsGangZoneFlashingForPlayer: (playerId: number, zoneId: number) => boolean;
-    static __inject__IsPlayerGangZoneFlashing: (playerId: number, zoneId: number) => boolean;
-    static __inject__IsValidPlayerGangZone: (playerId: number, zoneId: number) => boolean;
-    static __inject__IsValidGangZone: (zoneId: number) => boolean;
+    static __inject__: {
+        create: (minX: number, minY: number, maxX: number, maxY: number) => number;
+        destroy: (zone: number) => number;
+        showForAll: (zone: number, color: string | number) => number;
+        hideForAll: (zone: number) => number;
+        flashForAll: (zone: number, flashColor: string | number) => number;
+        stopFlashForAll: (zone: number) => number;
+        getPos: (zoneId: number) => IGangZonePos & ICommonRetVal;
+        useCheck: (zoneId: number, toggle: boolean) => void;
+        createPlayer: (playerId: number, minX: number, minY: number, maxX: number, maxY: number) => number;
+        destroyPlayer: (playerId: number, zoneId: number) => number;
+        showPlayer: (playerId: number, zoneId: number, color: number) => number;
+        showForPlayer: (playerId: number, zone: number, color: string | number) => number;
+        hidePlayer: (playerId: number, zoneId: number) => number;
+        hideForPlayer: (playerId: number, zone: number) => number;
+        flashPlayer: (playerId: number, zoneId: number, color: number) => number;
+        flashForPlayer: (playerId: number, zone: number, flashColor: string | number) => number;
+        stopFlashPlayer: (playerId: number, zoneId: number) => number;
+        stopFlashForPlayer: (playerId: number, zone: number) => number;
+        getPosPlayer: (playerId: number, zoneId: number) => IGangZonePos & ICommonRetVal;
+        useCheckPlayer: (playerId: number, zoneId: number, use: boolean) => void;
+        isPlayerIn: (playerId: number, zoneId: number) => boolean;
+        isPlayerInPlayer: (playerId: number, zoneId: number) => boolean;
+        isVisibleForPlayer: (playerId: number, zoneId: number) => boolean;
+        isVisiblePlayer: (playerId: number, zoneId: number) => boolean;
+        getColorForPlayer: (playerId: number, zoneId: number) => number;
+        getColorPlayer: (playerId: number, zoneId: number) => number;
+        getFlashColorForPlayer: (playerId: number, zoneId: number) => number;
+        getFlashColorPlayer: (playerId: number, zoneId: number) => number;
+        isFlashingForPlayer: (playerId: number, zoneId: number) => boolean;
+        isFlashingPlayer: (playerId: number, zoneId: number) => boolean;
+        isValidPlayer: (playerId: number, zoneId: number) => boolean;
+        isValidGlobal: (zoneId: number) => boolean;
+    };
 }
 
 declare class Menu {
-    private _itemCount;
-    get itemCount(): number;
+    private sourceInfo;
     private _id;
     get id(): number;
-    private _title;
-    get title(): string;
-    set title(value: string);
-    private _columns;
-    get columns(): number;
-    set columns(value: number);
-    private _x;
-    get x(): number;
-    set x(value: number);
-    private _y;
-    get y(): number;
-    set y(value: number);
-    private _col1width;
-    get col1width(): number;
-    set col1width(value: number);
-    private _col2width;
-    get col2width(): number;
-    set col2width(value: number);
-    constructor(title: string, columns: number, x: number, y: number, col1width: number, col2width: number);
+    constructor(menuOrId: IMenu | number);
     create(): this;
     destroy(): this;
     addItem(column: number, title: string): this;
     setColumnHeader(column: number, header: string): this;
     disable(): this;
-    disableRow(row: number): void;
+    disableRow(row: number): number;
     isValid(): boolean;
     showForPlayer(player: Player): number;
     hideForPlayer(player: Player): number;
@@ -1695,61 +1689,61 @@ declare class Menu {
         fX: number;
         fY: number;
         ret: number;
-    } | {
-        fX: number;
-        fY: number;
     };
     getColumnWidth(): {
         fColumn1: number;
         fColumn2: number;
         ret: number;
-    } | {
-        fColumn1: number;
-        fColumn2: number;
     };
     getColumnHeader(column: number): {
         header: string;
+        buf: number[];
         ret: number;
     };
     getItem(column: number, item: number): {
         item: string;
+        buf: number[];
         ret: number;
     };
     static isValid(menuId: number): boolean;
     static getInstance(id: number): Menu | undefined;
     static getInstances(): Menu[];
     static getInstanceByPlayer(player: Player): Menu | undefined;
-    static __inject__CreateMenu: (title: string, columns: number, x: number, y: number, col1width: number, col2width: number) => number;
-    static __inject__DestroyMenu: (menuId: number) => number;
-    static __inject__AddMenuItem: (menuId: number, column: number, menutext: string) => number;
-    static __inject__SetMenuColumnHeader: (menuId: number, column: number, columnHeader: string) => number;
-    static __inject__DisableMenu: (menuId: number) => number;
-    static __inject__DisableMenuRow: (menuId: number, row: number) => number;
-    static __inject__IsValidMenu: (menuId: number) => boolean;
-    static __inject__ShowMenuForPlayer: (menuId: number, playerId: number) => number;
-    static __inject__HideMenuForPlayer: (menuId: number, playerId: number) => number;
-    static __inject__IsMenuDisabled: (menuId: number) => boolean;
-    static __inject__IsMenuRowDisabled: (menuId: number, row: number) => boolean;
-    static __inject__GetMenuItems: (menuId: number, column: number) => number;
-    static __inject__GetMenuPos: (menuId: number) => {
-        fX: number;
-        fY: number;
-        ret: number;
-    };
-    static __inject__GetMenuColumnWidth: (menuId: number) => {
-        fColumn1: number;
-        fColumn2: number;
-        ret: number;
-    };
-    static __inject__GetMenuColumnHeader: (menuId: number, column: number) => {
-        header: string;
-        ret: number;
-    };
-    static __inject__GetMenuItem: (menuId: number, column: number, itemId: number) => {
-        item: string;
-        ret: number;
+    static __inject__: {
+        create: (title: string, columns: number, x: number, y: number, col1width: number, col2width: number, charset: string) => number;
+        destroy: (menuId: number) => number;
+        addItem: (menuId: number, column: number, menuText: string, charset: string) => number;
+        setColumnHeader: (menuId: number, column: number, columnHeader: string, charset: string) => number;
+        disable: (menuId: number) => number;
+        disableRow: (menuId: number, row: number) => number;
+        isValid: (menuId: number) => boolean;
+        showForPlayer: (menuId: number, playerId: number) => number;
+        hideForPlayer: (menuId: number, playerId: number) => number;
+        isDisabled: (menuId: number) => boolean;
+        isRowDisabled: (menuId: number, row: number) => boolean;
+        getItems: (menuId: number, column: number) => number;
+        getPos: (menuId: number) => {
+            fX: number;
+            fY: number;
+            ret: number;
+        };
+        getColumnWidth: (menuId: number) => {
+            fColumn1: number;
+            fColumn2: number;
+            ret: number;
+        };
+        getColumnHeader: (menuId: number, column: number, charset: string) => {
+            header: string;
+            buf: number[];
+            ret: number;
+        };
+        getItem: (menuId: number, column: number, itemId: number, charset: string) => {
+            item: string;
+            buf: number[];
+            ret: number;
+        };
+        getPlayerMenu: (playerId: number) => number;
     };
-    static __inject__GetPlayerMenu: (playerId: number) => number;
 }
 
 declare const VehicleEvent: Readonly<{
@@ -1973,6 +1967,60 @@ declare class DynamicObject {
     static showForPlayer(player: Player, z?: number): number;
     static getInstance(id: number): DynamicObject | undefined;
     static getInstances(): DynamicObject[];
+    static __inject__: {
+        createEx: (modelId: number, x: number, y: number, z: number, rx: number, ry: number, rz: number, streamDistance?: number, drawDistance?: number, worlds?: number[], interiors?: number[], players?: number[], areas?: number[], priority?: number) => number;
+        create: (modelId: number, x: number, y: number, z: number, rx: number, ry: number, rz: number, worldId?: number, interiorId?: number, playerId?: number, streamDistance?: number, drawDistance?: number, areaId?: number, priority?: number) => number;
+        destroy: (objectId: number) => number;
+        getPos: (objectId: number) => {
+            x: number;
+            y: number;
+            z: number;
+            ret: number;
+        };
+        setPos: (objectId: number, x: number, y: number, z: number) => number;
+        getRot: (objectId: number) => {
+            rx: number;
+            ry: number;
+            rz: number;
+            ret: number;
+        };
+        setRot: (objectId: number, rx: number, ry: number, rz: number) => number;
+        move: (objectId: number, x: number, y: number, z: number, speed: number, rx?: number, ry?: number, rz?: number) => number;
+        stop: (objectId: number) => number;
+        isMoving: (objectId: number) => boolean;
+        attachCamera: (playerId: number, objectId: number) => number;
+        attachToObject: (objectId: number, attachToId: number, offsetX: number, offsetY: number, offsetZ: number, rx: number, ry: number, rz: number, syncRotation?: boolean) => number;
+        attachToPlayer: (objectId: number, playerId: number, offsetX: number, offsetY: number, offsetZ: number, rx: number, ry: number, rz: number) => number;
+        attachToVehicle: (objectId: number, vehicleId: number, offsetX: number, offsetY: number, offsetZ: number, rx: number, ry: number, rz: number) => number;
+        edit: (playerId: number, objectId: number) => number;
+        isMaterialUsed: (objectId: number, materialIndex: number) => boolean;
+        removeMaterial: (objectId: number, materialIndex: number) => number;
+        getMaterial: (objectId: number, materialIndex: number, charset?: string) => {
+            modelId: number;
+            txdName: string;
+            textureName: string;
+            materialColor: number;
+            ret: number;
+        };
+        setMaterial: (objectId: number, materialIndex: number, modelId: number, txdName: string, textureName: string, materialColor?: number) => number;
+        isMaterialTextUsed: (objectId: number, materialIndex: number) => boolean;
+        removeMaterialText: (objectId: number, materialIndex: number) => number;
+        getMaterialText: (objectId: number, materialIndex: number, charset: string) => {
+            text: string;
+            materialSize: number;
+            fontFace: string;
+            fontSize: number;
+            bold: number;
+            fontColor: number;
+            backColor: number;
+            textAlignment: number;
+            ret: number;
+        };
+        setMaterialText: (charset: string, objectId: number, materialIndex: number, text: string, materialSize: number, fontFace: string, fontsize: number, bold: number, fontColor: number, backColor: number, textAlignment: number) => number;
+        getPlayerCameraTarget: (playerId: number) => number;
+        setNoCameraCol: (objectId: number) => boolean;
+        getNoCameraCol: (objectId: number) => boolean;
+    };
 }
 
 declare const DynamicObjectEvent: Readonly<{
@@ -2163,97 +2211,102 @@ declare class ObjectMp {
     static getInstance(objectId: number, player?: Player): ObjectMp | undefined;
     static getInstances(player?: Player): ObjectMp[];
     static getPlayersInstances(): [Player, ObjectMp[]][];
-    static __inject__CreateObject: (modelId: number, x: number, y: number, z: number, rX: number, rY: number, rZ: number, drawDistance?: number) => number;
-    static __inject__CreatePlayerObject: (playerId: number, modelId: number, x: number, y: number, z: number, rX: number, rY: number, rZ: number, drawDistance?: number) => number;
-    static __inject__DestroyObject: (objectId: number) => number;
-    static __inject__DestroyPlayerObject: (playerId: number, objectId: number) => number;
-    static __inject__SetObjectMaterialText: (charset: string, objectId: number, text: string, materialIndex: number, materialSize: number, fontFace: string, fontSize: number, bold: boolean | undefined, fontColor: string | number, backColor: string | number, textAlignment: number) => boolean;
-    static __inject__SetPlayerObjectMaterialText: (charset: string, playerId: number, objectId: number, text: string, materialIndex: number, materialSize: number, fontFace: string, fontsize: number, bold: boolean | undefined, fontColor: string | number, backColor: string | number, textAlignment: number) => boolean;
-    static __inject__SetObjectNoCameraCollision: (objectId: number) => boolean;
-    static __inject__SetPlayerObjectNoCameraCollision: (playerId: number, objectId: number) => boolean;
-    static __inject__IsObjectNoCameraCol: (objectId: number) => boolean;
-    static __inject__IsPlayerObjectNoCameraCol: (playerId: number, objectId: number) => boolean;
-    static __inject__GetObjectDrawDistance: (objectId: number) => number;
-    static __inject__GetPlayerObjectDrawDistance: (playerId: number, objectId: number) => number;
-    static __inject__SetObjectMoveSpeed: (objectId: number, fSpeed: number) => any;
-    static __inject__SetPlayerObjectMoveSpeed: (playerId: number, objectId: number, fSpeed: number) => any;
-    static __inject__GetObjectMoveSpeed: (objectId: number) => number;
-    static __inject__GetPlayerObjectMoveSpeed: (playerId: number, objectId: number) => number;
-    static __inject__GetObjectMovingTargetPos: (objectId: number) => IObjectPos & ICommonRetVal;
-    static __inject__GetPlayerObjectMovingTargetPos: (playerId: number, objectId: number) => IObjectPos & ICommonRetVal;
-    static __inject__GetObjectSyncRotation: (objectId: number) => number;
-    static __inject__GetPlayerObjectSyncRotation: (playerId: number, objectId: number) => boolean;
-    static __inject__GetObjectAttachedOffset: (objectId: number) => IObjectRotPos;
-    static __inject__GetPlayerObjectAttachedOffset: (playerId: number, objectId: number) => IObjectRotPos & ICommonRetVal;
-    static __inject__GetObjectTarget: (objectId: number) => IObjectPos & ICommonRetVal;
-    static __inject__GetPlayerObjectTarget: (playerId: number, objectId: number) => IObjectPos & ICommonRetVal;
-    static __inject__IsValidObject: (objectId: number) => boolean;
-    static __inject__IsValidPlayerObject: (playerId: number, objectId: number) => boolean;
-    static __inject__GetPlayerCameraTargetObject: (playerId: number) => number;
-    static __inject__GetPlayerCameraTargetPlayerObject: (playerId: number) => number;
-    static __inject__GetObjectModel: (objectId: number) => number;
-    static __inject__GetPlayerObjectModel: (playerId: number, objectId: number) => number;
-    static __inject__GetObjectPos: (objectId: number) => {
-        x: number;
-        y: number;
-        z: number;
-        ret: number;
-    };
-    static __inject__GetPlayerObjectPos: (playerId: number, objectId: number) => {
-        x: number;
-        y: number;
-        z: number;
-        ret: number;
-    };
-    static __inject__GetObjectRot: (objectId: number) => {
-        x: number;
-        y: number;
-        z: number;
-        ret: number;
-    };
-    static __inject__GetPlayerObjectRot: (playerId: number, objectId: number) => {
-        x: number;
-        y: number;
-        z: number;
-        ret: number;
+    static __inject__: {
+        create: (modelId: number, x: number, y: number, z: number, rX: number, rY: number, rZ: number, drawDistance?: number) => number;
+        createPlayer: (playerId: number, modelId: number, x: number, y: number, z: number, rX: number, rY: number, rZ: number, drawDistance?: number) => number;
+        destroy: (objectId: number) => number;
+        destroyPlayer: (playerId: number, objectId: number) => number;
+        setMaterialText: (charset: string, objectId: number, text: string, materialIndex: number, materialSize: number, fontFace: string, fontSize: number, bold: boolean | undefined, fontColor: string | number, backColor: string | number, textAlignment: number) => boolean;
+        setMaterialTextPlayer: (charset: string, playerId: number, objectId: number, text: string, materialIndex: number, materialSize: number, fontFace: string, fontsize: number, bold: boolean | undefined, fontColor: string | number, backColor: string | number, textAlignment: number) => boolean;
+        setNoCameraCollision: (objectId: number) => boolean;
+        setNoCameraCollisionPlayer: (playerId: number, objectId: number) => boolean;
+        isNoCameraCol: (objectId: number) => boolean;
+        isNoCameraColPlayer: (playerId: number, objectId: number) => boolean;
+        getDrawDistance: (objectId: number) => number;
+        getDrawDistancePlayer: (playerId: number, objectId: number) => number;
+        setMoveSpeed: (objectId: number, fSpeed: number) => boolean;
+        setMoveSpeedPlayer: (playerId: number, objectId: number, fSpeed: number) => boolean;
+        getMoveSpeed: (objectId: number) => number;
+        getMoveSpeedPlayer: (playerId: number, objectId: number) => number;
+        getMovingTargetPos: (objectId: number) => IObjectPos & ICommonRetVal;
+        getMovingTargetPosPlayer: (playerId: number, objectId: number) => IObjectPos & ICommonRetVal;
+        getSyncRotation: (objectId: number) => number;
+        getSyncRotationPlayer: (playerId: number, objectId: number) => boolean;
+        getAttachedOffset: (objectId: number) => IObjectRotPos;
+        getAttachedOffsetPlayer: (playerId: number, objectId: number) => IObjectRotPos & ICommonRetVal;
+        getTarget: (objectId: number) => IObjectPos & ICommonRetVal;
+        getTargetPlayer: (playerId: number, objectId: number) => IObjectPos & ICommonRetVal;
+        isValid: (objectId: number) => boolean;
+        isValidPlayer: (playerId: number, objectId: number) => boolean;
+        getCameraTarget: (playerId: number) => number;
+        getCameraTargetPlayer: (playerId: number) => number;
+        getModel: (objectId: number) => number;
+        getModelPlayer: (playerId: number, objectId: number) => number;
+        getPos: (objectId: number) => {
+            x: number;
+            y: number;
+            z: number;
+            ret: number;
+        };
+        getPosPlayer: (playerId: number, objectId: number) => {
+            x: number;
+            y: number;
+            z: number;
+            ret: number;
+        };
+        getRot: (objectId: number) => {
+            x: number;
+            y: number;
+            z: number;
+            ret: number;
+        };
+        getRotPlayer: (playerId: number, objectId: number) => {
+            x: number;
+            y: number;
+            z: number;
+            ret: number;
+        };
+        setPos: (objectId: number, x: number, y: number, z: number) => boolean;
+        setPosPlayer: (playerId: number, objectId: number, x: number, y: number, z: number) => boolean;
+        setRot: (objectId: number, rotX: number, rotY: number, rotZ: number) => boolean;
+        setRotPlayer: (playerId: number, objectId: number, rotX: number, rotY: number, rotZ: number) => boolean;
+        move: (objectId: number, x: number, y: number, z: number, speed: number, rotX: number, rotY: number, rotZ: number) => number;
+        movePlayer: (playerId: number, objectId: number, x: number, y: number, z: number, speed: number, rotX: number, rotY: number, rotZ: number) => number;
+        setMaterial: (objectId: number, materialIndex: number, modelId: number, txdName: string, textureName: string, materialColor: string | number) => boolean;
+        setMaterialPlayer: (playerId: number, objectId: number, materialIndex: number, modelId: number, txdName: string, textureName: string, materialColor: string | number) => boolean;
+        stop: (objectId: number) => number;
+        stopPlayer: (playerId: number, objectId: number) => number;
+        isMoving: (objectId: number) => boolean;
+        isMovingPlayer: (playerId: number, objectId: number) => boolean;
+        attachCamera: (playerId: number, objectId: number) => boolean;
+        attachCameraPlayer: (playerId: number, playerObjectId: number) => boolean;
+        attachToObject: (objectId: number, attachToId: number, offsetX: number, offsetY: number, offsetZ: number, rotX: number, rotY: number, rotZ: number, syncRotation?: boolean) => boolean;
+        attachToPlayer: (objectId: number, playerId: number, offsetX: number, offsetY: number, offsetZ: number, rotX: number, rotY: number, rotZ: number) => boolean;
+        attachToVehicle: (objectId: number, vehicleId: number, offsetX: number, offsetY: number, offsetZ: number, rotX: number, rotY: number, rotZ: number) => boolean;
+        attachPlayerToObject: (playerId: number, objectId: number, parentId: number, offsetX: number, offsetY: number, offsetZ: number, rotX: number, rotY: number, rotZ: number, syncRotation?: boolean) => boolean;
+        attachPlayerToPlayer: (objectPlayer: number, objectId: number, attachPlayer: number, offsetX: number, offsetY: number, offsetZ: number, rX: number, rY: number, rZ: number) => boolean;
+        attachPlayerToVehicle: (playerId: number, objectId: number, vehicleId: number, fOffsetX: number, fOffsetY: number, fOffsetZ: number, fRotX: number, fRotY: number, RotZ: number) => boolean;
+        beginEditing: (playerId: number, objectId: number) => boolean;
+        beginEditingPlayer: (playerId: number, objectId: number) => boolean;
+        endEditing: (playerId: number) => boolean;
+        getMaterial: (objectId: number, materialIndex: number) => IMaterial & ICommonRetVal;
+        getMaterialPlayer: (playerId: number, objectId: number, materialIndex: number) => IMaterial & ICommonRetVal;
+        isMaterialSlotUsed: (objectId: number, materialIndex: number) => boolean;
+        isMaterialSlotUsedPlayer: (playerId: number, objectId: number, materialIndex: number) => boolean;
+        getMaterialText: (objectId: number, materialIndex: number, charset: string) => IMaterialText & ICommonRetVal;
+        getMaterialTextPlayer: (playerId: number, objectId: number, materialIndex: number, charset: string) => IMaterialText & ICommonRetVal;
     };
-    static __inject__SetObjectPos: (objectId: number, x: number, y: number, z: number) => boolean;
-    static __inject__SetPlayerObjectPos: (playerId: number, objectId: number, x: number, y: number, z: number) => boolean;
-    static __inject__SetObjectRot: (objectId: number, rotX: number, rotY: number, rotZ: number) => boolean;
-    static __inject__SetPlayerObjectRot: (playerId: number, objectId: number, rotX: number, rotY: number, rotZ: number) => boolean;
-    static __inject__MoveObject: (objectId: number, x: number, y: number, z: number, speed: number, rotX: number, rotY: number, rotZ: number) => number;
-    static __inject__MovePlayerObject: (playerId: number, objectId: number, x: number, y: number, z: number, speed: number, rotX: number, rotY: number, rotZ: number) => number;
-    static __inject__SetObjectMaterial: (objectId: number, materialIndex: number, modelId: number, txdName: string, textureName: string, materialColor: string | number) => boolean;
-    static __inject__SetPlayerObjectMaterial: (playerId: number, objectId: number, materialIndex: number, modelId: number, txdName: string, textureName: string, materialColor: string | number) => boolean;
-    static __inject__StopObject: (objectId: number) => number;
-    static __inject__StopPlayerObject: (playerId: number, objectId: number) => number;
-    static __inject__IsObjectMoving: (objectId: number) => boolean;
-    static __inject__IsPlayerObjectMoving: (playerId: number, objectId: number) => boolean;
-    static __inject__AttachCameraToObject: (playerId: number, objectId: number) => boolean;
-    static __inject__AttachCameraToPlayerObject: (playerId: number, playerObjectId: number) => boolean;
-    static __inject__AttachObjectToPlayer: (objectId: number, playerId: number, offsetX: number, offsetY: number, offsetZ: number, rotX: number, rotY: number, rotZ: number) => boolean;
-    static __inject__AttachObjectToObject: (objectId: number, attachToId: number, offsetX: number, offsetY: number, offsetZ: number, rotX: number, rotY: number, rotZ: number, syncRotation?: boolean) => boolean;
-    static __inject__AttachPlayerObjectToObject: (playerId: number, objectId: number, parentId: number, offsetX: number, offsetY: number, offsetZ: number, rotX: number, rotY: number, rotZ: number, syncRotation?: boolean) => boolean;
-    static __inject__AttachPlayerObjectToPlayer: (objectPlayer: number, objectId: number, attachPlayer: number, offsetX: number, offsetY: number, offsetZ: number, rX: number, rY: number, rZ: number) => boolean;
-    static __inject__AttachObjectToVehicle: (objectId: number, vehicleId: number, offsetX: number, offsetY: number, offsetZ: number, rotX: number, rotY: number, rotZ: number) => boolean;
-    static __inject__AttachPlayerObjectToVehicle: (playerId: number, objectId: number, vehicleId: number, fOffsetX: number, fOffsetY: number, fOffsetZ: number, fRotX: number, fRotY: number, RotZ: number) => boolean;
-    static __inject__BeginObjectEditing: (playerId: number, objectId: number) => boolean;
-    static __inject__BeginPlayerObjectEditing: (playerId: number, objectId: number) => boolean;
-    static __inject__EndObjectEditing: (playerId: number) => boolean;
-    static __inject__GetObjectMaterial: (objectId: number, materialIndex: number) => IMaterial & ICommonRetVal;
-    static __inject__GetPlayerObjectMaterial: (playerId: number, objectId: number, materialIndex: number) => IMaterial & ICommonRetVal;
-    static __inject__IsObjectMaterialSlotUsed: (objectId: number, materialIndex: number) => boolean;
-    static __inject__IsPlayerObjectMaterialSlotUsed: (playerId: number, objectId: number, materialIndex: number) => boolean;
 }
 
 declare class Npc {
     private _id;
     private _name;
     get id(): number;
-    constructor(name: string);
+    constructor(nameOrId: string | number);
+    create(): this;
+    destroy(): this;
     getPlayer(): Player;
     getName(): string;
-    destroy(): this;
     isValid(): boolean;
     spawn(): this;
     respawn(): this;
@@ -2290,7 +2343,7 @@ declare class Npc {
     isDead(): boolean;
     applyAnimation(animLib: string, animName: string, delta: number, loop: boolean, lockX: boolean, lockY: boolean, freeze: boolean, time: number, sync: number): this;
     setWeapon(weapon: WeaponEnum): this;
-    getWeapon(): WeaponEnum;
+    getWeapon(): 0 | WeaponEnum;
     setAmmo(ammo: number): this;
     getAmmo(): number;
     setKeys(upAndDown: number, leftAndDown: number, keys: number): this;
@@ -2356,7 +2409,7 @@ declare class Npc {
     getVehicleTrainSpeed(): number;
     resetAnimation(): number;
     setAnimation(animationId: number, delta: number, loop: boolean, lockX: boolean, lockY: boolean, freeze: boolean, time: number): number;
-    getAnimation(): {
+    getAnimation(): 0 | {
         animationId: number;
         delta: number;
         loop: boolean;
@@ -2422,6 +2475,166 @@ declare class Npc {
     static isValid(id: number): boolean;
     static getInstance(id: number): Npc | undefined;
     static getInstances(): Npc[];
+    static __inject__: {
+        create: (name: string) => number;
+        destroy: (id: number) => number;
+        isValid: (id: number) => boolean;
+        spawn: (id: number) => number;
+        respawn: (id: number) => number;
+        setPos: (id: number, x: number, y: number, z: number) => number;
+        setRot: (id: number, rX: number, rY: number, rZ: number) => number;
+        getRot: (id: number) => {
+            rX: number;
+            rY: number;
+            rZ: number;
+            ret: number;
+        };
+        setFacingAngle: (id: number, angle: number) => number;
+        getFacingAngle: (id: number) => {
+            angle: number;
+            ret: number;
+        };
+        setVirtualWorld: (id: number, virtualWorld: number) => number;
+        getVirtualWorld: (id: number) => number;
+        move: (id: number, targetPosX: number, targetPosY: number, targetPosZ: number, moveType: number, moveSpeed: number) => boolean;
+        moveToPlayer: (id: number, playerId: number, moveType: number, moveSpeed: number) => boolean;
+        stopMove: (id: number) => number;
+        isMoving: (id: number) => boolean;
+        isMovingToPlayer: (id: number, playerId: number) => boolean;
+        setSkin: (id: number, model: number) => number;
+        getSkin: (id: number) => number;
+        isStreamedIn: (id: number, playerId: number) => boolean;
+        isAnyStreamedIn: (id: number) => boolean;
+        setInterior: (id: number, interior: number) => number;
+        getInterior: (id: number) => number;
+        setHealth: (id: number, health: number) => number;
+        getHealth: (id: number) => number;
+        setArmour: (id: number, armour: number) => number;
+        getArmour: (id: number) => number;
+        isDead: (id: number) => boolean;
+        applyAnimation: (id: number, animLib: string, animName: string, delta: number, loop: boolean, lockX: boolean, lockY: boolean, freeze: boolean, time: number, sync: number) => number;
+        setWeapon: (id: number, weapon: WeaponEnum) => number;
+        getWeapon: (id: number) => WeaponEnum;
+        setAmmo: (id: number, ammo: number) => number;
+        getAmmo: (id: number) => number;
+        setKeys: (id: number, upAndDown: number, leftAndDown: number, keys: number) => number;
+        getKeys: (id: number) => {
+            upAndDown: number;
+            leftAndDown: number;
+            keys: number;
+            ret: number;
+        };
+        setWeaponSkillLevel: (id: number, skill: WeaponSkillsEnum, level: number) => number;
+        getWeaponSkillLevel: (id: number, skill: WeaponSkillsEnum) => number;
+        meleeAttack: (id: number, time: number, secondaryAttack: boolean) => number;
+        stopMeleeAttack: (id: number) => number;
+        isMeleeAttacking: (id: number) => boolean;
+        setFightingStyle: (id: number, style: FightingStylesEnum) => number;
+        getFightingStyle: (id: number) => FightingStylesEnum;
+        enableReloading: (id: number, enable: boolean) => number;
+        isReloadEnabled: (id: number) => boolean;
+        isReloading: (id: number) => boolean;
+        enableInfiniteAmmo: (id: number, enable: boolean) => number;
+        isInfiniteAmmoEnabled: (id: number) => boolean;
+        setWeaponState: (id: number, weaponState: WeaponStatesEnum) => boolean;
+        getWeaponState: (id: number) => WeaponStatesEnum;
+        setAmmoInClip: (id: number, ammo: number) => number;
+        getAmmoInClip: (id: number) => number;
+        shoot: (id: number, weapon: WeaponStatesEnum, hitId: number, hitType: BulletHitTypesEnum, endPointX: number, endPointY: number, endPointZ: number, offsetX: number, offsetY: number, offsetZ: number, isHit: boolean, checkInBetweenFlags: number) => number;
+        isShooting: (id: number) => boolean;
+        aimAt: (id: number, pointX: number, pointY: number, pointZ: number, shoot: boolean, shootDelay: number, updateAngle: boolean, offsetFromX: number, offsetFromY: number, offsetFromZ: number, checkInBetweenFlags: number) => number;
+        aimAtPlayer: (id: number, playerId: number, shoot: boolean, shootDelay: number, updateAngle: boolean, offsetX: number, offsetY: number, offsetZ: number, offsetFromX: number, offsetFromY: number, offsetFromZ: number, checkInBetweenFlags: number) => number;
+        stopAim: (id: number) => number;
+        isAiming: (id: number) => boolean;
+        isAimingAtPlayer: (id: number, playerId: number) => boolean;
+        setWeaponAccuracy: (id: number, weapon: WeaponEnum, accuracy: number) => number;
+        getWeaponAccuracy: (id: number, weapon: number) => number;
+        setWeaponReloadTime: (id: number, weapon: number, time: number) => number;
+        getWeaponReloadTime: (id: number, weapon: number) => number;
+        getWeaponActualReloadTime: (id: number, weapon: number) => number;
+        setWeaponShootTime: (id: number, weapon: number, time: number) => number;
+        getWeaponShootTime: (id: number, weapon: number) => number;
+        setWeaponClipSize: (id: number, weapon: number, size: number) => number;
+        getWeaponClipSize: (id: number, weapon: number) => number;
+        getWeaponActualClipSize: (id: number, weapon: number) => number;
+        enterVehicle: (id: number, vehicleId: number, seatId: number, moveType: number) => number;
+        exitVehicle: (id: number) => number;
+        putInVehicle: (id: number, vehicleId: number, seat: number) => number;
+        removeFromVehicle: (id: number) => number;
+        getVehicle: (id: number) => number;
+        getVehicleSeat: (id: number) => number;
+        getEnteringVehicle: (id: number) => number;
+        getEnteringVehicleSeat: (id: number) => number;
+        isEnteringVehicle: (id: number) => boolean;
+        useVehicleSiren: (id: number, use: boolean) => number;
+        isVehicleSirenUsed: (id: number) => boolean;
+        setVehicleHealth: (id: number, health: number) => number;
+        getVehicleHealth: (id: number) => number;
+        setVehicleHydraThrusters: (id: number, direction: number) => number;
+        getVehicleHydraThrusters: (id: number) => number;
+        setVehicleGearState: (id: number, gearState: number) => number;
+        getVehicleGearState: (id: number) => number;
+        setVehicleTrainSpeed: (id: number, speed: number) => number;
+        getVehicleTrainSpeed: (id: number) => number;
+        resetAnimation: (id: number) => number;
+        setAnimation: (id: number, animationId: number, delta: number, loop: boolean, lockX: boolean, lockY: boolean, freeze: boolean, time: number) => number;
+        getAnimation: (id: number) => {
+            animationId: number;
+            delta: number;
+            loop: boolean;
+            lockX: boolean;
+            lockY: boolean;
+            freeze: boolean;
+            time: number;
+            ret: number;
+        };
+        clearAnimations: (id: number) => number;
+        setSpecialAction: (id: number, action: number) => number;
+        getSpecialAction: (id: number) => number;
+        startPlayback: (id: number, recordName: string, autoUnload: boolean, startX: number, startY: number, startZ: number, rotX: number, rotY: number, rotZ: number) => number;
+        startPlaybackEx: (id: number, recordId: number, autoUnload: boolean, startX: number, startY: number, startZ: number, rotX: number, rotY: number, rotZ: number) => number;
+        stopPlayback: (id: number) => number;
+        pausePlayback: (id: number, paused: boolean) => number;
+        isPlayingPlayback: (id: number) => boolean;
+        isPlaybackPaused: (id: number) => boolean;
+        playNode: (id: number, nodeId: number, moveType: number, speed: number, radius: number, setAngle: boolean) => boolean;
+        stopPlayingNode: (id: number) => boolean;
+        pausePlayingNode: (id: number) => boolean;
+        resumePlayingNode: (id: number) => boolean;
+        isPlayingNodePaused: (id: number) => boolean;
+        isPlayingNode: (id: number) => boolean;
+        changeNode: (id: number, nodeId: number, link: number) => number;
+        updateNodePoint: (id: number, pointId: number) => boolean;
+        setInvulnerable: (id: number, toggle: boolean) => number;
+        isInvulnerable: (id: number) => boolean;
+        setSurfingOffsets: (id: number, x: number, y: number, z: number) => number;
+        getSurfingOffsets: (id: number) => {
+            x: number;
+            y: number;
+            z: number;
+            ret: number;
+        };
+        setSurfingVehicle: (id: number, vehicleId: number) => number;
+        getSurfingVehicle: (id: number) => number;
+        setSurfingObject: (id: number, objectId: number) => number;
+        getSurfingObject: (id: number) => number;
+        setSurfingPlayerObject: (id: number, objectId: number) => number;
+        getSurfingPlayerObject: (id: number) => number;
+        resetSurfingData: (id: number) => number;
+        isSpawned: (id: number) => boolean;
+        kill: (id: number, killerId: number, reason: number) => boolean;
+        setVelocity: (id: number, x: number, y: number, z: number) => boolean;
+        getVelocity: (id: number) => {
+            x: number;
+            y: number;
+            z: number;
+            ret: number;
+        };
+        getPlayerAimingAt: (id: number) => number;
+        getPlayerMovingTo: (id: number) => number;
+        startRecordingPlayerData: (playerId: number, recordType: number, recordName: string) => boolean;
+        stopRecordingPlayerData: (playerId: number) => boolean;
+    };
 }
 
 declare class NpcPath {
@@ -2453,9 +2666,10 @@ declare class NpcPath {
 
 declare class TextDraw {
     private sourceInfo;
+    private _player;
     private _id;
     get id(): number;
-    constructor(textDraw: ITextDraw);
+    constructor(textDrawOrId: ITextDraw | number, player?: Player);
     create(): this;
     destroy(): this;
     setFont(style: 0 | 1 | 2 | 3 | TextDrawFontsEnum): this;
@@ -2510,102 +2724,104 @@ declare class TextDraw {
     static getInstance(textDrawId: number, player?: Player): TextDraw | undefined;
     static getInstances(player?: Player): TextDraw[];
     static getPlayersInstances(): [Player, TextDraw[]][];
-    static __inject__TextDrawCreate: (x: number, y: number, text: number[]) => number;
-    static __inject__CreatePlayerTextDraw: (playerId: number, x: number, y: number, text: number[]) => number;
-    static __inject__TextDrawDestroy: (text: number) => number;
-    static __inject__PlayerTextDrawDestroy: (playerId: number, text: number) => void;
-    static __inject__TextDrawFont: (text: number, font: number) => number;
-    static __inject__PlayerTextDrawFont: (playerId: number, text: number, font: number) => number;
-    static __inject__TextDrawColor: (text: number, color: string | number) => boolean;
-    static __inject__PlayerTextDrawColor: (playerId: number, text: number, color: string | number) => boolean;
-    static __inject__TextDrawBoxColor: (text: number, color: string | number) => boolean;
-    static __inject__PlayerTextDrawBoxColor: (playerId: number, text: number, color: string | number) => boolean;
-    static __inject__TextDrawBackgroundColor: (text: number, color: string | number) => boolean;
-    static __inject__PlayerTextDrawBackgroundColor: (playerId: number, text: number, color: string | number) => boolean;
-    static __inject__TextDrawAlignment: (text: number, alignment: TextDrawAlignEnum) => number;
-    static __inject__PlayerTextDrawAlignment: (playerId: number, text: number, alignment: TextDrawAlignEnum) => number;
-    static __inject__TextDrawLetterSize: (text: number, x: number, y: number) => number;
-    static __inject__PlayerTextDrawLetterSize: (playerId: number, text: number, x: number, y: number) => number;
-    static __inject__TextDrawSetOutline: (text: number, size: number) => number;
-    static __inject__PlayerTextDrawSetOutline: (playerId: number, text: number, size: number) => number;
-    static __inject__TextDrawSetPreviewModel: (text: number, modelIndex: number) => number;
-    static __inject__PlayerTextDrawSetPreviewModel: (playerId: number, text: number, modelIndex: number) => number;
-    static __inject__TextDrawSetPreviewRot: (text: number, fRotX: number, fRotY: number, fRotZ: number, fZoom?: number) => void;
-    static __inject__PlayerTextDrawSetPreviewRot: (playerId: number, text: number, fRotX: number, fRotY: number, fRotZ: number, fZoom: number) => number;
-    static __inject__TextDrawSetPreviewVehicleColors: (text: number, color1: string | number, color2: string | number) => boolean;
-    static __inject__PlayerTextDrawSetPreviewVehicleColors: (playerId: number, text: number, color1: string | number, color2: string | number) => boolean;
-    static __inject__TextDrawSetProportional: (text: number, set: boolean) => number;
-    static __inject__PlayerTextDrawSetProportional: (playerId: number, text: number, set: boolean) => number;
-    static __inject__TextDrawSetSelectable: (text: number, set: boolean) => number;
-    static __inject__PlayerTextDrawSetSelectable: (playerId: number, text: number, set: boolean) => number;
-    static __inject__TextDrawSetShadow: (text: number, size: number) => number;
-    static __inject__PlayerTextDrawSetShadow: (playerId: number, text: number, size: number) => number;
-    static __inject__PlayerTextDrawSetString: (playerId: number, text: number, string: number[]) => number;
-    static __inject__TextDrawSetStringForPlayer: (textDrawId: number, playerId: number, string: number[]) => void;
-    static __inject__TextDrawSetString: (text: number, string: number[]) => number;
-    static __inject__TextDrawTextSize: (text: number, x: number, y: number) => number;
-    static __inject__PlayerTextDrawTextSize: (playerId: number, text: number, x: number, y: number) => number;
-    static __inject__PlayerTextDrawUseBox: (playerId: number, text: number, use: boolean) => number;
-    static __inject__TextDrawUseBox: (text: number, use: boolean) => number;
-    static __inject__PlayerTextDrawShow: (playerId: number, text: number) => number;
-    static __inject__TextDrawShowForPlayer: (playerId: number, text: number) => number;
-    static __inject__PlayerTextDrawHide: (playerId: number, text: number) => number;
-    static __inject__TextDrawHideForPlayer: (playerId: number, text: number) => number;
-    static __inject__TextDrawShowForAll: (text: number) => number;
-    static __inject__TextDrawHideForAll: (text: number) => number;
-    static __inject__IsValidPlayerTextDraw: (playerId: number, textDrawId: number) => boolean;
-    static __inject__IsValidTextDraw: (textDrawId: number) => boolean;
-    static __inject__IsPlayerTextDrawVisible: (playerId: number, textDrawId: number) => boolean;
-    static __inject__IsTextDrawVisibleForPlayer: (playerId: number, textDrawId: number) => boolean;
-    static __inject__PlayerTextDrawGetString: (playerId: number, textDrawId: number) => {
-        str: string;
-        ret: number;
-    };
-    static __inject__TextDrawGetString: (textDrawId: number) => {
-        str: string;
-        ret: number;
-    };
-    static __inject__PlayerTextDrawSetPos: (playerId: number, textDrawId: number, fX: number, fY: number) => void;
-    static __inject__TextDrawSetPos: (textDrawId: number, fX: number, fY: number) => void;
-    static __inject__PlayerTextDrawGetLetterSize: (playerId: number, textDrawId: number) => ITextDrawCommonSize & ICommonRetVal;
-    static __inject__TextDrawGetLetterSize: (textDrawId: number) => ITextDrawCommonSize & ICommonRetVal;
-    static __inject__PlayerTextDrawGetTextSize: (playerId: number, textDrawId: number) => ITextDrawCommonSize & ICommonRetVal;
-    static __inject__TextDrawGetTextSize: (textDrawId: number) => ITextDrawCommonSize & ICommonRetVal;
-    static __inject__PlayerTextDrawGetPos: (playerId: number, textDrawId: number) => ITextDrawCommonSize & ICommonRetVal;
-    static __inject__TextDrawGetPos: (textDrawId: number) => ITextDrawCommonSize & ICommonRetVal;
-    static __inject__PlayerTextDrawGetColor: (playerId: number, textDrawId: number) => number;
-    static __inject__TextDrawGetColor: (textDrawId: number) => number;
-    static __inject__PlayerTextDrawGetBoxColor: (playerId: number, textDrawId: number) => number;
-    static __inject__TextDrawGetBoxColor: (textDrawId: number) => number;
-    static __inject__PlayerTextDrawGetBackgroundColor: (playerId: number, textDrawId: number) => number;
-    static __inject__TextDrawGetBackgroundColor: (textDrawId: number) => number;
-    static __inject__PlayerTextDrawGetShadow: (playerId: number, textDrawId: number) => number;
-    static __inject__TextDrawGetShadow: (textDrawId: number) => number;
-    static __inject__PlayerTextDrawGetOutline: (playerId: number, textDrawId: number) => number;
-    static __inject__TextDrawGetOutline: (textDrawId: number) => number;
-    static __inject__PlayerTextDrawGetFont: (playerId: number, textDrawId: number) => number;
-    static __inject__TextDrawGetFont: (textDrawId: number) => number;
-    static __inject__PlayerTextDrawIsBox: (playerId: number, textDrawId: number) => boolean;
-    static __inject__TextDrawIsBox: (textDrawId: number) => boolean;
-    static __inject__PlayerTextDrawIsProportional: (playerId: number, textDrawId: number) => boolean;
-    static __inject__TextDrawIsProportional: (textDrawId: number) => boolean;
-    static __inject__PlayerTextDrawIsSelectable: (playerId: number, textDrawId: number) => boolean;
-    static __inject__TextDrawIsSelectable: (textDrawId: number) => boolean;
-    static __inject__PlayerTextDrawGetAlignment: (playerId: number, textDrawId: number) => number;
-    static __inject__TextDrawGetAlignment: (textDrawId: number) => number;
-    static __inject__PlayerTextDrawGetPreviewModel: (playerId: number, textDrawId: number) => number;
-    static __inject__TextDrawGetPreviewModel: (textDrawId: number) => number;
-    static __inject__PlayerTextDrawGetPreviewRot: (playerId: number, textDrawId: number) => ITextDrawRot;
-    static __inject__TextDrawGetPreviewRot: (textDrawId: number) => ITextDrawRot & ICommonRetVal;
-    static __inject__TextDrawGetPreviewVehicleColors: (textDrawId: number) => {
-        color1: number;
-        color2: number;
-        ret: number;
-    };
-    static __inject__PlayerTextDrawGetPreviewVehicleColors: (playerId: number, textDrawId: number) => {
-        color1: number;
-        color2: number;
-        ret: number;
+    static __inject__: {
+        create: (x: number, y: number, text: number[]) => number;
+        createPlayer: (playerId: number, x: number, y: number, text: number[]) => number;
+        destroy: (text: number) => number;
+        destroyPlayer: (playerId: number, text: number) => void;
+        setFont: (text: number, font: number) => number;
+        setFontPlayer: (playerId: number, text: number, font: number) => number;
+        setColor: (text: number, color: string | number) => boolean;
+        setColorPlayer: (playerId: number, text: number, color: string | number) => boolean;
+        setBoxColor: (text: number, color: string | number) => boolean;
+        setBoxColorPlayer: (playerId: number, text: number, color: string | number) => boolean;
+        setBackgroundColor: (text: number, color: string | number) => boolean;
+        setBackgroundColorPlayer: (playerId: number, text: number, color: string | number) => boolean;
+        setAlignment: (text: number, alignment: TextDrawAlignEnum) => number;
+        setAlignmentPlayer: (playerId: number, text: number, alignment: TextDrawAlignEnum) => number;
+        setLetterSize: (text: number, x: number, y: number) => number;
+        setLetterSizePlayer: (playerId: number, text: number, x: number, y: number) => number;
+        setOutline: (text: number, size: number) => number;
+        setOutlinePlayer: (playerId: number, text: number, size: number) => number;
+        setPreviewModel: (text: number, modelIndex: number) => number;
+        setPreviewModelPlayer: (playerId: number, text: number, modelIndex: number) => number;
+        setPreviewRot: (text: number, fRotX: number, fRotY: number, fRotZ: number, fZoom?: number) => void;
+        setPreviewRotPlayer: (playerId: number, text: number, fRotX: number, fRotY: number, fRotZ: number, fZoom: number) => number;
+        setPreviewVehicleColors: (text: number, color1: string | number, color2: string | number) => boolean;
+        setPreviewVehicleColorsPlayer: (playerId: number, text: number, color1: string | number, color2: string | number) => boolean;
+        setProportional: (text: number, set: boolean) => number;
+        setProportionalPlayer: (playerId: number, text: number, set: boolean) => number;
+        setSelectable: (text: number, set: boolean) => number;
+        setSelectablePlayer: (playerId: number, text: number, set: boolean) => number;
+        setShadow: (text: number, size: number) => number;
+        setShadowPlayer: (playerId: number, text: number, size: number) => number;
+        setStringPlayer: (playerId: number, text: number, string: number[]) => number;
+        setStringForPlayer: (textDrawId: number, playerId: number, string: number[]) => void;
+        setString: (text: number, string: number[]) => number;
+        setTextSize: (text: number, x: number, y: number) => number;
+        setTextSizePlayer: (playerId: number, text: number, x: number, y: number) => number;
+        useBoxPlayer: (playerId: number, text: number, use: boolean) => number;
+        useBox: (text: number, use: boolean) => number;
+        showPlayer: (playerId: number, text: number) => number;
+        showForPlayer: (playerId: number, text: number) => number;
+        hidePlayer: (playerId: number, text: number) => number;
+        hideForPlayer: (playerId: number, text: number) => number;
+        showForAll: (text: number) => number;
+        hideForAll: (text: number) => number;
+        isValidPlayer: (playerId: number, textDrawId: number) => boolean;
+        isValid: (textDrawId: number) => boolean;
+        isVisiblePlayer: (playerId: number, textDrawId: number) => boolean;
+        isVisibleForPlayer: (playerId: number, textDrawId: number) => boolean;
+        getStringPlayer: (playerId: number, textDrawId: number) => {
+            str: string;
+            ret: number;
+        };
+        getString: (textDrawId: number) => {
+            str: string;
+            ret: number;
+        };
+        setPosPlayer: (playerId: number, textDrawId: number, fX: number, fY: number) => void;
+        setPos: (textDrawId: number, fX: number, fY: number) => void;
+        getLetterSizePlayer: (playerId: number, textDrawId: number) => ITextDrawCommonSize & ICommonRetVal;
+        getLetterSize: (textDrawId: number) => ITextDrawCommonSize & ICommonRetVal;
+        getTextSizePlayer: (playerId: number, textDrawId: number) => ITextDrawCommonSize & ICommonRetVal;
+        getTextSize: (textDrawId: number) => ITextDrawCommonSize & ICommonRetVal;
+        getPosPlayer: (playerId: number, textDrawId: number) => ITextDrawCommonSize & ICommonRetVal;
+        getPos: (textDrawId: number) => ITextDrawCommonSize & ICommonRetVal;
+        getColorPlayer: (playerId: number, textDrawId: number) => number;
+        getColor: (textDrawId: number) => number;
+        getBoxColorPlayer: (playerId: number, textDrawId: number) => number;
+        getBoxColor: (textDrawId: number) => number;
+        getBackgroundColorPlayer: (playerId: number, textDrawId: number) => number;
+        getBackgroundColor: (textDrawId: number) => number;
+        getShadowPlayer: (playerId: number, textDrawId: number) => number;
+        getShadow: (textDrawId: number) => number;
+        getOutlinePlayer: (playerId: number, textDrawId: number) => number;
+        getOutline: (textDrawId: number) => number;
+        getFontPlayer: (playerId: number, textDrawId: number) => number;
+        getFont: (textDrawId: number) => number;
+        isBoxPlayer: (playerId: number, textDrawId: number) => boolean;
+        isBox: (textDrawId: number) => boolean;
+        isProportionalPlayer: (playerId: number, textDrawId: number) => boolean;
+        isProportional: (textDrawId: number) => boolean;
+        isSelectablePlayer: (playerId: number, textDrawId: number) => boolean;
+        isSelectable: (textDrawId: number) => boolean;
+        getAlignmentPlayer: (playerId: number, textDrawId: number) => number;
+        getAlignment: (textDrawId: number) => number;
+        getPreviewModelPlayer: (playerId: number, textDrawId: number) => number;
+        getPreviewModel: (textDrawId: number) => number;
+        getPreviewRotPlayer: (playerId: number, textDrawId: number) => ITextDrawRot;
+        getPreviewRot: (textDrawId: number) => ITextDrawRot & ICommonRetVal;
+        getPreviewVehicleColors: (textDrawId: number) => {
+            color1: number;
+            color2: number;
+            ret: number;
+        };
+        getPreviewVehicleColorsPlayer: (playerId: number, textDrawId: number) => {
+            color1: number;
+            color2: number;
+            ret: number;
+        };
     };
 }
 
@@ -2994,6 +3210,28 @@ declare class NetStats {
     static getMessagesRecvPerSecond(player: Player): number;
     static getMessagesSent(player: Player): number;
     static getPacketLossPercent(player: Player): number;
+    static __inject__: {
+        getNetworkStats: () => {
+            stats: string;
+            ret: number;
+        };
+        getPlayerNetworkStats: (playerId: number) => {
+            stats: string;
+            ret: number;
+        };
+        getBytesReceived: (playerId: number) => number;
+        getBytesSent: (playerId: number) => number;
+        getConnectionStatus: (playerId: number) => ConnectionStatusEnum;
+        getConnectedTime: (playerId: number) => number;
+        getIpPort: (playerId: number) => {
+            ipPort: string;
+            ret: number;
+        };
+        getMessagesReceived: (playerId: number) => number;
+        getMessagesRecvPerSecond: (playerId: number) => number;
+        getMessagesSent: (playerId: number) => number;
+        getPacketLossPercent: (playerId: number) => number;
+    };
 }
 
 declare class GameText {
@@ -3012,11 +3250,13 @@ declare class GameText {
     forAll(charset?: string): void;
     forPlayer(player: Player, charset?: string): void;
     hideForPlayer(player: Player): boolean;
-    static __inject__HideGameTextForAll: (style: number) => void;
-    static __inject__HasGameText: (playerId: number, style: number) => boolean;
-    static __inject__GameTextForAll: (string: number[], time: number, style: number) => number;
-    static __inject__GameTextForPlayer: (playerId: number, string: number[], time: number, style: number) => boolean;
-    static __inject__HideGameTextForPlayer: (playerId: number, style: number) => boolean;
+    static __inject__: {
+        hideForAll: (style: number) => void;
+        has: (playerId: number, style: number) => boolean;
+        forAll: (string: number[], time: number, style: number) => number;
+        forPlayer: (playerId: number, string: number[], time: number, style: number) => boolean;
+        hideForPlayer: (playerId: number, style: number) => boolean;
+    };
 }
 
 declare const MenuEvent: Readonly<{
@@ -3274,37 +3514,39 @@ declare class Actor {
     static isValid(id: number): boolean;
     static getInstance(id: number): Actor | undefined;
     static getInstances(): Actor[];
-    static __inject__ApplyActorAnimation: (actorId: number, animLib: string, animName: string, fDelta: number, loop: boolean, lockX: boolean, lockY: boolean, freeze: boolean, time: number) => boolean;
-    static __inject__ClearActorAnimations: (actorId: number) => boolean;
-    static __inject__CreateActor: (skin: number, x: number, y: number, z: number, rotation: number) => number;
-    static __inject__DestroyActor: (actorId: number) => boolean;
-    static __inject__GetActorAnimation: (actorId: number) => IActorAnimation & ICommonRetVal;
-    static __inject__GetActorFacingAngle: (actorId: number) => {
-        angle: number;
-        ret: boolean;
-    };
-    static __inject__GetActorHealth: (actorId: number) => {
-        health: number;
-        ret: boolean;
-    };
-    static __inject__GetActorPos: (actorId: number) => {
-        x: number;
-        y: number;
-        z: number;
-        ret: boolean;
+    static __inject__: {
+        create: (skin: number, x: number, y: number, z: number, rotation: number) => number;
+        destroy: (actorId: number) => boolean;
+        applyAnimation: (actorId: number, animLib: string, animName: string, fDelta: number, loop: boolean, lockX: boolean, lockY: boolean, freeze: boolean, time: number) => boolean;
+        clearAnimations: (actorId: number) => boolean;
+        getAnimation: (actorId: number) => IActorAnimation & ICommonRetVal;
+        getFacingAngle: (actorId: number) => {
+            angle: number;
+            ret: boolean;
+        };
+        getHealth: (actorId: number) => {
+            health: number;
+            ret: boolean;
+        };
+        getPos: (actorId: number) => {
+            x: number;
+            y: number;
+            z: number;
+            ret: boolean;
+        };
+        getSkin: (actorId: number) => number;
+        getSpawnInfo: (actorId: number) => IActorSpawn & ICommonRetVal;
+        getVirtualWorld: (actorId: number) => number;
+        isInvulnerable: (actorId: number) => boolean;
+        isStreamedIn: (actorId: number, forPlayerId: number) => boolean;
+        isValid: (actorId: number) => boolean;
+        setFacingAngle: (actorId: number, ang: number) => boolean;
+        setHealth: (actorId: number, health: number) => boolean;
+        setInvulnerable: (actorId: number, invulnerable: boolean) => boolean;
+        setPos: (actorId: number, x: number, y: number, z: number) => boolean;
+        setSkin: (actorId: number, model: number) => boolean;
+        setVirtualWorld: (actorId: number, vWorld: number) => boolean;
     };
-    static __inject__GetActorSkin: (actorId: number) => number;
-    static __inject__GetActorSpawnInfo: (actorId: number) => IActorSpawn & ICommonRetVal;
-    static __inject__GetActorVirtualWorld: (actorId: number) => number;
-    static __inject__IsActorInvulnerable: (actorId: number) => boolean;
-    static __inject__IsActorStreamedIn: (actorId: number, forPlayerId: number) => boolean;
-    static __inject__IsValidActor: (actorId: number) => boolean;
-    static __inject__SetActorFacingAngle: (actorId: number, ang: number) => boolean;
-    static __inject__SetActorHealth: (actorId: number, health: number) => boolean;
-    static __inject__SetActorInvulnerable: (actorId: number, invulnerable: boolean) => boolean;
-    static __inject__SetActorPos: (actorId: number, x: number, y: number, z: number) => boolean;
-    static __inject__SetActorSkin: (actorId: number, model: number) => boolean;
-    static __inject__SetActorVirtualWorld: (actorId: number, vWorld: number) => boolean;
 }
 
 declare const ActorEvent: Readonly<{
@@ -3352,6 +3594,13 @@ declare class Checkpoint {
     static isPlayerIn(player: Player): boolean;
     static isActive(player: Player): boolean;
     static get(player: Player): ICheckPoint & ICommonRetVal;
+    static __inject__: {
+        disable: (playerId: number) => boolean;
+        get: (playerId: number) => ICheckPoint & ICommonRetVal;
+        isActive: (playerId: number) => boolean;
+        isPlayerIn: (playerId: number) => boolean;
+        set: (playerId: number, x: number, y: number, z: number, radius: number) => boolean;
+    };
 }
 
 declare const CheckPointEvent: Readonly<{
@@ -3379,6 +3628,13 @@ declare class RaceCheckpoint {
     static isPlayerIn(player: Player): boolean;
     static isActive(player: Player): boolean;
     static get(player: Player): IRaceCheckPoint & ICommonRetVal;
+    static __inject__: {
+        disable: (playerId: number) => boolean;
+        get: (playerId: number) => IRaceCheckPoint & ICommonRetVal;
+        isActive: (playerId: number) => boolean;
+        isPlayerIn: (playerId: number) => boolean;
+        set: (playerId: number, type: number, x: number, y: number, z: number, nextX: number, nextY: number, nextZ: number, radius: number) => boolean;
+    };
 }
 
 declare const RaceCpEvent: Readonly<{
@@ -3423,22 +3679,24 @@ declare class Pickup {
     static isValid(id: number): boolean;
     static getInstance(id: number): Pickup | undefined;
     static getInstances(): Pickup[];
-    static __inject__CreatePickup: (model: number, type: number, x: number, y: number, z: number, virtualWorld: number) => number;
-    static __inject__AddStaticPickup: (model: number, type: number, X: number, Y: number, Z: number, virtualWorld: number) => number;
-    static __inject__DestroyPickup: (pickup: number) => boolean;
-    static __inject__IsPickupStreamedIn: (playerId: number, pickupId: number) => boolean;
-    static __inject__GetPickupPos: (pickupId: number) => IObjectPos & ICommonRetVal;
-    static __inject__GetPickupModel: (pickupId: number) => number;
-    static __inject__GetPickupType: (pickupId: number) => number;
-    static __inject__GetPickupVirtualWorld: (pickupId: number) => number;
-    static __inject__SetPickupPos: (pickupId: number, x: number, y: number, z: number, update?: boolean) => boolean;
-    static __inject__SetPickupModel: (pickupId: number, model: number, update?: boolean) => boolean;
-    static __inject__SetPickupType: (pickupId: number, type: number, update?: boolean) => boolean;
-    static __inject__SetPickupVirtualWorld: (pickupId: number, virtualWorld: number) => boolean;
-    static __inject__ShowPickupForPlayer: (playerId: number, pickupId: number) => boolean;
-    static __inject__HidePickupForPlayer: (playerId: number, pickupId: number) => boolean;
-    static __inject__IsPickupHiddenForPlayer: (playerId: number, pickupId: number) => boolean;
-    static __inject__IsValidPickup: (pickupId: number) => boolean;
+    static __inject__: {
+        create: (model: number, type: number, x: number, y: number, z: number, virtualWorld: number) => number;
+        addStatic: (model: number, type: number, X: number, Y: number, Z: number, virtualWorld: number) => number;
+        destroy: (pickup: number) => boolean;
+        isStreamedIn: (playerId: number, pickupId: number) => boolean;
+        getPos: (pickupId: number) => IObjectPos & ICommonRetVal;
+        getModel: (pickupId: number) => number;
+        getType: (pickupId: number) => number;
+        getVirtualWorld: (pickupId: number) => number;
+        setPos: (pickupId: number, x: number, y: number, z: number, update?: boolean) => boolean;
+        setModel: (pickupId: number, model: number, update?: boolean) => boolean;
+        setType: (pickupId: number, type: number, update?: boolean) => boolean;
+        setVirtualWorld: (pickupId: number, virtualWorld: number) => boolean;
+        showForPlayer: (playerId: number, pickupId: number) => boolean;
+        hideForPlayer: (playerId: number, pickupId: number) => boolean;
+        isHiddenForPlayer: (playerId: number, pickupId: number) => boolean;
+        isValid: (pickupId: number) => boolean;
+    };
 }
 
 declare const PickUpEvent: Readonly<{
@@ -3509,31 +3767,47 @@ declare class TextLabel {
     static getInstance(textLabelId: number, player?: Player): TextLabel | undefined;
     static getInstances(player?: Player): TextLabel[];
     static getPlayersInstances(): [Player, TextLabel[]][];
-    static __inject__Delete3DTextLabel: (id: number) => number;
-    static __inject__Attach3DTextLabelToPlayer: (id: number, playerId: number, offsetX: number, offsetY: number, offsetZ: number) => boolean;
-    static __inject__Attach3DTextLabelToVehicle: (id: number, vehicleId: number, offsetX: number, offsetY: number, offsetZ: number) => boolean;
-    static __inject__Is3DTextLabelStreamedIn: (playerId: number, id: number) => boolean;
-    static __inject__Get3DTextLabelColor: (id: number) => number;
-    static __inject__Get3DTextLabelPos: (id: number) => IObjectPos & ICommonRetVal;
-    static __inject__Set3DTextLabelDrawDistance: (id: number, dist: number) => boolean;
-    static __inject__Get3DTextLabelDrawDistance: (id: number) => number;
-    static __inject__Get3DTextLabelLOS: (id: number) => boolean;
-    static __inject__Set3DTextLabelLOS: (id: number, status: boolean) => boolean;
-    static __inject__Get3DTextLabelVirtualWorld: (id: number) => number;
-    static __inject__Set3DTextLabelVirtualWorld: (id: number, worldId: number) => boolean;
-    static __inject__Get3DTextLabelAttachedData: (id: number) => IAttachedData;
-    static __inject__IsValid3DTextLabel: (id: number) => boolean;
-    static __inject__DeletePlayer3DTextLabel: (playerId: number, id: number) => number;
-    static __inject__GetPlayer3DTextLabelColor: (playerId: number, id: number) => number;
-    static __inject__GetPlayer3DTextLabelPos: (playerId: number, id: number) => IObjectPos & ICommonRetVal;
-    static __inject__SetPlayer3DTextLabelDrawDistance: (playerId: number, id: number, dist: number) => boolean;
-    static __inject__GetPlayer3DTextLabelDrawDistance: (playerId: number, id: number) => number;
-    static __inject__GetPlayer3DTextLabelLOS: (playerId: number, id: number) => boolean;
-    static __inject__SetPlayer3DTextLabelLOS: (playerId: number, id: number, status: boolean) => boolean;
-    static __inject__GetPlayer3DTextLabelVirtualWorld: (playerId: number, id: number) => number;
-    static __inject__SetPlayer3DTextLabelVirtualWorld: (playerId: number, id: number, worldId: number) => boolean;
-    static __inject__GetPlayer3DTextLabelAttachedData: (playerId: number, id: number) => IAttachedData;
-    static __inject__IsValidPlayer3DTextLabel: (playerId: number, id: number) => boolean;
+    static __inject__: {
+        create: (charset: string, text: string, color: string | number, x: number, y: number, z: number, drawDistance: number, virtualWorld: number, testLOS?: boolean) => number;
+        createPlayer: (charset: string, playerId: number, text: string, color: string | number, x: number, y: number, z: number, drawDistance: number, attachedPlayer: number, attachedVehicle: number, testLOS: boolean) => number;
+        getText: (charset: string, id: number) => {
+            text: string;
+            buf: number[];
+            ret: number;
+        };
+        getPlayerText: (charset: string, playerId: number, id: number) => {
+            text: string;
+            buf: number[];
+            ret: number;
+        };
+        updateText: (charset: string, id: number, color: string | number, text: string) => boolean;
+        updatePlayerText: (charset: string, playerId: number, id: number, color: string | number, text: string) => boolean;
+        delete: (id: number) => number;
+        attachToPlayer: (id: number, playerId: number, offsetX: number, offsetY: number, offsetZ: number) => boolean;
+        attachToVehicle: (id: number, vehicleId: number, offsetX: number, offsetY: number, offsetZ: number) => boolean;
+        isStreamedIn: (playerId: number, id: number) => boolean;
+        getColor: (id: number) => number;
+        getPos: (id: number) => IObjectPos & ICommonRetVal;
+        setDrawDistance: (id: number, dist: number) => boolean;
+        getDrawDistance: (id: number) => number;
+        getLOS: (id: number) => boolean;
+        setLOS: (id: number, status: boolean) => boolean;
+        getVirtualWorld: (id: number) => number;
+        setVirtualWorld: (id: number, worldId: number) => boolean;
+        getAttachedData: (id: number) => IAttachedData;
+        isValid: (id: number) => boolean;
+        deletePlayer: (playerId: number, id: number) => number;
+        getPlayerColor: (playerId: number, id: number) => number;
+        getPlayerPos: (playerId: number, id: number) => IObjectPos & ICommonRetVal;
+        setPlayerDrawDistance: (playerId: number, id: number, dist: number) => boolean;
+        getPlayerDrawDistance: (playerId: number, id: number) => number;
+        getPlayerLOS: (playerId: number, id: number) => boolean;
+        setPlayerLOS: (playerId: number, id: number, status: boolean) => boolean;
+        getPlayerVirtualWorld: (playerId: number, id: number) => number;
+        setPlayerVirtualWorld: (playerId: number, id: number, worldId: number) => boolean;
+        getPlayerAttachedData: (playerId: number, id: number) => IAttachedData;
+        isValidPlayer: (playerId: number, id: number) => boolean;
+    };
 }
 
 declare class DynamicMapIcon {
@@ -3552,6 +3826,11 @@ declare class DynamicMapIcon {
     static showForPlayer(player: Player, z?: number): number;
     static getInstance(id: number): DynamicMapIcon | undefined;
     static getInstances(): DynamicMapIcon[];
+    static __inject__: {
+        createEx: (x: number, y: number, z: number, type: number, color: number, style?: MapIconStyles, streamDistance?: number, worlds?: number[], interiors?: number[], players?: number[], areas?: number[], priority?: number) => number;
+        create: (x: number, y: number, z: number, type: StreamerItemTypes, color: number, worldId?: number, interiorId?: number, playerId?: number, streamDistance?: number, style?: number, areaId?: number, priority?: number) => number;
+        destroy: (iconId: number) => number;
+    };
 }
 
 declare const DynamicMapIconEvent: Readonly<{
@@ -3593,9 +3872,11 @@ declare class DynamicPickup {
     static showForPlayer(player: Player, z?: number): number;
     static getInstance(id: number): DynamicPickup | undefined;
     static getInstances(): DynamicPickup[];
-    static __inject__CreateDynamicPickup: (modelId: number, type: number, x: number, y: number, z: number, worldId?: number, interiorId?: number, playerId?: number, streamDistance?: number, areaId?: number, priority?: number) => number;
-    static __inject__CreateDynamicPickupEx: (modelId: number, type: number, x: number, y: number, z: number, streamDistance?: number, worlds?: number[], interiors?: number[], players?: number[], areas?: number[], priority?: number) => number;
-    static __inject__DestroyDynamicPickup: (pickupId: number) => boolean;
+    static __inject__: {
+        create: (modelId: number, type: number, x: number, y: number, z: number, worldId?: number, interiorId?: number, playerId?: number, streamDistance?: number, areaId?: number, priority?: number) => number;
+        createEx: (modelId: number, type: number, x: number, y: number, z: number, streamDistance?: number, worlds?: number[], interiors?: number[], players?: number[], areas?: number[], priority?: number) => number;
+        destroy: (pickupId: number) => boolean;
+    };
 }
 
 declare const DynamicPickupEvent: Readonly<{
@@ -3651,6 +3932,15 @@ declare class DynamicCheckpoint {
     static showForPlayer(player: Player, z?: number): number;
     static getInstance(id: number): DynamicCheckpoint | undefined;
     static getInstances(): DynamicCheckpoint[];
+    static __inject__: {
+        create: (x: number, y: number, z: number, size: number, worldId?: number, interiorId?: number, playerId?: number, streamDistance?: number, areaId?: number, priority?: number) => number;
+        createEx: (x: number, y: number, z: number, size: number, streamDistance?: number, worlds?: number[], interiors?: number[], players?: number[], areas?: number[], priority?: number) => number;
+        destroy: (checkpointId: number) => number;
+        getPlayerVisible: (playerId: number) => number;
+        isPlayerIn: (playerId: number, checkpointId: number) => boolean;
+        togglePlayerAll: (playerId: number, toggle: boolean) => number;
+        togglePlayer: (playerId: number, checkpointId: number, toggle: boolean) => number;
+    };
 }
 
 declare const DynamicCheckPointEvent: Readonly<{
@@ -3716,6 +4006,16 @@ declare class DynamicRaceCP {
     static showForPlayer(player: Player, z?: number): number;
     static getInstance(id: number): DynamicRaceCP | undefined;
     static getInstances(): DynamicRaceCP[];
+    static __inject__: {
+        create: (type: number, x: number, y: number, z: number, nextX: number, nextY: number, nextZ: number, size: number, worldId?: number, interiorId?: number, playerId?: number, streamDistance?: number, areaId?: number, priority?: number) => number;
+        createEx: (type: number, x: number, y: number, z: number, nextX: number, nextY: number, nextZ: number, size: number, streamDistance?: number, worlds?: number[], interiors?: number[], players?: number[], areas?: number[], priority?: number) => number;
+        destroy: (checkpointId: number) => number;
+        getPlayerVisible: (playerId: number) => number;
+        isPlayerIn: (playerId: number, checkpointId: number) => boolean;
+        isValid: (checkpointId: number) => boolean;
+        togglePlayerAll: (playerId: number, toggle: boolean) => number;
+        togglePlayer: (playerId: number, checkpointId: number, toggle: boolean) => number;
+    };
 }
 
 declare const DynamicRaceCPEvent: Readonly<{
@@ -3795,9 +4095,6 @@ declare class DynamicActor {
     setInvulnerable(invulnerable?: boolean): number;
     getPlayerTarget(player: Player): DynamicActor | undefined;
     getPlayerCameraTarget(player: Player): DynamicActor | undefined;
-    getSkin(): number;
-    setSkin(model: number, ignoreRange?: boolean): boolean;
-    getSpawnInfo(): IActorSpawn & ICommonRetVal;
     getAnimation(): {
         animLib: string;
         animName: string;
@@ -3817,6 +4114,48 @@ declare class DynamicActor {
     static showForPlayer(player: Player, z?: number): number;
     static getInstance(id: number): DynamicActor | undefined;
     static getInstances(): DynamicActor[];
+    static __inject__: {
+        createEx: (modelId: number, x: number, y: number, z: number, r: number, invulnerable?: boolean, health?: number, streamDistance?: number, worlds?: number[], interiors?: number[], players?: number[], areas?: number[], priority?: number) => number;
+        create: (modelId: number, x: number, y: number, z: number, r: number, invulnerable?: boolean, health?: number, worldId?: number, interiorId?: number, playerId?: number, streamDistance?: number, areaId?: number, priority?: number) => number;
+        destroy: (actorId: number) => number;
+        getPlayerTarget: (playerId: number) => number;
+        getPlayerCameraTarget: (playerId: number) => number;
+        isStreamedIn: (actorId: number, forPlayerId: number) => boolean;
+        getVirtualWorld: (actorId: number) => number;
+        setVirtualWorld: (actorId: number, vWorld: number) => number;
+        applyAnimation: (actorId: number, animLib: string, animName: string, fDelta: number, loop: boolean, lockX: boolean, lockY: boolean, freeze: boolean, time: number) => number;
+        clearAnimations: (actorId: number) => number;
+        getFacingAngle: (actorId: number) => {
+            angle: number;
+            ret: number;
+        };
+        setFacingAngle: (actorId: number, ang: number) => number;
+        getPos: (actorId: number) => {
+            x: number;
+            y: number;
+            z: number;
+            ret: number;
+        };
+        setPos: (actorId: number, x: number, y: number, z: number) => number;
+        getHealth: (actorId: number) => {
+            health: number;
+            ret: number;
+        };
+        setHealth: (actorId: number, health: number) => number;
+        isInvulnerable: (actorId: number) => boolean;
+        setInvulnerable: (actorId: number, invulnerable?: boolean) => number;
+        getAnimation: (actorId: number) => {
+            animLib: string;
+            animName: string;
+            fDelta: number;
+            loop: number;
+            lockX: number;
+            lockY: number;
+            freeze: number;
+            time: number;
+            ret: number;
+        };
+    };
 }
 
 declare const DynamicActorEvent: Readonly<{
@@ -3961,14 +4300,14 @@ declare class Streamer {
         z: number;
         ret: number;
     };
-    static setItemPos: (type: StreamerItemTypes, id: number, x: number, y: number, z: number) => any;
+    static setItemPos: (type: StreamerItemTypes, id: number, x: number, y: number, z: number) => number;
     static getItemOffset: (type: StreamerItemTypes, id: number) => {
         x: number;
         y: number;
         z: number;
         ret: number;
     };
-    static setItemOffset: (type: StreamerItemTypes, id: number, x: number, y: number, z: number) => any;
+    static setItemOffset: (type: StreamerItemTypes, id: number, x: number, y: number, z: number) => number;
     static getFloatData: (type: StreamerItemTypes, id: number, data: E_STREAMER) => {
         val: number;
         ret: number;
@@ -4016,7 +4355,7 @@ declare class DynamicArea {
     isAnyPlayerIn(recheck?: boolean): boolean;
     static isAnyPlayerInAny(recheck?: boolean): boolean;
     static getPlayerAreas(player: Player): Array<DynamicArea | undefined>;
-    static getPlayerAreasNumber(player: Player): any;
+    static getPlayerAreasNumber(player: Player): number;
     isPointIn(x: number, y: number, z: number): boolean;
     static isPointInAny(x: number, y: number, z: number): boolean;
     isLineIn(x1: number, y1: number, z1: number, x2: number, y2: number, z2: number): boolean;
@@ -4038,6 +4377,55 @@ declare class DynamicArea {
     static showForPlayer(player: Player, z?: number): number;
     static getInstance(id: number): DynamicArea | undefined;
     static getInstances(): DynamicArea[];
+    static __inject__: {
+        createCircleEx: (x: number, y: number, size: number, worlds?: number[], interiors?: number[], players?: number[], priority?: number) => number;
+        createCuboidEx: (minX: number, minY: number, minZ: number, maxX: number, maxY: number, maxZ: number, worlds?: number[], interiors?: number[], players?: number[], priority?: number) => number;
+        createCylinderEx: (x: number, y: number, minZ: number, maxZ: number, size: number, worlds?: number[], interiors?: number[], players?: number[], priority?: number) => number;
+        createPolygonEx: (points: number[], minZ?: number, maxZ?: number, worlds?: number[], interiors?: number[], players?: number[], priority?: number) => number;
+        createRectangleEx: (minX: number, minY: number, maxX: number, maxY: number, worlds?: number[], interiors?: number[], players?: number[], priority?: number) => number;
+        createSphereEx: (x: number, y: number, z: number, size: number, worlds?: number[], interiors?: number[], players?: number[], priority?: number) => number;
+        createCircle: (x: number, y: number, size: number, worldId?: number, interiorId?: number, playerId?: number, priority?: number) => number;
+        createCuboid: (minX: number, minY: number, minZ: number, maxX: number, maxY: number, maxZ: number, worldId?: number, interiorId?: number, playerId?: number, priority?: number) => number;
+        createCylinder: (x: number, y: number, minZ: number, maxZ: number, size: number, worldId?: number, interiorId?: number, playerId?: number, priority?: number) => number;
+        createPolygon: (points: number[], minZ?: number, maxZ?: number, worldId?: number, interiorId?: number, playerId?: number, priority?: number) => number;
+        createRectangle: (minX: number, minY: number, maxX: number, maxY: number, worldId?: number, interiorId?: number, playerId?: number, priority?: number) => number;
+        createSphere: (x: number, y: number, z: number, size: number, worldId?: number, interiorId?: number, playerId?: number, priority?: number) => number;
+        destroy: (areaId: number) => number;
+        getType: (areaId: number) => number;
+        getPolygonPoints: (areaId: number) => {
+            points: number[];
+            ret: number;
+        };
+        getPolygonNumberPoints: (areaId: number) => number;
+        isPlayerIn: (playerId: number, areaId: number, recheck?: boolean) => boolean;
+        isPlayerInAny: (playerId: number, recheck?: boolean) => boolean;
+        isAnyPlayerIn: (areaId: number, recheck?: boolean) => boolean;
+        isAnyPlayerInAny: (recheck?: boolean) => boolean;
+        getPlayerAreas: (playerId: number) => {
+            areas: number[];
+            ret: number;
+        };
+        getPlayerAreasNumber: (playerId: number) => number;
+        isPointIn: (areaId: number, x: number, y: number, z: number) => boolean;
+        isPointInAny: (x: number, y: number, z: number) => boolean;
+        isLineIn: (areaId: number, x1: number, y1: number, z1: number, x2: number, y2: number, z2: number) => boolean;
+        isLineInAny: (x1: number, y1: number, z1: number, x2: number, y2: number, z2: number) => boolean;
+        getForPoint: (x: number, y: number, z: number) => {
+            areas: number[];
+            ret: number;
+        };
+        getNumberForPoint: (x: number, y: number, z: number) => number;
+        getForLine: (x1: number, y1: number, z1: number, x2: number, y2: number, z2: number) => {
+            areas: number[];
+            ret: number;
+        };
+        getNumberForLine: (x1: number, y1: number, z1: number, x2: number, y2: number, z2: number) => number;
+        attachToObject: (areaId: number, objectId: number, type?: StreamerObjectTypes, playerId?: number, offsetX?: number, offsetY?: number, offsetZ?: number) => number;
+        attachToPlayer: (areaId: number, playerId: number, offsetX?: number, offsetY?: number, offsetZ?: number) => number;
+        attachToVehicle: (areaId: number, vehicleId: number, offsetX?: number, offsetY?: number, offsetZ?: number) => number;
+        toggleSpectateMode: (areaId: number, toggle: boolean) => number;
+        isToggleSpectateMode: (areaId: number) => boolean;
+    };
 }
 
 declare const DynamicAreaEvent: Readonly<{
@@ -4109,6 +4497,17 @@ declare class Dynamic3DTextLabel {
     static showForPlayer(player: Player, z?: number): number;
     static getInstance(id: number): Dynamic3DTextLabel | undefined;
     static getInstances(): Dynamic3DTextLabel[];
+    static __inject__: {
+        create: (charset: string, text: string, color: number, x: number, y: number, z: number, drawDistance: number, attachedPlayer: number, attachedVehicle: number, testLOS: boolean, worldId: number, interiorId: number, playerId: number, streamDistance: number, areaId: number, priority: number) => number;
+        createEx: (text: string, color: number, x: number, y: number, z: number, drawDistance: number, attachedPlayer: number, attachedVehicle: number, testLOS: boolean, streamDistance: number, worlds: number[], interiors: number[], players: number[], areas: number[], priority: number, charset: string) => number;
+        getText: (id: number, charset: string) => {
+            text: string;
+            ret: number;
+        };
+        updateText: (id: number, color: number, text: string, charset: string) => number;
+        destroy: (id: number) => number;
+        isValid: (id: number) => boolean;
+    };
 }
 
 declare const internalPlayerProps: unique symbol;
@@ -4384,6 +4783,243 @@ declare class Player {
     simulateCommand(cmdText: string | number[]): number;
     static getInstance(id: number): Player | undefined;
     static getInstances(): Player[];
+    static __inject__: {
+        sendClientMessage: (player: Player, color: string | number, msg: string) => number;
+        sendClientMessageToAll: (players: Array<Player>, color: string | number, msg: string) => number;
+        sendMessageToPlayer: (player: Player, senderId: number, message: string) => number;
+        sendMessageToAll: (players: Array<Player>, senderId: number, message: string) => number;
+        banEx: (playerId: number, reason: string, charset: string) => number;
+        getName: (player: Player) => {
+            name: string;
+            ret: number;
+        };
+        setName: (player: Player, name: string) => number;
+        setChatBubble: (playerId: number, text: string, color: string | number, drawDistance: number, expireTime: number, charset: string) => boolean;
+        isNpc: (playerId: number) => boolean;
+        getDrunkLevel: (playerId: number) => number;
+        setDrunkLevel: (playerId: number, level: number) => boolean;
+        allowTeleport: (playerId: number, allow: boolean) => boolean;
+        isTeleportAllowed: (playerId: number) => boolean;
+        enableCameraTarget: (playerId: number, enable: boolean) => boolean;
+        enableStuntBonus: (playerId: number, enable: boolean) => boolean;
+        getInterior: (playerId: number) => number;
+        setInterior: (playerId: number, interiorId: number) => boolean;
+        showNameTag: (playerId: number, showPlayerId: number, show: boolean) => boolean;
+        setColor: (playerId: number, color: string | number) => boolean;
+        getColor: (playerId: number) => number;
+        setMapIcon: (playerId: number, iconId: number, x: number, y: number, z: number, markerType: number, color: string | number, style: number) => boolean;
+        removeMapIcon: (playerId: number, iconId: number) => boolean;
+        setMarker: (playerId: number, showPlayerId: number, color: string | number) => void;
+        getMarker: typeof GetPlayerMarkerForPlayer;
+        resetMoney: (playerId: number) => boolean;
+        getMoney: (playerId: number) => number;
+        giveMoney: (playerId: number, money: number) => boolean;
+        resetWeapons: (playerId: number) => boolean;
+        spawn: (playerId: number) => boolean;
+        setHealth: (playerId: number, health: number) => boolean;
+        getHealth: (playerId: number) => {
+            health: number;
+            ret: number;
+        };
+        toggleClock: (playerId: number, toggle: boolean) => boolean;
+        toggleControllable: (playerId: number, toggle: boolean) => boolean;
+        toggleSpectating: (playerId: number, toggle: boolean) => boolean;
+        spectatePlayer: (playerId: number, targetPlayerId: number, mode: SpectateModesEnum) => boolean;
+        spectateVehicle: (playerId: number, targetVehicleId: number, mode: SpectateModesEnum) => boolean;
+        forceClassSelection: (playerId: number) => boolean;
+        kick: (playerId: number) => boolean;
+        ban: (playerId: number) => boolean;
+        isAdmin: (playerId: number) => boolean;
+        isInRangeOfPoint: (playerId: number, range: number, x: number, y: number, z: number) => boolean;
+        isStreamedIn: (playerId: number, forPlayerId: number) => boolean;
+        setSkin: (playerId: number, skinId: number) => boolean;
+        getSkin: (playerId: number) => number;
+        isInAnyVehicle: (playerId: number) => boolean;
+        getSpecialAction: (playerId: number) => SpecialActionsEnum;
+        setSpecialAction: (playerId: number, actionId: SpecialActionsEnum) => boolean;
+        setScore: (playerId: number, score: number) => boolean;
+        getScore: (playerId: number) => number;
+        getPing: (playerId: number) => number;
+        setPos: (playerId: number, x: number, y: number, z: number) => boolean;
+        getPos: (playerId: number) => {
+            x: number;
+            y: number;
+            z: number;
+            ret: number;
+        };
+        getState: (playerId: number) => PlayerStateEnum;
+        getVersion: (playerId: number) => {
+            version: string;
+            ret: number;
+        };
+        setVirtualWorld: (playerId: number, worldId: number) => boolean;
+        getVirtualWorld: (playerId: number) => number;
+        removeFromVehicle: (playerId: number) => boolean;
+        setWantedLevel: (playerId: number, level: number) => boolean;
+        getWantedLevel: (playerId: number) => number;
+        setFacingAngle: (playerId: number, ang: number) => boolean;
+        getFacingAngle: (playerId: number) => {
+            angle: number;
+            ret: number;
+        };
+        setWeather: (playerId: number, weather: number) => boolean;
+        getWeather: (playerId: number) => number;
+        setTime: (playerId: number, hour: number, minute: number) => boolean;
+        getTime: (playerId: number) => {
+            hour: number;
+            minute: number;
+            ret: number;
+        };
+        removeBuilding: (playerId: number, modelId: number, fX: number, fY: number, fZ: number, fRadius: number) => boolean;
+        setTeam: (playerId: number, teamId: number) => void;
+        getTeam: (playerId: number) => number;
+        setSkillLevel: (playerId: number, skill: WeaponSkillsEnum, level: number) => boolean;
+        setVelocity: (playerId: number, x: number, y: number, z: number) => boolean;
+        getVelocity: (playerId: number) => {
+            x: number;
+            y: number;
+            z: number;
+            ret: number;
+        };
+        getKeys: (playerId: number) => {
+            keys: KeysEnum;
+            upDown: KeysEnum;
+            leftRight: KeysEnum;
+            ret: number;
+        };
+        getIp: (playerId: number) => {
+            ip: string;
+            ret: number;
+        };
+        getFightingStyle: (playerId: number) => FightingStylesEnum;
+        setFightingStyle: (playerId: number, style: FightingStylesEnum) => boolean;
+        setArmour: (playerId: number, armour: number) => boolean;
+        getArmour: (playerId: number) => {
+            armour: number;
+            ret: number;
+        };
+        setCameraBehind: (playerId: number) => boolean;
+        setCameraPos: (playerId: number, x: number, y: number, z: number) => boolean;
+        setCameraLookAt: (playerId: number, x: number, y: number, z: number, style: CameraCutStylesEnum) => boolean;
+        getCameraAspectRatio: (playerId: number) => number;
+        getCameraFrontVector: (playerId: number) => {
+            x: number;
+            y: number;
+            z: number;
+            ret: number;
+        };
+        getCameraMode: (playerId: number) => CameraModesEnum;
+        getCameraPos: (playerId: number) => {
+            x: number;
+            y: number;
+            z: number;
+            ret: number;
+        };
+        getCameraTargetPlayer: (playerId: number) => number;
+        getCameraTargetVehicle: (playerId: number) => number;
+        getCameraZoom: (playerId: number) => number;
+        playAudioStream: (playerId: number, url: string, posX: number, posY: number, posZ: number, distance: number, usePos?: boolean) => boolean;
+        stopAudioStream: (playerId: number) => boolean;
+        playSound: (playerId: number, soundId: number, x: number, y: number, z: number) => boolean;
+        getMaxPlayers: () => number;
+        playCrimeReport: (playerId: number, suspectId: number, crime: number) => boolean;
+        interpolateCameraPos: (playerId: number, fromX: number, fromY: number, fromZ: number, toX: number, toY: number, toZ: number, time: number, cut: CameraCutStylesEnum) => boolean;
+        interpolateCameraLookAt: (playerId: number, fromX: number, fromY: number, fromZ: number, toX: number, toY: number, toZ: number, time: number, cut: CameraCutStylesEnum) => boolean;
+        createExplosion: (playerId: number, x: number, y: number, z: number, type: number, radius: number) => boolean;
+        isConnected: (playerId: number) => boolean;
+        disableRemoteVehicleCollisions: (playerId: number, disable: boolean) => boolean;
+        getVehicleID: (playerId: number) => number;
+        getVehicleSeat: (playerId: number) => number;
+        getSurfingVehicleID: (playerId: number) => number;
+        applyAnimation: (playerId: number, animLib: string, animName: string, fDelta: number, loop: boolean, lockX: boolean, lockY: boolean, freeze: boolean, time: number, forceSync: number) => boolean;
+        clearAnimations: (playerId: number, forceSync: boolean) => boolean;
+        getAnimationIndex: (playerId: number) => number;
+        getAnimationName: (index: number) => [string, string, number];
+        setShopName: (playerId: number, shopName: string) => boolean;
+        setPosFindZ: (playerId: number, x: number, y: number, z: number) => boolean;
+        setWorldBounds: (playerId: number, xMax: number, xMin: number, yMax: number, yMin: number) => boolean;
+        clearWorldBounds: (playerId: number) => boolean;
+        getDistanceFromPoint: (playerId: number, x: number, y: number, z: number) => number;
+        getCustomSkin: (playerId: number) => number;
+        getTargetPlayer: (playerId: number) => number;
+        getLastShotVectors: (playerId: number) => {
+            fOriginX: number;
+            fOriginY: number;
+            fOriginZ: number;
+            fHitPosX: number;
+            fHitPosY: number;
+            fHitPosZ: number;
+            ret: number;
+        };
+        getWeapon: (playerId: number) => number;
+        getWeaponData: (playerId: number, slot: number) => {
+            weapons: number;
+            ammo: number;
+            ret: number;
+        };
+        getWeaponState: (playerId: number) => WeaponStatesEnum;
+        giveWeapon: (playerId: number, weaponId: number, ammo: number) => boolean;
+        setAmmo: (playerId: number, weaponId: number, ammo: number) => boolean;
+        getAmmo: (playerId: number) => number;
+        setArmedWeapon: (playerId: number, weaponId: number) => boolean;
+        sendDeathMessage: (killer: number, killee: number, weapon: WeaponEnum | DamageDeathReasonEnum) => number;
+        sendDeathMessageToPlayer: (playerId: number, killer: number, killee: number, weapon: WeaponEnum | DamageDeathReasonEnum) => boolean;
+        setSpawnInfo: (playerId: number, team: number, skin: number, x: number, y: number, z: number, rotation: number, weapon1: WeaponEnum, weapon1Ammo: number, weapon2: WeaponEnum, weapon2Ammo: number, weapon3: WeaponEnum, weapon3Ammo: number) => boolean;
+        redirectDownload: (playerId: number, url: string) => boolean;
+        sendClientCheck: (playerId: number, type: number, memAddr: number, memOffset: number, byteCount: number) => number;
+        selectTextDraw: (playerId: number, hoverColor: string | number) => void;
+        cancelSelectTextDraw: (playerId: number) => void;
+        beginObjectSelecting: (playerId: number) => boolean;
+        endObjectEditing: (playerId: number) => boolean;
+        getSurfingObjectID: (playerId: number) => number;
+        getSurfingPlayerObjectID: (playerId: number) => number;
+        isAttachedObjectSlotUsed: (playerId: number, index: number) => boolean;
+        editAttachedObject: (playerId: number, index: number) => boolean;
+        setAttachedObject: (playerId: number, index: number, modelId: number, bone: BoneIdsEnum, fOffsetX: number, fOffsetY: number, fOffsetZ: number, fRotX: number, fRotY: number, fRotZ: number, fScaleX: number, fScaleY: number, fScaleZ: number, materialColor1: string | number, materialColor2: string | number) => boolean;
+        removeAttachedObject: (playerId: number, index: number) => boolean;
+        toggleWidescreen: (playerId: number, set: boolean) => boolean;
+        isWidescreenToggled: (playerId: number) => boolean;
+        getSpawnInfo: (playerId: number) => IPlayerClass & ICommonRetVal;
+        getSkillLevel: (playerId: number, skill: number) => number;
+        isCheckpointActive: (playerId: number) => boolean;
+        getCheckpoint: (playerId: number) => ICheckPoint & ICommonRetVal;
+        isRaceCheckpointActive: (playerId: number) => boolean;
+        getRaceCheckpoint: (playerId: number) => IRaceCheckPoint & ICommonRetVal;
+        getWorldBounds: (playerId: number) => IBounds & ICommonRetVal;
+        isInModShop: (playerId: number) => boolean;
+        getSirenState: (playerId: number) => number;
+        getLandingGearState: (playerId: number) => number;
+        getHydraReactorAngle: (playerId: number) => number;
+        getTrainSpeed: (playerId: number) => number;
+        getZAim: (playerId: number) => number;
+        getSurfingOffsets: (playerId: number) => IOffsets & ICommonRetVal;
+        getRotationQuat: (playerId: number) => IQuat & ICommonRetVal;
+        getDialogID: (playerId: number) => number;
+        getSpectateID: (playerId: number) => number;
+        getSpectateType: (playerId: number) => number;
+        getRawIp: (playerId: number) => string;
+        setGravity: (playerId: number, gravity: number) => boolean;
+        getGravity: (playerId: number) => number;
+        setAdmin: (playerId: number, admin: boolean) => boolean;
+        isSpawned: (playerId: number) => boolean;
+        isControllable: (playerId: number) => boolean;
+        isCameraTargetEnabled: (playerId: number) => boolean;
+        toggleGhostMode: (playerId: number, toggle: boolean) => boolean;
+        getGhostMode: (playerId: number) => boolean;
+        getBuildingsRemoved: (playerId: number) => number;
+        getAttachedObject: (playerId: number, index: number) => IAttachedObject & ICommonRetVal;
+        removeWeapon: (playerId: number, weaponId: number) => boolean;
+        isUsingOfficialClient: (playerId: number) => boolean;
+        allowWeapons: (playerId: number, allow: boolean) => boolean;
+        areWeaponsAllowed: (playerId: number) => boolean;
+        gpci: (playerId: number, charset: string) => {
+            val: string;
+            ret: number;
+        };
+        isCuffed: (playerId: number) => boolean;
+        isInDriveByMode: (playerId: number) => boolean;
+        isUsingOmp: (playerId: number) => boolean;
+    };
 }
 
 type TEventName = string | string[];
@@ -4617,6 +5253,14 @@ interface ITextLabel {
     attachedPlayer?: Player;
     attachedVehicle?: Vehicle;
 }
+interface IMenu {
+    title: string;
+    columns: number;
+    x: number;
+    y: number;
+    colWidth: [number, number];
+    charset?: string;
+}
 
 declare const rgba: (value: string | number) => number;
 
@@ -4648,4 +5292,4 @@ declare class I18n {
 }
 
 export { Actor, ActorEvent, ArtworkEnum, BodyPartsEnum, BoneIdsEnum, BulletHitTypesEnum, CameraCutStylesEnum, CameraModesEnum, CarModTypeEnum, CheckPointEvent, Checkpoint, ClickSourcesEnum, CommandErrors, ConnectionStatusEnum, DamageDeathReasonEnum, Dialog, DialogStylesEnum, Dynamic3DTextLabel, Dynamic3DTextLabelEvent, DynamicActor, DynamicActorEvent, DynamicArea, DynamicAreaEvent, DynamicCheckPointEvent, DynamicCheckpoint, DynamicMapIcon, DynamicMapIconEvent, DynamicObject, DynamicObjectEvent, DynamicPickup, DynamicPickupEvent, DynamicRaceCP, DynamicRaceCPEvent, E_STREAMER, EditResponseTypesEnum, FightingStylesEnum, ForceSyncEnum, GameMode, GameText, GangZone, GangZoneEvent, I18n, InvalidEnum, KeysEnum, LimitsEnum, MapIconStyles, MapIconStylesEnum, MarkerModesEnum, MaterialTextAlign, MaterialTextSizes, Menu, MenuEvent, NPCEntityCheckEnum, NPCMoveSpeedEnum, NPCMoveTypeEnum, NPCPlaybackEnum, NPCRecordStatusEnum, NetStats, Npc, NpcEvent, NpcNode, NpcPath, NpcRecord, ObjectMaterialAlignmentEnum, ObjectMaterialTextSizeEnum, ObjectMp, ObjectMpEvent, PickUpEvent, Pickup, Player, PlayerEvent, PlayerStateEnum, RaceCheckpoint, RaceCpEvent, RecordTypesEnum, SelectObjectTypesEnum, SpecialActionsEnum, SpectateModesEnum, Streamer, StreamerAreaTypes, StreamerDistances, StreamerItemTypes, StreamerMiscellaneous, StreamerObjectTypes, TextDraw, TextDrawAlignEnum, TextDrawEvent, TextDrawFontsEnum, TextLabel, Vehicle, VehicleEvent, VehicleModelInfoEnum, VehicleParamsEnum, WeaponEnum, WeaponSkillsEnum, WeaponStatesEnum, animateLib, defineEvent, defineHooks, getAnimateDurationByLibName, isHolding, isPressed, isPressing, isReleased, isValidAnimateLib, isValidAnimateName, rgba, useTrigger, withTriggerOptions };
-export type { CmdBusCallback, CommandErrorRet, CommandErrorTypes, ExecMiddlewareOptions, GangZoneCb, IActor, IActorAnimation, IActorSpawn, IAnimateInfo, IAttachedData, IAttachedObject, IBounds, ICheckPoint, IClientResRaw, ICmdOptions, ICommonRetVal, ICommonTextDrawKey, IDialog, IDialogFuncQueue, IDialogResCommon, IDynamic, IDynamic3DTextLabel, IDynamicActor, IDynamicAreaKey, IDynamicCheckPoint, IDynamicCircle, IDynamicCircleCommon, IDynamicCommon, IDynamicCuboid, IDynamicCylinder, IDynamicMapIcon, IDynamicObject, IDynamicPickup, IDynamicPolygon, IDynamicRaceCp, IDynamicRectangle, IDynamicRectangleCommon, IDynamicSphere, IFilterScript, IGangZone, IGangZonePos, IInnerPlayerProps, IMaterial, IMaterialText, IObjectMp, IObjectPos, IObjectRotPos, IOffsets, IPickup, IPlayerClass, IQuat, IRaceCheckPoint, ITextDraw, ITextDrawCommonSize, ITextDrawRot, ITextLabel, IVehColor, IVehMatrix, IVehSpawnInfo, IVehicle, StreamerArrayData, StreamerItemTypeTuple, TCommonCallback, TDynamicArea, TDynamicAreaTypes, TEventFunc, TEventName, THookedMethods, TLocales, TMethodKeys, TPos, TStreamerExtendable, defineEventOptions };
+export type { CmdBusCallback, CommandErrorRet, CommandErrorTypes, ExecMiddlewareOptions, GangZoneCb, IActor, IActorAnimation, IActorSpawn, IAnimateInfo, IAttachedData, IAttachedObject, IBounds, ICheckPoint, IClientResRaw, ICmdOptions, ICommonRetVal, ICommonTextDrawKey, IDialog, IDialogFuncQueue, IDialogResCommon, IDynamic, IDynamic3DTextLabel, IDynamicActor, IDynamicAreaKey, IDynamicCheckPoint, IDynamicCircle, IDynamicCircleCommon, IDynamicCommon, IDynamicCuboid, IDynamicCylinder, IDynamicMapIcon, IDynamicObject, IDynamicPickup, IDynamicPolygon, IDynamicRaceCp, IDynamicRectangle, IDynamicRectangleCommon, IDynamicSphere, IFilterScript, IGangZone, IGangZonePos, IInnerPlayerProps, IMaterial, IMaterialText, IMenu, IObjectMp, IObjectPos, IObjectRotPos, IOffsets, IPickup, IPlayerClass, IQuat, IRaceCheckPoint, ITextDraw, ITextDrawCommonSize, ITextDrawRot, ITextLabel, IVehColor, IVehMatrix, IVehSpawnInfo, IVehicle, StreamerArrayData, StreamerItemTypeTuple, TCommonCallback, TDynamicArea, TDynamicAreaTypes, TEventFunc, TEventName, THookedMethods, TLocales, TMethodKeys, TPos, TStreamerExtendable, defineEventOptions };