rock-mod 0.5.1 → 0.6.0

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2024 Carter
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2024 Carter
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

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/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/package.json

@@ -1,62 +1,62 @@
-{
-  "name": "rock-mod",
-  "version": "0.5.1",
-  "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",
-  "scripts": {
-    "start": "npx tsx src/server/index.ts",
-    "build": "npm run build:server && npm run build:client",
-    "build:server": "tsc --project src/server/tsconfig.json",
-    "build:client": "tsc --project src/client/tsconfig.json",
-    "lint:server:check": "cd src/server && eslint . --ext .ts",
-    "lint:server:fix": "cd src/server && eslint . --ext .ts --fix",
-    "lint:client:check": "cd src/client && eslint . --ext .ts",
-    "lint:client:fix": "cd src/client && eslint . --ext .ts --fix",
-    "lint:check": "npm run lint:server:check && npm run lint:client:check",
-    "lint:fix": "npm run lint:server:fix && npm run lint:client:fix",
-    "format:check": "prettier --check .",
-    "format:fix": "prettier --write .",
-    "type:server:check": "tsc --noEmit --project src/server/tsconfig.json",
-    "type:client:check": "tsc --noEmit --project src/client/tsconfig.json",
-    "type:check": "npm run type:server:check && npm run type:client:check",
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "prepare": "husky"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "*.{ts,json,md}": [
-      "npm run lint:fix",
-      "npm run format:fix"
-    ]
-  },
-  "files": [
-    "dist"
-  ],
-  "keywords": [
-    "gta",
-    "multiplayer",
-    "altv",
-    "ragemp"
-  ],
-  "author": "xvetal",
-  "license": "MIT",
-  "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^7.18.0",
-    "@typescript-eslint/parser": "^7.18.0",
-    "eslint": "^8.57.1",
-    "eslint-config-airbnb-typescript": "^18.0.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-import-resolver-typescript": "^3.6.3",
-    "eslint-plugin-import": "^2.30.0",
-    "eslint-plugin-prettier": "^5.2.1",
-    "husky": "^9.1.6",
-    "lint-staged": "^15.2.10",
-    "prettier": "^3.3.3",
-    "typescript": "^5.6.2"
-  }
-}
+{
+  "name": "rock-mod",
+  "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",
+  "scripts": {
+    "start": "npx tsx src/server/index.ts",
+    "build": "npm run build:server && npm run build:client",
+    "build:server": "tsc --project src/server/tsconfig.json",
+    "build:client": "tsc --project src/client/tsconfig.json",
+    "lint:server:check": "cd src/server && eslint . --ext .ts",
+    "lint:server:fix": "cd src/server && eslint . --ext .ts --fix",
+    "lint:client:check": "cd src/client && eslint . --ext .ts",
+    "lint:client:fix": "cd src/client && eslint . --ext .ts --fix",
+    "lint:check": "npm run lint:server:check && npm run lint:client:check",
+    "lint:fix": "npm run lint:server:fix && npm run lint:client:fix",
+    "format:check": "prettier --check .",
+    "format:fix": "prettier --write .",
+    "type:server:check": "tsc --noEmit --project src/server/tsconfig.json",
+    "type:client:check": "tsc --noEmit --project src/client/tsconfig.json",
+    "type:check": "npm run type:server:check && npm run type:client:check",
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "prepare": "husky"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "*.{ts,json,md}": [
+      "npm run lint:fix",
+      "npm run format:fix"
+    ]
+  },
+  "files": [
+    "dist"
+  ],
+  "keywords": [
+    "gta",
+    "multiplayer",
+    "altv",
+    "ragemp"
+  ],
+  "author": "xvetal",
+  "license": "MIT",
+  "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
+    "eslint": "^8.57.1",
+    "eslint-config-airbnb-typescript": "^18.0.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-import-resolver-typescript": "^3.6.3",
+    "eslint-plugin-import": "^2.30.0",
+    "eslint-plugin-prettier": "^5.2.1",
+    "husky": "^9.1.6",
+    "lint-staged": "^15.2.10",
+    "prettier": "^3.3.3",
+    "typescript": "^5.6.2"
+  }
+}