@nativewrappers/redm-codegen 0.0.3 → 0.0.4

package/src/namespaces/Posse.ts

@@ -7,75 +7,70 @@ import { inv, rai, raf, ras, rav, pvi, pvf, pvv, pvii, pvfi, _h, f } from '../ty
 
 export class Posse {
   /**
-   * @param p0 
    * @returns
    */
-  static N_0xC08DEF658B2E51DA(p0: any): any {
-    return inv<number>('0xC08DEF658B2E51DA', p0);
+  static N_0xC08DFF658B2E51DA(): any {
+    return inv<number>('0xC08DFF658B2E51DA');
   }
 
   /**
-   * @param p0 
-   * @param p1 
    * @returns
    */
-  static N_0xC08EFF658B2E51DB(p0: any, p1: any): any {
-    return inv<number>('0xC08EFF658B2E51DB', p0, p1);
+  static getPosseMembershipCount(): number {
+    return inv<number>('0xC088FF658B2E51DA', rai());
   }
 
   /**
    * @param p0 
    * @param p1 
-   * @param p2 
-   * @param p3 
    * @returns
    */
-  static N_0xC394FF658B2E55DA(p0: any, p1: any, p2: any, p3: any): any {
-    return inv<number>('0xC394FF658B2E55DA', p0, p1, p2, p3);
+  static N_0xC184FF658B2E55DA(p0: any, p1: any): any {
+    return inv<number>('0xC184FF658B2E55DA', p0, p1);
   }
 
   /**
    * @param p0 
+   * @param p1 
+   * @param p2 
    * @returns
    */
-  static N_0xC084FF658B2E54DA(p0: any): any {
-    return inv<number>('0xC084FF658B2E54DA', p0);
+  static N_0xC09CFF658B2E51DA(p0: any, p1: any, p2: any): any {
+    return inv<number>('0xC09CFF658B2E51DA', p0, p1, p2);
   }
 
   /**
+   * @param p0 
+   * @param p1 
    * @returns
    */
-  static N_0xC08FFF658B2E51DA(): any {
-    return inv<number>('0xC08FFF658B2E51DA');
+  static N_0xC084FF658B2E55DA(p0: any, p1: any): any {
+    return inv<number>('0xC084FF658B2E55DA', p0, p1);
   }
 
   /**
    * @param p0 
-   * @param p1 
-   * @param p2 
    * @returns
    */
-  static N_0xC084FF658B2E81DA(p0: any, p1: any, p2: any): any {
-    return inv<number>('0xC084FF658B2E81DA', p0, p1, p2);
+  static N_0xC08BFF658B2E51DA(p0: any): any {
+    return inv<number>('0xC08BFF658B2E51DA', p0);
   }
 
   /**
    * @param p0 
-   * @param p1 
    * @returns
    */
-  static N_0xC089FF658B2E51DA(p0: any, p1: any): any {
-    return inv<number>('0xC089FF658B2E51DA', p0, p1);
+  static N_0xC086FF658B2E51DA(p0: any): any {
+    return inv<number>('0xC086FF658B2E51DA', p0);
   }
 
   /**
    * @param p0 
    * @param p1 
-   * @param p2 
    * @returns
    */
-  static N_0xC06CFF658B2E51DA(p0: any, p1: any, p2: any): any {
-    return inv<number>('0xC06CFF658B2E51DA', p0, p1, p2);
+  static N_0xC08CFF658B2E51DA(p0: any, p1: any): any {
+    return inv<number>('0xC08CFF658B2E51DA', p0, p1);
   }
 
   /**
@@ -110,136 +105,141 @@ export class Posse {
 
   /**
    * @param p0 
-   * @param p1 
    * @returns
    */
-  static N_0xC087FF658B2E51DA(p0: any, p1: any): any {
-    return inv<number>('0xC087FF658B2E51DA', p0, p1);
+  static N_0xC08DEF658B2E51DA(p0: any): any {
+    return inv<number>('0xC08DEF658B2E51DA', p0);
   }
 
   /**
    * @param p0 
    * @param p1 
-   * @param p2 
    * @returns
    */
-  static N_0xC284FF658B2E55DA(p0: any, p1: any, p2: any): any {
-    return inv<number>('0xC284FF658B2E55DA', p0, p1, p2);
+  static N_0xC08EFF658B2E51DB(p0: any, p1: any): any {
+    return inv<number>('0xC08EFF658B2E51DB', p0, p1);
   }
 
   /**
    * @param p0 
+   * @param p1 
+   * @param p2 
+   * @param p3 
    * @returns
    */
-  static N_0xC08FFF658B2E51DB(p0: any): any {
-    return inv<number>('0xC08FFF658B2E51DB', p0);
+  static N_0xC394FF658B2E55DA(p0: any, p1: any, p2: any, p3: any): any {
+    return inv<number>('0xC394FF658B2E55DA', p0, p1, p2, p3);
   }
 
   /**
    * @param p0 
-   * @param p1 
-   * @param p2 
    * @returns
    */
-  static N_0xC084FF658B2E71DA(p0: any, p1: any, p2: any): any {
-    return inv<number>('0xC084FF658B2E71DA', p0, p1, p2);
+  static N_0xC084FF658B2E54DA(p0: any): any {
+    return inv<number>('0xC084FF658B2E54DA', p0);
   }
 
   /**
    * @returns
    */
-  static N_0xC08DFF658B2E51DA(): any {
-    return inv<number>('0xC08DFF658B2E51DA');
+  static N_0xC084FF658B2E53DA(): any {
+    return inv<number>('0xC084FF658B2E53DA');
   }
 
   /**
+   * @param p0 
    * @returns
    */
-  static getPosseMembershipCount(): number {
-    return inv<number>('0xC088FF658B2E51DA', rai());
+  static N_0xC084FF658B2E61DA(p0: any): any {
+    return inv<number>('0xC084FF658B2E61DA', p0);
   }
 
   /**
    * @param p0 
-   * @param p1 
    * @returns
    */
-  static N_0xC184FF658B2E55DA(p0: any, p1: any): any {
-    return inv<number>('0xC184FF658B2E55DA', p0, p1);
+  static N_0xC084FF658B2E52DA(p0: any): any {
+    return inv<number>('0xC084FF658B2E52DA', p0);
   }
 
   /**
    * @param p0 
-   * @param p1 
-   * @param p2 
-   * @returns
    */
-  static N_0xC09CFF658B2E51DA(p0: any, p1: any, p2: any): any {
-    return inv<number>('0xC09CFF658B2E51DA', p0, p1, p2);
+  static N_0xC484FF658B2E55DA(p0: any): void {
+    inv<void>('0xC484FF658B2E55DA', p0);
   }
 
   /**
-   * @param p0 
-   * @param p1 
    * @returns
    */
-  static N_0xC084FF658B2E55DA(p0: any, p1: any): any {
-    return inv<number>('0xC084FF658B2E55DA', p0, p1);
+  static N_0xC08FFF658B2E51DA(): any {
+    return inv<number>('0xC08FFF658B2E51DA');
   }
 
   /**
    * @param p0 
+   * @param p1 
+   * @param p2 
    * @returns
    */
-  static N_0xC08BFF658B2E51DA(p0: any): any {
-    return inv<number>('0xC08BFF658B2E51DA', p0);
+  static N_0xC084FF658B2E81DA(p0: any, p1: any, p2: any): any {
+    return inv<number>('0xC084FF658B2E81DA', p0, p1, p2);
   }
 
   /**
    * @param p0 
+   * @param p1 
    * @returns
    */
-  static N_0xC086FF658B2E51DA(p0: any): any {
-    return inv<number>('0xC086FF658B2E51DA', p0);
+  static N_0xC089FF658B2E51DA(p0: any, p1: any): any {
+    return inv<number>('0xC089FF658B2E51DA', p0, p1);
   }
 
   /**
    * @param p0 
    * @param p1 
+   * @param p2 
    * @returns
    */
-  static N_0xC08CFF658B2E51DA(p0: any, p1: any): any {
-    return inv<number>('0xC08CFF658B2E51DA', p0, p1);
+  static N_0xC06CFF658B2E51DA(p0: any, p1: any, p2: any): any {
+    return inv<number>('0xC06CFF658B2E51DA', p0, p1, p2);
   }
 
   /**
+   * @param p0 
+   * @param p1 
    * @returns
    */
-  static N_0xC084FF658B2E53DA(): any {
-    return inv<number>('0xC084FF658B2E53DA');
+  static N_0xC087FF658B2E51DA(p0: any, p1: any): any {
+    return inv<number>('0xC087FF658B2E51DA', p0, p1);
   }
 
   /**
    * @param p0 
+   * @param p1 
+   * @param p2 
    * @returns
    */
-  static N_0xC084FF658B2E61DA(p0: any): any {
-    return inv<number>('0xC084FF658B2E61DA', p0);
+  static N_0xC284FF658B2E55DA(p0: any, p1: any, p2: any): any {
+    return inv<number>('0xC284FF658B2E55DA', p0, p1, p2);
   }
 
   /**
    * @param p0 
    * @returns
    */
-  static N_0xC084FF658B2E52DA(p0: any): any {
-    return inv<number>('0xC084FF658B2E52DA', p0);
+  static N_0xC08FFF658B2E51DB(p0: any): any {
+    return inv<number>('0xC08FFF658B2E51DB', p0);
   }
 
   /**
    * @param p0 
+   * @param p1 
+   * @param p2 
+   * @returns
    */
-  static N_0xC484FF658B2E55DA(p0: any): void {
-    inv<void>('0xC484FF658B2E55DA', p0);
+  static N_0xC084FF658B2E71DA(p0: any, p1: any, p2: any): any {
+    return inv<number>('0xC084FF658B2E71DA', p0, p1, p2);
   }
 
   /**

package/src/namespaces/Propset.ts

@@ -9,98 +9,6 @@ import { createFromHandle } from '../types/HandleRegistry';
 import { inv, rai, raf, ras, rav, pvi, pvf, pvv, pvii, pvfi, _h, f } from '../types/NativeAliases';
 
 export class Propset {
-  /**
-   * https://github.com/femga/rdr3_discoveries/blob/master/vehicles/vehicle_modding/vehicle_propsets.lua
-   *
-   * @param vehicle 
-   * @param propset 
-   */
-  static addAdditionalPropSetForVehicle(vehicle: Vehicle, propset: string | number): void {
-    inv<void>('0x75F90E4051CC084C', vehicle.handle, _h(propset));
-  }
-
-  /**
-   * @param vehicle 
-   * @returns
-   */
-  static getVehiclePropSet(vehicle: Vehicle): PropSet | null {
-    return createFromHandle<PropSet>('PropSet', inv<number>('0xCE2ACD6F602803E5', vehicle.handle, rai()));
-  }
-
-  /**
-   * @param p0 
-   */
-  static N_0x58E0B01D45CA7357(p0: any): void {
-    inv<void>('0x58E0B01D45CA7357', p0);
-  }
-
-  /**
-   * @param hash 
-   * @returns
-   */
-  static hasPropSetLoaded(hash: string | number): any {
-    return inv<number>('0x48A88FC684C55FDC', _h(hash));
-  }
-
-  /**
-   * @param vehicle 
-   * @returns
-   */
-  static doesVehicleHaveAnyPropSet(vehicle: Vehicle): any {
-    return inv<number>('0x53784CEA0159439B', vehicle.handle);
-  }
-
-  /**
-   * Example before/after deleting a train carriage's propset: https://imgur.com/a/qRNrIrK
-   *
-   * @param trainCarriage 
-   * @returns
-   */
-  static getTrainCarriagePropSet(trainCarriage: Entity): PropSet | null {
-    return createFromHandle<PropSet>('PropSet', inv<number>('0xCFC0BD09BB1B73FF', trainCarriage.handle, rai()));
-  }
-
-  /**
-   * @param vehicle 
-   * @returns
-   */
-  static getVehiclePropSetHash(vehicle: Vehicle): number {
-    return (inv<number>('0x36F69E7A22655653', vehicle.handle, rai())) & 0xFFFFFFFF;
-  }
-
-  /**
-   * @param vehicle 
-   * @returns
-   */
-  static isVehicleLightPropSetLoaded(vehicle: Vehicle): any {
-    return inv<number>('0x0790473EEE1977D3', vehicle.handle);
-  }
-
-  /**
-   * @param hash 
-   * @returns
-   */
-  static releasePropSet(hash: string | number): any {
-    return inv<number>('0xB1964A83B345B4AB', _h(hash));
-  }
-
-  /**
-   * @param propsetHash 
-   * @param pos 
-   * @returns
-   */
-  static getPropSetAtCoords(propsetHash: string | number, pos: Vector3): PropSet | null {
-    return createFromHandle<PropSet>('PropSet', inv<number>('0xC061E50F8D299F95', _h(propsetHash), f(pos.x), f(pos.y), f(pos.z), rai()));
-  }
-
-  /**
-   * @param vehicle 
-   * @returns
-   */
-  static isVehiclePropSetLoaded(vehicle: Vehicle): any {
-    return inv<number>('0x155B2FBE72D7D1D0', vehicle.handle);
-  }
-
   /**
    * @param vehicle 
    * @returns
@@ -282,4 +190,96 @@ export class Propset {
     return createFromHandle<PropSet>('PropSet', inv<number>('0x9609DBDDE18FAD8C', _h(hash), f(pos.x), f(pos.y), f(pos.z), entity.handle, f(p5), p6, p7, p8, rai()));
   }
 
+  /**
+   * https://github.com/femga/rdr3_discoveries/blob/master/vehicles/vehicle_modding/vehicle_propsets.lua
+   *
+   * @param vehicle 
+   * @param propset 
+   */
+  static addAdditionalPropSetForVehicle(vehicle: Vehicle, propset: string | number): void {
+    inv<void>('0x75F90E4051CC084C', vehicle.handle, _h(propset));
+  }
+
+  /**
+   * @param vehicle 
+   * @returns
+   */
+  static getVehiclePropSet(vehicle: Vehicle): PropSet | null {
+    return createFromHandle<PropSet>('PropSet', inv<number>('0xCE2ACD6F602803E5', vehicle.handle, rai()));
+  }
+
+  /**
+   * @param p0 
+   */
+  static N_0x58E0B01D45CA7357(p0: any): void {
+    inv<void>('0x58E0B01D45CA7357', p0);
+  }
+
+  /**
+   * @param hash 
+   * @returns
+   */
+  static hasPropSetLoaded(hash: string | number): any {
+    return inv<number>('0x48A88FC684C55FDC', _h(hash));
+  }
+
+  /**
+   * @param vehicle 
+   * @returns
+   */
+  static doesVehicleHaveAnyPropSet(vehicle: Vehicle): any {
+    return inv<number>('0x53784CEA0159439B', vehicle.handle);
+  }
+
+  /**
+   * Example before/after deleting a train carriage's propset: https://imgur.com/a/qRNrIrK
+   *
+   * @param trainCarriage 
+   * @returns
+   */
+  static getTrainCarriagePropSet(trainCarriage: Entity): PropSet | null {
+    return createFromHandle<PropSet>('PropSet', inv<number>('0xCFC0BD09BB1B73FF', trainCarriage.handle, rai()));
+  }
+
+  /**
+   * @param vehicle 
+   * @returns
+   */
+  static getVehiclePropSetHash(vehicle: Vehicle): number {
+    return (inv<number>('0x36F69E7A22655653', vehicle.handle, rai())) & 0xFFFFFFFF;
+  }
+
+  /**
+   * @param vehicle 
+   * @returns
+   */
+  static isVehicleLightPropSetLoaded(vehicle: Vehicle): any {
+    return inv<number>('0x0790473EEE1977D3', vehicle.handle);
+  }
+
+  /**
+   * @param hash 
+   * @returns
+   */
+  static releasePropSet(hash: string | number): any {
+    return inv<number>('0xB1964A83B345B4AB', _h(hash));
+  }
+
+  /**
+   * @param propsetHash 
+   * @param pos 
+   * @returns
+   */
+  static getPropSetAtCoords(propsetHash: string | number, pos: Vector3): PropSet | null {
+    return createFromHandle<PropSet>('PropSet', inv<number>('0xC061E50F8D299F95', _h(propsetHash), f(pos.x), f(pos.y), f(pos.z), rai()));
+  }
+
+  /**
+   * @param vehicle 
+   * @returns
+   */
+  static isVehiclePropSetLoaded(vehicle: Vehicle): any {
+    return inv<number>('0x155B2FBE72D7D1D0', vehicle.handle);
+  }
+
 }

package/src/namespaces/Shapetest.ts

@@ -8,6 +8,20 @@ import { createFromHandle } from '../types/HandleRegistry';
 import { inv, rai, raf, ras, rav, pvi, pvf, pvv, pvii, pvfi, _h, f } from '../types/NativeAliases';
 
 export class Shapetest {
+  /**
+   * Asynchronously starts a line-of-sight (raycast) world probe shape test. Use the handle with 0x3D87450E15D98694 or 0x65287525D951F6BE until it returns 0 or 2. p8 is a bit mask with bits 1, 2 and/or 4, relating to collider types; 4 should usually be used.
+   *
+   * @param pos1 
+   * @param pos2 
+   * @param flags 
+   * @param entity 
+   * @param p8 
+   * @returns
+   */
+  static startShapeTestLosProbe(pos1: Vector3, pos2: Vector3, flags: number, entity: Entity, p8: number): number {
+    return inv<number>('0x7EE9F5D83DD4F90E', f(pos1.x), f(pos1.y), f(pos1.z), f(pos2.x), f(pos2.y), f(pos2.z), flags, entity.handle, p8, rai());
+  }
+
   /**
    * Returns the result of a shape test: 0 if the handle is invalid, 1 if the shape test is still pending, or 2 if the shape test has completed, and the handle should be invalidated. When used with an asynchronous shape test, this native should be looped until returning 0 or 2, after which the handle is invalidated. enum eShapeTestStatus
    * {
@@ -102,18 +116,4 @@ export class Shapetest {
     return inv<number>('0xAA5B7C8309F73230', f(pos1.x), f(pos1.y), f(pos1.z), f(pos2.x), f(pos2.y), f(pos2.z), f(radius), flags, entity.handle, p9, rai());
   }
 
-  /**
-   * Asynchronously starts a line-of-sight (raycast) world probe shape test. Use the handle with 0x3D87450E15D98694 or 0x65287525D951F6BE until it returns 0 or 2. p8 is a bit mask with bits 1, 2 and/or 4, relating to collider types; 4 should usually be used.
-   *
-   * @param pos1 
-   * @param pos2 
-   * @param flags 
-   * @param entity 
-   * @param p8 
-   * @returns
-   */
-  static startShapeTestLosProbe(pos1: Vector3, pos2: Vector3, flags: number, entity: Entity, p8: number): number {
-    return inv<number>('0x7EE9F5D83DD4F90E', f(pos1.x), f(pos1.y), f(pos1.z), f(pos2.x), f(pos2.y), f(pos2.z), flags, entity.handle, p8, rai());
-  }
-
 }