@nativewrappers/redm 0.0.98 → 0.0.100

package/Model.d.ts

@@ -6,8 +6,12 @@ export declare class Model implements Disposable {
     /**
      * Hash of this model.
      */
-    private hash;
-    private requestedModel;
+    protected hash: number;
+    protected requestCount: number;
+    /**
+     * Returns the amount of times this model has been requested from the client, useful for finding situations where the client fails to release the ref
+     */
+    get RequestCount(): number;
     /**
      * Creates a model object based on the hash key or model string.
      *

package/Model.js

@@ -10,7 +10,13 @@ class Model {
    * Hash of this model.
    */
   hash;
-  requestedModel = false;
+  requestCount = 0;
+  /**
+   * Returns the amount of times this model has been requested from the client, useful for finding situations where the client fails to release the ref
+   */
+  get RequestCount() {
+    return this.requestCount;
+  }
   /**
    * Creates a model object based on the hash key or model string.
    *
@@ -24,7 +30,7 @@ class Model {
     }
   }
   [Symbol.dispose]() {
-    if (this.requestedModel) {
+    if (this.requestCount > 0) {
       this.markAsNoLongerNeeded();
     }
   }
@@ -127,11 +133,8 @@ class Model {
   }
   // TODO: Metaped stuff too at some point
   requestModel() {
-    if (this.IsWeapon) {
-      Citizen.invokeNative("0x72D4CB5DB927009C", this.hash, 0, true);
-    } else {
-      RequestModel(this.hash, false);
-    }
+    RequestModel(this.hash, false);
+    this.requestCount++;
   }
   /**
    * Request and load the model with a specified timeout. Default timeout is 1000 (recommended).
@@ -152,7 +155,9 @@ class Model {
     while (!this.IsLoaded && GetGameTimer() < timeout) {
       await Delay(0);
     }
-    this.requestedModel = true;
+    if (!this.IsLoaded) {
+      this.markAsNoLongerNeeded();
+    }
     return this.IsLoaded;
   }
   /**

package/Weapons.d.ts

@@ -1,4 +1,5 @@
 import { WeaponModel } from "./models/WeaponModel";
+export declare const WEAPON_UNARMED: WeaponModel;
 export declare const WEAPON_MELEE_HATCHET_MELEEONLY: WeaponModel;
 export declare const WEAPON_MELEE_KNIFE_MINER: WeaponModel;
 export declare const WEAPON_MELEE_KNIFE_JAWBONE: WeaponModel;

package/Weapons.js

@@ -1,4 +1,5 @@
 import { WeaponModel } from "./models/WeaponModel";
+const WEAPON_UNARMED = new WeaponModel("WEAPON_UNARMED");
 const WEAPON_MELEE_HATCHET_MELEEONLY = new WeaponModel("WEAPON_MELEE_HATCHET_MELEEONLY");
 const WEAPON_MELEE_KNIFE_MINER = new WeaponModel("WEAPON_MELEE_KNIFE_MINER");
 const WEAPON_MELEE_KNIFE_JAWBONE = new WeaponModel("WEAPON_MELEE_KNIFE_JAWBONE");
@@ -147,6 +148,7 @@ const WEAPON_MELEE_KNIFE_HORROR = new WeaponModel("WEAPON_MELEE_KNIFE_HORROR");
 const WEAPON_MELEE_KNIFE_RUSTIC = new WeaponModel("WEAPON_MELEE_KNIFE_RUSTIC");
 const WEAPON_MELEE_LANTERN_HALLOWEEN = new WeaponModel("WEAPON_MELEE_LANTERN_HALLOWEEN");
 const WEAPONS_MAP = /* @__PURE__ */ new Map([
+  ["weapon_unarmed", WEAPON_UNARMED],
   ["weapon_melee_hatchet_meleeonly", WEAPON_MELEE_HATCHET_MELEEONLY],
   ["weapon_melee_knife_miner", WEAPON_MELEE_KNIFE_MINER],
   ["weapon_melee_knife_jawbone", WEAPON_MELEE_KNIFE_JAWBONE],
@@ -437,6 +439,7 @@ export {
   WEAPON_THROWN_THROWING_KNIVES_JAVIER,
   WEAPON_THROWN_TOMAHAWK,
   WEAPON_THROWN_TOMAHAWK_ANCIENT,
+  WEAPON_UNARMED,
   WEAPON_WOLF,
   WEAPON_WOLF_MEDIUM,
   WEAPON_WOLF_SMALL

package/common/Command.d.ts

@@ -8,6 +8,7 @@ interface ParameterTypes {
 interface Parameter {
     name: string;
     type: keyof ParameterTypes;
+    defaultValue?: any;
     help?: string;
     optional?: boolean;
 }
@@ -18,6 +19,27 @@ type MappedParameters<T extends Parameter[]> = {
     raw: string;
 };
 type CommandHandler<T extends Parameter[]> = (args: MappedParameters<T>) => void | Promise<void>;
+/**
+ * ```typescript
+ * new Command(["do", "deleteobjects"], async ({source, radius}) => {
+ *   const entities = Prop.AllProps();
+ *   const ply = new Player(source);
+ *   const pos = ply.Ped.Position
+ *   for (const ent of entities) {
+ *     // if they're outside of the range of our specified radius just continue to next
+ *     if (ent.Position.distance(pos) > radius) continue;
+ *     ent.delete();
+ *   }
+ * }, "Deletes all objects in the specified range", [
+ *   {
+ *      name: "radius",
+ *      type: "number",
+ *      help: "The radius to delete the entities in",
+ *      defaultValue: 5.0
+ *   }
+ * ] as const, "group.moderator")
+ *  ```
+ */
 export declare class Command<T extends Parameter[] = Parameter[]> {
     #private;
     readonly name: string | string[];

package/common/Command.js

@@ -49,7 +49,9 @@ class Command {
     if (params) {
       for (const parameter of params) {
         if (parameter.type) {
-          parameter.help = parameter.help ? `${parameter.help} (type: ${parameter.type})` : `(type: ${parameter.type})`;
+          const defaultString = parameter.defaultValue !== void 0 ? `[default: ${parameter.defaultValue}]` : "";
+          const typeString = `[type: ${parameter.type}] ${defaultString}`;
+          parameter.help = parameter.help ? `${parameter.help} ${typeString}` : `${typeString}`;
         }
       }
     }
@@ -87,26 +89,36 @@ class Command {
     const result = this.params.every((param, index) => {
       const arg = args[index];
       let value = arg;
-      switch (param.type) {
-        case "number":
-          value = +arg;
-          break;
-        case "string":
-          value = !Number(arg) ? arg : false;
-          break;
-        case "playerId":
-          $SERVER: {
-            value = arg === "me" ? source2 : +arg;
-            if (!value || !DoesPlayerExist(value.toString())) value = void 0;
-          }
-          $CLIENT: {
-            value = arg === "me" ? GetPlayerServerId(PlayerId()) : +arg;
-            if (!value || GetPlayerFromServerId(value) === -1) value = void 0;
-          }
-          break;
-        case "longString":
-          value = raw.substring(raw.indexOf(arg));
-          break;
+      const hasDefaultValue = param.defaultValue !== void 0;
+      const hasArg = typeof arg === "string";
+      if (!hasArg && hasDefaultValue) {
+        value = param.defaultValue;
+      } else {
+        switch (param.type) {
+          case "number":
+            if (hasDefaultValue && !hasArg) {
+              value = param.defaultValue;
+            } else {
+              value = +arg;
+            }
+            break;
+          case "string":
+            value = !Number(arg) ? arg : false;
+            break;
+          case "playerId":
+            $SERVER: {
+              value = arg === "me" ? source2 : +arg;
+              if (!value || !DoesPlayerExist(value.toString())) value = void 0;
+            }
+            $CLIENT: {
+              value = arg === "me" ? GetPlayerServerId(PlayerId()) : +arg;
+              if (!value || GetPlayerFromServerId(value) === -1) value = void 0;
+            }
+            break;
+          case "longString":
+            value = raw.substring(raw.indexOf(arg));
+            break;
+        }
       }
       if (value === void 0 && (!param.optional || param.optional && arg)) {
         return Citizen.trace(

package/common/decors/Events.js

@@ -15,8 +15,20 @@ function Exports(exportName) {
       throw new Error("Exports does not work on private methods, please mark the method as public");
     }
     context.addInitializer(function() {
-      exports(exportName, (...args) => {
-        return originalMethod.call(this, ...args);
+      exports(exportName, async (...args) => {
+        try {
+          return await originalMethod.call(this, ...args);
+        } catch (err) {
+          REMOVE_EVENT_LOG: {
+            if (!GlobalData.EnablePrettyPrint) return;
+            console.error("------- EXPORT ERROR --------");
+            console.error(`Call to ${exportName} errored`);
+            console.error(`Data: ${JSON.stringify(args)}`);
+            console.error(`Error: ${err}`);
+            console.error("------- END EXPORT ERROR --------");
+          }
+          throw err;
+        }
       });
     });
   }, "actualDecorator");
@@ -28,9 +40,9 @@ function Event(eventName) {
       throw new Error("Event does not work on private methods, please mark the method as public");
     }
     context.addInitializer(function() {
-      on(eventName, (...args) => {
+      on(eventName, async (...args) => {
         try {
-          return originalMethod.call(this, ...args);
+          return await originalMethod.call(this, ...args);
         } catch (e) {
           REMOVE_EVENT_LOG: {
             if (!GlobalData.EnablePrettyPrint) return;
@@ -52,7 +64,7 @@ function NetEvent(eventName, remoteOnly = true) {
       throw new Error("NetEvent does not work on private methods, please mark the method as public");
     }
     context.addInitializer(function() {
-      onNet(eventName, (...args) => {
+      onNet(eventName, async (...args) => {
         const src = source;
         try {
           $CLIENT: {
@@ -60,7 +72,7 @@ function NetEvent(eventName, remoteOnly = true) {
               return;
             }
           }
-          return originalMethod.call(this, ...args);
+          return await originalMethod.call(this, ...args);
         } catch (e) {
           REMOVE_NET_EVENT_LOG: {
             if (!GlobalData.EnablePrettyPrint) return;

package/entities/Ped.d.ts

@@ -1,8 +1,9 @@
 import type { Vector3 } from "../common/utils/Vector";
 import { Tasks } from "../Task";
+import { WeaponAttachPoints } from "../enums/WeaponAttachPoints";
 import { ItemAddReason } from "../inventory/InventoryTypes";
 import type { AmmoModel } from "../models/AmmoModel";
-import type { WeaponModel } from "../models/WeaponModel";
+import { WeaponModel } from "../models/WeaponModel";
 import { Attributes } from "../Attribute";
 import type { KnockOffVehicle, TamingState, eDamageCleanliness } from "../enums/Ped";
 import type { VehicleSeat } from "../enums/VehicleSeat";
@@ -205,4 +206,8 @@ export declare class Ped extends BaseEntity {
     disableAmmoForWeapon(weapon: WeaponModel, ammo: AmmoModel): void;
     get HasPistol(): boolean;
     get HasRepeater(): boolean;
+    get CurrentWeapon(): WeaponModel;
+    giveWeapon(weapon: WeaponModel, ammoCount: number, forceInHand?: boolean, forceInHolster?: boolean, attachPoint?: WeaponAttachPoints | undefined, allowMultipleCopies?: boolean, p7?: number, p8?: number, addReason?: ItemAddReason, ignoreUnlocks?: boolean, permanentDegradation?: number, p12?: boolean): Promise<void>;
+    setCurrentWeapon(weapon: WeaponModel, equipNow?: boolean, attachPoint?: WeaponAttachPoints, p4?: boolean, p5?: boolean): void;
+    holsterWeapon(): void;
 }

package/entities/Ped.js

@@ -1,7 +1,9 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 import { Tasks } from "../Task";
+import { WeaponAttachPoints } from "../enums/WeaponAttachPoints";
 import { ItemAddReason } from "../inventory/InventoryTypes";
+import { WeaponModel } from "../models/WeaponModel";
 import { _N } from "../utils/Native";
 import { Attributes } from "../Attribute";
 import { BaseEntity } from "./BaseEntity";
@@ -441,6 +443,36 @@ class Ped extends BaseEntity {
   get HasRepeater() {
     return Citizen.invokeNative("0x495A04CAEC263AF8", this.handle);
   }
+  get CurrentWeapon() {
+    const weapon = Citizen.invokeNative("0x8425C5F057012DAB", this.handle);
+    return new WeaponModel(weapon);
+  }
+  async giveWeapon(weapon, ammoCount, forceInHand = true, forceInHolster = false, attachPoint = void 0, allowMultipleCopies = false, p7 = 0.5, p8 = 1, addReason = ItemAddReason.Default, ignoreUnlocks = true, permanentDegradation = 0.5, p12 = false) {
+    await weapon.request();
+    attachPoint = attachPoint ?? weapon.DefaultAttachPoint;
+    Citizen.invokeNative(
+      "0x5E3BDDBCB83F3D84",
+      this.handle,
+      weapon.Hash,
+      ammoCount,
+      forceInHand,
+      forceInHolster,
+      attachPoint,
+      allowMultipleCopies,
+      p7,
+      p8,
+      addReason,
+      ignoreUnlocks,
+      permanentDegradation,
+      p12
+    );
+  }
+  setCurrentWeapon(weapon, equipNow = true, attachPoint = WeaponAttachPoints.HandPrimary, p4 = false, p5 = false) {
+    Citizen.invokeNative("0xADF692B254977C0C", this.handle, weapon.Hash, equipNow, attachPoint, p4, p5);
+  }
+  holsterWeapon() {
+    Citizen.invokeNative("0x94A3C1B804D291EC", this.handle, true, true, true, true);
+  }
 }
 export {
   Ped

package/enums/WeaponAttachPoints.d.ts

@@ -0,0 +1,35 @@
+export declare enum WeaponAttachPoints {
+    HandPrimary = 0,
+    HandSecondary = 1,
+    PistolR = 2,
+    MAX_HAND_ATTACH_POINTS = 2,
+    PistolLeft = 3,
+    Knife = 4,
+    Lasso = 5,
+    Thrower = 6,
+    Bow = 7,
+    BowAlternative = 8,
+    Rifle = 9,
+    RifleAlternative = 10,
+    Lantern = 11,
+    TempLantern = 12,
+    Melee = 13,
+    MAX_SYNCED_WEAPON_ATTACH_POINTS = 13,
+    Hip = 14,
+    Boot = 15,
+    Back = 16,
+    Front = 18,
+    ShoulderSling = 19,
+    LeftBreast = 20,
+    RightBreast = 21,
+    LeftArmpit = 22,
+    RightArmpit = 23,
+    LeftArmpitRifle = 24,
+    Satchel = 25,
+    LeftArmPitBow = 26,
+    RightHandExtra = 27,
+    LeftHandExtra = 28,
+    RightHandAux = 29,
+    MAX_WEAPON_ATTACH_POINTS = 29,
+    WEAPON_ATTACH_POINT_INVALID = -1
+}

package/enums/WeaponAttachPoints.js

@@ -0,0 +1,39 @@
+var WeaponAttachPoints = /* @__PURE__ */ ((WeaponAttachPoints2) => {
+  WeaponAttachPoints2[WeaponAttachPoints2["HandPrimary"] = 0] = "HandPrimary";
+  WeaponAttachPoints2[WeaponAttachPoints2["HandSecondary"] = 1] = "HandSecondary";
+  WeaponAttachPoints2[WeaponAttachPoints2["PistolR"] = 2] = "PistolR";
+  WeaponAttachPoints2[WeaponAttachPoints2["MAX_HAND_ATTACH_POINTS"] = 2] = "MAX_HAND_ATTACH_POINTS";
+  WeaponAttachPoints2[WeaponAttachPoints2["PistolLeft"] = 3] = "PistolLeft";
+  WeaponAttachPoints2[WeaponAttachPoints2["Knife"] = 4] = "Knife";
+  WeaponAttachPoints2[WeaponAttachPoints2["Lasso"] = 5] = "Lasso";
+  WeaponAttachPoints2[WeaponAttachPoints2["Thrower"] = 6] = "Thrower";
+  WeaponAttachPoints2[WeaponAttachPoints2["Bow"] = 7] = "Bow";
+  WeaponAttachPoints2[WeaponAttachPoints2["BowAlternative"] = 8] = "BowAlternative";
+  WeaponAttachPoints2[WeaponAttachPoints2["Rifle"] = 9] = "Rifle";
+  WeaponAttachPoints2[WeaponAttachPoints2["RifleAlternative"] = 10] = "RifleAlternative";
+  WeaponAttachPoints2[WeaponAttachPoints2["Lantern"] = 11] = "Lantern";
+  WeaponAttachPoints2[WeaponAttachPoints2["TempLantern"] = 12] = "TempLantern";
+  WeaponAttachPoints2[WeaponAttachPoints2["Melee"] = 13] = "Melee";
+  WeaponAttachPoints2[WeaponAttachPoints2["MAX_SYNCED_WEAPON_ATTACH_POINTS"] = 13] = "MAX_SYNCED_WEAPON_ATTACH_POINTS";
+  WeaponAttachPoints2[WeaponAttachPoints2["Hip"] = 14] = "Hip";
+  WeaponAttachPoints2[WeaponAttachPoints2["Boot"] = 15] = "Boot";
+  WeaponAttachPoints2[WeaponAttachPoints2["Back"] = 16] = "Back";
+  WeaponAttachPoints2[WeaponAttachPoints2["Front"] = 18] = "Front";
+  WeaponAttachPoints2[WeaponAttachPoints2["ShoulderSling"] = 19] = "ShoulderSling";
+  WeaponAttachPoints2[WeaponAttachPoints2["LeftBreast"] = 20] = "LeftBreast";
+  WeaponAttachPoints2[WeaponAttachPoints2["RightBreast"] = 21] = "RightBreast";
+  WeaponAttachPoints2[WeaponAttachPoints2["LeftArmpit"] = 22] = "LeftArmpit";
+  WeaponAttachPoints2[WeaponAttachPoints2["RightArmpit"] = 23] = "RightArmpit";
+  WeaponAttachPoints2[WeaponAttachPoints2["LeftArmpitRifle"] = 24] = "LeftArmpitRifle";
+  WeaponAttachPoints2[WeaponAttachPoints2["Satchel"] = 25] = "Satchel";
+  WeaponAttachPoints2[WeaponAttachPoints2["LeftArmPitBow"] = 26] = "LeftArmPitBow";
+  WeaponAttachPoints2[WeaponAttachPoints2["RightHandExtra"] = 27] = "RightHandExtra";
+  WeaponAttachPoints2[WeaponAttachPoints2["LeftHandExtra"] = 28] = "LeftHandExtra";
+  WeaponAttachPoints2[WeaponAttachPoints2["RightHandAux"] = 29] = "RightHandAux";
+  WeaponAttachPoints2[WeaponAttachPoints2["MAX_WEAPON_ATTACH_POINTS"] = 29] = "MAX_WEAPON_ATTACH_POINTS";
+  WeaponAttachPoints2[WeaponAttachPoints2["WEAPON_ATTACH_POINT_INVALID"] = -1] = "WEAPON_ATTACH_POINT_INVALID";
+  return WeaponAttachPoints2;
+})(WeaponAttachPoints || {});
+export {
+  WeaponAttachPoints
+};

package/index.d.ts

@@ -35,6 +35,7 @@ export * from "./enums/Ped";
 export * from "./enums/RawKeys";
 export * from "./enums/Relationship";
 export * from "./enums/VehicleSeat";
+export * from "./enums/WeaponAttachPoints";
 export * from "./entities/BaseEntity";
 export * from "./entities/Entity";
 export * from "./entities/HorsePeltEntries";

package/index.js

@@ -35,6 +35,7 @@ export * from "./enums/Ped";
 export * from "./enums/RawKeys";
 export * from "./enums/Relationship";
 export * from "./enums/VehicleSeat";
+export * from "./enums/WeaponAttachPoints";
 export * from "./entities/BaseEntity";
 export * from "./entities/Entity";
 export * from "./entities/HorsePeltEntries";

package/models/WeaponModel.d.ts

@@ -1,3 +1,7 @@
 import { Model } from "../Model";
+import type { WeaponAttachPoints } from "../enums/WeaponAttachPoints";
 export declare class WeaponModel extends Model {
+    requestModel(): void;
+    markAsNoLongerNeeded(): void;
+    get DefaultAttachPoint(): WeaponAttachPoints;
 }

package/models/WeaponModel.js

@@ -5,6 +5,17 @@ class WeaponModel extends Model {
   static {
     __name(this, "WeaponModel");
   }
+  requestModel() {
+    Citizen.invokeNative("0x72D4CB5DB927009C", this.hash, 0, true);
+    this.requestCount++;
+  }
+  markAsNoLongerNeeded() {
+    Citizen.invokeNative("0xC3896D03E2852236", this.hash);
+    this.requestCount--;
+  }
+  get DefaultAttachPoint() {
+    return Citizen.invokeNative("0x65DC4AC5B96614CB", this.hash, Citizen.resultAsInteger());
+  }
 }
 export {
   WeaponModel

package/package.json

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