rock-mod 0.5.0 → 0.6.0

package/dist/client/entities/common/baseObject/IBaseObject.d.ts

@@ -0,0 +1,12 @@
+import BaseObject = AltVClient.BaseObject;
+export declare enum BaseObjectType {
+    Player = "player"
+}
+export interface IBaseObjectOptions {
+    mpEntity: EntityMp | BaseObject;
+}
+export interface IBaseObject {
+    get id(): number;
+    get type(): BaseObjectType;
+    get isExists(): boolean;
+}

package/dist/client/entities/common/baseObject/IBaseObject.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseObjectType = void 0;
+var BaseObjectType;
+(function (BaseObjectType) {
+    BaseObjectType["Player"] = "player";
+})(BaseObjectType || (exports.BaseObjectType = BaseObjectType = {}));

package/dist/client/entities/common/baseObject/IBaseObjectsIterator.d.ts

@@ -0,0 +1,4 @@
+import { IBaseObject } from "./IBaseObject";
+export interface IBaseObjectsIterator<T extends IBaseObject> {
+    all(): IterableIterator<T>;
+}

package/dist/client/entities/common/baseObject/IBaseObjectsIterator.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/client/entities/common/baseObject/IBaseObjectsManager.d.ts

@@ -0,0 +1,12 @@
+import { BaseObjectType, IBaseObject } from "./IBaseObject";
+import { IBaseObjectsIterator } from "./IBaseObjectsIterator";
+export interface IBaseObjectsManagerOptions {
+    baseObjectsType: `${BaseObjectType}`;
+}
+export interface IBaseObjectCreateOptions {
+}
+export interface IBaseObjectsManager<T extends IBaseObject> {
+    get iterator(): IBaseObjectsIterator<T>;
+    getByID(id: number): T;
+    findByID(id: number): T | null;
+}

package/dist/client/entities/common/baseObject/IBaseObjectsManager.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/client/entities/common/baseObject/index.d.ts

@@ -0,0 +1,3 @@
+export * from "./IBaseObject";
+export * from "./IBaseObjectsIterator";
+export * from "./IBaseObjectsManager";

package/dist/client/entities/common/baseObject/index.js

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./IBaseObject"), exports);
+__exportStar(require("./IBaseObjectsIterator"), exports);
+__exportStar(require("./IBaseObjectsManager"), exports);

package/dist/client/entities/common/index.d.ts

@@ -0,0 +1 @@
+export * from "./baseObject";

package/dist/client/entities/common/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./baseObject"), exports);

package/dist/server/entities/altv/baseObject/AltVBaseObject.js

@@ -29,7 +29,7 @@ class AltVBaseObject {
         this._mpEntity = options.mpEntity;
     }
     destroy() {
-        console.log("destroy");
+        this._mpEntity.destroy();
     }
 }
 exports.AltVBaseObject = AltVBaseObject;

package/dist/server/entities/altv/baseObject/AltVBaseObjectsManager.js

@@ -17,6 +17,12 @@ class AltVBaseObjectsManager {
         this._baseObjects = new Map();
         this._baseObjectsType = options.baseObjectsType;
         this._iterator = new AltVBaseObjectsIterator_1.AltVBaseObjectsIterator(this._baseObjects);
+        AltVServer.on("removeEntity", (mpEntity) => {
+            if (mpEntity.type === this._baseObjectsType) {
+                const baseObject = this.getByID(mpEntity.id);
+                this.unregisterBaseObject(baseObject);
+            }
+        });
     }
     getByID(id) {
         const baseObject = this.findByID(id);
@@ -40,7 +46,7 @@ class AltVBaseObjectsManager {
         if (!this._baseObjects.delete(baseObject.id)) {
             throw new Error(`BaseObject [${this._baseObjectsType}] with id ${baseObject.id} not found`);
         }
-        RockMod_1.RockMod.instance.net.events.emit("rm::entityCreated", baseObject);
+        RockMod_1.RockMod.instance.net.events.emit("rm::entityDestroyed", baseObject);
     }
 }
 exports.AltVBaseObjectsManager = AltVBaseObjectsManager;

package/dist/server/entities/altv/blip/AltVBlip.d.ts

@@ -3,13 +3,17 @@ import { IBlip, IBlipColor, IBlipSprite } from "../../common";
 export interface IAltVBlipOptions extends IAltVWorldObjectOptions<AltVServer.Blip> {
 }
 export declare class AltVBlip extends AltVWorldObject<AltVServer.Blip> implements IBlip {
-    get sprite(): IBlipSprite;
-    get alpha(): number;
     get name(): string;
+    get sprite(): IBlipSprite;
     get color(): IBlipColor;
+    get alpha(): number;
+    get scale(): number;
+    get drawDistance(): number;
+    get shortRange(): boolean;
+    get rotation(): number;
     constructor(options: IAltVBlipOptions);
-    setSprite(value: IBlipSprite): void;
-    setAlpha(value: number): void;
     setName(value: string): void;
+    setSprite(value: IBlipSprite): void;
     setColor(value: IBlipColor): void;
+    setAlpha(value: number): void;
 }

