@pma-network/fivem-server 0.0.15 → 0.0.16

package/package.json

@@ -5,7 +5,7 @@
     "Dillon Skaggs <AvarianKnight>"
   ],
   "type": "module",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "files": [
     "./**/*.js",
     "./**/*.d.ts"

package/shared-server/class/CommonPMAPlayer.d.ts

@@ -3,7 +3,7 @@ import type { CommonAbstractPMAPlayer } from "../types/CommonAbstractPMAPlayer";
 import type { CommonNotificationVariant, CommonPMAPartialNotification } from "../types/CommonNotifications";
 import type { CallSign, ItemName, PlayerJob, PlayerUID } from "../types/SharedTypes";
 export declare class CommonPMAPlayer extends Player implements CommonAbstractPMAPlayer {
-    #private;
+    protected pma_player: CommonAbstractPMAPlayer | null;
     /**
      * Creates the player from the ScRT msgpack'd class
      */
@@ -31,7 +31,7 @@ export declare class CommonPMAPlayer extends Player implements CommonAbstractPMA
     get_log_name(): string;
     get_item(item_name: ItemName): unknown;
     add_item(item_name: ItemName, quantity: number): unknown;
-    remove_item(item_name: ItemName, quantity: number): void;
+    remove_item(item_name: ItemName, quantity: number): unknown;
     has_enough_of_item(item_name: ItemName, quantity: number): boolean;
     get_job(): PlayerJob;
     set_job(job_name: string, rank: number): void;

package/shared-server/class/CommonPMAPlayer.js

@@ -1,7 +1,6 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 import { Player } from "@nativewrappers/server";
-import { framework_name } from "../utils/FrameworkName";
 import { pma_get_player_from_id } from "../utils/GlobalOverrides";
 class CommonPMAPlayer extends Player {
   static {
@@ -10,7 +9,7 @@ class CommonPMAPlayer extends Player {
   // This will get lazy-initialized whenever we actually call a function that needs it,
   // this will make sure we don't pay the un-needed serialize cost if we're only using this for
   // basic nativewrappers types
-  #pma_player = null;
+  pma_player = null;
   /**
    * Creates the player from the ScRT msgpack'd class
    */
@@ -36,15 +35,15 @@ class CommonPMAPlayer extends Player {
     if (typeof source !== "number") {
       const ply = source;
       super(ply.source);
-      this.#pma_player = ply;
+      this.pma_player = ply;
     } else {
       super(source);
     }
   }
   // Ensure we initialize the player whenever we're doing something that needs it.
   ensure_init() {
-    if (!this.#pma_player) {
-      this.#pma_player = globalThis.pma_get_player_from_id ? (
+    if (!this.pma_player) {
+      this.pma_player = globalThis.pma_get_player_from_id ? (
         // @ts-ignore: we override this in GlobalOverrides
         globalThis.pma_get_player_from_id(this.Source)
       ) : pma_get_player_from_id(this.Source);
@@ -56,7 +55,7 @@ class CommonPMAPlayer extends Player {
    */
   is_player_valid() {
     this.ensure_init();
-    return this.#pma_player !== null;
+    return this.pma_player !== null;
   }
   send_notification(title, description, variant = "default", duration = 5e3) {
     const noti = {
@@ -71,71 +70,71 @@ class CommonPMAPlayer extends Player {
   }
   get_sex() {
     this.ensure_init();
-    return this.#pma_player.get_sex();
+    return this.pma_player.get_sex();
   }
   get_height() {
     this.ensure_init();
-    return this.#pma_player.get_height();
+    return this.pma_player.get_height();
   }
   get_dob() {
     this.ensure_init();
-    return this.#pma_player.get_dob();
+    return this.pma_player.get_dob();
   }
   get_unique_id() {
     this.ensure_init();
-    return this.#pma_player.get_unique_id();
+    return this.pma_player.get_unique_id();
   }
   get_call_sign() {
     this.ensure_init();
-    return this.#pma_player.get_call_sign();
+    return this.pma_player.get_call_sign();
   }
   get_character_name() {
     this.ensure_init();
-    return this.#pma_player.get_character_name();
+    return this.pma_player.get_character_name();
   }
   get_log_name() {
     this.ensure_init();
-    return this.#pma_player.get_character_name();
+    return this.pma_player.get_character_name();
   }
   get_item(item_name) {
     this.ensure_init();
-    return this.#pma_player.get_item(item_name);
+    return this.pma_player.get_item(item_name);
   }
   add_item(item_name, quantity) {
     this.ensure_init();
-    return this.#pma_player.add_item(item_name, quantity);
+    return this.pma_player.add_item(item_name, quantity);
   }
   remove_item(item_name, quantity) {
     this.ensure_init();
-    return this.#pma_player.remove_item(item_name, quantity);
+    return this.pma_player.remove_item(item_name, quantity);
   }
   has_enough_of_item(item_name, quantity) {
     this.ensure_init();
-    return this.#pma_player.has_enough_of_item(item_name, quantity);
+    return this.pma_player.has_enough_of_item(item_name, quantity);
   }
   get_job() {
     this.ensure_init();
-    return this.#pma_player.get_job();
+    return this.pma_player.get_job();
   }
   set_job(job_name, rank) {
     this.ensure_init();
-    return this.#pma_player.set_job(job_name, rank);
+    return this.pma_player.set_job(job_name, rank);
   }
   get_bank() {
     this.ensure_init();
-    return this.#pma_player.get_bank();
+    return this.pma_player.get_bank();
   }
   add_to_bank(positive_amount) {
     this.ensure_init();
-    return this.#pma_player.add_to_bank(positive_amount);
+    return this.pma_player.add_to_bank(positive_amount);
   }
   remove_from_bank(negative_amount) {
     this.ensure_init();
-    return this.#pma_player.remove_from_bank(negative_amount);
+    return this.pma_player.remove_from_bank(negative_amount);
   }
   save() {
     this.ensure_init();
-    return this.#pma_player.save();
+    return this.pma_player.save();
   }
 }
 export {

package/shared-server/types/CommonAbstractPMAPlayer.d.ts

@@ -21,7 +21,7 @@ export declare abstract class CommonAbstractPMAPlayer {
      * Removes the item with {@param item_name} from the players inventory
      * @throws This will throw an error if there wasn't enough {@param quantity} in the players inventory, you should use use has_enough_of_item to check before calling
      */
-    abstract remove_item(item_name: ItemName, quantity: number): void;
+    abstract remove_item(item_name: ItemName, quantity: number): unknown;
     /**
      * Checks if the player has enough of {@param item_name}
      * @returns `true` if they had enough {@param quantity}, `false` otherwise

package/shared-server/utils/GlobalOverrides.d.ts

@@ -1,3 +1,4 @@
 import type { CommonPMAPlayer } from "../class/CommonPMAPlayer";
 import type { Source } from "../types/SharedTypes";
 export declare function pma_get_player_from_id(source: Source): CommonPMAPlayer;
+export declare function pma_get_inventory_from_id(source: Source): CommonPMAPlayer;

package/shared-server/utils/GlobalOverrides.js

@@ -6,6 +6,12 @@ function pma_get_player_from_id(source) {
 }
 __name(pma_get_player_from_id, "pma_get_player_from_id");
 globalThis.pma_get_player_from_id = pma_get_player_from_id;
+function pma_get_inventory_from_id(source) {
+  return exports[framework_name].get_inventory(source);
+}
+__name(pma_get_inventory_from_id, "pma_get_inventory_from_id");
+globalThis.pma_get_inventory_from_id = pma_get_inventory_from_id;
 export {
+  pma_get_inventory_from_id,
   pma_get_player_from_id
 };