From 12f2a7613a1e454787ed023dab283fd41207a092 Mon Sep 17 00:00:00 2001
From: dank074 <torresefrain10@gmail.com>
Date: Tue, 26 Oct 2021 20:07:46 -0500
Subject: [PATCH] updated outgoing layout packets

---
 src/nitro/communication/NitroMessages.ts       | 18 +++++++++---------
 .../messages/outgoing/OutgoingHeader.ts        |  4 ++--
 .../messages/outgoing/room/index.ts            |  2 +-
 .../GetOccupiedTilesMessageComposer.ts}        |  6 +++---
 .../GetRoomEntryDataMessageComposer.ts}        |  6 +++---
 .../GetRoomEntryTileMessageComposer.ts}        |  6 +++---
 .../UpdateFloorPropertiesMessageComposer.ts}   |  6 +++---
 .../messages/outgoing/room/layout/index.ts     |  4 ++++
 .../messages/outgoing/room/mapping/index.ts    |  4 ----
 src/nitro/room/RoomMessageHandler.ts           |  6 +++---
 10 files changed, 31 insertions(+), 31 deletions(-)
 rename src/nitro/communication/messages/outgoing/room/{mapping/RoomBlockedTilesComposer.ts => layout/GetOccupiedTilesMessageComposer.ts} (56%)
 rename src/nitro/communication/messages/outgoing/room/{mapping/RoomDoorSettingsComposer.ts => layout/GetRoomEntryDataMessageComposer.ts} (56%)
 rename src/nitro/communication/messages/outgoing/room/{mapping/RoomModelComposer.ts => layout/GetRoomEntryTileMessageComposer.ts} (56%)
 rename src/nitro/communication/messages/outgoing/room/{mapping/RoomModelSaveComposer.ts => layout/UpdateFloorPropertiesMessageComposer.ts} (67%)
 create mode 100644 src/nitro/communication/messages/outgoing/room/layout/index.ts
 delete mode 100644 src/nitro/communication/messages/outgoing/room/mapping/index.ts

diff --git a/src/nitro/communication/NitroMessages.ts b/src/nitro/communication/NitroMessages.ts
index 4bf20d3b..d3cc3e77 100644
--- a/src/nitro/communication/NitroMessages.ts
+++ b/src/nitro/communication/NitroMessages.ts
@@ -409,10 +409,10 @@ import { FurnitureMannequinSaveNameComposer } from './messages/outgoing/room/fur
 import { OpenPresentComposer } from './messages/outgoing/room/furniture/presents/OpenPresentComposer';
 import { ApplyTonerComposer } from './messages/outgoing/room/furniture/toner/ApplyTonerComposer';
 import { FurnitureWallUpdateComposer } from './messages/outgoing/room/furniture/wall/FurnitureWallUpdateComposer';
-import { RoomBlockedTilesComposer } from './messages/outgoing/room/mapping/RoomBlockedTilesComposer';
-import { RoomDoorSettingsComposer } from './messages/outgoing/room/mapping/RoomDoorSettingsComposer';
-import { RoomModelComposer } from './messages/outgoing/room/mapping/RoomModelComposer';
-import { RoomModelSaveComposer } from './messages/outgoing/room/mapping/RoomModelSaveComposer';
+import { GetOccupiedTilesMessageComposer } from './messages/outgoing/room/layout/GetOccupiedTilesMessageComposer';
+import { GetRoomEntryDataMessageComposer } from './messages/outgoing/room/layout/GetRoomEntryDataMessageComposer';
+import { GetRoomEntryTileMessageComposer } from './messages/outgoing/room/layout/GetRoomEntryTileMessageComposer';
+import { UpdateFloorPropertiesMessageComposer } from './messages/outgoing/room/layout/UpdateFloorPropertiesMessageComposer';
 import { RedeemItemClothingComposer } from './messages/outgoing/room/RedeemItemClothingComposer';
 import { RoomCreateComposer } from './messages/outgoing/room/RoomCreateComposer';
 import { RoomUnitChatComposer } from './messages/outgoing/room/unit/chat/RoomUnitChatComposer';
