Merge pull request #26 from rune-js/restructure

Restructuring a lot of packages and files.

package.json

@@ -5,7 +5,7 @@
  "main": "src/game-server.ts",
  "scripts": {
  "server": "npm start",
- "start": "ts-node src/main.ts",
+ "start": "ts-node -r tsconfig-paths/register src/main.ts",
  "fake-players": "npm start -- --fakePlayers"
  },
  "repository": {
@@ -40,6 +40,7 @@
  "@types/js-yaml": "^3.12.1",
  "@types/node": "^12.12.6",
  "@types/uuid": "^3.4.6",
- "@types/yargs": "^13.0.4"
+ "@types/yargs": "^13.0.4",
+ "tsconfig-paths": "^3.9.0"
  }
 }

src/net/client-connection.ts

@@ -1,10 +1,10 @@
 import { Socket } from 'net';
-import { Player } from '../world/entity/mob/player/player';
+import { Player } from '@server/world/mob/player/player';
+import { world } from '@server/game-server';
 import { RsBuffer } from './rs-buffer';
 import { ClientHandshakeParser } from './data-parser/client-handshake-parser';
 import { ClientLoginParser } from './data-parser/client-login-parser';
 import { ClientPacketDataParser } from './data-parser/client-packet-data-parser';
-import { world } from '../game-server';
 import { DataParser } from './data-parser/data-parser';
 
 enum ConnectionStage {

src/net/data-parser/client-handshake-parser.ts

@@ -1,4 +1,4 @@
-import { RsBuffer } from '../rs-buffer';
+import { RsBuffer } from '@server/net/rs-buffer';
 import { DataParser } from './data-parser';
 
 /**

src/net/data-parser/client-login-parser.ts

@@ -1,8 +1,8 @@
-import { RsBuffer } from '../rs-buffer';
-import { Player } from '../../world/entity/mob/player/player';
 import BigInteger from 'bigi';
-import { Isaac } from '../isaac';
-import { world } from '../../game-server';
+import { RsBuffer } from '@server/net/rs-buffer';
+import { Player } from '@server/world/mob/player/player';
+import { Isaac } from '@server/net/isaac';
+import { world } from '@server/game-server';
 import { DataParser } from './data-parser';
 
 const rsaModulus = BigInteger('119568088839203297999728368933573315070738693395974011872885408638642676871679245723887367232256427712869170521351089799352546294030059890127723509653145359924771433131004387212857375068629466435244653901851504845054452735390701003613803443469723435116497545687393297329052988014281948392136928774011011998343');

src/net/data-parser/client-packet-data-parser.ts

@@ -1,7 +1,7 @@
-import { RsBuffer } from '../rs-buffer';
-import { incomingPacketSizes } from '../incoming-packet-sizes';
+import { RsBuffer } from '@server/net/rs-buffer';
+import { incomingPacketSizes } from '@server/net/incoming-packet-sizes';
+import { handlePacket } from '@server/world/mob/player/packet/incoming-packet-directory';
 import { DataParser } from './data-parser';
-import { handlePacket } from '../../world/entity/mob/player/packet/incoming-packet-directory';
 
 /**
  * Parses incoming packet data from the game client once the user is fully authenticated.

src/net/data-parser/data-parser.ts

@@ -1,5 +1,5 @@
-import { ClientConnection } from '../client-connection';
-import { RsBuffer } from '../rs-buffer';
+import { ClientConnection } from '@server/net/client-connection';
+import { RsBuffer } from '@server/net/rs-buffer';
 
 export abstract class DataParser {
 

src/web-server.ts

@@ -1,6 +1,6 @@
 import express, { Request } from 'express';
 import { gameCache, world } from './game-server';
-import { Player } from './world/entity/mob/player/player';
+import { Player } from './world/mob/player/player';
 import { constants } from 'http2';
 import { logger } from '@runejs/logger';
 import { ItemData, ItemDetails, saveItemData } from './world/config/item-data';

src/world/config/item-data.ts

@@ -2,7 +2,7 @@ import { readFileSync, writeFileSync } from 'fs';
 import { ItemDefinition } from '@runejs/cache-parser';
 import { logger } from '@runejs/logger/dist/logger';
 import { join } from 'path';
-import { serverDir } from '../../game-server';
+import { serverDir } from '@server/game-server';
 import { JSON_SCHEMA, safeLoad, safeDump } from 'js-yaml';
 
 export enum EquipmentSlot {

src/world/config/npc-spawn.ts

@@ -1,9 +1,9 @@
 import { logger } from '@runejs/logger/dist/logger';
 import { JSON_SCHEMA, safeLoad } from 'js-yaml';
-import { readFileSync } from "fs";
-import { join } from "path";
-import { serverDir } from '../../game-server';
-import { Direction } from '../world';
+import { readFileSync } from 'fs';
+import { join } from 'path';
+import { serverDir } from '@server/game-server';
+import { Direction } from '@server/world/world';
 
 export interface NpcSpawn {
  npcId: number;

src/world/entity/entity.ts → src/world/entity.ts

@@ -1,4 +1,4 @@
-import { Position } from '../position';
+import { Position } from './position';
 
 export abstract class Entity {
 

src/world/entity/mob/items/item-container.ts → src/world/items/item-container.ts

@@ -1,6 +1,6 @@
 import { Item } from './item';
 import { Subject } from 'rxjs';
-import { world } from '../../../../game-server';
+import { world } from '@server/game-server';
 
 export interface ContainerUpdateEvent {
  slot?: number;

src/world/map/chunk.ts

@@ -1,9 +1,9 @@
 import { Position } from '../position';
-import { Player } from '../entity/mob/player/player';
+import { Player } from '../mob/player/player';
 import { CollisionMap } from './collision-map';
 import { gameCache } from '../../game-server';
 import { LandscapeObject, LandscapeObjectDefinition, MapRegionTile } from '@runejs/cache-parser';
-import { Npc } from '../entity/mob/npc/npc';
+import { Npc } from '../mob/npc/npc';
 
 /**
  * A single map chunk within the game world that keeps track of the entities within it.

src/world/entity/mob/mob.ts → src/world/mob/mob.ts

@@ -1,8 +1,8 @@
-import { Entity } from '../entity';
 import { WalkingQueue } from './walking-queue';
-import { ItemContainer } from './items/item-container';
+import { ItemContainer } from '../items/item-container';
 import { UpdateFlags } from './update-flags';
 import { Npc } from './npc/npc';
+import { Entity } from '../entity';
 
 /**
  * Handles a mobile entity within the game world.

src/world/entity/mob/npc/npc.ts → src/world/mob/npc/npc.ts

@@ -1,10 +1,10 @@
-import { Mob } from '../mob';
-import { NpcSpawn } from '../../../config/npc-spawn';
+import { Mob } from '@server/world/mob/mob';
+import { NpcSpawn } from '@server/world/config/npc-spawn';
 import { NpcDefinition } from '@runejs/cache-parser';
 import uuidv4 from 'uuid/v4';
-import { Position } from '../../../position';
-import { Direction } from '../../../world';
-import { world } from '../../../../game-server';
+import { Position } from '@server/world/position';
+import { Direction } from '@server/world/world';
+import { world } from '@server/game-server';
 
 interface NpcAnimations {
  walk: number;

src/world/entity/mob/player/action/equip-item-action.ts → src/world/mob/player/action/equip-item-action.ts

@@ -1,10 +1,10 @@
 import { Player } from '../player';
-import { world } from '../../../../../game-server';
+import { world } from '@server/game-server';
 import { logger } from '@runejs/logger/dist/logger';
-import { EquipmentSlot, equipmentSlotIndex, ItemDetails, WeaponType } from '../../../../config/item-data';
-import { Item } from '../../items/item';
+import { EquipmentSlot, equipmentSlotIndex, ItemDetails, WeaponType } from '@server/world/config/item-data';
+import { Item } from '@server/world/items/item';
 import { interfaceIds } from '../game-interface';
-import { ItemContainer } from '../../items/item-container';
+import { ItemContainer } from '@server/world/items/item-container';
 
 export const equipItemAction = (player: Player, itemId: number, inventorySlot: number) => {
  const itemToEquipData = world.itemData.get(itemId);

src/world/entity/mob/player/action/input-command-action.ts → src/world/mob/player/action/input-command-action.ts

@@ -1,7 +1,6 @@
 import { Player } from '../player';
 import { logger } from '@runejs/logger/dist/logger';
-import { world } from '../../../../../game-server';
-import { throws } from 'assert';
+import { world } from '@server/game-server';
 import { interfaceIds } from '../game-interface';
 
 type commandHandler = (player: Player, args?: string[]) => void;

src/world/entity/mob/player/action/unequip-item-action.ts → src/world/mob/player/action/unequip-item-action.ts

@@ -1,5 +1,5 @@
 import { Player } from '../player';
-import { Item } from '../../items/item';
+import { Item } from '@server/world/items/item';
 import { interfaceIds } from '../game-interface';
 
 export const unequipItemAction = (player: Player, itemId: number, equipmentSlot: number) => {

src/world/entity/mob/player/packet/impl/button-click-packet.ts → src/world/mob/player/packet/impl/button-click-packet.ts

@@ -1,6 +1,6 @@
 import { incomingPacket } from '../incoming-packet';
 import { Player } from '../../player';
-import { RsBuffer } from '../../../../../../net/rs-buffer';
+import { RsBuffer } from '@server/net/rs-buffer';
 
 const ignoreButtons: number[] = [
  3651 // character design accept button

src/world/entity/mob/player/packet/impl/camera-turn-packet.ts → src/world/mob/player/packet/impl/camera-turn-packet.ts

@@ -1,6 +1,6 @@
 import { incomingPacket } from '../incoming-packet';
 import { Player } from '../../player';
-import { RsBuffer } from '../../../../../../net/rs-buffer';
+import { RsBuffer } from '@server/net/rs-buffer';
 
 export const cameraTurnPacket: incomingPacket = (player: Player, packetId: number, packetSize: number, packet: RsBuffer): void => {
  // Do nothing

src/world/entity/mob/player/packet/impl/character-design-packet.ts → src/world/mob/player/packet/impl/character-design-packet.ts

@@ -1,6 +1,6 @@
 import { incomingPacket } from '../incoming-packet';
 import { Player } from '../../player';
-import { RsBuffer } from '../../../../../../net/rs-buffer';
+import { RsBuffer } from '@server/net/rs-buffer';
 import { interfaceIds } from '../../game-interface';
 
 export const characterDesignPacket: incomingPacket = (player: Player, packetId: number, packetSize: number, packet: RsBuffer): void => {

src/world/entity/mob/player/packet/impl/command-packet.ts → src/world/mob/player/packet/impl/command-packet.ts

@@ -1,6 +1,6 @@
 import { incomingPacket } from '../incoming-packet';
 import { Player } from '../../player';
-import { RsBuffer } from '../../../../../../net/rs-buffer';
+import { RsBuffer } from '@server/net/rs-buffer';
 import { inputCommandAction } from '../../action/input-command-action';
 
 export const commandPacket: incomingPacket = (player: Player, packetId: number, packetSize: number, packet: RsBuffer): void => {

src/world/entity/mob/player/packet/impl/interface-click-packet.ts → src/world/mob/player/packet/impl/interface-click-packet.ts

@@ -1,6 +1,6 @@
 import { incomingPacket } from '../incoming-packet';
 import { Player } from '../../player';
-import { RsBuffer } from '../../../../../../net/rs-buffer';
+import { RsBuffer } from '@server/net/rs-buffer';
 
 export const interfaceClickPacket: incomingPacket = (player: Player, packetId: number, packetSize: number, packet: RsBuffer): void => {
  // Do nothing

src/world/entity/mob/player/packet/impl/item-equip-packet.ts → src/world/mob/player/packet/impl/item-equip-packet.ts

@@ -1,6 +1,6 @@
 import { incomingPacket } from '../incoming-packet';
 import { Player } from '../../player';
-import { RsBuffer } from '../../../../../../net/rs-buffer';
+import { RsBuffer } from '@server/net/rs-buffer';
 import { logger } from '@runejs/logger/dist/logger';
 import { interfaceIds } from '../../game-interface';
 import { equipItemAction } from '../../action/equip-item-action';

src/world/entity/mob/player/packet/impl/item-option-1-packet.ts → src/world/mob/player/packet/impl/item-option-1-packet.ts

@@ -1,10 +1,10 @@
 import { incomingPacket } from '../incoming-packet';
-import { RsBuffer } from '../../../../../../net/rs-buffer';
+import { RsBuffer } from '@server/net/rs-buffer';
 import { Player } from '../../player';
 import { interfaceIds } from '../../game-interface';
 import { logger } from '@runejs/logger/dist/logger';
 import { unequipItemAction } from '../../action/unequip-item-action';
-import { ItemContainer } from '../../../items/item-container';
+import { ItemContainer } from '@server/world/items/item-container';
 
 export const itemOption1Packet: incomingPacket = (player: Player, packetId: number, packetSize: number, packet: RsBuffer): void => {
  const itemId = packet.readNegativeOffsetShortBE();

src/world/entity/mob/player/packet/impl/item-swap-packet.ts → src/world/mob/player/packet/impl/item-swap-packet.ts

@@ -1,6 +1,6 @@
 import { incomingPacket } from '../incoming-packet';
 import { Player } from '../../player';
-import { RsBuffer } from '../../../../../../net/rs-buffer';
+import { RsBuffer } from '@server/net/rs-buffer';
 import { swapItemAction } from '../../action/swap-item-action';
 
 export const itemSwapPacket: incomingPacket = (player: Player, packetId: number, packetSize: number, packet: RsBuffer): void => {

src/world/entity/mob/player/packet/impl/walk-packet.ts → src/world/mob/player/packet/impl/walk-packet.ts

@@ -1,5 +1,5 @@
 import { Player } from '../../player';
-import { RsBuffer } from '../../../../../../net/rs-buffer';
+import { RsBuffer } from '@server/net/rs-buffer';
 import { incomingPacket } from '../incoming-packet';
 
 export const walkPacket: incomingPacket = (player: Player, packetId: number, packetSize: number, packet: RsBuffer): void => {

src/world/entity/mob/player/packet/incoming-packet-directory.ts → src/world/mob/player/packet/incoming-packet-directory.ts

@@ -1,5 +1,5 @@
 import { Player } from '../player';
-import { RsBuffer } from '../../../../../net/rs-buffer';
+import { RsBuffer } from '@server/net/rs-buffer';
 import { logger } from '@runejs/logger';
 
 import { incomingPacket } from './incoming-packet';

src/world/entity/mob/player/packet/incoming-packet.ts → src/world/mob/player/packet/incoming-packet.ts

@@ -1,4 +1,4 @@
-import { RsBuffer } from '../../../../../net/rs-buffer';
+import { RsBuffer } from '@server/net/rs-buffer';
 import { Player } from '../player';
 
 export type incomingPacket = (player: Player, packetId: number, packetSize: number, buffer: RsBuffer) => void;

src/world/entity/mob/player/packet/packet-sender.ts → src/world/mob/player/packet/packet-sender.ts

@@ -1,9 +1,9 @@
 import { Player } from '../player';
 import { Socket } from 'net';
-import { Packet, PacketType } from '../../../../../net/packet';
-import { ItemContainer } from '../../items/item-container';
-import { Item } from '../../items/item';
-import { Position } from '../../../../position';
+import { Packet, PacketType } from '@server/net/packet';
+import { ItemContainer } from '@server/world/items/item-container';
+import { Item } from '@server/world/items/item';
+import { Position } from '@server/world/position';
 
 /**
  * 6 = set chatbox input type to 2

src/world/entity/mob/player/player-data.ts → src/world/mob/player/player-data.ts

@@ -1,9 +1,9 @@
-import { Item } from '../items/item';
+import { Item } from '@server/world/items/item';
+import { serverDir } from '@server/game-server';
 import { writeFileSync, readFileSync, existsSync } from 'fs';
 import { join } from 'path';
 import { logger } from '@runejs/logger/dist/logger';
 import { Player } from './player';
-import { serverDir } from '../../../../game-server';
 
 export interface Appearance {
  gender: number;