Merge pull request #306 from runejs/fix/item-swapping

Fixing item swapping and moving functionality

Author: Tynarus

package-lock.json

@@ -28,22 +28,17 @@
     "author": "Tynarus",
     "license": "GPL-3.0",
     "dependencies": {
-        "@hapi/joi": "^16.1.8",
         "@runejs/core": "^1.3.2",
         "@runejs/filestore": "^0.13.3",
         "@runejs/login-server": "^1.1.0",
         "@runejs/update-server": "^1.1.1",
-        "bcrypt": "^5.0.0",
         "bigi": "^1.4.2",
-        "body-parser": "^1.19.0",
-        "crc-32": "^1.2.0",
-        "express": "^4.17.1",
         "js-yaml": "^3.13.1",
         "json5": "^2.1.3",
         "lodash": "^4.17.15",
         "quadtree-lib": "^1.0.9",
-        "rxjs": "^7.0.0-beta.8",
-        "source-map-support": "^0.5.16",
+        "rxjs": "^7.0.0",
+        "source-map-support": "^0.5.19",
         "ts-node": "^9.1.1",
         "tslib": "^2.1.0",
         "typescript": "^4.2.3",
@@ -58,22 +53,19 @@
         "@babel/preset-env": "^7.10.2",
         "@babel/preset-typescript": "^7.10.1",
         "@halkeye/tscpaths": "0.0.9",
-        "@types/body-parser": "^1.17.1",
-        "@types/express": "^4.17.2",
-        "@types/hapi__joi": "^16.0.6",
         "@types/js-yaml": "^3.12.1",
         "@types/json5": "0.0.30",
         "@types/lodash": "^4.14.149",
         "@types/node": "^14.14.37",
         "@types/uuid": "^3.4.6",
         "@types/yargs": "^13.0.4",
-        "@typescript-eslint/eslint-plugin": "^4.6.0",
-        "@typescript-eslint/eslint-plugin-tslint": "^4.6.0",
-        "@typescript-eslint/parser": "^4.6.0",
+        "@typescript-eslint/eslint-plugin": "^4.22.0",
+        "@typescript-eslint/eslint-plugin-tslint": "^4.22.0",
+        "@typescript-eslint/parser": "^4.22.0",
         "babel-plugin-module-resolver": "^4.0.0",
         "chokidar": "^3.4.3",
         "concurrently": "^5.1.0",
-        "eslint": "^7.12.1",
+        "eslint": "^7.25.0",
         "mkdirp": "^1.0.4",
         "nodemon": "^2.0.6",
         "rimraf": "^3.0.2",

package.json

@@ -1,7 +1,7 @@
 import uuidv4 from 'uuid/v4';
 import { lastValueFrom, Subscription, timer } from 'rxjs';
 import { Actor } from '@engine/world/actor/actor';
-import { ActionHook } from '@engine/world/action/hooks/index';
+import { ActionHook } from '@engine/world/action';
 import { World } from '@engine/world';
 import { logger } from '@runejs/core';
 import { Player } from '@engine/world/actor/player/player';

src/game-engine/world/action/hooks/task.ts

@@ -143,7 +143,7 @@ export class ActionPipeline {
     }
 
     private async runActionHandler(actionHandler: any, ...args: any[]): Promise<void> {
-        const runnableHooks: RunnableHooks | null | undefined = actionHandler(...args);
+        const runnableHooks: RunnableHooks | null | undefined = await actionHandler(...args);
 
         if(!runnableHooks?.hooks || runnableHooks.hooks.length === 0) {
             return;

src/game-engine/world/action/index.ts

@@ -43,13 +43,13 @@ export interface ItemSwapAction {
  * @param toSlot
  * @param widget
  */
-const itemSwapActionPipe = async (player: Player, fromSlot: number, toSlot: number, widget: {
-    widgetId: number; containerId: number; }): Promise<RunnableHooks<ItemSwapAction>> => {
+const itemSwapActionPipe = (player: Player, fromSlot: number, toSlot: number,
+                            widget: { widgetId: number, containerId: number }): RunnableHooks<ItemSwapAction> => {
     const matchingHooks = getActionHooks<ItemSwapActionHook>('item_swap')
         .filter(plugin => numberHookFilter(plugin.widgetId || plugin.widgetIds, widget.widgetId));
 
     if(!matchingHooks || matchingHooks.length === 0) {
-        await player.sendMessage(`Unhandled Swap Items action: widget[${widget.widgetId}] container[${widget.containerId}] fromSlot[${fromSlot} toSlot${toSlot}`);
+        player.sendMessage(`Unhandled Swap Items action: widget[${widget.widgetId}] container[${widget.containerId}] fromSlot[${fromSlot} toSlot${toSlot}`);
         return null;
     }
 

src/game-engine/world/action/item-swap.action.ts

@@ -44,13 +44,13 @@ export interface MoveItemAction {
  * @param toSlot
  * @param widget
  */
-const moveItemActionPipe = async (player: Player, fromSlot: number, toSlot: number,
-                                  widget: { widgetId: number, containerId: number }): Promise<RunnableHooks<MoveItemAction>> => {
+const moveItemActionPipe = (player: Player, fromSlot: number, toSlot: number,
+                            widget: { widgetId: number, containerId: number }): RunnableHooks<MoveItemAction> => {
     const matchingHooks = getActionHooks<MoveItemActionHook>('move_item')
         .filter(plugin => numberHookFilter(plugin.widgetId || plugin.widgetIds, widget.widgetId));
 
     if(!matchingHooks || matchingHooks.length === 0) {
-        await player.sendMessage(`Unhandled Move Item action: widget[${widget.widgetId}] container[${widget.containerId}] fromSlot[${fromSlot} toSlot${toSlot}`);
+        player.sendMessage(`Unhandled Move Item action: widget[${widget.widgetId}] container[${widget.containerId}] fromSlot[${fromSlot} toSlot${toSlot}`);
         return null;
     }
 

src/game-engine/world/action/move-item.action.ts

@@ -5,7 +5,7 @@ import { widgetInteractionActionHandler } from '@engine/world/action/widget-inte
  */
 export const action: widgetInteractionActionHandler = (details) => {
     const { player, widgetId, childId } = details;
-    player.interfaceState.closeWidget(widgetId, childId);
+    player.interfaceState.closeWidget('chatbox', widgetId, childId);
 };
 
 export default {

src/plugins/dialogue/item-selection.plugin.ts

@@ -14,7 +14,7 @@ const widgetIds = [
  * Handles a level-up dialogue action.
  */
 export const handler: widgetInteractionActionHandler = ({ player }) =>
-    player.interfaceState.closeChatOverlayWidget();
+    player.interfaceState.closeWidget('chatbox');
 
 export default {
     pluginId: 'rs:close_level_up_message',