Merge pull request runejs#14 from rune-js/remove-vue

Removing VueJS ui from the project.
jameshallam93 · Dec 29, 2019 · 5650b5e · 5650b5e
2 parents 857ff07 + c30d3a4
commit 5650b5e
Show file tree

Hide file tree

Showing 62 changed files with 479 additions and 12,229 deletions.
diff --git a/.browserslistrc b/.browserslistrc
diff --git a/app.js b/app.js
diff --git a/babel.config.js b/babel.config.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,13 +2,10 @@
     "name": "rune.js",
     "version": "0.1.0",
     "description": "",
-    "main": "src/server/game-server.ts",
+    "main": "src/game-server.ts",
     "scripts": {
-        "server": "ts-node ./src/server/main.ts",
-        "ui": "vue-cli-service serve",
-        "build": "vue-cli-service build",
-        "lint": "vue-cli-service lint",
-        "start": "concurrently \"npm run server\" \"npm run ui\""
+        "server": "ts-node src/main.ts",
+        "start": "npm run server"
     },
     "repository": {
         "type": "git",
@@ -23,27 +20,14 @@
     "dependencies": {
         "@runejs/cache-parser": "^0.1.2",
         "@runejs/logger": "^1.0.0",
-        "axios": "^0.19.0",
         "bigi": "^1.4.2",
-        "core-js": "^3.4.3",
         "express": "^4.17.1",
         "ts-node": "^8.4.1",
-        "typescript": "^3.7.2",
-        "vue": "^2.6.10",
-        "vue-class-component": "^7.0.2",
-        "vue-property-decorator": "^8.3.0",
-        "vue-router": "^3.1.3"
+        "tslib": "^1.10.0",
+        "typescript": "^3.7.2"
     },
     "devDependencies": {
         "@types/express": "^4.17.2",
-        "@types/node": "^12.12.6",
-        "@vue/cli-plugin-babel": "^4.1.0",
-        "@vue/cli-plugin-router": "^4.1.0",
-        "@vue/cli-plugin-typescript": "^4.1.0",
-        "@vue/cli-service": "^4.1.0",
-        "concurrently": "^5.0.2",
-        "node-sass": "^4.12.0",
-        "sass-loader": "^8.0.0",
-        "vue-template-compiler": "^2.6.10"
+        "@types/node": "^12.12.6"
     }
 }
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/index.html b/public/index.html
diff --git a/src/server/game-server.ts → src/game-server.ts b/src/server/game-server.ts → src/game-server.ts
@@ -8,7 +8,7 @@ import { GameCache } from '@runejs/cache-parser';
 
 const GAME_SERVER_PORT = 43594;
 
-export const serverDir = join(__dirname, '../../');
+export const serverDir = join(__dirname, '../');
 export const gameCache = new GameCache(join(serverDir, 'cache'));
 export const world = new World();
 world.chunkManager.generateCollisionMaps();