package/dist/server/entities/altv/blip/AltVBlip.js

@@ -3,32 +3,45 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AltVBlip = void 0;
 const AltVWorldObject_1 = require("../worldObject/AltVWorldObject");
 class AltVBlip extends AltVWorldObject_1.AltVWorldObject {
+    get name() {
+        return this.mpEntity.name;
+    }
     get sprite() {
         return this.mpEntity.sprite;
     }
+    get color() {
+        return this.mpEntity.color;
+    }
     get alpha() {
         return this.mpEntity.alpha;
     }
-    get name() {
-        return this.mpEntity.name;
+    get scale() {
+        return this.mpEntity.scale;
     }
-    get color() {
-        return this.mpEntity.color;
+    get drawDistance() {
+        console.log("[RockMod] AltVBlip drawDistance is not implemented");
+        return 0;
     }
-    constructor(options) {
-        super(options);
+    get shortRange() {
+        return this.mpEntity.shortRange;
     }
-    setSprite(value) {
-        this.mpEntity.sprite = value;
+    get rotation() {
+        return this.mpEntity.heading;
     }
-    setAlpha(value) {
-        this.mpEntity.alpha = value;
+    constructor(options) {
+        super(options);
     }
     setName(value) {
         this.mpEntity.name = value;
     }
+    setSprite(value) {
+        this.mpEntity.sprite = value;
+    }
     setColor(value) {
         this.mpEntity.color = value;
     }
+    setAlpha(value) {
+        this.mpEntity.alpha = value;
+    }
 }
 exports.AltVBlip = AltVBlip;

package/dist/server/entities/altv/blip/AltVBlipsManager.js

@@ -12,11 +12,16 @@ class AltVBlipsManager extends AltVWorldObjectsManager_1.AltVWorldObjectsManager
         });
     }
     create(options) {
-        const { sprite, position, dimension, alpha } = options;
+        const { alpha, color, dimension, name, position, rotation, scale, shortRange, sprite } = options;
         const mpEntity = new PointBlip(new Vector3(position), true);
-        mpEntity.sprite = sprite;
+        mpEntity.alpha = alpha ?? 255;
+        mpEntity.color = color ?? 1;
         mpEntity.dimension = dimension;
-        mpEntity.alpha = alpha;
+        mpEntity.name = name ?? "";
+        mpEntity.heading = rotation ?? 0;
+        mpEntity.scale = scale ?? 1;
+        mpEntity.shortRange = shortRange ?? false;
+        mpEntity.sprite = sprite;
         const blip = new AltVBlip_1.AltVBlip({ mpEntity });
         this.registerBaseObject(blip);
         return blip;

package/dist/server/entities/common/blip/IBlip.d.ts

@@ -800,12 +800,17 @@ export declare enum IBlipColor {
 export interface IBlipOptions extends IWorldObjectOptions {
 }
 export interface IBlip extends IWorldObject {
+    get name(): string;
     get sprite(): IBlipSprite;
+    get color(): number;
     get alpha(): number;
-    get name(): string;
-    get color(): IBlipColor;
-    setSprite(value: IBlipSprite): void;
-    setAlpha(value: number): void;
+    get scale(): number;
+    get drawDistance(): number;
+    get shortRange(): boolean;
+    get rotation(): number;
+    get dimension(): number;
     setName(value: string): void;
+    setSprite(value: IBlipSprite): void;
     setColor(value: IBlipColor): void;
+    setAlpha(value: number): void;
 }

package/dist/server/entities/common/blip/IBlipsManager.d.ts

@@ -1,8 +1,14 @@
 import { IWorldObjectCreateOptions, IWorldObjectsManager } from "../worldObject";
 import { IBlip } from "./IBlip";
 export interface IBlipCreateOptions extends IWorldObjectCreateOptions {
+    alpha?: number;
+    color?: number;
+    drawDistance?: number;
+    name?: string;
+    rotation?: number;
+    scale?: number;
+    shortRange?: boolean;
     sprite: number;
-    alpha: number;
 }
 export interface IBlipsManager extends IWorldObjectsManager<IBlip> {
     create(options: IBlipCreateOptions): IBlip;

package/dist/server/entities/ragemp/baseObject/RageBaseObject.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RageBaseObject = void 0;
+// RAGEMP BUG: event 'entityDestroyed' is not callable
+const unsupportedRageEntityTypes = new Set(["blip", "colshape"]);
 class RageBaseObject {
     _mpEntity;
     get id() {
@@ -19,7 +21,10 @@ class RageBaseObject {
         this._mpEntity = options.mpEntity;
     }
     destroy() {
-        console.log("destroy");
+        this._mpEntity.destroy();
+        if (unsupportedRageEntityTypes.has(this.type)) {
+            mp.events.call("entityDestroyed", this._mpEntity);
+        }
     }
 }
 exports.RageBaseObject = RageBaseObject;

package/dist/server/entities/ragemp/baseObject/RageBaseObjectsManager.js

@@ -17,6 +17,12 @@ class RageBaseObjectsManager {
         this._baseObjects = new Map();
         this._baseObjectsType = options.baseObjectsType;
         this._iterator = new RageBaseObjectsIterator_1.RageBaseObjectsIterator(this._baseObjects);
+        mp.events.add("entityDestroyed", (mpEntity) => {
+            if (mpEntity.type === this._baseObjectsType) {
+                const baseObject = this.getByID(mpEntity.id);
+                this.unregisterBaseObject(baseObject);
+            }
+        });
     }
     getByID(id) {
         const baseObject = this.findByID(id);

package/dist/server/entities/ragemp/blip/RageBlip.d.ts

@@ -3,13 +3,17 @@ import { IBlip, IBlipColor, IBlipSprite } from "../../common";
 export interface IRageBlipOptions extends IRageWorldObjectOptions<EntityMp> {
 }
 export declare class RageBlip extends RageWorldObject<EntityMp> implements IBlip {
-    get sprite(): IBlipSprite;
-    get alpha(): number;
     get name(): string;
+    get sprite(): IBlipSprite;
     get color(): IBlipColor;
+    get alpha(): number;
+    get scale(): number;
+    get drawDistance(): number;
+    get shortRange(): boolean;
+    get rotation(): number;
     constructor(options: IRageBlipOptions);
-    setSprite(value: IBlipSprite): void;
-    setAlpha(value: number): void;
     setName(value: string): void;
+    setSprite(value: IBlipSprite): void;
     setColor(value: IBlipColor): void;
+    setAlpha(value: number): void;
 }

package/dist/server/entities/ragemp/blip/RageBlip.js

@@ -3,32 +3,44 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RageBlip = void 0;
 const RageWorldObject_1 = require("../worldObject/RageWorldObject");
 class RageBlip extends RageWorldObject_1.RageWorldObject {
+    get name() {
+        return this.mpEntity.name;
+    }
     get sprite() {
         return this.mpEntity.sprite;
     }
+    get color() {
+        return this.mpEntity.color;
+    }
     get alpha() {
         return this.mpEntity.alpha;
     }
-    get name() {
-        return this.mpEntity.name;
+    get scale() {
+        return this.mpEntity.scale;
     }
-    get color() {
-        return this.mpEntity.color;
+    get drawDistance() {
+        return this.mpEntity.drawDistance;
     }
-    constructor(options) {
-        super(options);
+    get shortRange() {
+        return this.mpEntity.shortRange;
     }
-    setSprite(value) {
-        this.mpEntity.sprite = value;
+    get rotation() {
+        return this.mpEntity.rotation;
     }
-    setAlpha(value) {
-        this.mpEntity.alpha = value;
+    constructor(options) {
+        super(options);
     }
     setName(value) {
         this.mpEntity.name = value;
     }
+    setSprite(value) {
+        this.mpEntity.sprite = value;
+    }
     setColor(value) {
         this.mpEntity.color = value;
     }
+    setAlpha(value) {
+        this.mpEntity.alpha = value;
+    }
 }
 exports.RageBlip = RageBlip;

package/dist/server/entities/ragemp/blip/RageBlipsManager.js

@@ -10,11 +10,8 @@ class RageBlipsManager extends RageWorldObjectsManager_1.RageWorldObjectsManager
         });
     }
     create(options) {
-        const { sprite, position, dimension, alpha } = options;
-        const mpEntity = mp.blips.new(sprite, new mp.Vector3(position), {
-            dimension,
-            alpha,
-        });
+        const { sprite, position } = options;
+        const mpEntity = mp.blips.new(sprite, new mp.Vector3(position), options);
         mpEntity.isExists = () => mp.blips.exists(mpEntity);
         const blip = new RageBlip_1.RageBlip({
             mpEntity: mpEntity,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rock-mod",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Rock-Mod is a powerful framework designed for creating and managing mods for Grand Theft Auto (GTA) games.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",