@nativewrappers/redm-codegen 0.0.2 → 0.0.4

package/src/namespaces/Uiapps.ts

@@ -6,6 +6,44 @@ import { createFromHandle } from '../types/HandleRegistry';
 import { inv, rai, raf, ras, rav, pvi, pvf, pvv, pvii, pvfi, _h, f } from '../types/NativeAliases';
 
 export class Uiapps {
+  /**
+   * @param appName 
+   * @returns
+   */
+  static isUiappRunning(appName: string | null): boolean {
+    return inv<boolean>('0xDE4A9B35D028979F', appName, rai());
+  }
+
+  /**
+   * @returns
+   */
+  static isAnyUiappRunning(): any {
+    return inv<number>('0xDB30BEC7A7A5CBD3');
+  }
+
+  /**
+   * @returns
+   */
+  static isAnyUiappActive(): any {
+    return inv<number>('0xAC959AB99AAF3D9F');
+  }
+
+  /**
+   * @param appName 
+   * @param entry 
+   * @returns
+   */
+  static launchUiappWithEntry(appName: string | null, entry: string | null): number {
+    return inv<number>('0x7B2027BAC5C8EC89', appName, entry, rai());
+  }
+
+  /**
+   * @param appNameHash 
+   */
+  static closeUiappByHash(appNameHash: string | number): void {
+    inv<void>('0x2FF10C9C3F92277E', _h(appNameHash));
+  }
+
   /**
    * @param appName 
    */
@@ -25,7 +63,7 @@ export class Uiapps {
    * @param appNameHash 
    * @returns
    */
-  static getUiappCurrentActivityByHash(appNameHash: string | number): string | number {
+  static getUiappCurrentActivityByHash(appNameHash: string | number): number {
     return (inv<number>('0x96FD694FE5BE55DC', _h(appNameHash), rai())) & 0xFFFFFFFF;
   }
 
@@ -110,42 +148,4 @@ export class Uiapps {
     inv<void>('0xAD7B70F7230C5A12');
   }
 
-  /**
-   * @param appName 
-   * @returns
-   */
-  static isUiappRunning(appName: string | null): boolean {
-    return inv<boolean>('0xDE4A9B35D028979F', appName, rai());
-  }
-
-  /**
-   * @returns
-   */
-  static isAnyUiappRunning(): any {
-    return inv<number>('0xDB30BEC7A7A5CBD3');
-  }
-
-  /**
-   * @returns
-   */
-  static isAnyUiappActive(): any {
-    return inv<number>('0xAC959AB99AAF3D9F');
-  }
-
-  /**
-   * @param appName 
-   * @param entry 
-   * @returns
-   */
-  static launchUiappWithEntry(appName: string | null, entry: string | null): number {
-    return inv<number>('0x7B2027BAC5C8EC89', appName, entry, rai());
-  }
-
-  /**
-   * @param appNameHash 
-   */
-  static closeUiappByHash(appNameHash: string | number): void {
-    inv<void>('0x2FF10C9C3F92277E', _h(appNameHash));
-  }
-
 }

package/src/namespaces/Uistickyfeed.ts

@@ -6,29 +6,6 @@ import { createFromHandle } from '../types/HandleRegistry';
 import { inv, rai, raf, ras, rav, pvi, pvf, pvv, pvii, pvfi, _h, f } from '../types/NativeAliases';
 
 export class Uistickyfeed {
-  /**
-   * stickyFeedChannel: https://github.com/Halen84/RDR3-Native-Flags-And-Enums/tree/main/eUIStickyFeedChannel
-   *
-   * @param stickyFeedChannel 
-   * @returns
-   */
-  static uiStickyFeedIsChannelActive(stickyFeedChannel: number): any {
-    return inv<number>('0xC5C395C60B542A3C', stickyFeedChannel);
-  }
-
-  /**
-   * Seems to only update _UI_STICKY_FEED_CREATE_ERROR_MESSAGE(0x9F2CC2439A04E7BA) and _UI_STICKY_FEED_CREATE_DEATH_FAIL_MESSAGE(0x815C4065AE6E6071) message.
-   * Example: https://pastebin.com/nDrJyWq2
-   *
-   * @param msgId 
-   * @param p2 
-   * @returns p1
-   */
-  static uiStickyFeedUpdateMessage(msgId: number, p2: boolean): number {
-    const result = inv<number>('0xBC6F454E310124DA', msgId, pvi(), p2);
-    return result;
-  }
-
   /**
    * Returns state of sticky feed message, see 0x59FA676177DBE4C9
    *
@@ -86,4 +63,27 @@ export class Uistickyfeed {
     inv<void>('0x00A15B94CBA4F76F', msgId);
   }
 
+  /**
+   * stickyFeedChannel: https://github.com/Halen84/RDR3-Native-Flags-And-Enums/tree/main/eUIStickyFeedChannel
+   *
+   * @param stickyFeedChannel 
+   * @returns
+   */
+  static uiStickyFeedIsChannelActive(stickyFeedChannel: number): any {
+    return inv<number>('0xC5C395C60B542A3C', stickyFeedChannel);
+  }
+
+  /**
+   * Seems to only update _UI_STICKY_FEED_CREATE_ERROR_MESSAGE(0x9F2CC2439A04E7BA) and _UI_STICKY_FEED_CREATE_DEATH_FAIL_MESSAGE(0x815C4065AE6E6071) message.
+   * Example: https://pastebin.com/nDrJyWq2
+   *
+   * @param msgId 
+   * @param p2 
+   * @returns p1
+   */
+  static uiStickyFeedUpdateMessage(msgId: number, p2: boolean): number {
+    const result = inv<number>('0xBC6F454E310124DA', msgId, pvi(), p2);
+    return result;
+  }
+
 }

package/src/namespaces/VehicleStatics.ts

@@ -534,7 +534,7 @@ export class VehicleStatics {
    * @param trainCarIndex 
    * @returns
    */
-  static getTrainModelFromTrainConfigByCarIndex(trainConfig: string | number, trainCarIndex: number): string | number {
+  static getTrainModelFromTrainConfigByCarIndex(trainConfig: string | number, trainCarIndex: number): number {
     return (inv<number>('0x8DF5F6A19F99F0D5', _h(trainConfig), trainCarIndex, rai())) & 0xFFFFFFFF;
   }
 
@@ -858,7 +858,7 @@ export class VehicleStatics {
    * @param stationIndex 
    * @returns
    */
-  static N_0x9CC94A948EAF5372(trackIndex: number, stationIndex: number): string | number {
+  static N_0x9CC94A948EAF5372(trackIndex: number, stationIndex: number): number {
     return (inv<number>('0x9CC94A948EAF5372', trackIndex, stationIndex, rai())) & 0xFFFFFFFF;
   }
 

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');
+  }
+
 }