diff --git a/src/server/main.ts → src/main.ts b/src/server/main.ts → src/main.ts
diff --git a/src/server/net/client-connection.ts → src/net/client-connection.ts b/src/server/net/client-connection.ts → src/net/client-connection.ts
diff --git a/...et/data-parser/client-handshake-parser.ts → ...et/data-parser/client-handshake-parser.ts b/...et/data-parser/client-handshake-parser.ts → ...et/data-parser/client-handshake-parser.ts
diff --git a/...er/net/data-parser/client-login-parser.ts → src/net/data-parser/client-login-parser.ts b/...er/net/data-parser/client-login-parser.ts → src/net/data-parser/client-login-parser.ts
diff --git a/.../data-parser/client-packet-data-parser.ts → .../data-parser/client-packet-data-parser.ts b/.../data-parser/client-packet-data-parser.ts → .../data-parser/client-packet-data-parser.ts
diff --git a/src/server/net/data-parser/data-parser.ts → src/net/data-parser/data-parser.ts b/src/server/net/data-parser/data-parser.ts → src/net/data-parser/data-parser.ts
diff --git a/src/server/net/incoming-packet-sizes.ts → src/net/incoming-packet-sizes.ts b/src/server/net/incoming-packet-sizes.ts → src/net/incoming-packet-sizes.ts
diff --git a/src/server/net/isaac.ts → src/net/isaac.ts b/src/server/net/isaac.ts → src/net/isaac.ts
diff --git a/src/server/net/packet.ts → src/net/packet.ts b/src/server/net/packet.ts → src/net/packet.ts
diff --git a/src/server/net/rs-buffer.ts → src/net/rs-buffer.ts b/src/server/net/rs-buffer.ts → src/net/rs-buffer.ts
diff --git a/src/server/task/task.ts → src/task/task.ts b/src/server/task/task.ts → src/task/task.ts
diff --git a/src/ui/App.vue b/src/ui/App.vue
diff --git a/src/ui/assets/logo.png b/src/ui/assets/logo.png
diff --git a/src/ui/components/HelloWorld.vue b/src/ui/components/HelloWorld.vue
diff --git a/src/ui/main.ts b/src/ui/main.ts
diff --git a/src/ui/router/index.ts b/src/ui/router/index.ts
diff --git a/src/ui/shims-tsx.d.ts b/src/ui/shims-tsx.d.ts
diff --git a/src/ui/shims-vue.d.ts b/src/ui/shims-vue.d.ts
diff --git a/src/ui/views/About.vue b/src/ui/views/About.vue
diff --git a/src/ui/views/Home.vue b/src/ui/views/Home.vue
diff --git a/src/server/web-server.ts → src/web-server.ts b/src/server/web-server.ts → src/web-server.ts
diff --git a/src/server/world/config/item-data.ts → src/world/config/item-data.ts b/src/server/world/config/item-data.ts → src/world/config/item-data.ts
diff --git a/src/server/world/entity/entity.ts → src/world/entity/entity.ts b/src/server/world/entity/entity.ts → src/world/entity/entity.ts
diff --git a/.../world/entity/mob/items/item-container.ts → src/world/entity/mob/items/item-container.ts b/.../world/entity/mob/items/item-container.ts → src/world/entity/mob/items/item-container.ts
diff --git a/src/server/world/entity/mob/items/item.ts → src/world/entity/mob/items/item.ts b/src/server/world/entity/mob/items/item.ts → src/world/entity/mob/items/item.ts
diff --git a/src/server/world/entity/mob/mob.ts → src/world/entity/mob/mob.ts b/src/server/world/entity/mob/mob.ts → src/world/entity/mob/mob.ts
diff --git a/...ty/mob/player/action/equip-item-action.ts → ...ty/mob/player/action/equip-item-action.ts b/...ty/mob/player/action/equip-item-action.ts → ...ty/mob/player/action/equip-item-action.ts
diff --git a/...mob/player/action/input-command-action.ts → ...mob/player/action/input-command-action.ts b/...mob/player/action/input-command-action.ts → ...mob/player/action/input-command-action.ts
diff --git a/.../mob/player/action/unequip-item-action.ts → .../mob/player/action/unequip-item-action.ts b/.../mob/player/action/unequip-item-action.ts → .../mob/player/action/unequip-item-action.ts
diff --git a/...world/entity/mob/player/game-interface.ts → ...world/entity/mob/player/game-interface.ts b/...world/entity/mob/player/game-interface.ts → ...world/entity/mob/player/game-interface.ts
diff --git a/...player/packet/impl/button-click-packet.ts → ...player/packet/impl/button-click-packet.ts b/...player/packet/impl/button-click-packet.ts → ...player/packet/impl/button-click-packet.ts
diff --git a/.../player/packet/impl/camera-turn-packet.ts → .../player/packet/impl/camera-turn-packet.ts b/.../player/packet/impl/camera-turn-packet.ts → .../player/packet/impl/camera-turn-packet.ts
diff --git a/...er/packet/impl/character-design-packet.ts → ...er/packet/impl/character-design-packet.ts b/...er/packet/impl/character-design-packet.ts → ...er/packet/impl/character-design-packet.ts
diff --git a/.../mob/player/packet/impl/command-packet.ts → .../mob/player/packet/impl/command-packet.ts b/.../mob/player/packet/impl/command-packet.ts → .../mob/player/packet/impl/command-packet.ts
diff --git a/...yer/packet/impl/interface-click-packet.ts → ...yer/packet/impl/interface-click-packet.ts b/...yer/packet/impl/interface-click-packet.ts → ...yer/packet/impl/interface-click-packet.ts
diff --git a/...b/player/packet/impl/item-equip-packet.ts → ...b/player/packet/impl/item-equip-packet.ts b/...b/player/packet/impl/item-equip-packet.ts → ...b/player/packet/impl/item-equip-packet.ts
diff --git a/...layer/packet/impl/item-option-1-packet.ts → ...layer/packet/impl/item-option-1-packet.ts b/...layer/packet/impl/item-option-1-packet.ts → ...layer/packet/impl/item-option-1-packet.ts
diff --git a/...ity/mob/player/packet/impl/walk-packet.ts → ...ity/mob/player/packet/impl/walk-packet.ts b/...ity/mob/player/packet/impl/walk-packet.ts → ...ity/mob/player/packet/impl/walk-packet.ts
diff --git a/...layer/packet/incoming-packet-directory.ts → ...layer/packet/incoming-packet-directory.ts b/...layer/packet/incoming-packet-directory.ts → ...layer/packet/incoming-packet-directory.ts
diff --git a/...tity/mob/player/packet/incoming-packet.ts → ...tity/mob/player/packet/incoming-packet.ts b/...tity/mob/player/packet/incoming-packet.ts → ...tity/mob/player/packet/incoming-packet.ts
diff --git a/...entity/mob/player/packet/packet-sender.ts → ...entity/mob/player/packet/packet-sender.ts b/...entity/mob/player/packet/packet-sender.ts → ...entity/mob/player/packet/packet-sender.ts
diff --git a/...er/world/entity/mob/player/player-data.ts → src/world/entity/mob/player/player-data.ts b/...er/world/entity/mob/player/player-data.ts → src/world/entity/mob/player/player-data.ts
@@ -3,6 +3,7 @@ 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;
@@ -52,7 +53,7 @@ export function defaultAppearance(): Appearance {
 
 export function savePlayerData(player: Player): boolean {
     const fileName = player.username.toLowerCase() + '.json';
-    const filePath = join(__dirname, '../../../../../../data/saves', fileName);
+    const filePath = join(serverDir, 'data/saves', fileName);
 
     const playerSave: PlayerSave = {
         username: player.username,
@@ -77,7 +78,7 @@ export function savePlayerData(player: Player): boolean {
 
 export function loadPlayerSave(username: string): PlayerSave {
     const fileName = username.toLowerCase() + '.json';
-    const filePath = join(__dirname, '../../../../../../data/saves', fileName);
+    const filePath = join(serverDir, 'data/saves', fileName);
 
     if(!existsSync(filePath)) {
         return null;

diff --git a/src/server/world/entity/mob/player/player.ts → src/world/entity/mob/player/player.ts b/src/server/world/entity/mob/player/player.ts → src/world/entity/mob/player/player.ts
diff --git a/...ity/mob/player/task/player-update-task.ts → ...ity/mob/player/task/player-update-task.ts b/...ity/mob/player/task/player-update-task.ts → ...ity/mob/player/task/player-update-task.ts
diff --git a/...r/world/entity/mob/player/update-flags.ts → src/world/entity/mob/player/update-flags.ts b/...r/world/entity/mob/player/update-flags.ts → src/world/entity/mob/player/update-flags.ts
diff --git a/src/server/world/entity/mob/skills/skill.ts → src/world/entity/mob/skills/skill.ts b/src/server/world/entity/mob/skills/skill.ts → src/world/entity/mob/skills/skill.ts
diff --git a/src/server/world/entity/mob/walking-queue.ts → src/world/entity/mob/walking-queue.ts b/src/server/world/entity/mob/walking-queue.ts → src/world/entity/mob/walking-queue.ts
diff --git a/src/server/world/map/chunk-manager.ts → src/world/map/chunk-manager.ts b/src/server/world/map/chunk-manager.ts → src/world/map/chunk-manager.ts
diff --git a/src/server/world/map/chunk.ts → src/world/map/chunk.ts b/src/server/world/map/chunk.ts → src/world/map/chunk.ts
diff --git a/src/server/world/map/collision-map.ts → src/world/map/collision-map.ts b/src/server/world/map/collision-map.ts → src/world/map/collision-map.ts
diff --git a/src/server/world/position.ts → src/world/position.ts b/src/server/world/position.ts → src/world/position.ts
diff --git a/src/server/world/world.ts → src/world/world.ts b/src/server/world/world.ts → src/world/world.ts
diff --git a/tslint.json b/tslint.json
diff --git a/vue.config.js b/vue.config.js