Added missing static IDs

Added Subscriber.ts which is passed to ActionBus instead of functions.

Author: robere2

actions/ActionBus.ts

@@ -1,4 +1,5 @@
 import Action from "./Action";
+import Subscriber from "./Subscriber";
 
 /**
  * The ActionBus is the bus to allow different elements of your program to be notified when a new Action is published,
@@ -7,51 +8,47 @@ import Action from "./Action";
 class ActionBus {
 
     /**
-     * The subscribed functions. Map of Action IDs to all the subscribed Functions for that Action ID.
+     * The subscribed Subscribers. Map of Action IDs to all the Subscribers for that Action ID.
      */
-    private subscribers : Record<number, Function[]> = {}
+    private subscribers : Record<number, Subscriber[]> = {}
 
     /**
-     * Subscribe to listen for new Actions of a certain type to come in, at which point the passed function
-     * will be called. The same Function can be subscribed multiple times.
+     * Subscribe to listen for new Actions of a certain type to come in, at which point the passed Subscriber
+     * will be notified. The same Subscriber can be subscribed multiple times.
      * @param action {typeof Action|number} The Action type to listen for. Can be an Action class, or an Action ID.
-     * @param fn {Function} The function to be called when the Action is received. Should be non-null. Should take at
-     * least one argument, which is the Action. Further arbitrary "rest" arguments can be passed to {@link publish},
-     * which can be received by this function.
+     * @param sub {Subscriber} The Subscriber to be notified when the specified Action is published.
      * @returns {boolean} True if the subscriber is added successfully, false otherwise.
      */
-    public subscribe(action: typeof Action|number, fn: Function) : boolean {
-        if(action == null || fn == null) {
+    public subscribe(action: typeof Action|number, sub: Subscriber) : boolean {
+        if(action == null || sub == null) {
             return false
         }
         const actionId = typeof action == "number" ? action : action.id
         if(this.subscribers[actionId] == null) {
             this.subscribers[actionId] = []
         }
-        this.subscribers[actionId].push(fn)
+        this.subscribers[actionId].push(sub)
         return true
     }
 
     /**
-     * Unsubscribe to stop listening for a type of Action on a specific Function. Will only unsubscribe the Function
-     * once, so if the passed Function was subscribed multiple times, you will need to unsubscribe multiple times.
+     * Unsubscribe to stop listening for a type of Action on a specific Subscriber. Will only unsubscribe the Subscriber
+     * once, so if the passed Subscriber was subscribed multiple times, you will need to unsubscribe multiple times.
      * @param action {typeof Action|number} The Action type to listen for. Can be an Action class, or an Action ID.
-     * @param fn {Function} The function to be called when the Action is received. Should be non-null. Should take at
-     * least one argument, which is the Action. Further arbitrary "rest" arguments can be passed to {@link publish},
-     * which can be received by this function.
+     * @param sub {Subscriber} The Subscriber to be notified when the specified Action is published.
      * @returns {boolean} True if the subscriber is added successfully, false otherwise. Returns true if the
      * passed Function was never subscribed to the passed Action in the first place.
      */
-    public unsubscribe(action: typeof Action|number, fn: Function) : boolean {
-        if(action == null || fn == null) {
+    public unsubscribe(action: typeof Action|number, sub: Subscriber) : boolean {
+        if(action == null || sub == null) {
             return true
         }
 
         const actionId = typeof action == "number" ? action : action.id
         if(this.subscribers[actionId] == null) {
             return true
         }
-        const index = this.subscribers[actionId].indexOf(fn)
+        const index = this.subscribers[actionId].indexOf(sub)
         if(index < 0 || index >= this.subscribers[actionId].length) {
             return true
         }
@@ -61,16 +58,16 @@ class ActionBus {
     }
 
     /**
-     * Publish a new Action to this ActionBus, notifying all Functions subscribed to the type of Action published.
+     * Publish a new Action to this ActionBus, notifying all Subscribers subscribed to the type of Action published.
      * @param action {Action} The action to publish. Should be non-null.
-     * @param args {Object[]} Arbitrary arguments to pass to the subscriber
+     * @param args {Object[]} Arbitrary arguments to pass to the subscriber.
      */
-    public publish(action: Action, ... args: Object[]) : void {
+    public async publish(action: Action, ... args: Object[]) : Promise<void> {
         if(action == null || this.subscribers[action.id] == null) {
             return
         }
         for(let i = 0; i < this.subscribers[action.id].length; i++) {
-            this.subscribers[action.id][i](action, ...args)
+            await this.subscribers[action.id][i].run(action, ...args)
         }
     }
 }

actions/Subscriber.ts

@@ -0,0 +1,16 @@
+import Action from "./Action";
+
+/**
+ * Subscribers can be subscribed to the ActionBus to be notified when a specific Action is published to the bus.
+ */
+abstract class Subscriber {
+    /**
+     * Run function called when the ActionBus this Subscriber is called to notifies this Subscriber of a new Action.
+     * @param action {Action} The Action that caused this Subscriber to be notified.
+     * @param args {Object[]} Arbitrary arguments provided by the ActionBus publisher.
+     */
+    abstract async run(action: Action, ... args: Object[]): Promise<void>
+}
+
+export default Subscriber
+

actions/clientbound/AuthBeginHandshakeAction.ts

@@ -10,6 +10,8 @@ import {Buffer} from 'buffer'
  */
 class AuthBeginHandshakeAction extends Action {
 
+    static id = 26
+
     /**
 	 * Create a new AuthBeginHandshakeAction.
 	 * @param handshakeToken {string} Handshake token to send

actions/clientbound/AuthCompleteAction.ts

@@ -11,6 +11,8 @@ import {Buffer} from 'buffer'
  */
 class AuthCompleteAction extends Action {
 
+    static id = 28
+
     /**
      * Create a new AuthCompleteAction.
      * @param sessionToken {string} Session token to send

actions/clientbound/DisableModAction.ts

@@ -10,6 +10,8 @@ import {Buffer} from 'buffer'
  */
 class DisableModAction extends Action {
 
+    static id = 2
+
     /**
 	 * Create a new DisableModAction.
      * @param reason {string} The reason the mod was disabled

actions/clientbound/EnableModAction.ts

@@ -6,6 +6,8 @@ import Action from '../Action'
  */
 class EnableModAction extends Action {
 
+    static id = 1
+
     /**
 	 * Create a new EnableModAction.
 	 */

actions/clientbound/OpenGuiAction.ts

@@ -11,6 +11,8 @@ import {Buffer} from 'buffer'
  */
 class OpenGuiAction extends Action {
 
+    static id = 10
+
     /**
      * Create a new OpenGuiAction.
      * @param classpath {string} The path of the class to open as a GUI.

actions/clientbound/OpenScreenAction.ts

@@ -10,6 +10,8 @@ import {Buffer} from 'buffer'
  */
 class OpenScreenAction extends Action {
 
+    static id = 11
+
     /**
 	 * Create a new OpenScreenAction.
 	 * @param screenName {string} The name of the screen that the client should open.

actions/clientbound/RefreshCacheAction.ts

@@ -8,6 +8,8 @@ import Action from '../Action'
  */
 class RefreshCacheAction extends Action {
 
+    static id = 12
+
     /**
 	 * Create a new RefreshCacheAction.
 	 */

actions/clientbound/ResetConfigAction.ts

@@ -6,6 +6,8 @@ import Action from '../Action'
  */
 class ResetConfigAction extends Action {
 
+    static id = 5
+
     /**
 	 * Create a new ResetConfigAction.
 	 */