2 files changed, 12 insertions(+), 25 deletions(-)

M client/src/gateway.ts
M client/src/index.ts

@@ 27,7 27,8 @@ import {
 } from "./protocol/message_s2c";
 import {GoodbyeReason} from "./protocol/goodbye_reason";
 import {global} from "./index";
-import {AttachedModule, Attachment, ModuleType} from "./protocol/module";
+import {Attachment, ModuleType} from "./protocol/module";
+import type {AttachedModule as ProtocolAttachedModule} from "./protocol/module";
 
 const logger = new Logger("Gateway");
 


@@ 186,18 187,18 @@ export async function gateway_connect(gateway_url: string, username: string): Pr
             } else if (pkt_id == MessageS2CModuleAdd_packetInfo.type) {
                 let pkt = MessageS2CModuleAdd.decode(pkt_data);
                 let module = {
-                    module_type: pkt.module.moduleType,
-                    rotation: pkt.module.rotation,
-                    x: pkt.module.x,
-                    y: pkt.module.y,
-                    children: pkt.module.children,
+                    module_type: pkt.module!.moduleType,
+                    rotation: pkt.module!.rotation,
+                    x: pkt.module!.x,
+                    y: pkt.module!.y,
+                    children: pkt.module!.children,
                 };
-                global.tree.set(pkt.module.id, module);
+                global.tree.set(pkt.module!.id, module);
             } else if (pkt_id == MessageS2CModuleTreeUpdate_packetInfo.type) {
                 let pkt = MessageS2CModuleTreeUpdate.decode(pkt_data);
-                let modules: AttachedModule[] = [];
-                pkt.tree.forEach((value: AttachedModule) => {
-                    modules.push({
+                let modules: Map<number, AttachedModule> = new Map<number, AttachedModule>();
+                pkt.tree.forEach((value: ProtocolAttachedModule) => {
+                    modules.set(value.id, {
                         module_type: value.moduleType,
                         rotation: value.rotation,
                         x: value.x,

@@ 126,16 126,8 @@ async function client_main(server: string, username: string, texture_quality: st
     let canvas = document.getElementById("canvas")!;
 
     document.onmousedown = (e) => {
-        let canvasLeft = canvas.offsetLeft + canvas.clientLeft;
-        let canvasTop = canvas.offsetTop + canvas.clientTop;
-
-        let screenspaceX = e.pageX - canvasLeft;
-        let screenspaceY = e.pageY - canvasTop;
-
         // convert screenspace to worldspace
         if (global.me !== null) {
-            //let worldX = screenspaceX + global.me?.x;
-            //let worldY = screenspaceY + global.me?.y;
             let worldX = e.clientX - window.innerWidth / 2 + global.me?.x;
             let worldY = e.clientY - window.innerHeight / 2 + global.me?.y;
 


@@ 179,12 171,6 @@ async function client_main(server: string, username: string, texture_quality: st
     }
 
     document.onmouseup = (e) => {
-        let canvasLeft = canvas.offsetLeft + canvas.clientLeft;
-        let canvasTop = canvas.offsetTop + canvas.clientTop;
-
-        let screenspaceX = e.pageX - canvasLeft;
-        let screenspaceY = e.pageY - canvasTop;
-
         // convert screenspace to worldspace
         if (global.me !== null) {
             let worldX = e.clientX - window.innerWidth / 2 + global.me?.x;


@@ 389,7 375,7 @@ async function client_main(server: string, username: string, texture_quality: st
             }
         }
 
-        global.tree.forEach((value: AttachedModule, key: number) => {
+        global.tree.forEach((value: AttachedModule, _key: number) => {
             if (global.me !== null) {
                 console.log(value.x + ", " + value.y);
                 // @ts-ignore