@nativewrappers/fivem 0.0.134 → 0.0.136

package/World.js

@@ -430,7 +430,10 @@ class World {
    * const rope = await World.createRope(position, rotation, 15.0, RopeType.ThickRope, 3.0, 0.5);
    * ```
    *
-   * You should manually call `RopeUnloadTextures()` after you finish using **all** ropes, unlike models requesting rope models is instantaneous
+   * You should manually call `RopeUnloadTextures()` after you finish using **all** ropes, unlike models
+   * requesting to unload rope models will instantly unload *all* rope textures, so if you have other scripts
+   * using ropes, those ropes will go inivisible.
+   *
    * If called with collisionOn you will have to LoadRopeData after
    */
   static async createRope(position, rotation, maxLength, ropeType, initLength, minLength, lengthChangeRate = 1, onlyPPU = false, collisionOn = false, lockFromFront = false, timeMultiplier = 1, breakable = false, shouldLoadTextures = true) {

package/common/decors/Events.d.ts

@@ -2,34 +2,6 @@
  * Disables pretty printing in error messages
  */
 export declare const DisablePrettyPrint: () => boolean;
-export declare enum Binding {
-    /**
-     * No one can call this
-     */
-    None = 0,
-    /**
-     * Server only accepts server calls, client only client calls
-     */
-    Local = 1,
-    /**
-     * Server only accepts client calls, client only server calls
-     */
-    Remote = 2,
-    /**
-     * Accept all incoming calls
-     * Server only accepts client calls, client only server calls
-     */
-    All = 3
-}
-/**
- * Registers the Event call for {@link eventName} to this method.
- *
- * This has internal pretty-printing to make errors easier to track, if
- * you want to disable this you will need to call {@link DisablePrettyPrint}, or if you're
- * using esbuild you can add `REMOVE_EVENT_LOG` to your drop label {@link https://esbuild.github.io/api/#drop-labels}
- * @param eventName the event to bind to
- */
-export declare function CfxEvent(eventName: string, binding?: Binding): (originalMethod: any, context: ClassMethodDecoratorContext) => void;
 /**
  * Registers the Event call for {@link eventName} to this method.
  *
@@ -39,7 +11,8 @@ export declare function CfxEvent(eventName: string, binding?: Binding): (origina
  *
  * @param eventName the event to bind to
  */
-export declare function Event(eventName: string): (originalMethod: any, context: ClassMethodDecoratorContext) => void;
+export declare function OnEvent(eventName: string): (originalMethod: any, context: ClassMethodDecoratorContext) => void;
+export declare const Event: typeof OnEvent;
 /**
  * Registers the Net Event call for {@link eventName} to this method
  *
@@ -51,7 +24,8 @@ export declare function Event(eventName: string): (originalMethod: any, context:
  * @param eventName the event to bind this net event to
  * @param remoteOnly if the event should only accept remote calls, if set to true it will ignore any local call via `emit`, defaults to true
  */
-export declare function NetEvent(eventName: string, remoteOnly?: boolean): (originalMethod: any, context: ClassMethodDecoratorContext) => void;
+export declare function OnNetEvent(eventName: string, remoteOnly?: boolean): (originalMethod: any, context: ClassMethodDecoratorContext) => void;
+export declare const NetEvent: typeof OnNetEvent;
 export type NuiCallback = (data: string) => void;
 /**
  * Registers the NUI Event call for {eventName} to this method, the function signature
@@ -63,4 +37,5 @@ export type NuiCallback = (data: string) => void;
  * @param eventName the event this will listen for
  * @param dontErrorWhenCbIsntInvoked this will just block the event fro merroring when the callback is never invoked.
  */
-export declare function NuiEvent(eventName: string, dontErrorWhenCbIsntInvoked?: boolean): (originalMethod: any, context: ClassMethodDecoratorContext) => void;
+export declare function OnNuiEvent(eventName: string, dontErrorWhenCbIsntInvoked?: boolean): (originalMethod: any, context: ClassMethodDecoratorContext) => void;
+export declare const NuiEvent: typeof OnNuiEvent;

package/common/decors/Events.js

@@ -4,57 +4,7 @@ import { GlobalData } from "../GlobalData";
 const DisablePrettyPrint = /* @__PURE__ */ __name(() => GlobalData.EnablePrettyPrint = false, "DisablePrettyPrint");
 const AsyncFunction = (async () => {
 }).constructor;
-var Binding = /* @__PURE__ */ ((Binding2) => {
-  Binding2[Binding2["None"] = 0] = "None";
-  Binding2[Binding2["Local"] = 1] = "Local";
-  Binding2[Binding2["Remote"] = 2] = "Remote";
-  Binding2[Binding2["All"] = 3] = "All";
-  return Binding2;
-})(Binding || {});
-function CfxEvent(eventName, binding = 1 /* Local */) {
-  return /* @__PURE__ */ __name(function actualDecorator(originalMethod, context) {
-    if (context.private) {
-      throw new Error("Event does not work on private methods, please mark the method as public");
-    }
-    context.addInitializer(function() {
-      const fn = (binding & 2 /* Remote */) !== 0 ? onNet : on;
-      const _t = this;
-      fn(eventName, async (...args) => {
-        const src = source;
-        if (_t.__permissionMap && binding & 2 /* Remote */) {
-          const permissions = _t.__permissionMap.get(context.name);
-          if (permissions) {
-            let hasPermission = false;
-            for (const perm of permissions) {
-              if (IsPlayerAceAllowed(src, perm)) {
-                hasPermission = true;
-                break;
-              }
-            }
-            if (!hasPermission) {
-              emit("@nativewrappers:no_permission", { eventName, method: context.name });
-              return;
-            }
-          }
-        }
-        try {
-          return await originalMethod.call(this, ...args);
-        } catch (e) {
-          REMOVE_EVENT_LOG: {
-            if (!GlobalData.EnablePrettyPrint) return;
-            console.error("------- EVENT ERROR --------");
-            console.error(`Call to ${eventName} errored`);
-            console.error(`Data: ${JSON.stringify(args)}`);
-            console.error(`Error: ${e}`);
-            console.error("------- END EVENT ERROR --------");
-          }
-        }
-      });
-    });
-  }, "actualDecorator");
-}
-__name(CfxEvent, "CfxEvent");
-function Event(eventName) {
+function OnEvent(eventName) {
   return /* @__PURE__ */ __name(function actualDecorator(originalMethod, context) {
     if (context.private) {
       throw new Error("Event does not work on private methods, please mark the method as public");
@@ -77,8 +27,9 @@ function Event(eventName) {
     });
   }, "actualDecorator");
 }
-__name(Event, "Event");
-function NetEvent(eventName, remoteOnly = true) {
+__name(OnEvent, "OnEvent");
+const Event = OnEvent;
+function OnNetEvent(eventName, remoteOnly = true) {
   return /* @__PURE__ */ __name(function actualDecorator(originalMethod, context) {
     if (context.private) {
       throw new Error("NetEvent does not work on private methods, please mark the method as public");
@@ -125,8 +76,9 @@ function NetEvent(eventName, remoteOnly = true) {
     });
   }, "actualDecorator");
 }
-__name(NetEvent, "NetEvent");
-function NuiEvent(eventName, dontErrorWhenCbIsntInvoked = false) {
+__name(OnNetEvent, "OnNetEvent");
+const NetEvent = OnNetEvent;
+function OnNuiEvent(eventName, dontErrorWhenCbIsntInvoked = false) {
   return /* @__PURE__ */ __name(function actualDecorator(originalMethod, context) {
     if (context.private) {
       throw new Error("NuiEvent does not work on private methods, please mark the method as public");
@@ -152,12 +104,14 @@ function NuiEvent(eventName, dontErrorWhenCbIsntInvoked = false) {
     });
   }, "actualDecorator");
 }
-__name(NuiEvent, "NuiEvent");
+__name(OnNuiEvent, "OnNuiEvent");
+const NuiEvent = OnNuiEvent;
 export {
-  Binding,
-  CfxEvent,
   DisablePrettyPrint,
   Event,
   NetEvent,
-  NuiEvent
+  NuiEvent,
+  OnEvent,
+  OnNetEvent,
+  OnNuiEvent
 };

package/models/Ped.js

@@ -387,6 +387,10 @@ class Ped extends BaseEntity {
   set BlockPermanentEvents(block) {
     SetBlockingOfNonTemporaryEvents(this.handle, block);
   }
+  /*
+   * NOTE: You should generally just use {@link ped.CurrentVehicle} if you plan on using the vehicle after
+   * as then you don't have to do an extra native call.
+   */
   isInAnyVehicle() {
     return IsPedInAnyVehicle(this.handle, false);
   }

package/package.json

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