Skip to content

Commit 0c17ef3

Browse files
committed
Clean up redundant dependencies
1 parent 94815ec commit 0c17ef3

File tree

4 files changed

+7
-29
lines changed

4 files changed

+7
-29
lines changed

JavascriptServer/concepts/entity.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { EventEmitter } from "events";
22
import { CircleCollider, BoxCollider, PolygonCollider } from '#concepts/collider';
33

4-
import { v4 as uuidv4 } from 'uuid';
54
import { isDeepStrictEqual } from 'util';
65

76
// a thing
@@ -89,7 +88,7 @@ class Entity extends EventEmitter {
8988

9089
constructor(room, x = 0, y = 0) {
9190
super();
92-
this.id = uuidv4();
91+
this.id = crypto.randomUUID();
9392
this.room = room;
9493
this.pos = { x, y };
9594
this.spd = { x: 0, y: 0 };

JavascriptServer/package.json

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,16 @@
2121
"@msgpack/msgpack": "^2.8.0",
2222
"chalk": "^5.2.0",
2323
"detect-collisions": "7.0.5",
24-
"extend": "^3.0.2",
2524
"fastest-validator": "^1.16.0",
2625
"minimist": "^1.2.8",
27-
"module-alias": "^2.2.2",
2826
"mongoose": "^7.3.3",
29-
"performance-now": "^2.1.0",
30-
"rbush": "3.0.1",
3127
"semver": "^7.5.2",
32-
"uuid": "^9.0.0",
3328
"ws": "^8.17.1"
3429
},
3530
"devDependencies": {
36-
"@types/minimist": "^1.2.2",
3731
"@types/node": "^18.15.11",
38-
"@types/rbush": "^3.0.0",
3932
"@types/semver": "^7.3.13",
40-
"@types/uuid": "^9.0.1",
4133
"@types/ws": "^8.5.4",
42-
"0x": "^4.1.4",
4334
"typescript": "^5.0.3"
4435
},
4536
"imports": {

TypescriptServer/package.json

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
{
22
"name": "warp-server",
3-
"version": "6.0.0",
3+
"version": "7.0.0",
44
"private": true,
55
"description": "",
66
"main": "out/server.js",
7-
"author": {
8-
"name": "Evoleo"
9-
},
7+
"author": "Evoleo",
108
"type": "module",
119
"scripts": {
1210
"debug": "node --inspect . --env=dev",
@@ -21,25 +19,16 @@
2119
"@msgpack/msgpack": "^2.8.0",
2220
"chalk": "^5.2.0",
2321
"detect-collisions": "7.0.5",
24-
"extend": "^3.0.2",
2522
"fastest-validator": "^1.16.0",
2623
"minimist": "^1.2.8",
27-
"module-alias": "^2.2.2",
28-
"mongoose": "^7.0.3",
29-
"performance-now": "^2.1.0",
30-
"rbush": "3.0.1",
24+
"mongoose": "^8.8.1",
3125
"semver": "^7.3.8",
32-
"uuid": "^9.0.0",
3326
"ws": "^8.13.0"
3427
},
3528
"devDependencies": {
36-
"@types/minimist": "^1.2.2",
3729
"@types/node": "^18.15.11",
38-
"@types/rbush": "^3.0.0",
3930
"@types/semver": "^7.3.13",
40-
"@types/uuid": "^9.0.1",
4131
"@types/ws": "^8.5.4",
42-
"0x": "^4.1.4",
4332
"typescript": "^5.0.3"
4433
},
4534
"imports": {

TypescriptServer/src/concepts/entity.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import BBox from '#types/bbox';
44
import { EventEmitter } from "events";
55
import { CircleCollider, BoxCollider, PolygonCollider, Collider } from '#concepts/collider';
66

7-
import { v4 as uuidv4 } from 'uuid';
87
import Client from "#concepts/client";
98
import Room from "#concepts/room";
109

@@ -131,7 +130,7 @@ class Entity extends EventEmitter {
131130

132131
constructor(room:Room, x:number = 0, y:number = 0) {
133132
super();
134-
this.id = uuidv4();
133+
this.id = crypto.randomUUID();
135134
this.room = room;
136135
this.pos = { x, y };
137136
this.spd = { x: 0, y: 0};
@@ -303,8 +302,8 @@ class Entity extends EventEmitter {
303302
// removes the entity from the room (and triggers the 'remove' event)
304303
public remove() {
305304
this.emit('remove');
306-
var pos = this.room.entities.indexOf(this);
307-
this.room.entities.splice(pos, 1);
305+
let idx = this.room.entities.indexOf(this);
306+
this.room.entities.splice(idx, 1);
308307
this.tree.remove(this.collider);
309308
}
310309

0 commit comments

Comments
 (0)