@nativewrappers/redm 0.0.147 → 0.0.156

package/common/decors/Proto.d.ts

@@ -7,16 +7,12 @@ export type MessageTypeEncoder<T> = {
     name: string;
 };
 type ProtoCallback<Message> = (message: Message) => Promise<void> | void;
-type NetProtoCallback<Message> = (source: number, message: Message) => Promise<void> | void;
+type NetProtoCallback<Message> = (message: Message, source: number) => Promise<void> | void;
 /**
  * PMA uses ts-proto to define our types, you can see that here: https://github.com/stephenh/ts-proto
  * You will have to modify the generator to add `name` or just use {@param eventName}
  *
- * We use this:
- * content = content.replace(/export const (\w+)[^=]*= \{/g, 'export const $1 = {\n  name: "$1" as const,');
- *
  * This makes it very nice to handle events since we only have to give it the Protobuf Object
- *
  */
 export declare function OnProto<T>(messageType: MessageTypeDecoder<T>, eventName?: string): (originalMethod: ProtoCallback<T>, context: ClassMethodDecoratorContext) => void;
 /**

package/common/decors/Proto.js

@@ -35,7 +35,7 @@ function OnProtoNet(messageType, eventName) {
       Net.onRawNet(event, async (data, source) => {
         try {
           const message = messageType.decode(data);
-          return await originalMethod.call(this, parseSource(source), message);
+          return await originalMethod.call(this, message, parseSource(source));
         } catch (e) {
           globalThis.printError?.("proto event", e);
         }

package/common/utils/randomInt.d.ts

@@ -1 +1,2 @@
+export declare function randomFloat(min: number, max: number): number;
 export declare function randomInt(min: number, max: number): number;

package/common/utils/randomInt.js

@@ -1,9 +1,14 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-function randomInt(min, max) {
+function randomFloat(min, max) {
   return Math.random() * (max - min) + min;
 }
+__name(randomFloat, "randomFloat");
+function randomInt(min, max) {
+  return Math.floor(randomFloat(min, max));
+}
 __name(randomInt, "randomInt");
 export {
+  randomFloat,
   randomInt
 };

package/entities/Pickup.d.ts

@@ -2,4 +2,5 @@ export declare class Pickup {
     handle: number;
     constructor(handle: number);
     get Handle(): number;
+    get IsNetworked(): boolean;
 }

package/entities/Pickup.js

@@ -11,6 +11,9 @@ class Pickup {
   get Handle() {
     return this.handle;
   }
+  get IsNetworked() {
+    return false;
+  }
 }
 export {
   Pickup

package/index.d.ts

@@ -15,6 +15,7 @@ export * from "./world/createDraftVehicle";
 export * from "./world/createPed";
 export * from "./world/createProp";
 export * from "./world/createVehicle";
+export * from "./world/getGamePool";
 export * from "./utils/Animations";
 export * from "./utils/Native";
 export * from "./types/Throwable";

package/index.js

@@ -15,6 +15,7 @@ export * from "./world/createDraftVehicle";
 export * from "./world/createPed";
 export * from "./world/createProp";
 export * from "./world/createVehicle";
+export * from "./world/getGamePool";
 export * from "./utils/Animations";
 export * from "./utils/Native";
 export * from "./types/Throwable";

package/package.json

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

package/world/getGamePool.d.ts

@@ -0,0 +1,16 @@
+import { Ped } from "../entities/Ped";
+import { Pickup } from "../entities/Pickup";
+import { Prop } from "../entities/Prop";
+import { Vehicle } from "../entities/Vehicle";
+declare const constructorMap: {
+    CObject: typeof Prop;
+    CPed: typeof Ped;
+    CVehicle: typeof Vehicle;
+    CPickup: typeof Pickup;
+    CNetObject: typeof Prop;
+};
+type PoolTypeMap = {
+    [K in keyof typeof constructorMap]: InstanceType<(typeof constructorMap)[K]>;
+};
+export declare function getGamePool<T extends keyof typeof constructorMap>(type: T, networkOnly?: boolean): PoolTypeMap[T][];
+export {};

package/world/getGamePool.js

@@ -0,0 +1,32 @@
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { Ped } from "../entities/Ped";
+import { Pickup } from "../entities/Pickup";
+import { Prop } from "../entities/Prop";
+import { Vehicle } from "../entities/Vehicle";
+const constructorMap = {
+  CObject: Prop,
+  CPed: Ped,
+  CVehicle: Vehicle,
+  CPickup: Pickup,
+  CNetObject: Prop
+};
+function getGamePool(type, networkOnly = false) {
+  const pool = GetGamePool(type);
+  const entityConstructor = constructorMap[type];
+  let poolMap = pool.map((v) => {
+    const p = new entityConstructor(v);
+    if (networkOnly && !p.IsNetworked) {
+      return null;
+    }
+    return p;
+  });
+  if (networkOnly) {
+    poolMap = poolMap.filter((v) => v !== null);
+  }
+  return poolMap;
+}
+__name(getGamePool, "getGamePool");
+export {
+  getGamePool
+};