@@ -1141,11 +1141,11 @@ export class NitroMessages implements IMessageConfiguration
         this._composers.set(OutgoingHeader.ITEM_EXCHANGE_REDEEM, FurnitureExchangeComposer);
         this._composers.set(OutgoingHeader.ITEM_CLOTHING_REDEEM, RedeemItemClothingComposer);
 
-        // MAPPING
-        this._composers.set(OutgoingHeader.ROOM_MODEL, RoomModelComposer);
-        this._composers.set(OutgoingHeader.ROOM_MODEL_BLOCKED_TILES, RoomBlockedTilesComposer);
-        this._composers.set(OutgoingHeader.ROOM_MODEL_DOOR, RoomDoorSettingsComposer);
-        this._composers.set(OutgoingHeader.ROOM_MODEL_SAVE, RoomModelSaveComposer);
+        // LAYOUT
+        this._composers.set(OutgoingHeader.ROOM_MODEL, GetRoomEntryDataMessageComposer);
+        this._composers.set(OutgoingHeader.GET_OCCUPIED_TILES, GetOccupiedTilesMessageComposer);
+        this._composers.set(OutgoingHeader.GET_ROOM_ENTRY_TILE, GetRoomEntryTileMessageComposer);
+        this._composers.set(OutgoingHeader.ROOM_MODEL_SAVE, UpdateFloorPropertiesMessageComposer);
 
         // UNIT
         this._composers.set(OutgoingHeader.UNIT_ACTION, RoomUnitActionComposer);
diff --git a/src/nitro/communication/messages/outgoing/OutgoingHeader.ts b/src/nitro/communication/messages/outgoing/OutgoingHeader.ts
index 2be04f88..d0459988 100644
--- a/src/nitro/communication/messages/outgoing/OutgoingHeader.ts
+++ b/src/nitro/communication/messages/outgoing/OutgoingHeader.ts
@@ -133,8 +133,8 @@ export class OutgoingHeader
     public static ROOM_KICK                      = 1320;
     public static ROOM_LIKE                      = 3582;
     public static ROOM_MODEL                     = 2300;
-    public static ROOM_MODEL_BLOCKED_TILES       = 1687;
-    public static ROOM_MODEL_DOOR                = 3559;
+    public static GET_OCCUPIED_TILES             = 1687;
+    public static GET_ROOM_ENTRY_TILE            = 3559;
     public static ROOM_MODEL_SAVE                = 875;
     public static ROOM_MUTE                      = 3637;
     public static ROOM_MUTE_USER                 = 3485;
diff --git a/src/nitro/communication/messages/outgoing/room/index.ts b/src/nitro/communication/messages/outgoing/room/index.ts
index d9fd832c..047a28e1 100644
--- a/src/nitro/communication/messages/outgoing/room/index.ts
+++ b/src/nitro/communication/messages/outgoing/room/index.ts
@@ -4,7 +4,7 @@ export * from './bots';
 export * from './data';
 export * from './engine';
 export * from './furniture';
-export * from './mapping';
+export * from './layout';
 export * from './RedeemItemClothingComposer';
 export * from './RoomCreateComposer';
 export * from './session';
diff --git a/src/nitro/communication/messages/outgoing/room/mapping/RoomBlockedTilesComposer.ts b/src/nitro/communication/messages/outgoing/room/layout/GetOccupiedTilesMessageComposer.ts
similarity index 56%
rename from src/nitro/communication/messages/outgoing/room/mapping/RoomBlockedTilesComposer.ts
rename to src/nitro/communication/messages/outgoing/room/layout/GetOccupiedTilesMessageComposer.ts
index f55d5f9f..fa1983b5 100644
--- a/src/nitro/communication/messages/outgoing/room/mapping/RoomBlockedTilesComposer.ts
+++ b/src/nitro/communication/messages/outgoing/room/layout/GetOccupiedTilesMessageComposer.ts
@@ -1,8 +1,8 @@
 import { IMessageComposer } from '../../../../../../core/communication/messages/IMessageComposer';
 
