refactor: prefer non arrow function properties where necessary

2004Scape · Apr 22, 2024 · 1c24036 · 1c24036
1 parent 7fd064f
commit 1c24036
Show file tree

Hide file tree

Showing 36 changed files with 338 additions and 334 deletions.
diff --git a/src/js/jagex2/config/ComType.ts b/src/js/jagex2/config/ComType.ts
@@ -494,7 +494,7 @@ export default class ComType {
     seqFrame: number = 0;
     seqCycle: number = 0;
 
-    getModel = (primaryFrame: number, secondaryFrame: number, active: boolean): Model | null => {
+    getModel(primaryFrame: number, secondaryFrame: number, active: boolean): Model | null {
         let model: Model | null = this.model;
         if (active) {
             model = this.activeModel;
@@ -523,7 +523,7 @@ export default class ComType {
 
         tmp.calculateNormals(64, 768, -50, -10, -50, true);
         return tmp;
-    };
+    }
 
     getAbsoluteX(): number {
         if (this.layer === this.id) {

diff --git a/src/js/jagex2/config/ConfigType.ts b/src/js/jagex2/config/ConfigType.ts
@@ -10,7 +10,7 @@ export abstract class ConfigType {
 
     abstract decode(code: number, dat: Packet): void;
 
-    decodeType = (dat: Packet): this => {
+    decodeType(dat: Packet): this {
         // eslint-disable-next-line no-constant-condition
         while (true) {
             const opcode: number = dat.g1;
@@ -20,5 +20,5 @@ export abstract class ConfigType {
             this.decode(opcode, dat);
         }
         return this;
-    };
+    }
 }
diff --git a/src/js/jagex2/config/FloType.ts b/src/js/jagex2/config/FloType.ts
@@ -81,7 +81,7 @@ export default class FloType extends ConfigType {
     chroma: number = 0;
     hsl: number = 0;
 
-    decode = (code: number, dat: Packet): void => {
+    decode(code: number, dat: Packet): void {
         if (code === 1) {
             this.rgb = dat.g3;
             this.setColor(this.rgb);
@@ -96,9 +96,9 @@ export default class FloType extends ConfigType {
         } else {
             console.log('Error unrecognised config code: ', code);
         }
-    };
+    }
 
-    private setColor = (rgb: number): void => {
+    private setColor(rgb: number): void {
         const red: number = ((rgb >> 16) & 0xff) / 256.0;
         const green: number = ((rgb >> 8) & 0xff) / 256.0;
         const blue: number = (rgb & 0xff) / 256.0;
@@ -192,5 +192,5 @@ export default class FloType extends ConfigType {
         }
 
         this.hsl = FloType.hsl24to16(hue, saturation, lightness);
-    };
+    }
 }
diff --git a/src/js/jagex2/config/IdkType.ts b/src/js/jagex2/config/IdkType.ts
@@ -25,7 +25,7 @@ export default class IdkType extends ConfigType {
     recol_d: Int32Array = new Int32Array(6);
     disable: boolean = false;
 
-    decode = (code: number, dat: Packet): void => {
+    decode(code: number, dat: Packet): void {
         if (code === 1) {
             this.type = dat.g1;
         } else if (code === 2) {
@@ -46,9 +46,9 @@ export default class IdkType extends ConfigType {
         } else {
             throw new Error(`Unrecognized idk config code: ${code}`);
         }
-    };
+    }
 
-    getModel = (): Model | null => {
+    getModel(): Model | null {
         if (!this.models) {
             return null;
         }
@@ -69,9 +69,9 @@ export default class IdkType extends ConfigType {
             model?.recolor(this.recol_s[i], this.recol_d[i]);
         }
         return model;
-    };
+    }
 
-    getHeadModel = (): Model => {
+    getHeadModel(): Model {
         let count: number = 0;
 
         const models: (Model | null)[] = new TypedArray1d(5, null);
@@ -87,5 +87,5 @@ export default class IdkType extends ConfigType {
         }
 
         return model;
-    };
+    }
 }
diff --git a/src/js/jagex2/config/LocType.ts b/src/js/jagex2/config/LocType.ts
@@ -115,7 +115,7 @@ export default class LocType extends ConfigType {
     zoff: number = 0;
     forcedecor: boolean = false;
 
-    decode = (code: number, dat: Packet): void => {
+    decode(code: number, dat: Packet): void {
         if (code === 1) {
             const count: number = dat.g1;
             this.models = new Int32Array(count);
@@ -205,9 +205,9 @@ export default class LocType extends ConfigType {
         } else if (code === 73) {
             this.forcedecor = true;
         }
-    };
+    }
 
-    getModel = (shape: number, angle: number, heightmapSW: number, heightmapSE: number, heightmapNE: number, heightmapNW: number, transformId: number): Model | null => {
+    getModel(shape: number, angle: number, heightmapSW: number, heightmapSE: number, heightmapNE: number, heightmapNW: number, transformId: number): Model | null {
         if (!this.shapes) {
             return null;
         }
@@ -345,9 +345,9 @@ export default class LocType extends ConfigType {
         }
 
         return modified;
-    };
+    }
 
-    private reset = (): void => {
+    private reset(): void {
         this.models = null;
         this.shapes = null;
         this.name = null;
@@ -381,5 +381,5 @@ export default class LocType extends ConfigType {
         this.yoff = 0;
         this.zoff = 0;
         this.forcedecor = false;
-    };
+    }
 }
diff --git a/src/js/jagex2/config/MesAnimType.ts b/src/js/jagex2/config/MesAnimType.ts
@@ -18,13 +18,13 @@ export default class MesAnimType extends ConfigType {
 
     len: Int32Array = new Int32Array(4).fill(-1);
 
-    decode = (code: number, dat: Packet): void => {
+    decode(code: number, dat: Packet): void {
         if (code >= 1 && code < 5) {
             this.len[code - 1] = dat.g2;
         } else if (code === 250) {
             this.debugname = dat.gjstr;
         } else {
             throw new Error(`Unrecognized mesanim config code: ${code}`);
         }
-    };
+    }
 }
diff --git a/src/js/jagex2/config/NpcType.ts b/src/js/jagex2/config/NpcType.ts
@@ -85,7 +85,7 @@ export default class NpcType extends ConfigType {
     resizeh: number = 128;
     resizev: number = 128;
 
-    decode = (code: number, dat: Packet): void => {
+    decode(code: number, dat: Packet): void {
         if (code === 1) {
             const count: number = dat.g1;
             this.models = new Uint16Array(count);
@@ -150,9 +150,9 @@ export default class NpcType extends ConfigType {
         } else if (code === 98) {
             this.resizev = dat.g2;
         }
-    };
+    }
 
-    getSequencedModel = (primaryTransformId: number, secondaryTransformId: number, seqMask: Int32Array | null): Model | null => {
+    getSequencedModel(primaryTransformId: number, secondaryTransformId: number, seqMask: Int32Array | null): Model | null {
         let tmp: Model | null = null;
         let model: Model | null = null;
         if (NpcType.modelCache) {
@@ -207,9 +207,9 @@ export default class NpcType extends ConfigType {
         }
 
         return null;
-    };
+    }
 
-    getHeadModel = (): Model | null => {
+    getHeadModel(): Model | null {
         if (!this.heads) {
             return null;
         }
@@ -233,5 +233,5 @@ export default class NpcType extends ConfigType {
         }
 
         return model;
-    };
+    }
 }
diff --git a/src/js/jagex2/config/ObjType.ts b/src/js/jagex2/config/ObjType.ts
@@ -229,7 +229,7 @@ export default class ObjType extends ConfigType {
     certlink: number = -1;
     certtemplate: number = -1;
 
-    decode = (code: number, dat: Packet): void => {
+    decode(code: number, dat: Packet): void {
         if (code === 1) {
             this.model = dat.g2;
         } else if (code === 2) {
@@ -322,9 +322,9 @@ export default class ObjType extends ConfigType {
             this.countobj[code - 100] = dat.g2;
             this.countco[code - 100] = dat.g2;
         }
-    };
+    }
 
-    getWornModel = (gender: number): Model | null => {
+    getWornModel(gender: number): Model | null {
         let id1: number = this.manwear;
         if (gender === 1) {
             id1 = this.womanwear;
@@ -369,9 +369,9 @@ export default class ObjType extends ConfigType {
             }
         }
         return model;
-    };
+    }
 
-    getHeadModel = (gender: number): Model | null => {
+    getHeadModel(gender: number): Model | null {
         let head1: number = this.manhead;
         if (gender === 1) {
             head1 = this.womanhead;
@@ -399,9 +399,9 @@ export default class ObjType extends ConfigType {
             }
         }
         return model;
-    };
+    }
 
-    getInterfaceModel = (count: number): Model => {
+    getInterfaceModel(count: number): Model {
         if (this.countobj && this.countco && count > 1) {
             let id: number = -1;
             for (let i: number = 0; i < 10; i++) {
@@ -433,9 +433,9 @@ export default class ObjType extends ConfigType {
         model.pickable = true;
         ObjType.modelCache?.put(BigInt(this.id), model);
         return model;
-    };
+    }
 
-    private toCertificate = (): void => {
+    private toCertificate(): void {
         const template: ObjType = ObjType.get(this.certtemplate);
         this.model = template.model;
         this.zoom2d = template.zoom2d;
@@ -460,9 +460,9 @@ export default class ObjType extends ConfigType {
         this.desc = `Swap this note at any bank for ${article} ${link.name}.`;
 
         this.stackable = true;
-    };
+    }
 
-    private reset = (): void => {
+    private reset(): void {
         this.model = 0;
         this.name = null;
         this.desc = null;
@@ -497,5 +497,5 @@ export default class ObjType extends ConfigType {
         this.countco = null;
         this.certlink = -1;
         this.certtemplate = -1;
-    };
+    }
 }
diff --git a/src/js/jagex2/config/SeqType.ts b/src/js/jagex2/config/SeqType.ts
@@ -43,7 +43,7 @@ export default class SeqType extends ConfigType {
     replaycount: number = 99;
     duration: number = 0;
 
-    decode = (code: number, dat: Packet): void => {
+    decode(code: number, dat: Packet): void {
         if (code === 1) {
             this.frameCount = dat.g1;
             this.frames = new Int16Array(this.frameCount);
@@ -93,5 +93,5 @@ export default class SeqType extends ConfigType {
         } else {
             throw new Error(`Unrecognized seq config code: ${code}`);
         }
-    };
+    }
 }
diff --git a/src/js/jagex2/config/SpotAnimType.ts b/src/js/jagex2/config/SpotAnimType.ts
@@ -32,7 +32,7 @@ export default class SpotAnimType extends ConfigType {
     ambient: number = 0;
     contrast: number = 0;
 
-    decode = (code: number, dat: Packet): void => {
+    decode(code: number, dat: Packet): void {
         if (code === 1) {
             this.model = dat.g2;
         } else if (code === 2) {
@@ -60,9 +60,9 @@ export default class SpotAnimType extends ConfigType {
         } else {
             throw new Error(`Unrecognized spotanim config code: ${code}`);
         }
-    };
+    }
 
-    getModel = (): Model => {
+    getModel(): Model {
         let model: Model | null = SpotAnimType.modelCache?.get(BigInt(this.id)) as Model | null;
         if (model) {
             return model;
@@ -75,5 +75,5 @@ export default class SpotAnimType extends ConfigType {
         }
         SpotAnimType.modelCache?.put(BigInt(this.id), model);
         return model;
-    };
+    }
 }
diff --git a/src/js/jagex2/config/VarpType.ts b/src/js/jagex2/config/VarpType.ts
@@ -27,7 +27,7 @@ export default class VarpType extends ConfigType {
     transmit: boolean = false;
     code8: boolean = false;
 
-    decode = (code: number, dat: Packet): void => {
+    decode(code: number, dat: Packet): void {
         if (code === 1) {
             this.scope = dat.g1;
         } else if (code === 2) {
@@ -50,5 +50,5 @@ export default class VarpType extends ConfigType {
         } else {
             throw new Error(`Error unrecognised config code: ${code}`);
         }
-    };
+    }
 }
diff --git a/src/js/jagex2/dash3d/entity/NpcEntity.ts b/src/js/jagex2/dash3d/entity/NpcEntity.ts
@@ -7,7 +7,7 @@ import SeqType from '../../config/SeqType';
 export default class NpcEntity extends PathingEntity {
     type: NpcType | null = null;
 
-    draw = (_loopCycle: number): Model | null => {
+    draw(_loopCycle: number): Model | null {
         if (!this.type) {
             return null;
         }
@@ -44,11 +44,13 @@ export default class NpcEntity extends PathingEntity {
         }
 
         return tmp;
-    };
+    }
 
-    isVisible = (): boolean => this.type !== null;
+    isVisible(): boolean {
+        return this.type !== null;
+    }
 
-    private getSequencedModel = (): Model | null => {
+    private getSequencedModel(): Model | null {
         if (!this.type) {
             return null;
         }
@@ -81,5 +83,5 @@ export default class NpcEntity extends PathingEntity {
         }
         this.height = model.maxY;
         return model;
-    };
+    }
 }
diff --git a/src/js/jagex2/dash3d/entity/PathingEntity.ts b/src/js/jagex2/dash3d/entity/PathingEntity.ts
@@ -63,7 +63,7 @@ export default abstract class PathingEntity extends Entity {
 
     abstract isVisible(): boolean;
 
-    move = (teleport: boolean, x: number, z: number): void => {
+    move(teleport: boolean, x: number, z: number): void {
         if (this.primarySeqId !== -1 && SeqType.instances[this.primarySeqId].priority <= 1) {
             this.primarySeqId = -1;
         }
@@ -96,9 +96,9 @@ export default abstract class PathingEntity extends Entity {
         this.pathTileZ[0] = z;
         this.x = this.pathTileX[0] * 128 + this.size * 64;
         this.z = this.pathTileZ[0] * 128 + this.size * 64;
-    };
+    }
 
-    step = (running: boolean, direction: number): void => {
+    step(running: boolean, direction: number): void {
         let nextX: number = this.pathTileX[0];
         let nextZ: number = this.pathTileZ[0];
 
@@ -141,5 +141,5 @@ export default abstract class PathingEntity extends Entity {
         this.pathTileX[0] = nextX;
         this.pathTileZ[0] = nextZ;
         this.pathRunning[0] = running;
-    };
+    }
 }