@nativewrappers/redm-codegen 0.0.3 → 0.0.4

package/src/namespaces/VolumeStatics.ts

@@ -166,22 +166,37 @@ export class VolumeStatics {
   }
 
   /**
-   * @param p0 
-   * @param p1 
-   * @param p2 
+   * @param pos 
+   * @param rot 
+   * @param scale 
+   * @returns
    */
-  static N_0x4A8FEFC43FD8AC9B(p0: any, p1: any, p2: any): void {
-    inv<void>('0x4A8FEFC43FD8AC9B', p0, p1, p2);
+  static createVolumeCylinder(pos: Vector3, rot: Vector3, scale: Vector3): Volume | null {
+    return createFromHandle<Volume>('Volume', inv<number>('0x0522D4774B82E3E6', f(pos.x), f(pos.y), f(pos.z), f(rot.x), f(rot.y), f(rot.z), f(scale.x), f(scale.y), f(scale.z), rai()));
   }
 
   /**
-   * @param pos 
-   * @param rot 
-   * @param scale 
    * @returns
    */
-  static createVolumeSphere(pos: Vector3, rot: Vector3, scale: Vector3): Volume | null {
-    return createFromHandle<Volume>('Volume', inv<number>('0xB3FB80A32BAE3065', f(pos.x), f(pos.y), f(pos.z), f(rot.x), f(rot.y), f(rot.z), f(scale.x), f(scale.y), f(scale.z), rai()));
+  static createVolumeAggregate(): Volume | null {
+    return createFromHandle<Volume>('Volume', inv<number>('0x59F6F5C1D129F106', rai()));
+  }
+
+  /**
+   * enum eVolumeLockRequestStatus
+   * {
+   * VOLUME_LOCK_REQUEST_STATUS_INVALID,
+   * VOLUME_LOCK_REQUEST_STATUS_READY,
+   * VOLUME_LOCK_REQUEST_STATUS_IN_PROGRESS,
+   * VOLUME_LOCK_REQUEST_STATUS_SUCCEEDED,
+   * VOLUME_LOCK_REQUEST_STATUS_FAILED
+   * };
+   *
+   * @param volLockRequestId 
+   * @returns
+   */
+  static getVolumeLockRequestStatus(volLockRequestId: number): number {
+    return inv<number>('0xB33A604345F58202', volLockRequestId, rai());
   }
 
   /**
@@ -190,48 +205,58 @@ export class VolumeStatics {
    * @param p2 
    * @param p3 
    * @param p4 
+   * @param p5 
    * @returns
    */
-  static N_0xD882C5B3991575B7(p0: any, p1: any, p2: any, p3: any, p4: any): Vector3 {
-    return Vector3.fromArray(inv<number[]>('0xD882C5B3991575B7', p0, p1, p2, p3, p4, rav()));
+  static N_0x870E9981ED27C815(p0: any, p1: any, p2: any, p3: any, p4: any, p5: any): any {
+    return inv<number>('0x870E9981ED27C815', p0, p1, p2, p3, p4, p5);
   }
 
   /**
-   * @returns args
+   * @param p0 
+   * @returns
    */
-  static requestVolumeLockWithArgs(): [number, number] {
-    const result = inv<[number, number]>('0x183C0B6CFEFFCAE4', pvi(), rai());
-    return [result[0], result[1]];
+  static N_0xF6CE6F9C3897804E(p0: any): any {
+    return inv<number>('0xF6CE6F9C3897804E', p0);
   }
 
   /**
    * @param p0 
-   * @param p1 
+   * @returns
    */
-  static N_0x695DAC2DB928F308(p0: any, p1: any): void {
-    inv<void>('0x695DAC2DB928F308', p0, p1);
+  static N_0x7FD78DFD0C5D7B9B(p0: any): any {
+    return inv<number>('0x7FD78DFD0C5D7B9B', p0);
   }
 
   /**
-   * Indexes items (including entyties and peds) in a set volume
-   * Counts up as its the return value of how many items it writes to given itemSet
-   *
+   * @param volLockRequestId 
+   * @returns
+   */
+  static N_0xC4019CF9AE8E931A(volLockRequestId: number): Vector3 {
+    return Vector3.fromArray(inv<number[]>('0xC4019CF9AE8E931A', volLockRequestId, rav()));
+  }
+
+  /**
+   * @param volumeType 
    * @param pos 
-   * @param radius 
-   * @param itemSet 
+   * @param rot 
+   * @param scale 
    * @returns
    */
-  static getVolumeAmountOfIndexedItems(pos: Vector3, radius: number, itemSet: ItemSet): any {
-    return inv<number>('0x2B32B11520626229', f(pos.x), f(pos.y), f(pos.z), f(radius), itemSet.handle);
+  static createAntiGriefVolume(volumeType: string | number, pos: Vector3, rot: Vector3, scale: Vector3): Volume | null {
+    return createFromHandle<Volume>('Volume', inv<number>('0x0EB78C2B156635B1', _h(volumeType), f(pos.x), f(pos.y), f(pos.z), f(rot.x), f(rot.y), f(rot.z), f(scale.x), f(scale.y), f(scale.z), rai()));
   }
 
   /**
-   * @param p0 
-   * @param p1 
-   * @param p2 
+   * @param pos 
+   * @param radius 
+   * @param p4 
+   * @param p5 
+   * @param flags 
+   * @returns
    */
-  static N_0x3EFABB21E14A6BD1(p0: any, p1: any, p2: any): void {
-    inv<void>('0x3EFABB21E14A6BD1', p0, p1, p2);
+  static isPointNearVolumeLockCenter(pos: Vector3, radius: number, p4: number, p5: number, flags: number): any {
+    return inv<number>('0x769BB7626B8CDB06', f(pos.x), f(pos.y), f(pos.z), f(radius), p4, p5, flags);
   }
 
   /**
@@ -473,37 +498,22 @@ export class VolumeStatics {
   }
 
   /**
-   * @param pos 
-   * @param rot 
-   * @param scale 
-   * @returns
-   */
-  static createVolumeCylinder(pos: Vector3, rot: Vector3, scale: Vector3): Volume | null {
-    return createFromHandle<Volume>('Volume', inv<number>('0x0522D4774B82E3E6', f(pos.x), f(pos.y), f(pos.z), f(rot.x), f(rot.y), f(rot.z), f(scale.x), f(scale.y), f(scale.z), rai()));
-  }
-
-  /**
-   * @returns
+   * @param p0 
+   * @param p1 
+   * @param p2 
    */
-  static createVolumeAggregate(): Volume | null {
-    return createFromHandle<Volume>('Volume', inv<number>('0x59F6F5C1D129F106', rai()));
+  static N_0x4A8FEFC43FD8AC9B(p0: any, p1: any, p2: any): void {
+    inv<void>('0x4A8FEFC43FD8AC9B', p0, p1, p2);
   }
 
   /**
-   * enum eVolumeLockRequestStatus
-   * {
-   * VOLUME_LOCK_REQUEST_STATUS_INVALID,
-   * VOLUME_LOCK_REQUEST_STATUS_READY,
-   * VOLUME_LOCK_REQUEST_STATUS_IN_PROGRESS,
-   * VOLUME_LOCK_REQUEST_STATUS_SUCCEEDED,
-   * VOLUME_LOCK_REQUEST_STATUS_FAILED
-   * };
-   *
-   * @param volLockRequestId 
+   * @param pos 
+   * @param rot 
+   * @param scale 
    * @returns
    */
-  static getVolumeLockRequestStatus(volLockRequestId: number): number {
-    return inv<number>('0xB33A604345F58202', volLockRequestId, rai());
+  static createVolumeSphere(pos: Vector3, rot: Vector3, scale: Vector3): Volume | null {
+    return createFromHandle<Volume>('Volume', inv<number>('0xB3FB80A32BAE3065', f(pos.x), f(pos.y), f(pos.z), f(rot.x), f(rot.y), f(rot.z), f(scale.x), f(scale.y), f(scale.z), rai()));
   }
 
   /**
@@ -512,58 +522,48 @@ export class VolumeStatics {
    * @param p2 
    * @param p3 
    * @param p4 
-   * @param p5 
    * @returns
    */
-  static N_0x870E9981ED27C815(p0: any, p1: any, p2: any, p3: any, p4: any, p5: any): any {
-    return inv<number>('0x870E9981ED27C815', p0, p1, p2, p3, p4, p5);
+  static N_0xD882C5B3991575B7(p0: any, p1: any, p2: any, p3: any, p4: any): Vector3 {
+    return Vector3.fromArray(inv<number[]>('0xD882C5B3991575B7', p0, p1, p2, p3, p4, rav()));
   }
 
   /**
-   * @param p0 
-   * @returns
+   * @returns args
    */
-  static N_0xF6CE6F9C3897804E(p0: any): any {
-    return inv<number>('0xF6CE6F9C3897804E', p0);
+  static requestVolumeLockWithArgs(): [number, number] {
+    const result = inv<[number, number]>('0x183C0B6CFEFFCAE4', pvi(), rai());
+    return [result[0], result[1]];
   }
 
   /**
    * @param p0 
-   * @returns
-   */
-  static N_0x7FD78DFD0C5D7B9B(p0: any): any {
-    return inv<number>('0x7FD78DFD0C5D7B9B', p0);
-  }
-
-  /**
-   * @param volLockRequestId 
-   * @returns
+   * @param p1 
    */
-  static N_0xC4019CF9AE8E931A(volLockRequestId: number): Vector3 {
-    return Vector3.fromArray(inv<number[]>('0xC4019CF9AE8E931A', volLockRequestId, rav()));
+  static N_0x695DAC2DB928F308(p0: any, p1: any): void {
+    inv<void>('0x695DAC2DB928F308', p0, p1);
   }
 
   /**
-   * @param volumeType 
+   * Indexes items (including entyties and peds) in a set volume
+   * Counts up as its the return value of how many items it writes to given itemSet
+   *
    * @param pos 
-   * @param rot 
-   * @param scale 
+   * @param radius 
+   * @param itemSet 
    * @returns
    */
-  static createAntiGriefVolume(volumeType: string | number, pos: Vector3, rot: Vector3, scale: Vector3): Volume | null {
-    return createFromHandle<Volume>('Volume', inv<number>('0x0EB78C2B156635B1', _h(volumeType), f(pos.x), f(pos.y), f(pos.z), f(rot.x), f(rot.y), f(rot.z), f(scale.x), f(scale.y), f(scale.z), rai()));
+  static getVolumeAmountOfIndexedItems(pos: Vector3, radius: number, itemSet: ItemSet): any {
+    return inv<number>('0x2B32B11520626229', f(pos.x), f(pos.y), f(pos.z), f(radius), itemSet.handle);
   }
 
   /**
-   * @param pos 
-   * @param radius 
-   * @param p4 
-   * @param p5 
-   * @param flags 
-   * @returns
+   * @param p0 
+   * @param p1 
+   * @param p2 
    */
-  static isPointNearVolumeLockCenter(pos: Vector3, radius: number, p4: number, p5: number, flags: number): any {
-    return inv<number>('0x769BB7626B8CDB06', f(pos.x), f(pos.y), f(pos.z), f(radius), p4, p5, flags);
+  static N_0x3EFABB21E14A6BD1(p0: any, p1: any, p2: any): void {
+    inv<void>('0x3EFABB21E14A6BD1', p0, p1, p2);
   }
 
 }

package/src/namespaces/Water.ts

@@ -8,53 +8,6 @@ import { createFromHandle } from '../types/HandleRegistry';
 import { inv, rai, raf, ras, rav, pvi, pvf, pvv, pvii, pvfi, _h, f } from '../types/NativeAliases';
 
 export class Water {
-  /**
-   * @returns
-   */
-  static getWorldWaterType(): number {
-    return inv<number>('0x189739A7631C1867', rai());
-  }
-
-  /**
-   * @param pos 
-   * @returns height
-   */
-  static getWaterHeightNoWaves(pos: Vector3): [boolean, number] {
-    const result = inv<[boolean, number]>('0xDCF3690AA262C03F', f(pos.x), f(pos.y), f(pos.z), pvf(), rai());
-    return [!!result[0], result[1]];
-  }
-
-  /**
-   * Used in bounty1, fanale3, sean1 R* Scripts
-   *
-   * @param entity 
-   */
-  static N_0xB34A6009A0DB80B8(entity: Entity): void {
-    inv<void>('0xB34A6009A0DB80B8', entity.handle);
-  }
-
-  static enableWaterLookup(): void {
-    inv<void>('0x754616EC6965D1BF');
-  }
-
-  /**
-   * Checks against a global variable that is set by _SET_WORLD_WATER_TYPE. If that is set to one it will fail. Likely not the only issue but part of it.
-   *
-   * @param pos 
-   * @returns height
-   */
-  static getWaterHeight(pos: Vector3): [boolean, number] {
-    const result = inv<[boolean, number]>('0xFCA8B23F28813F69', f(pos.x), f(pos.y), f(pos.z), pvf(), rai());
-    return [!!result[0], result[1]];
-  }
-
-  /**
-   * Only used in fishing_core R* Script
-   */
-  static N_0xA33F5069B0CB89B8(): void {
-    inv<void>('0xA33F5069B0CB89B8');
-  }
-
   /**
    * Only used in native_son1 R* Script: p1 = 1
    *
@@ -172,4 +125,51 @@ export class Water {
     inv<void>('0x754616EC6965D1FB');
   }
 
+  /**
+   * @returns
+   */
+  static getWorldWaterType(): number {
+    return inv<number>('0x189739A7631C1867', rai());
+  }
+
+  /**
+   * @param pos 
+   * @returns height
+   */
+  static getWaterHeightNoWaves(pos: Vector3): [boolean, number] {
+    const result = inv<[boolean, number]>('0xDCF3690AA262C03F', f(pos.x), f(pos.y), f(pos.z), pvf(), rai());
+    return [!!result[0], result[1]];
+  }
+
+  /**
+   * Used in bounty1, fanale3, sean1 R* Scripts
+   *
+   * @param entity 
+   */
+  static N_0xB34A6009A0DB80B8(entity: Entity): void {
+    inv<void>('0xB34A6009A0DB80B8', entity.handle);
+  }
+
+  static enableWaterLookup(): void {
+    inv<void>('0x754616EC6965D1BF');
+  }
+
+  /**
+   * Checks against a global variable that is set by _SET_WORLD_WATER_TYPE. If that is set to one it will fail. Likely not the only issue but part of it.
+   *
+   * @param pos 
+   * @returns height
+   */
+  static getWaterHeight(pos: Vector3): [boolean, number] {
+    const result = inv<[boolean, number]>('0xFCA8B23F28813F69', f(pos.x), f(pos.y), f(pos.z), pvf(), rai());
+    return [!!result[0], result[1]];
+  }
+
+  /**
+   * Only used in fishing_core R* Script
+   */
+  static N_0xA33F5069B0CB89B8(): void {
+    inv<void>('0xA33F5069B0CB89B8');
+  }
+
 }