-export class RoomBlockedTilesComposer implements IMessageComposer<ConstructorParameters<typeof RoomBlockedTilesComposer>>
+export class GetOccupiedTilesMessageComposer implements IMessageComposer<ConstructorParameters<typeof GetOccupiedTilesMessageComposer>>
 {
-    private _data: ConstructorParameters<typeof RoomBlockedTilesComposer>;
+    private _data: ConstructorParameters<typeof GetOccupiedTilesMessageComposer>;
 
     constructor()
     {
@@ -18,4 +18,4 @@ export class RoomBlockedTilesComposer implements IMessageComposer<ConstructorPar
     {
         return;
     }
-}
\ No newline at end of file
+}
diff --git a/src/nitro/communication/messages/outgoing/room/mapping/RoomDoorSettingsComposer.ts b/src/nitro/communication/messages/outgoing/room/layout/GetRoomEntryDataMessageComposer.ts
similarity index 56%
rename from src/nitro/communication/messages/outgoing/room/mapping/RoomDoorSettingsComposer.ts
rename to src/nitro/communication/messages/outgoing/room/layout/GetRoomEntryDataMessageComposer.ts
index eae30ae6..c2f98d0d 100644
--- a/src/nitro/communication/messages/outgoing/room/mapping/RoomDoorSettingsComposer.ts
+++ b/src/nitro/communication/messages/outgoing/room/layout/GetRoomEntryDataMessageComposer.ts
@@ -1,8 +1,8 @@
 import { IMessageComposer } from '../../../../../../core/communication/messages/IMessageComposer';
 
-export class RoomDoorSettingsComposer implements IMessageComposer<ConstructorParameters<typeof RoomDoorSettingsComposer>>
+export class GetRoomEntryDataMessageComposer implements IMessageComposer<ConstructorParameters<typeof GetRoomEntryDataMessageComposer>>
 {
-    private _data: ConstructorParameters<typeof RoomDoorSettingsComposer>;
+    private _data: ConstructorParameters<typeof GetRoomEntryDataMessageComposer>;
 
     constructor()
     {
@@ -18,4 +18,4 @@ export class RoomDoorSettingsComposer implements IMessageComposer<ConstructorPar
     {
         return;
     }
-}
\ No newline at end of file
+}
diff --git a/src/nitro/communication/messages/outgoing/room/mapping/RoomModelComposer.ts b/src/nitro/communication/messages/outgoing/room/layout/GetRoomEntryTileMessageComposer.ts
similarity index 56%
rename from src/nitro/communication/messages/outgoing/room/mapping/RoomModelComposer.ts
rename to src/nitro/communication/messages/outgoing/room/layout/GetRoomEntryTileMessageComposer.ts
index df3c5198..d06e22e8 100644
--- a/src/nitro/communication/messages/outgoing/room/mapping/RoomModelComposer.ts
+++ b/src/nitro/communication/messages/outgoing/room/layout/GetRoomEntryTileMessageComposer.ts
@@ -1,8 +1,8 @@
 import { IMessageComposer } from '../../../../../../core/communication/messages/IMessageComposer';
 
-export class RoomModelComposer implements IMessageComposer<ConstructorParameters<typeof RoomModelComposer>>
+export class GetRoomEntryTileMessageComposer implements IMessageComposer<ConstructorParameters<typeof GetRoomEntryTileMessageComposer>>
 {
-    private _data: ConstructorParameters<typeof RoomModelComposer>;
+    private _data: ConstructorParameters<typeof GetRoomEntryTileMessageComposer>;
 
     constructor()
     {
@@ -18,4 +18,4 @@ export class RoomModelComposer implements IMessageComposer<ConstructorParameters
     {
         return;
     }
-}
\ No newline at end of file
+}
diff --git a/src/nitro/communication/messages/outgoing/room/mapping/RoomModelSaveComposer.ts b/src/nitro/communication/messages/outgoing/room/layout/UpdateFloorPropertiesMessageComposer.ts
similarity index 67%
rename from src/nitro/communication/messages/outgoing/room/mapping/RoomModelSaveComposer.ts
rename to src/nitro/communication/messages/outgoing/room/layout/UpdateFloorPropertiesMessageComposer.ts
index 3943f466..583c205c 100644
--- a/src/nitro/communication/messages/outgoing/room/mapping/RoomModelSaveComposer.ts
+++ b/src/nitro/communication/messages/outgoing/room/layout/UpdateFloorPropertiesMessageComposer.ts
@@ -1,8 +1,8 @@
 import { IMessageComposer } from '../../../../../../core/communication/messages/IMessageComposer';
 
-export class RoomModelSaveComposer implements IMessageComposer<ConstructorParameters<typeof RoomModelSaveComposer>>
+export class UpdateFloorPropertiesMessageComposer implements IMessageComposer<ConstructorParameters<typeof UpdateFloorPropertiesMessageComposer>>
 {
-    private _data: ConstructorParameters<typeof RoomModelSaveComposer>;
+    private _data: ConstructorParameters<typeof UpdateFloorPropertiesMessageComposer>;
 
     constructor(model: string, doorX: number, doorY: number, doorDirection: number, thicknessWall: number, thicknessFloor: number, wallHeight: number)
     {
@@ -18,4 +18,4 @@ export class RoomModelSaveComposer implements IMessageComposer<ConstructorParame
     {
         return;
     }
-}
\ No newline at end of file
+}
diff --git a/src/nitro/communication/messages/outgoing/room/layout/index.ts b/src/nitro/communication/messages/outgoing/room/layout/index.ts
new file mode 100644
index 00000000..e8a3d7c0
--- /dev/null
+++ b/src/nitro/communication/messages/outgoing/room/layout/index.ts
@@ -0,0 +1,4 @@
+export * from './GetOccupiedTilesMessageComposer';
+export * from './GetRoomEntryDataMessageComposer';
+export * from './GetRoomEntryTileMessageComposer';
+export * from './UpdateFloorPropertiesMessageComposer';
diff --git a/src/nitro/communication/messages/outgoing/room/mapping/index.ts b/src/nitro/communication/messages/outgoing/room/mapping/index.ts
deleted file mode 100644
index ca5941e7..00000000
--- a/src/nitro/communication/messages/outgoing/room/mapping/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './RoomBlockedTilesComposer';
-export * from './RoomDoorSettingsComposer';
-export * from './RoomModelComposer';
-export * from './RoomModelSaveComposer';
diff --git a/src/nitro/room/RoomMessageHandler.ts b/src/nitro/room/RoomMessageHandler.ts
index d7477081..c85824aa 100644
--- a/src/nitro/room/RoomMessageHandler.ts
+++ b/src/nitro/room/RoomMessageHandler.ts
@@ -44,7 +44,7 @@ import { RoomUnitStatusEvent } from '../communication/messages/incoming/room/uni
 import { UserInfoEvent } from '../communication/messages/incoming/user/data/UserInfoEvent';
 import { IgnoreResultEvent } from '../communication/messages/incoming/user/IgnoreResultEvent';
 import { FurnitureAliasesComposer } from '../communication/messages/outgoing/room/furniture/FurnitureAliasesComposer';
-import { RoomModelComposer } from '../communication/messages/outgoing/room/mapping/RoomModelComposer';
+import { GetRoomEntryDataMessageComposer } from '../communication/messages/outgoing/room/layout/GetRoomEntryDataMessageComposer';
 import { FurnitureFloorDataParser } from '../communication/messages/parser/room/furniture/floor/FurnitureFloorDataParser';
 import { FurnitureWallDataParser } from '../communication/messages/parser/room/furniture/wall/FurnitureWallDataParser';
 import { RoomDoorParser } from '../communication/messages/parser/room/mapping/RoomDoorParser';
@@ -199,7 +199,7 @@ export class RoomMessageHandler extends Disposable
             return;
         }
 
-        event.connection.send(new RoomModelComposer());
+        event.connection.send(new GetRoomEntryDataMessageComposer());
     }
 
     private onRoomPaintEvent(event: RoomPaintEvent): void
@@ -482,7 +482,7 @@ export class RoomMessageHandler extends Disposable
 
         const alises = event.getParser().aliases;
 
-        this._connection.send(new RoomModelComposer());
+        this._connection.send(new GetRoomEntryDataMessageComposer());
     }
 
     private onFurnitureFloorAddEvent(event: FurnitureFloorAddEvent): void