From 175e706b51e2b3e753d7dd002a1597f12c3f09a1 Mon Sep 17 00:00:00 2001 From: Bill Date: Thu, 3 Nov 2022 14:40:24 -0400 Subject: [PATCH] Move events --- .../avatar/IAvatarAssetDownloadLibrary.ts | 8 + .../avatar/IEffectAssetDownloadLibrary.ts | 10 + src/api/nitro/avatar/index.ts | 2 + src/api/nitro/room/object/IPetFigureData.ts | 10 + src/api/nitro/room/object/index.ts | 1 + src/api/nitro/session/IPollChoice.ts | 6 + src/api/nitro/session/IPollQuestion.ts | 14 + src/api/nitro/session/IQuestion.ts | 12 + src/api/nitro/session/IRoomPetData.ts | 30 + src/api/nitro/session/index.ts | 4 + src/api/room/IPetBreedingResultData.ts | 10 + src/api/room/index.ts | 1 + src/core/common/EventDispatcher.ts | 31 +- src/core/common/index.ts | 1 - src/core/communication/SocketConnection.ts | 70 +- src/core/communication/index.ts | 1 - .../messages/MessageClassManager.ts | 42 +- src/core/communication/messages/index.ts | 1 - src/core/configuration/ConfigurationEvent.ts | 2 +- src/{nitro => }/events/NitroSettingsEvent.ts | 2 +- src/{nitro => }/events/NitroSoundEvent.ts | 2 +- .../events/NitroToolbarAnimateIconEvent.ts | 0 src/{nitro => }/events/NitroToolbarEvent.ts | 2 +- .../avatar/AvatarRenderEffectLibraryEvent.ts | 21 + .../avatar}/AvatarRenderEvent.ts | 0 src/events/avatar/AvatarRenderLibraryEvent.ts | 21 + .../avatar/events => events/avatar}/index.ts | 0 .../camera/RoomCameraWidgetManagerEvent.ts | 2 +- src/events/camera/index.ts | 1 + .../NitroCommunicationDemoEvent.ts | 4 +- .../demo => events/communication}/index.ts | 1 - .../messages => events/core}/MessageEvent.ts | 2 +- .../common => events/core}/NitroEvent.ts | 0 .../core}/SocketConnectionEvent.ts | 2 +- src/events/core/index.ts | 3 + src/events/index.ts | 11 + .../localization/NitroLocalizationEvent.ts | 2 +- src/events/localization/index.ts | 1 + .../room}/RoomBackgroundColorEvent.ts | 0 .../events => events/room}/RoomDragEvent.ts | 0 .../room}/RoomEngineDimmerStateEvent.ts | 0 .../events => events/room}/RoomEngineEvent.ts | 2 +- .../room}/RoomEngineObjectEvent.ts | 0 .../room}/RoomEngineObjectPlacedEvent.ts | 0 .../RoomEngineObjectPlacedOnUserEvent.ts | 0 .../room}/RoomEngineObjectPlaySoundEvent.ts | 0 .../room}/RoomEngineRoomAdEvent.ts | 0 .../room}/RoomEngineSamplePlaybackEvent.ts | 0 .../room}/RoomEngineTriggerWidgetEvent.ts | 0 .../room}/RoomEngineUseProductEvent.ts | 0 .../room}/RoomObjectBadgeAssetEvent.ts | 4 +- .../room}/RoomObjectDataRequestEvent.ts | 4 +- .../room}/RoomObjectDimmerStateUpdateEvent.ts | 4 +- .../room}/RoomObjectFloorHoleEvent.ts | 4 +- .../room}/RoomObjectFurnitureActionEvent.ts | 2 +- .../room}/RoomObjectHSLColorEnableEvent.ts | 4 +- .../room}/RoomObjectHSLColorEnabledEvent.ts | 0 .../room}/RoomObjectMoveEvent.ts | 4 +- .../room}/RoomObjectPlaySoundIdEvent.ts | 2 +- .../room}/RoomObjectRoomAdEvent.ts | 4 +- .../room}/RoomObjectSamplePlaybackEvent.ts | 4 +- .../room}/RoomObjectSoundMachineEvent.ts | 0 .../room}/RoomObjectStateChangedEvent.ts | 4 +- .../room}/RoomObjectTileMouseEvent.ts | 4 +- .../room}/RoomObjectWallMouseEvent.ts | 10 +- .../room}/RoomObjectWidgetRequestEvent.ts | 4 +- .../room}/RoomToObjectOwnAvatarMoveEvent.ts | 4 +- .../events => events/room}/RoomZoomEvent.ts | 0 .../room/events => events/room}/index.ts | 0 .../session}/BadgeImageReadyEvent.ts | 2 +- .../session}/MysteryBoxKeysUpdateEvent.ts | 2 +- .../session}/PerksUpdatedEvent.ts | 2 +- .../session}/RoomSessionChatEvent.ts | 2 +- .../RoomSessionConfirmPetBreedingEvent.ts | 2 +- ...oomSessionConfirmPetBreedingResultEvent.ts | 2 +- .../session}/RoomSessionDanceEvent.ts | 2 +- .../session}/RoomSessionDimmerPresetsEvent.ts | 4 +- ...RoomSessionDimmerPresetsEventPresetItem.ts | 0 .../session}/RoomSessionDoorbellEvent.ts | 2 +- .../session}/RoomSessionErrorMessageEvent.ts | 2 +- .../session}/RoomSessionEvent.ts | 4 +- .../RoomSessionFavoriteGroupUpdateEvent.ts | 2 +- .../session}/RoomSessionFriendRequestEvent.ts | 2 +- .../RoomSessionNestBreedingSuccessEvent.ts | 2 +- .../session}/RoomSessionPetBreedingEvent.ts | 2 +- .../RoomSessionPetBreedingResultEvent.ts | 13 +- .../RoomSessionPetCommandsUpdateEvent.ts | 2 +- .../RoomSessionPetFigureUpdateEvent.ts | 2 +- .../session}/RoomSessionPetInfoUpdateEvent.ts | 9 +- .../RoomSessionPetLevelUpdateEvent.ts | 2 +- .../session}/RoomSessionPetPackageEvent.ts | 9 +- .../RoomSessionPetStatusUpdateEvent.ts | 2 +- .../session}/RoomSessionPollEvent.ts | 10 +- .../session}/RoomSessionPresentEvent.ts | 2 +- .../RoomSessionPropertyUpdateEvent.ts | 2 +- .../session}/RoomSessionQueueEvent.ts | 2 +- .../session}/RoomSessionSpectatorModeEvent.ts | 2 +- .../session}/RoomSessionUserBadgesEvent.ts | 2 +- .../RoomSessionUserDataUpdateEvent.ts | 2 +- .../RoomSessionUserFigureUpdateEvent.ts | 2 +- .../session}/RoomSessionUserTagsEvent.ts | 2 +- .../session}/RoomSessionVoteEvent.ts | 4 +- .../session}/RoomSessionWordQuizEvent.ts | 3 +- .../session}/SessionDataPreferencesEvent.ts | 2 +- .../session}/UserNameUpdateEvent.ts | 2 +- .../events => events/session}/index.ts | 0 src/index.ts | 1 + src/nitro/Nitro.ts | 5 +- .../avatar/AvatarAssetDownloadLibrary.ts | 14 +- .../avatar/AvatarAssetDownloadManager.ts | 8 +- src/nitro/avatar/AvatarRenderManager.ts | 16 +- .../avatar/EffectAssetDownloadLibrary.ts | 16 +- .../avatar/EffectAssetDownloadManager.ts | 8 +- .../events/AvatarRenderEffectLibraryEvent.ts | 21 - .../avatar/events/AvatarRenderLibraryEvent.ts | 21 - src/nitro/avatar/index.ts | 1 - .../structure/AvatarStructureDownload.ts | 3 +- src/nitro/camera/RoomCameraWidgetManager.ts | 20 +- src/nitro/camera/index.ts | 1 - .../{demo => }/NitroCommunicationDemo.ts | 12 +- .../NitroCommunicationManager.ts | 23 +- src/nitro/communication/index.ts | 2 +- .../advertisement/InterstitialMessageEvent.ts | 2 +- .../advertisement/RoomAdErrorEvent.ts | 2 +- .../AvailabilityStatusMessageEvent.ts | 2 +- .../AvailabilityTimeMessageEvent.ts | 2 +- .../availability/HotelClosedAndOpensEvent.ts | 2 +- .../HotelClosesAndWillOpenAtEvent.ts | 2 +- .../HotelWillCloseInMinutesEvent.ts | 2 +- .../MaintenanceStatusMessageEvent.ts | 2 +- .../ChangeUserNameResultMessageEvent.ts | 2 +- .../avatar/CheckUserNameResultMessageEvent.ts | 2 +- .../incoming/avatar/FigureUpdateEvent.ts | 2 +- .../incoming/avatar/WardrobeMessageEvent.ts | 2 +- .../incoming/bots/BotAddedToInventoryEvent.ts | 2 +- .../incoming/bots/BotInventoryMessageEvent.ts | 2 +- .../incoming/bots/BotReceivedMessageEvent.ts | 2 +- .../bots/BotRemovedFromInventoryEvent.ts | 2 +- .../callforhelp/CfhSanctionMessageEvent.ts | 2 +- .../callforhelp/CfhTopicsInitEvent.ts | 2 +- .../callforhelp/SanctionStatusEvent.ts | 2 +- .../camera/CameraPublishStatusMessageEvent.ts | 2 +- .../camera/CameraPurchaseOKMessageEvent.ts | 2 +- .../camera/CameraStorageUrlMessageEvent.ts | 2 +- .../camera/CompetitionStatusMessageEvent.ts | 2 +- .../incoming/camera/InitCameraMessageEvent.ts | 2 +- .../camera/ThumbnailStatusMessageEvent.ts | 2 +- .../CampaignCalendarDataMessageEvent.ts | 2 +- .../CampaignCalendarDoorOpenedMessageEvent.ts | 2 +- .../catalog/BonusRareInfoMessageEvent.ts | 2 +- .../BuildersClubFurniCountMessageEvent.ts | 2 +- ...ldersClubSubscriptionStatusMessageEvent.ts | 2 +- .../BundleDiscountRulesetMessageEvent.ts | 2 +- .../catalog/CatalogPageExpirationEvent.ts | 2 +- .../catalog/CatalogPageMessageEvent.ts | 2 +- ...talogPageWithEarliestExpiryMessageEvent.ts | 2 +- .../incoming/catalog/CatalogPagesListEvent.ts | 2 +- .../catalog/CatalogPublishedMessageEvent.ts | 2 +- .../incoming/catalog/ClubGiftInfoEvent.ts | 2 +- .../incoming/catalog/ClubGiftSelectedEvent.ts | 2 +- .../DirectSMSClubBuyAvailableMessageEvent.ts | 2 +- .../catalog/GiftReceiverNotFoundEvent.ts | 2 +- .../catalog/GiftWrappingConfigurationEvent.ts | 2 +- .../HabboClubExtendOfferMessageEvent.ts | 2 +- .../catalog/HabboClubOffersMessageEvent.ts | 2 +- .../catalog/IsOfferGiftableMessageEvent.ts | 2 +- .../catalog/LimitedEditionSoldOutEvent.ts | 2 +- .../LimitedOfferAppearingNextMessageEvent.ts | 2 +- .../catalog/NotEnoughBalanceMessageEvent.ts | 2 +- .../incoming/catalog/ProductOfferEvent.ts | 2 +- .../catalog/PurchaseErrorMessageEvent.ts | 2 +- .../catalog/PurchaseNotAllowedMessageEvent.ts | 2 +- .../catalog/PurchaseOKMessageEvent.ts | 2 +- .../catalog/RoomAdPurchaseInfoEvent.ts | 2 +- .../SeasonalCalendarDailyOfferMessageEvent.ts | 2 +- .../SellablePetPalettesMessageEvent.ts | 2 +- .../incoming/catalog/TargetedOfferEvent.ts | 2 +- .../catalog/TargetedOfferNotFoundEvent.ts | 2 +- .../catalog/VoucherRedeemErrorMessageEvent.ts | 2 +- .../catalog/VoucherRedeemOkMessageEvent.ts | 2 +- .../incoming/client/ClientPingEvent.ts | 2 +- .../CompetitionEntrySubmitResultEvent.ts | 2 +- .../CompetitionVotingInfoMessageEvent.ts | 2 +- .../CurrentTimingCodeMessageEvent.ts | 2 +- .../IsUserPartOfCompetitionMessageEvent.ts | 2 +- .../NoOwnedRoomsAlertMessageEvent.ts | 2 +- .../competition/SecondsUntilMessageEvent.ts | 2 +- .../crafting/CraftableProductsEvent.ts | 2 +- .../incoming/crafting/CraftingRecipeEvent.ts | 2 +- .../crafting/CraftingRecipesAvailableEvent.ts | 2 +- .../incoming/crafting/CraftingResultEvent.ts | 2 +- .../incoming/desktop/DesktopViewEvent.ts | 2 +- .../friendlist/AcceptFriendResultEvent.ts | 2 +- .../FindFriendsProcessResultEvent.ts | 2 +- .../friendlist/FollowFriendFailedEvent.ts | 2 +- .../friendlist/FriendListFragmentEvent.ts | 2 +- .../friendlist/FriendListUpdateEvent.ts | 2 +- .../friendlist/FriendNotificationEvent.ts | 2 +- .../friendlist/FriendRequestsEvent.ts | 2 +- .../friendlist/HabboSearchResultEvent.ts | 2 +- .../friendlist/InstantMessageErrorEvent.ts | 2 +- .../incoming/friendlist/MessageErrorEvent.ts | 2 +- .../incoming/friendlist/MessengerInitEvent.ts | 2 +- .../friendlist/MiniMailNewMessageEvent.ts | 2 +- .../friendlist/MiniMailUnreadCountEvent.ts | 2 +- .../friendlist/NewConsoleMessageEvent.ts | 2 +- .../friendlist/NewFriendRequestEvent.ts | 2 +- .../friendlist/RoomInviteErrorEvent.ts | 2 +- .../incoming/friendlist/RoomInviteEvent.ts | 2 +- .../Game2AccountGameStatusMessageEvent.ts | 2 +- ...ievementResolutionCompletedMessageEvent.ts | 2 +- ...hievementResolutionProgressMessageEvent.ts | 2 +- .../AchievementResolutionsMessageEvent.ts | 2 +- .../lobby/GameAchievementsMessageEvent.ts | 2 +- .../game/lobby/GameInviteMessageEvent.ts | 2 +- .../game/lobby/GameListMessageEvent.ts | 2 +- .../game/lobby/GameStatusMessageEvent.ts | 2 +- .../game/lobby/JoinedQueueMessageEvent.ts | 2 +- .../lobby/JoiningQueueFailedMessageEvent.ts | 2 +- .../game/lobby/LeftQueueMessageEvent.ts | 2 +- .../game/lobby/LoadGameMessageEvent.ts | 2 +- .../incoming/game/lobby/LoadGameUrlEvent.ts | 2 +- .../game/lobby/UnloadGameMessageEvent.ts | 2 +- .../lobby/UserGameAchievementsMessageEvent.ts | 2 +- .../incoming/generic/GenericErrorEvent.ts | 2 +- .../incoming/group/GroupBadgePartsEvent.ts | 2 +- .../incoming/group/GroupBuyDataEvent.ts | 2 +- .../group/GroupConfirmMemberRemoveEvent.ts | 2 +- .../incoming/group/GroupInformationEvent.ts | 2 +- .../incoming/group/GroupMembersEvent.ts | 2 +- .../incoming/group/GroupPurchasedEvent.ts | 2 +- .../incoming/group/GroupSettingsEvent.ts | 2 +- .../HabboGroupDeactivatedMessageEvent.ts | 2 +- .../groupforums/ForumDataMessageEvent.ts | 2 +- .../groupforums/ForumsListMessageEvent.ts | 2 +- .../groupforums/GuildForumThreadsEvent.ts | 2 +- .../groupforums/PostMessageMessageEvent.ts | 2 +- .../groupforums/PostThreadMessageEvent.ts | 2 +- .../groupforums/ThreadMessagesMessageEvent.ts | 2 +- .../UnreadForumsCountMessageEvent.ts | 2 +- .../groupforums/UpdateMessageMessageEvent.ts | 2 +- .../groupforums/UpdateThreadMessageEvent.ts | 2 +- .../handshake/NoobnessLevelMessageEvent.ts | 2 +- .../CallForHelpDisabledNotifyMessageEvent.ts | 2 +- ...lForHelpPendingCallsDeletedMessageEvent.ts | 2 +- .../CallForHelpPendingCallsMessageEvent.ts | 2 +- .../help/CallForHelpReplyMessageEvent.ts | 2 +- .../help/CallForHelpResultMessageEvent.ts | 2 +- .../ChatReviewSessionDetachedMessageEvent.ts | 2 +- ...ReviewSessionOfferedToGuideMessageEvent.ts | 2 +- .../ChatReviewSessionResultsMessageEvent.ts | 2 +- .../ChatReviewSessionStartedMessageEvent.ts | 2 +- ...atReviewSessionVotingStatusMessageEvent.ts | 2 +- .../help/GuideOnDutyStatusMessageEvent.ts | 2 +- .../help/GuideReportingStatusMessageEvent.ts | 2 +- .../help/GuideSessionAttachedMessageEvent.ts | 2 +- .../help/GuideSessionDetachedMessageEvent.ts | 2 +- .../help/GuideSessionEndedMessageEvent.ts | 2 +- .../help/GuideSessionErrorMessageEvent.ts | 2 +- ...deSessionInvitedToGuideRoomMessageEvent.ts | 2 +- .../help/GuideSessionMessageMessageEvent.ts | 2 +- ...GuideSessionPartnerIsTypingMessageEvent.ts | 2 +- .../GuideSessionRequesterRoomMessageEvent.ts | 2 +- .../help/GuideSessionStartedMessageEvent.ts | 2 +- .../GuideTicketCreationResultMessageEvent.ts | 2 +- .../help/GuideTicketResolutionMessageEvent.ts | 2 +- .../help/HotelMergeNameChangeEvent.ts | 2 +- .../IssueCloseNotificationMessageEvent.ts | 2 +- .../incoming/help/QuizDataMessageEvent.ts | 2 +- .../incoming/help/QuizResultsMessageEvent.ts | 2 +- .../achievements/AchievementEvent.ts | 2 +- .../achievements/AchievementsEvent.ts | 2 +- .../achievements/AchievementsScoreEvent.ts | 2 +- .../AvatarEffectActivatedEvent.ts | 2 +- .../avatareffect/AvatarEffectAddedEvent.ts | 2 +- .../avatareffect/AvatarEffectExpiredEvent.ts | 2 +- .../avatareffect/AvatarEffectSelectedEvent.ts | 2 +- .../avatareffect/AvatarEffectsEvent.ts | 2 +- .../inventory/badges/BadgePointLimitsEvent.ts | 2 +- .../inventory/badges/BadgeReceivedEvent.ts | 2 +- .../incoming/inventory/badges/BadgesEvent.ts | 2 +- .../badges/IsBadgeRequestFulfilledEvent.ts | 2 +- .../clothes/FigureSetIdsMessageEvent.ts | 2 +- .../incoming/inventory/clothes/_Str_16135.ts | 2 +- .../incoming/inventory/clothes/_Str_17532.ts | 2 +- .../furni/FurnitureListAddOrUpdateEvent.ts | 2 +- .../inventory/furni/FurnitureListEvent.ts | 2 +- .../furni/FurnitureListInvalidateEvent.ts | 2 +- .../furni/FurnitureListRemovedEvent.ts | 2 +- .../furni/FurniturePostItPlacedEvent.ts | 2 +- .../furni/gifts/PresentOpenedMessageEvent.ts | 2 +- .../pets/PetAddedToInventoryEvent.ts | 2 +- .../inventory/pets/PetInventoryEvent.ts | 2 +- .../inventory/pets/PetReceivedMessageEvent.ts | 2 +- .../pets/PetRemovedFromInventoryEvent.ts | 2 +- .../inventory/trading/TradingAcceptEvent.ts | 2 +- .../inventory/trading/TradingCloseEvent.ts | 2 +- .../trading/TradingCompletedEvent.ts | 2 +- .../trading/TradingConfirmationEvent.ts | 2 +- .../inventory/trading/TradingListItemEvent.ts | 2 +- .../inventory/trading/TradingNotOpenEvent.ts | 2 +- .../inventory/trading/TradingOpenEvent.ts | 2 +- .../trading/TradingOpenFailedEvent.ts | 2 +- .../trading/TradingOtherNotAllowedEvent.ts | 2 +- .../trading/TradingYouAreNotAllowedEvent.ts | 2 +- .../landingview/PromoArticlesMessageEvent.ts | 2 +- .../votes/CommunityGoalVoteMessageEvent.ts | 2 +- .../MarketplaceBuyOfferResultEvent.ts | 2 +- .../MarketplaceCanMakeOfferResult.ts | 2 +- .../MarketplaceCancelOfferResultEvent.ts | 2 +- .../MarketplaceConfigurationEvent.ts | 2 +- .../marketplace/MarketplaceItemStatsEvent.ts | 2 +- .../marketplace/MarketplaceMakeOfferResult.ts | 2 +- .../marketplace/MarketplaceOffersEvent.ts | 2 +- .../marketplace/MarketplaceOwnOffersEvent.ts | 2 +- .../incoming/moderation/CfhChatlogEvent.ts | 2 +- .../moderation/IssueDeletedMessageEvent.ts | 2 +- .../moderation/IssueInfoMessageEvent.ts | 2 +- .../moderation/IssuePickFailedMessageEvent.ts | 2 +- .../ModeratorActionResultMessageEvent.ts | 2 +- .../moderation/ModeratorCautionEvent.ts | 2 +- .../moderation/ModeratorInitMessageEvent.ts | 2 +- .../moderation/ModeratorMessageEvent.ts | 2 +- .../moderation/ModeratorRoomInfoEvent.ts | 2 +- .../ModeratorToolPreferencesEvent.ts | 2 +- .../moderation/ModeratorUserInfoEvent.ts | 2 +- .../incoming/moderation/RoomChatlogEvent.ts | 2 +- .../incoming/moderation/RoomVisitsEvent.ts | 2 +- .../moderation/UserBannedMessageEvent.ts | 2 +- .../incoming/moderation/UserChatlogEvent.ts | 2 +- .../mysterybox/MysteryBoxKeysEvent.ts | 2 +- .../incoming/navigator/CanCreateRoomEvent.ts | 2 +- .../navigator/CanCreateRoomEventEvent.ts | 2 +- .../CategoriesWithVisitorCountEvent.ts | 2 +- .../CompetitionRoomsDataMessageEvent.ts | 2 +- .../navigator/ConvertedRoomIdEvent.ts | 2 +- .../navigator/DoorbellMessageEvent.ts | 2 +- .../navigator/FavouriteChangedEvent.ts | 2 +- .../incoming/navigator/FavouritesEvent.ts | 2 +- .../navigator/FlatAccessDeniedMessageEvent.ts | 2 +- .../incoming/navigator/FlatCreatedEvent.ts | 2 +- .../navigator/GetGuestRoomResultEvent.ts | 2 +- .../navigator/GuestRoomSearchResultEvent.ts | 2 +- .../navigator/NavigatorCollapsedEvent.ts | 2 +- .../navigator/NavigatorHomeRoomEvent.ts | 2 +- .../navigator/NavigatorLiftedEvent.ts | 2 +- .../navigator/NavigatorMetadataEvent.ts | 2 +- .../NavigatorOpenRoomCreatorEvent.ts | 2 +- .../navigator/NavigatorSearchEvent.ts | 2 +- .../navigator/NavigatorSearchesEvent.ts | 2 +- .../navigator/NavigatorSettingsEvent.ts | 2 +- .../navigator/RoomEventCancelEvent.ts | 2 +- .../incoming/navigator/RoomEventEvent.ts | 2 +- .../navigator/RoomSettingsUpdatedEvent.ts | 2 +- .../RoomThumbnailUpdateResultEvent.ts | 2 +- .../incoming/navigator/UserEventCatsEvent.ts | 2 +- .../incoming/navigator/UserFlatCatsEvent.ts | 2 +- .../AchievementNotificationMessageEvent.ts | 2 +- .../ActivityPointNotificationMessageEvent.ts | 2 +- .../incoming/notifications/BotErrorEvent.ts | 2 +- .../ClubGiftNotificationEvent.ts | 2 +- .../HabboBroadcastMessageEvent.ts | 2 +- .../notifications/HotelWillShutdownEvent.ts | 2 +- .../InfoFeedEnableMessageEvent.ts | 2 +- .../notifications/MOTDNotificationEvent.ts | 2 +- .../NotificationDialogMessageEvent.ts | 2 +- .../PetLevelNotificationEvent.ts | 2 +- .../notifications/PetPlacingErrorEvent.ts | 2 +- .../notifications/UnseenItemsEvent.ts | 2 +- .../perk/PerkAllowancesMessageEvent.ts | 2 +- .../incoming/poll/PollContentsEvent.ts | 2 +- .../messages/incoming/poll/PollErrorEvent.ts | 2 +- .../messages/incoming/poll/PollOfferEvent.ts | 2 +- .../incoming/poll/QuestionAnsweredEvent.ts | 2 +- .../messages/incoming/poll/QuestionEvent.ts | 2 +- .../incoming/poll/QuestionFinishedEvent.ts | 2 +- .../CommunityGoalEarnedPrizesMessageEvent.ts | 2 +- .../CommunityGoalHallOfFameMessageEvent.ts | 2 +- .../CommunityGoalProgressMessageEvent.ts | 2 +- ...ConcurrentUsersGoalProgressMessageEvent.ts | 2 +- .../incoming/quest/EpicPopupMessageEvent.ts | 2 +- .../quest/QuestCancelledMessageEvent.ts | 2 +- .../quest/QuestCompletedMessageEvent.ts | 2 +- .../incoming/quest/QuestDailyMessageEvent.ts | 2 +- .../incoming/quest/QuestMessageEvent.ts | 2 +- .../incoming/quest/QuestsMessageEvent.ts | 2 +- .../quest/SeasonalQuestsMessageEvent.ts | 2 +- .../room/access/RoomEnterErrorEvent.ts | 2 +- .../incoming/room/access/RoomEnterEvent.ts | 2 +- .../incoming/room/access/RoomForwardEvent.ts | 2 +- .../doorbell/RoomDoorbellAcceptedEvent.ts | 2 +- .../access/rights/RoomRightsClearEvent.ts | 2 +- .../room/access/rights/RoomRightsEvent.ts | 2 +- .../access/rights/RoomRightsOwnerEvent.ts | 2 +- .../room/bots/BotCommandConfigurationEvent.ts | 2 +- .../room/data/RoomChatSettingsEvent.ts | 2 +- .../room/data/RoomEntryInfoMessageEvent.ts | 2 +- .../incoming/room/data/RoomScoreEvent.ts | 2 +- .../FavoriteMembershipUpdateMessageEvent.ts | 2 +- .../room/engine/ObjectsDataUpdateEvent.ts | 2 +- .../room/engine/ObjectsRollingEvent.ts | 2 +- .../CustomUserNotificationMessageEvent.ts | 2 +- .../room/furniture/DiceValueMessageEvent.ts | 2 +- .../room/furniture/FurnitureAliasesEvent.ts | 2 +- .../room/furniture/FurnitureDataEvent.ts | 2 +- .../furniture/FurnitureStackHeightEvent.ts | 2 +- .../GroupFurniContextMenuInfoMessageEvent.ts | 2 +- .../furniture/ItemDataUpdateMessageEvent.ts | 2 +- .../furniture/LoveLockFurniFinishedEvent.ts | 2 +- .../LoveLockFurniFriendConfirmedEvent.ts | 2 +- .../room/furniture/LoveLockFurniStartEvent.ts | 2 +- .../furniture/OneWayDoorStatusMessageEvent.ts | 2 +- .../RequestSpamWallPostItMessageEvent.ts | 2 +- .../RoomDimmerPresetsMessageEvent.ts | 2 +- .../furniture/floor/FurnitureFloorAddEvent.ts | 2 +- .../furniture/floor/FurnitureFloorEvent.ts | 2 +- .../floor/FurnitureFloorRemoveEvent.ts | 2 +- .../floor/FurnitureFloorUpdateEvent.ts | 2 +- .../furniture/wall/FurnitureWallAddEvent.ts | 2 +- .../room/furniture/wall/FurnitureWallEvent.ts | 2 +- .../wall/FurnitureWallRemoveEvent.ts | 2 +- .../wall/FurnitureWallUpdateEvent.ts | 2 +- .../YoutubeControlVideoMessageEvent.ts | 2 +- .../youtube/YoutubeDisplayPlaylistsEvent.ts | 2 +- .../YoutubeDisplayVideoMessageEvent.ts | 2 +- .../room/mapping/FloorHeightMapEvent.ts | 2 +- .../room/mapping/RoomEntryTileMessageEvent.ts | 2 +- .../room/mapping/RoomHeightMapEvent.ts | 2 +- .../room/mapping/RoomHeightMapUpdateEvent.ts | 2 +- .../mapping/RoomOccupiedTilesMessageEvent.ts | 2 +- .../incoming/room/mapping/RoomPaintEvent.ts | 2 +- .../room/mapping/RoomReadyMessageEvent.ts | 2 +- .../mapping/RoomVisualizationSettingsEvent.ts | 2 +- .../incoming/room/pet/PetExperienceEvent.ts | 2 +- .../incoming/room/pet/PetFigureUpdateEvent.ts | 2 +- .../incoming/room/pet/PetInfoEvent.ts | 2 +- .../incoming/room/pet/PetStatusUpdateEvent.ts | 2 +- .../room/session/YouArePlayingGameEvent.ts | 2 +- .../session/YouAreSpectatorMessageEvent.ts | 2 +- .../incoming/room/unit/RoomUnitDanceEvent.ts | 2 +- .../incoming/room/unit/RoomUnitEffectEvent.ts | 2 +- .../incoming/room/unit/RoomUnitEvent.ts | 2 +- .../room/unit/RoomUnitExpressionEvent.ts | 2 +- .../room/unit/RoomUnitHandItemEvent.ts | 2 +- .../unit/RoomUnitHandItemReceivedEvent.ts | 2 +- .../incoming/room/unit/RoomUnitIdleEvent.ts | 2 +- .../incoming/room/unit/RoomUnitInfoEvent.ts | 2 +- .../incoming/room/unit/RoomUnitNumberEvent.ts | 2 +- .../incoming/room/unit/RoomUnitRemoveEvent.ts | 2 +- .../incoming/room/unit/RoomUnitStatusEvent.ts | 2 +- .../room/unit/chat/FloodControlEvent.ts | 2 +- .../room/unit/chat/RemainingMuteEvent.ts | 2 +- .../room/unit/chat/RoomUnitChatEvent.ts | 2 +- .../room/unit/chat/RoomUnitChatShoutEvent.ts | 2 +- .../unit/chat/RoomUnitChatWhisperEvent.ts | 2 +- .../room/unit/chat/RoomUnitTypingEvent.ts | 2 +- .../roomevents/WiredFurniActionEvent.ts | 2 +- .../roomevents/WiredFurniConditionEvent.ts | 2 +- .../roomevents/WiredFurniTriggerEvent.ts | 2 +- .../incoming/roomevents/WiredOpenEvent.ts | 2 +- .../WiredRewardResultMessageEvent.ts | 2 +- .../roomevents/WiredSaveSuccessEvent.ts | 2 +- .../roomevents/WiredValidationErrorEvent.ts | 2 +- .../roomsettings/BannedUsersFromRoomEvent.ts | 2 +- .../roomsettings/FlatControllerAddedEvent.ts | 2 +- .../FlatControllerRemovedEvent.ts | 2 +- .../roomsettings/FlatControllersEvent.ts | 2 +- .../roomsettings/MuteAllInRoomEvent.ts | 2 +- .../incoming/roomsettings/NoSuchFlatEvent.ts | 2 +- .../roomsettings/RoomSettingsDataEvent.ts | 2 +- .../roomsettings/RoomSettingsErrorEvent.ts | 2 +- .../RoomSettingsSaveErrorEvent.ts | 2 +- .../roomsettings/RoomSettingsSavedEvent.ts | 2 +- .../ShowEnforceRoomCategoryDialogEvent.ts | 2 +- .../roomsettings/UserUnbannedFromRoomEvent.ts | 2 +- .../incoming/security/AuthenticatedEvent.ts | 2 +- .../sound/JukeboxPlayListFullMessageEvent.ts | 2 +- .../sound/JukeboxSongDisksMessageEvent.ts | 2 +- .../incoming/sound/NowPlayingMessageEvent.ts | 2 +- .../sound/OfficialSongIdMessageEvent.ts | 2 +- .../incoming/sound/PlayListMessageEvent.ts | 2 +- .../sound/PlayListSongAddedMessageEvent.ts | 2 +- .../sound/TraxSongInfoMessageEvent.ts | 2 +- .../UserSongDisksInventoryMessageEvent.ts | 2 +- .../talent/TalentTrackMessageEvent.ts | 2 +- .../incoming/user/ApproveNameMessageEvent.ts | 2 +- .../user/GuildMembershipsMessageEvent.ts | 2 +- .../user/HabboGroupBadgesMessageEvent.ts | 2 +- .../incoming/user/IgnoreResultEvent.ts | 2 +- .../incoming/user/IgnoredUsersEvent.ts | 2 +- .../incoming/user/InClientLinkEvent.ts | 2 +- .../user/PetRespectNoficationEvent.ts | 2 +- .../user/PetSupplementedNotificationEvent.ts | 2 +- .../incoming/user/RespectReceivedEvent.ts | 2 +- .../user/ScrSendKickbackInfoMessageEvent.ts | 2 +- .../user/access/UserPermissionsEvent.ts | 2 +- .../user/data/RelationshipStatusInfoEvent.ts | 2 +- .../user/data/UserCurrentBadgesEvent.ts | 2 +- .../incoming/user/data/UserInfoEvent.ts | 2 +- .../user/data/UserNameChangeMessageEvent.ts | 2 +- .../incoming/user/data/UserProfileEvent.ts | 2 +- .../incoming/user/data/UserSettingsEvent.ts | 2 +- .../inventory/currency/UserCreditsEvent.ts | 2 +- .../inventory/currency/UserCurrencyEvent.ts | 2 +- .../subscription/UserSubscriptionEvent.ts | 2 +- .../user/wardrobe/UserWardrobePageEvent.ts | 2 +- .../inventory/pets/PetFigureDataParser.ts | 8 +- .../messages/parser/poll/PollChoice.ts | 34 +- .../messages/parser/poll/PollQuestion.ts | 67 +- .../messages/parser/poll/QuestionParser.ts | 19 +- .../parser/room/pet/PetBreedingResultData.ts | 4 +- src/nitro/events/index.ts | 4 - src/nitro/index.ts | 1 - .../localization/NitroLocalizationManager.ts | 72 +-- src/nitro/localization/index.ts | 1 - src/nitro/room/RoomContentLoader.ts | 161 ++--- src/nitro/room/RoomEngine.ts | 10 +- src/nitro/room/RoomObjectEventHandler.ts | 604 +++++++++--------- src/nitro/room/index.ts | 1 - .../room/object/logic/avatar/AvatarLogic.ts | 2 +- .../FurnitureAchievementResolutionLogic.ts | 18 +- .../furniture/FurnitureBadgeDisplayLogic.ts | 2 +- .../FurnitureChangeStateWhenStepOnLogic.ts | 14 +- .../furniture/FurnitureClothingChangeLogic.ts | 12 +- .../furniture/FurnitureCounterClockLogic.ts | 12 +- .../logic/furniture/FurnitureCreditLogic.ts | 8 +- .../furniture/FurnitureCuckooClockLogic.ts | 8 +- .../FurnitureCustomStackHeightLogic.ts | 6 +- .../logic/furniture/FurnitureDiceLogic.ts | 16 +- .../furniture/FurnitureEcotronBoxLogic.ts | 4 +- .../FurnitureEditableInternalLinkLogic.ts | 22 +- .../FurnitureEditableRoomLinkLogic.ts | 18 +- .../furniture/FurnitureEffectBoxLogic.ts | 4 +- .../furniture/FurnitureExternalImageLogic.ts | 12 +- .../furniture/FurnitureFireworksLogic.ts | 16 +- .../furniture/FurnitureFloorHoleLogic.ts | 30 +- .../furniture/FurnitureFriendFurniLogic.ts | 12 +- .../FurnitureGroupForumTerminalLogic.ts | 4 +- .../FurnitureGuildCustomizedLogic.ts | 2 +- .../furniture/FurnitureHabboWheelLogic.ts | 4 +- .../furniture/FurnitureHighScoreLogic.ts | 10 +- .../furniture/FurnitureHockeyScoreLogic.ts | 14 +- .../furniture/FurnitureInternalLinkLogic.ts | 22 +- .../logic/furniture/FurnitureJukeboxLogic.ts | 24 +- .../object/logic/furniture/FurnitureLogic.ts | 110 ++-- .../furniture/FurnitureMannequinLogic.ts | 8 +- .../FurnitureMonsterplantSeedLogic.ts | 4 +- .../furniture/FurnitureMultiStateLogic.ts | 6 +- .../furniture/FurnitureMysteryBoxLogic.ts | 4 +- .../furniture/FurnitureMysteryTrophyLogic.ts | 4 +- .../furniture/FurnitureOneWayDoorLogic.ts | 4 +- .../FurniturePetCustomizationLogic.ts | 8 +- .../furniture/FurniturePlaceholderLogic.ts | 4 +- .../logic/furniture/FurniturePresentLogic.ts | 24 +- .../FurniturePurchaseableClothingLogic.ts | 4 +- .../furniture/FurnitureRandomStateLogic.ts | 4 +- .../furniture/FurnitureRentableSpaceLogic.ts | 10 +- .../FurnitureRoomBackgroundColorLogic.ts | 22 +- .../furniture/FurnitureRoomBillboardLogic.ts | 6 +- .../furniture/FurnitureRoomBrandingLogic.ts | 58 +- .../furniture/FurnitureRoomDimmerLogic.ts | 28 +- .../furniture/FurnitureSoundBlockLogic.ts | 28 +- .../furniture/FurnitureSoundMachineLogic.ts | 22 +- .../logic/furniture/FurnitureStickieLogic.ts | 12 +- .../logic/furniture/FurnitureTrophyLogic.ts | 4 +- .../furniture/FurnitureWelcomeGiftLogic.ts | 8 +- .../logic/furniture/FurnitureYoutubeLogic.ts | 6 +- src/nitro/room/object/logic/pet/PetLogic.ts | 64 +- src/nitro/room/object/logic/room/RoomLogic.ts | 96 +-- src/nitro/room/preview/RoomPreviewer.ts | 2 +- src/nitro/session/RoomPetData.ts | 4 +- src/nitro/session/RoomSession.ts | 26 +- src/nitro/session/RoomSessionManager.ts | 31 +- src/nitro/session/SessionDataManager.ts | 109 ++-- src/nitro/session/badge/BadgeImageManager.ts | 58 +- .../session/furniture/FurnitureDataLoader.ts | 37 +- .../session/handler/GenericErrorHandler.ts | 12 +- src/nitro/session/handler/PollHandler.ts | 20 +- src/nitro/session/handler/RoomChatHandler.ts | 60 +- src/nitro/session/handler/RoomDataHandler.ts | 10 +- .../handler/RoomDimmerPresetsHandler.ts | 12 +- .../session/handler/RoomPresentHandler.ts | 12 +- .../session/handler/RoomSessionHandler.ts | 39 +- src/nitro/session/handler/RoomUsersHandler.ts | 104 +-- src/nitro/session/handler/WordQuizHandler.ts | 20 +- src/nitro/session/index.ts | 2 +- .../session/product/ProductDataLoader.ts | 13 +- src/nitro/sound/SoundManager.ts | 9 +- src/nitro/sound/events/SoundManagerEvent.ts | 2 +- src/nitro/sound/music/MusicManager.ts | 8 +- src/room/events/RoomContentLoadedEvent.ts | 2 +- src/room/events/RoomObjectEvent.ts | 6 +- src/room/events/RoomToObjectEvent.ts | 2 +- 593 files changed, 1988 insertions(+), 1889 deletions(-) create mode 100644 src/api/nitro/avatar/IAvatarAssetDownloadLibrary.ts create mode 100644 src/api/nitro/avatar/IEffectAssetDownloadLibrary.ts create mode 100644 src/api/nitro/room/object/IPetFigureData.ts create mode 100644 src/api/nitro/session/IPollChoice.ts create mode 100644 src/api/nitro/session/IPollQuestion.ts create mode 100644 src/api/nitro/session/IQuestion.ts create mode 100644 src/api/nitro/session/IRoomPetData.ts create mode 100644 src/api/room/IPetBreedingResultData.ts rename src/{nitro => }/events/NitroSettingsEvent.ts (98%) rename src/{nitro => }/events/NitroSoundEvent.ts (89%) rename src/{nitro => }/events/NitroToolbarAnimateIconEvent.ts (100%) rename src/{nitro => }/events/NitroToolbarEvent.ts (93%) create mode 100644 src/events/avatar/AvatarRenderEffectLibraryEvent.ts rename src/{nitro/avatar/events => events/avatar}/AvatarRenderEvent.ts (100%) create mode 100644 src/events/avatar/AvatarRenderLibraryEvent.ts rename src/{nitro/avatar/events => events/avatar}/index.ts (100%) rename src/{nitro => events}/camera/RoomCameraWidgetManagerEvent.ts (82%) create mode 100644 src/events/camera/index.ts rename src/{nitro/communication/demo => events/communication}/NitroCommunicationDemoEvent.ts (89%) rename src/{nitro/communication/demo => events/communication}/index.ts (52%) rename src/{core/communication/messages => events/core}/MessageEvent.ts (99%) rename src/{core/common => events/core}/NitroEvent.ts (100%) rename src/{core/communication => events/core}/SocketConnectionEvent.ts (94%) create mode 100644 src/events/core/index.ts create mode 100644 src/events/index.ts rename src/{nitro => events}/localization/NitroLocalizationEvent.ts (84%) create mode 100644 src/events/localization/index.ts rename src/{nitro/room/events => events/room}/RoomBackgroundColorEvent.ts (100%) rename src/{nitro/room/events => events/room}/RoomDragEvent.ts (100%) rename src/{nitro/room/events => events/room}/RoomEngineDimmerStateEvent.ts (100%) rename src/{nitro/room/events => events/room}/RoomEngineEvent.ts (94%) rename src/{nitro/room/events => events/room}/RoomEngineObjectEvent.ts (100%) rename src/{nitro/room/events => events/room}/RoomEngineObjectPlacedEvent.ts (100%) rename src/{nitro/room/events => events/room}/RoomEngineObjectPlacedOnUserEvent.ts (100%) rename src/{nitro/room/events => events/room}/RoomEngineObjectPlaySoundEvent.ts (100%) rename src/{nitro/room/events => events/room}/RoomEngineRoomAdEvent.ts (100%) rename src/{nitro/room/events => events/room}/RoomEngineSamplePlaybackEvent.ts (100%) rename src/{nitro/room/events => events/room}/RoomEngineTriggerWidgetEvent.ts (100%) rename src/{nitro/room/events => events/room}/RoomEngineUseProductEvent.ts (100%) rename src/{nitro/room/events => events/room}/RoomObjectBadgeAssetEvent.ts (85%) rename src/{nitro/room/events => events/room}/RoomObjectDataRequestEvent.ts (75%) rename src/{nitro/room/events => events/room}/RoomObjectDimmerStateUpdateEvent.ts (91%) rename src/{nitro/room/events => events/room}/RoomObjectFloorHoleEvent.ts (73%) rename src/{nitro/room/events => events/room}/RoomObjectFurnitureActionEvent.ts (95%) rename src/{nitro/room/events => events/room}/RoomObjectHSLColorEnableEvent.ts (90%) rename src/{nitro/room/events => events/room}/RoomObjectHSLColorEnabledEvent.ts (100%) rename src/{nitro/room/events => events/room}/RoomObjectMoveEvent.ts (74%) rename src/{nitro/room/events => events/room}/RoomObjectPlaySoundIdEvent.ts (94%) rename src/{nitro/room/events => events/room}/RoomObjectRoomAdEvent.ts (90%) rename src/{nitro/room/events => events/room}/RoomObjectSamplePlaybackEvent.ts (89%) rename src/{nitro/room/events => events/room}/RoomObjectSoundMachineEvent.ts (100%) rename src/{nitro/room/events => events/room}/RoomObjectStateChangedEvent.ts (82%) rename src/{nitro/room/events => events/room}/RoomObjectTileMouseEvent.ts (91%) rename src/{nitro/room/events => events/room}/RoomObjectWallMouseEvent.ts (85%) rename src/{nitro/room/events => events/room}/RoomObjectWidgetRequestEvent.ts (96%) rename src/{nitro/room/events => events/room}/RoomToObjectOwnAvatarMoveEvent.ts (80%) rename src/{nitro/room/events => events/room}/RoomZoomEvent.ts (100%) rename src/{nitro/room/events => events/room}/index.ts (100%) rename src/{nitro/session/events => events/session}/BadgeImageReadyEvent.ts (93%) rename src/{nitro/session/events => events/session}/MysteryBoxKeysUpdateEvent.ts (92%) rename src/{nitro/session/events => events/session}/PerksUpdatedEvent.ts (80%) rename src/{nitro/session/events => events/session}/RoomSessionChatEvent.ts (97%) rename src/{nitro/session/events => events/session}/RoomSessionConfirmPetBreedingEvent.ts (95%) rename src/{nitro/session/events => events/session}/RoomSessionConfirmPetBreedingResultEvent.ts (93%) rename src/{nitro/session/events => events/session}/RoomSessionDanceEvent.ts (92%) rename src/{nitro/session/events => events/session}/RoomSessionDimmerPresetsEvent.ts (90%) rename src/{nitro/session/events => events/session}/RoomSessionDimmerPresetsEventPresetItem.ts (100%) rename src/{nitro/session/events => events/session}/RoomSessionDoorbellEvent.ts (92%) rename src/{nitro/session/events => events/session}/RoomSessionErrorMessageEvent.ts (96%) rename src/{nitro/session/events => events/session}/RoomSessionEvent.ts (88%) rename src/{nitro/session/events => events/session}/RoomSessionFavoriteGroupUpdateEvent.ts (95%) rename src/{nitro/session/events => events/session}/RoomSessionFriendRequestEvent.ts (94%) rename src/{nitro/session/events => events/session}/RoomSessionNestBreedingSuccessEvent.ts (93%) rename src/{nitro/session/events => events/session}/RoomSessionPetBreedingEvent.ts (94%) rename src/{nitro/session/events => events/session}/RoomSessionPetBreedingResultEvent.ts (53%) rename src/{nitro/session/events => events/session}/RoomSessionPetCommandsUpdateEvent.ts (94%) rename src/{nitro/session/events => events/session}/RoomSessionPetFigureUpdateEvent.ts (92%) rename src/{nitro/session/events => events/session}/RoomSessionPetInfoUpdateEvent.ts (60%) rename src/{nitro/session/events => events/session}/RoomSessionPetLevelUpdateEvent.ts (92%) rename src/{nitro/session/events => events/session}/RoomSessionPetPackageEvent.ts (79%) rename src/{nitro/session/events => events/session}/RoomSessionPetStatusUpdateEvent.ts (96%) rename src/{nitro/session/events => events/session}/RoomSessionPollEvent.ts (87%) rename src/{nitro/session/events => events/session}/RoomSessionPresentEvent.ts (97%) rename src/{nitro/session/events => events/session}/RoomSessionPropertyUpdateEvent.ts (85%) rename src/{nitro/session/events => events/session}/RoomSessionQueueEvent.ts (96%) rename src/{nitro/session/events => events/session}/RoomSessionSpectatorModeEvent.ts (86%) rename src/{nitro/session/events => events/session}/RoomSessionUserBadgesEvent.ts (92%) rename src/{nitro/session/events => events/session}/RoomSessionUserDataUpdateEvent.ts (89%) rename src/{nitro/session/events => events/session}/RoomSessionUserFigureUpdateEvent.ts (96%) rename src/{nitro/session/events => events/session}/RoomSessionUserTagsEvent.ts (91%) rename src/{nitro/session/events => events/session}/RoomSessionVoteEvent.ts (93%) rename src/{nitro/session/events => events/session}/RoomSessionWordQuizEvent.ts (95%) rename src/{nitro/session/events => events/session}/SessionDataPreferencesEvent.ts (87%) rename src/{nitro/session/events => events/session}/UserNameUpdateEvent.ts (88%) rename src/{nitro/session/events => events/session}/index.ts (100%) delete mode 100644 src/nitro/avatar/events/AvatarRenderEffectLibraryEvent.ts delete mode 100644 src/nitro/avatar/events/AvatarRenderLibraryEvent.ts rename src/nitro/communication/{demo => }/NitroCommunicationDemo.ts (94%) delete mode 100644 src/nitro/events/index.ts diff --git a/src/api/nitro/avatar/IAvatarAssetDownloadLibrary.ts b/src/api/nitro/avatar/IAvatarAssetDownloadLibrary.ts new file mode 100644 index 00000000..4ed78f83 --- /dev/null +++ b/src/api/nitro/avatar/IAvatarAssetDownloadLibrary.ts @@ -0,0 +1,8 @@ +import { IEventDispatcher } from '../../common'; + +export interface IAvatarAssetDownloadLibrary extends IEventDispatcher +{ + downloadAsset(): void; + readonly libraryName: string; + readonly isLoaded: boolean; +} diff --git a/src/api/nitro/avatar/IEffectAssetDownloadLibrary.ts b/src/api/nitro/avatar/IEffectAssetDownloadLibrary.ts new file mode 100644 index 00000000..d08cd31a --- /dev/null +++ b/src/api/nitro/avatar/IEffectAssetDownloadLibrary.ts @@ -0,0 +1,10 @@ +import { IAssetAnimation } from '../../asset'; +import { IEventDispatcher } from '../../common'; + +export interface IEffectAssetDownloadLibrary extends IEventDispatcher +{ + downloadAsset(): void; + readonly libraryName: string; + readonly animation: { [index: string]: IAssetAnimation }; + readonly isLoaded: boolean; +} diff --git a/src/api/nitro/avatar/index.ts b/src/api/nitro/avatar/index.ts index 84a5e432..7ad21f64 100644 --- a/src/api/nitro/avatar/index.ts +++ b/src/api/nitro/avatar/index.ts @@ -2,11 +2,13 @@ export * from './actions'; export * from './animation'; export * from './enum'; export * from './figuredata'; +export * from './IAvatarAssetDownloadLibrary'; export * from './IAvatarEffectListener'; export * from './IAvatarFigureContainer'; export * from './IAvatarImage'; export * from './IAvatarImageListener'; export * from './IAvatarRenderManager'; +export * from './IEffectAssetDownloadLibrary'; export * from './IOutfit'; export * from './pet'; export * from './structure'; diff --git a/src/api/nitro/room/object/IPetFigureData.ts b/src/api/nitro/room/object/IPetFigureData.ts new file mode 100644 index 00000000..4a40d1c0 --- /dev/null +++ b/src/api/nitro/room/object/IPetFigureData.ts @@ -0,0 +1,10 @@ +export interface IPetFigureData +{ + readonly typeId: number; + readonly paletteId: number; + readonly color: string; + readonly breedId: number; + readonly figuredata: string; + readonly customParts: number[]; + readonly custompartCount: number; +} diff --git a/src/api/nitro/room/object/index.ts b/src/api/nitro/room/object/index.ts index a1c70596..b2bff00c 100644 --- a/src/api/nitro/room/object/index.ts +++ b/src/api/nitro/room/object/index.ts @@ -1,5 +1,6 @@ export * from './data'; export * from './data/type'; +export * from './IPetFigureData'; export * from './IRoomMapData'; export * from './RoomObjectCategory'; export * from './RoomObjectLogicType'; diff --git a/src/api/nitro/session/IPollChoice.ts b/src/api/nitro/session/IPollChoice.ts new file mode 100644 index 00000000..e6456763 --- /dev/null +++ b/src/api/nitro/session/IPollChoice.ts @@ -0,0 +1,6 @@ +export interface IPollChoice +{ + value: string; + choiceText: string; + choiceType: number; +} diff --git a/src/api/nitro/session/IPollQuestion.ts b/src/api/nitro/session/IPollQuestion.ts new file mode 100644 index 00000000..d85fd9fb --- /dev/null +++ b/src/api/nitro/session/IPollQuestion.ts @@ -0,0 +1,14 @@ +import { IPollChoice } from './IPollChoice'; + +export interface IPollQuestion +{ + questionId: number; + questionType: number; + sortOrder: number; + questionText: string; + questionCategory: number; + questionAnswerType: number; + questionAnswerCount: number; + children: IPollQuestion[]; + questionChoices: IPollChoice[]; +} diff --git a/src/api/nitro/session/IQuestion.ts b/src/api/nitro/session/IQuestion.ts new file mode 100644 index 00000000..fdd1b3f0 --- /dev/null +++ b/src/api/nitro/session/IQuestion.ts @@ -0,0 +1,12 @@ +export interface IQuestion +{ + id: number; + number: number; + type: number; + content: string; + selection_min?: number; + selections?: string[]; + selection_values?: string[]; + selection_count?: number; + selection_max?: number; +} diff --git a/src/api/nitro/session/IRoomPetData.ts b/src/api/nitro/session/IRoomPetData.ts new file mode 100644 index 00000000..70dfbbce --- /dev/null +++ b/src/api/nitro/session/IRoomPetData.ts @@ -0,0 +1,30 @@ +export interface IRoomPetData +{ + id: number; + level: number; + maximumLevel: number; + experience: number; + levelExperienceGoal: number; + energy: number; + maximumEnergy: number; + happyness: number; + maximumHappyness: number; + ownerId: number; + ownerName: string; + respect: number; + age: number; + unknownRarity: number; + saddle: boolean; + rider: boolean; + skillTresholds: number[]; + publiclyRideable: number; + breedable: boolean; + fullyGrown: boolean; + dead: boolean; + rarityLevel: number; + maximumTimeToLive: number; + remainingTimeToLive: number; + remainingGrowTime: number; + publiclyBreedable: boolean; + readonly adultLevel: number; +} diff --git a/src/api/nitro/session/index.ts b/src/api/nitro/session/index.ts index 4101bfe5..0607986a 100644 --- a/src/api/nitro/session/index.ts +++ b/src/api/nitro/session/index.ts @@ -4,10 +4,14 @@ export * from './IFurnitureData'; export * from './IFurnitureDataListener'; export * from './IGroupInformationManager'; export * from './IIgnoredUsersManager'; +export * from './IPollChoice'; +export * from './IPollQuestion'; export * from './IProductData'; export * from './IProductDataListener'; +export * from './IQuestion'; export * from './IRoomHandlerListener'; export * from './IRoomModerationSettings'; +export * from './IRoomPetData'; export * from './IRoomSession'; export * from './IRoomSessionManager'; export * from './IRoomUserData'; diff --git a/src/api/room/IPetBreedingResultData.ts b/src/api/room/IPetBreedingResultData.ts new file mode 100644 index 00000000..b3f8985c --- /dev/null +++ b/src/api/room/IPetBreedingResultData.ts @@ -0,0 +1,10 @@ +export interface IPetBreedingResultData +{ + readonly stuffId: number; + readonly classId: number; + readonly productCode: string; + readonly userId: number; + readonly userName: string; + readonly rarityLevel: number; + readonly hasMutation: boolean; +} diff --git a/src/api/room/index.ts b/src/api/room/index.ts index 001384f7..2f374395 100644 --- a/src/api/room/index.ts +++ b/src/api/room/index.ts @@ -1,3 +1,4 @@ +export * from './IPetBreedingResultData'; export * from './IRoomGeometry'; export * from './IRoomInstance'; export * from './IRoomInstanceContainer'; diff --git a/src/core/common/EventDispatcher.ts b/src/core/common/EventDispatcher.ts index a65df3c3..0f1db964 100644 --- a/src/core/common/EventDispatcher.ts +++ b/src/core/common/EventDispatcher.ts @@ -1,6 +1,5 @@ -import { IDisposable, IEventDispatcher, INitroLogger } from '../../api'; +import { IDisposable, IEventDispatcher, INitroEvent, INitroLogger } from '../../api'; import { Disposable } from './Disposable'; -import { NitroEvent } from './NitroEvent'; import { NitroLogger } from './NitroLogger'; export class EventDispatcher extends Disposable implements IEventDispatcher, IDisposable @@ -25,11 +24,11 @@ export class EventDispatcher extends Disposable implements IEventDispatcher, IDi public addEventListener(type: string, callback: Function): void { - if(!type || !callback) return; + if (!type || !callback) return; const existing = this._listeners.get(type); - if(!existing) + if (!existing) { this._listeners.set(type, [callback]); @@ -41,27 +40,27 @@ export class EventDispatcher extends Disposable implements IEventDispatcher, IDi public removeEventListener(type: string, callback: any): void { - if(!type || !callback) return; + if (!type || !callback) return; const existing = this._listeners.get(type); - if(!existing || !existing.length) return; + if (!existing || !existing.length) return; - for(const [i, cb] of existing.entries()) + for (const [i, cb] of existing.entries()) { - if(!cb || (cb !== callback)) continue; + if (!cb || (cb !== callback)) continue; existing.splice(i, 1); - if(!existing.length) this._listeners.delete(type); + if (!existing.length) this._listeners.delete(type); return; } } - public dispatchEvent(event: NitroEvent): boolean + public dispatchEvent(event: INitroEvent): boolean { - if(!event) return false; + if (!event) return false; //if (Nitro.instance.getConfiguration('system.dispatcher.log')) this._logger.log('Dispatched Event', event.type); @@ -70,22 +69,22 @@ export class EventDispatcher extends Disposable implements IEventDispatcher, IDi return true; } - private processEvent(event: NitroEvent): void + private processEvent(event: INitroEvent): void { const existing = this._listeners.get(event.type); - if(!existing || !existing.length) return; + if (!existing || !existing.length) return; const callbacks = []; - for(const callback of existing) + for (const callback of existing) { - if(!callback) continue; + if (!callback) continue; callbacks.push(callback); } - while(callbacks.length) + while (callbacks.length) { const callback = callbacks.shift(); diff --git a/src/core/common/index.ts b/src/core/common/index.ts index ed685f50..089fab57 100644 --- a/src/core/common/index.ts +++ b/src/core/common/index.ts @@ -1,5 +1,4 @@ export * from './Disposable'; export * from './EventDispatcher'; -export * from './NitroEvent'; export * from './NitroLogger'; export * from './NitroManager'; diff --git a/src/core/communication/SocketConnection.ts b/src/core/communication/SocketConnection.ts index 51a97485..e3426ba7 100644 --- a/src/core/communication/SocketConnection.ts +++ b/src/core/communication/SocketConnection.ts @@ -1,8 +1,8 @@ import { ICodec, ICommunicationManager, IConnection, IConnectionStateListener, IMessageComposer, IMessageConfiguration, IMessageDataWrapper, IMessageEvent, WebSocketEventEnum } from '../../api'; +import { SocketConnectionEvent } from '../../events'; import { EventDispatcher } from '../common'; import { EvaWireFormat } from './codec'; import { MessageClassManager } from './messages'; -import { SocketConnectionEvent } from './SocketConnectionEvent'; export class SocketConnection extends EventDispatcher implements IConnection { @@ -44,7 +44,7 @@ export class SocketConnection extends EventDispatcher implements IConnection public init(socketUrl: string): void { - if(this._stateListener) + if (this._stateListener) { this._stateListener.connectionInit(socketUrl); } @@ -67,13 +67,13 @@ export class SocketConnection extends EventDispatcher implements IConnection public onReady(): void { - if(this._isReady) return; + if (this._isReady) return; this._isReady = true; - if(this._pendingServerMessages && this._pendingServerMessages.length) this.processWrappers(...this._pendingServerMessages); + if (this._pendingServerMessages && this._pendingServerMessages.length) this.processWrappers(...this._pendingServerMessages); - if(this._pendingClientMessages && this._pendingClientMessages.length) this.send(...this._pendingClientMessages); + if (this._pendingClientMessages && this._pendingClientMessages.length) this.send(...this._pendingClientMessages); this._pendingServerMessages = []; this._pendingClientMessages = []; @@ -81,7 +81,7 @@ export class SocketConnection extends EventDispatcher implements IConnection private createSocket(socketUrl: string): void { - if(!socketUrl) return; + if (!socketUrl) return; this.destroySocket(); @@ -96,14 +96,14 @@ export class SocketConnection extends EventDispatcher implements IConnection private destroySocket(): void { - if(!this._socket) return; + if (!this._socket) return; this._socket.removeEventListener(WebSocketEventEnum.CONNECTION_OPENED, this.onOpen); this._socket.removeEventListener(WebSocketEventEnum.CONNECTION_CLOSED, this.onClose); this._socket.removeEventListener(WebSocketEventEnum.CONNECTION_ERROR, this.onError); this._socket.removeEventListener(WebSocketEventEnum.CONNECTION_MESSAGE, this.onMessage); - if(this._socket.readyState === WebSocket.OPEN) this._socket.close(); + if (this._socket.readyState === WebSocket.OPEN) this._socket.close(); this._socket = null; } @@ -125,7 +125,7 @@ export class SocketConnection extends EventDispatcher implements IConnection private onMessage(event: MessageEvent): void { - if(!event) return; + if (!event) return; //this.dispatchConnectionEvent(SocketConnectionEvent.CONNECTION_MESSAGE, event); @@ -153,26 +153,26 @@ export class SocketConnection extends EventDispatcher implements IConnection public send(...composers: IMessageComposer[]): boolean { - if(this.disposed || !composers) return false; + if (this.disposed || !composers) return false; composers = [...composers]; - if(this._isAuthenticated && !this._isReady) + if (this._isAuthenticated && !this._isReady) { - if(!this._pendingClientMessages) this._pendingClientMessages = []; + if (!this._pendingClientMessages) this._pendingClientMessages = []; this._pendingClientMessages.push(...composers); return false; } - for(const composer of composers) + for (const composer of composers) { - if(!composer) continue; + if (!composer) continue; const header = this._messages.getComposerId(composer); - if(header === -1) + if (header === -1) { //if (Nitro.instance.getConfiguration('system.packet.log')) this.logger.log(`Unknown Composer: ${composer.constructor.name}`); @@ -182,7 +182,7 @@ export class SocketConnection extends EventDispatcher implements IConnection const message = composer.getMessageArray(); const encoded = this._codec.encode(header, message); - if(!encoded) + if (!encoded) { //if (Nitro.instance.getConfiguration('system.packet.log')) this.logger.log('Encoding Failed', composer.constructor.name); @@ -199,7 +199,7 @@ export class SocketConnection extends EventDispatcher implements IConnection private write(buffer: ArrayBuffer): void { - if(this._socket.readyState !== WebSocket.OPEN) return; + if (this._socket.readyState !== WebSocket.OPEN) return; this._socket.send(buffer); } @@ -221,11 +221,11 @@ export class SocketConnection extends EventDispatcher implements IConnection { const wrappers = this.splitReceivedMessages(); - if(!wrappers || !wrappers.length) return; + if (!wrappers || !wrappers.length) return; - if(this._isAuthenticated && !this._isReady) + if (this._isAuthenticated && !this._isReady) { - if(!this._pendingServerMessages) this._pendingServerMessages = []; + if (!this._pendingServerMessages) this._pendingServerMessages = []; this._pendingServerMessages.push(...wrappers); @@ -237,15 +237,15 @@ export class SocketConnection extends EventDispatcher implements IConnection private processWrappers(...wrappers: IMessageDataWrapper[]): void { - if(!wrappers || !wrappers.length) return; + if (!wrappers || !wrappers.length) return; - for(const wrapper of wrappers) + for (const wrapper of wrappers) { - if(!wrapper) continue; + if (!wrapper) continue; const messages = this.getMessagesForWrapper(wrapper); - if(!messages || !messages.length) continue; + if (!messages || !messages.length) continue; //if (Nitro.instance.getConfiguration('system.packet.log')) this.logger.log('IncomingMessage', wrapper.header, messages[0].constructor.name, messages[0].parser); @@ -255,7 +255,7 @@ export class SocketConnection extends EventDispatcher implements IConnection private splitReceivedMessages(): IMessageDataWrapper[] { - if(!this._dataBuffer || !this._dataBuffer.byteLength) return null; + if (!this._dataBuffer || !this._dataBuffer.byteLength) return null; return this._codec.decode(this); } @@ -272,11 +272,11 @@ export class SocketConnection extends EventDispatcher implements IConnection private getMessagesForWrapper(wrapper: IMessageDataWrapper): IMessageEvent[] { - if(!wrapper) return null; + if (!wrapper) return null; const events = this._messages.getEvents(wrapper.header); - if(!events || !events.length) + if (!events || !events.length) { //if (Nitro.instance.getConfiguration('system.packet.log')) this.logger.log('IncomingMessage', wrapper.header, 'UNREGISTERED', wrapper); @@ -288,9 +288,9 @@ export class SocketConnection extends EventDispatcher implements IConnection //@ts-ignore const parser = new events[0].parserClass(); - if(!parser || !parser.flush() || !parser.parse(wrapper)) return null; + if (!parser || !parser.flush() || !parser.parse(wrapper)) return null; - for(const event of events) (event.parser = parser); + for (const event of events) (event.parser = parser); } catch (e) @@ -307,33 +307,33 @@ export class SocketConnection extends EventDispatcher implements IConnection { messages = [...messages]; - for(const message of messages) + for (const message of messages) { - if(!message) continue; + if (!message) continue; message.connection = this; - if(message.callBack) message.callBack(message); + if (message.callBack) message.callBack(message); } } public registerMessages(configuration: IMessageConfiguration): void { - if(!configuration) return; + if (!configuration) return; this._messages.registerMessages(configuration); } public addMessageEvent(event: IMessageEvent): void { - if(!event || !this._messages) return; + if (!event || !this._messages) return; this._messages.registerMessageEvent(event); } public removeMessageEvent(event: IMessageEvent): void { - if(!event || !this._messages) return; + if (!event || !this._messages) return; this._messages.removeMessageEvent(event); } diff --git a/src/core/communication/index.ts b/src/core/communication/index.ts index af71066a..d9e31cd6 100644 --- a/src/core/communication/index.ts +++ b/src/core/communication/index.ts @@ -3,4 +3,3 @@ export * from './codec/evawire'; export * from './CommunicationManager'; export * from './messages'; export * from './SocketConnection'; -export * from './SocketConnectionEvent'; diff --git a/src/core/communication/messages/MessageClassManager.ts b/src/core/communication/messages/MessageClassManager.ts index b3a740f8..b191b04c 100644 --- a/src/core/communication/messages/MessageClassManager.ts +++ b/src/core/communication/messages/MessageClassManager.ts @@ -1,5 +1,5 @@ import { IMessageComposer, IMessageConfiguration, IMessageEvent } from '../../../api'; -import { MessageEvent } from './MessageEvent'; +import { MessageEvent } from '../../../events'; export class MessageClassManager { @@ -23,36 +23,36 @@ export class MessageClassManager public registerMessages(configuration: IMessageConfiguration): void { - for(const [header, handler] of configuration.events) this.registerMessageEventClass(header, handler); + for (const [header, handler] of configuration.events) this.registerMessageEventClass(header, handler); - for(const [header, handler] of configuration.composers) this.registerMessageComposerClass(header, handler); + for (const [header, handler] of configuration.composers) this.registerMessageComposerClass(header, handler); } private registerMessageEventClass(header: number, handler: Function): void { - if(!header || !handler) return; + if (!header || !handler) return; this._messageIdByEvent.set(handler, header); } private registerMessageComposerClass(header: number, handler: Function): void { - if(!header || !handler) return; + if (!header || !handler) return; this._messageIdByComposer.set(handler, header); } public registerMessageEvent(event: IMessageEvent): void { - if(!event) return; + if (!event) return; const header = this.getEventId(event); - if(!header) return; + if (!header) return; let existing = this._messageInstancesById.get(header); - if(!existing || !existing.length) + if (!existing || !existing.length) { existing = []; @@ -64,25 +64,25 @@ export class MessageClassManager public removeMessageEvent(event: IMessageEvent): void { - if(!event) return; + if (!event) return; const header = this.getEventId(event); - if(!header) return; + if (!header) return; const existing = this._messageInstancesById.get(header); - if(!existing) return; + if (!existing) return; - for(const [index, message] of existing.entries()) + for (const [index, message] of existing.entries()) { - if(!message) continue; + if (!message) continue; - if(message !== event) continue; + if (message !== event) continue; existing.splice(index, 1); - if(existing.length === 0) this._messageInstancesById.delete(header); + if (existing.length === 0) this._messageInstancesById.delete(header); message.dispose(); @@ -92,36 +92,36 @@ export class MessageClassManager public getEvents(header: number): IMessageEvent[] { - if(!header) return; + if (!header) return; const existing = this._messageInstancesById.get(header); - if(!existing) return; + if (!existing) return; return existing; } public getEventId(event: IMessageEvent): number { - if(!event) return -1; + if (!event) return -1; //@ts-ignore const name = (event instanceof MessageEvent ? event.constructor : event) as Function; const existing = this._messageIdByEvent.get(name); - if(!existing) return -1; + if (!existing) return -1; return existing; } public getComposerId(composer: IMessageComposer): number { - if(!composer) return -1; + if (!composer) return -1; const existing = this._messageIdByComposer.get(composer.constructor); - if(!existing) return -1; + if (!existing) return -1; return existing; } diff --git a/src/core/communication/messages/index.ts b/src/core/communication/messages/index.ts index 208dd896..deb18a32 100644 --- a/src/core/communication/messages/index.ts +++ b/src/core/communication/messages/index.ts @@ -1,2 +1 @@ export * from './MessageClassManager'; -export * from './MessageEvent'; diff --git a/src/core/configuration/ConfigurationEvent.ts b/src/core/configuration/ConfigurationEvent.ts index ea72dfef..6f4c5be0 100644 --- a/src/core/configuration/ConfigurationEvent.ts +++ b/src/core/configuration/ConfigurationEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../common'; +import { NitroEvent } from '../../events'; export class ConfigurationEvent extends NitroEvent { diff --git a/src/nitro/events/NitroSettingsEvent.ts b/src/events/NitroSettingsEvent.ts similarity index 98% rename from src/nitro/events/NitroSettingsEvent.ts rename to src/events/NitroSettingsEvent.ts index 4ce5d853..62635a0f 100644 --- a/src/nitro/events/NitroSettingsEvent.ts +++ b/src/events/NitroSettingsEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../core'; +import { NitroEvent } from './core'; export class NitroSettingsEvent extends NitroEvent { diff --git a/src/nitro/events/NitroSoundEvent.ts b/src/events/NitroSoundEvent.ts similarity index 89% rename from src/nitro/events/NitroSoundEvent.ts rename to src/events/NitroSoundEvent.ts index 810e9b3f..5e702231 100644 --- a/src/nitro/events/NitroSoundEvent.ts +++ b/src/events/NitroSoundEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../core'; +import { NitroEvent } from './core'; export class NitroSoundEvent extends NitroEvent { diff --git a/src/nitro/events/NitroToolbarAnimateIconEvent.ts b/src/events/NitroToolbarAnimateIconEvent.ts similarity index 100% rename from src/nitro/events/NitroToolbarAnimateIconEvent.ts rename to src/events/NitroToolbarAnimateIconEvent.ts diff --git a/src/nitro/events/NitroToolbarEvent.ts b/src/events/NitroToolbarEvent.ts similarity index 93% rename from src/nitro/events/NitroToolbarEvent.ts rename to src/events/NitroToolbarEvent.ts index fbefde50..d9cbc63d 100644 --- a/src/nitro/events/NitroToolbarEvent.ts +++ b/src/events/NitroToolbarEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../core'; +import { NitroEvent } from './core'; export class NitroToolbarEvent extends NitroEvent { diff --git a/src/events/avatar/AvatarRenderEffectLibraryEvent.ts b/src/events/avatar/AvatarRenderEffectLibraryEvent.ts new file mode 100644 index 00000000..de486249 --- /dev/null +++ b/src/events/avatar/AvatarRenderEffectLibraryEvent.ts @@ -0,0 +1,21 @@ +import { IEffectAssetDownloadLibrary } from '../../api'; +import { NitroEvent } from '../core'; + +export class AvatarRenderEffectLibraryEvent extends NitroEvent +{ + public static DOWNLOAD_COMPLETE: string = 'ARELE_DOWNLOAD_COMPLETE'; + + private _library: IEffectAssetDownloadLibrary; + + constructor(type: string, library: IEffectAssetDownloadLibrary) + { + super(type); + + this._library = library; + } + + public get library(): IEffectAssetDownloadLibrary + { + return this._library; + } +} diff --git a/src/nitro/avatar/events/AvatarRenderEvent.ts b/src/events/avatar/AvatarRenderEvent.ts similarity index 100% rename from src/nitro/avatar/events/AvatarRenderEvent.ts rename to src/events/avatar/AvatarRenderEvent.ts diff --git a/src/events/avatar/AvatarRenderLibraryEvent.ts b/src/events/avatar/AvatarRenderLibraryEvent.ts new file mode 100644 index 00000000..9f2dec87 --- /dev/null +++ b/src/events/avatar/AvatarRenderLibraryEvent.ts @@ -0,0 +1,21 @@ +import { IAvatarAssetDownloadLibrary } from '../../api'; +import { NitroEvent } from '../core'; + +export class AvatarRenderLibraryEvent extends NitroEvent +{ + public static DOWNLOAD_COMPLETE: string = 'ARLE_DOWNLOAD_COMPLETE'; + + private _library: IAvatarAssetDownloadLibrary; + + constructor(type: string, library: IAvatarAssetDownloadLibrary) + { + super(type); + + this._library = library; + } + + public get library(): IAvatarAssetDownloadLibrary + { + return this._library; + } +} diff --git a/src/nitro/avatar/events/index.ts b/src/events/avatar/index.ts similarity index 100% rename from src/nitro/avatar/events/index.ts rename to src/events/avatar/index.ts diff --git a/src/nitro/camera/RoomCameraWidgetManagerEvent.ts b/src/events/camera/RoomCameraWidgetManagerEvent.ts similarity index 82% rename from src/nitro/camera/RoomCameraWidgetManagerEvent.ts rename to src/events/camera/RoomCameraWidgetManagerEvent.ts index 882f7ec1..59896278 100644 --- a/src/nitro/camera/RoomCameraWidgetManagerEvent.ts +++ b/src/events/camera/RoomCameraWidgetManagerEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../core'; +import { NitroEvent } from '../core'; export class RoomCameraWidgetManagerEvent extends NitroEvent { diff --git a/src/events/camera/index.ts b/src/events/camera/index.ts new file mode 100644 index 00000000..b6e32e26 --- /dev/null +++ b/src/events/camera/index.ts @@ -0,0 +1 @@ +export * from './RoomCameraWidgetManagerEvent'; diff --git a/src/nitro/communication/demo/NitroCommunicationDemoEvent.ts b/src/events/communication/NitroCommunicationDemoEvent.ts similarity index 89% rename from src/nitro/communication/demo/NitroCommunicationDemoEvent.ts rename to src/events/communication/NitroCommunicationDemoEvent.ts index 721bf876..e326f42d 100644 --- a/src/nitro/communication/demo/NitroCommunicationDemoEvent.ts +++ b/src/events/communication/NitroCommunicationDemoEvent.ts @@ -1,5 +1,5 @@ -import { IConnection } from '../../../api'; -import { NitroEvent } from '../../../core'; +import { IConnection } from '../../api'; +import { NitroEvent } from '../core'; export class NitroCommunicationDemoEvent extends NitroEvent { diff --git a/src/nitro/communication/demo/index.ts b/src/events/communication/index.ts similarity index 52% rename from src/nitro/communication/demo/index.ts rename to src/events/communication/index.ts index 81a45dae..d795b929 100644 --- a/src/nitro/communication/demo/index.ts +++ b/src/events/communication/index.ts @@ -1,2 +1 @@ -export * from './NitroCommunicationDemo'; export * from './NitroCommunicationDemoEvent'; diff --git a/src/core/communication/messages/MessageEvent.ts b/src/events/core/MessageEvent.ts similarity index 99% rename from src/core/communication/messages/MessageEvent.ts rename to src/events/core/MessageEvent.ts index 0adb4622..012c8c23 100644 --- a/src/core/communication/messages/MessageEvent.ts +++ b/src/events/core/MessageEvent.ts @@ -1,4 +1,4 @@ -import { IConnection, IMessageEvent, IMessageParser } from '../../../api'; +import { IConnection, IMessageEvent, IMessageParser } from '../../api'; export class MessageEvent implements IMessageEvent { diff --git a/src/core/common/NitroEvent.ts b/src/events/core/NitroEvent.ts similarity index 100% rename from src/core/common/NitroEvent.ts rename to src/events/core/NitroEvent.ts diff --git a/src/core/communication/SocketConnectionEvent.ts b/src/events/core/SocketConnectionEvent.ts similarity index 94% rename from src/core/communication/SocketConnectionEvent.ts rename to src/events/core/SocketConnectionEvent.ts index ec697a0a..5df9c5ab 100644 --- a/src/core/communication/SocketConnectionEvent.ts +++ b/src/events/core/SocketConnectionEvent.ts @@ -1,5 +1,5 @@ import { IConnection } from '../../api'; -import { NitroEvent } from '../common'; +import { NitroEvent } from './NitroEvent'; export class SocketConnectionEvent extends NitroEvent { diff --git a/src/events/core/index.ts b/src/events/core/index.ts new file mode 100644 index 00000000..4657952b --- /dev/null +++ b/src/events/core/index.ts @@ -0,0 +1,3 @@ +export * from './MessageEvent'; +export * from './NitroEvent'; +export * from './SocketConnectionEvent'; diff --git a/src/events/index.ts b/src/events/index.ts new file mode 100644 index 00000000..17b21217 --- /dev/null +++ b/src/events/index.ts @@ -0,0 +1,11 @@ +export * from './avatar'; +export * from './camera'; +export * from './communication'; +export * from './core'; +export * from './localization'; +export * from './NitroSettingsEvent'; +export * from './NitroSoundEvent'; +export * from './NitroToolbarAnimateIconEvent'; +export * from './NitroToolbarEvent'; +export * from './room'; +export * from './session'; diff --git a/src/nitro/localization/NitroLocalizationEvent.ts b/src/events/localization/NitroLocalizationEvent.ts similarity index 84% rename from src/nitro/localization/NitroLocalizationEvent.ts rename to src/events/localization/NitroLocalizationEvent.ts index 1d0e505c..a011d392 100644 --- a/src/nitro/localization/NitroLocalizationEvent.ts +++ b/src/events/localization/NitroLocalizationEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../core'; +import { NitroEvent } from '../core'; export class NitroLocalizationEvent extends NitroEvent { diff --git a/src/events/localization/index.ts b/src/events/localization/index.ts new file mode 100644 index 00000000..30cf817d --- /dev/null +++ b/src/events/localization/index.ts @@ -0,0 +1 @@ +export * from './NitroLocalizationEvent'; diff --git a/src/nitro/room/events/RoomBackgroundColorEvent.ts b/src/events/room/RoomBackgroundColorEvent.ts similarity index 100% rename from src/nitro/room/events/RoomBackgroundColorEvent.ts rename to src/events/room/RoomBackgroundColorEvent.ts diff --git a/src/nitro/room/events/RoomDragEvent.ts b/src/events/room/RoomDragEvent.ts similarity index 100% rename from src/nitro/room/events/RoomDragEvent.ts rename to src/events/room/RoomDragEvent.ts diff --git a/src/nitro/room/events/RoomEngineDimmerStateEvent.ts b/src/events/room/RoomEngineDimmerStateEvent.ts similarity index 100% rename from src/nitro/room/events/RoomEngineDimmerStateEvent.ts rename to src/events/room/RoomEngineDimmerStateEvent.ts diff --git a/src/nitro/room/events/RoomEngineEvent.ts b/src/events/room/RoomEngineEvent.ts similarity index 94% rename from src/nitro/room/events/RoomEngineEvent.ts rename to src/events/room/RoomEngineEvent.ts index 6f3eae22..4d908677 100644 --- a/src/nitro/room/events/RoomEngineEvent.ts +++ b/src/events/room/RoomEngineEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../../core'; +import { NitroEvent } from '../core'; export class RoomEngineEvent extends NitroEvent { diff --git a/src/nitro/room/events/RoomEngineObjectEvent.ts b/src/events/room/RoomEngineObjectEvent.ts similarity index 100% rename from src/nitro/room/events/RoomEngineObjectEvent.ts rename to src/events/room/RoomEngineObjectEvent.ts diff --git a/src/nitro/room/events/RoomEngineObjectPlacedEvent.ts b/src/events/room/RoomEngineObjectPlacedEvent.ts similarity index 100% rename from src/nitro/room/events/RoomEngineObjectPlacedEvent.ts rename to src/events/room/RoomEngineObjectPlacedEvent.ts diff --git a/src/nitro/room/events/RoomEngineObjectPlacedOnUserEvent.ts b/src/events/room/RoomEngineObjectPlacedOnUserEvent.ts similarity index 100% rename from src/nitro/room/events/RoomEngineObjectPlacedOnUserEvent.ts rename to src/events/room/RoomEngineObjectPlacedOnUserEvent.ts diff --git a/src/nitro/room/events/RoomEngineObjectPlaySoundEvent.ts b/src/events/room/RoomEngineObjectPlaySoundEvent.ts similarity index 100% rename from src/nitro/room/events/RoomEngineObjectPlaySoundEvent.ts rename to src/events/room/RoomEngineObjectPlaySoundEvent.ts diff --git a/src/nitro/room/events/RoomEngineRoomAdEvent.ts b/src/events/room/RoomEngineRoomAdEvent.ts similarity index 100% rename from src/nitro/room/events/RoomEngineRoomAdEvent.ts rename to src/events/room/RoomEngineRoomAdEvent.ts diff --git a/src/nitro/room/events/RoomEngineSamplePlaybackEvent.ts b/src/events/room/RoomEngineSamplePlaybackEvent.ts similarity index 100% rename from src/nitro/room/events/RoomEngineSamplePlaybackEvent.ts rename to src/events/room/RoomEngineSamplePlaybackEvent.ts diff --git a/src/nitro/room/events/RoomEngineTriggerWidgetEvent.ts b/src/events/room/RoomEngineTriggerWidgetEvent.ts similarity index 100% rename from src/nitro/room/events/RoomEngineTriggerWidgetEvent.ts rename to src/events/room/RoomEngineTriggerWidgetEvent.ts diff --git a/src/nitro/room/events/RoomEngineUseProductEvent.ts b/src/events/room/RoomEngineUseProductEvent.ts similarity index 100% rename from src/nitro/room/events/RoomEngineUseProductEvent.ts rename to src/events/room/RoomEngineUseProductEvent.ts diff --git a/src/nitro/room/events/RoomObjectBadgeAssetEvent.ts b/src/events/room/RoomObjectBadgeAssetEvent.ts similarity index 85% rename from src/nitro/room/events/RoomObjectBadgeAssetEvent.ts rename to src/events/room/RoomObjectBadgeAssetEvent.ts index cf840d70..1225ecb9 100644 --- a/src/nitro/room/events/RoomObjectBadgeAssetEvent.ts +++ b/src/events/room/RoomObjectBadgeAssetEvent.ts @@ -1,5 +1,5 @@ -import { IRoomObject } from '../../../api'; -import { RoomObjectEvent } from '../../../room'; +import { IRoomObject } from '../../api'; +import { RoomObjectEvent } from '../../room'; export class RoomObjectBadgeAssetEvent extends RoomObjectEvent { diff --git a/src/nitro/room/events/RoomObjectDataRequestEvent.ts b/src/events/room/RoomObjectDataRequestEvent.ts similarity index 75% rename from src/nitro/room/events/RoomObjectDataRequestEvent.ts rename to src/events/room/RoomObjectDataRequestEvent.ts index 4d1e477a..48eee716 100644 --- a/src/nitro/room/events/RoomObjectDataRequestEvent.ts +++ b/src/events/room/RoomObjectDataRequestEvent.ts @@ -1,5 +1,5 @@ -import { IRoomObject } from '../../../api'; -import { RoomObjectEvent } from '../../../room'; +import { IRoomObject } from '../../api'; +import { RoomObjectEvent } from '../../room'; export class RoomObjectDataRequestEvent extends RoomObjectEvent { diff --git a/src/nitro/room/events/RoomObjectDimmerStateUpdateEvent.ts b/src/events/room/RoomObjectDimmerStateUpdateEvent.ts similarity index 91% rename from src/nitro/room/events/RoomObjectDimmerStateUpdateEvent.ts rename to src/events/room/RoomObjectDimmerStateUpdateEvent.ts index 8b6a7252..b4e68c0e 100644 --- a/src/nitro/room/events/RoomObjectDimmerStateUpdateEvent.ts +++ b/src/events/room/RoomObjectDimmerStateUpdateEvent.ts @@ -1,5 +1,5 @@ -import { IRoomObject } from '../../../api'; -import { RoomObjectEvent } from '../../../room'; +import { IRoomObject } from '../../api'; +import { RoomObjectEvent } from '../../room'; export class RoomObjectDimmerStateUpdateEvent extends RoomObjectEvent { diff --git a/src/nitro/room/events/RoomObjectFloorHoleEvent.ts b/src/events/room/RoomObjectFloorHoleEvent.ts similarity index 73% rename from src/nitro/room/events/RoomObjectFloorHoleEvent.ts rename to src/events/room/RoomObjectFloorHoleEvent.ts index 3fe5e087..d1562672 100644 --- a/src/nitro/room/events/RoomObjectFloorHoleEvent.ts +++ b/src/events/room/RoomObjectFloorHoleEvent.ts @@ -1,5 +1,5 @@ -import { IRoomObject } from '../../../api'; -import { RoomObjectEvent } from '../../../room'; +import { IRoomObject } from '../../api'; +import { RoomObjectEvent } from '../../room'; export class RoomObjectFloorHoleEvent extends RoomObjectEvent { diff --git a/src/nitro/room/events/RoomObjectFurnitureActionEvent.ts b/src/events/room/RoomObjectFurnitureActionEvent.ts similarity index 95% rename from src/nitro/room/events/RoomObjectFurnitureActionEvent.ts rename to src/events/room/RoomObjectFurnitureActionEvent.ts index 2a7c695d..b6b7838e 100644 --- a/src/nitro/room/events/RoomObjectFurnitureActionEvent.ts +++ b/src/events/room/RoomObjectFurnitureActionEvent.ts @@ -1,4 +1,4 @@ -import { RoomObjectEvent } from '../../../room'; +import { RoomObjectEvent } from '../../room'; export class RoomObjectFurnitureActionEvent extends RoomObjectEvent { diff --git a/src/nitro/room/events/RoomObjectHSLColorEnableEvent.ts b/src/events/room/RoomObjectHSLColorEnableEvent.ts similarity index 90% rename from src/nitro/room/events/RoomObjectHSLColorEnableEvent.ts rename to src/events/room/RoomObjectHSLColorEnableEvent.ts index 213ffed0..33846e69 100644 --- a/src/nitro/room/events/RoomObjectHSLColorEnableEvent.ts +++ b/src/events/room/RoomObjectHSLColorEnableEvent.ts @@ -1,5 +1,5 @@ -import { IRoomObject } from '../../../api'; -import { RoomObjectEvent } from '../../../room'; +import { IRoomObject } from '../../api'; +import { RoomObjectEvent } from '../../room'; export class RoomObjectHSLColorEnableEvent extends RoomObjectEvent { diff --git a/src/nitro/room/events/RoomObjectHSLColorEnabledEvent.ts b/src/events/room/RoomObjectHSLColorEnabledEvent.ts similarity index 100% rename from src/nitro/room/events/RoomObjectHSLColorEnabledEvent.ts rename to src/events/room/RoomObjectHSLColorEnabledEvent.ts diff --git a/src/nitro/room/events/RoomObjectMoveEvent.ts b/src/events/room/RoomObjectMoveEvent.ts similarity index 74% rename from src/nitro/room/events/RoomObjectMoveEvent.ts rename to src/events/room/RoomObjectMoveEvent.ts index 86baf23b..9fcd1f95 100644 --- a/src/nitro/room/events/RoomObjectMoveEvent.ts +++ b/src/events/room/RoomObjectMoveEvent.ts @@ -1,5 +1,5 @@ -import { IRoomObject } from '../../../api'; -import { RoomObjectEvent } from '../../../room'; +import { IRoomObject } from '../../api'; +import { RoomObjectEvent } from '../../room'; export class RoomObjectMoveEvent extends RoomObjectEvent { diff --git a/src/nitro/room/events/RoomObjectPlaySoundIdEvent.ts b/src/events/room/RoomObjectPlaySoundIdEvent.ts similarity index 94% rename from src/nitro/room/events/RoomObjectPlaySoundIdEvent.ts rename to src/events/room/RoomObjectPlaySoundIdEvent.ts index 63953ffa..315b9836 100644 --- a/src/nitro/room/events/RoomObjectPlaySoundIdEvent.ts +++ b/src/events/room/RoomObjectPlaySoundIdEvent.ts @@ -1,4 +1,4 @@ -import { IRoomObject } from '../../../api'; +import { IRoomObject } from '../../api'; import { RoomObjectFurnitureActionEvent } from './RoomObjectFurnitureActionEvent'; export class RoomObjectPlaySoundIdEvent extends RoomObjectFurnitureActionEvent diff --git a/src/nitro/room/events/RoomObjectRoomAdEvent.ts b/src/events/room/RoomObjectRoomAdEvent.ts similarity index 90% rename from src/nitro/room/events/RoomObjectRoomAdEvent.ts rename to src/events/room/RoomObjectRoomAdEvent.ts index 5f26cdce..33bcc02a 100644 --- a/src/nitro/room/events/RoomObjectRoomAdEvent.ts +++ b/src/events/room/RoomObjectRoomAdEvent.ts @@ -1,5 +1,5 @@ -import { IRoomObject } from '../../../api'; -import { RoomObjectEvent } from '../../../room'; +import { IRoomObject } from '../../api'; +import { RoomObjectEvent } from '../../room'; export class RoomObjectRoomAdEvent extends RoomObjectEvent { diff --git a/src/nitro/room/events/RoomObjectSamplePlaybackEvent.ts b/src/events/room/RoomObjectSamplePlaybackEvent.ts similarity index 89% rename from src/nitro/room/events/RoomObjectSamplePlaybackEvent.ts rename to src/events/room/RoomObjectSamplePlaybackEvent.ts index 1edbf6c6..a790e6ff 100644 --- a/src/nitro/room/events/RoomObjectSamplePlaybackEvent.ts +++ b/src/events/room/RoomObjectSamplePlaybackEvent.ts @@ -1,5 +1,5 @@ -import { IRoomObject } from '../../../api'; -import { RoomObjectEvent } from '../../../room'; +import { IRoomObject } from '../../api'; +import { RoomObjectEvent } from '../../room'; export class RoomObjectSamplePlaybackEvent extends RoomObjectEvent { diff --git a/src/nitro/room/events/RoomObjectSoundMachineEvent.ts b/src/events/room/RoomObjectSoundMachineEvent.ts similarity index 100% rename from src/nitro/room/events/RoomObjectSoundMachineEvent.ts rename to src/events/room/RoomObjectSoundMachineEvent.ts diff --git a/src/nitro/room/events/RoomObjectStateChangedEvent.ts b/src/events/room/RoomObjectStateChangedEvent.ts similarity index 82% rename from src/nitro/room/events/RoomObjectStateChangedEvent.ts rename to src/events/room/RoomObjectStateChangedEvent.ts index 7634d271..6f0da7e1 100644 --- a/src/nitro/room/events/RoomObjectStateChangedEvent.ts +++ b/src/events/room/RoomObjectStateChangedEvent.ts @@ -1,5 +1,5 @@ -import { IRoomObject } from '../../../api'; -import { RoomObjectEvent } from '../../../room'; +import { IRoomObject } from '../../api'; +import { RoomObjectEvent } from '../../room'; export class RoomObjectStateChangedEvent extends RoomObjectEvent { diff --git a/src/nitro/room/events/RoomObjectTileMouseEvent.ts b/src/events/room/RoomObjectTileMouseEvent.ts similarity index 91% rename from src/nitro/room/events/RoomObjectTileMouseEvent.ts rename to src/events/room/RoomObjectTileMouseEvent.ts index 3d4c9c5b..b0e238d0 100644 --- a/src/nitro/room/events/RoomObjectTileMouseEvent.ts +++ b/src/events/room/RoomObjectTileMouseEvent.ts @@ -1,5 +1,5 @@ -import { IRoomObject } from '../../../api'; -import { RoomObjectMouseEvent } from '../../../room'; +import { IRoomObject } from '../../api'; +import { RoomObjectMouseEvent } from '../../room'; export class RoomObjectTileMouseEvent extends RoomObjectMouseEvent { diff --git a/src/nitro/room/events/RoomObjectWallMouseEvent.ts b/src/events/room/RoomObjectWallMouseEvent.ts similarity index 85% rename from src/nitro/room/events/RoomObjectWallMouseEvent.ts rename to src/events/room/RoomObjectWallMouseEvent.ts index d283e4c5..f5ae8a86 100644 --- a/src/nitro/room/events/RoomObjectWallMouseEvent.ts +++ b/src/events/room/RoomObjectWallMouseEvent.ts @@ -1,11 +1,11 @@ -import { IRoomObject, IVector3D, Vector3d } from '../../../api'; -import { RoomObjectMouseEvent } from '../../../room'; +import { IRoomObject, IVector3D, Vector3d } from '../../api'; +import { RoomObjectMouseEvent } from '../../room'; export class RoomObjectWallMouseEvent extends RoomObjectMouseEvent { - private _wallLocation: Vector3d; - private _wallWd: Vector3d; - private _wallHt: Vector3d; + private _wallLocation: IVector3D; + private _wallWd: IVector3D; + private _wallHt: IVector3D; private _x: number; private _y: number; private _direction: number; diff --git a/src/nitro/room/events/RoomObjectWidgetRequestEvent.ts b/src/events/room/RoomObjectWidgetRequestEvent.ts similarity index 96% rename from src/nitro/room/events/RoomObjectWidgetRequestEvent.ts rename to src/events/room/RoomObjectWidgetRequestEvent.ts index 92dacf9a..69b5cff9 100644 --- a/src/nitro/room/events/RoomObjectWidgetRequestEvent.ts +++ b/src/events/room/RoomObjectWidgetRequestEvent.ts @@ -1,5 +1,5 @@ -import { IRoomObject } from '../../../api'; -import { RoomObjectEvent } from '../../../room'; +import { IRoomObject } from '../../api'; +import { RoomObjectEvent } from '../../room'; export class RoomObjectWidgetRequestEvent extends RoomObjectEvent { diff --git a/src/nitro/room/events/RoomToObjectOwnAvatarMoveEvent.ts b/src/events/room/RoomToObjectOwnAvatarMoveEvent.ts similarity index 80% rename from src/nitro/room/events/RoomToObjectOwnAvatarMoveEvent.ts rename to src/events/room/RoomToObjectOwnAvatarMoveEvent.ts index 330104bf..0cff2174 100644 --- a/src/nitro/room/events/RoomToObjectOwnAvatarMoveEvent.ts +++ b/src/events/room/RoomToObjectOwnAvatarMoveEvent.ts @@ -1,5 +1,5 @@ -import { IVector3D } from '../../../api'; -import { RoomToObjectEvent } from '../../../room'; +import { IVector3D } from '../../api'; +import { RoomToObjectEvent } from '../../room'; export class RoomToObjectOwnAvatarMoveEvent extends RoomToObjectEvent { diff --git a/src/nitro/room/events/RoomZoomEvent.ts b/src/events/room/RoomZoomEvent.ts similarity index 100% rename from src/nitro/room/events/RoomZoomEvent.ts rename to src/events/room/RoomZoomEvent.ts diff --git a/src/nitro/room/events/index.ts b/src/events/room/index.ts similarity index 100% rename from src/nitro/room/events/index.ts rename to src/events/room/index.ts diff --git a/src/nitro/session/events/BadgeImageReadyEvent.ts b/src/events/session/BadgeImageReadyEvent.ts similarity index 93% rename from src/nitro/session/events/BadgeImageReadyEvent.ts rename to src/events/session/BadgeImageReadyEvent.ts index b8b16122..22b6390a 100644 --- a/src/nitro/session/events/BadgeImageReadyEvent.ts +++ b/src/events/session/BadgeImageReadyEvent.ts @@ -1,5 +1,5 @@ import { Resource, Texture } from '@pixi/core'; -import { NitroEvent } from '../../../core'; +import { NitroEvent } from '../core'; export class BadgeImageReadyEvent extends NitroEvent { diff --git a/src/nitro/session/events/MysteryBoxKeysUpdateEvent.ts b/src/events/session/MysteryBoxKeysUpdateEvent.ts similarity index 92% rename from src/nitro/session/events/MysteryBoxKeysUpdateEvent.ts rename to src/events/session/MysteryBoxKeysUpdateEvent.ts index 96c27279..7f6a0733 100644 --- a/src/nitro/session/events/MysteryBoxKeysUpdateEvent.ts +++ b/src/events/session/MysteryBoxKeysUpdateEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../../core'; +import { NitroEvent } from '../core'; export class MysteryBoxKeysUpdateEvent extends NitroEvent { diff --git a/src/nitro/session/events/PerksUpdatedEvent.ts b/src/events/session/PerksUpdatedEvent.ts similarity index 80% rename from src/nitro/session/events/PerksUpdatedEvent.ts rename to src/events/session/PerksUpdatedEvent.ts index 9c721feb..e7b9679f 100644 --- a/src/nitro/session/events/PerksUpdatedEvent.ts +++ b/src/events/session/PerksUpdatedEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../../core'; +import { NitroEvent } from '../core'; export class PerksUpdatedEvent extends NitroEvent { diff --git a/src/nitro/session/events/RoomSessionChatEvent.ts b/src/events/session/RoomSessionChatEvent.ts similarity index 97% rename from src/nitro/session/events/RoomSessionChatEvent.ts rename to src/events/session/RoomSessionChatEvent.ts index 31e18964..10ec0b78 100644 --- a/src/nitro/session/events/RoomSessionChatEvent.ts +++ b/src/events/session/RoomSessionChatEvent.ts @@ -1,4 +1,4 @@ -import { IRoomSession } from '../../../api'; +import { IRoomSession } from '../../api'; import { RoomSessionEvent } from './RoomSessionEvent'; export class RoomSessionChatEvent extends RoomSessionEvent diff --git a/src/nitro/session/events/RoomSessionConfirmPetBreedingEvent.ts b/src/events/session/RoomSessionConfirmPetBreedingEvent.ts similarity index 95% rename from src/nitro/session/events/RoomSessionConfirmPetBreedingEvent.ts rename to src/events/session/RoomSessionConfirmPetBreedingEvent.ts index 2e47e20d..274a3127 100644 --- a/src/nitro/session/events/RoomSessionConfirmPetBreedingEvent.ts +++ b/src/events/session/RoomSessionConfirmPetBreedingEvent.ts @@ -1,4 +1,4 @@ -import { IRoomSession } from '../../../api'; +import { IRoomSession } from '../../api'; import { RoomSessionEvent } from './RoomSessionEvent'; export class RoomSessionConfirmPetBreedingEvent extends RoomSessionEvent diff --git a/src/nitro/session/events/RoomSessionConfirmPetBreedingResultEvent.ts b/src/events/session/RoomSessionConfirmPetBreedingResultEvent.ts similarity index 93% rename from src/nitro/session/events/RoomSessionConfirmPetBreedingResultEvent.ts rename to src/events/session/RoomSessionConfirmPetBreedingResultEvent.ts index 092171cc..5cb2e08c 100644 --- a/src/nitro/session/events/RoomSessionConfirmPetBreedingResultEvent.ts +++ b/src/events/session/RoomSessionConfirmPetBreedingResultEvent.ts @@ -1,4 +1,4 @@ -import { IRoomSession } from '../../../api'; +import { IRoomSession } from '../../api'; import { RoomSessionEvent } from './RoomSessionEvent'; export class RoomSessionConfirmPetBreedingResultEvent extends RoomSessionEvent diff --git a/src/nitro/session/events/RoomSessionDanceEvent.ts b/src/events/session/RoomSessionDanceEvent.ts similarity index 92% rename from src/nitro/session/events/RoomSessionDanceEvent.ts rename to src/events/session/RoomSessionDanceEvent.ts index 54fd11ae..22cab6b4 100644 --- a/src/nitro/session/events/RoomSessionDanceEvent.ts +++ b/src/events/session/RoomSessionDanceEvent.ts @@ -1,4 +1,4 @@ -import { IRoomSession } from '../../../api'; +import { IRoomSession } from '../../api'; import { RoomSessionEvent } from './RoomSessionEvent'; export class RoomSessionDanceEvent extends RoomSessionEvent diff --git a/src/nitro/session/events/RoomSessionDimmerPresetsEvent.ts b/src/events/session/RoomSessionDimmerPresetsEvent.ts similarity index 90% rename from src/nitro/session/events/RoomSessionDimmerPresetsEvent.ts rename to src/events/session/RoomSessionDimmerPresetsEvent.ts index 0136aeb6..ddd40705 100644 --- a/src/nitro/session/events/RoomSessionDimmerPresetsEvent.ts +++ b/src/events/session/RoomSessionDimmerPresetsEvent.ts @@ -1,4 +1,4 @@ -import { IRoomSession } from '../../../api'; +import { IRoomSession } from '../../api'; import { RoomSessionDimmerPresetsEventPresetItem } from './RoomSessionDimmerPresetsEventPresetItem'; import { RoomSessionEvent } from './RoomSessionEvent'; @@ -23,7 +23,7 @@ export class RoomSessionDimmerPresetsEvent extends RoomSessionEvent public getPreset(id: number): RoomSessionDimmerPresetsEventPresetItem { - if((id < 0) || (id >= this._presets.length)) return null; + if ((id < 0) || (id >= this._presets.length)) return null; return this._presets[id]; } diff --git a/src/nitro/session/events/RoomSessionDimmerPresetsEventPresetItem.ts b/src/events/session/RoomSessionDimmerPresetsEventPresetItem.ts similarity index 100% rename from src/nitro/session/events/RoomSessionDimmerPresetsEventPresetItem.ts rename to src/events/session/RoomSessionDimmerPresetsEventPresetItem.ts diff --git a/src/nitro/session/events/RoomSessionDoorbellEvent.ts b/src/events/session/RoomSessionDoorbellEvent.ts similarity index 92% rename from src/nitro/session/events/RoomSessionDoorbellEvent.ts rename to src/events/session/RoomSessionDoorbellEvent.ts index 67a17d35..e393454a 100644 --- a/src/nitro/session/events/RoomSessionDoorbellEvent.ts +++ b/src/events/session/RoomSessionDoorbellEvent.ts @@ -1,4 +1,4 @@ -import { IRoomSession } from '../../../api'; +import { IRoomSession } from '../../api'; import { RoomSessionEvent } from './RoomSessionEvent'; export class RoomSessionDoorbellEvent extends RoomSessionEvent diff --git a/src/nitro/session/events/RoomSessionErrorMessageEvent.ts b/src/events/session/RoomSessionErrorMessageEvent.ts similarity index 96% rename from src/nitro/session/events/RoomSessionErrorMessageEvent.ts rename to src/events/session/RoomSessionErrorMessageEvent.ts index 7f25d635..807ba3b3 100644 --- a/src/nitro/session/events/RoomSessionErrorMessageEvent.ts +++ b/src/events/session/RoomSessionErrorMessageEvent.ts @@ -1,4 +1,4 @@ -import { IRoomSession } from '../../../api'; +import { IRoomSession } from '../../api'; import { RoomSessionEvent } from './RoomSessionEvent'; export class RoomSessionErrorMessageEvent extends RoomSessionEvent diff --git a/src/nitro/session/events/RoomSessionEvent.ts b/src/events/session/RoomSessionEvent.ts similarity index 88% rename from src/nitro/session/events/RoomSessionEvent.ts rename to src/events/session/RoomSessionEvent.ts index c931fa29..dfa67869 100644 --- a/src/nitro/session/events/RoomSessionEvent.ts +++ b/src/events/session/RoomSessionEvent.ts @@ -1,5 +1,5 @@ -import { IRoomSession } from '../../../api'; -import { NitroEvent } from '../../../core'; +import { IRoomSession } from '../../api'; +import { NitroEvent } from '../core'; export class RoomSessionEvent extends NitroEvent { diff --git a/src/nitro/session/events/RoomSessionFavoriteGroupUpdateEvent.ts b/src/events/session/RoomSessionFavoriteGroupUpdateEvent.ts similarity index 95% rename from src/nitro/session/events/RoomSessionFavoriteGroupUpdateEvent.ts rename to src/events/session/RoomSessionFavoriteGroupUpdateEvent.ts index 56483e88..0e2d05b4 100644 --- a/src/nitro/session/events/RoomSessionFavoriteGroupUpdateEvent.ts +++ b/src/events/session/RoomSessionFavoriteGroupUpdateEvent.ts @@ -1,4 +1,4 @@ -import { IRoomSession } from '../../../api'; +import { IRoomSession } from '../../api'; import { RoomSessionEvent } from './RoomSessionEvent'; export class RoomSessionFavoriteGroupUpdateEvent extends RoomSessionEvent diff --git a/src/nitro/session/events/RoomSessionFriendRequestEvent.ts b/src/events/session/RoomSessionFriendRequestEvent.ts similarity index 94% rename from src/nitro/session/events/RoomSessionFriendRequestEvent.ts rename to src/events/session/RoomSessionFriendRequestEvent.ts index 948128b1..37f63dc9 100644 --- a/src/nitro/session/events/RoomSessionFriendRequestEvent.ts +++ b/src/events/session/RoomSessionFriendRequestEvent.ts @@ -1,4 +1,4 @@ -import { IRoomSession } from '../../../api'; +import { IRoomSession } from '../../api'; import { RoomSessionEvent } from './RoomSessionEvent'; export class RoomSessionFriendRequestEvent extends RoomSessionEvent diff --git a/src/nitro/session/events/RoomSessionNestBreedingSuccessEvent.ts b/src/events/session/RoomSessionNestBreedingSuccessEvent.ts similarity index 93% rename from src/nitro/session/events/RoomSessionNestBreedingSuccessEvent.ts rename to src/events/session/RoomSessionNestBreedingSuccessEvent.ts index 6c740e97..1764e494 100644 --- a/src/nitro/session/events/RoomSessionNestBreedingSuccessEvent.ts +++ b/src/events/session/RoomSessionNestBreedingSuccessEvent.ts @@ -1,4 +1,4 @@ -import { IRoomSession } from '../../../api'; +import { IRoomSession } from '../../api'; import { RoomSessionEvent } from './RoomSessionEvent'; export class RoomSessionNestBreedingSuccessEvent extends RoomSessionEvent diff --git a/src/nitro/session/events/RoomSessionPetBreedingEvent.ts b/src/events/session/RoomSessionPetBreedingEvent.ts similarity index 94% rename from src/nitro/session/events/RoomSessionPetBreedingEvent.ts rename to src/events/session/RoomSessionPetBreedingEvent.ts index 92984fee..ea2786e9 100644 --- a/src/nitro/session/events/RoomSessionPetBreedingEvent.ts +++ b/src/events/session/RoomSessionPetBreedingEvent.ts @@ -1,4 +1,4 @@ -import { IRoomSession } from '../../../api'; +import { IRoomSession } from '../../api'; import { RoomSessionEvent } from './RoomSessionEvent'; export class RoomSessionPetBreedingEvent extends RoomSessionEvent diff --git a/src/nitro/session/events/RoomSessionPetBreedingResultEvent.ts b/src/events/session/RoomSessionPetBreedingResultEvent.ts similarity index 53% rename from src/nitro/session/events/RoomSessionPetBreedingResultEvent.ts rename to src/events/session/RoomSessionPetBreedingResultEvent.ts index 8f4c27ca..7c22f983 100644 --- a/src/nitro/session/events/RoomSessionPetBreedingResultEvent.ts +++ b/src/events/session/RoomSessionPetBreedingResultEvent.ts @@ -1,15 +1,14 @@ -import { IRoomSession } from '../../../api'; -import { PetBreedingResultData } from '../../communication'; +import { IPetBreedingResultData, IRoomSession } from '../../api'; import { RoomSessionEvent } from './RoomSessionEvent'; export class RoomSessionPetBreedingResultEvent extends RoomSessionEvent { public static PET_BREEDING_RESULT: string = 'RSPFUE_PET_BREEDING_RESULT'; - private _resultData: PetBreedingResultData; - private _otherResultData: PetBreedingResultData; + private _resultData: IPetBreedingResultData; + private _otherResultData: IPetBreedingResultData; - constructor(k: IRoomSession, _arg_2: PetBreedingResultData, _arg_3: PetBreedingResultData) + constructor(k: IRoomSession, _arg_2: IPetBreedingResultData, _arg_3: IPetBreedingResultData) { super(RoomSessionPetBreedingResultEvent.PET_BREEDING_RESULT, k); @@ -17,12 +16,12 @@ export class RoomSessionPetBreedingResultEvent extends RoomSessionEvent this._otherResultData = _arg_3; } - public get resultData(): PetBreedingResultData + public get resultData(): IPetBreedingResultData { return this._resultData; } - public get otherResultData(): PetBreedingResultData + public get otherResultData(): IPetBreedingResultData { return this._otherResultData; } diff --git a/src/nitro/session/events/RoomSessionPetCommandsUpdateEvent.ts b/src/events/session/RoomSessionPetCommandsUpdateEvent.ts similarity index 94% rename from src/nitro/session/events/RoomSessionPetCommandsUpdateEvent.ts rename to src/events/session/RoomSessionPetCommandsUpdateEvent.ts index dc19b75b..89ec8453 100644 --- a/src/nitro/session/events/RoomSessionPetCommandsUpdateEvent.ts +++ b/src/events/session/RoomSessionPetCommandsUpdateEvent.ts @@ -1,4 +1,4 @@ -import { IRoomSession } from '../../../api'; +import { IRoomSession } from '../../api'; import { RoomSessionEvent } from './RoomSessionEvent'; export class RoomSessionPetCommandsUpdateEvent extends RoomSessionEvent diff --git a/src/nitro/session/events/RoomSessionPetFigureUpdateEvent.ts b/src/events/session/RoomSessionPetFigureUpdateEvent.ts similarity index 92% rename from src/nitro/session/events/RoomSessionPetFigureUpdateEvent.ts rename to src/events/session/RoomSessionPetFigureUpdateEvent.ts index c1f2c23b..5f317cb9 100644 --- a/src/nitro/session/events/RoomSessionPetFigureUpdateEvent.ts +++ b/src/events/session/RoomSessionPetFigureUpdateEvent.ts @@ -1,4 +1,4 @@ -import { IRoomSession } from '../../../api'; +import { IRoomSession } from '../../api'; import { RoomSessionEvent } from './RoomSessionEvent'; export class RoomSessionPetFigureUpdateEvent extends RoomSessionEvent diff --git a/src/nitro/session/events/RoomSessionPetInfoUpdateEvent.ts b/src/events/session/RoomSessionPetInfoUpdateEvent.ts similarity index 60% rename from src/nitro/session/events/RoomSessionPetInfoUpdateEvent.ts rename to src/events/session/RoomSessionPetInfoUpdateEvent.ts index 2ad210d3..23c238c7 100644 --- a/src/nitro/session/events/RoomSessionPetInfoUpdateEvent.ts +++ b/src/events/session/RoomSessionPetInfoUpdateEvent.ts @@ -1,21 +1,20 @@ -import { IRoomSession } from '../../../api'; -import { RoomPetData } from '../RoomPetData'; +import { IRoomPetData, IRoomSession } from '../../api'; import { RoomSessionEvent } from './RoomSessionEvent'; export class RoomSessionPetInfoUpdateEvent extends RoomSessionEvent { public static PET_INFO: string = 'RSPIUE_PET_INFO'; - private _petInfo: RoomPetData; + private _petInfo: IRoomPetData; - constructor(k: IRoomSession, _arg_2: RoomPetData) + constructor(k: IRoomSession, _arg_2: IRoomPetData) { super(RoomSessionPetInfoUpdateEvent.PET_INFO, k); this._petInfo = _arg_2; } - public get petInfo(): RoomPetData + public get petInfo(): IRoomPetData { return this._petInfo; } diff --git a/src/nitro/session/events/RoomSessionPetLevelUpdateEvent.ts b/src/events/session/RoomSessionPetLevelUpdateEvent.ts similarity index 92% rename from src/nitro/session/events/RoomSessionPetLevelUpdateEvent.ts rename to src/events/session/RoomSessionPetLevelUpdateEvent.ts index e6c8ddbe..4b9ba1e9 100644 --- a/src/nitro/session/events/RoomSessionPetLevelUpdateEvent.ts +++ b/src/events/session/RoomSessionPetLevelUpdateEvent.ts @@ -1,4 +1,4 @@ -import { IRoomSession } from '../../../api'; +import { IRoomSession } from '../../api'; import { RoomSessionEvent } from './RoomSessionEvent'; export class RoomSessionPetLevelUpdateEvent extends RoomSessionEvent diff --git a/src/nitro/session/events/RoomSessionPetPackageEvent.ts b/src/events/session/RoomSessionPetPackageEvent.ts similarity index 79% rename from src/nitro/session/events/RoomSessionPetPackageEvent.ts rename to src/events/session/RoomSessionPetPackageEvent.ts index e62c1e3c..90266809 100644 --- a/src/nitro/session/events/RoomSessionPetPackageEvent.ts +++ b/src/events/session/RoomSessionPetPackageEvent.ts @@ -1,5 +1,4 @@ -import { IRoomSession } from '../../../api'; -import { PetFigureDataParser } from '../../communication'; +import { IPetFigureData, IRoomSession } from '../../api'; import { RoomSessionEvent } from './RoomSessionEvent'; export class RoomSessionPetPackageEvent extends RoomSessionEvent @@ -8,11 +7,11 @@ export class RoomSessionPetPackageEvent extends RoomSessionEvent public static RSOPPE_OPEN_PET_PACKAGE_RESULT: string = 'RSOPPE_OPEN_PET_PACKAGE_RESULT'; private _objectId: number = -1; - private _figureData: PetFigureDataParser; + private _figureData: IPetFigureData; private _nameValidationStatus: number = 0; private _nameValidationInfo: string = null; - constructor(k: string, _arg_2: IRoomSession, _arg_3: number, _arg_4: PetFigureDataParser, _arg_5: number, _arg_6: string) + constructor(k: string, _arg_2: IRoomSession, _arg_3: number, _arg_4: IPetFigureData, _arg_5: number, _arg_6: string) { super(k, _arg_2); this._objectId = _arg_3; @@ -26,7 +25,7 @@ export class RoomSessionPetPackageEvent extends RoomSessionEvent return this._objectId; } - public get figureData(): PetFigureDataParser + public get figureData(): IPetFigureData { return this._figureData; } diff --git a/src/nitro/session/events/RoomSessionPetStatusUpdateEvent.ts b/src/events/session/RoomSessionPetStatusUpdateEvent.ts similarity index 96% rename from src/nitro/session/events/RoomSessionPetStatusUpdateEvent.ts rename to src/events/session/RoomSessionPetStatusUpdateEvent.ts index e8928f51..d62f0189 100644 --- a/src/nitro/session/events/RoomSessionPetStatusUpdateEvent.ts +++ b/src/events/session/RoomSessionPetStatusUpdateEvent.ts @@ -1,4 +1,4 @@ -import { IRoomSession } from '../../../api'; +import { IRoomSession } from '../../api'; import { RoomSessionEvent } from './RoomSessionEvent'; export class RoomSessionPetStatusUpdateEvent extends RoomSessionEvent diff --git a/src/nitro/session/events/RoomSessionPollEvent.ts b/src/events/session/RoomSessionPollEvent.ts similarity index 87% rename from src/nitro/session/events/RoomSessionPollEvent.ts rename to src/events/session/RoomSessionPollEvent.ts index 23a021c7..551ead71 100644 --- a/src/nitro/session/events/RoomSessionPollEvent.ts +++ b/src/events/session/RoomSessionPollEvent.ts @@ -1,8 +1,6 @@ -import { IRoomSession } from '../../../api'; -import { PollQuestion } from '../../communication'; +import { IPollQuestion, IRoomSession } from '../../api'; import { RoomSessionEvent } from './RoomSessionEvent'; - export class RoomSessionPollEvent extends RoomSessionEvent { public static OFFER: string = 'RSPE_POLL_OFFER'; @@ -15,7 +13,7 @@ export class RoomSessionPollEvent extends RoomSessionEvent private _numQuestions: number = 0; private _startMessage: string = ''; private _endMessage: string = ''; - private _questionArray: PollQuestion[] = null; + private _questionArray: IPollQuestion[] = null; private _npsPoll: boolean = false; constructor(k: string, _arg_2: IRoomSession, _arg_3: number) @@ -80,12 +78,12 @@ export class RoomSessionPollEvent extends RoomSessionEvent this._endMessage = k; } - public get questionArray(): PollQuestion[] + public get questionArray(): IPollQuestion[] { return this._questionArray; } - public set questionArray(k: PollQuestion[]) + public set questionArray(k: IPollQuestion[]) { this._questionArray = k; } diff --git a/src/nitro/session/events/RoomSessionPresentEvent.ts b/src/events/session/RoomSessionPresentEvent.ts similarity index 97% rename from src/nitro/session/events/RoomSessionPresentEvent.ts rename to src/events/session/RoomSessionPresentEvent.ts index 3ae77e5a..d589987c 100644 --- a/src/nitro/session/events/RoomSessionPresentEvent.ts +++ b/src/events/session/RoomSessionPresentEvent.ts @@ -1,4 +1,4 @@ -import { IRoomSession } from '../../../api'; +import { IRoomSession } from '../../api'; import { RoomSessionEvent } from './RoomSessionEvent'; export class RoomSessionPresentEvent extends RoomSessionEvent diff --git a/src/nitro/session/events/RoomSessionPropertyUpdateEvent.ts b/src/events/session/RoomSessionPropertyUpdateEvent.ts similarity index 85% rename from src/nitro/session/events/RoomSessionPropertyUpdateEvent.ts rename to src/events/session/RoomSessionPropertyUpdateEvent.ts index 67b0e935..bf284b47 100644 --- a/src/nitro/session/events/RoomSessionPropertyUpdateEvent.ts +++ b/src/events/session/RoomSessionPropertyUpdateEvent.ts @@ -1,4 +1,4 @@ -import { IRoomSession } from '../../../api'; +import { IRoomSession } from '../../api'; import { RoomSessionEvent } from './RoomSessionEvent'; export class RoomSessionPropertyUpdateEvent extends RoomSessionEvent diff --git a/src/nitro/session/events/RoomSessionQueueEvent.ts b/src/events/session/RoomSessionQueueEvent.ts similarity index 96% rename from src/nitro/session/events/RoomSessionQueueEvent.ts rename to src/events/session/RoomSessionQueueEvent.ts index 2c24514c..7cc3462b 100644 --- a/src/nitro/session/events/RoomSessionQueueEvent.ts +++ b/src/events/session/RoomSessionQueueEvent.ts @@ -1,4 +1,4 @@ -import { IRoomSession } from '../../../api'; +import { IRoomSession } from '../../api'; import { RoomSessionEvent } from './RoomSessionEvent'; export class RoomSessionQueueEvent extends RoomSessionEvent diff --git a/src/nitro/session/events/RoomSessionSpectatorModeEvent.ts b/src/events/session/RoomSessionSpectatorModeEvent.ts similarity index 86% rename from src/nitro/session/events/RoomSessionSpectatorModeEvent.ts rename to src/events/session/RoomSessionSpectatorModeEvent.ts index fb03e728..aed96851 100644 --- a/src/nitro/session/events/RoomSessionSpectatorModeEvent.ts +++ b/src/events/session/RoomSessionSpectatorModeEvent.ts @@ -1,4 +1,4 @@ -import { IRoomSession } from '../../../api'; +import { IRoomSession } from '../../api'; import { RoomSessionEvent } from './RoomSessionEvent'; export class RoomSessionSpectatorModeEvent extends RoomSessionEvent diff --git a/src/nitro/session/events/RoomSessionUserBadgesEvent.ts b/src/events/session/RoomSessionUserBadgesEvent.ts similarity index 92% rename from src/nitro/session/events/RoomSessionUserBadgesEvent.ts rename to src/events/session/RoomSessionUserBadgesEvent.ts index 47ada48c..9d28c1a8 100644 --- a/src/nitro/session/events/RoomSessionUserBadgesEvent.ts +++ b/src/events/session/RoomSessionUserBadgesEvent.ts @@ -1,4 +1,4 @@ -import { IRoomSession } from '../../../api'; +import { IRoomSession } from '../../api'; import { RoomSessionEvent } from './RoomSessionEvent'; export class RoomSessionUserBadgesEvent extends RoomSessionEvent diff --git a/src/nitro/session/events/RoomSessionUserDataUpdateEvent.ts b/src/events/session/RoomSessionUserDataUpdateEvent.ts similarity index 89% rename from src/nitro/session/events/RoomSessionUserDataUpdateEvent.ts rename to src/events/session/RoomSessionUserDataUpdateEvent.ts index bca845c4..6e8d2392 100644 --- a/src/nitro/session/events/RoomSessionUserDataUpdateEvent.ts +++ b/src/events/session/RoomSessionUserDataUpdateEvent.ts @@ -1,4 +1,4 @@ -import { IRoomSession, IRoomUserData } from '../../../api'; +import { IRoomSession, IRoomUserData } from '../../api'; import { RoomSessionEvent } from './RoomSessionEvent'; export class RoomSessionUserDataUpdateEvent extends RoomSessionEvent diff --git a/src/nitro/session/events/RoomSessionUserFigureUpdateEvent.ts b/src/events/session/RoomSessionUserFigureUpdateEvent.ts similarity index 96% rename from src/nitro/session/events/RoomSessionUserFigureUpdateEvent.ts rename to src/events/session/RoomSessionUserFigureUpdateEvent.ts index 9bd20e7a..40c410a0 100644 --- a/src/nitro/session/events/RoomSessionUserFigureUpdateEvent.ts +++ b/src/events/session/RoomSessionUserFigureUpdateEvent.ts @@ -1,4 +1,4 @@ -import { IRoomSession } from '../../../api'; +import { IRoomSession } from '../../api'; import { RoomSessionEvent } from './RoomSessionEvent'; export class RoomSessionUserFigureUpdateEvent extends RoomSessionEvent diff --git a/src/nitro/session/events/RoomSessionUserTagsEvent.ts b/src/events/session/RoomSessionUserTagsEvent.ts similarity index 91% rename from src/nitro/session/events/RoomSessionUserTagsEvent.ts rename to src/events/session/RoomSessionUserTagsEvent.ts index 736c117e..057b7bcf 100644 --- a/src/nitro/session/events/RoomSessionUserTagsEvent.ts +++ b/src/events/session/RoomSessionUserTagsEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../../core'; +import { NitroEvent } from '../core'; export class RoomSessionUserTagsEvent extends NitroEvent { diff --git a/src/nitro/session/events/RoomSessionVoteEvent.ts b/src/events/session/RoomSessionVoteEvent.ts similarity index 93% rename from src/nitro/session/events/RoomSessionVoteEvent.ts rename to src/events/session/RoomSessionVoteEvent.ts index c7135474..ae29ad54 100644 --- a/src/nitro/session/events/RoomSessionVoteEvent.ts +++ b/src/events/session/RoomSessionVoteEvent.ts @@ -1,4 +1,4 @@ -import { IRoomSession } from '../../../api'; +import { IRoomSession } from '../../api'; import { RoomSessionEvent } from './RoomSessionEvent'; @@ -21,7 +21,7 @@ export class RoomSessionVoteEvent extends RoomSessionEvent this._question = _arg_3; this._choices = _arg_4; this._SafeStr_7651 = _arg_5; - if(this._SafeStr_7651 == null) + if (this._SafeStr_7651 == null) { this._SafeStr_7651 = []; } diff --git a/src/nitro/session/events/RoomSessionWordQuizEvent.ts b/src/events/session/RoomSessionWordQuizEvent.ts similarity index 95% rename from src/nitro/session/events/RoomSessionWordQuizEvent.ts rename to src/events/session/RoomSessionWordQuizEvent.ts index 3c35f189..df5a1db6 100644 --- a/src/nitro/session/events/RoomSessionWordQuizEvent.ts +++ b/src/events/session/RoomSessionWordQuizEvent.ts @@ -1,5 +1,4 @@ -import { IRoomSession } from '../../../api'; -import { IQuestion } from '../../communication'; +import { IQuestion, IRoomSession } from '../../api'; import { RoomSessionEvent } from './RoomSessionEvent'; export class RoomSessionWordQuizEvent extends RoomSessionEvent diff --git a/src/nitro/session/events/SessionDataPreferencesEvent.ts b/src/events/session/SessionDataPreferencesEvent.ts similarity index 87% rename from src/nitro/session/events/SessionDataPreferencesEvent.ts rename to src/events/session/SessionDataPreferencesEvent.ts index b689ee1b..7e362d91 100644 --- a/src/nitro/session/events/SessionDataPreferencesEvent.ts +++ b/src/events/session/SessionDataPreferencesEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../../core'; +import { NitroEvent } from '../core'; export class SessionDataPreferencesEvent extends NitroEvent { diff --git a/src/nitro/session/events/UserNameUpdateEvent.ts b/src/events/session/UserNameUpdateEvent.ts similarity index 88% rename from src/nitro/session/events/UserNameUpdateEvent.ts rename to src/events/session/UserNameUpdateEvent.ts index 97b9402d..9b8051e7 100644 --- a/src/nitro/session/events/UserNameUpdateEvent.ts +++ b/src/events/session/UserNameUpdateEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../../core'; +import { NitroEvent } from '../core'; export class UserNameUpdateEvent extends NitroEvent { diff --git a/src/nitro/session/events/index.ts b/src/events/session/index.ts similarity index 100% rename from src/nitro/session/events/index.ts rename to src/events/session/index.ts diff --git a/src/index.ts b/src/index.ts index 31b70b7d..64121b05 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,5 +1,6 @@ export * from './api'; export * from './core'; +export * from './events'; export * from './nitro'; export * from './pixi-proxy'; export * from './room'; diff --git a/src/nitro/Nitro.ts b/src/nitro/Nitro.ts index 74efbb1f..54da3050 100644 --- a/src/nitro/Nitro.ts +++ b/src/nitro/Nitro.ts @@ -3,7 +3,8 @@ import { SCALE_MODES } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Ticker } from '@pixi/ticker'; import { IAvatarRenderManager, IEventDispatcher, ILinkEventTracker, INitroCommunicationManager, INitroCore, INitroLocalizationManager, IRoomCameraWidgetManager, IRoomEngine, IRoomManager, IRoomSessionManager, ISessionDataManager, ISoundManager, IWorkerEventTracker } from '../api'; -import { ConfigurationEvent, EventDispatcher, NitroCore, NitroEvent } from '../core'; +import { ConfigurationEvent, EventDispatcher, NitroCore } from '../core'; +import { NitroEvent, RoomEngineEvent } from '../events'; import { PixiApplicationProxy } from '../pixi-proxy'; import { RoomManager } from '../room'; import { AvatarRenderManager } from './avatar'; @@ -14,7 +15,7 @@ import { GameMessageHandler } from './game'; import { INitro } from './INitro'; import { NitroLocalizationManager } from './localization'; import './Plugins'; -import { RoomEngine, RoomEngineEvent } from './room'; +import { RoomEngine } from './room'; import { RoomSessionManager, SessionDataManager } from './session'; import { SoundManager } from './sound'; import { HabboWebTools } from './utils/HabboWebTools'; diff --git a/src/nitro/avatar/AvatarAssetDownloadLibrary.ts b/src/nitro/avatar/AvatarAssetDownloadLibrary.ts index 7586537f..4d3437b9 100644 --- a/src/nitro/avatar/AvatarAssetDownloadLibrary.ts +++ b/src/nitro/avatar/AvatarAssetDownloadLibrary.ts @@ -1,8 +1,8 @@ -import { IAssetManager } from '../../api'; +import { IAssetManager, IAvatarAssetDownloadLibrary } from '../../api'; import { EventDispatcher } from '../../core'; -import { AvatarRenderLibraryEvent } from './events'; +import { AvatarRenderLibraryEvent } from '../../events'; -export class AvatarAssetDownloadLibrary extends EventDispatcher +export class AvatarAssetDownloadLibrary extends EventDispatcher implements IAvatarAssetDownloadLibrary { public static DOWNLOAD_COMPLETE: string = 'AADL_DOWNLOAD_COMPLETE'; @@ -31,16 +31,16 @@ export class AvatarAssetDownloadLibrary extends EventDispatcher const asset = this._assets.getCollection(this._libraryName); - if(asset) this._state = AvatarAssetDownloadLibrary.LOADED; + if (asset) this._state = AvatarAssetDownloadLibrary.LOADED; } public downloadAsset(): void { - if(!this._assets || (this._state === AvatarAssetDownloadLibrary.LOADING) || (this._state === AvatarAssetDownloadLibrary.LOADED)) return; + if (!this._assets || (this._state === AvatarAssetDownloadLibrary.LOADING) || (this._state === AvatarAssetDownloadLibrary.LOADED)) return; const asset = this._assets.getCollection(this._libraryName); - if(asset) + if (asset) { this._state = AvatarAssetDownloadLibrary.LOADED; @@ -53,7 +53,7 @@ export class AvatarAssetDownloadLibrary extends EventDispatcher this._assets.downloadAsset(this._downloadUrl, (flag: boolean) => { - if(flag) + if (flag) { this._state = AvatarAssetDownloadLibrary.LOADED; diff --git a/src/nitro/avatar/AvatarAssetDownloadManager.ts b/src/nitro/avatar/AvatarAssetDownloadManager.ts index 3815af30..45846e91 100644 --- a/src/nitro/avatar/AvatarAssetDownloadManager.ts +++ b/src/nitro/avatar/AvatarAssetDownloadManager.ts @@ -1,9 +1,9 @@ -import { IAssetManager, IAvatarFigureContainer, IAvatarImageListener } from '../../api'; -import { EventDispatcher, NitroEvent } from '../../core'; +import { IAssetManager, IAvatarFigureContainer, IAvatarImageListener, INitroEvent } from '../../api'; +import { EventDispatcher } from '../../core'; +import { AvatarRenderEvent, AvatarRenderLibraryEvent, NitroEvent } from '../../events'; import { Nitro } from '../Nitro'; import { AvatarAssetDownloadLibrary } from './AvatarAssetDownloadLibrary'; import { AvatarStructure } from './AvatarStructure'; -import { AvatarRenderEvent, AvatarRenderLibraryEvent } from './events'; export class AvatarAssetDownloadManager extends EventDispatcher { @@ -124,7 +124,7 @@ export class AvatarAssetDownloadManager extends EventDispatcher } } - private onAvatarRenderReady(event: NitroEvent): void + private onAvatarRenderReady(event: INitroEvent): void { if (!event) return; diff --git a/src/nitro/avatar/AvatarRenderManager.ts b/src/nitro/avatar/AvatarRenderManager.ts index bf06604a..100a40ba 100644 --- a/src/nitro/avatar/AvatarRenderManager.ts +++ b/src/nitro/avatar/AvatarRenderManager.ts @@ -1,5 +1,6 @@ -import { AvatarSetType, IAssetManager, IAvatarEffectListener, IAvatarFigureContainer, IAvatarImage, IAvatarImageListener, IAvatarRenderManager, IFigureData, IFigurePartSet, IFigureSetData, IGraphicAsset, IStructureData } from '../../api'; -import { NitroEvent, NitroManager } from '../../core'; +import { AvatarSetType, IAssetManager, IAvatarEffectListener, IAvatarFigureContainer, IAvatarImage, IAvatarImageListener, IAvatarRenderManager, IFigureData, IFigurePartSet, IFigureSetData, IGraphicAsset, INitroEvent, IStructureData } from '../../api'; +import { NitroManager } from '../../core'; +import { AvatarRenderEvent, NitroEvent } from '../../events'; import { Nitro } from '../Nitro'; import { FigureDataContainer } from '../utils'; import { AssetAliasCollection } from './alias'; @@ -11,7 +12,6 @@ import { HabboAvatarAnimations } from "./data/HabboAvatarAnimations"; import { HabboAvatarGeometry } from './data/HabboAvatarGeometry'; import { HabboAvatarPartSets } from './data/HabboAvatarPartSets'; import { EffectAssetDownloadManager } from './EffectAssetDownloadManager'; -import { AvatarRenderEvent } from './events'; import { PlaceHolderAvatarImage } from './PlaceHolderAvatarImage'; import { AvatarStructureDownload } from './structure'; @@ -198,7 +198,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa structureDownloader.addEventListener(AvatarStructureDownload.AVATAR_STRUCTURE_DONE, this.onAvatarStructureDownloadDone); } - private onAvatarStructureDownloadDone(event: NitroEvent): void + private onAvatarStructureDownloadDone(event: INitroEvent): void { this._structureReady = true; @@ -207,7 +207,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa this.checkReady(); } - private onAvatarAssetDownloaderReady(event: NitroEvent): void + private onAvatarAssetDownloaderReady(event: INitroEvent): void { if (!event) return; @@ -216,14 +216,14 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa this.checkReady(); } - private onAvatarAssetDownloaded(event: NitroEvent): void + private onAvatarAssetDownloaded(event: INitroEvent): void { if (!event) return; this._aliasCollection.reset(); } - private onEffectAssetDownloaderReady(event: NitroEvent): void + private onEffectAssetDownloaderReady(event: INitroEvent): void { if (!event) return; @@ -232,7 +232,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa this.checkReady(); } - private onEffectAssetDownloaded(event: NitroEvent): void + private onEffectAssetDownloaded(event: INitroEvent): void { if (!event) return; diff --git a/src/nitro/avatar/EffectAssetDownloadLibrary.ts b/src/nitro/avatar/EffectAssetDownloadLibrary.ts index 06e08cf4..9a7db8df 100644 --- a/src/nitro/avatar/EffectAssetDownloadLibrary.ts +++ b/src/nitro/avatar/EffectAssetDownloadLibrary.ts @@ -1,8 +1,8 @@ -import { IAssetAnimation, IAssetManager } from '../../api'; +import { IAssetAnimation, IAssetManager, IEffectAssetDownloadLibrary } from '../../api'; import { EventDispatcher } from '../../core'; -import { AvatarRenderEffectLibraryEvent } from './events'; +import { AvatarRenderEffectLibraryEvent } from '../../events'; -export class EffectAssetDownloadLibrary extends EventDispatcher +export class EffectAssetDownloadLibrary extends EventDispatcher implements IEffectAssetDownloadLibrary { public static DOWNLOAD_COMPLETE: string = 'EADL_DOWNLOAD_COMPLETE'; @@ -33,16 +33,16 @@ export class EffectAssetDownloadLibrary extends EventDispatcher const asset = this._assets.getCollection(this._libraryName); - if(asset) this._state = EffectAssetDownloadLibrary.LOADED; + if (asset) this._state = EffectAssetDownloadLibrary.LOADED; } public downloadAsset(): void { - if(!this._assets || (this._state === EffectAssetDownloadLibrary.LOADING) || (this._state === EffectAssetDownloadLibrary.LOADED)) return; + if (!this._assets || (this._state === EffectAssetDownloadLibrary.LOADING) || (this._state === EffectAssetDownloadLibrary.LOADED)) return; const asset = this._assets.getCollection(this._libraryName); - if(asset) + if (asset) { this._state = EffectAssetDownloadLibrary.LOADED; @@ -55,13 +55,13 @@ export class EffectAssetDownloadLibrary extends EventDispatcher this._assets.downloadAsset(this._downloadUrl, (flag: boolean) => { - if(flag) + if (flag) { this._state = EffectAssetDownloadLibrary.LOADED; const collection = this._assets.getCollection(this._libraryName); - if(collection) this._animation = collection.data.animations; + if (collection) this._animation = collection.data.animations; this.dispatchEvent(new AvatarRenderEffectLibraryEvent(AvatarRenderEffectLibraryEvent.DOWNLOAD_COMPLETE, this)); } diff --git a/src/nitro/avatar/EffectAssetDownloadManager.ts b/src/nitro/avatar/EffectAssetDownloadManager.ts index 06aa219f..fb1eb782 100644 --- a/src/nitro/avatar/EffectAssetDownloadManager.ts +++ b/src/nitro/avatar/EffectAssetDownloadManager.ts @@ -1,9 +1,9 @@ -import { IAssetManager, IAvatarEffectListener } from '../../api'; -import { EventDispatcher, NitroEvent } from '../../core'; +import { IAssetManager, IAvatarEffectListener, INitroEvent } from '../../api'; +import { EventDispatcher } from '../../core'; +import { AvatarRenderEffectLibraryEvent, AvatarRenderEvent, NitroEvent } from '../../events'; import { Nitro } from '../Nitro'; import { AvatarStructure } from './AvatarStructure'; import { EffectAssetDownloadLibrary } from './EffectAssetDownloadLibrary'; -import { AvatarRenderEffectLibraryEvent, AvatarRenderEvent } from './events'; export class EffectAssetDownloadManager extends EventDispatcher { @@ -157,7 +157,7 @@ export class EffectAssetDownloadManager extends EventDispatcher } } - private onAvatarRenderReady(event: NitroEvent): void + private onAvatarRenderReady(event: INitroEvent): void { if (!event) return; diff --git a/src/nitro/avatar/events/AvatarRenderEffectLibraryEvent.ts b/src/nitro/avatar/events/AvatarRenderEffectLibraryEvent.ts deleted file mode 100644 index c636fe6c..00000000 --- a/src/nitro/avatar/events/AvatarRenderEffectLibraryEvent.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { NitroEvent } from '../../../core'; -import { EffectAssetDownloadLibrary } from '../EffectAssetDownloadLibrary'; - -export class AvatarRenderEffectLibraryEvent extends NitroEvent -{ - public static DOWNLOAD_COMPLETE: string = 'ARELE_DOWNLOAD_COMPLETE'; - - private _library: EffectAssetDownloadLibrary; - - constructor(type: string, library: EffectAssetDownloadLibrary) - { - super(type); - - this._library = library; - } - - public get library(): EffectAssetDownloadLibrary - { - return this._library; - } -} diff --git a/src/nitro/avatar/events/AvatarRenderLibraryEvent.ts b/src/nitro/avatar/events/AvatarRenderLibraryEvent.ts deleted file mode 100644 index 98df7207..00000000 --- a/src/nitro/avatar/events/AvatarRenderLibraryEvent.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { NitroEvent } from '../../../core'; -import { AvatarAssetDownloadLibrary } from '../AvatarAssetDownloadLibrary'; - -export class AvatarRenderLibraryEvent extends NitroEvent -{ - public static DOWNLOAD_COMPLETE: string = 'ARLE_DOWNLOAD_COMPLETE'; - - private _library: AvatarAssetDownloadLibrary; - - constructor(type: string, library: AvatarAssetDownloadLibrary) - { - super(type); - - this._library = library; - } - - public get library(): AvatarAssetDownloadLibrary - { - return this._library; - } -} diff --git a/src/nitro/avatar/index.ts b/src/nitro/avatar/index.ts index a00fb967..86ffe1b4 100644 --- a/src/nitro/avatar/index.ts +++ b/src/nitro/avatar/index.ts @@ -15,7 +15,6 @@ export * from './data/HabboAvatarGeometry'; export * from './data/HabboAvatarPartSets'; export * from './EffectAssetDownloadLibrary'; export * from './EffectAssetDownloadManager'; -export * from './events'; export * from './geometry'; export * from './pets'; export * from './PlaceHolderAvatarImage'; diff --git a/src/nitro/avatar/structure/AvatarStructureDownload.ts b/src/nitro/avatar/structure/AvatarStructureDownload.ts index 44b311d7..901f9f1c 100644 --- a/src/nitro/avatar/structure/AvatarStructureDownload.ts +++ b/src/nitro/avatar/structure/AvatarStructureDownload.ts @@ -1,5 +1,6 @@ import { IFigureSetData } from '../../../api'; -import { EventDispatcher, NitroEvent } from '../../../core'; +import { EventDispatcher } from '../../../core'; +import { NitroEvent } from '../../../events'; export class AvatarStructureDownload extends EventDispatcher { diff --git a/src/nitro/camera/RoomCameraWidgetManager.ts b/src/nitro/camera/RoomCameraWidgetManager.ts index dfb5bee7..9e9a6ab2 100644 --- a/src/nitro/camera/RoomCameraWidgetManager.ts +++ b/src/nitro/camera/RoomCameraWidgetManager.ts @@ -2,10 +2,10 @@ import { Texture } from '@pixi/core'; import { ColorMatrix, ColorMatrixFilter } from '@pixi/filter-color-matrix'; import { IEventDispatcher, IRoomCameraWidgetEffect, IRoomCameraWidgetManager, IRoomCameraWidgetSelectedEffect } from '../../api'; import { EventDispatcher } from '../../core'; +import { RoomCameraWidgetManagerEvent } from '../../events'; import { NitroContainer, NitroSprite, TextureUtils } from '../../pixi-proxy'; import { Nitro } from '../Nitro'; import { RoomCameraWidgetEffect } from './RoomCameraWidgetEffect'; -import { RoomCameraWidgetManagerEvent } from './RoomCameraWidgetManagerEvent'; export class RoomCameraWidgetManager implements IRoomCameraWidgetManager { @@ -22,20 +22,20 @@ export class RoomCameraWidgetManager implements IRoomCameraWidgetManager public init(): void { - if(this._isLoaded) return; + if (this._isLoaded) return; this._isLoaded = true; const imagesUrl = Nitro.instance.getConfiguration('image.library.url') + 'Habbo-Stories/'; const effects = Nitro.instance.getConfiguration<{ name: string, colorMatrix?: ColorMatrix, minLevel: number, blendMode?: number, enabled: boolean }[]>('camera.available.effects'); - for(const effect of effects) + for (const effect of effects) { - if(!effect.enabled) continue; + if (!effect.enabled) continue; const cameraEffect = new RoomCameraWidgetEffect(effect.name, effect.minLevel); - if(effect.colorMatrix.length) + if (effect.colorMatrix.length) { cameraEffect.colorMatrix = effect.colorMatrix; } @@ -58,22 +58,22 @@ export class RoomCameraWidgetManager implements IRoomCameraWidgetManager container.addChild(sprite); - if(isZoomed) sprite.scale.set(2); + if (isZoomed) sprite.scale.set(2); - for(const selectedEffect of selectedEffects) + for (const selectedEffect of selectedEffects) { const effect = selectedEffect.effect; - if(!effect) continue; + if (!effect) continue; - if(effect.colorMatrix) + if (effect.colorMatrix) { const filter = new ColorMatrixFilter(); filter.matrix = effect.colorMatrix; filter.alpha = selectedEffect.alpha; - if(!sprite.filters) sprite.filters = []; + if (!sprite.filters) sprite.filters = []; sprite.filters.push(filter); } diff --git a/src/nitro/camera/index.ts b/src/nitro/camera/index.ts index 5d0ba1a8..c79058c0 100644 --- a/src/nitro/camera/index.ts +++ b/src/nitro/camera/index.ts @@ -1,4 +1,3 @@ export * from './RoomCameraWidgetEffect'; export * from './RoomCameraWidgetManager'; -export * from './RoomCameraWidgetManagerEvent'; export * from './RoomCameraWidgetSelectedEffect'; diff --git a/src/nitro/communication/demo/NitroCommunicationDemo.ts b/src/nitro/communication/NitroCommunicationDemo.ts similarity index 94% rename from src/nitro/communication/demo/NitroCommunicationDemo.ts rename to src/nitro/communication/NitroCommunicationDemo.ts index 0350c13c..7a93bfdd 100644 --- a/src/nitro/communication/demo/NitroCommunicationDemo.ts +++ b/src/nitro/communication/NitroCommunicationDemo.ts @@ -1,9 +1,9 @@ -import { IConnection, INitroCommunicationDemo, INitroCommunicationManager } from '../../../api'; -import { NitroManager, SocketConnectionEvent } from '../../../core'; -import { GetTickerTime } from '../../../pixi-proxy'; -import { Nitro } from '../../Nitro'; -import { AuthenticatedEvent, ClientHelloMessageComposer, ClientPingEvent, InfoRetrieveMessageComposer, PongMessageComposer, SSOTicketMessageComposer } from '../messages'; -import { NitroCommunicationDemoEvent } from './NitroCommunicationDemoEvent'; +import { IConnection, INitroCommunicationDemo, INitroCommunicationManager } from '../../api'; +import { NitroManager } from '../../core'; +import { NitroCommunicationDemoEvent, SocketConnectionEvent } from '../../events'; +import { GetTickerTime } from '../../pixi-proxy'; +import { Nitro } from '../Nitro'; +import { AuthenticatedEvent, ClientHelloMessageComposer, ClientPingEvent, InfoRetrieveMessageComposer, PongMessageComposer, SSOTicketMessageComposer } from './messages'; export class NitroCommunicationDemo extends NitroManager implements INitroCommunicationDemo { diff --git a/src/nitro/communication/NitroCommunicationManager.ts b/src/nitro/communication/NitroCommunicationManager.ts index 6b1cff98..81b82c0b 100644 --- a/src/nitro/communication/NitroCommunicationManager.ts +++ b/src/nitro/communication/NitroCommunicationManager.ts @@ -1,7 +1,8 @@ -import { ICommunicationManager, IConnection, IConnectionStateListener, IMessageConfiguration, IMessageEvent, INitroCommunicationDemo, INitroCommunicationManager } from '../../api'; -import { NitroEvent, NitroManager, SocketConnectionEvent } from '../../core'; +import { ICommunicationManager, IConnection, IConnectionStateListener, IMessageConfiguration, IMessageEvent, INitroCommunicationDemo, INitroCommunicationManager, INitroEvent } from '../../api'; +import { NitroManager } from '../../core'; +import { NitroCommunicationDemoEvent, SocketConnectionEvent } from '../../events'; import { Nitro } from '../Nitro'; -import { NitroCommunicationDemo, NitroCommunicationDemoEvent } from './demo'; +import { NitroCommunicationDemo } from './NitroCommunicationDemo'; import { NitroMessages } from './NitroMessages'; export class NitroCommunicationManager extends NitroManager implements INitroCommunicationManager, IConnectionStateListener @@ -30,7 +31,7 @@ export class NitroCommunicationManager extends NitroManager implements INitroCom protected onInit(): void { - if(this._connection) return; + if (this._connection) return; Nitro.instance.events.addEventListener(NitroCommunicationDemoEvent.CONNECTION_AUTHENTICATED, this.onConnectionAuthenticatedEvent); @@ -42,16 +43,16 @@ export class NitroCommunicationManager extends NitroManager implements INitroCom this._connection.addEventListener(SocketConnectionEvent.CONNECTION_CLOSED, this.onConnectionClosedEvent); this._connection.addEventListener(SocketConnectionEvent.CONNECTION_ERROR, this.onConnectionErrorEvent); - if(this._demo) this._demo.init(); + if (this._demo) this._demo.init(); this._connection.init(Nitro.instance.getConfiguration('socket.url')); } protected onDispose(): void { - if(this._demo) this._demo.dispose(); + if (this._demo) this._demo.dispose(); - if(this._connection) + if (this._connection) { this._connection.removeEventListener(SocketConnectionEvent.CONNECTION_OPENED, this.onConnectionOpenedEvent); this._connection.removeEventListener(SocketConnectionEvent.CONNECTION_CLOSED, this.onConnectionClosedEvent); @@ -78,11 +79,11 @@ export class NitroCommunicationManager extends NitroManager implements INitroCom this.logger.log('Connection Error'); } - private onConnectionAuthenticatedEvent(event: NitroEvent): void + private onConnectionAuthenticatedEvent(event: INitroEvent): void { this.logger.log('Connection Authenticated'); - if(this._connection) this._connection.authenticated(); + if (this._connection) this._connection.authenticated(); } public connectionInit(socketUrl: string): void @@ -92,14 +93,14 @@ export class NitroCommunicationManager extends NitroManager implements INitroCom public registerMessageEvent(event: IMessageEvent): IMessageEvent { - if(this._connection) this._connection.addMessageEvent(event); + if (this._connection) this._connection.addMessageEvent(event); return event; } public removeMessageEvent(event: IMessageEvent): void { - if(!this._connection) return; + if (!this._connection) return; this._connection.removeMessageEvent(event); } diff --git a/src/nitro/communication/index.ts b/src/nitro/communication/index.ts index 721fe26f..b5f456f7 100644 --- a/src/nitro/communication/index.ts +++ b/src/nitro/communication/index.ts @@ -1,4 +1,4 @@ -export * from './demo'; export * from './messages'; +export * from './NitroCommunicationDemo'; export * from './NitroCommunicationManager'; export * from './NitroMessages'; diff --git a/src/nitro/communication/messages/incoming/advertisement/InterstitialMessageEvent.ts b/src/nitro/communication/messages/incoming/advertisement/InterstitialMessageEvent.ts index 2e297e75..bad2f832 100644 --- a/src/nitro/communication/messages/incoming/advertisement/InterstitialMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/advertisement/InterstitialMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { InterstitialMessageParser } from '../../parser'; export class InterstitialMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/advertisement/RoomAdErrorEvent.ts b/src/nitro/communication/messages/incoming/advertisement/RoomAdErrorEvent.ts index 162c2320..a3559411 100644 --- a/src/nitro/communication/messages/incoming/advertisement/RoomAdErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/advertisement/RoomAdErrorEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { RoomAdErrorMessageParser } from '../../parser'; export class RoomAdErrorEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/availability/AvailabilityStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/availability/AvailabilityStatusMessageEvent.ts index 58827fdd..0e5bc26d 100644 --- a/src/nitro/communication/messages/incoming/availability/AvailabilityStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/availability/AvailabilityStatusMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { AvailabilityStatusMessageParser } from '../../parser'; export class AvailabilityStatusMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/availability/AvailabilityTimeMessageEvent.ts b/src/nitro/communication/messages/incoming/availability/AvailabilityTimeMessageEvent.ts index 3db21149..e1aa43e2 100644 --- a/src/nitro/communication/messages/incoming/availability/AvailabilityTimeMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/availability/AvailabilityTimeMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { AvailabilityTimeMessageParser } from '../../parser'; export class AvailabilityTimeMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/availability/HotelClosedAndOpensEvent.ts b/src/nitro/communication/messages/incoming/availability/HotelClosedAndOpensEvent.ts index be7b77ad..e048a644 100644 --- a/src/nitro/communication/messages/incoming/availability/HotelClosedAndOpensEvent.ts +++ b/src/nitro/communication/messages/incoming/availability/HotelClosedAndOpensEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { HotelClosedAndOpensMessageParser } from '../../parser'; export class HotelClosedAndOpensEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/availability/HotelClosesAndWillOpenAtEvent.ts b/src/nitro/communication/messages/incoming/availability/HotelClosesAndWillOpenAtEvent.ts index 32a4adba..cae55a23 100644 --- a/src/nitro/communication/messages/incoming/availability/HotelClosesAndWillOpenAtEvent.ts +++ b/src/nitro/communication/messages/incoming/availability/HotelClosesAndWillOpenAtEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { HotelClosesAndWillOpenAtMessageParser } from '../../parser'; export class HotelClosesAndWillOpenAtEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/availability/HotelWillCloseInMinutesEvent.ts b/src/nitro/communication/messages/incoming/availability/HotelWillCloseInMinutesEvent.ts index f457a6c6..74eda44b 100644 --- a/src/nitro/communication/messages/incoming/availability/HotelWillCloseInMinutesEvent.ts +++ b/src/nitro/communication/messages/incoming/availability/HotelWillCloseInMinutesEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { HotelWillCloseInMinutesMessageParser } from '../../parser'; export class HotelWillCloseInMinutesEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/availability/MaintenanceStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/availability/MaintenanceStatusMessageEvent.ts index ec58bbd2..3da15a81 100644 --- a/src/nitro/communication/messages/incoming/availability/MaintenanceStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/availability/MaintenanceStatusMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { MaintenanceStatusMessageParser } from '../../parser'; export class MaintenanceStatusMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/avatar/ChangeUserNameResultMessageEvent.ts b/src/nitro/communication/messages/incoming/avatar/ChangeUserNameResultMessageEvent.ts index f0eaeed0..886005ca 100644 --- a/src/nitro/communication/messages/incoming/avatar/ChangeUserNameResultMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/avatar/ChangeUserNameResultMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { ChangeUserNameResultMessageParser } from '../../parser'; export class ChangeUserNameResultMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/avatar/CheckUserNameResultMessageEvent.ts b/src/nitro/communication/messages/incoming/avatar/CheckUserNameResultMessageEvent.ts index 76177870..93d0d49b 100644 --- a/src/nitro/communication/messages/incoming/avatar/CheckUserNameResultMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/avatar/CheckUserNameResultMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CheckUserNameResultMessageParser } from '../../parser'; export class CheckUserNameResultMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/avatar/FigureUpdateEvent.ts b/src/nitro/communication/messages/incoming/avatar/FigureUpdateEvent.ts index 398b46d8..dacf15fd 100644 --- a/src/nitro/communication/messages/incoming/avatar/FigureUpdateEvent.ts +++ b/src/nitro/communication/messages/incoming/avatar/FigureUpdateEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { FigureUpdateParser } from '../../parser'; export class FigureUpdateEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/avatar/WardrobeMessageEvent.ts b/src/nitro/communication/messages/incoming/avatar/WardrobeMessageEvent.ts index 1337f40a..b138c322 100644 --- a/src/nitro/communication/messages/incoming/avatar/WardrobeMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/avatar/WardrobeMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { WardrobeMessageParser } from '../../parser'; export class WardrobeMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/bots/BotAddedToInventoryEvent.ts b/src/nitro/communication/messages/incoming/bots/BotAddedToInventoryEvent.ts index 53b17052..0036a0f6 100644 --- a/src/nitro/communication/messages/incoming/bots/BotAddedToInventoryEvent.ts +++ b/src/nitro/communication/messages/incoming/bots/BotAddedToInventoryEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { BotAddedToInventoryParser } from '../../parser'; export class BotAddedToInventoryEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/bots/BotInventoryMessageEvent.ts b/src/nitro/communication/messages/incoming/bots/BotInventoryMessageEvent.ts index cf462462..f1c2a990 100644 --- a/src/nitro/communication/messages/incoming/bots/BotInventoryMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/bots/BotInventoryMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { BotInventoryMessageParser } from '../../parser'; export class BotInventoryMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/bots/BotReceivedMessageEvent.ts b/src/nitro/communication/messages/incoming/bots/BotReceivedMessageEvent.ts index 7852f696..aab273d3 100644 --- a/src/nitro/communication/messages/incoming/bots/BotReceivedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/bots/BotReceivedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { BotReceivedMessageParser } from '../../parser'; export class BotReceivedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/bots/BotRemovedFromInventoryEvent.ts b/src/nitro/communication/messages/incoming/bots/BotRemovedFromInventoryEvent.ts index 36622665..30982df7 100644 --- a/src/nitro/communication/messages/incoming/bots/BotRemovedFromInventoryEvent.ts +++ b/src/nitro/communication/messages/incoming/bots/BotRemovedFromInventoryEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { BotRemovedFromInventoryParser } from '../../parser'; export class BotRemovedFromInventoryEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/callforhelp/CfhSanctionMessageEvent.ts b/src/nitro/communication/messages/incoming/callforhelp/CfhSanctionMessageEvent.ts index cfc1bd52..3e058ff9 100644 --- a/src/nitro/communication/messages/incoming/callforhelp/CfhSanctionMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/callforhelp/CfhSanctionMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CfhSanctionMessageParser } from '../../parser'; export class CfhSanctionMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/callforhelp/CfhTopicsInitEvent.ts b/src/nitro/communication/messages/incoming/callforhelp/CfhTopicsInitEvent.ts index a45ee59e..1109b5c9 100644 --- a/src/nitro/communication/messages/incoming/callforhelp/CfhTopicsInitEvent.ts +++ b/src/nitro/communication/messages/incoming/callforhelp/CfhTopicsInitEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CfhTopicsInitMessageParser } from '../../parser'; export class CfhTopicsInitEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/callforhelp/SanctionStatusEvent.ts b/src/nitro/communication/messages/incoming/callforhelp/SanctionStatusEvent.ts index 5091dc4f..0710df1a 100644 --- a/src/nitro/communication/messages/incoming/callforhelp/SanctionStatusEvent.ts +++ b/src/nitro/communication/messages/incoming/callforhelp/SanctionStatusEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { SanctionStatusMessageParser } from '../../parser'; export class SanctionStatusEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/camera/CameraPublishStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/camera/CameraPublishStatusMessageEvent.ts index ba37bf86..f70e3d20 100644 --- a/src/nitro/communication/messages/incoming/camera/CameraPublishStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/camera/CameraPublishStatusMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CameraPublishStatusMessageParser } from '../../parser'; export class CameraPublishStatusMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/camera/CameraPurchaseOKMessageEvent.ts b/src/nitro/communication/messages/incoming/camera/CameraPurchaseOKMessageEvent.ts index 1495510c..7c0a8c61 100644 --- a/src/nitro/communication/messages/incoming/camera/CameraPurchaseOKMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/camera/CameraPurchaseOKMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CameraPurchaseOKMessageParser } from '../../parser'; export class CameraPurchaseOKMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/camera/CameraStorageUrlMessageEvent.ts b/src/nitro/communication/messages/incoming/camera/CameraStorageUrlMessageEvent.ts index 16f22453..7e7d1dfd 100644 --- a/src/nitro/communication/messages/incoming/camera/CameraStorageUrlMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/camera/CameraStorageUrlMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CameraStorageUrlMessageParser } from '../../parser'; export class CameraStorageUrlMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/camera/CompetitionStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/camera/CompetitionStatusMessageEvent.ts index 95ff38d3..b2e1e107 100644 --- a/src/nitro/communication/messages/incoming/camera/CompetitionStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/camera/CompetitionStatusMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CompetitionStatusMessageParser } from '../../parser'; export class CompetitionStatusMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/camera/InitCameraMessageEvent.ts b/src/nitro/communication/messages/incoming/camera/InitCameraMessageEvent.ts index 4dcaef28..28d734f4 100644 --- a/src/nitro/communication/messages/incoming/camera/InitCameraMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/camera/InitCameraMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { InitCameraMessageParser } from '../../parser'; export class InitCameraMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/camera/ThumbnailStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/camera/ThumbnailStatusMessageEvent.ts index a1c516fa..ec6e0730 100644 --- a/src/nitro/communication/messages/incoming/camera/ThumbnailStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/camera/ThumbnailStatusMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { ThumbnailStatusMessageParser } from '../../parser'; export class ThumbnailStatusMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/campaign/CampaignCalendarDataMessageEvent.ts b/src/nitro/communication/messages/incoming/campaign/CampaignCalendarDataMessageEvent.ts index d275a6c9..6e239a58 100644 --- a/src/nitro/communication/messages/incoming/campaign/CampaignCalendarDataMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/campaign/CampaignCalendarDataMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CampaignCalendarDataMessageParser } from '../../parser'; export class CampaignCalendarDataMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/campaign/CampaignCalendarDoorOpenedMessageEvent.ts b/src/nitro/communication/messages/incoming/campaign/CampaignCalendarDoorOpenedMessageEvent.ts index f845afd5..83416827 100644 --- a/src/nitro/communication/messages/incoming/campaign/CampaignCalendarDoorOpenedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/campaign/CampaignCalendarDoorOpenedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CampaignCalendarDoorOpenedMessageParser } from '../../parser'; export class CampaignCalendarDoorOpenedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/BonusRareInfoMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/BonusRareInfoMessageEvent.ts index 44a8cb60..2e6169a3 100644 --- a/src/nitro/communication/messages/incoming/catalog/BonusRareInfoMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/BonusRareInfoMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { BonusRareInfoMessageParser } from '../../parser'; export class BonusRareInfoMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/BuildersClubFurniCountMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/BuildersClubFurniCountMessageEvent.ts index 8282bdd6..159bc882 100644 --- a/src/nitro/communication/messages/incoming/catalog/BuildersClubFurniCountMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/BuildersClubFurniCountMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { BuildersClubFurniCountMessageParser } from '../../parser'; export class BuildersClubFurniCountMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/BuildersClubSubscriptionStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/BuildersClubSubscriptionStatusMessageEvent.ts index 77a84ee4..e4385dce 100644 --- a/src/nitro/communication/messages/incoming/catalog/BuildersClubSubscriptionStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/BuildersClubSubscriptionStatusMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { BuildersClubSubscriptionStatusMessageParser } from '../../parser'; export class BuildersClubSubscriptionStatusMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/BundleDiscountRulesetMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/BundleDiscountRulesetMessageEvent.ts index 9c9ad068..6cd294ee 100644 --- a/src/nitro/communication/messages/incoming/catalog/BundleDiscountRulesetMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/BundleDiscountRulesetMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { BundleDiscountRulesetMessageParser } from '../../parser'; export class BundleDiscountRulesetMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/CatalogPageExpirationEvent.ts b/src/nitro/communication/messages/incoming/catalog/CatalogPageExpirationEvent.ts index ee463719..cd75eab3 100644 --- a/src/nitro/communication/messages/incoming/catalog/CatalogPageExpirationEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/CatalogPageExpirationEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CatalogPageExpirationParser } from '../../parser'; export class CatalogPageExpirationEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/CatalogPageMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/CatalogPageMessageEvent.ts index 28793986..a9a67123 100644 --- a/src/nitro/communication/messages/incoming/catalog/CatalogPageMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/CatalogPageMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CatalogPageMessageParser } from '../../parser'; export class CatalogPageMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/CatalogPageWithEarliestExpiryMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/CatalogPageWithEarliestExpiryMessageEvent.ts index 79659f3e..50e8f9a0 100644 --- a/src/nitro/communication/messages/incoming/catalog/CatalogPageWithEarliestExpiryMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/CatalogPageWithEarliestExpiryMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CatalogPageWithEarliestExpiryMessageParser } from '../../parser'; export class CatalogPageWithEarliestExpiryMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/CatalogPagesListEvent.ts b/src/nitro/communication/messages/incoming/catalog/CatalogPagesListEvent.ts index 3a9bf6d2..ae255bff 100644 --- a/src/nitro/communication/messages/incoming/catalog/CatalogPagesListEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/CatalogPagesListEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CatalogIndexMessageParser } from '../../parser'; export class CatalogPagesListEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/CatalogPublishedMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/CatalogPublishedMessageEvent.ts index e9b5df22..8364f2ed 100644 --- a/src/nitro/communication/messages/incoming/catalog/CatalogPublishedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/CatalogPublishedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CatalogPublishedMessageParser } from '../../parser'; export class CatalogPublishedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/ClubGiftInfoEvent.ts b/src/nitro/communication/messages/incoming/catalog/ClubGiftInfoEvent.ts index 752b9868..cbae8d4d 100644 --- a/src/nitro/communication/messages/incoming/catalog/ClubGiftInfoEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/ClubGiftInfoEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { ClubGiftInfoParser } from '../../parser'; export class ClubGiftInfoEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/ClubGiftSelectedEvent.ts b/src/nitro/communication/messages/incoming/catalog/ClubGiftSelectedEvent.ts index f0c5d31b..289b22ca 100644 --- a/src/nitro/communication/messages/incoming/catalog/ClubGiftSelectedEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/ClubGiftSelectedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { ClubGiftSelectedParser } from '../../parser'; export class ClubGiftSelectedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/DirectSMSClubBuyAvailableMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/DirectSMSClubBuyAvailableMessageEvent.ts index 70b98b1c..0b0fe3be 100644 --- a/src/nitro/communication/messages/incoming/catalog/DirectSMSClubBuyAvailableMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/DirectSMSClubBuyAvailableMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { DirectSMSClubBuyAvailableMessageParser } from '../../parser'; export class DirectSMSClubBuyAvailableMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/GiftReceiverNotFoundEvent.ts b/src/nitro/communication/messages/incoming/catalog/GiftReceiverNotFoundEvent.ts index 1827ebda..39ff2e54 100644 --- a/src/nitro/communication/messages/incoming/catalog/GiftReceiverNotFoundEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/GiftReceiverNotFoundEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { GiftReceiverNotFoundParser } from '../../parser'; export class GiftReceiverNotFoundEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/GiftWrappingConfigurationEvent.ts b/src/nitro/communication/messages/incoming/catalog/GiftWrappingConfigurationEvent.ts index 15899ca0..fe9077d9 100644 --- a/src/nitro/communication/messages/incoming/catalog/GiftWrappingConfigurationEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/GiftWrappingConfigurationEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { GiftWrappingConfigurationParser } from '../../parser'; export class GiftWrappingConfigurationEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/HabboClubExtendOfferMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/HabboClubExtendOfferMessageEvent.ts index 52fa4fb4..6347b0cd 100644 --- a/src/nitro/communication/messages/incoming/catalog/HabboClubExtendOfferMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/HabboClubExtendOfferMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { HabboClubExtendOfferMessageParser } from '../../parser'; export class HabboClubExtendOfferMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/HabboClubOffersMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/HabboClubOffersMessageEvent.ts index b37ac258..4a03436b 100644 --- a/src/nitro/communication/messages/incoming/catalog/HabboClubOffersMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/HabboClubOffersMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { HabboClubOffersMessageParser } from '../../parser'; export class HabboClubOffersMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/IsOfferGiftableMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/IsOfferGiftableMessageEvent.ts index ca418f61..e0aa9f79 100644 --- a/src/nitro/communication/messages/incoming/catalog/IsOfferGiftableMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/IsOfferGiftableMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { IsOfferGiftableMessageParser } from '../../parser'; export class IsOfferGiftableMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/LimitedEditionSoldOutEvent.ts b/src/nitro/communication/messages/incoming/catalog/LimitedEditionSoldOutEvent.ts index 08f05b99..665c882f 100644 --- a/src/nitro/communication/messages/incoming/catalog/LimitedEditionSoldOutEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/LimitedEditionSoldOutEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { LimitedEditionSoldOutParser } from '../../parser'; export class LimitedEditionSoldOutEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/LimitedOfferAppearingNextMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/LimitedOfferAppearingNextMessageEvent.ts index 03044ff9..eb571d00 100644 --- a/src/nitro/communication/messages/incoming/catalog/LimitedOfferAppearingNextMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/LimitedOfferAppearingNextMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { LimitedOfferAppearingNextMessageParser } from '../../parser'; export class LimitedOfferAppearingNextMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/NotEnoughBalanceMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/NotEnoughBalanceMessageEvent.ts index c70741fa..1ec3dfe6 100644 --- a/src/nitro/communication/messages/incoming/catalog/NotEnoughBalanceMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/NotEnoughBalanceMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { NotEnoughBalanceMessageParser } from '../../parser'; export class NotEnoughBalanceMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/ProductOfferEvent.ts b/src/nitro/communication/messages/incoming/catalog/ProductOfferEvent.ts index da6a17d0..f4c51263 100644 --- a/src/nitro/communication/messages/incoming/catalog/ProductOfferEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/ProductOfferEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { ProductOfferMessageParser } from '../../parser'; export class ProductOfferEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/PurchaseErrorMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/PurchaseErrorMessageEvent.ts index 18cc5d16..f2fd9da1 100644 --- a/src/nitro/communication/messages/incoming/catalog/PurchaseErrorMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/PurchaseErrorMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { PurchaseErrorMessageParser } from '../../parser'; export class PurchaseErrorMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/PurchaseNotAllowedMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/PurchaseNotAllowedMessageEvent.ts index 77069cb6..9c98db0c 100644 --- a/src/nitro/communication/messages/incoming/catalog/PurchaseNotAllowedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/PurchaseNotAllowedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { PurchaseNotAllowedMessageParser } from '../../parser'; export class PurchaseNotAllowedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/PurchaseOKMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/PurchaseOKMessageEvent.ts index d4fdd66d..2a3eae57 100644 --- a/src/nitro/communication/messages/incoming/catalog/PurchaseOKMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/PurchaseOKMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { PurchaseOKMessageParser } from '../../parser'; export class PurchaseOKMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/RoomAdPurchaseInfoEvent.ts b/src/nitro/communication/messages/incoming/catalog/RoomAdPurchaseInfoEvent.ts index 7f9190eb..c7b365e7 100644 --- a/src/nitro/communication/messages/incoming/catalog/RoomAdPurchaseInfoEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/RoomAdPurchaseInfoEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { RoomAdPurchaseInfoEventParser } from '../../parser'; export class RoomAdPurchaseInfoEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/SeasonalCalendarDailyOfferMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/SeasonalCalendarDailyOfferMessageEvent.ts index 541091d6..b119e45c 100644 --- a/src/nitro/communication/messages/incoming/catalog/SeasonalCalendarDailyOfferMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/SeasonalCalendarDailyOfferMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { SeasonalCalendarDailyOfferMessageParser } from '../../parser'; export class SeasonalCalendarDailyOfferMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/SellablePetPalettesMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/SellablePetPalettesMessageEvent.ts index 5a365c4c..f77c4ee0 100644 --- a/src/nitro/communication/messages/incoming/catalog/SellablePetPalettesMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/SellablePetPalettesMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { SellablePetPalettesParser } from '../../parser'; export class SellablePetPalettesMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/TargetedOfferEvent.ts b/src/nitro/communication/messages/incoming/catalog/TargetedOfferEvent.ts index 6a97978c..6de23a93 100644 --- a/src/nitro/communication/messages/incoming/catalog/TargetedOfferEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/TargetedOfferEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { TargetedOfferParser } from '../../parser'; export class TargetedOfferEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/TargetedOfferNotFoundEvent.ts b/src/nitro/communication/messages/incoming/catalog/TargetedOfferNotFoundEvent.ts index f43cc5e5..71a08833 100644 --- a/src/nitro/communication/messages/incoming/catalog/TargetedOfferNotFoundEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/TargetedOfferNotFoundEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { TargetedOfferNotFoundParser } from '../../parser'; export class TargetedOfferNotFoundEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/VoucherRedeemErrorMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/VoucherRedeemErrorMessageEvent.ts index 7e2bdc60..ceb96647 100644 --- a/src/nitro/communication/messages/incoming/catalog/VoucherRedeemErrorMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/VoucherRedeemErrorMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { VoucherRedeemErrorMessageParser } from '../../parser'; export class VoucherRedeemErrorMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/catalog/VoucherRedeemOkMessageEvent.ts b/src/nitro/communication/messages/incoming/catalog/VoucherRedeemOkMessageEvent.ts index f5628451..5209e34a 100644 --- a/src/nitro/communication/messages/incoming/catalog/VoucherRedeemOkMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/catalog/VoucherRedeemOkMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { VoucherRedeemOkMessageParser } from '../../parser'; export class VoucherRedeemOkMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/client/ClientPingEvent.ts b/src/nitro/communication/messages/incoming/client/ClientPingEvent.ts index 55e656c6..05f49324 100644 --- a/src/nitro/communication/messages/incoming/client/ClientPingEvent.ts +++ b/src/nitro/communication/messages/incoming/client/ClientPingEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { ClientPingParser } from '../../parser'; export class ClientPingEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/competition/CompetitionEntrySubmitResultEvent.ts b/src/nitro/communication/messages/incoming/competition/CompetitionEntrySubmitResultEvent.ts index 81ef339e..d947558b 100644 --- a/src/nitro/communication/messages/incoming/competition/CompetitionEntrySubmitResultEvent.ts +++ b/src/nitro/communication/messages/incoming/competition/CompetitionEntrySubmitResultEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CompetitionEntrySubmitResultMessageParser } from '../../parser'; export class CompetitionEntrySubmitResultEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/competition/CompetitionVotingInfoMessageEvent.ts b/src/nitro/communication/messages/incoming/competition/CompetitionVotingInfoMessageEvent.ts index 148fce84..e291b358 100644 --- a/src/nitro/communication/messages/incoming/competition/CompetitionVotingInfoMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/competition/CompetitionVotingInfoMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CompetitionVotingInfoMessageParser } from '../../parser'; export class CompetitionVotingInfoMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/competition/CurrentTimingCodeMessageEvent.ts b/src/nitro/communication/messages/incoming/competition/CurrentTimingCodeMessageEvent.ts index 98f9f361..7c9fab39 100644 --- a/src/nitro/communication/messages/incoming/competition/CurrentTimingCodeMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/competition/CurrentTimingCodeMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CurrentTimingCodeMessageParser } from '../../parser'; export class CurrentTimingCodeMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/competition/IsUserPartOfCompetitionMessageEvent.ts b/src/nitro/communication/messages/incoming/competition/IsUserPartOfCompetitionMessageEvent.ts index 88881857..bf40c90d 100644 --- a/src/nitro/communication/messages/incoming/competition/IsUserPartOfCompetitionMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/competition/IsUserPartOfCompetitionMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { IsUserPartOfCompetitionMessageParser } from '../../parser'; export class IsUserPartOfCompetitionMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/competition/NoOwnedRoomsAlertMessageEvent.ts b/src/nitro/communication/messages/incoming/competition/NoOwnedRoomsAlertMessageEvent.ts index 8e111b37..d8e1fda4 100644 --- a/src/nitro/communication/messages/incoming/competition/NoOwnedRoomsAlertMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/competition/NoOwnedRoomsAlertMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { NoOwnedRoomsAlertMessageParser } from '../../parser'; export class NoOwnedRoomsAlertMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/competition/SecondsUntilMessageEvent.ts b/src/nitro/communication/messages/incoming/competition/SecondsUntilMessageEvent.ts index 8cbbca4a..89432fa9 100644 --- a/src/nitro/communication/messages/incoming/competition/SecondsUntilMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/competition/SecondsUntilMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { SecondsUntilMessageParser } from '../../parser'; export class SecondsUntilMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/crafting/CraftableProductsEvent.ts b/src/nitro/communication/messages/incoming/crafting/CraftableProductsEvent.ts index e3a768f1..268b907e 100644 --- a/src/nitro/communication/messages/incoming/crafting/CraftableProductsEvent.ts +++ b/src/nitro/communication/messages/incoming/crafting/CraftableProductsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CraftableProductsMessageParser } from '../../parser'; export class CraftableProductsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/crafting/CraftingRecipeEvent.ts b/src/nitro/communication/messages/incoming/crafting/CraftingRecipeEvent.ts index 93195a50..dbfc86ed 100644 --- a/src/nitro/communication/messages/incoming/crafting/CraftingRecipeEvent.ts +++ b/src/nitro/communication/messages/incoming/crafting/CraftingRecipeEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CraftingRecipeMessageParser } from '../../parser'; export class CraftingRecipeEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/crafting/CraftingRecipesAvailableEvent.ts b/src/nitro/communication/messages/incoming/crafting/CraftingRecipesAvailableEvent.ts index 8e371a58..0e6ed086 100644 --- a/src/nitro/communication/messages/incoming/crafting/CraftingRecipesAvailableEvent.ts +++ b/src/nitro/communication/messages/incoming/crafting/CraftingRecipesAvailableEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CraftingRecipesAvailableMessageParser } from '../../parser'; export class CraftingRecipesAvailableEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/crafting/CraftingResultEvent.ts b/src/nitro/communication/messages/incoming/crafting/CraftingResultEvent.ts index e353a38b..15175c5c 100644 --- a/src/nitro/communication/messages/incoming/crafting/CraftingResultEvent.ts +++ b/src/nitro/communication/messages/incoming/crafting/CraftingResultEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CraftingResultMessageParser } from '../../parser'; export class CraftingResultEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/desktop/DesktopViewEvent.ts b/src/nitro/communication/messages/incoming/desktop/DesktopViewEvent.ts index b3080346..0afb2c72 100644 --- a/src/nitro/communication/messages/incoming/desktop/DesktopViewEvent.ts +++ b/src/nitro/communication/messages/incoming/desktop/DesktopViewEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { DesktopViewParser } from '../../parser'; export class DesktopViewEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/AcceptFriendResultEvent.ts b/src/nitro/communication/messages/incoming/friendlist/AcceptFriendResultEvent.ts index 716ab0a9..c1fd8db4 100644 --- a/src/nitro/communication/messages/incoming/friendlist/AcceptFriendResultEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/AcceptFriendResultEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { AcceptFriendResultParser } from '../../parser'; export class AcceptFriendResultEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/FindFriendsProcessResultEvent.ts b/src/nitro/communication/messages/incoming/friendlist/FindFriendsProcessResultEvent.ts index f2d3c767..37dedf32 100644 --- a/src/nitro/communication/messages/incoming/friendlist/FindFriendsProcessResultEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/FindFriendsProcessResultEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { FindFriendsProcessResultParser } from '../../parser'; export class FindFriendsProcessResultEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/FollowFriendFailedEvent.ts b/src/nitro/communication/messages/incoming/friendlist/FollowFriendFailedEvent.ts index 4e1558b4..98f6061d 100644 --- a/src/nitro/communication/messages/incoming/friendlist/FollowFriendFailedEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/FollowFriendFailedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { FollowFriendFailedParser } from '../../parser'; export class FollowFriendFailedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/FriendListFragmentEvent.ts b/src/nitro/communication/messages/incoming/friendlist/FriendListFragmentEvent.ts index a244b512..a4cacdc1 100644 --- a/src/nitro/communication/messages/incoming/friendlist/FriendListFragmentEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/FriendListFragmentEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { FriendListFragmentParser } from '../../parser'; export class FriendListFragmentEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/FriendListUpdateEvent.ts b/src/nitro/communication/messages/incoming/friendlist/FriendListUpdateEvent.ts index 79834deb..64da5722 100644 --- a/src/nitro/communication/messages/incoming/friendlist/FriendListUpdateEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/FriendListUpdateEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { FriendListUpdateParser } from '../../parser'; export class FriendListUpdateEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/FriendNotificationEvent.ts b/src/nitro/communication/messages/incoming/friendlist/FriendNotificationEvent.ts index b0e5777f..ccf0c873 100644 --- a/src/nitro/communication/messages/incoming/friendlist/FriendNotificationEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/FriendNotificationEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { FriendNotificationParser } from '../../parser'; export class FriendNotificationEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/FriendRequestsEvent.ts b/src/nitro/communication/messages/incoming/friendlist/FriendRequestsEvent.ts index e419cb16..c490325b 100644 --- a/src/nitro/communication/messages/incoming/friendlist/FriendRequestsEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/FriendRequestsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { FriendRequestsParser } from '../../parser'; export class FriendRequestsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/HabboSearchResultEvent.ts b/src/nitro/communication/messages/incoming/friendlist/HabboSearchResultEvent.ts index cecb0479..3dbabf85 100644 --- a/src/nitro/communication/messages/incoming/friendlist/HabboSearchResultEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/HabboSearchResultEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { HabboSearchResultParser } from '../../parser'; export class HabboSearchResultEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/InstantMessageErrorEvent.ts b/src/nitro/communication/messages/incoming/friendlist/InstantMessageErrorEvent.ts index 33694360..3a3ab083 100644 --- a/src/nitro/communication/messages/incoming/friendlist/InstantMessageErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/InstantMessageErrorEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { InstantMessageErrorParser } from '../../parser'; export class InstantMessageErrorEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/MessageErrorEvent.ts b/src/nitro/communication/messages/incoming/friendlist/MessageErrorEvent.ts index 0a97f5a1..1510f565 100644 --- a/src/nitro/communication/messages/incoming/friendlist/MessageErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/MessageErrorEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { MessageErrorParser } from '../../parser'; export class MessageErrorEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/MessengerInitEvent.ts b/src/nitro/communication/messages/incoming/friendlist/MessengerInitEvent.ts index 7f4c06f2..ade1a645 100644 --- a/src/nitro/communication/messages/incoming/friendlist/MessengerInitEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/MessengerInitEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { MessengerInitParser } from '../../parser'; export class MessengerInitEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/MiniMailNewMessageEvent.ts b/src/nitro/communication/messages/incoming/friendlist/MiniMailNewMessageEvent.ts index f6b9d8bc..5c452f19 100644 --- a/src/nitro/communication/messages/incoming/friendlist/MiniMailNewMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/MiniMailNewMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { MiniMailNewMessageParser } from '../../parser'; export class MiniMailNewMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/MiniMailUnreadCountEvent.ts b/src/nitro/communication/messages/incoming/friendlist/MiniMailUnreadCountEvent.ts index b8242f84..33dea735 100644 --- a/src/nitro/communication/messages/incoming/friendlist/MiniMailUnreadCountEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/MiniMailUnreadCountEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { MiniMailUnreadCountParser } from '../../parser'; export class MiniMailUnreadCountEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/NewConsoleMessageEvent.ts b/src/nitro/communication/messages/incoming/friendlist/NewConsoleMessageEvent.ts index 50a2b98a..255d3140 100644 --- a/src/nitro/communication/messages/incoming/friendlist/NewConsoleMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/NewConsoleMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { NewConsoleMessageParser } from '../../parser'; export class NewConsoleMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/NewFriendRequestEvent.ts b/src/nitro/communication/messages/incoming/friendlist/NewFriendRequestEvent.ts index 7f0157ee..a3b0bc54 100644 --- a/src/nitro/communication/messages/incoming/friendlist/NewFriendRequestEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/NewFriendRequestEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { NewFriendRequestParser } from '../../parser'; export class NewFriendRequestEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/RoomInviteErrorEvent.ts b/src/nitro/communication/messages/incoming/friendlist/RoomInviteErrorEvent.ts index 9d3ce22c..c54b0706 100644 --- a/src/nitro/communication/messages/incoming/friendlist/RoomInviteErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/RoomInviteErrorEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { RoomInviteErrorParser } from '../../parser'; export class RoomInviteErrorEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/friendlist/RoomInviteEvent.ts b/src/nitro/communication/messages/incoming/friendlist/RoomInviteEvent.ts index 1e2765e5..2e0ea001 100644 --- a/src/nitro/communication/messages/incoming/friendlist/RoomInviteEvent.ts +++ b/src/nitro/communication/messages/incoming/friendlist/RoomInviteEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { RoomInviteParser } from '../../parser'; export class RoomInviteEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/game/directory/Game2AccountGameStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/game/directory/Game2AccountGameStatusMessageEvent.ts index 02fc2ab4..1c680c81 100644 --- a/src/nitro/communication/messages/incoming/game/directory/Game2AccountGameStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/game/directory/Game2AccountGameStatusMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { Game2AccountGameStatusMessageParser } from '../../../parser'; export class Game2AccountGameStatusMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/game/lobby/AchievementResolutionCompletedMessageEvent.ts b/src/nitro/communication/messages/incoming/game/lobby/AchievementResolutionCompletedMessageEvent.ts index 2db48932..9f7702f4 100644 --- a/src/nitro/communication/messages/incoming/game/lobby/AchievementResolutionCompletedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/game/lobby/AchievementResolutionCompletedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { AchievementResolutionCompletedMessageParser } from '../../../parser'; export class AchievementResolutionCompletedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/game/lobby/AchievementResolutionProgressMessageEvent.ts b/src/nitro/communication/messages/incoming/game/lobby/AchievementResolutionProgressMessageEvent.ts index 6b8e4154..c503c07d 100644 --- a/src/nitro/communication/messages/incoming/game/lobby/AchievementResolutionProgressMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/game/lobby/AchievementResolutionProgressMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { AchievementResolutionProgressMessageParser } from '../../../parser'; export class AchievementResolutionProgressMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/game/lobby/AchievementResolutionsMessageEvent.ts b/src/nitro/communication/messages/incoming/game/lobby/AchievementResolutionsMessageEvent.ts index 55c29749..2eaea111 100644 --- a/src/nitro/communication/messages/incoming/game/lobby/AchievementResolutionsMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/game/lobby/AchievementResolutionsMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { AchievementResolutionsMessageParser } from '../../../parser'; export class AchievementResolutionsMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/game/lobby/GameAchievementsMessageEvent.ts b/src/nitro/communication/messages/incoming/game/lobby/GameAchievementsMessageEvent.ts index 930536f1..3190043f 100644 --- a/src/nitro/communication/messages/incoming/game/lobby/GameAchievementsMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/game/lobby/GameAchievementsMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { GameAchievementsMessageParser } from '../../../parser'; export class GameAchievementsMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/game/lobby/GameInviteMessageEvent.ts b/src/nitro/communication/messages/incoming/game/lobby/GameInviteMessageEvent.ts index 5ac97e66..36f21c0f 100644 --- a/src/nitro/communication/messages/incoming/game/lobby/GameInviteMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/game/lobby/GameInviteMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { GameInviteMessageParser } from '../../../parser'; export class GameInviteMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/game/lobby/GameListMessageEvent.ts b/src/nitro/communication/messages/incoming/game/lobby/GameListMessageEvent.ts index 227cc57b..8ce4aed2 100644 --- a/src/nitro/communication/messages/incoming/game/lobby/GameListMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/game/lobby/GameListMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { GameListMessageParser } from '../../../parser'; export class GameListMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/game/lobby/GameStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/game/lobby/GameStatusMessageEvent.ts index 6285b4a1..401e8bc4 100644 --- a/src/nitro/communication/messages/incoming/game/lobby/GameStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/game/lobby/GameStatusMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { GameStatusMessageParser } from '../../../parser'; export class GameStatusMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/game/lobby/JoinedQueueMessageEvent.ts b/src/nitro/communication/messages/incoming/game/lobby/JoinedQueueMessageEvent.ts index 236bb203..4c562401 100644 --- a/src/nitro/communication/messages/incoming/game/lobby/JoinedQueueMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/game/lobby/JoinedQueueMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { JoinedQueueMessageParser } from '../../../parser'; export class JoinedQueueMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/game/lobby/JoiningQueueFailedMessageEvent.ts b/src/nitro/communication/messages/incoming/game/lobby/JoiningQueueFailedMessageEvent.ts index 8b4f31d4..6d4e646b 100644 --- a/src/nitro/communication/messages/incoming/game/lobby/JoiningQueueFailedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/game/lobby/JoiningQueueFailedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { JoiningQueueFailedMessageParser } from '../../../parser'; export class JoiningQueueFailedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/game/lobby/LeftQueueMessageEvent.ts b/src/nitro/communication/messages/incoming/game/lobby/LeftQueueMessageEvent.ts index f1d92055..b502954d 100644 --- a/src/nitro/communication/messages/incoming/game/lobby/LeftQueueMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/game/lobby/LeftQueueMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { LeftQueueMessageParser } from '../../../parser'; export class LeftQueueMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/game/lobby/LoadGameMessageEvent.ts b/src/nitro/communication/messages/incoming/game/lobby/LoadGameMessageEvent.ts index c5b770a8..67f2ec4c 100644 --- a/src/nitro/communication/messages/incoming/game/lobby/LoadGameMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/game/lobby/LoadGameMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { LoadGameMessageParser } from '../../../parser'; export class LoadGameMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/game/lobby/LoadGameUrlEvent.ts b/src/nitro/communication/messages/incoming/game/lobby/LoadGameUrlEvent.ts index fc75bca8..829127ee 100644 --- a/src/nitro/communication/messages/incoming/game/lobby/LoadGameUrlEvent.ts +++ b/src/nitro/communication/messages/incoming/game/lobby/LoadGameUrlEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { LoadGameUrlParser } from '../../../parser'; export class LoadGameUrlEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/game/lobby/UnloadGameMessageEvent.ts b/src/nitro/communication/messages/incoming/game/lobby/UnloadGameMessageEvent.ts index 34d4bcb4..05be2984 100644 --- a/src/nitro/communication/messages/incoming/game/lobby/UnloadGameMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/game/lobby/UnloadGameMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { UnloadGameMessageParser } from '../../../parser'; export class UnloadGameMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/game/lobby/UserGameAchievementsMessageEvent.ts b/src/nitro/communication/messages/incoming/game/lobby/UserGameAchievementsMessageEvent.ts index eb8c0c3b..e2285907 100644 --- a/src/nitro/communication/messages/incoming/game/lobby/UserGameAchievementsMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/game/lobby/UserGameAchievementsMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { UserGameAchievementsMessageParser } from '../../../parser'; export class UserGameAchievementsMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/generic/GenericErrorEvent.ts b/src/nitro/communication/messages/incoming/generic/GenericErrorEvent.ts index 3364f632..43b3a881 100644 --- a/src/nitro/communication/messages/incoming/generic/GenericErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/generic/GenericErrorEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { GenericErrorParser } from '../../parser'; export class GenericErrorEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/group/GroupBadgePartsEvent.ts b/src/nitro/communication/messages/incoming/group/GroupBadgePartsEvent.ts index a6db9f17..3cdfa97f 100644 --- a/src/nitro/communication/messages/incoming/group/GroupBadgePartsEvent.ts +++ b/src/nitro/communication/messages/incoming/group/GroupBadgePartsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { GroupBadgePartsParser } from '../../parser'; export class GroupBadgePartsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/group/GroupBuyDataEvent.ts b/src/nitro/communication/messages/incoming/group/GroupBuyDataEvent.ts index 454b4e87..9447adda 100644 --- a/src/nitro/communication/messages/incoming/group/GroupBuyDataEvent.ts +++ b/src/nitro/communication/messages/incoming/group/GroupBuyDataEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { GroupBuyDataParser } from '../../parser'; export class GroupBuyDataEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/group/GroupConfirmMemberRemoveEvent.ts b/src/nitro/communication/messages/incoming/group/GroupConfirmMemberRemoveEvent.ts index 6e82bbc4..007a78cb 100644 --- a/src/nitro/communication/messages/incoming/group/GroupConfirmMemberRemoveEvent.ts +++ b/src/nitro/communication/messages/incoming/group/GroupConfirmMemberRemoveEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { GroupConfirmMemberRemoveParser } from '../../parser'; export class GroupConfirmMemberRemoveEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/group/GroupInformationEvent.ts b/src/nitro/communication/messages/incoming/group/GroupInformationEvent.ts index bbaefc07..c75dae80 100644 --- a/src/nitro/communication/messages/incoming/group/GroupInformationEvent.ts +++ b/src/nitro/communication/messages/incoming/group/GroupInformationEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { GroupInformationParser } from '../../parser'; export class GroupInformationEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/group/GroupMembersEvent.ts b/src/nitro/communication/messages/incoming/group/GroupMembersEvent.ts index 655e25a0..90636b18 100644 --- a/src/nitro/communication/messages/incoming/group/GroupMembersEvent.ts +++ b/src/nitro/communication/messages/incoming/group/GroupMembersEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { GroupMembersParser } from '../../parser'; export class GroupMembersEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/group/GroupPurchasedEvent.ts b/src/nitro/communication/messages/incoming/group/GroupPurchasedEvent.ts index d0c49901..29171156 100644 --- a/src/nitro/communication/messages/incoming/group/GroupPurchasedEvent.ts +++ b/src/nitro/communication/messages/incoming/group/GroupPurchasedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { GroupPurchasedParser } from '../../parser'; export class GroupPurchasedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/group/GroupSettingsEvent.ts b/src/nitro/communication/messages/incoming/group/GroupSettingsEvent.ts index abb0c6ed..efb9db15 100644 --- a/src/nitro/communication/messages/incoming/group/GroupSettingsEvent.ts +++ b/src/nitro/communication/messages/incoming/group/GroupSettingsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { GroupSettingsParser } from '../../parser'; export class GroupSettingsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/group/HabboGroupDeactivatedMessageEvent.ts b/src/nitro/communication/messages/incoming/group/HabboGroupDeactivatedMessageEvent.ts index d2dfe90b..ff97a5d1 100644 --- a/src/nitro/communication/messages/incoming/group/HabboGroupDeactivatedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/group/HabboGroupDeactivatedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { HabboGroupDeactivatedMessageParser } from '../../parser'; export class HabboGroupDeactivatedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/groupforums/ForumDataMessageEvent.ts b/src/nitro/communication/messages/incoming/groupforums/ForumDataMessageEvent.ts index bcfe4b9d..a7de339d 100644 --- a/src/nitro/communication/messages/incoming/groupforums/ForumDataMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/groupforums/ForumDataMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { ForumDataMessageParser } from '../../parser'; export class ForumDataMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/groupforums/ForumsListMessageEvent.ts b/src/nitro/communication/messages/incoming/groupforums/ForumsListMessageEvent.ts index 2be0030f..f4ea0215 100644 --- a/src/nitro/communication/messages/incoming/groupforums/ForumsListMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/groupforums/ForumsListMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { GetForumsListMessageParser } from '../../parser'; export class ForumsListMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/groupforums/GuildForumThreadsEvent.ts b/src/nitro/communication/messages/incoming/groupforums/GuildForumThreadsEvent.ts index f93374f8..94bb4086 100644 --- a/src/nitro/communication/messages/incoming/groupforums/GuildForumThreadsEvent.ts +++ b/src/nitro/communication/messages/incoming/groupforums/GuildForumThreadsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { GuildForumThreadsParser } from '../../parser'; export class GuildForumThreadsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/groupforums/PostMessageMessageEvent.ts b/src/nitro/communication/messages/incoming/groupforums/PostMessageMessageEvent.ts index afd83ba8..147785cb 100644 --- a/src/nitro/communication/messages/incoming/groupforums/PostMessageMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/groupforums/PostMessageMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { PostMessageMessageParser } from '../../parser'; export class PostMessageMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/groupforums/PostThreadMessageEvent.ts b/src/nitro/communication/messages/incoming/groupforums/PostThreadMessageEvent.ts index 994349a9..077a6d66 100644 --- a/src/nitro/communication/messages/incoming/groupforums/PostThreadMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/groupforums/PostThreadMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { PostThreadMessageParser } from '../../parser'; export class PostThreadMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/groupforums/ThreadMessagesMessageEvent.ts b/src/nitro/communication/messages/incoming/groupforums/ThreadMessagesMessageEvent.ts index c768edfd..30f58324 100644 --- a/src/nitro/communication/messages/incoming/groupforums/ThreadMessagesMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/groupforums/ThreadMessagesMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { ThreadMessagesMessageParser } from '../../parser'; export class ThreadMessagesMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/groupforums/UnreadForumsCountMessageEvent.ts b/src/nitro/communication/messages/incoming/groupforums/UnreadForumsCountMessageEvent.ts index f5531c23..922e757e 100644 --- a/src/nitro/communication/messages/incoming/groupforums/UnreadForumsCountMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/groupforums/UnreadForumsCountMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { UnreadForumsCountMessageParser } from '../../parser'; export class UnreadForumsCountMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/groupforums/UpdateMessageMessageEvent.ts b/src/nitro/communication/messages/incoming/groupforums/UpdateMessageMessageEvent.ts index fab0d801..24a109b7 100644 --- a/src/nitro/communication/messages/incoming/groupforums/UpdateMessageMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/groupforums/UpdateMessageMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { UpdateMessageMessageParser } from '../../parser'; export class UpdateMessageMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/groupforums/UpdateThreadMessageEvent.ts b/src/nitro/communication/messages/incoming/groupforums/UpdateThreadMessageEvent.ts index d605eaca..9ff27895 100644 --- a/src/nitro/communication/messages/incoming/groupforums/UpdateThreadMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/groupforums/UpdateThreadMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { UpdateThreadMessageParser } from '../../parser'; export class UpdateThreadMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/handshake/NoobnessLevelMessageEvent.ts b/src/nitro/communication/messages/incoming/handshake/NoobnessLevelMessageEvent.ts index 63a52edb..113818b5 100644 --- a/src/nitro/communication/messages/incoming/handshake/NoobnessLevelMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/handshake/NoobnessLevelMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { NoobnessLevelMessageParser } from '../../parser'; export class NoobnessLevelMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/CallForHelpDisabledNotifyMessageEvent.ts b/src/nitro/communication/messages/incoming/help/CallForHelpDisabledNotifyMessageEvent.ts index 1a6285ef..d98a3e69 100644 --- a/src/nitro/communication/messages/incoming/help/CallForHelpDisabledNotifyMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/CallForHelpDisabledNotifyMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CallForHelpDisabledNotifyMessageParser } from '../../parser'; export class CallForHelpDisabledNotifyMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/CallForHelpPendingCallsDeletedMessageEvent.ts b/src/nitro/communication/messages/incoming/help/CallForHelpPendingCallsDeletedMessageEvent.ts index 9b970505..05d2695d 100644 --- a/src/nitro/communication/messages/incoming/help/CallForHelpPendingCallsDeletedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/CallForHelpPendingCallsDeletedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CallForHelpPendingCallsDeletedMessageParser } from '../../parser'; export class CallForHelpPendingCallsDeletedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/CallForHelpPendingCallsMessageEvent.ts b/src/nitro/communication/messages/incoming/help/CallForHelpPendingCallsMessageEvent.ts index e9594766..34e13323 100644 --- a/src/nitro/communication/messages/incoming/help/CallForHelpPendingCallsMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/CallForHelpPendingCallsMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CallForHelpPendingCallsMessageParser } from '../../parser'; export class CallForHelpPendingCallsMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/CallForHelpReplyMessageEvent.ts b/src/nitro/communication/messages/incoming/help/CallForHelpReplyMessageEvent.ts index aff01c67..dd95950e 100644 --- a/src/nitro/communication/messages/incoming/help/CallForHelpReplyMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/CallForHelpReplyMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CallForHelpReplyMessageParser } from '../../parser'; export class CallForHelpReplyMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/CallForHelpResultMessageEvent.ts b/src/nitro/communication/messages/incoming/help/CallForHelpResultMessageEvent.ts index 28556d76..1e71eccb 100644 --- a/src/nitro/communication/messages/incoming/help/CallForHelpResultMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/CallForHelpResultMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CallForHelpResultMessageParser } from '../../parser'; export class CallForHelpResultMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/ChatReviewSessionDetachedMessageEvent.ts b/src/nitro/communication/messages/incoming/help/ChatReviewSessionDetachedMessageEvent.ts index 157b5a91..c07cb7a2 100644 --- a/src/nitro/communication/messages/incoming/help/ChatReviewSessionDetachedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/ChatReviewSessionDetachedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { ChatReviewSessionDetachedMessageParser } from '../../parser'; export class ChatReviewSessionDetachedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/ChatReviewSessionOfferedToGuideMessageEvent.ts b/src/nitro/communication/messages/incoming/help/ChatReviewSessionOfferedToGuideMessageEvent.ts index 2fc04610..da307ba8 100644 --- a/src/nitro/communication/messages/incoming/help/ChatReviewSessionOfferedToGuideMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/ChatReviewSessionOfferedToGuideMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { ChatReviewSessionOfferedToGuideMessageParser } from '../../parser'; export class ChatReviewSessionOfferedToGuideMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/ChatReviewSessionResultsMessageEvent.ts b/src/nitro/communication/messages/incoming/help/ChatReviewSessionResultsMessageEvent.ts index 176c2c02..009012e2 100644 --- a/src/nitro/communication/messages/incoming/help/ChatReviewSessionResultsMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/ChatReviewSessionResultsMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { ChatReviewSessionResultsMessageParser } from '../../parser'; export class ChatReviewSessionResultsMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/ChatReviewSessionStartedMessageEvent.ts b/src/nitro/communication/messages/incoming/help/ChatReviewSessionStartedMessageEvent.ts index 3504177d..9cc7caa5 100644 --- a/src/nitro/communication/messages/incoming/help/ChatReviewSessionStartedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/ChatReviewSessionStartedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { ChatReviewSessionStartedMessageParser } from '../../parser'; export class ChatReviewSessionStartedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/ChatReviewSessionVotingStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/help/ChatReviewSessionVotingStatusMessageEvent.ts index 3f055ed5..693f2060 100644 --- a/src/nitro/communication/messages/incoming/help/ChatReviewSessionVotingStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/ChatReviewSessionVotingStatusMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { ChatReviewSessionVotingStatusMessageParser } from '../../parser'; export class ChatReviewSessionVotingStatusMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/GuideOnDutyStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideOnDutyStatusMessageEvent.ts index c8a60069..c989e4d6 100644 --- a/src/nitro/communication/messages/incoming/help/GuideOnDutyStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideOnDutyStatusMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { GuideOnDutyStatusMessageParser } from '../../parser'; export class GuideOnDutyStatusMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/GuideReportingStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideReportingStatusMessageEvent.ts index 72169149..ea4a56d6 100644 --- a/src/nitro/communication/messages/incoming/help/GuideReportingStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideReportingStatusMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { GuideReportingStatusMessageParser } from './../../parser'; export class GuideReportingStatusMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/GuideSessionAttachedMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideSessionAttachedMessageEvent.ts index 7fbceb87..539c041f 100644 --- a/src/nitro/communication/messages/incoming/help/GuideSessionAttachedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideSessionAttachedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { GuideSessionAttachedMessageParser } from '../../parser'; export class GuideSessionAttachedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/GuideSessionDetachedMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideSessionDetachedMessageEvent.ts index 89912dd8..0eda406e 100644 --- a/src/nitro/communication/messages/incoming/help/GuideSessionDetachedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideSessionDetachedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { GuideSessionDetachedMessageParser } from '../../parser'; export class GuideSessionDetachedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/GuideSessionEndedMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideSessionEndedMessageEvent.ts index 52299756..58f7dd13 100644 --- a/src/nitro/communication/messages/incoming/help/GuideSessionEndedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideSessionEndedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { GuideSessionEndedMessageParser } from '../../parser'; export class GuideSessionEndedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/GuideSessionErrorMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideSessionErrorMessageEvent.ts index cfa0df25..16bbda3e 100644 --- a/src/nitro/communication/messages/incoming/help/GuideSessionErrorMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideSessionErrorMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { GuideSessionErrorMessageParser } from '../../parser'; export class GuideSessionErrorMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/GuideSessionInvitedToGuideRoomMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideSessionInvitedToGuideRoomMessageEvent.ts index 439d5661..c259c55c 100644 --- a/src/nitro/communication/messages/incoming/help/GuideSessionInvitedToGuideRoomMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideSessionInvitedToGuideRoomMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { GuideSessionInvitedToGuideRoomMessageParser } from '../../parser'; export class GuideSessionInvitedToGuideRoomMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/GuideSessionMessageMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideSessionMessageMessageEvent.ts index e15fc0c8..5d1ecb2c 100644 --- a/src/nitro/communication/messages/incoming/help/GuideSessionMessageMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideSessionMessageMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { GuideSessionMessageMessageParser } from '../../parser'; export class GuideSessionMessageMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/GuideSessionPartnerIsTypingMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideSessionPartnerIsTypingMessageEvent.ts index 75357011..978862f4 100644 --- a/src/nitro/communication/messages/incoming/help/GuideSessionPartnerIsTypingMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideSessionPartnerIsTypingMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { GuideSessionPartnerIsTypingMessageParser } from '../../parser'; export class GuideSessionPartnerIsTypingMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/GuideSessionRequesterRoomMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideSessionRequesterRoomMessageEvent.ts index 458a5216..ae2464c4 100644 --- a/src/nitro/communication/messages/incoming/help/GuideSessionRequesterRoomMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideSessionRequesterRoomMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { GuideSessionRequesterRoomMessageParser } from '../../parser'; export class GuideSessionRequesterRoomMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/GuideSessionStartedMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideSessionStartedMessageEvent.ts index 254eb8c0..27939e1e 100644 --- a/src/nitro/communication/messages/incoming/help/GuideSessionStartedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideSessionStartedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { GuideSessionStartedMessageParser } from '../../parser'; export class GuideSessionStartedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/GuideTicketCreationResultMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideTicketCreationResultMessageEvent.ts index b8b7c6f6..cca728de 100644 --- a/src/nitro/communication/messages/incoming/help/GuideTicketCreationResultMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideTicketCreationResultMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { GuideTicketCreationResultMessageParser } from '../../parser'; export class GuideTicketCreationResultMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/GuideTicketResolutionMessageEvent.ts b/src/nitro/communication/messages/incoming/help/GuideTicketResolutionMessageEvent.ts index b2c80727..861035d4 100644 --- a/src/nitro/communication/messages/incoming/help/GuideTicketResolutionMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/GuideTicketResolutionMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { GuideTicketResolutionMessageParser } from '../../parser'; export class GuideTicketResolutionMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/HotelMergeNameChangeEvent.ts b/src/nitro/communication/messages/incoming/help/HotelMergeNameChangeEvent.ts index 4ec49a41..929a7b8e 100644 --- a/src/nitro/communication/messages/incoming/help/HotelMergeNameChangeEvent.ts +++ b/src/nitro/communication/messages/incoming/help/HotelMergeNameChangeEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { HotelMergeNameChangeParser } from '../../parser'; export class HotelMergeNameChangeEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/IssueCloseNotificationMessageEvent.ts b/src/nitro/communication/messages/incoming/help/IssueCloseNotificationMessageEvent.ts index 3557bced..b8b3642c 100644 --- a/src/nitro/communication/messages/incoming/help/IssueCloseNotificationMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/IssueCloseNotificationMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { IssueCloseNotificationMessageParser } from '../../parser'; export class IssueCloseNotificationMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/QuizDataMessageEvent.ts b/src/nitro/communication/messages/incoming/help/QuizDataMessageEvent.ts index ccac10d8..bf2b6ba5 100644 --- a/src/nitro/communication/messages/incoming/help/QuizDataMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/QuizDataMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { QuizDataMessageParser } from '../../parser'; export class QuizDataMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/help/QuizResultsMessageEvent.ts b/src/nitro/communication/messages/incoming/help/QuizResultsMessageEvent.ts index 4b4bf7ea..d1d8806b 100644 --- a/src/nitro/communication/messages/incoming/help/QuizResultsMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/help/QuizResultsMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { QuizResultsMessageParser } from '../../parser'; export class QuizResultsMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/achievements/AchievementEvent.ts b/src/nitro/communication/messages/incoming/inventory/achievements/AchievementEvent.ts index cba60fe1..9946decf 100644 --- a/src/nitro/communication/messages/incoming/inventory/achievements/AchievementEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/achievements/AchievementEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { AchievementParser } from '../../../parser'; export class AchievementEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/achievements/AchievementsEvent.ts b/src/nitro/communication/messages/incoming/inventory/achievements/AchievementsEvent.ts index 14eb18cb..cd167bd5 100644 --- a/src/nitro/communication/messages/incoming/inventory/achievements/AchievementsEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/achievements/AchievementsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { AchievementsParser } from '../../../parser'; export class AchievementsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/achievements/AchievementsScoreEvent.ts b/src/nitro/communication/messages/incoming/inventory/achievements/AchievementsScoreEvent.ts index b37b2a75..4e339702 100644 --- a/src/nitro/communication/messages/incoming/inventory/achievements/AchievementsScoreEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/achievements/AchievementsScoreEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { AchievementsScoreParser } from '../../../parser'; export class AchievementsScoreEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectActivatedEvent.ts b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectActivatedEvent.ts index 7170ac8d..89570a2b 100644 --- a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectActivatedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectActivatedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { AvatarEffectActivatedParser } from '../../../parser'; export class AvatarEffectActivatedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectAddedEvent.ts b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectAddedEvent.ts index ecd9057a..7f63c95a 100644 --- a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectAddedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectAddedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { AvatarEffectAddedParser } from '../../../parser'; export class AvatarEffectAddedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectExpiredEvent.ts b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectExpiredEvent.ts index daaccad6..2e670981 100644 --- a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectExpiredEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectExpiredEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { AvatarEffectExpiredParser } from '../../../parser'; export class AvatarEffectExpiredEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectSelectedEvent.ts b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectSelectedEvent.ts index 5983b17f..451186c5 100644 --- a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectSelectedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectSelectedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { AvatarEffectSelectedParser } from '../../../parser'; export class AvatarEffectSelectedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectsEvent.ts b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectsEvent.ts index c8a11275..40d0a226 100644 --- a/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectsEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/avatareffect/AvatarEffectsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { AvatarEffectsParser } from '../../../parser'; export class AvatarEffectsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/badges/BadgePointLimitsEvent.ts b/src/nitro/communication/messages/incoming/inventory/badges/BadgePointLimitsEvent.ts index 8d3326eb..bc6d58ed 100644 --- a/src/nitro/communication/messages/incoming/inventory/badges/BadgePointLimitsEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/badges/BadgePointLimitsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { BadgePointLimitsParser } from '../../../parser'; export class BadgePointLimitsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/badges/BadgeReceivedEvent.ts b/src/nitro/communication/messages/incoming/inventory/badges/BadgeReceivedEvent.ts index 289811eb..60d2b98e 100644 --- a/src/nitro/communication/messages/incoming/inventory/badges/BadgeReceivedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/badges/BadgeReceivedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { BadgeReceivedParser } from '../../../parser'; export class BadgeReceivedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/badges/BadgesEvent.ts b/src/nitro/communication/messages/incoming/inventory/badges/BadgesEvent.ts index d274f821..1b446e0e 100644 --- a/src/nitro/communication/messages/incoming/inventory/badges/BadgesEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/badges/BadgesEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { BadgesParser } from '../../../parser'; export class BadgesEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/badges/IsBadgeRequestFulfilledEvent.ts b/src/nitro/communication/messages/incoming/inventory/badges/IsBadgeRequestFulfilledEvent.ts index fda4c255..ca820dd6 100644 --- a/src/nitro/communication/messages/incoming/inventory/badges/IsBadgeRequestFulfilledEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/badges/IsBadgeRequestFulfilledEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { IsBadgeRequestFulfilledParser } from '../../../parser'; export class IsBadgeRequestFulfilledEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/clothes/FigureSetIdsMessageEvent.ts b/src/nitro/communication/messages/incoming/inventory/clothes/FigureSetIdsMessageEvent.ts index 36a1e317..153d74f8 100644 --- a/src/nitro/communication/messages/incoming/inventory/clothes/FigureSetIdsMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/clothes/FigureSetIdsMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { FigureSetIdsMessageParser } from '../../../parser'; export class FigureSetIdsMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/clothes/_Str_16135.ts b/src/nitro/communication/messages/incoming/inventory/clothes/_Str_16135.ts index 80f2618e..d1f356f5 100644 --- a/src/nitro/communication/messages/incoming/inventory/clothes/_Str_16135.ts +++ b/src/nitro/communication/messages/incoming/inventory/clothes/_Str_16135.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { _Str_8728 } from '../../../parser'; export class _Str_16135 extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/clothes/_Str_17532.ts b/src/nitro/communication/messages/incoming/inventory/clothes/_Str_17532.ts index d2d644f7..f41a9c2d 100644 --- a/src/nitro/communication/messages/incoming/inventory/clothes/_Str_17532.ts +++ b/src/nitro/communication/messages/incoming/inventory/clothes/_Str_17532.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { _Str_9021 } from '../../../parser'; export class _Str_17532 extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListAddOrUpdateEvent.ts b/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListAddOrUpdateEvent.ts index 414df47a..3baee650 100644 --- a/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListAddOrUpdateEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListAddOrUpdateEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { FurnitureListAddOrUpdateParser } from '../../../parser'; export class FurnitureListAddOrUpdateEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListEvent.ts b/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListEvent.ts index 43049a3c..abf9e711 100644 --- a/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { FurnitureListParser } from '../../../parser'; export class FurnitureListEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListInvalidateEvent.ts b/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListInvalidateEvent.ts index 00803bc8..5b3b404b 100644 --- a/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListInvalidateEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListInvalidateEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { FurnitureListInvalidateParser } from '../../../parser'; export class FurnitureListInvalidateEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListRemovedEvent.ts b/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListRemovedEvent.ts index 5f081ae7..b7b1aaff 100644 --- a/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListRemovedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/furni/FurnitureListRemovedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { FurnitureListRemovedParser } from '../../../parser'; export class FurnitureListRemovedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/furni/FurniturePostItPlacedEvent.ts b/src/nitro/communication/messages/incoming/inventory/furni/FurniturePostItPlacedEvent.ts index 301b3edd..50296e09 100644 --- a/src/nitro/communication/messages/incoming/inventory/furni/FurniturePostItPlacedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/furni/FurniturePostItPlacedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { FurniturePostItPlacedParser } from '../../../parser'; export class FurniturePostItPlacedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/furni/gifts/PresentOpenedMessageEvent.ts b/src/nitro/communication/messages/incoming/inventory/furni/gifts/PresentOpenedMessageEvent.ts index 2161076c..d8187817 100644 --- a/src/nitro/communication/messages/incoming/inventory/furni/gifts/PresentOpenedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/furni/gifts/PresentOpenedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core'; +import { MessageEvent } from '../../../../../../../events'; import { PresentOpenedMessageParser } from '../../../../parser'; export class PresentOpenedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/pets/PetAddedToInventoryEvent.ts b/src/nitro/communication/messages/incoming/inventory/pets/PetAddedToInventoryEvent.ts index 6e0f7682..ccfafbd5 100644 --- a/src/nitro/communication/messages/incoming/inventory/pets/PetAddedToInventoryEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/pets/PetAddedToInventoryEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { PetAddedToInventoryParser } from '../../../parser'; export class PetAddedToInventoryEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/pets/PetInventoryEvent.ts b/src/nitro/communication/messages/incoming/inventory/pets/PetInventoryEvent.ts index 2f7d2129..e6d02c3b 100644 --- a/src/nitro/communication/messages/incoming/inventory/pets/PetInventoryEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/pets/PetInventoryEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { PetInventoryParser } from '../../../parser'; export class PetInventoryEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/pets/PetReceivedMessageEvent.ts b/src/nitro/communication/messages/incoming/inventory/pets/PetReceivedMessageEvent.ts index 3ce49ff2..b1414c34 100644 --- a/src/nitro/communication/messages/incoming/inventory/pets/PetReceivedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/pets/PetReceivedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { PetReceivedMessageParser } from '../../../parser'; export class PetReceivedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/pets/PetRemovedFromInventoryEvent.ts b/src/nitro/communication/messages/incoming/inventory/pets/PetRemovedFromInventoryEvent.ts index 62f2227a..0a4fda8c 100644 --- a/src/nitro/communication/messages/incoming/inventory/pets/PetRemovedFromInventoryEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/pets/PetRemovedFromInventoryEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { PetRemovedFromInventoryParser } from '../../../parser'; export class PetRemovedFromInventory extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingAcceptEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingAcceptEvent.ts index 6eb2b485..bf71c7f0 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingAcceptEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingAcceptEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { TradingAcceptParser } from '../../../parser'; export class TradingAcceptEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingCloseEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingCloseEvent.ts index 9bfece5a..bb333e84 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingCloseEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingCloseEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { TradingCloseParser } from '../../../parser'; export class TradingCloseEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingCompletedEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingCompletedEvent.ts index 92b36854..d840bba3 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingCompletedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingCompletedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { TradingCompletedParser } from '../../../parser'; export class TradingCompletedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingConfirmationEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingConfirmationEvent.ts index 40a39605..c6d33aff 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingConfirmationEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingConfirmationEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { TradingConfirmationParser } from '../../../parser'; export class TradingConfirmationEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingListItemEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingListItemEvent.ts index e8a73826..34e1c6e0 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingListItemEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingListItemEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { ItemDataStructure, TradingListItemParser } from '../../../parser'; export class TradingListItemEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingNotOpenEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingNotOpenEvent.ts index 11965a48..28331632 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingNotOpenEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingNotOpenEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { TradingNotOpenParser } from '../../../parser'; export class TradingNotOpenEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingOpenEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingOpenEvent.ts index 25a8bb8a..7c8fdfab 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingOpenEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingOpenEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { TradingOpenParser } from '../../../parser'; export class TradingOpenEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingOpenFailedEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingOpenFailedEvent.ts index ad83ea0a..ba2f73cf 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingOpenFailedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingOpenFailedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { TradingOpenFailedParser } from '../../../parser'; export class TradingOpenFailedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingOtherNotAllowedEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingOtherNotAllowedEvent.ts index e56f838d..c082348d 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingOtherNotAllowedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingOtherNotAllowedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { TradingOtherNotAllowedParser } from '../../../parser'; export class TradingOtherNotAllowedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/inventory/trading/TradingYouAreNotAllowedEvent.ts b/src/nitro/communication/messages/incoming/inventory/trading/TradingYouAreNotAllowedEvent.ts index a457b9ae..4f1b24f8 100644 --- a/src/nitro/communication/messages/incoming/inventory/trading/TradingYouAreNotAllowedEvent.ts +++ b/src/nitro/communication/messages/incoming/inventory/trading/TradingYouAreNotAllowedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { TradingYouAreNotAllowedParser } from '../../../parser'; export class TradingYouAreNotAllowedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/landingview/PromoArticlesMessageEvent.ts b/src/nitro/communication/messages/incoming/landingview/PromoArticlesMessageEvent.ts index f9078a99..b74cb484 100644 --- a/src/nitro/communication/messages/incoming/landingview/PromoArticlesMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/landingview/PromoArticlesMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { PromoArticlesMessageParser } from '../../parser'; export class PromoArticlesMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/landingview/votes/CommunityGoalVoteMessageEvent.ts b/src/nitro/communication/messages/incoming/landingview/votes/CommunityGoalVoteMessageEvent.ts index 196fb5d1..a4d26312 100644 --- a/src/nitro/communication/messages/incoming/landingview/votes/CommunityGoalVoteMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/landingview/votes/CommunityGoalVoteMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { CommunityVoteReceivedParser } from '../../../parser'; export class CommunityGoalVoteMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/marketplace/MarketplaceBuyOfferResultEvent.ts b/src/nitro/communication/messages/incoming/marketplace/MarketplaceBuyOfferResultEvent.ts index b96f8fec..8ee9e264 100644 --- a/src/nitro/communication/messages/incoming/marketplace/MarketplaceBuyOfferResultEvent.ts +++ b/src/nitro/communication/messages/incoming/marketplace/MarketplaceBuyOfferResultEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { MarketplaceBuyOfferResultParser } from '../../parser'; diff --git a/src/nitro/communication/messages/incoming/marketplace/MarketplaceCanMakeOfferResult.ts b/src/nitro/communication/messages/incoming/marketplace/MarketplaceCanMakeOfferResult.ts index aa451acd..926d6749 100644 --- a/src/nitro/communication/messages/incoming/marketplace/MarketplaceCanMakeOfferResult.ts +++ b/src/nitro/communication/messages/incoming/marketplace/MarketplaceCanMakeOfferResult.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { MarketplaceCanMakeOfferResultParser } from '../../parser'; diff --git a/src/nitro/communication/messages/incoming/marketplace/MarketplaceCancelOfferResultEvent.ts b/src/nitro/communication/messages/incoming/marketplace/MarketplaceCancelOfferResultEvent.ts index 6d714337..b6671473 100644 --- a/src/nitro/communication/messages/incoming/marketplace/MarketplaceCancelOfferResultEvent.ts +++ b/src/nitro/communication/messages/incoming/marketplace/MarketplaceCancelOfferResultEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { MarketplaceCancelOfferResultParser } from '../../parser'; export class MarketplaceCancelOfferResultEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/marketplace/MarketplaceConfigurationEvent.ts b/src/nitro/communication/messages/incoming/marketplace/MarketplaceConfigurationEvent.ts index 5fc00b84..c8f97134 100644 --- a/src/nitro/communication/messages/incoming/marketplace/MarketplaceConfigurationEvent.ts +++ b/src/nitro/communication/messages/incoming/marketplace/MarketplaceConfigurationEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { MarketplaceConfigurationMessageParser } from '../../parser'; export class MarketplaceConfigurationEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/marketplace/MarketplaceItemStatsEvent.ts b/src/nitro/communication/messages/incoming/marketplace/MarketplaceItemStatsEvent.ts index 954ce20d..b42ad6b4 100644 --- a/src/nitro/communication/messages/incoming/marketplace/MarketplaceItemStatsEvent.ts +++ b/src/nitro/communication/messages/incoming/marketplace/MarketplaceItemStatsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { MarketplaceItemStatsParser } from '../../parser'; export class MarketplaceItemStatsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/marketplace/MarketplaceMakeOfferResult.ts b/src/nitro/communication/messages/incoming/marketplace/MarketplaceMakeOfferResult.ts index d9d6182b..67f2f7c7 100644 --- a/src/nitro/communication/messages/incoming/marketplace/MarketplaceMakeOfferResult.ts +++ b/src/nitro/communication/messages/incoming/marketplace/MarketplaceMakeOfferResult.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { MarketplaceMakeOfferResultParser } from '../../parser'; diff --git a/src/nitro/communication/messages/incoming/marketplace/MarketplaceOffersEvent.ts b/src/nitro/communication/messages/incoming/marketplace/MarketplaceOffersEvent.ts index ac92985e..f0430c87 100644 --- a/src/nitro/communication/messages/incoming/marketplace/MarketplaceOffersEvent.ts +++ b/src/nitro/communication/messages/incoming/marketplace/MarketplaceOffersEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { MarketplaceOffersParser } from '../../parser'; export class MarketPlaceOffersEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/marketplace/MarketplaceOwnOffersEvent.ts b/src/nitro/communication/messages/incoming/marketplace/MarketplaceOwnOffersEvent.ts index 8055159b..07f829a01 100644 --- a/src/nitro/communication/messages/incoming/marketplace/MarketplaceOwnOffersEvent.ts +++ b/src/nitro/communication/messages/incoming/marketplace/MarketplaceOwnOffersEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { MarketplaceOwnOffersParser } from '../../parser'; export class MarketplaceOwnOffersEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/moderation/CfhChatlogEvent.ts b/src/nitro/communication/messages/incoming/moderation/CfhChatlogEvent.ts index e64a2884..15f70704 100644 --- a/src/nitro/communication/messages/incoming/moderation/CfhChatlogEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/CfhChatlogEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CfhChatlogMessageParser } from '../../parser'; export class CfhChatlogEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/moderation/IssueDeletedMessageEvent.ts b/src/nitro/communication/messages/incoming/moderation/IssueDeletedMessageEvent.ts index 2abba560..fdc774b7 100644 --- a/src/nitro/communication/messages/incoming/moderation/IssueDeletedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/IssueDeletedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { IssueDeletedMessageParser } from '../../parser'; export class IssueDeletedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/moderation/IssueInfoMessageEvent.ts b/src/nitro/communication/messages/incoming/moderation/IssueInfoMessageEvent.ts index 63b28572..1cccb4de 100644 --- a/src/nitro/communication/messages/incoming/moderation/IssueInfoMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/IssueInfoMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { IssueInfoMessageParser } from '../../parser'; export class IssueInfoMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/moderation/IssuePickFailedMessageEvent.ts b/src/nitro/communication/messages/incoming/moderation/IssuePickFailedMessageEvent.ts index 1ea036d0..f57994ef 100644 --- a/src/nitro/communication/messages/incoming/moderation/IssuePickFailedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/IssuePickFailedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { IssuePickFailedMessageParser } from '../../parser'; export class IssuePickFailedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/moderation/ModeratorActionResultMessageEvent.ts b/src/nitro/communication/messages/incoming/moderation/ModeratorActionResultMessageEvent.ts index 1103cda5..3f92dca5 100644 --- a/src/nitro/communication/messages/incoming/moderation/ModeratorActionResultMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/ModeratorActionResultMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { ModeratorActionResultMessageParser } from '../../parser'; export class ModeratorActionResultMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/moderation/ModeratorCautionEvent.ts b/src/nitro/communication/messages/incoming/moderation/ModeratorCautionEvent.ts index bce4de39..5208f43d 100644 --- a/src/nitro/communication/messages/incoming/moderation/ModeratorCautionEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/ModeratorCautionEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { ModerationCautionParser } from '../../parser'; export class ModeratorCautionEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/moderation/ModeratorInitMessageEvent.ts b/src/nitro/communication/messages/incoming/moderation/ModeratorInitMessageEvent.ts index 804715ee..a4c027d7 100644 --- a/src/nitro/communication/messages/incoming/moderation/ModeratorInitMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/ModeratorInitMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { ModeratorInitMessageParser } from '../../parser'; export class ModeratorInitMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/moderation/ModeratorMessageEvent.ts b/src/nitro/communication/messages/incoming/moderation/ModeratorMessageEvent.ts index 2330470e..f7c5a3bb 100644 --- a/src/nitro/communication/messages/incoming/moderation/ModeratorMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/ModeratorMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { ModeratorMessageParser } from '../../parser'; export class ModeratorMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/moderation/ModeratorRoomInfoEvent.ts b/src/nitro/communication/messages/incoming/moderation/ModeratorRoomInfoEvent.ts index c4bfbbd1..37490d73 100644 --- a/src/nitro/communication/messages/incoming/moderation/ModeratorRoomInfoEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/ModeratorRoomInfoEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { ModeratorRoomInfoMessageParser } from '../../parser'; export class ModeratorRoomInfoEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/moderation/ModeratorToolPreferencesEvent.ts b/src/nitro/communication/messages/incoming/moderation/ModeratorToolPreferencesEvent.ts index c8572f7a..09d1bf86 100644 --- a/src/nitro/communication/messages/incoming/moderation/ModeratorToolPreferencesEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/ModeratorToolPreferencesEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { ModeratorToolPreferencesMessageParser } from '../../parser'; export class ModeratorToolPreferencesEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/moderation/ModeratorUserInfoEvent.ts b/src/nitro/communication/messages/incoming/moderation/ModeratorUserInfoEvent.ts index 5cec3cc9..44961d51 100644 --- a/src/nitro/communication/messages/incoming/moderation/ModeratorUserInfoEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/ModeratorUserInfoEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { ModeratorUserInfoMessageParser } from '../../parser'; export class ModeratorUserInfoEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/moderation/RoomChatlogEvent.ts b/src/nitro/communication/messages/incoming/moderation/RoomChatlogEvent.ts index 53861077..a41ada41 100644 --- a/src/nitro/communication/messages/incoming/moderation/RoomChatlogEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/RoomChatlogEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { RoomChatlogMessageParser } from '../../parser'; export class RoomChatlogEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/moderation/RoomVisitsEvent.ts b/src/nitro/communication/messages/incoming/moderation/RoomVisitsEvent.ts index 5cd9ff04..16a0339d 100644 --- a/src/nitro/communication/messages/incoming/moderation/RoomVisitsEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/RoomVisitsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { RoomVisitsMessageParser } from '../../parser'; export class RoomVisitsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/moderation/UserBannedMessageEvent.ts b/src/nitro/communication/messages/incoming/moderation/UserBannedMessageEvent.ts index 0002b04d..2c684e14 100644 --- a/src/nitro/communication/messages/incoming/moderation/UserBannedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/UserBannedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { UserBannedMessageParser } from '../../parser'; export class UserBannedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/moderation/UserChatlogEvent.ts b/src/nitro/communication/messages/incoming/moderation/UserChatlogEvent.ts index 0648c9e3..7134e284 100644 --- a/src/nitro/communication/messages/incoming/moderation/UserChatlogEvent.ts +++ b/src/nitro/communication/messages/incoming/moderation/UserChatlogEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { UserChatlogMessageParser } from '../../parser'; export class UserChatlogEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/mysterybox/MysteryBoxKeysEvent.ts b/src/nitro/communication/messages/incoming/mysterybox/MysteryBoxKeysEvent.ts index 20b922ae..2f71462c 100644 --- a/src/nitro/communication/messages/incoming/mysterybox/MysteryBoxKeysEvent.ts +++ b/src/nitro/communication/messages/incoming/mysterybox/MysteryBoxKeysEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { MysteryBoxKeysParser } from '../../parser'; export class MysteryBoxKeysEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/CanCreateRoomEvent.ts b/src/nitro/communication/messages/incoming/navigator/CanCreateRoomEvent.ts index 5dbe037e..ba811b99 100644 --- a/src/nitro/communication/messages/incoming/navigator/CanCreateRoomEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/CanCreateRoomEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CanCreateRoomMessageParser } from '../../parser'; export class CanCreateRoomEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/CanCreateRoomEventEvent.ts b/src/nitro/communication/messages/incoming/navigator/CanCreateRoomEventEvent.ts index 182d38fb..06641da1 100644 --- a/src/nitro/communication/messages/incoming/navigator/CanCreateRoomEventEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/CanCreateRoomEventEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CanCreateRoomEventParser } from '../../parser'; export class CanCreateRoomEventEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/CategoriesWithVisitorCountEvent.ts b/src/nitro/communication/messages/incoming/navigator/CategoriesWithVisitorCountEvent.ts index 8b5d94e9..eda6d8f3 100644 --- a/src/nitro/communication/messages/incoming/navigator/CategoriesWithVisitorCountEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/CategoriesWithVisitorCountEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CategoriesWithVisitorCountParser } from '../../parser'; export class CategoriesWithVisitorCountEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/CompetitionRoomsDataMessageEvent.ts b/src/nitro/communication/messages/incoming/navigator/CompetitionRoomsDataMessageEvent.ts index b26a301f..71ea8063 100644 --- a/src/nitro/communication/messages/incoming/navigator/CompetitionRoomsDataMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/CompetitionRoomsDataMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CompetitionRoomsDataMessageParser } from '../../parser'; export class CompetitionRoomsDataMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/ConvertedRoomIdEvent.ts b/src/nitro/communication/messages/incoming/navigator/ConvertedRoomIdEvent.ts index 48dec87b..f0c39ce6 100644 --- a/src/nitro/communication/messages/incoming/navigator/ConvertedRoomIdEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/ConvertedRoomIdEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { ConvertedRoomIdMessageParser } from '../../parser'; export class ConvertedRoomIdEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/DoorbellMessageEvent.ts b/src/nitro/communication/messages/incoming/navigator/DoorbellMessageEvent.ts index a5e20ed6..f4c14d72 100644 --- a/src/nitro/communication/messages/incoming/navigator/DoorbellMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/DoorbellMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { DoorbellMessageParser } from '../../parser'; export class DoorbellMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/FavouriteChangedEvent.ts b/src/nitro/communication/messages/incoming/navigator/FavouriteChangedEvent.ts index 4bf9da8b..62f1c3a3 100644 --- a/src/nitro/communication/messages/incoming/navigator/FavouriteChangedEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/FavouriteChangedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { FavouriteChangedMessageParser } from '../../parser'; export class FavouriteChangedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/FavouritesEvent.ts b/src/nitro/communication/messages/incoming/navigator/FavouritesEvent.ts index 1d68628a..13aecb24 100644 --- a/src/nitro/communication/messages/incoming/navigator/FavouritesEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/FavouritesEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { FavouritesMessageParser } from '../../parser'; export class FavouritesEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/FlatAccessDeniedMessageEvent.ts b/src/nitro/communication/messages/incoming/navigator/FlatAccessDeniedMessageEvent.ts index 1a5d09e3..5ab87bab 100644 --- a/src/nitro/communication/messages/incoming/navigator/FlatAccessDeniedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/FlatAccessDeniedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { FlatAccessDeniedMessageParser } from '../../parser'; export class FlatAccessDeniedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/FlatCreatedEvent.ts b/src/nitro/communication/messages/incoming/navigator/FlatCreatedEvent.ts index b225c41a..3702d193 100644 --- a/src/nitro/communication/messages/incoming/navigator/FlatCreatedEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/FlatCreatedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { FlatCreatedMessageParser } from '../../parser'; export class FlatCreatedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/GetGuestRoomResultEvent.ts b/src/nitro/communication/messages/incoming/navigator/GetGuestRoomResultEvent.ts index 2390984d..190585c6 100644 --- a/src/nitro/communication/messages/incoming/navigator/GetGuestRoomResultEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/GetGuestRoomResultEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { GetGuestRoomResultMessageParser } from '../../parser'; export class GetGuestRoomResultEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/GuestRoomSearchResultEvent.ts b/src/nitro/communication/messages/incoming/navigator/GuestRoomSearchResultEvent.ts index 9e0a8de7..a7a65f89 100644 --- a/src/nitro/communication/messages/incoming/navigator/GuestRoomSearchResultEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/GuestRoomSearchResultEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { GuestRoomSearchResultMessageParser } from '../../parser'; export class GuestRoomSearchResultEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/NavigatorCollapsedEvent.ts b/src/nitro/communication/messages/incoming/navigator/NavigatorCollapsedEvent.ts index c080ea6f..344f4742 100644 --- a/src/nitro/communication/messages/incoming/navigator/NavigatorCollapsedEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/NavigatorCollapsedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { NavigatorCollapsedParser } from '../../parser'; export class NavigatorCollapsedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/NavigatorHomeRoomEvent.ts b/src/nitro/communication/messages/incoming/navigator/NavigatorHomeRoomEvent.ts index cb7f444e..c8e80aac 100644 --- a/src/nitro/communication/messages/incoming/navigator/NavigatorHomeRoomEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/NavigatorHomeRoomEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { NavigatorHomeRoomParser } from '../../parser'; export class NavigatorHomeRoomEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/NavigatorLiftedEvent.ts b/src/nitro/communication/messages/incoming/navigator/NavigatorLiftedEvent.ts index 3dd343d8..8f95e103 100644 --- a/src/nitro/communication/messages/incoming/navigator/NavigatorLiftedEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/NavigatorLiftedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { NavigatorLiftedParser } from '../../parser'; export class NavigatorLiftedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/NavigatorMetadataEvent.ts b/src/nitro/communication/messages/incoming/navigator/NavigatorMetadataEvent.ts index 715e07d4..f6c2dda8 100644 --- a/src/nitro/communication/messages/incoming/navigator/NavigatorMetadataEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/NavigatorMetadataEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { NavigatorMetadataParser } from '../../parser'; export class NavigatorMetadataEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/NavigatorOpenRoomCreatorEvent.ts b/src/nitro/communication/messages/incoming/navigator/NavigatorOpenRoomCreatorEvent.ts index 7d21a096..a403734e 100644 --- a/src/nitro/communication/messages/incoming/navigator/NavigatorOpenRoomCreatorEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/NavigatorOpenRoomCreatorEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { NavigatorOpenRoomCreatorParser } from '../../parser'; export class NavigatorOpenRoomCreatorEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/NavigatorSearchEvent.ts b/src/nitro/communication/messages/incoming/navigator/NavigatorSearchEvent.ts index 1c6e61c3..2ee5fa9d 100644 --- a/src/nitro/communication/messages/incoming/navigator/NavigatorSearchEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/NavigatorSearchEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { NavigatorSearchParser } from '../../parser'; export class NavigatorSearchEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/NavigatorSearchesEvent.ts b/src/nitro/communication/messages/incoming/navigator/NavigatorSearchesEvent.ts index eccd2083..32a72c41 100644 --- a/src/nitro/communication/messages/incoming/navigator/NavigatorSearchesEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/NavigatorSearchesEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { NavigatorSearchesParser } from '../../parser'; export class NavigatorSearchesEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/NavigatorSettingsEvent.ts b/src/nitro/communication/messages/incoming/navigator/NavigatorSettingsEvent.ts index 0ba71859..eed65785 100644 --- a/src/nitro/communication/messages/incoming/navigator/NavigatorSettingsEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/NavigatorSettingsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { NavigatorSettingsParser } from '../../parser'; export class NavigatorSettingsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/RoomEventCancelEvent.ts b/src/nitro/communication/messages/incoming/navigator/RoomEventCancelEvent.ts index cd7a2bba..4846e93d 100644 --- a/src/nitro/communication/messages/incoming/navigator/RoomEventCancelEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/RoomEventCancelEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { RoomEventCancelMessageParser } from '../../parser'; export class RoomEventCancelEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/RoomEventEvent.ts b/src/nitro/communication/messages/incoming/navigator/RoomEventEvent.ts index 4aa0c9d8..6e8a5de4 100644 --- a/src/nitro/communication/messages/incoming/navigator/RoomEventEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/RoomEventEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { RoomEventMessageParser } from '../../parser'; export class RoomEventEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/RoomSettingsUpdatedEvent.ts b/src/nitro/communication/messages/incoming/navigator/RoomSettingsUpdatedEvent.ts index 28cc857a..a7c04d3e 100644 --- a/src/nitro/communication/messages/incoming/navigator/RoomSettingsUpdatedEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/RoomSettingsUpdatedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { RoomSettingsUpdatedParser } from '../../parser'; export class RoomSettingsUpdatedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/RoomThumbnailUpdateResultEvent.ts b/src/nitro/communication/messages/incoming/navigator/RoomThumbnailUpdateResultEvent.ts index 59262b46..7824096d 100644 --- a/src/nitro/communication/messages/incoming/navigator/RoomThumbnailUpdateResultEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/RoomThumbnailUpdateResultEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { RoomThumbnailUpdateResultMessageParser } from '../../parser'; export class RoomThumbnailUpdateResultEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/UserEventCatsEvent.ts b/src/nitro/communication/messages/incoming/navigator/UserEventCatsEvent.ts index 4bd2e56a..693ee3f1 100644 --- a/src/nitro/communication/messages/incoming/navigator/UserEventCatsEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/UserEventCatsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { UserEventCatsMessageParser } from '../../parser'; export class UserEventCatsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/navigator/UserFlatCatsEvent.ts b/src/nitro/communication/messages/incoming/navigator/UserFlatCatsEvent.ts index cb8e4980..9d53f37e 100644 --- a/src/nitro/communication/messages/incoming/navigator/UserFlatCatsEvent.ts +++ b/src/nitro/communication/messages/incoming/navigator/UserFlatCatsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { UserFlatCatsMessageParser } from '../../parser'; export class UserFlatCatsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/notifications/AchievementNotificationMessageEvent.ts b/src/nitro/communication/messages/incoming/notifications/AchievementNotificationMessageEvent.ts index fa0806f2..81af079b 100644 --- a/src/nitro/communication/messages/incoming/notifications/AchievementNotificationMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/AchievementNotificationMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { AchievementNotificationMessageParser } from '../../parser'; export class AchievementNotificationMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/notifications/ActivityPointNotificationMessageEvent.ts b/src/nitro/communication/messages/incoming/notifications/ActivityPointNotificationMessageEvent.ts index ea72f343..c35b6cc8 100644 --- a/src/nitro/communication/messages/incoming/notifications/ActivityPointNotificationMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/ActivityPointNotificationMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { ActivityPointNotificationParser } from '../../parser'; export class ActivityPointNotificationMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/notifications/BotErrorEvent.ts b/src/nitro/communication/messages/incoming/notifications/BotErrorEvent.ts index 711d1919..8770bfe5 100644 --- a/src/nitro/communication/messages/incoming/notifications/BotErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/BotErrorEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { BotErrorEventParser } from '../../parser'; export class BotErrorEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/notifications/ClubGiftNotificationEvent.ts b/src/nitro/communication/messages/incoming/notifications/ClubGiftNotificationEvent.ts index c6a0c918..a322be97 100644 --- a/src/nitro/communication/messages/incoming/notifications/ClubGiftNotificationEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/ClubGiftNotificationEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { ClubGiftNotificationParser } from '../../parser'; export class ClubGiftNotificationEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/notifications/HabboBroadcastMessageEvent.ts b/src/nitro/communication/messages/incoming/notifications/HabboBroadcastMessageEvent.ts index ad34912e..574423dc 100644 --- a/src/nitro/communication/messages/incoming/notifications/HabboBroadcastMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/HabboBroadcastMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { HabboBroadcastMessageParser } from '../../parser'; export class HabboBroadcastMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/notifications/HotelWillShutdownEvent.ts b/src/nitro/communication/messages/incoming/notifications/HotelWillShutdownEvent.ts index f89b3f8a..481c1588 100644 --- a/src/nitro/communication/messages/incoming/notifications/HotelWillShutdownEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/HotelWillShutdownEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { HotelWillShutdownParser } from '../../parser'; export class HotelWillShutdownEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/notifications/InfoFeedEnableMessageEvent.ts b/src/nitro/communication/messages/incoming/notifications/InfoFeedEnableMessageEvent.ts index ce99505c..aa4a1f03 100644 --- a/src/nitro/communication/messages/incoming/notifications/InfoFeedEnableMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/InfoFeedEnableMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { InfoFeedEnableMessageParser } from '../../parser'; export class InfoFeedEnableMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/notifications/MOTDNotificationEvent.ts b/src/nitro/communication/messages/incoming/notifications/MOTDNotificationEvent.ts index 392ca904..1ef2d8cb 100644 --- a/src/nitro/communication/messages/incoming/notifications/MOTDNotificationEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/MOTDNotificationEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { MOTDNotificationParser } from '../../parser'; export class MOTDNotificationEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/notifications/NotificationDialogMessageEvent.ts b/src/nitro/communication/messages/incoming/notifications/NotificationDialogMessageEvent.ts index a5d8c63f..102d35e5 100644 --- a/src/nitro/communication/messages/incoming/notifications/NotificationDialogMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/NotificationDialogMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { NotificationDialogMessageParser } from '../../parser'; export class NotificationDialogMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/notifications/PetLevelNotificationEvent.ts b/src/nitro/communication/messages/incoming/notifications/PetLevelNotificationEvent.ts index f32211e9..300836cb 100644 --- a/src/nitro/communication/messages/incoming/notifications/PetLevelNotificationEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/PetLevelNotificationEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { PetLevelNotificationParser } from '../../parser'; export class PetLevelNotificationEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/notifications/PetPlacingErrorEvent.ts b/src/nitro/communication/messages/incoming/notifications/PetPlacingErrorEvent.ts index e6eba64c..093b4c3f 100644 --- a/src/nitro/communication/messages/incoming/notifications/PetPlacingErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/PetPlacingErrorEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { PetPlacingErrorEventParser } from '../../parser'; export class PetPlacingErrorEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/notifications/UnseenItemsEvent.ts b/src/nitro/communication/messages/incoming/notifications/UnseenItemsEvent.ts index 311ef391..51cbd650 100644 --- a/src/nitro/communication/messages/incoming/notifications/UnseenItemsEvent.ts +++ b/src/nitro/communication/messages/incoming/notifications/UnseenItemsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { UnseenItemsParser } from '../../parser'; export class UnseenItemsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/perk/PerkAllowancesMessageEvent.ts b/src/nitro/communication/messages/incoming/perk/PerkAllowancesMessageEvent.ts index a7208550..7d7cf0c0 100644 --- a/src/nitro/communication/messages/incoming/perk/PerkAllowancesMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/perk/PerkAllowancesMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { PerkAllowancesMessageParser } from './../../parser'; export class PerkAllowancesMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/poll/PollContentsEvent.ts b/src/nitro/communication/messages/incoming/poll/PollContentsEvent.ts index 3d8e50dc..fa0674b0 100644 --- a/src/nitro/communication/messages/incoming/poll/PollContentsEvent.ts +++ b/src/nitro/communication/messages/incoming/poll/PollContentsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { PollContentsParser } from '../../parser'; export class PollContentsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/poll/PollErrorEvent.ts b/src/nitro/communication/messages/incoming/poll/PollErrorEvent.ts index 07d0a363..01bef84f 100644 --- a/src/nitro/communication/messages/incoming/poll/PollErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/poll/PollErrorEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { PollErrorParser } from '../../parser'; export class PollErrorEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/poll/PollOfferEvent.ts b/src/nitro/communication/messages/incoming/poll/PollOfferEvent.ts index 5e939ffe..6aecdd3b 100644 --- a/src/nitro/communication/messages/incoming/poll/PollOfferEvent.ts +++ b/src/nitro/communication/messages/incoming/poll/PollOfferEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { PollOfferParser } from '../../parser'; export class PollOfferEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/poll/QuestionAnsweredEvent.ts b/src/nitro/communication/messages/incoming/poll/QuestionAnsweredEvent.ts index 61c67532..7ea92037 100644 --- a/src/nitro/communication/messages/incoming/poll/QuestionAnsweredEvent.ts +++ b/src/nitro/communication/messages/incoming/poll/QuestionAnsweredEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { QuestionAnsweredParser } from '../../parser'; export class QuestionAnsweredEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/poll/QuestionEvent.ts b/src/nitro/communication/messages/incoming/poll/QuestionEvent.ts index 0c457e2c..4ec3196b 100644 --- a/src/nitro/communication/messages/incoming/poll/QuestionEvent.ts +++ b/src/nitro/communication/messages/incoming/poll/QuestionEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { QuestionParser } from '../../parser'; export class QuestionEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/poll/QuestionFinishedEvent.ts b/src/nitro/communication/messages/incoming/poll/QuestionFinishedEvent.ts index 05e653ec..809e2b2f 100644 --- a/src/nitro/communication/messages/incoming/poll/QuestionFinishedEvent.ts +++ b/src/nitro/communication/messages/incoming/poll/QuestionFinishedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { QuestionFinishedParser } from '../../parser'; export class QuestionFinishedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/quest/CommunityGoalEarnedPrizesMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/CommunityGoalEarnedPrizesMessageEvent.ts index a96a452f..9087c13d 100644 --- a/src/nitro/communication/messages/incoming/quest/CommunityGoalEarnedPrizesMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/CommunityGoalEarnedPrizesMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CommunityGoalEarnedPrizesMessageParser } from '../../parser'; export class CommunityGoalEarnedPrizesMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/quest/CommunityGoalHallOfFameMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/CommunityGoalHallOfFameMessageEvent.ts index 35d5906b..0ad79a4f 100644 --- a/src/nitro/communication/messages/incoming/quest/CommunityGoalHallOfFameMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/CommunityGoalHallOfFameMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CommunityGoalHallOfFameMessageParser } from '../../parser'; export class CommunityGoalHallOfFameMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/quest/CommunityGoalProgressMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/CommunityGoalProgressMessageEvent.ts index 4e9ab67c..3c0dc059 100644 --- a/src/nitro/communication/messages/incoming/quest/CommunityGoalProgressMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/CommunityGoalProgressMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { CommunityGoalProgressMessageParser } from '../../parser'; export class CommunityGoalProgressMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/quest/ConcurrentUsersGoalProgressMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/ConcurrentUsersGoalProgressMessageEvent.ts index 0a945cac..2f9d4bce 100644 --- a/src/nitro/communication/messages/incoming/quest/ConcurrentUsersGoalProgressMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/ConcurrentUsersGoalProgressMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { ConcurrentUsersGoalProgressMessageParser } from '../../parser'; export class ConcurrentUsersGoalProgressMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/quest/EpicPopupMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/EpicPopupMessageEvent.ts index 6cfa8791..611bcdab 100644 --- a/src/nitro/communication/messages/incoming/quest/EpicPopupMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/EpicPopupMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { EpicPopupMessageParser } from '../../parser'; export class EpicPopupMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/quest/QuestCancelledMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/QuestCancelledMessageEvent.ts index 35e49c16..c7f8b019 100644 --- a/src/nitro/communication/messages/incoming/quest/QuestCancelledMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/QuestCancelledMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { QuestCancelledMessageParser } from '../../parser'; export class QuestCancelledMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/quest/QuestCompletedMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/QuestCompletedMessageEvent.ts index c21f5f7a..1cd26f71 100644 --- a/src/nitro/communication/messages/incoming/quest/QuestCompletedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/QuestCompletedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { QuestCompletedMessageParser } from '../../parser'; export class QuestCompletedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/quest/QuestDailyMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/QuestDailyMessageEvent.ts index 539b26a9..5ddb274b 100644 --- a/src/nitro/communication/messages/incoming/quest/QuestDailyMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/QuestDailyMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { QuestDailyMessageParser } from '../../parser'; export class QuestDailyMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/quest/QuestMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/QuestMessageEvent.ts index 17dc92c0..774c5381 100644 --- a/src/nitro/communication/messages/incoming/quest/QuestMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/QuestMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { QuestMessageParser } from '../../parser'; export class QuestMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/quest/QuestsMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/QuestsMessageEvent.ts index bb9a8f7c..f4a14f3b 100644 --- a/src/nitro/communication/messages/incoming/quest/QuestsMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/QuestsMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { QuestsMessageParser } from '../../parser'; export class QuestsMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/quest/SeasonalQuestsMessageEvent.ts b/src/nitro/communication/messages/incoming/quest/SeasonalQuestsMessageEvent.ts index 9f65684c..0a5d07e6 100644 --- a/src/nitro/communication/messages/incoming/quest/SeasonalQuestsMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/quest/SeasonalQuestsMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { SeasonalQuestsParser } from '../../parser'; export class SeasonalQuestsMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/access/RoomEnterErrorEvent.ts b/src/nitro/communication/messages/incoming/room/access/RoomEnterErrorEvent.ts index 2f74e7e7..84bf3f8a 100644 --- a/src/nitro/communication/messages/incoming/room/access/RoomEnterErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/room/access/RoomEnterErrorEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { CantConnectMessageParser } from '../../../parser'; export class RoomEnterErrorEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/access/RoomEnterEvent.ts b/src/nitro/communication/messages/incoming/room/access/RoomEnterEvent.ts index dfb4c54e..11b92108 100644 --- a/src/nitro/communication/messages/incoming/room/access/RoomEnterEvent.ts +++ b/src/nitro/communication/messages/incoming/room/access/RoomEnterEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { RoomEnterParser } from '../../../parser'; export class RoomEnterEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/access/RoomForwardEvent.ts b/src/nitro/communication/messages/incoming/room/access/RoomForwardEvent.ts index e895cb46..78ce8336 100644 --- a/src/nitro/communication/messages/incoming/room/access/RoomForwardEvent.ts +++ b/src/nitro/communication/messages/incoming/room/access/RoomForwardEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { RoomFowardParser as RoomForwardParser } from '../../../parser'; export class RoomForwardEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/access/doorbell/RoomDoorbellAcceptedEvent.ts b/src/nitro/communication/messages/incoming/room/access/doorbell/RoomDoorbellAcceptedEvent.ts index 508fc70d..57243236 100644 --- a/src/nitro/communication/messages/incoming/room/access/doorbell/RoomDoorbellAcceptedEvent.ts +++ b/src/nitro/communication/messages/incoming/room/access/doorbell/RoomDoorbellAcceptedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core'; +import { MessageEvent } from '../../../../../../../events'; import { RoomDoorbellAcceptedParser } from '../../../../parser'; export class RoomDoorbellAcceptedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsClearEvent.ts b/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsClearEvent.ts index 442b2f43..b3836807 100644 --- a/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsClearEvent.ts +++ b/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsClearEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core'; +import { MessageEvent } from '../../../../../../../events'; import { RoomRightsClearParser } from '../../../../parser'; export class RoomRightsClearEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsEvent.ts b/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsEvent.ts index ea64b0a5..8299daf2 100644 --- a/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsEvent.ts +++ b/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core'; +import { MessageEvent } from '../../../../../../../events'; import { RoomRightsParser } from '../../../../parser'; export class RoomRightsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsOwnerEvent.ts b/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsOwnerEvent.ts index 7f17078c..5b59c121 100644 --- a/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsOwnerEvent.ts +++ b/src/nitro/communication/messages/incoming/room/access/rights/RoomRightsOwnerEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core'; +import { MessageEvent } from '../../../../../../../events'; import { RoomRightsOwnerParser } from '../../../../parser'; export class RoomRightsOwnerEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/bots/BotCommandConfigurationEvent.ts b/src/nitro/communication/messages/incoming/room/bots/BotCommandConfigurationEvent.ts index b2d469cf..2361f35d 100644 --- a/src/nitro/communication/messages/incoming/room/bots/BotCommandConfigurationEvent.ts +++ b/src/nitro/communication/messages/incoming/room/bots/BotCommandConfigurationEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { BotCommandConfigurationParser } from '../../../parser'; export class BotCommandConfigurationEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/data/RoomChatSettingsEvent.ts b/src/nitro/communication/messages/incoming/room/data/RoomChatSettingsEvent.ts index 2c562416..50b4828f 100644 --- a/src/nitro/communication/messages/incoming/room/data/RoomChatSettingsEvent.ts +++ b/src/nitro/communication/messages/incoming/room/data/RoomChatSettingsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { RoomChatSettingsParser } from '../../../parser'; export class RoomChatSettingsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/data/RoomEntryInfoMessageEvent.ts b/src/nitro/communication/messages/incoming/room/data/RoomEntryInfoMessageEvent.ts index 10a25889..535fe0df 100644 --- a/src/nitro/communication/messages/incoming/room/data/RoomEntryInfoMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/data/RoomEntryInfoMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { RoomEntryInfoMessageParser } from '../../../parser'; export class RoomEntryInfoMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/data/RoomScoreEvent.ts b/src/nitro/communication/messages/incoming/room/data/RoomScoreEvent.ts index 9cbfdb91..70561d1e 100644 --- a/src/nitro/communication/messages/incoming/room/data/RoomScoreEvent.ts +++ b/src/nitro/communication/messages/incoming/room/data/RoomScoreEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { RoomScoreParser } from '../../../parser'; export class RoomScoreEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/engine/FavoriteMembershipUpdateMessageEvent.ts b/src/nitro/communication/messages/incoming/room/engine/FavoriteMembershipUpdateMessageEvent.ts index 624e2b8d..18c4639b 100644 --- a/src/nitro/communication/messages/incoming/room/engine/FavoriteMembershipUpdateMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/engine/FavoriteMembershipUpdateMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { FavoriteMembershipUpdateMessageParser } from '../../../parser'; export class FavoriteMembershipUpdateMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/engine/ObjectsDataUpdateEvent.ts b/src/nitro/communication/messages/incoming/room/engine/ObjectsDataUpdateEvent.ts index 1ae8187a..a040c574 100644 --- a/src/nitro/communication/messages/incoming/room/engine/ObjectsDataUpdateEvent.ts +++ b/src/nitro/communication/messages/incoming/room/engine/ObjectsDataUpdateEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { ObjectsDataUpdateParser } from '../../../parser'; export class ObjectsDataUpdateEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/engine/ObjectsRollingEvent.ts b/src/nitro/communication/messages/incoming/room/engine/ObjectsRollingEvent.ts index a48969f0..6d96622d 100644 --- a/src/nitro/communication/messages/incoming/room/engine/ObjectsRollingEvent.ts +++ b/src/nitro/communication/messages/incoming/room/engine/ObjectsRollingEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { ObjectsRollingParser } from '../../../parser'; export class ObjectsRollingEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/CustomUserNotificationMessageEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/CustomUserNotificationMessageEvent.ts index 4c53a712..e61ec8dd 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/CustomUserNotificationMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/CustomUserNotificationMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { CustomUserNotificationMessageParser } from '../../../parser'; export class CustomUserNotificationMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/DiceValueMessageEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/DiceValueMessageEvent.ts index 826035c1..53a05936 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/DiceValueMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/DiceValueMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { DiceValueMessageParser } from '../../../parser'; export class DiceValueMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/FurnitureAliasesEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/FurnitureAliasesEvent.ts index 3f844582..a42fe467 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/FurnitureAliasesEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/FurnitureAliasesEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { FurnitureAliasesParser } from '../../../parser'; export class FurnitureAliasesEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/FurnitureDataEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/FurnitureDataEvent.ts index c94dbf0d..4b3dc068 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/FurnitureDataEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/FurnitureDataEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { FurnitureDataParser } from '../../../parser'; export class FurnitureDataEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/FurnitureStackHeightEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/FurnitureStackHeightEvent.ts index 95a9ec8f..784e6255 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/FurnitureStackHeightEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/FurnitureStackHeightEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { FurnitureStackHeightParser } from '../../../parser'; export class FurnitureStackHeightEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/GroupFurniContextMenuInfoMessageEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/GroupFurniContextMenuInfoMessageEvent.ts index dbe0a819..761b30ea 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/GroupFurniContextMenuInfoMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/GroupFurniContextMenuInfoMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { GroupFurniContextMenuInfoMessageParser } from '../../../parser'; export class GroupFurniContextMenuInfoMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/ItemDataUpdateMessageEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/ItemDataUpdateMessageEvent.ts index e6035f3e..fd438490 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/ItemDataUpdateMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/ItemDataUpdateMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { ItemDataUpdateMessageParser } from '../../../parser'; export class ItemDataUpdateMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniFinishedEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniFinishedEvent.ts index 63b94d2c..e7bf2082 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniFinishedEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniFinishedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { LoveLockFurniFinishedParser } from '../../../parser'; export class LoveLockFurniFinishedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniFriendConfirmedEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniFriendConfirmedEvent.ts index ec8d92f8..34316d66 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniFriendConfirmedEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniFriendConfirmedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { LoveLockFurniFriendConfirmedParser } from '../../../parser'; export class LoveLockFurniFriendConfirmedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniStartEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniStartEvent.ts index 2aeb96ec..f1b65c5e 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniStartEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/LoveLockFurniStartEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { LoveLockFurniStartParser } from '../../../parser'; export class LoveLockFurniStartEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/OneWayDoorStatusMessageEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/OneWayDoorStatusMessageEvent.ts index 82dd0991..35ac5937 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/OneWayDoorStatusMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/OneWayDoorStatusMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { OneWayDoorStatusMessageParser } from '../../../parser'; export class OneWayDoorStatusMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/RequestSpamWallPostItMessageEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/RequestSpamWallPostItMessageEvent.ts index a7d2e4a9..03d9e4be 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/RequestSpamWallPostItMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/RequestSpamWallPostItMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { RequestSpamWallPostItMessageParser } from '../../../parser'; export class RequestSpamWallPostItMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/RoomDimmerPresetsMessageEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/RoomDimmerPresetsMessageEvent.ts index 9de9facb..dab41b99 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/RoomDimmerPresetsMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/RoomDimmerPresetsMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { RoomDimmerPresetsMessageParser } from '../../../parser'; export class RoomDimmerPresetsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorAddEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorAddEvent.ts index f18a33bd..c606f9fe 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorAddEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorAddEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core'; +import { MessageEvent } from '../../../../../../../events'; import { FurnitureFloorAddParser } from '../../../../parser'; export class FurnitureFloorAddEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorEvent.ts index eb8894e3..0aa41bad 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core'; +import { MessageEvent } from '../../../../../../../events'; import { FurnitureFloorParser } from '../../../../parser'; export class FurnitureFloorEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorRemoveEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorRemoveEvent.ts index 7c8be063..0da0907a 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorRemoveEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorRemoveEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core'; +import { MessageEvent } from '../../../../../../../events'; import { FurnitureFloorRemoveParser } from '../../../../parser'; export class FurnitureFloorRemoveEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorUpdateEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorUpdateEvent.ts index 5dfc22f5..df99117f 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorUpdateEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/floor/FurnitureFloorUpdateEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core'; +import { MessageEvent } from '../../../../../../../events'; import { FurnitureFloorUpdateParser } from '../../../../parser'; export class FurnitureFloorUpdateEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallAddEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallAddEvent.ts index 705393c9..4e79e1ac 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallAddEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallAddEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core'; +import { MessageEvent } from '../../../../../../../events'; import { FurnitureWallAddParser } from '../../../../parser'; export class FurnitureWallAddEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallEvent.ts index a5063fc3..95345c58 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core'; +import { MessageEvent } from '../../../../../../../events'; import { FurnitureWallParser } from '../../../../parser'; export class FurnitureWallEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallRemoveEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallRemoveEvent.ts index 909ee088..24356881 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallRemoveEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallRemoveEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core'; +import { MessageEvent } from '../../../../../../../events'; import { FurnitureWallRemoveParser } from '../../../../parser'; export class FurnitureWallRemoveEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallUpdateEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallUpdateEvent.ts index 73f8ea0d..ca6412e9 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallUpdateEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/wall/FurnitureWallUpdateEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core'; +import { MessageEvent } from '../../../../../../../events'; import { FurnitureWallUpdateParser } from '../../../../parser'; export class FurnitureWallUpdateEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeControlVideoMessageEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeControlVideoMessageEvent.ts index eb4f54b4..412f630e 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeControlVideoMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeControlVideoMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core'; +import { MessageEvent } from '../../../../../../../events'; import { YoutubeControlVideoMessageParser } from '../../../../parser'; export class YoutubeControlVideoMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeDisplayPlaylistsEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeDisplayPlaylistsEvent.ts index 1c479179..73b715f6 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeDisplayPlaylistsEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeDisplayPlaylistsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core'; +import { MessageEvent } from '../../../../../../../events'; import { YoutubeDisplayPlaylistsMessageParser } from '../../../../parser'; export class YoutubeDisplayPlaylistsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeDisplayVideoMessageEvent.ts b/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeDisplayVideoMessageEvent.ts index 587a1bb6..88835e92 100644 --- a/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeDisplayVideoMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/furniture/youtube/YoutubeDisplayVideoMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core'; +import { MessageEvent } from '../../../../../../../events'; import { YoutubeDisplayVideoMessageParser } from '../../../../parser'; export class YoutubeDisplayVideoMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/mapping/FloorHeightMapEvent.ts b/src/nitro/communication/messages/incoming/room/mapping/FloorHeightMapEvent.ts index 9be5f173..d1750610 100644 --- a/src/nitro/communication/messages/incoming/room/mapping/FloorHeightMapEvent.ts +++ b/src/nitro/communication/messages/incoming/room/mapping/FloorHeightMapEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { FloorHeightMapMessageParser } from '../../../parser'; export class FloorHeightMapEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/mapping/RoomEntryTileMessageEvent.ts b/src/nitro/communication/messages/incoming/room/mapping/RoomEntryTileMessageEvent.ts index aec9d8a6..445b0aed 100644 --- a/src/nitro/communication/messages/incoming/room/mapping/RoomEntryTileMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/mapping/RoomEntryTileMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { RoomEntryTileMessageParser } from '../../../parser'; export class RoomEntryTileMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/mapping/RoomHeightMapEvent.ts b/src/nitro/communication/messages/incoming/room/mapping/RoomHeightMapEvent.ts index a60c924e..f736a30e 100644 --- a/src/nitro/communication/messages/incoming/room/mapping/RoomHeightMapEvent.ts +++ b/src/nitro/communication/messages/incoming/room/mapping/RoomHeightMapEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { RoomHeightMapParser } from '../../../parser'; export class RoomHeightMapEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/mapping/RoomHeightMapUpdateEvent.ts b/src/nitro/communication/messages/incoming/room/mapping/RoomHeightMapUpdateEvent.ts index 1bc2f360..0cb80e12 100644 --- a/src/nitro/communication/messages/incoming/room/mapping/RoomHeightMapUpdateEvent.ts +++ b/src/nitro/communication/messages/incoming/room/mapping/RoomHeightMapUpdateEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { RoomHeightMapUpdateParser } from '../../../parser'; export class RoomHeightMapUpdateEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/mapping/RoomOccupiedTilesMessageEvent.ts b/src/nitro/communication/messages/incoming/room/mapping/RoomOccupiedTilesMessageEvent.ts index 08b74b4d..6d288ed3 100644 --- a/src/nitro/communication/messages/incoming/room/mapping/RoomOccupiedTilesMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/mapping/RoomOccupiedTilesMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { RoomOccupiedTilesMessageParser } from '../../../parser'; export class RoomOccupiedTilesMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/mapping/RoomPaintEvent.ts b/src/nitro/communication/messages/incoming/room/mapping/RoomPaintEvent.ts index 218c14a1..62dc9312 100644 --- a/src/nitro/communication/messages/incoming/room/mapping/RoomPaintEvent.ts +++ b/src/nitro/communication/messages/incoming/room/mapping/RoomPaintEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { RoomPaintParser } from '../../../parser'; export class RoomPaintEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/mapping/RoomReadyMessageEvent.ts b/src/nitro/communication/messages/incoming/room/mapping/RoomReadyMessageEvent.ts index ee20dd55..820b5271 100644 --- a/src/nitro/communication/messages/incoming/room/mapping/RoomReadyMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/mapping/RoomReadyMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { RoomReadyMessageParser } from '../../../parser'; export class RoomReadyMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/mapping/RoomVisualizationSettingsEvent.ts b/src/nitro/communication/messages/incoming/room/mapping/RoomVisualizationSettingsEvent.ts index 4ac289bc..2af794d1 100644 --- a/src/nitro/communication/messages/incoming/room/mapping/RoomVisualizationSettingsEvent.ts +++ b/src/nitro/communication/messages/incoming/room/mapping/RoomVisualizationSettingsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { RoomVisualizationSettingsParser } from '../../../parser'; export class RoomVisualizationSettingsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/pet/PetExperienceEvent.ts b/src/nitro/communication/messages/incoming/room/pet/PetExperienceEvent.ts index b7521c61..afb2f436 100644 --- a/src/nitro/communication/messages/incoming/room/pet/PetExperienceEvent.ts +++ b/src/nitro/communication/messages/incoming/room/pet/PetExperienceEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { PetExperienceParser } from '../../../parser'; export class PetExperienceEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/pet/PetFigureUpdateEvent.ts b/src/nitro/communication/messages/incoming/room/pet/PetFigureUpdateEvent.ts index 60b1e492..a3942025 100644 --- a/src/nitro/communication/messages/incoming/room/pet/PetFigureUpdateEvent.ts +++ b/src/nitro/communication/messages/incoming/room/pet/PetFigureUpdateEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { PetFigureUpdateParser } from '../../../parser'; export class PetFigureUpdateEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/pet/PetInfoEvent.ts b/src/nitro/communication/messages/incoming/room/pet/PetInfoEvent.ts index 47ea73f3..83af2685 100644 --- a/src/nitro/communication/messages/incoming/room/pet/PetInfoEvent.ts +++ b/src/nitro/communication/messages/incoming/room/pet/PetInfoEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { PetInfoParser } from '../../../parser'; export class PetInfoEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/pet/PetStatusUpdateEvent.ts b/src/nitro/communication/messages/incoming/room/pet/PetStatusUpdateEvent.ts index f80bcee7..063b6c01 100644 --- a/src/nitro/communication/messages/incoming/room/pet/PetStatusUpdateEvent.ts +++ b/src/nitro/communication/messages/incoming/room/pet/PetStatusUpdateEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { PetStatusUpdateParser } from '../../../parser'; export class PetStatusUpdateEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/session/YouArePlayingGameEvent.ts b/src/nitro/communication/messages/incoming/room/session/YouArePlayingGameEvent.ts index af23b229..624fff21 100644 --- a/src/nitro/communication/messages/incoming/room/session/YouArePlayingGameEvent.ts +++ b/src/nitro/communication/messages/incoming/room/session/YouArePlayingGameEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { YouArePlayingGameParser } from '../../../parser'; export class YouArePlayingGameEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/session/YouAreSpectatorMessageEvent.ts b/src/nitro/communication/messages/incoming/room/session/YouAreSpectatorMessageEvent.ts index 4285f41e..510a74a6 100644 --- a/src/nitro/communication/messages/incoming/room/session/YouAreSpectatorMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/room/session/YouAreSpectatorMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { YouAreSpectatorMessageParser } from '../../../parser'; export class YouAreSpectatorMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitDanceEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitDanceEvent.ts index a5a639a4..a91c3290 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitDanceEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitDanceEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { RoomUnitDanceParser } from '../../../parser'; export class RoomUnitDanceEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitEffectEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitEffectEvent.ts index 0775c84d..42033bcb 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitEffectEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitEffectEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { RoomUnitEffectParser } from '../../../parser'; export class RoomUnitEffectEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitEvent.ts index ce157dfd..0b2aa791 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { RoomUnitParser } from '../../../parser'; export class RoomUnitEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitExpressionEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitExpressionEvent.ts index bf1e41f4..34486274 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitExpressionEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitExpressionEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { RoomUnitExpressionParser } from '../../../parser'; export class RoomUnitExpressionEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitHandItemEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitHandItemEvent.ts index 7a536e93..32f0f0e5 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitHandItemEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitHandItemEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { RoomUnitHandItemParser } from '../../../parser'; export class RoomUnitHandItemEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitHandItemReceivedEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitHandItemReceivedEvent.ts index 08c480dc..339c68fe 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitHandItemReceivedEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitHandItemReceivedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { RoomUnitHandItemReceivedParser } from '../../../parser'; export class RoomUnitHandItemReceivedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitIdleEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitIdleEvent.ts index b7705068..a36d51df 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitIdleEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitIdleEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { RoomUnitIdleParser } from '../../../parser'; export class RoomUnitIdleEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitInfoEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitInfoEvent.ts index 5768cb6e..52201329 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitInfoEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitInfoEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { RoomUnitInfoParser } from '../../../parser'; export class RoomUnitInfoEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitNumberEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitNumberEvent.ts index 1ae9cec5..c5e4dccb 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitNumberEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitNumberEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { RoomUnitNumberParser } from '../../../parser'; export class RoomUnitNumberEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitRemoveEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitRemoveEvent.ts index 4921e234..fb4d91d7 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitRemoveEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitRemoveEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { RoomUnitRemoveParser } from '../../../parser'; export class RoomUnitRemoveEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/RoomUnitStatusEvent.ts b/src/nitro/communication/messages/incoming/room/unit/RoomUnitStatusEvent.ts index a50fcbfa..d4c5b9fa 100644 --- a/src/nitro/communication/messages/incoming/room/unit/RoomUnitStatusEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/RoomUnitStatusEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { RoomUnitStatusParser } from '../../../parser'; export class RoomUnitStatusEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/chat/FloodControlEvent.ts b/src/nitro/communication/messages/incoming/room/unit/chat/FloodControlEvent.ts index e06cfe03..b1bcee50 100644 --- a/src/nitro/communication/messages/incoming/room/unit/chat/FloodControlEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/chat/FloodControlEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core'; +import { MessageEvent } from '../../../../../../../events'; import { FloodControlParser } from '../../../../parser'; export class FloodControlEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/chat/RemainingMuteEvent.ts b/src/nitro/communication/messages/incoming/room/unit/chat/RemainingMuteEvent.ts index afdde398..381d72b7 100644 --- a/src/nitro/communication/messages/incoming/room/unit/chat/RemainingMuteEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/chat/RemainingMuteEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core'; +import { MessageEvent } from '../../../../../../../events'; import { RemainingMuteParser } from '../../../../parser'; export class RemainingMuteEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatEvent.ts b/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatEvent.ts index a3f2701e..e13b98ce 100644 --- a/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core'; +import { MessageEvent } from '../../../../../../../events'; import { RoomUnitChatParser } from '../../../../parser'; export class RoomUnitChatEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatShoutEvent.ts b/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatShoutEvent.ts index ff171f6c..fce5ce2a 100644 --- a/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatShoutEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatShoutEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core'; +import { MessageEvent } from '../../../../../../../events'; import { RoomUnitChatParser } from '../../../../parser'; export class RoomUnitChatShoutEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatWhisperEvent.ts b/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatWhisperEvent.ts index 7292e031..48ddb250 100644 --- a/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatWhisperEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitChatWhisperEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core'; +import { MessageEvent } from '../../../../../../../events'; import { RoomUnitChatParser } from '../../../../parser'; export class RoomUnitChatWhisperEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitTypingEvent.ts b/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitTypingEvent.ts index f96d9a1d..0f3a3737 100644 --- a/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitTypingEvent.ts +++ b/src/nitro/communication/messages/incoming/room/unit/chat/RoomUnitTypingEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core'; +import { MessageEvent } from '../../../../../../../events'; import { RoomUnitTypingParser } from '../../../../parser'; export class RoomUnitTypingEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomevents/WiredFurniActionEvent.ts b/src/nitro/communication/messages/incoming/roomevents/WiredFurniActionEvent.ts index 663ca50c..7c0c5286 100644 --- a/src/nitro/communication/messages/incoming/roomevents/WiredFurniActionEvent.ts +++ b/src/nitro/communication/messages/incoming/roomevents/WiredFurniActionEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { WiredFurniActionParser } from '../../parser'; export class WiredFurniActionEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomevents/WiredFurniConditionEvent.ts b/src/nitro/communication/messages/incoming/roomevents/WiredFurniConditionEvent.ts index f156ecbe..29a7f203 100644 --- a/src/nitro/communication/messages/incoming/roomevents/WiredFurniConditionEvent.ts +++ b/src/nitro/communication/messages/incoming/roomevents/WiredFurniConditionEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { WiredFurniConditionParser } from '../../parser'; export class WiredFurniConditionEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomevents/WiredFurniTriggerEvent.ts b/src/nitro/communication/messages/incoming/roomevents/WiredFurniTriggerEvent.ts index 3787682c..3c15db66 100644 --- a/src/nitro/communication/messages/incoming/roomevents/WiredFurniTriggerEvent.ts +++ b/src/nitro/communication/messages/incoming/roomevents/WiredFurniTriggerEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { WiredFurniTriggerParser } from '../../parser'; export class WiredFurniTriggerEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomevents/WiredOpenEvent.ts b/src/nitro/communication/messages/incoming/roomevents/WiredOpenEvent.ts index e59713ed..ef5b564a 100644 --- a/src/nitro/communication/messages/incoming/roomevents/WiredOpenEvent.ts +++ b/src/nitro/communication/messages/incoming/roomevents/WiredOpenEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { WiredOpenParser } from '../../parser'; export class WiredOpenEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomevents/WiredRewardResultMessageEvent.ts b/src/nitro/communication/messages/incoming/roomevents/WiredRewardResultMessageEvent.ts index 5da652d8..fe7f9983 100644 --- a/src/nitro/communication/messages/incoming/roomevents/WiredRewardResultMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/roomevents/WiredRewardResultMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { WiredRewardResultMessageParser } from '../../parser'; export class WiredRewardResultMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomevents/WiredSaveSuccessEvent.ts b/src/nitro/communication/messages/incoming/roomevents/WiredSaveSuccessEvent.ts index 1cf05937..e0a93a5d 100644 --- a/src/nitro/communication/messages/incoming/roomevents/WiredSaveSuccessEvent.ts +++ b/src/nitro/communication/messages/incoming/roomevents/WiredSaveSuccessEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { WiredSaveSuccessParser } from '../../parser'; export class WiredSaveSuccessEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomevents/WiredValidationErrorEvent.ts b/src/nitro/communication/messages/incoming/roomevents/WiredValidationErrorEvent.ts index b937130e..4f94d158 100644 --- a/src/nitro/communication/messages/incoming/roomevents/WiredValidationErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/roomevents/WiredValidationErrorEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { WiredValidationErrorParser } from '../../parser'; export class WiredValidationErrorEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomsettings/BannedUsersFromRoomEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/BannedUsersFromRoomEvent.ts index 5611d9e0..672665a7 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/BannedUsersFromRoomEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/BannedUsersFromRoomEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { BannedUsersFromRoomParser } from '../../parser'; export class BannedUsersFromRoomEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomsettings/FlatControllerAddedEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/FlatControllerAddedEvent.ts index e84d382c..b94be074 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/FlatControllerAddedEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/FlatControllerAddedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { FlatControllerAddedParser } from '../../parser'; export class FlatControllerAddedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomsettings/FlatControllerRemovedEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/FlatControllerRemovedEvent.ts index 8c17c441..d819b89a 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/FlatControllerRemovedEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/FlatControllerRemovedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { FlatControllerRemovedParser } from '../../parser'; export class FlatControllerRemovedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomsettings/FlatControllersEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/FlatControllersEvent.ts index 8f42575e..23f5778b 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/FlatControllersEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/FlatControllersEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { FlatControllersParser } from '../../parser'; export class FlatControllersEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomsettings/MuteAllInRoomEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/MuteAllInRoomEvent.ts index a9ab9e40..e5b0a9d7 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/MuteAllInRoomEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/MuteAllInRoomEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { MuteAllInRoomParser } from '../../parser'; export class MuteAllInRoomEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomsettings/NoSuchFlatEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/NoSuchFlatEvent.ts index a6d8c96d..7f98b55a 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/NoSuchFlatEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/NoSuchFlatEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { NoSuchFlatParser } from '../../parser'; export class NoSuchFlatEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsDataEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsDataEvent.ts index 7e7af183..c3b07442 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsDataEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsDataEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { RoomSettingsDataParser } from '../../parser'; export class RoomSettingsDataEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsErrorEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsErrorEvent.ts index ae0ef2d8..8a0717db 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsErrorEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { RoomSettingsErrorParser } from '../../parser'; export class RoomSettingsErrorEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsSaveErrorEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsSaveErrorEvent.ts index ffd04b42..65a1a0e3 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsSaveErrorEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsSaveErrorEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { RoomSettingsSaveErrorParser } from '../../parser'; export class RoomSettingsSaveErrorEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsSavedEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsSavedEvent.ts index 6a3573cf..0623a851 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsSavedEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/RoomSettingsSavedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { RoomSettingsSavedParser } from '../../parser'; export class RoomSettingsSavedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomsettings/ShowEnforceRoomCategoryDialogEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/ShowEnforceRoomCategoryDialogEvent.ts index 1c8359dc..77e6bea0 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/ShowEnforceRoomCategoryDialogEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/ShowEnforceRoomCategoryDialogEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { ShowEnforceRoomCategoryDialogParser } from '../../parser'; export class ShowEnforceRoomCategoryDialogEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/roomsettings/UserUnbannedFromRoomEvent.ts b/src/nitro/communication/messages/incoming/roomsettings/UserUnbannedFromRoomEvent.ts index 4f896eb5..7f453440 100644 --- a/src/nitro/communication/messages/incoming/roomsettings/UserUnbannedFromRoomEvent.ts +++ b/src/nitro/communication/messages/incoming/roomsettings/UserUnbannedFromRoomEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { UserUnbannedFromRoomParser } from '../../parser'; export class UserUnbannedFromRoomEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/security/AuthenticatedEvent.ts b/src/nitro/communication/messages/incoming/security/AuthenticatedEvent.ts index 14b3c2ea..2951c8e4 100644 --- a/src/nitro/communication/messages/incoming/security/AuthenticatedEvent.ts +++ b/src/nitro/communication/messages/incoming/security/AuthenticatedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { AuthenticatedParser } from '../../parser'; export class AuthenticatedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/sound/JukeboxPlayListFullMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/JukeboxPlayListFullMessageEvent.ts index 7cdb08b6..c26ac254 100644 --- a/src/nitro/communication/messages/incoming/sound/JukeboxPlayListFullMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/sound/JukeboxPlayListFullMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { JukeboxPlayListFullMessageParser } from '../../parser'; export class JukeboxPlayListFullMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/sound/JukeboxSongDisksMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/JukeboxSongDisksMessageEvent.ts index 5ff2d285..d6448670 100644 --- a/src/nitro/communication/messages/incoming/sound/JukeboxSongDisksMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/sound/JukeboxSongDisksMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { JukeboxSongDisksMessageParser } from '../../parser'; export class JukeboxSongDisksMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/sound/NowPlayingMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/NowPlayingMessageEvent.ts index 5022a146..610f3928 100644 --- a/src/nitro/communication/messages/incoming/sound/NowPlayingMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/sound/NowPlayingMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { NowPlayingMessageParser } from '../../parser'; export class NowPlayingMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/sound/OfficialSongIdMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/OfficialSongIdMessageEvent.ts index b1398512..aa9fbc12 100644 --- a/src/nitro/communication/messages/incoming/sound/OfficialSongIdMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/sound/OfficialSongIdMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { OfficialSongIdMessageParser } from '../../parser'; export class OfficialSongIdMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/sound/PlayListMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/PlayListMessageEvent.ts index 49b52ec5..bae8e8ac 100644 --- a/src/nitro/communication/messages/incoming/sound/PlayListMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/sound/PlayListMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { PlayListMessageParser } from '../../parser'; export class PlayListMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/sound/PlayListSongAddedMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/PlayListSongAddedMessageEvent.ts index d4b02287..84226f2c 100644 --- a/src/nitro/communication/messages/incoming/sound/PlayListSongAddedMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/sound/PlayListSongAddedMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { PlayListSongAddedMessageParser } from '../../parser'; export class PlayListSongAddedMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/sound/TraxSongInfoMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/TraxSongInfoMessageEvent.ts index 18587eb1..b6f69c22 100644 --- a/src/nitro/communication/messages/incoming/sound/TraxSongInfoMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/sound/TraxSongInfoMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { TraxSongInfoMessageParser } from '../../parser'; export class TraxSongInfoMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/sound/UserSongDisksInventoryMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/UserSongDisksInventoryMessageEvent.ts index 5a953ff4..4b4fcf6d 100644 --- a/src/nitro/communication/messages/incoming/sound/UserSongDisksInventoryMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/sound/UserSongDisksInventoryMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { UserSongDisksInventoryMessageParser } from '../../parser'; export class UserSongDisksInventoryMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/talent/TalentTrackMessageEvent.ts b/src/nitro/communication/messages/incoming/talent/TalentTrackMessageEvent.ts index c4e86b2f..5f231774 100644 --- a/src/nitro/communication/messages/incoming/talent/TalentTrackMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/talent/TalentTrackMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { TalentTrackParser } from '../../parser'; export class TalentTrackMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/ApproveNameMessageEvent.ts b/src/nitro/communication/messages/incoming/user/ApproveNameMessageEvent.ts index 124f5a1f..e623d61f 100644 --- a/src/nitro/communication/messages/incoming/user/ApproveNameMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/user/ApproveNameMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { ApproveNameResultParser } from '../../parser'; export class ApproveNameMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/GuildMembershipsMessageEvent.ts b/src/nitro/communication/messages/incoming/user/GuildMembershipsMessageEvent.ts index eba5da20..1638e10c 100644 --- a/src/nitro/communication/messages/incoming/user/GuildMembershipsMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/user/GuildMembershipsMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { GuildMembershipsMessageParser } from '../../parser'; export class GuildMembershipsMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/HabboGroupBadgesMessageEvent.ts b/src/nitro/communication/messages/incoming/user/HabboGroupBadgesMessageEvent.ts index f0764033..58f5d0d6 100644 --- a/src/nitro/communication/messages/incoming/user/HabboGroupBadgesMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/user/HabboGroupBadgesMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { HabboGroupBadgesMessageParser } from '../../parser'; export class HabboGroupBadgesMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/IgnoreResultEvent.ts b/src/nitro/communication/messages/incoming/user/IgnoreResultEvent.ts index 187677b7..8b1fa48c 100644 --- a/src/nitro/communication/messages/incoming/user/IgnoreResultEvent.ts +++ b/src/nitro/communication/messages/incoming/user/IgnoreResultEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { IgnoreResultParser } from '../../parser'; export class IgnoreResultEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/IgnoredUsersEvent.ts b/src/nitro/communication/messages/incoming/user/IgnoredUsersEvent.ts index 3b238f30..c796988d 100644 --- a/src/nitro/communication/messages/incoming/user/IgnoredUsersEvent.ts +++ b/src/nitro/communication/messages/incoming/user/IgnoredUsersEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { IgnoredUsersParser } from '../../parser'; export class IgnoredUsersEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/InClientLinkEvent.ts b/src/nitro/communication/messages/incoming/user/InClientLinkEvent.ts index 522a438b..8218641e 100644 --- a/src/nitro/communication/messages/incoming/user/InClientLinkEvent.ts +++ b/src/nitro/communication/messages/incoming/user/InClientLinkEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { InClientLinkParser } from '../../parser'; export class InClientLinkEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/PetRespectNoficationEvent.ts b/src/nitro/communication/messages/incoming/user/PetRespectNoficationEvent.ts index dc092f04..b74bffe8 100644 --- a/src/nitro/communication/messages/incoming/user/PetRespectNoficationEvent.ts +++ b/src/nitro/communication/messages/incoming/user/PetRespectNoficationEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { PetRespectNotificationParser } from '../../parser'; export class PetRespectNoficationEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/PetSupplementedNotificationEvent.ts b/src/nitro/communication/messages/incoming/user/PetSupplementedNotificationEvent.ts index 54e634f5..6a297e8f 100644 --- a/src/nitro/communication/messages/incoming/user/PetSupplementedNotificationEvent.ts +++ b/src/nitro/communication/messages/incoming/user/PetSupplementedNotificationEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { PetSupplementedNotificationParser } from '../../parser'; export class PetSupplementedNotificationEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/RespectReceivedEvent.ts b/src/nitro/communication/messages/incoming/user/RespectReceivedEvent.ts index ebff1210..f471295f 100644 --- a/src/nitro/communication/messages/incoming/user/RespectReceivedEvent.ts +++ b/src/nitro/communication/messages/incoming/user/RespectReceivedEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { RespectReceivedParser } from '../../parser'; export class RespectReceivedEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/ScrSendKickbackInfoMessageEvent.ts b/src/nitro/communication/messages/incoming/user/ScrSendKickbackInfoMessageEvent.ts index d02b77dc..36b4bf51 100644 --- a/src/nitro/communication/messages/incoming/user/ScrSendKickbackInfoMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/user/ScrSendKickbackInfoMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../api'; -import { MessageEvent } from '../../../../../core'; +import { MessageEvent } from '../../../../../events'; import { ScrSendKickbackInfoMessageParser } from '../../parser'; export class ScrSendKickbackInfoMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/access/UserPermissionsEvent.ts b/src/nitro/communication/messages/incoming/user/access/UserPermissionsEvent.ts index 7b7f036b..18615df9 100644 --- a/src/nitro/communication/messages/incoming/user/access/UserPermissionsEvent.ts +++ b/src/nitro/communication/messages/incoming/user/access/UserPermissionsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { UserPermissionsParser } from '../../../parser'; export class UserPermissionsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/data/RelationshipStatusInfoEvent.ts b/src/nitro/communication/messages/incoming/user/data/RelationshipStatusInfoEvent.ts index aefe2c2f..dd8e9af9 100644 --- a/src/nitro/communication/messages/incoming/user/data/RelationshipStatusInfoEvent.ts +++ b/src/nitro/communication/messages/incoming/user/data/RelationshipStatusInfoEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { RelationshipStatusInfoMessageParser } from '../../../parser'; export class RelationshipStatusInfoEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/data/UserCurrentBadgesEvent.ts b/src/nitro/communication/messages/incoming/user/data/UserCurrentBadgesEvent.ts index e7148b97..8231d901 100644 --- a/src/nitro/communication/messages/incoming/user/data/UserCurrentBadgesEvent.ts +++ b/src/nitro/communication/messages/incoming/user/data/UserCurrentBadgesEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { UserCurrentBadgesParser } from '../../../parser'; export class UserCurrentBadgesEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/data/UserInfoEvent.ts b/src/nitro/communication/messages/incoming/user/data/UserInfoEvent.ts index 88748eec..2cc8a574 100644 --- a/src/nitro/communication/messages/incoming/user/data/UserInfoEvent.ts +++ b/src/nitro/communication/messages/incoming/user/data/UserInfoEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { UserInfoParser } from '../../../parser'; export class UserInfoEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/data/UserNameChangeMessageEvent.ts b/src/nitro/communication/messages/incoming/user/data/UserNameChangeMessageEvent.ts index 1e8a6b2b..06145843 100644 --- a/src/nitro/communication/messages/incoming/user/data/UserNameChangeMessageEvent.ts +++ b/src/nitro/communication/messages/incoming/user/data/UserNameChangeMessageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { UserNameChangeMessageParser } from '../../../parser'; export class UserNameChangeMessageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/data/UserProfileEvent.ts b/src/nitro/communication/messages/incoming/user/data/UserProfileEvent.ts index 29542132..f8605a4b 100644 --- a/src/nitro/communication/messages/incoming/user/data/UserProfileEvent.ts +++ b/src/nitro/communication/messages/incoming/user/data/UserProfileEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { UserProfileParser } from '../../../parser'; export class UserProfileEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/data/UserSettingsEvent.ts b/src/nitro/communication/messages/incoming/user/data/UserSettingsEvent.ts index 91955756..9b996326 100644 --- a/src/nitro/communication/messages/incoming/user/data/UserSettingsEvent.ts +++ b/src/nitro/communication/messages/incoming/user/data/UserSettingsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { UserSettingsParser } from '../../../parser'; export class UserSettingsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/inventory/currency/UserCreditsEvent.ts b/src/nitro/communication/messages/incoming/user/inventory/currency/UserCreditsEvent.ts index a39e6856..ea15f85d 100644 --- a/src/nitro/communication/messages/incoming/user/inventory/currency/UserCreditsEvent.ts +++ b/src/nitro/communication/messages/incoming/user/inventory/currency/UserCreditsEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core'; +import { MessageEvent } from '../../../../../../../events'; import { UserCreditsParser } from '../../../../parser'; export class UserCreditsEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/inventory/currency/UserCurrencyEvent.ts b/src/nitro/communication/messages/incoming/user/inventory/currency/UserCurrencyEvent.ts index c872fb91..864b97df 100644 --- a/src/nitro/communication/messages/incoming/user/inventory/currency/UserCurrencyEvent.ts +++ b/src/nitro/communication/messages/incoming/user/inventory/currency/UserCurrencyEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core'; +import { MessageEvent } from '../../../../../../../events'; import { UserCurrencyParser } from '../../../../parser'; export class UserCurrencyEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/inventory/subscription/UserSubscriptionEvent.ts b/src/nitro/communication/messages/incoming/user/inventory/subscription/UserSubscriptionEvent.ts index 2b9e1d68..5a014a92 100644 --- a/src/nitro/communication/messages/incoming/user/inventory/subscription/UserSubscriptionEvent.ts +++ b/src/nitro/communication/messages/incoming/user/inventory/subscription/UserSubscriptionEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../../api'; -import { MessageEvent } from '../../../../../../../core'; +import { MessageEvent } from '../../../../../../../events'; import { UserSubscriptionParser } from '../../../../parser'; export class UserSubscriptionEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/incoming/user/wardrobe/UserWardrobePageEvent.ts b/src/nitro/communication/messages/incoming/user/wardrobe/UserWardrobePageEvent.ts index a1b15a51..0db5671d 100644 --- a/src/nitro/communication/messages/incoming/user/wardrobe/UserWardrobePageEvent.ts +++ b/src/nitro/communication/messages/incoming/user/wardrobe/UserWardrobePageEvent.ts @@ -1,5 +1,5 @@ import { IMessageEvent } from '../../../../../../api'; -import { MessageEvent } from '../../../../../../core'; +import { MessageEvent } from '../../../../../../events'; import { UserWardrobePageParser } from '../../../parser'; export class UserWardrobePageEvent extends MessageEvent implements IMessageEvent diff --git a/src/nitro/communication/messages/parser/inventory/pets/PetFigureDataParser.ts b/src/nitro/communication/messages/parser/inventory/pets/PetFigureDataParser.ts index 54d15f13..e27f5b2b 100644 --- a/src/nitro/communication/messages/parser/inventory/pets/PetFigureDataParser.ts +++ b/src/nitro/communication/messages/parser/inventory/pets/PetFigureDataParser.ts @@ -1,6 +1,6 @@ -import { IMessageDataWrapper } from '../../../../../../api'; +import { IMessageDataWrapper, IPetFigureData } from '../../../../../../api'; -export class PetFigureDataParser +export class PetFigureDataParser implements IPetFigureData { private _typeId: number; private _paletteId: number; @@ -20,7 +20,7 @@ export class PetFigureDataParser let i = 0; - while(i < this._customPartCount) + while (i < this._customPartCount) { this._customParts.push(wrapper.readInt()); this._customParts.push(wrapper.readInt()); @@ -56,7 +56,7 @@ export class PetFigureDataParser figure = (figure + (' ' + this.custompartCount)); - for(const _local_2 of this.customParts) figure = (figure + (' ' + _local_2)); + for (const _local_2 of this.customParts) figure = (figure + (' ' + _local_2)); return figure; } diff --git a/src/nitro/communication/messages/parser/poll/PollChoice.ts b/src/nitro/communication/messages/parser/poll/PollChoice.ts index 5895b3ef..7720b13e 100644 --- a/src/nitro/communication/messages/parser/poll/PollChoice.ts +++ b/src/nitro/communication/messages/parser/poll/PollChoice.ts @@ -1,43 +1,45 @@ -export class PollChoice -{ - private _value:string; - private _choiceText:string; - private _choiceType:number; +import { IPollChoice } from '../../../../../api'; - constructor(k:string, _arg_2:string, _arg_3:number) +export class PollChoice implements IPollChoice +{ + private _value: string; + private _choiceText: string; + private _choiceType: number; + + constructor(value: string, choiceText: string, choiceType: number) { - this._value = k; - this._choiceText = _arg_2; - this._choiceType = _arg_3; + this._value = value; + this._choiceText = choiceText; + this._choiceType = choiceType; } - public get value():string + public get value(): string { return this._value; } - public set value(value:string) + public set value(value: string) { this._value = value; } - public get choiceText():string + public get choiceText(): string { return this._choiceText; } - public set choiceText(choiceText:string) + public set choiceText(choiceText: string) { this._choiceText = choiceText; } - public get choiceType():number + public get choiceType(): number { return this._choiceType; } - public set choiceType(k:number) + public set choiceType(choiceType: number) { - this._choiceType = k; + this._choiceType = choiceType; } } diff --git a/src/nitro/communication/messages/parser/poll/PollQuestion.ts b/src/nitro/communication/messages/parser/poll/PollQuestion.ts index 35fdb802..b38579eb 100644 --- a/src/nitro/communication/messages/parser/poll/PollQuestion.ts +++ b/src/nitro/communication/messages/parser/poll/PollQuestion.ts @@ -1,16 +1,17 @@ +import { IPollQuestion } from '../../../../../api'; import { PollChoice } from './PollChoice'; -export class PollQuestion +export class PollQuestion implements IPollQuestion { - private _questionId:number; - private _questionType:number; - private _sortOrder:number; - private _questionCategory:number; - private _questionText:string; - private _questionAnswerType:number; - private _questionAnswerCount:number; - private _children:PollQuestion[]; - private _questionChoices:PollChoice[]; + private _questionId: number; + private _questionType: number; + private _sortOrder: number; + private _questionCategory: number; + private _questionText: string; + private _questionAnswerType: number; + private _questionAnswerCount: number; + private _children: PollQuestion[]; + private _questionChoices: PollChoice[]; constructor() { @@ -18,92 +19,92 @@ export class PollQuestion this._questionChoices = []; } - public get questionId():number + public get questionId(): number { return this._questionId; } - public set questionId(k:number) + public set questionId(questionId: number) { - this._questionId = k; + this._questionId = questionId; } - public get questionType():number + public get questionType(): number { return this._questionType; } - public set questionType(k:number) + public set questionType(questionType: number) { - this._questionType = k; + this._questionType = questionType; } - public get sortOrder():number + public get sortOrder(): number { return this._sortOrder; } - public set sortOrder(sortOrder:number) + public set sortOrder(sortOrder: number) { this._sortOrder = sortOrder; } - public get questionText():string + public get questionText(): string { return this._questionText; } - public set questionText(k:string) + public set questionText(questionText: string) { - this._questionText = k; + this._questionText = questionText; } - public get questionCategory():number + public get questionCategory(): number { return this._questionCategory; } - public set questionCategory(k:number) + public set questionCategory(questionCategory: number) { - this._questionCategory = k; + this._questionCategory = questionCategory; } - public get questionAnswerType():number + public get questionAnswerType(): number { return this._questionAnswerType; } - public set questionAnswerType(k:number) + public set questionAnswerType(answerType: number) { - this._questionAnswerType = k; + this._questionAnswerType = answerType; } - public get questionAnswerCount():number + public get questionAnswerCount(): number { return this._questionAnswerCount; } - public set questionAnswerCount(k:number) + public set questionAnswerCount(k: number) { this._questionAnswerCount = k; } - public get children():PollQuestion[] + public get children(): PollQuestion[] { return this._children; } - public set children(children:PollQuestion[]) + public set children(children: PollQuestion[]) { this._children = children; } - public get questionChoices():PollChoice[] + public get questionChoices(): PollChoice[] { return this._questionChoices; } - public set questionChoices(k:PollChoice[]) + public set questionChoices(k: PollChoice[]) { this._questionChoices = k; } diff --git a/src/nitro/communication/messages/parser/poll/QuestionParser.ts b/src/nitro/communication/messages/parser/poll/QuestionParser.ts index 2c1c2a5a..c65f870a 100644 --- a/src/nitro/communication/messages/parser/poll/QuestionParser.ts +++ b/src/nitro/communication/messages/parser/poll/QuestionParser.ts @@ -1,4 +1,4 @@ -import { IMessageDataWrapper, IMessageParser } from '../../../../../api'; +import { IMessageDataWrapper, IMessageParser, IQuestion } from '../../../../../api'; export class QuestionParser implements IMessageParser { @@ -32,7 +32,7 @@ export class QuestionParser implements IMessageParser this._question = { id: questionId, number: questionNumber, type: questionType, content: questionContent }; - if(((this._question.type == 1) || (this._question.type == 2))) + if (((this._question.type == 1) || (this._question.type == 2))) { this._question.selection_min = wrapper.readInt(); const count = wrapper.readInt(); @@ -41,7 +41,7 @@ export class QuestionParser implements IMessageParser this._question.selection_count = count; this._question.selection_max = count; - for(let i = 0; i < count; i++) + for (let i = 0; i < count; i++) { this._question.selection_values.push(wrapper.readString()); this._question.selections.push(wrapper.readString()); @@ -75,16 +75,3 @@ export class QuestionParser implements IMessageParser return this._question; } } - -export interface IQuestion -{ - id: number; - number: number; - type: number; - content: string; - selection_min?: number; - selections?: string[]; - selection_values?: string[]; - selection_count?: number; - selection_max?: number; -} diff --git a/src/nitro/communication/messages/parser/room/pet/PetBreedingResultData.ts b/src/nitro/communication/messages/parser/room/pet/PetBreedingResultData.ts index 6447c3d4..25460cf2 100644 --- a/src/nitro/communication/messages/parser/room/pet/PetBreedingResultData.ts +++ b/src/nitro/communication/messages/parser/room/pet/PetBreedingResultData.ts @@ -1,4 +1,6 @@ -export class PetBreedingResultData +import { IPetBreedingResultData } from '../../../../../../api'; + +export class PetBreedingResultData implements IPetBreedingResultData { private _stuffId: number; private _classId: number; diff --git a/src/nitro/events/index.ts b/src/nitro/events/index.ts deleted file mode 100644 index c165bbad..00000000 --- a/src/nitro/events/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export * from './NitroSettingsEvent'; -export * from './NitroSoundEvent'; -export * from './NitroToolbarAnimateIconEvent'; -export * from './NitroToolbarEvent'; diff --git a/src/nitro/index.ts b/src/nitro/index.ts index be6755b4..55441b9b 100644 --- a/src/nitro/index.ts +++ b/src/nitro/index.ts @@ -1,7 +1,6 @@ export * from './avatar'; export * from './camera'; export * from './communication'; -export * from './events'; export * from './externalInterface'; export * from './game'; export * from './INitro'; diff --git a/src/nitro/localization/NitroLocalizationManager.ts b/src/nitro/localization/NitroLocalizationManager.ts index 867308ef..af661112 100644 --- a/src/nitro/localization/NitroLocalizationManager.ts +++ b/src/nitro/localization/NitroLocalizationManager.ts @@ -1,9 +1,9 @@ import { INitroCommunicationManager, INitroLocalizationManager } from '../../api'; import { NitroManager } from '../../core'; +import { NitroLocalizationEvent } from '../../events'; import { BadgePointLimitsEvent } from '../communication'; import { Nitro } from '../Nitro'; import { BadgeBaseAndLevel } from './BadgeBaseAndLevel'; -import { NitroLocalizationEvent } from './NitroLocalizationEvent'; export class NitroLocalizationManager extends NitroManager implements INitroLocalizationManager { @@ -32,12 +32,12 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca let urls: string[] = Nitro.instance.getConfiguration('external.texts.url'); - if(!Array.isArray(urls)) + if (!Array.isArray(urls)) { urls = [Nitro.instance.getConfiguration('external.texts.url')]; } - for(let i = 0; i < urls.length; i++) urls[i] = Nitro.instance.core.configuration.interpolate(urls[i]); + for (let i = 0; i < urls.length; i++) urls[i] = Nitro.instance.core.configuration.interpolate(urls[i]); this._pendingUrls = urls; @@ -46,7 +46,7 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca private loadNextLocalization(): void { - if(!this._pendingUrls.length) + if (!this._pendingUrls.length) { this.events && this.events.dispatchEvent(new NitroLocalizationEvent(NitroLocalizationEvent.LOADED)); @@ -66,13 +66,13 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca private onLocalizationLoaded(data: { [index: string]: any }, url: string): void { - if(!data) return; + if (!data) return; - if(!this.parseLocalization(data)) throw new Error(`Invalid json data for file ${url}`); + if (!this.parseLocalization(data)) throw new Error(`Invalid json data for file ${url}`); const index = this._pendingUrls.indexOf(url); - if(index >= 0) this._pendingUrls.splice(index, 1); + if (index >= 0) this._pendingUrls.splice(index, 1); this.loadNextLocalization(); } @@ -84,9 +84,9 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca private parseLocalization(data: { [index: string]: any }): boolean { - if(!data) return false; + if (!data) return false; - for(const key in data) this._definitions.set(key, data[key]); + for (const key in data) this._definitions.set(key, data[key]); return true; } @@ -95,7 +95,7 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca { const parser = event.getParser(); - for(const data of parser.data) this.setBadgePointLimit(data.badgeId, data.limit); + for (const data of parser.data) this.setBadgePointLimit(data.badgeId, data.limit); } public getBadgePointLimit(badge: string): number @@ -129,31 +129,31 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca public getValue(key: string, doParams: boolean = true): string { - if(!key || !key.length) return null; + if (!key || !key.length) return null; const keys = key.match(/\$\{.[^}]*\}/g); - if(keys && keys.length) + if (keys && keys.length) { - for(const splitKey of keys) key = key.replace(splitKey, this.getValue(splitKey.slice(2, -1), doParams)); + for (const splitKey of keys) key = key.replace(splitKey, this.getValue(splitKey.slice(2, -1), doParams)); } let value = (this._definitions.get(key) || null); - if(!value) + if (!value) { value = (Nitro.instance.core.configuration.definitions.get(key) as any); - if(value) return value; + if (value) return value; } - if(value && doParams) + if (value && doParams) { const parameters = this._parameters.get(key); - if(parameters) + if (parameters) { - for(const [parameter, replacement] of parameters) + for (const [parameter, replacement] of parameters) { value = value.replace('%' + parameter + '%', replacement); } @@ -169,7 +169,7 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca const replacedValue = value.replace('%' + parameter + '%', replacement); - if(value.startsWith('%{')) + if (value.startsWith('%{')) { // This adds support for multi-optioned texts like // catalog.vip.item.header.months=%{NUM_MONTHS|0 months|1 month|%% months} @@ -181,13 +181,13 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca const regex = new RegExp('%{' + parameter.toUpperCase() + '\\|([^|]*)\\|([^|]*)\\|([^|]*)}'); const result = value.match(regex); - if(!result) return replacedValue; + if (!result) return replacedValue; let indexKey = -1; const replacementAsNumber = Number.parseInt(replacement); let replace = false; - switch(replacementAsNumber) + switch (replacementAsNumber) { case 0: indexKey = 1; @@ -203,14 +203,14 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca } - if(indexKey == -1 || typeof result[indexKey] == 'undefined') + if (indexKey == -1 || typeof result[indexKey] == 'undefined') { return replacedValue; } const valueFromResults = result[indexKey]; - if(valueFromResults) + if (valueFromResults) { return valueFromResults.replace('%%', replacement); } @@ -223,30 +223,30 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca { let value = this.getValue(key, false); - if(parameters) + if (parameters) { - for(let i = 0; i < parameters.length; i++) + for (let i = 0; i < parameters.length; i++) { const parameter = parameters[i]; const replacement = replacements[i]; - if(replacement === undefined) continue; + if (replacement === undefined) continue; value = value.replace('%' + parameter + '%', replacement); - if(value.startsWith('%{')) + if (value.startsWith('%{')) { const regex = new RegExp('%{' + parameter.toUpperCase() + '\\|([^|]*)\\|([^|]*)\\|([^|]*)}'); const result = value.match(regex); - if(!result) continue; + if (!result) continue; const replacementAsNumber = parseInt(replacement); let indexKey = -1; let replace = false; - switch(replacementAsNumber) + switch (replacementAsNumber) { case 0: indexKey = 1; @@ -262,11 +262,11 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca } - if((indexKey === -1) || (typeof result[indexKey] === 'undefined')) continue; + if ((indexKey === -1) || (typeof result[indexKey] === 'undefined')) continue; const valueFromResults = result[indexKey]; - if(valueFromResults) + if (valueFromResults) { value = valueFromResults.replace('%%', replacement); } @@ -284,11 +284,11 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca public registerParameter(key: string, parameter: string, value: string): void { - if(!key || (key.length === 0) || !parameter || (parameter.length === 0)) return; + if (!key || (key.length === 0) || !parameter || (parameter.length === 0)) return; let existing = this._parameters.get(key); - if(!existing) + if (!existing) { existing = new Map(); @@ -319,7 +319,7 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca const limit = this.getBadgePointLimit(key); - if(limit > -1) desc = desc.replace('%limit%', limit.toString()); + if (limit > -1) desc = desc.replace('%limit%', limit.toString()); desc = desc.replace('%roman%', this.getRomanNumeral(badge.level)); @@ -328,10 +328,10 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca private getExistingKey(keys: string[]): string { - for(const entry of keys) + for (const entry of keys) { const item = this.getValue(entry); - if(item != entry) return item; + if (item != entry) return item; } return ''; diff --git a/src/nitro/localization/index.ts b/src/nitro/localization/index.ts index e0f23f89..34e18ce3 100644 --- a/src/nitro/localization/index.ts +++ b/src/nitro/localization/index.ts @@ -1,3 +1,2 @@ export * from './BadgeBaseAndLevel'; -export * from './NitroLocalizationEvent'; export * from './NitroLocalizationManager'; diff --git a/src/nitro/room/RoomContentLoader.ts b/src/nitro/room/RoomContentLoader.ts index 3f96b111..8e840398 100644 --- a/src/nitro/room/RoomContentLoader.ts +++ b/src/nitro/room/RoomContentLoader.ts @@ -2,7 +2,8 @@ import { BaseTexture, Resource, Texture } from '@pixi/core'; import { Loader, LoaderResource } from '@pixi/loaders'; import { Spritesheet } from '@pixi/spritesheet'; import { FurnitureType, IAssetData, IEventDispatcher, IFurnitureData, IFurnitureDataListener, IGraphicAssetCollection, IGraphicAssetGifCollection, INitroLogger, IPetColorResult, IRoomContentListener, IRoomContentLoader, IRoomObject, ISessionDataManager, RoomObjectCategory, RoomObjectUserType, RoomObjectVariable, RoomObjectVisualizationType } from '../../api'; -import { GraphicAssetCollection, GraphicAssetGifCollection, NitroBundle, NitroEvent, NitroLogger } from '../../core'; +import { GraphicAssetCollection, GraphicAssetGifCollection, NitroBundle, NitroLogger } from '../../core'; +import { NitroEvent } from '../../events'; import { RoomContentLoadedEvent } from '../../room/events/RoomContentLoadedEvent'; import { Nitro } from '../Nitro'; import { PetColorResult } from './PetColorResult'; @@ -81,7 +82,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo this.setFurnitureData(); - for(const [index, name] of Nitro.instance.getConfiguration('pet.types').entries()) this._pets[name] = index; + for (const [index, name] of Nitro.instance.getConfiguration('pet.types').entries()) this._pets[name] = index; } public dispose(): void @@ -93,7 +94,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { this._sessionDataManager = sessionData; - if(this._waitingForSessionDataManager) + if (this._waitingForSessionDataManager) { this._waitingForSessionDataManager = false; @@ -108,7 +109,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo private setFurnitureData(): void { - if(!this._sessionDataManager) + if (!this._sessionDataManager) { this._waitingForSessionDataManager = true; @@ -117,7 +118,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo const furnitureData = this._sessionDataManager.getAllFurnitureData(this); - if(!furnitureData) return; + if (!furnitureData) return; this._sessionDataManager.removePendingFurniDataListener(this); @@ -128,42 +129,42 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo private processFurnitureData(furnitureData: IFurnitureData[]): void { - if(!furnitureData) return; + if (!furnitureData) return; - for(const furniture of furnitureData) + for (const furniture of furnitureData) { - if(!furniture) continue; + if (!furniture) continue; const id = furniture.id; let className = furniture.className; - if(furniture.hasIndexedColor) className = ((className + '*') + furniture.colorIndex); + if (furniture.hasIndexedColor) className = ((className + '*') + furniture.colorIndex); const revision = furniture.revision; const adUrl = furniture.adUrl; - if(adUrl && adUrl.length > 0) this._objectTypeAdUrls.set(className, adUrl); + if (adUrl && adUrl.length > 0) this._objectTypeAdUrls.set(className, adUrl); let name = furniture.className; - if(furniture.type === FurnitureType.FLOOR) + if (furniture.type === FurnitureType.FLOOR) { this._activeObjectTypes.set(id, className); this._activeObjectTypeIds.set(className, id); - if(!this._activeObjects[name]) this._activeObjects[name] = 1; + if (!this._activeObjects[name]) this._activeObjects[name] = 1; } - else if(furniture.type === FurnitureType.WALL) + else if (furniture.type === FurnitureType.WALL) { - if(name === 'post.it') + if (name === 'post.it') { className = 'post_it'; name = 'post_it'; } - if(name === 'post.it.vd') + if (name === 'post.it.vd') { className = 'post_it_vd'; name = 'post_id_vd'; @@ -172,12 +173,12 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo this._wallItemTypes.set(id, className); this._wallItemTypeIds.set(className, id); - if(!this._wallItems[name]) this._wallItems[name] = 1; + if (!this._wallItems[name]) this._wallItems[name] = 1; } const existingRevision = this._furniRevisions.get(name); - if(revision > existingRevision) + if (revision > existingRevision) { this._furniRevisions.delete(name); this._furniRevisions.set(name, revision); @@ -196,7 +197,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { let type = this._wallItemTypes.get(typeId); - if((type === 'poster') && (extra !== null)) type = (type + extra); + if ((type === 'poster') && (extra !== null)) type = (type + extra); return this.removeColorIndex(type); } @@ -205,7 +206,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { const type = this._activeObjectTypes.get(typeId); - if(!type) return -1; + if (!type) return -1; return this.getColorIndexFromName(type); } @@ -214,29 +215,29 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { const type = this._wallItemTypes.get(typeId); - if(!type) return -1; + if (!type) return -1; return this.getColorIndexFromName(type); } private getColorIndexFromName(name: string): number { - if(!name) return -1; + if (!name) return -1; const index = name.indexOf('*'); - if(index === -1) return 0; + if (index === -1) return 0; return parseInt(name.substr(index + 1)); } private removeColorIndex(name: string): string { - if(!name) return null; + if (!name) return null; const index = name.indexOf('*'); - if(index === -1) return name; + if (index === -1) return name; return name.substr(0, index); } @@ -245,7 +246,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { const value = this._objectTypeAdUrls.get(type); - if(!value) return ''; + if (!value) return ''; return value; } @@ -254,7 +255,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { const colorResults = this._petColors.get(petIndex); - if(!colorResults) return null; + if (!colorResults) return null; return colorResults.get(paletteIndex); } @@ -264,11 +265,11 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo const colorResults = this._petColors.get(petIndex); const results: IPetColorResult[] = []; - if(colorResults) + if (colorResults) { - for(const result of colorResults.values()) + for (const result of colorResults.values()) { - if(result.tag === tagName) results.push(result); + if (result.tag === tagName) results.push(result); } } @@ -277,15 +278,15 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo public getCollection(name: string): IGraphicAssetCollection { - if(!name) return null; + if (!name) return null; const existing = this._collections.get(name); - if(!existing) + if (!existing) { const globalCollection = Nitro.instance.core.asset.getCollection(name); - if(globalCollection) + if (globalCollection) { this._collections.set(name, globalCollection); @@ -300,18 +301,18 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo public getGifCollection(name: string): IGraphicAssetGifCollection { - if(!name) return null; + if (!name) return null; return this._gifCollections.get(name) || null; } public getImage(name: string): HTMLImageElement { - if(!name) return null; + if (!name) return null; const existing = this._images.get(name); - if(!existing) return null; + if (!existing) return null; const image = new Image(); @@ -324,14 +325,14 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { const collection = this.getCollection(collectionName); - if(!collection) return false; + if (!collection) return false; return collection.addAsset(assetName, texture, override, 0, 0, false, false); } public createGifCollection(collectionName: string, textures: Texture[], durations: number[]): GraphicAssetGifCollection { - if(!collectionName || !textures || !durations) return null; + if (!collectionName || !textures || !durations) return null; const collection = new GraphicAssetGifCollection(collectionName, textures, durations); @@ -342,7 +343,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo private createCollection(data: IAssetData, spritesheet: Spritesheet): GraphicAssetCollection { - if(!data || !spritesheet) return null; + if (!data || !spritesheet) return null; const collection = new GraphicAssetCollection(data, spritesheet); @@ -350,12 +351,12 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo const petIndex = this._pets[collection.name]; - if(petIndex !== undefined) + if (petIndex !== undefined) { const keys = collection.getPaletteNames(); const palettes: Map = new Map(); - for(const key of keys) + for (const key of keys) { const palette = collection.getPalette(key); const paletteData = data.palettes[key]; @@ -378,14 +379,14 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { const category = this.getCategoryForType(type); - switch(category) + switch (category) { case RoomObjectCategory.FLOOR: return RoomContentLoader.PLACE_HOLDER; case RoomObjectCategory.WALL: return RoomContentLoader.PLACE_HOLDER_WALL; default: - if(this._pets[type] !== undefined) return RoomContentLoader.PLACE_HOLDER_PET; + if (this._pets[type] !== undefined) return RoomContentLoader.PLACE_HOLDER_PET; return RoomContentLoader.PLACE_HOLDER_DEFAULT; } @@ -393,27 +394,27 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo public getCategoryForType(type: string): number { - if(!type) return RoomObjectCategory.MINIMUM; + if (!type) return RoomObjectCategory.MINIMUM; - if(this._activeObjects[type] !== undefined) return RoomObjectCategory.FLOOR; + if (this._activeObjects[type] !== undefined) return RoomObjectCategory.FLOOR; - if(this._wallItems[type] !== undefined) return RoomObjectCategory.WALL; + if (this._wallItems[type] !== undefined) return RoomObjectCategory.WALL; - if(this._pets[type] !== undefined) return RoomObjectCategory.UNIT; + if (this._pets[type] !== undefined) return RoomObjectCategory.UNIT; - if(type.indexOf('poster') === 0) return RoomObjectCategory.WALL; + if (type.indexOf('poster') === 0) return RoomObjectCategory.WALL; - if(type === 'room') return RoomObjectCategory.ROOM; + if (type === 'room') return RoomObjectCategory.ROOM; - if(type === RoomObjectUserType.USER) return RoomObjectCategory.UNIT; + if (type === RoomObjectUserType.USER) return RoomObjectCategory.UNIT; - if(type === RoomObjectUserType.PET) return RoomObjectCategory.UNIT; + if (type === RoomObjectUserType.PET) return RoomObjectCategory.UNIT; - if(type === RoomObjectUserType.BOT) return RoomObjectCategory.UNIT; + if (type === RoomObjectUserType.BOT) return RoomObjectCategory.UNIT; - if(type === RoomObjectUserType.RENTABLE_BOT) return RoomObjectCategory.UNIT; + if (type === RoomObjectUserType.RENTABLE_BOT) return RoomObjectCategory.UNIT; - if((type === RoomContentLoader.TILE_CURSOR) || (type === RoomContentLoader.SELECTION_ARROW)) return RoomObjectCategory.CURSOR; + if ((type === RoomContentLoader.TILE_CURSOR) || (type === RoomContentLoader.SELECTION_ARROW)) return RoomObjectCategory.CURSOR; return RoomObjectCategory.MINIMUM; } @@ -427,7 +428,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { type = RoomObjectUserType.getRealType(type); - if(type === RoomObjectVisualizationType.USER) return false; + if (type === RoomObjectVisualizationType.USER) return false; return true; } @@ -437,13 +438,13 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo let typeName: string = null; let assetUrls: string[] = []; - if(type && (type.indexOf(',') >= 0)) + if (type && (type.indexOf(',') >= 0)) { typeName = type; type = typeName.split(',')[0]; } - if(typeName) + if (typeName) { assetUrls = this.getAssetUrls(typeName, param, true); } @@ -452,7 +453,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo assetUrls = this.getAssetUrls(type, param, true); } - if(assetUrls && assetUrls.length) + if (assetUrls && assetUrls.length) { const url = assetUrls[0]; @@ -488,18 +489,18 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { const assetUrls: string[] = this.getAssetUrls(type); - if(!assetUrls || !assetUrls.length) return; + if (!assetUrls || !assetUrls.length) return; - if((this._pendingContentTypes.indexOf(type) >= 0) || this.getOrRemoveEventDispatcher(type)) return; + if ((this._pendingContentTypes.indexOf(type) >= 0) || this.getOrRemoveEventDispatcher(type)) return; this._pendingContentTypes.push(type); this._events.set(type, events); const loader = new Loader(); - for(const url of assetUrls) + for (const url of assetUrls) { - if(!url || !url.length) continue; + if (!url || !url.length) continue; loader .add({ @@ -514,7 +515,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo const onDownloaded = (status: boolean, url: string) => { - if(!status) + if (!status) { this._logger.error('Failed to download asset', url); @@ -527,13 +528,13 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo remaining--; - if(!remaining) + if (!remaining) { loader.destroy(); const events = this._events.get(type); - if(!events) return; + if (!events) return; events.dispatchEvent(new RoomContentLoadedEvent(RoomContentLoadedEvent.RCLE_SUCCESS, type)); @@ -543,11 +544,11 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo loader.load((loader, resources) => { - for(const key in resources) + for (const key in resources) { const resource = resources[key]; - if(!resource || resource.error || !resource.xhr) + if (!resource || resource.error || !resource.xhr) { onDownloaded(false, resource.url); @@ -556,7 +557,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo const resourceType = (resource.xhr.getResponseHeader('Content-Type') || 'application/octet-stream'); - if(resourceType === 'application/octet-stream') + if (resourceType === 'application/octet-stream') { const nitroBundle = new NitroBundle(resource.data); @@ -575,7 +576,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { const spritesheetData = data.spritesheet; - if(!baseTexture || !spritesheetData || !Object.keys(spritesheetData).length) + if (!baseTexture || !spritesheetData || !Object.keys(spritesheetData).length) { this.createCollection(data, null); @@ -596,7 +597,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo }); }; - if(baseTexture.valid) + if (baseTexture.valid) { createAsset(); } @@ -616,7 +617,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { const existing = this._objectAliases.get(name); - if(!existing) return name; + if (!existing) return name; return existing; } @@ -625,14 +626,14 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { const existing = this._objectOriginalNames.get(name); - if(!existing) return name; + if (!existing) return name; return existing; } public getAssetUrls(type: string, param: string = null, icon: boolean = false): string[] { - switch(type) + switch (type) { case RoomContentLoader.PLACE_HOLDER: return [this.getAssetUrlWithGenericBase(RoomContentLoader.PLACE_HOLDER)]; @@ -649,13 +650,13 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo default: { const category = this.getCategoryForType(type); - if((category === RoomObjectCategory.FLOOR) || (category === RoomObjectCategory.WALL)) + if ((category === RoomObjectCategory.FLOOR) || (category === RoomObjectCategory.WALL)) { const name = this.getAssetAliasName(type); let assetUrl = (icon ? this.getAssetUrlWithFurniIconBase(name) : this.getAssetUrlWithFurniBase(type)); - if(icon) + if (icon) { const active = (param && (param !== '') && (this._activeObjectTypeIds.has((name + '*' + param)))); @@ -665,7 +666,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo return [assetUrl]; } - if(category === RoomObjectCategory.UNIT) + if (category === RoomObjectCategory.UNIT) { return [this.getAssetUrlWithPetBase(type)]; } @@ -680,14 +681,14 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo let assetName: string = null; let assetUrls: string[] = []; - if(type && (type.indexOf(',') >= 0)) + if (type && (type.indexOf(',') >= 0)) { assetName = type; type = assetName.split(',')[0]; } - if(assetName) + if (assetName) { assetUrls = this.getAssetUrls(assetName, colorIndex, true); } @@ -696,7 +697,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo assetUrls = this.getAssetUrls(type, colorIndex, true); } - if(assetUrls && assetUrls.length) return assetUrls[0]; + if (assetUrls && assetUrls.length) return assetUrls[0]; return null; } @@ -725,7 +726,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { const model = object && object.model; - if(!model) return; + if (!model) return; model.setValue(RoomObjectVariable.OBJECT_ROOM_ID, roomId); } @@ -734,7 +735,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { const existing = this._events.get(type); - if(remove) this._events.delete(type); + if (remove) this._events.delete(type); return existing; } diff --git a/src/nitro/room/RoomEngine.ts b/src/nitro/room/RoomEngine.ts index 58697a59..bb5f1025 100644 --- a/src/nitro/room/RoomEngine.ts +++ b/src/nitro/room/RoomEngine.ts @@ -1,18 +1,16 @@ import { RenderTexture, Resource, Texture } from '@pixi/core'; import { Container, DisplayObject } from '@pixi/display'; import { Matrix, Point, Rectangle } from '@pixi/math'; -import { IConnection, IDisposable, IFurnitureStackingHeightMap, IGetImageListener, IImageResult, ILegacyWallGeometry, IMessageComposer, INitroCommunicationManager, IObjectData, IPetColorResult, IPetCustomPart, IRoomContentListener, IRoomContentLoader, IRoomCreator, IRoomEngine, IRoomEngineServices, IRoomGeometry, IRoomInstance, IRoomManager, IRoomManagerListener, IRoomObject, IRoomObjectController, IRoomObjectLogicFactory, IRoomObjectVisualizationFactory, IRoomRenderer, IRoomRendererFactory, IRoomRenderingCanvas, IRoomSessionManager, ISelectedRoomObjectData, ISessionDataManager, ITileObjectMap, IUpdateReceiver, IVector3D, LegacyDataType, ObjectDataFactory, RoomControllerLevel, RoomObjectCategory, RoomObjectUserType, RoomObjectVariable, ToolbarIconEnum, Vector3d } from '../../api'; -import { NitroEvent, NitroManager } from '../../core'; +import { IConnection, IDisposable, IFurnitureStackingHeightMap, IGetImageListener, IImageResult, ILegacyWallGeometry, IMessageComposer, INitroCommunicationManager, INitroEvent, IObjectData, IPetColorResult, IPetCustomPart, IRoomContentListener, IRoomContentLoader, IRoomCreator, IRoomEngine, IRoomEngineServices, IRoomGeometry, IRoomInstance, IRoomManager, IRoomManagerListener, IRoomObject, IRoomObjectController, IRoomObjectLogicFactory, IRoomObjectVisualizationFactory, IRoomRenderer, IRoomRendererFactory, IRoomRenderingCanvas, IRoomSessionManager, ISelectedRoomObjectData, ISessionDataManager, ITileObjectMap, IUpdateReceiver, IVector3D, LegacyDataType, ObjectDataFactory, RoomControllerLevel, RoomObjectCategory, RoomObjectUserType, RoomObjectVariable, ToolbarIconEnum, Vector3d } from '../../api'; +import { NitroManager } from '../../core'; +import { BadgeImageReadyEvent, NitroToolbarAnimateIconEvent, RoomBackgroundColorEvent, RoomDragEvent, RoomEngineEvent, RoomEngineObjectEvent, RoomObjectFurnitureActionEvent, RoomSessionEvent, RoomToObjectOwnAvatarMoveEvent } from '../../events'; import { GetTickerTime, NitroSprite, TextureUtils } from '../../pixi-proxy'; import { NumberBank, RoomEnterEffect, RoomGeometry, RoomInstance, RoomObjectEvent, RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomRendererFactory } from '../../room'; import { PetFigureData } from '../avatar'; import { RenderRoomMessageComposer, RenderRoomThumbnailMessageComposer } from '../communication'; -import { NitroToolbarAnimateIconEvent } from '../events'; import { Nitro } from '../Nitro'; -import { BadgeImageReadyEvent, RoomSessionEvent } from '../session'; import { MouseEventType } from '../ui'; import { FurniId } from '../utils'; -import { RoomBackgroundColorEvent, RoomDragEvent, RoomEngineEvent, RoomEngineObjectEvent, RoomObjectFurnitureActionEvent, RoomToObjectOwnAvatarMoveEvent } from './events'; import { ImageResult } from './ImageResult'; import { ObjectAvatarCarryObjectUpdateMessage, ObjectAvatarChatUpdateMessage, ObjectAvatarDanceUpdateMessage, ObjectAvatarEffectUpdateMessage, ObjectAvatarExperienceUpdateMessage, ObjectAvatarExpressionUpdateMessage, ObjectAvatarFigureUpdateMessage, ObjectAvatarFlatControlUpdateMessage, ObjectAvatarGestureUpdateMessage, ObjectAvatarGuideStatusUpdateMessage, ObjectAvatarMutedUpdateMessage, ObjectAvatarOwnMessage, ObjectAvatarPetGestureUpdateMessage, ObjectAvatarPlayerValueUpdateMessage, ObjectAvatarPlayingGameUpdateMessage, ObjectAvatarPostureUpdateMessage, ObjectAvatarSignUpdateMessage, ObjectAvatarSleepUpdateMessage, ObjectAvatarTypingUpdateMessage, ObjectAvatarUpdateMessage, ObjectAvatarUseObjectUpdateMessage, ObjectDataUpdateMessage, ObjectGroupBadgeUpdateMessage, ObjectHeightUpdateMessage, ObjectItemDataUpdateMessage, ObjectModelDataUpdateMessage, ObjectMoveUpdateMessage, ObjectRoomColorUpdateMessage, ObjectRoomFloorHoleUpdateMessage, ObjectRoomMaskUpdateMessage, ObjectRoomPlanePropertyUpdateMessage, ObjectRoomPlaneVisibilityUpdateMessage, ObjectRoomUpdateMessage, ObjectStateUpdateMessage } from './messages'; import { RoomLogic, RoomMapData, RoomObjectVisualizationFactory } from './object'; @@ -208,7 +206,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } } - private onRoomContentLoaderReadyEvent(event: NitroEvent): void + private onRoomContentLoaderReadyEvent(event: INitroEvent): void { this._roomContentLoaderReady = true; diff --git a/src/nitro/room/RoomObjectEventHandler.ts b/src/nitro/room/RoomObjectEventHandler.ts index bcf67740..0eeaecf6 100644 --- a/src/nitro/room/RoomObjectEventHandler.ts +++ b/src/nitro/room/RoomObjectEventHandler.ts @@ -1,10 +1,10 @@ import { IFurnitureStackingHeightMap, ILegacyWallGeometry, IObjectData, IRoomCanvasMouseListener, IRoomEngineServices, IRoomGeometry, IRoomObject, IRoomObjectController, IRoomObjectEventManager, ISelectedRoomObjectData, IVector3D, RoomObjectCategory, RoomObjectOperationType, RoomObjectPlacementSource, RoomObjectType, RoomObjectUserType, RoomObjectVariable, Vector3d } from '../../api'; import { Disposable, NitroLogger } from '../../core'; +import { RoomEngineDimmerStateEvent, RoomEngineObjectEvent, RoomEngineObjectPlacedEvent, RoomEngineObjectPlacedOnUserEvent, RoomEngineObjectPlaySoundEvent, RoomEngineRoomAdEvent, RoomEngineSamplePlaybackEvent, RoomEngineTriggerWidgetEvent, RoomEngineUseProductEvent, RoomObjectBadgeAssetEvent, RoomObjectDataRequestEvent, RoomObjectDimmerStateUpdateEvent, RoomObjectFloorHoleEvent, RoomObjectFurnitureActionEvent, RoomObjectHSLColorEnabledEvent, RoomObjectHSLColorEnableEvent, RoomObjectMoveEvent, RoomObjectPlaySoundIdEvent, RoomObjectRoomAdEvent, RoomObjectSamplePlaybackEvent, RoomObjectSoundMachineEvent, RoomObjectStateChangedEvent, RoomObjectTileMouseEvent, RoomObjectWallMouseEvent, RoomObjectWidgetRequestEvent } from '../../events'; import { RoomEnterEffect, RoomId, RoomObjectEvent, RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../room'; import { BotPlaceComposer, FurnitureColorWheelComposer, FurnitureDiceActivateComposer, FurnitureDiceDeactivateComposer, FurnitureFloorUpdateComposer, FurnitureGroupInfoComposer, FurnitureMultiStateComposer, FurnitureOneWayDoorComposer, FurniturePickupComposer, FurniturePlaceComposer, FurniturePostItPlaceComposer, FurnitureRandomStateComposer, FurnitureWallMultiStateComposer, FurnitureWallUpdateComposer, GetItemDataComposer, GetResolutionAchievementsMessageComposer, PetMoveComposer, PetPlaceComposer, RemoveWallItemComposer, RoomUnitLookComposer, RoomUnitWalkComposer, SetItemDataMessageComposer, SetObjectDataMessageComposer } from '../communication'; import { Nitro } from '../Nitro'; import { MouseEventType } from '../ui'; -import { RoomEngineDimmerStateEvent, RoomEngineObjectEvent, RoomEngineObjectPlacedEvent, RoomEngineObjectPlacedOnUserEvent, RoomEngineObjectPlaySoundEvent, RoomEngineRoomAdEvent, RoomEngineSamplePlaybackEvent, RoomEngineTriggerWidgetEvent, RoomEngineUseProductEvent, RoomObjectBadgeAssetEvent, RoomObjectDataRequestEvent, RoomObjectDimmerStateUpdateEvent, RoomObjectFloorHoleEvent, RoomObjectFurnitureActionEvent, RoomObjectHSLColorEnabledEvent, RoomObjectHSLColorEnableEvent, RoomObjectMoveEvent, RoomObjectPlaySoundIdEvent, RoomObjectRoomAdEvent, RoomObjectSamplePlaybackEvent, RoomObjectSoundMachineEvent, RoomObjectStateChangedEvent, RoomObjectTileMouseEvent, RoomObjectWallMouseEvent, RoomObjectWidgetRequestEvent } from './events'; import { ObjectAvatarSelectedMessage, ObjectDataUpdateMessage, ObjectSelectedMessage, ObjectTileCursorUpdateMessage, ObjectVisibilityUpdateMessage } from './messages'; import { SelectedRoomObjectData } from './utils'; @@ -41,7 +41,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou public dispose(): void { - if(this._eventIds) + if (this._eventIds) { this._eventIds = null; } @@ -55,19 +55,19 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou { let selectedData = this.getSelectedRoomObjectData(event.roomId); - if(!selectedData) return; + if (!selectedData) return; - if((selectedData.operation === RoomObjectOperationType.OBJECT_PLACE) && (selectedData.id === event.objectId)) + if ((selectedData.operation === RoomObjectOperationType.OBJECT_PLACE) && (selectedData.id === event.objectId)) { const roomObject = this._roomEngine.getRoomObject(event.roomId, selectedData.id, selectedData.category); - if(roomObject && roomObject.model) + if (roomObject && roomObject.model) { - if(selectedData.category === RoomObjectCategory.FLOOR) + if (selectedData.category === RoomObjectCategory.FLOOR) { const allowedDirections = roomObject.model.getValue(RoomObjectVariable.FURNITURE_ALLOWED_DIRECTIONS); - if(allowedDirections && allowedDirections.length) + if (allowedDirections && allowedDirections.length) { const direction = new Vector3d(allowedDirections[0]); @@ -77,7 +77,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou selectedData = this.getSelectedRoomObjectData(event.roomId); - if(!selectedData) return; + if (!selectedData) return; } } } @@ -88,31 +88,31 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou public processRoomCanvasMouseEvent(event: RoomSpriteMouseEvent, object: IRoomObject, geometry: IRoomGeometry): void { - if(!event || !object) return; + if (!event || !object) return; - if(RoomEnterEffect.isRunning()) return; + if (RoomEnterEffect.isRunning()) return; const type = object.type; let category = this._roomEngine.getRoomObjectCategoryForType(type); - if((category !== RoomObjectCategory.ROOM) && (!this._roomEngine.isPlayingGame() || category !== RoomObjectCategory.UNIT)) category = RoomObjectCategory.MINIMUM; + if ((category !== RoomObjectCategory.ROOM) && (!this._roomEngine.isPlayingGame() || category !== RoomObjectCategory.UNIT)) category = RoomObjectCategory.MINIMUM; const _local_7 = this.getMouseEventId(category, event.type); - if(_local_7 === event.eventId) + if (_local_7 === event.eventId) { - if((event.type === MouseEventType.MOUSE_CLICK) || (event.type === MouseEventType.DOUBLE_CLICK) || (event.type === MouseEventType.MOUSE_DOWN) || (event.type === MouseEventType.MOUSE_UP) || (event.type === MouseEventType.MOUSE_MOVE)) return; + if ((event.type === MouseEventType.MOUSE_CLICK) || (event.type === MouseEventType.DOUBLE_CLICK) || (event.type === MouseEventType.MOUSE_DOWN) || (event.type === MouseEventType.MOUSE_UP) || (event.type === MouseEventType.MOUSE_MOVE)) return; } else { - if(event.eventId) + if (event.eventId) { this.setMouseEventId(category, event.type, event.eventId); } } - if(object.mouseHandler) object.mouseHandler.mouseEvent(event, geometry); + if (object.mouseHandler) object.mouseHandler.mouseEvent(event, geometry); } public processRoomObjectPlacement(placementSource: string, roomId: number, id: number, category: number, typeId: number, extra: string = null, stuffData: IObjectData = null, state: number = -1, frameNumber: number = -1, posture: string = null): boolean @@ -124,7 +124,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou this.setSelectedRoomObjectData(roomId, id, category, location, direction, RoomObjectOperationType.OBJECT_PLACE, typeId, extra, stuffData, state, frameNumber, posture); - if(this._roomEngine) + if (this._roomEngine) { this._roomEngine.setObjectMoverIconSprite(typeId, category, false, extra, stuffData, state, frameNumber, posture); this._roomEngine.setObjectMoverIconSpriteVisible(false); @@ -144,7 +144,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou { const existing = this._eventIds.get(k); - if(!existing) return null; + if (!existing) return null; return (existing.get(_arg_2) || null); } @@ -153,7 +153,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou { let existing = this._eventIds.get(k); - if(!existing) + if (!existing) { existing = new Map(); @@ -167,16 +167,16 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou public handleRoomObjectEvent(event: RoomObjectEvent, roomId: number): void { - if(!event) return; + if (!event) return; - if(event instanceof RoomObjectMouseEvent) + if (event instanceof RoomObjectMouseEvent) { this.handleRoomObjectMouseEvent(event, roomId); return; } - switch(event.type) + switch (event.type) { case RoomObjectStateChangedEvent.STATE_CHANGE: case RoomObjectStateChangedEvent.STATE_RANDOM: @@ -290,9 +290,9 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private handleRoomObjectMouseEvent(event: RoomObjectMouseEvent, roomId: number): void { - if(!event || !event.type) return; + if (!event || !event.type) return; - switch(event.type) + switch (event.type) { case RoomObjectMouseEvent.CLICK: this.handleRoomObjectMouseClickEvent(event, roomId); @@ -317,20 +317,20 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private handleRoomObjectMouseClickEvent(event: RoomObjectMouseEvent, roomId: number): void { - if(!event) return; + if (!event) return; let operation = RoomObjectOperationType.OBJECT_UNDEFINED; const selectedData = this.getSelectedRoomObjectData(roomId); - if(selectedData) operation = selectedData.operation; + if (selectedData) operation = selectedData.operation; let didWalk = false; let didMove = false; - if(this._whereYouClickIsWhereYouGo) + if (this._whereYouClickIsWhereYouGo) { - if(!operation || (operation === RoomObjectOperationType.OBJECT_UNDEFINED)) + if (!operation || (operation === RoomObjectOperationType.OBJECT_UNDEFINED)) { didWalk = this.handleMoveTargetFurni(roomId, event); } @@ -338,50 +338,50 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou const category = this._roomEngine.getRoomObjectCategoryForType(event.objectType); - switch(operation) + switch (operation) { case RoomObjectOperationType.OBJECT_MOVE: - if(category === RoomObjectCategory.ROOM) + if (category === RoomObjectCategory.ROOM) { - if(selectedData) + if (selectedData) { this.modifyRoomObject(roomId, selectedData.id, selectedData.category, RoomObjectOperationType.OBJECT_MOVE_TO); } } - else if(category === RoomObjectCategory.UNIT) + else if (category === RoomObjectCategory.UNIT) { - if(selectedData && (event.objectType === RoomObjectUserType.MONSTER_PLANT)) + if (selectedData && (event.objectType === RoomObjectUserType.MONSTER_PLANT)) { this.modifyRoomObject(roomId, selectedData.id, selectedData.category, RoomObjectOperationType.OBJECT_MOVE_TO); } - if(event.eventId) this.setMouseEventId(RoomObjectCategory.ROOM, MouseEventType.MOUSE_CLICK, event.eventId); + if (event.eventId) this.setMouseEventId(RoomObjectCategory.ROOM, MouseEventType.MOUSE_CLICK, event.eventId); this.placeObjectOnUser(roomId, event.objectId, category); } didMove = true; - if(event.objectId !== -1) this.setSelectedObject(roomId, event.objectId, category); + if (event.objectId !== -1) this.setSelectedObject(roomId, event.objectId, category); break; case RoomObjectOperationType.OBJECT_PLACE: - if(category === RoomObjectCategory.ROOM) + if (category === RoomObjectCategory.ROOM) { this.placeObject(roomId, (event instanceof RoomObjectTileMouseEvent), (event instanceof RoomObjectWallMouseEvent)); } - else if(category === RoomObjectCategory.UNIT) + else if (category === RoomObjectCategory.UNIT) { - switch(event.objectType) + switch (event.objectType) { case RoomObjectUserType.MONSTER_PLANT: case RoomObjectUserType.RENTABLE_BOT: this.placeObject(roomId, (event instanceof RoomObjectTileMouseEvent), (event instanceof RoomObjectWallMouseEvent)); break; default: - if(event.eventId) + if (event.eventId) { this.setMouseEventId(RoomObjectCategory.ROOM, MouseEventType.MOUSE_CLICK, event.eventId); } @@ -392,9 +392,9 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou } break; case RoomObjectOperationType.OBJECT_UNDEFINED: - if(category === RoomObjectCategory.ROOM) + if (category === RoomObjectCategory.ROOM) { - if(!didWalk && (event instanceof RoomObjectTileMouseEvent)) this.onRoomObjectTileMouseEvent(roomId, event); + if (!didWalk && (event instanceof RoomObjectTileMouseEvent)) this.onRoomObjectTileMouseEvent(roomId, event); } else { @@ -402,24 +402,24 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou didMove = false; - if(category === RoomObjectCategory.UNIT) + if (category === RoomObjectCategory.UNIT) { - if(event.ctrlKey && !event.altKey && !event.shiftKey && (event.objectType === RoomObjectUserType.RENTABLE_BOT)) + if (event.ctrlKey && !event.altKey && !event.shiftKey && (event.objectType === RoomObjectUserType.RENTABLE_BOT)) { this.modifyRoomObject(roomId, event.objectId, category, RoomObjectOperationType.OBJECT_PICKUP_BOT); } - else if(event.ctrlKey && !event.altKey && !event.shiftKey && (event.objectType === RoomObjectUserType.MONSTER_PLANT)) + else if (event.ctrlKey && !event.altKey && !event.shiftKey && (event.objectType === RoomObjectUserType.MONSTER_PLANT)) { this.modifyRoomObject(roomId, event.objectId, category, RoomObjectOperationType.OBJECT_PICKUP_PET); } - else if(!event.ctrlKey && !event.altKey && event.shiftKey && (event.objectType === RoomObjectUserType.MONSTER_PLANT)) + else if (!event.ctrlKey && !event.altKey && event.shiftKey && (event.objectType === RoomObjectUserType.MONSTER_PLANT)) { this.modifyRoomObject(roomId, event.objectId, category, RoomObjectOperationType.OBJECT_ROTATE_POSITIVE); } - if(!this._roomEngine.isPlayingGame()) + if (!this._roomEngine.isPlayingGame()) { didWalk = true; } @@ -429,27 +429,27 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou } } - else if((category === RoomObjectCategory.FLOOR) || (category === RoomObjectCategory.WALL)) + else if ((category === RoomObjectCategory.FLOOR) || (category === RoomObjectCategory.WALL)) { - if(event.altKey || event.ctrlKey || event.shiftKey) + if (event.altKey || event.ctrlKey || event.shiftKey) { - if(!event.ctrlKey && !event.altKey && event.shiftKey) + if (!event.ctrlKey && !event.altKey && event.shiftKey) { - if(category === RoomObjectCategory.FLOOR) + if (category === RoomObjectCategory.FLOOR) { - if(this._roomEngine.events) + if (this._roomEngine.events) { this._roomEngine.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.REQUEST_ROTATE, roomId, event.objectId, category)); } } } - else if(event.ctrlKey && !event.altKey && !event.shiftKey) + else if (event.ctrlKey && !event.altKey && !event.shiftKey) { this.modifyRoomObject(roomId, event.objectId, category, RoomObjectOperationType.OBJECT_PICKUP); } - if(!this._roomEngine.isPlayingGame()) + if (!this._roomEngine.isPlayingGame()) { didWalk = true; } @@ -460,14 +460,14 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou } } - if(event.eventId) + if (event.eventId) { - if(didWalk) + if (didWalk) { this.setMouseEventId(RoomObjectCategory.ROOM, MouseEventType.MOUSE_CLICK, event.eventId); } - if(didMove) + if (didMove) { this.setMouseEventId(RoomObjectCategory.MINIMUM, MouseEventType.MOUSE_CLICK, event.eventId); } @@ -476,16 +476,16 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou break; } - if(category === RoomObjectCategory.ROOM) + if (category === RoomObjectCategory.ROOM) { const _local_15 = this.getMouseEventId(RoomObjectCategory.MINIMUM, MouseEventType.MOUSE_CLICK); const _local_16 = this.getMouseEventId(RoomObjectCategory.UNIT, MouseEventType.MOUSE_CLICK); - if((_local_15 !== event.eventId) && (_local_16 !== event.eventId) && !didMove) + if ((_local_15 !== event.eventId) && (_local_16 !== event.eventId) && !didMove) { this.deselectObject(roomId); - if(this._roomEngine.events) this._roomEngine.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.DESELECTED, roomId, -1, RoomObjectCategory.MINIMUM)); + if (this._roomEngine.events) this._roomEngine.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.DESELECTED, roomId, -1, RoomObjectCategory.MINIMUM)); this.setSelectedAvatar(roomId, 0, false); } @@ -494,32 +494,32 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private handleRoomObjectMouseMoveEvent(event: RoomObjectMouseEvent, roomId: number): void { - if(!event) return; + if (!event) return; let operation = RoomObjectOperationType.OBJECT_UNDEFINED; const selectedData = this.getSelectedRoomObjectData(roomId); - if(selectedData) operation = selectedData.operation; + if (selectedData) operation = selectedData.operation; const category = this._roomEngine.getRoomObjectCategoryForType(event.objectType); - if(this._roomEngine) + if (this._roomEngine) { const roomCursor = this._roomEngine.getRoomObjectCursor(roomId); - if(roomCursor && roomCursor.logic) + if (roomCursor && roomCursor.logic) { let newEvent: ObjectTileCursorUpdateMessage = null; - if(event instanceof RoomObjectTileMouseEvent) + if (event instanceof RoomObjectTileMouseEvent) { newEvent = this.handleMouseOverTile(event, roomId); } - else if(event.object && (event.object.id !== -1)) + else if (event.object && (event.object.id !== -1)) { - if(this._whereYouClickIsWhereYouGo) + if (this._whereYouClickIsWhereYouGo) { newEvent = this.handleMouseOverObject(category, roomId, event); } @@ -534,14 +534,14 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou } } - switch(operation) + switch (operation) { case RoomObjectOperationType.OBJECT_MOVE: - if(category === RoomObjectCategory.ROOM) this.handleObjectMove(event, roomId); + if (category === RoomObjectCategory.ROOM) this.handleObjectMove(event, roomId); return; case RoomObjectOperationType.OBJECT_PLACE: - if(category === RoomObjectCategory.ROOM) this.handleObjectPlace(event, roomId); + if (category === RoomObjectCategory.ROOM) this.handleObjectPlace(event, roomId); return; } @@ -549,24 +549,24 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private handleRoomObjectMouseDownEvent(event: RoomObjectMouseEvent, roomId: number): void { - if(!event) return; + if (!event) return; let operation = RoomObjectOperationType.OBJECT_UNDEFINED; const selectedData = this.getSelectedRoomObjectData(roomId); - if(selectedData) operation = selectedData.operation; + if (selectedData) operation = selectedData.operation; const category = this._roomEngine.getRoomObjectCategoryForType(event.objectType); - switch(operation) + switch (operation) { case RoomObjectOperationType.OBJECT_UNDEFINED: - if((category === RoomObjectCategory.FLOOR) || (category === RoomObjectCategory.WALL) || (event.objectType === RoomObjectUserType.MONSTER_PLANT)) + if ((category === RoomObjectCategory.FLOOR) || (category === RoomObjectCategory.WALL) || (event.objectType === RoomObjectUserType.MONSTER_PLANT)) { - if((event.altKey && !event.ctrlKey && !event.shiftKey) || this.decorateModeMove(event)) + if ((event.altKey && !event.ctrlKey && !event.shiftKey) || this.decorateModeMove(event)) { - if(this._roomEngine.events) this._roomEngine.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.REQUEST_MOVE, roomId, event.objectId, category)); + if (this._roomEngine.events) this._roomEngine.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.REQUEST_MOVE, roomId, event.objectId, category)); } } return; @@ -575,24 +575,24 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private handleRoomObjectMouseDownLongEvent(event: RoomObjectMouseEvent, roomId: number): void { - if(!event) return; + if (!event) return; let operation = RoomObjectOperationType.OBJECT_UNDEFINED; const selectedData = this.getSelectedRoomObjectData(roomId); - if(selectedData) operation = selectedData.operation; + if (selectedData) operation = selectedData.operation; const category = this._roomEngine.getRoomObjectCategoryForType(event.objectType); - switch(operation) + switch (operation) { case RoomObjectOperationType.OBJECT_UNDEFINED: - if((category === RoomObjectCategory.FLOOR) || (category === RoomObjectCategory.WALL) || (event.objectType === RoomObjectUserType.MONSTER_PLANT)) + if ((category === RoomObjectCategory.FLOOR) || (category === RoomObjectCategory.WALL) || (event.objectType === RoomObjectUserType.MONSTER_PLANT)) { - if((!event.ctrlKey && !event.shiftKey) || this.decorateModeMove(event)) + if ((!event.ctrlKey && !event.shiftKey) || this.decorateModeMove(event)) { - if(this._roomEngine.events) this._roomEngine.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.REQUEST_MANIPULATION, roomId, event.objectId, category)); + if (this._roomEngine.events) this._roomEngine.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.REQUEST_MANIPULATION, roomId, event.objectId, category)); } } return; @@ -605,7 +605,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou const type = event.objectType; const category = this._roomEngine.getRoomObjectCategoryForType(type); - if(this._roomEngine.events) + if (this._roomEngine.events) { this._roomEngine.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.MOUSE_ENTER, roomId, id, category)); } @@ -617,17 +617,17 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou const type = event.objectType; const category = this._roomEngine.getRoomObjectCategoryForType(type); - if(category !== RoomObjectCategory.ROOM) + if (category !== RoomObjectCategory.ROOM) { - if(category === RoomObjectCategory.UNIT) + if (category === RoomObjectCategory.UNIT) { const cursor = this._roomEngine.getRoomObjectCursor(roomId); - if(cursor) cursor.processUpdateMessage(new ObjectDataUpdateMessage(0, null)); + if (cursor) cursor.processUpdateMessage(new ObjectDataUpdateMessage(0, null)); } } - if(this._roomEngine.events) + if (this._roomEngine.events) { this._roomEngine.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.MOUSE_LEAVE, roomId, id, category)); } @@ -637,9 +637,9 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private onRoomObjectStateChangedEvent(event: RoomObjectStateChangedEvent, roomId: number): void { - if(!event) return; + if (!event) return; - switch(event.type) + switch (event.type) { case RoomObjectStateChangedEvent.STATE_CHANGE: this.changeObjectState(roomId, event.object.id, event.object.type, event.state, false); @@ -652,9 +652,9 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private onRoomObjectDimmerStateUpdateEvent(event: RoomObjectDimmerStateUpdateEvent, roomId: number): void { - if(!event) return; + if (!event) return; - switch(event.type) + switch (event.type) { case RoomObjectDimmerStateUpdateEvent.DIMMER_STATE: this._roomEngine.events.dispatchEvent(new RoomEngineDimmerStateEvent(roomId, event.state, event.presetId, event.effectId, event.color, event.brightness)); @@ -664,9 +664,9 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private handleSelectedObjectRemove(event: RoomObjectMoveEvent, roomId: number): void { - if(!event || !this._roomEngine) return; + if (!event || !this._roomEngine) return; - switch(event.type) + switch (event.type) { case RoomObjectMoveEvent.POSITION_CHANGED: { const objectId = event.objectId; @@ -675,7 +675,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou const object = this._roomEngine.getRoomObject(roomId, objectId, objectCategory); const selectionArrow = this._roomEngine.getRoomObjectSelectionArrow(roomId); - if(object && selectionArrow && selectionArrow.logic) + if (object && selectionArrow && selectionArrow.logic) { const location = object.getLocation(); @@ -691,18 +691,18 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private onRoomObjectWidgetRequestEvent(event: RoomObjectWidgetRequestEvent, roomId: number): void { - if(!event || !this._roomEngine) return; + if (!event || !this._roomEngine) return; const objectId = event.objectId; const objectType = event.objectType; const objectCategory = this._roomEngine.getRoomObjectCategoryForType(objectType); const eventDispatcher = this._roomEngine.events; - if(!eventDispatcher) return; + if (!eventDispatcher) return; - if(RoomId.isRoomPreviewerId(roomId)) return; + if (RoomId.isRoomPreviewerId(roomId)) return; - switch(event.type) + switch (event.type) { case RoomObjectWidgetRequestEvent.OPEN_WIDGET: eventDispatcher.dispatchEvent(new RoomEngineTriggerWidgetEvent(RoomEngineTriggerWidgetEvent.OPEN_WIDGET, roomId, objectId, objectCategory, ((event.object as IRoomObjectController).logic.widget))); @@ -820,27 +820,27 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private onRoomObjectFurnitureActionEvent(event: RoomObjectFurnitureActionEvent, roomId: number): void { - if(!event) return; + if (!event) return; this.useObject(roomId, event.object.id, event.object.type, event.type); } private handleObjectSoundMachineEvent(event: RoomObjectEvent, roomId: number): void { - if(!event) return; + if (!event) return; const objectCategory = this._roomEngine.getRoomObjectCategoryForType(event.objectType); const selectedData = this.getSelectedRoomObjectData(roomId); - if(selectedData) + if (selectedData) { - if((selectedData.category === objectCategory) && (selectedData.id === event.objectId)) + if ((selectedData.category === objectCategory) && (selectedData.id === event.objectId)) { - if(selectedData.operation === RoomObjectOperationType.OBJECT_PLACE) return; + if (selectedData.operation === RoomObjectOperationType.OBJECT_PLACE) return; } } - switch(event.type) + switch (event.type) { case RoomObjectFurnitureActionEvent.SOUND_MACHINE_INIT: this._roomEngine.events.dispatchEvent(new RoomObjectSoundMachineEvent(RoomObjectSoundMachineEvent.SOUND_MACHINE_INIT, roomId, event.objectId, objectCategory)); @@ -859,20 +859,20 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private handleObjectJukeboxEvent(event: RoomObjectEvent, roomId: number): void { - if(!event) return; + if (!event) return; const objectCategory = this._roomEngine.getRoomObjectCategoryForType(event.objectType); const selectedData = this.getSelectedRoomObjectData(roomId); - if(selectedData) + if (selectedData) { - if((selectedData.category === objectCategory) && (selectedData.id === event.objectId)) + if ((selectedData.category === objectCategory) && (selectedData.id === event.objectId)) { - if(selectedData.operation === RoomObjectOperationType.OBJECT_PLACE) return; + if (selectedData.operation === RoomObjectOperationType.OBJECT_PLACE) return; } } - switch(event.type) + switch (event.type) { case RoomObjectFurnitureActionEvent.JUKEBOX_INIT: this._roomEngine.events.dispatchEvent(new RoomObjectSoundMachineEvent(RoomObjectSoundMachineEvent.JUKEBOX_INIT, roomId, event.objectId, objectCategory)); @@ -891,9 +891,9 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private onRoomObjectFloorHoleEvent(event: RoomObjectFloorHoleEvent, roomId: number): void { - if(!event) return; + if (!event) return; - switch(event.type) + switch (event.type) { case RoomObjectFloorHoleEvent.ADD_HOLE: this._roomEngine.addRoomInstanceFloorHole(roomId, event.objectId); @@ -906,16 +906,16 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private onRoomObjectRoomAdEvent(event: RoomObjectRoomAdEvent, roomId: number): void { - if(!event) return; + if (!event) return; let eventType: string = null; - switch(event.type) + switch (event.type) { case RoomObjectRoomAdEvent.ROOM_AD_FURNI_CLICK: this._roomEngine.events.dispatchEvent(event); - if(event.clickUrl && (event.clickUrl.length > 0)) + if (event.clickUrl && (event.clickUrl.length > 0)) { Nitro.instance.createLinkEvent(event.clickUrl); } @@ -923,11 +923,11 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou eventType = RoomEngineRoomAdEvent.FURNI_CLICK; break; case RoomObjectRoomAdEvent.ROOM_AD_FURNI_DOUBLE_CLICK: - if(event.clickUrl && (event.clickUrl.length > 0)) + if (event.clickUrl && (event.clickUrl.length > 0)) { const catalogPage = 'CATALOG_PAGE'; - if(event.clickUrl.indexOf(catalogPage) === 0) + if (event.clickUrl.indexOf(catalogPage) === 0) { Nitro.instance.createLinkEvent(event.clickUrl.substr(catalogPage.length)); } @@ -943,14 +943,14 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou break; } - if(eventType) this._roomEngine.events.dispatchEvent(new RoomEngineObjectEvent(eventType, roomId, event.objectId, this._roomEngine.getRoomObjectCategoryForType(event.objectType))); + if (eventType) this._roomEngine.events.dispatchEvent(new RoomEngineObjectEvent(eventType, roomId, event.objectId, this._roomEngine.getRoomObjectCategoryForType(event.objectType))); } private onRoomObjectBadgeAssetEvent(event: RoomObjectBadgeAssetEvent, roomId: number): void { - if(!event || !this._roomEngine) return; + if (!event || !this._roomEngine) return; - switch(event.type) + switch (event.type) { case RoomObjectBadgeAssetEvent.LOAD_BADGE: { const objectId = event.objectId; @@ -965,7 +965,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private handleMousePointer(event: RoomObjectFurnitureActionEvent, roomId: number): void { - if(!event) return; + if (!event) return; this._roomEngine.updateMousePointer(event.type, event.objectId, event.objectType); } @@ -974,7 +974,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou { const objectCategory = this._roomEngine.getRoomObjectCategoryForType(event.objectType); - switch(event.type) + switch (event.type) { case RoomObjectPlaySoundIdEvent.PLAY_SOUND: this._roomEngine.events.dispatchEvent(new RoomEngineObjectPlaySoundEvent(RoomEngineObjectPlaySoundEvent.PLAY_SOUND, roomId, event.objectId, objectCategory, event.soundId, event.pitch)); @@ -987,11 +987,11 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private handleRoomObjectSamplePlaybackEvent(event: RoomObjectSamplePlaybackEvent, roomId: number): void { - if(!event) return; + if (!event) return; const objectCategory = this._roomEngine.getRoomObjectCategoryForType(event.objectType); - switch(event.type) + switch (event.type) { case RoomObjectSamplePlaybackEvent.ROOM_OBJECT_INITIALIZED: this._roomEngine.events.dispatchEvent(new RoomEngineSamplePlaybackEvent(RoomEngineSamplePlaybackEvent.ROOM_OBJECT_INITIALIZED, roomId, event.objectId, objectCategory, event.sampleId, event.pitch)); @@ -1010,9 +1010,9 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private onHSLColorEnableEvent(event: RoomObjectHSLColorEnableEvent, roomId: number): void { - if(!event || !this._roomEngine) return; + if (!event || !this._roomEngine) return; - switch(event.type) + switch (event.type) { case RoomObjectHSLColorEnableEvent.ROOM_BACKGROUND_COLOR: this._roomEngine.events.dispatchEvent(new RoomObjectHSLColorEnabledEvent(RoomObjectHSLColorEnabledEvent.ROOM_BACKGROUND_COLOR, roomId, event.enable, event.hue, event.saturation, event.lightness)); @@ -1022,9 +1022,9 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private onRoomObjectDataRequestEvent(event: RoomObjectDataRequestEvent, roomId: number): void { - if(!event || !this._roomEngine || !event.object) return; + if (!event || !this._roomEngine || !event.object) return; - switch(event.type) + switch (event.type) { case RoomObjectDataRequestEvent.RODRE_CURRENT_USER_ID: event.object.model.setValue(RoomObjectVariable.SESSION_CURRENT_USER_ID, this._roomEngine.sessionDataManager.userId); @@ -1037,38 +1037,38 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private onRoomObjectTileMouseEvent(roomId: number, event: RoomObjectTileMouseEvent): void { - if(!this._roomEngine || this._roomEngine.isDecorating || !this._roomEngine.roomSessionManager) return; + if (!this._roomEngine || this._roomEngine.isDecorating || !this._roomEngine.roomSessionManager) return; const session = this._roomEngine.roomSessionManager.getSession(roomId); - if(!session || session.isSpectator) return; + if (!session || session.isSpectator) return; this.sendWalkUpdate(event.tileXAsInt, event.tileYAsInt); } private handleObjectMove(event: RoomObjectMouseEvent, roomId: number): void { - if(!event || !this._roomEngine) return; + if (!event || !this._roomEngine) return; const eventDispatcher = this._roomEngine.events; - if(!eventDispatcher) return; + if (!eventDispatcher) return; const selectedData = this.getSelectedRoomObjectData(roomId); - if(!selectedData) return; + if (!selectedData) return; const roomObject = this._roomEngine.getRoomObject(roomId, selectedData.id, selectedData.category); - if(!roomObject) return; + if (!roomObject) return; let _local_6 = true; - if((selectedData.category === RoomObjectCategory.FLOOR) || (selectedData.category === RoomObjectCategory.UNIT)) + if ((selectedData.category === RoomObjectCategory.FLOOR) || (selectedData.category === RoomObjectCategory.UNIT)) { const stackingHeightMap = this._roomEngine.getFurnitureStackingHeightMap(roomId); - if(!(((event instanceof RoomObjectTileMouseEvent)) && (this.handleFurnitureMove(roomObject, selectedData, Math.trunc(event.tileX + 0.5), Math.trunc(event.tileY + 0.5), stackingHeightMap)))) + if (!(((event instanceof RoomObjectTileMouseEvent)) && (this.handleFurnitureMove(roomObject, selectedData, Math.trunc(event.tileX + 0.5), Math.trunc(event.tileY + 0.5), stackingHeightMap)))) { this.handleFurnitureMove(roomObject, selectedData, selectedData.loc.x, selectedData.loc.y, stackingHeightMap); @@ -1076,11 +1076,11 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou } } - else if((selectedData.category === RoomObjectCategory.WALL)) + else if ((selectedData.category === RoomObjectCategory.WALL)) { _local_6 = false; - if(event instanceof RoomObjectWallMouseEvent) + if (event instanceof RoomObjectWallMouseEvent) { const _local_10 = event.wallLocation; const _local_11 = event.wallWidth; @@ -1089,13 +1089,13 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou const _local_14 = event.y; const _local_15 = event.direction; - if(this.handleWallItemMove(roomObject, selectedData, _local_10, _local_11, _local_12, _local_13, _local_14, _local_15)) + if (this.handleWallItemMove(roomObject, selectedData, _local_10, _local_11, _local_12, _local_13, _local_14, _local_15)) { _local_6 = true; } } - if(!_local_6) + if (!_local_6) { roomObject.setLocation(selectedData.loc); roomObject.setDirection(selectedData.dir); @@ -1104,7 +1104,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou this._roomEngine.updateRoomObjectMask(roomId, selectedData.id, _local_6); } - if(_local_6) + if (_local_6) { this.setFurnitureAlphaMultiplier(roomObject, 0.5); @@ -1120,28 +1120,28 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private handleObjectPlace(event: RoomObjectMouseEvent, roomId: number): void { - if(!event || !this._roomEngine) return; + if (!event || !this._roomEngine) return; const eventDispatcher = this._roomEngine.events; - if(!eventDispatcher) return; + if (!eventDispatcher) return; let selectedData = this.getSelectedRoomObjectData(roomId); - if(!selectedData) return; + if (!selectedData) return; let roomObject = this._roomEngine.getRoomObject(roomId, selectedData.id, selectedData.category); - if(!roomObject) + if (!roomObject) { - if(event instanceof RoomObjectTileMouseEvent) + if (event instanceof RoomObjectTileMouseEvent) { - if(selectedData.category === RoomObjectCategory.FLOOR) + if (selectedData.category === RoomObjectCategory.FLOOR) { this._roomEngine.addFurnitureFloor(roomId, selectedData.id, selectedData.typeId, selectedData.loc, selectedData.dir, 0, selectedData.stuffData, parseFloat(selectedData.instanceData), -1, 0, 0, '', false); } - else if(selectedData.category === RoomObjectCategory.UNIT) + else if (selectedData.category === RoomObjectCategory.UNIT) { this._roomEngine.addRoomObjectUser(roomId, selectedData.id, new Vector3d(), new Vector3d(180), 180, selectedData.typeId, selectedData.instanceData); @@ -1151,9 +1151,9 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou } } - else if(event instanceof RoomObjectWallMouseEvent) + else if (event instanceof RoomObjectWallMouseEvent) { - if(selectedData.category === RoomObjectCategory.WALL) + if (selectedData.category === RoomObjectCategory.WALL) { this._roomEngine.addFurnitureWall(roomId, selectedData.id, selectedData.typeId, selectedData.loc, selectedData.dir, 0, selectedData.instanceData, 0); } @@ -1161,13 +1161,13 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou roomObject = this._roomEngine.getRoomObject(roomId, selectedData.id, selectedData.category); - if(roomObject) + if (roomObject) { - if(selectedData.category === RoomObjectCategory.FLOOR) + if (selectedData.category === RoomObjectCategory.FLOOR) { const allowedDirections = roomObject.model.getValue(RoomObjectVariable.FURNITURE_ALLOWED_DIRECTIONS); - if(allowedDirections && allowedDirections.length) + if (allowedDirections && allowedDirections.length) { const direction = new Vector3d(allowedDirections[0]); @@ -1177,7 +1177,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou selectedData = this.getSelectedRoomObjectData(roomId); - if(!selectedData) return; + if (!selectedData) return; } } } @@ -1186,15 +1186,15 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou this._roomEngine.setObjectMoverIconSpriteVisible(true); } - if(roomObject) + if (roomObject) { let _local_12 = true; const stackingHeightMap = this._roomEngine.getFurnitureStackingHeightMap(roomId); - if(selectedData.category === RoomObjectCategory.FLOOR) + if (selectedData.category === RoomObjectCategory.FLOOR) { - if(!((event instanceof RoomObjectTileMouseEvent) && this.handleFurnitureMove(roomObject, selectedData, Math.trunc(event.tileX + 0.5), Math.trunc(event.tileY + 0.5), stackingHeightMap))) + if (!((event instanceof RoomObjectTileMouseEvent) && this.handleFurnitureMove(roomObject, selectedData, Math.trunc(event.tileX + 0.5), Math.trunc(event.tileY + 0.5), stackingHeightMap))) { this._roomEngine.removeRoomObjectFloor(roomId, selectedData.id); @@ -1202,11 +1202,11 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou } } - else if(selectedData.category === RoomObjectCategory.WALL) + else if (selectedData.category === RoomObjectCategory.WALL) { _local_12 = false; - if(event instanceof RoomObjectWallMouseEvent) + if (event instanceof RoomObjectWallMouseEvent) { const _local_14 = event.wallLocation; const _local_15 = event.wallWidth; @@ -1215,13 +1215,13 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou const _local_18 = event.y; const _local_19 = event.direction; - if(this.handleWallItemMove(roomObject, selectedData, _local_14, _local_15, _local_16, _local_17, _local_18, _local_19)) + if (this.handleWallItemMove(roomObject, selectedData, _local_14, _local_15, _local_16, _local_17, _local_18, _local_19)) { _local_12 = true; } } - if(!_local_12) + if (!_local_12) { this._roomEngine.removeRoomObjectWall(roomId, selectedData.id); } @@ -1229,9 +1229,9 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou this._roomEngine.updateRoomObjectMask(roomId, selectedData.id, _local_12); } - else if(selectedData.category === RoomObjectCategory.UNIT) + else if (selectedData.category === RoomObjectCategory.UNIT) { - if(!((event instanceof RoomObjectTileMouseEvent) && this.handleUserPlace(roomObject, Math.trunc(event.tileX + 0.5), Math.trunc(event.tileY + 0.5), this._roomEngine.getLegacyWallGeometry(roomId)))) + if (!((event instanceof RoomObjectTileMouseEvent) && this.handleUserPlace(roomObject, Math.trunc(event.tileX + 0.5), Math.trunc(event.tileY + 0.5), this._roomEngine.getLegacyWallGeometry(roomId)))) { this._roomEngine.removeRoomObjectUser(roomId, selectedData.id); @@ -1245,7 +1245,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private handleFurnitureMove(roomObject: IRoomObjectController, selectedObjectData: ISelectedRoomObjectData, x: number, y: number, stackingHeightMap: IFurnitureStackingHeightMap): boolean { - if(!roomObject || !selectedObjectData) return false; + if (!roomObject || !selectedObjectData) return false; const _local_6 = new Vector3d(); _local_6.assign(roomObject.getDirection()); @@ -1259,7 +1259,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou let _local_9 = this.validateFurnitureLocation(roomObject, _local_7, selectedObjectData.loc, selectedObjectData.dir, stackingHeightMap); - if(!_local_9) + if (!_local_9) { _local_8.x = this.getValidRoomObjectDirection(roomObject, true); @@ -1268,7 +1268,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou _local_9 = this.validateFurnitureLocation(roomObject, _local_7, selectedObjectData.loc, selectedObjectData.dir, stackingHeightMap); } - if(!_local_9) + if (!_local_9) { roomObject.setDirection(_local_6); @@ -1277,19 +1277,19 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou roomObject.setLocation(_local_9); - if(_local_8) roomObject.setDirection(_local_8); + if (_local_8) roomObject.setDirection(_local_8); return true; } private handleWallItemMove(k: IRoomObjectController, _arg_2: ISelectedRoomObjectData, _arg_3: IVector3D, _arg_4: IVector3D, _arg_5: IVector3D, _arg_6: number, _arg_7: number, _arg_8: number): boolean { - if(!k || !_arg_2) return false; + if (!k || !_arg_2) return false; const _local_9 = new Vector3d(_arg_8); const _local_10 = this.validateWallItemLocation(k, _arg_3, _arg_4, _arg_5, _arg_6, _arg_7, _arg_2); - if(!_local_10) return false; + if (!_local_10) return false; k.setLocation(_local_10); k.setDirection(_local_9); @@ -1299,19 +1299,19 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private validateFurnitureLocation(k: IRoomObject, _arg_2: IVector3D, _arg_3: IVector3D, _arg_4: IVector3D, _arg_5: IFurnitureStackingHeightMap): Vector3d { - if(!k || !k.model || !_arg_2) return null; + if (!k || !k.model || !_arg_2) return null; let _local_15: Vector3d = null; const _local_6 = k.getDirection(); - if(!_local_6) return null; + if (!_local_6) return null; - if(!_arg_3 || !_arg_4) return null; + if (!_arg_3 || !_arg_4) return null; - if((_arg_2.x === _arg_3.x) && (_arg_2.y === _arg_3.y)) + if ((_arg_2.x === _arg_3.x) && (_arg_2.y === _arg_3.y)) { - if(_local_6.x === _arg_4.x) + if (_local_6.x === _arg_4.x) { _local_15 = new Vector3d(); @@ -1324,9 +1324,9 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou let sizeX = k.model.getValue(RoomObjectVariable.FURNITURE_SIZE_X); let sizeY = k.model.getValue(RoomObjectVariable.FURNITURE_SIZE_Y); - if(sizeX < 1) sizeX = 1; + if (sizeX < 1) sizeX = 1; - if(sizeY < 1) sizeY = 1; + if (sizeY < 1) sizeY = 1; const _local_9 = _arg_3.x; const _local_10 = _arg_3.y; @@ -1335,7 +1335,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou let _local_13 = 0; let _local_14 = (Math.trunc((Math.trunc(_local_6.x + 45) % 360) / 90)); - if((_local_14 === 1) || (_local_14 === 3)) + if ((_local_14 === 1) || (_local_14 === 3)) { _local_13 = sizeX; @@ -1345,18 +1345,18 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou _local_14 = Math.trunc((Math.trunc(_arg_4.x + 45) % 360) / 90); - if((_local_14 === 1) || (_local_14 === 3)) + if ((_local_14 === 1) || (_local_14 === 3)) { _local_13 = _local_11; _local_11 = _local_12; _local_12 = _local_13; } - if(_arg_5 && _arg_2) + if (_arg_5 && _arg_2) { const stackable = (k.model.getValue(RoomObjectVariable.FURNITURE_ALWAYS_STACKABLE) === 1); - if(_arg_5.validateLocation(_arg_2.x, _arg_2.y, sizeX, sizeY, _local_9, _local_10, _local_11, _local_12, stackable)) + if (_arg_5.validateLocation(_arg_2.x, _arg_2.y, sizeX, sizeY, _local_9, _local_10, _local_11, _local_12, stackable)) { return new Vector3d(_arg_2.x, _arg_2.y, _arg_5.getTileHeight(_arg_2.x, _arg_2.y)); } @@ -1369,40 +1369,40 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private validateWallItemLocation(k: IRoomObject, _arg_2: IVector3D, _arg_3: IVector3D, _arg_4: IVector3D, _arg_5: number, _arg_6: number, _arg_7: ISelectedRoomObjectData): Vector3d { - if((((((k == null) || (k.model == null)) || (_arg_2 == null)) || (_arg_3 == null)) || (_arg_4 == null)) || (_arg_7 == null)) return null; + if ((((((k == null) || (k.model == null)) || (_arg_2 == null)) || (_arg_3 == null)) || (_arg_4 == null)) || (_arg_7 == null)) return null; const _local_8 = k.model.getValue(RoomObjectVariable.FURNITURE_SIZE_X); const _local_9 = k.model.getValue(RoomObjectVariable.FURNITURE_SIZE_Z); const _local_10 = k.model.getValue(RoomObjectVariable.FURNITURE_CENTER_Z); - if((((_arg_5 < (_local_8 / 2)) || (_arg_5 > (_arg_3.length - (_local_8 / 2)))) || (_arg_6 < _local_10)) || (_arg_6 > (_arg_4.length - (_local_9 - _local_10)))) + if ((((_arg_5 < (_local_8 / 2)) || (_arg_5 > (_arg_3.length - (_local_8 / 2)))) || (_arg_6 < _local_10)) || (_arg_6 > (_arg_4.length - (_local_9 - _local_10)))) { - if((_arg_5 < (_local_8 / 2)) && (_arg_5 <= (_arg_3.length - (_local_8 / 2)))) + if ((_arg_5 < (_local_8 / 2)) && (_arg_5 <= (_arg_3.length - (_local_8 / 2)))) { _arg_5 = (_local_8 / 2); } else { - if((_arg_5 >= (_local_8 / 2)) && (_arg_5 > (_arg_3.length - (_local_8 / 2)))) + if ((_arg_5 >= (_local_8 / 2)) && (_arg_5 > (_arg_3.length - (_local_8 / 2)))) { _arg_5 = (_arg_3.length - (_local_8 / 2)); } } - if((_arg_6 < _local_10) && (_arg_6 <= (_arg_4.length - (_local_9 - _local_10)))) + if ((_arg_6 < _local_10) && (_arg_6 <= (_arg_4.length - (_local_9 - _local_10)))) { _arg_6 = _local_10; } else { - if((_arg_6 >= _local_10) && (_arg_6 > (_arg_4.length - (_local_9 - _local_10)))) + if ((_arg_6 >= _local_10) && (_arg_6 > (_arg_4.length - (_local_9 - _local_10)))) { _arg_6 = (_arg_4.length - (_local_9 - _local_10)); } } } - if((((_arg_5 < (_local_8 / 2)) || (_arg_5 > (_arg_3.length - (_local_8 / 2)))) || (_arg_6 < _local_10)) || (_arg_6 > (_arg_4.length - (_local_9 - _local_10)))) + if ((((_arg_5 < (_local_8 / 2)) || (_arg_5 > (_arg_3.length - (_local_8 / 2)))) || (_arg_6 < _local_10)) || (_arg_6 > (_arg_4.length - (_local_9 - _local_10)))) { return null; } @@ -1423,8 +1423,8 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private useObject(roomId: number, objectId: number, type: string, action: string): void { - if(!this._roomEngine || !this._roomEngine.connection) return; - switch(action) + if (!this._roomEngine || !this._roomEngine.connection) return; + switch (action) { case RoomObjectFurnitureActionEvent.DICE_ACTIVATE: this._roomEngine.connection.send(new FurnitureDiceActivateComposer(objectId)); @@ -1446,11 +1446,11 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private changeRoomObjectState(roomId: number, objectId: number, category: number, state: number, isRandom: boolean): boolean { - if(!this._roomEngine || !this._roomEngine.connection) return true; + if (!this._roomEngine || !this._roomEngine.connection) return true; - if(category === RoomObjectCategory.FLOOR) + if (category === RoomObjectCategory.FLOOR) { - if(!isRandom) + if (!isRandom) { this._roomEngine.connection.send(new FurnitureMultiStateComposer(objectId, state)); } @@ -1460,7 +1460,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou } } - else if(category === RoomObjectCategory.WALL) + else if (category === RoomObjectCategory.WALL) { this._roomEngine.connection.send(new FurnitureWallMultiStateComposer(objectId, state)); } @@ -1470,26 +1470,26 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private sendWalkUpdate(x: number, y: number): void { - if(!this._roomEngine || !this._roomEngine.connection) return; + if (!this._roomEngine || !this._roomEngine.connection) return; this._roomEngine.connection.send(new RoomUnitWalkComposer(x, y)); } private handleMouseOverObject(category: number, roomId: number, event: RoomObjectMouseEvent): ObjectTileCursorUpdateMessage { - if(category !== RoomObjectCategory.FLOOR) return null; + if (category !== RoomObjectCategory.FLOOR) return null; const roomObject = this._roomEngine.getRoomObject(roomId, event.objectId, RoomObjectCategory.FLOOR); - if(!roomObject) return null; + if (!roomObject) return null; const location = this.getActiveSurfaceLocation(roomObject, event); - if(!location) return null; + if (!location) return null; const furnitureHeightMap = this._roomEngine.getFurnitureStackingHeightMap(roomId); - if(!furnitureHeightMap) return null; + if (!furnitureHeightMap) return null; const x = location.x; const y = location.y; @@ -1500,12 +1500,12 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private handleMoveTargetFurni(k: number, _arg_2: RoomObjectMouseEvent): boolean { - if((_arg_2.objectType === RoomObjectUserType.USER) || (_arg_2.objectType === RoomObjectUserType.PET) || (_arg_2.objectType === RoomObjectUserType.BOT) || (_arg_2.objectType === RoomObjectUserType.RENTABLE_BOT) || (_arg_2.objectType === RoomObjectUserType.MONSTER_PLANT)) return; + if ((_arg_2.objectType === RoomObjectUserType.USER) || (_arg_2.objectType === RoomObjectUserType.PET) || (_arg_2.objectType === RoomObjectUserType.BOT) || (_arg_2.objectType === RoomObjectUserType.RENTABLE_BOT) || (_arg_2.objectType === RoomObjectUserType.MONSTER_PLANT)) return; const _local_3 = this._roomEngine.getRoomObject(k, _arg_2.objectId, RoomObjectCategory.FLOOR); const _local_4 = this.getActiveSurfaceLocation(_local_3, _arg_2); - if(_local_4) + if (_local_4) { this.sendWalkUpdate(_local_4.x, _local_4.y); @@ -1517,17 +1517,17 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private getActiveSurfaceLocation(k: IRoomObject, _arg_2: RoomObjectMouseEvent): Vector3d { - if(!k || !_arg_2) return null; + if (!k || !_arg_2) return null; const furniData = this._roomEngine.sessionDataManager.getFloorItemDataByName(k.type); - if(!furniData) return null; + if (!furniData) return null; - if(!furniData.canStandOn && !furniData.canSitOn && !furniData.canLayOn) return null; + if (!furniData.canStandOn && !furniData.canSitOn && !furniData.canLayOn) return null; const model = k.model; - if(!model) return null; + if (!model) return null; const location = k.getLocation(); const direction = k.getDirection(); @@ -1536,14 +1536,14 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou let sizeY = model.getValue(RoomObjectVariable.FURNITURE_SIZE_Y); const sizeZ = model.getValue(RoomObjectVariable.FURNITURE_SIZE_Z); - if((direction.x === 90) || (direction.x === 270)) [sizeX, sizeY] = [sizeY, sizeX]; + if ((direction.x === 90) || (direction.x === 270)) [sizeX, sizeY] = [sizeY, sizeX]; - if(sizeX < 1) sizeX = 1; - if(sizeY < 1) sizeY = 1; + if (sizeX < 1) sizeX = 1; + if (sizeY < 1) sizeY = 1; const renderingCanvas = this._roomEngine.getActiveRoomInstanceRenderingCanvas(); - if(!renderingCanvas) return null; + if (!renderingCanvas) return null; const scale = renderingCanvas.geometry.scale; const _local_13 = furniData.canSitOn ? 0.5 : 0; @@ -1556,44 +1556,44 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou let _local_20 = false; - if((_local_18 < location.x) || (_local_18 >= (location.x + sizeX))) _local_20 = true; - else if((_local_19 < location.y) || (_local_19 >= (location.y + sizeY))) _local_20 = true; + if ((_local_18 < location.x) || (_local_18 >= (location.x + sizeX))) _local_20 = true; + else if ((_local_19 < location.y) || (_local_19 >= (location.y + sizeY))) _local_20 = true; const _local_21 = furniData.canSitOn ? (sizeZ - 0.5) : sizeZ; - if(!_local_20) return new Vector3d(_local_18, _local_19, _local_21); + if (!_local_20) return new Vector3d(_local_18, _local_19, _local_21); return null; } private handleMouseOverTile(k: RoomObjectTileMouseEvent, roomId: number): ObjectTileCursorUpdateMessage { - if(this._whereYouClickIsWhereYouGo) + if (this._whereYouClickIsWhereYouGo) { return new ObjectTileCursorUpdateMessage(new Vector3d(k.tileXAsInt, k.tileYAsInt, k.tileZAsInt), 0, true, k.eventId); } const roomObject = this._roomEngine.getRoomObjectCursor(roomId); - if(roomObject && roomObject.visualization) + if (roomObject && roomObject.visualization) { const _local_4 = k.tileXAsInt; const _local_5 = k.tileYAsInt; const _local_6 = k.tileZAsInt; const _local_7 = this._roomEngine.getRoomInstance(roomId); - if(_local_7) + if (_local_7) { const _local_8 = this._roomEngine.getRoomTileObjectMap(roomId); - if(_local_8) + if (_local_8) { const _local_9 = _local_8.getObjectIntTile(_local_4, _local_5); const _local_10 = this._roomEngine.getFurnitureStackingHeightMap(roomId); - if(_local_10) + if (_local_10) { - if(_local_9 && _local_9.model && (_local_9.model.getValue(RoomObjectVariable.FURNITURE_IS_VARIABLE_HEIGHT) > 0)) + if (_local_9 && _local_9.model && (_local_9.model.getValue(RoomObjectVariable.FURNITURE_IS_VARIABLE_HEIGHT) > 0)) { const _local_11 = _local_10.getTileHeight(_local_4, _local_5); const _local_12 = this._roomEngine.getLegacyWallGeometry(roomId).getHeight(_local_4, _local_5); @@ -1614,7 +1614,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou { const selectedData = this.getSelectedRoomObjectData(roomId); - if(!selectedData) return; + if (!selectedData) return; let roomObject: IRoomObjectController = null; let objectId = selectedData.id; @@ -1626,24 +1626,24 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou let direction = 0; let wallLocation = ''; - if(this._roomEngine && this._roomEngine.connection) + if (this._roomEngine && this._roomEngine.connection) { roomObject = this._roomEngine.getRoomObject(roomId, objectId, category); - if(roomObject) + if (roomObject) { const location = roomObject.getLocation(); direction = roomObject.getDirection().x; - if((category === RoomObjectCategory.FLOOR) || (category === RoomObjectCategory.UNIT)) + if ((category === RoomObjectCategory.FLOOR) || (category === RoomObjectCategory.UNIT)) { x = location.x; y = location.y; z = location.z; } - else if(category === RoomObjectCategory.WALL) + else if (category === RoomObjectCategory.WALL) { x = location.x; y = location.y; @@ -1651,29 +1651,29 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou const wallGeometry = this._roomEngine.getLegacyWallGeometry(roomId); - if(wallGeometry) wallLocation = wallGeometry.getOldLocationString(location, direction); + if (wallGeometry) wallLocation = wallGeometry.getOldLocationString(location, direction); } direction = ((((direction / 45) % 8) + 8) % 8); - if((objectId < 0) && (category === RoomObjectCategory.UNIT)) objectId = (objectId * -1); + if ((objectId < 0) && (category === RoomObjectCategory.UNIT)) objectId = (objectId * -1); - if(this._objectPlacementSource !== RoomObjectPlacementSource.CATALOG) + if (this._objectPlacementSource !== RoomObjectPlacementSource.CATALOG) { - if(category === RoomObjectCategory.UNIT) + if (category === RoomObjectCategory.UNIT) { - if(selectedData.typeId === RoomObjectType.PET) + if (selectedData.typeId === RoomObjectType.PET) { this._roomEngine.connection.send(new PetPlaceComposer(objectId, Math.trunc(x), Math.trunc(y))); } - else if(selectedData.typeId === RoomObjectType.RENTABLE_BOT) + else if (selectedData.typeId === RoomObjectType.RENTABLE_BOT) { this._roomEngine.connection.send(new BotPlaceComposer(objectId, Math.trunc(x), Math.trunc(y))); } } - else if(roomObject.model.getValue(RoomObjectVariable.FURNITURE_IS_STICKIE) !== undefined) + else if (roomObject.model.getValue(RoomObjectVariable.FURNITURE_IS_STICKIE) !== undefined) { this._roomEngine.connection.send(new FurniturePostItPlaceComposer(objectId, wallLocation)); } @@ -1690,7 +1690,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou this.resetSelectedObjectData(roomId); - if(this._roomEngine && this._roomEngine.events) + if (this._roomEngine && this._roomEngine.events) { const placedInRoom = (roomObject && (roomObject.id === selectedData.id)); @@ -1700,23 +1700,23 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou public modifyRoomObject(roomId: number, objectId: number, category: number, operation: string): boolean { - if(!this._roomEngine) return false; + if (!this._roomEngine) return false; const roomObject = this._roomEngine.getRoomObject(roomId, objectId, category); - if(!roomObject) return false; + if (!roomObject) return false; let _local_9 = true; - switch(operation) + switch (operation) { case RoomObjectOperationType.OBJECT_ROTATE_POSITIVE: case RoomObjectOperationType.OBJECT_ROTATE_NEGATIVE: - if(this._roomEngine.connection) + if (this._roomEngine.connection) { let direction = 0; - if(operation == RoomObjectOperationType.OBJECT_ROTATE_NEGATIVE) + if (operation == RoomObjectOperationType.OBJECT_ROTATE_NEGATIVE) { direction = this.getValidRoomObjectDirection(roomObject, false); } @@ -1728,19 +1728,19 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou const x = roomObject.getLocation().x; const y = roomObject.getLocation().y; - if(this.isValidLocation(roomObject, new Vector3d(direction), this._roomEngine.getFurnitureStackingHeightMap(roomId))) + if (this.isValidLocation(roomObject, new Vector3d(direction), this._roomEngine.getFurnitureStackingHeightMap(roomId))) { direction = Math.trunc((direction / 45)); - if(roomObject.type === RoomObjectUserType.MONSTER_PLANT) + if (roomObject.type === RoomObjectUserType.MONSTER_PLANT) { const roomSession = this._roomEngine.roomSessionManager.getSession(roomId); - if(roomSession) + if (roomSession) { const userData = roomSession.userDataManager.getUserDataByIndex(objectId); - if(userData) + if (userData) { this._roomEngine.connection.send(new PetMoveComposer(userData.webID, Math.trunc(x), Math.trunc(y), direction)); } @@ -1755,14 +1755,14 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou break; case RoomObjectOperationType.OBJECT_EJECT: case RoomObjectOperationType.OBJECT_PICKUP: - if(this._roomEngine.connection) this._roomEngine.connection.send(new FurniturePickupComposer(category, objectId)); + if (this._roomEngine.connection) this._roomEngine.connection.send(new FurniturePickupComposer(category, objectId)); break; case RoomObjectOperationType.OBJECT_PICKUP_PET: - if(this._roomEngine.connection) + if (this._roomEngine.connection) { const session = this._roomEngine.roomSessionManager.getSession(roomId); - if(session) + if (session) { const userData = session.userDataManager.getUserDataByIndex(objectId); @@ -1771,11 +1771,11 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou } break; case RoomObjectOperationType.OBJECT_PICKUP_BOT: - if(this._roomEngine.connection) + if (this._roomEngine.connection) { const session = this._roomEngine.roomSessionManager.getSession(roomId); - if(session) + if (session) { const userData = session.userDataManager.getUserDataByIndex(objectId); @@ -1797,9 +1797,9 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou this.setFurnitureAlphaMultiplier(roomObject, 1); this._roomEngine.removeObjectMoverIconSprite(); - if(this._roomEngine.connection) + if (this._roomEngine.connection) { - if(category === RoomObjectCategory.FLOOR) + if (category === RoomObjectCategory.FLOOR) { const angle = ((roomObject.getDirection().x) % 360); const location = roomObject.getLocation(); @@ -1808,20 +1808,20 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou this._roomEngine.connection.send(new FurnitureFloorUpdateComposer(objectId, location.x, location.y, direction)); } - else if(category === RoomObjectCategory.WALL) + else if (category === RoomObjectCategory.WALL) { const angle = ((roomObject.getDirection().x) % 360); const wallGeometry = this._roomEngine.getLegacyWallGeometry(roomId); - if(wallGeometry) + if (wallGeometry) { const location = wallGeometry.getOldLocationString(roomObject.getLocation(), angle); - if(location) this._roomEngine.connection.send(new FurnitureWallUpdateComposer(objectId, location)); + if (location) this._roomEngine.connection.send(new FurnitureWallUpdateComposer(objectId, location)); } } - else if(category === RoomObjectCategory.UNIT) + else if (category === RoomObjectCategory.UNIT) { const angle = ((roomObject.getDirection().x) % 360); const location = roomObject.getLocation(); @@ -1829,11 +1829,11 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou const race = parseInt(roomObject.model.getValue(RoomObjectVariable.RACE)); const roomSession = this._roomEngine.roomSessionManager.getSession(roomId); - if(roomSession) + if (roomSession) { const userData = roomSession.userDataManager.getUserDataByIndex(objectId); - if(userData) this._roomEngine.connection.send(new PetMoveComposer(userData.webID, location.x, location.y, direction)); + if (userData) this._roomEngine.connection.send(new PetMoveComposer(userData.webID, location.x, location.y, direction)); } } } @@ -1842,23 +1842,23 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou } } - if(_local_9) this.resetSelectedObjectData(roomId); + if (_local_9) this.resetSelectedObjectData(roomId); return true; } public modifyRoomObjectDataWithMap(roomId: number, objectId: number, category: number, operation: string, data: Map): boolean { - if(!this._roomEngine) return false; + if (!this._roomEngine) return false; const roomObject = this._roomEngine.getRoomObject(roomId, objectId, category); - if(!roomObject) return false; + if (!roomObject) return false; - switch(operation) + switch (operation) { case RoomObjectOperationType.OBJECT_SAVE_STUFF_DATA: - if(this._roomEngine.connection) + if (this._roomEngine.connection) { this._roomEngine.connection.send(new SetObjectDataMessageComposer(objectId, data)); } @@ -1870,7 +1870,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou public modifyWallItemData(roomId: number, objectId: number, colorHex: string, text: string): boolean { - if(!this._roomEngine || !this._roomEngine.connection) return false; + if (!this._roomEngine || !this._roomEngine.connection) return false; this._roomEngine.connection.send(new SetItemDataMessageComposer(objectId, colorHex, text)); @@ -1879,7 +1879,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou public deleteWallItem(roomId: number, itemId: number): boolean { - if(!this._roomEngine || !this._roomEngine.connection) return false; + if (!this._roomEngine || !this._roomEngine.connection) return false; this._roomEngine.connection.send(new RemoveWallItemComposer(itemId)); @@ -1888,13 +1888,13 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou public getValidRoomObjectDirection(k: IRoomObjectController, _arg_2: boolean): number { - if(!k || !k.model) return 0; + if (!k || !k.model) return 0; let _local_6 = 0; let _local_7 = 0; let allowedDirections: number[] = []; - if(k.type === RoomObjectUserType.MONSTER_PLANT) + if (k.type === RoomObjectUserType.MONSTER_PLANT) { allowedDirections = k.model.getValue(RoomObjectVariable.PET_ALLOWED_DIRECTIONS); } @@ -1905,18 +1905,18 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou let direction = k.getDirection().x; - if(allowedDirections && allowedDirections.length) + if (allowedDirections && allowedDirections.length) { _local_6 = allowedDirections.indexOf(direction); - if(_local_6 < 0) + if (_local_6 < 0) { _local_6 = 0; _local_7 = 0; - while(_local_7 < allowedDirections.length) + while (_local_7 < allowedDirections.length) { - if(direction <= allowedDirections[_local_7]) break; + if (direction <= allowedDirections[_local_7]) break; _local_6++; _local_7++; @@ -1925,7 +1925,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou _local_6 = (_local_6 % allowedDirections.length); } - if(_arg_2) _local_6 = ((_local_6 + 1) % allowedDirections.length); + if (_arg_2) _local_6 = ((_local_6 + 1) % allowedDirections.length); else _local_6 = (((_local_6 - 1) + allowedDirections.length) % allowedDirections.length); direction = allowedDirections[_local_6]; @@ -1936,38 +1936,38 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private isValidLocation(object: IRoomObject, goalDirection: IVector3D, stackingHeightMap: IFurnitureStackingHeightMap): boolean { - if(!object || !object.model || !goalDirection) return false; + if (!object || !object.model || !goalDirection) return false; const direction = object.getDirection(); const location = object.getLocation(); - if(!direction || !location) return false; + if (!direction || !location) return false; - if((direction.x % 180) === (goalDirection.x % 180)) return true; + if ((direction.x % 180) === (goalDirection.x % 180)) return true; let sizeX = object.model.getValue(RoomObjectVariable.FURNITURE_SIZE_X); let sizeY = object.model.getValue(RoomObjectVariable.FURNITURE_SIZE_Y); - if(sizeX < 1) sizeX = 1; + if (sizeX < 1) sizeX = 1; - if(sizeY < 1) sizeY = 1; + if (sizeY < 1) sizeY = 1; let _local_8 = sizeX; let _local_9 = sizeY; let _local_11 = (Math.trunc((Math.trunc((goalDirection.x + 45)) % 360) / 90)); - if((_local_11 === 1) || (_local_11 === 3)) [sizeX, sizeY] = [sizeY, sizeX]; + if ((_local_11 === 1) || (_local_11 === 3)) [sizeX, sizeY] = [sizeY, sizeX]; _local_11 = (Math.trunc((Math.trunc((direction.x + 45)) % 360) / 90)); - if(((_local_11 === 1) || (_local_11 === 3))) [_local_8, _local_9] = [_local_9, _local_8]; + if (((_local_11 === 1) || (_local_11 === 3))) [_local_8, _local_9] = [_local_9, _local_8]; - if(stackingHeightMap && location) + if (stackingHeightMap && location) { const alwaysStackable = (object.model.getValue(RoomObjectVariable.FURNITURE_ALWAYS_STACKABLE) === 1); - if(stackingHeightMap.validateLocation(location.x, location.y, sizeX, sizeY, location.x, location.y, _local_8, _local_9, alwaysStackable, location.z)) return true; + if (stackingHeightMap.validateLocation(location.x, location.y, sizeX, sizeY, location.x, location.y, _local_8, _local_9, alwaysStackable, location.z)) return true; } return false; @@ -1977,31 +1977,31 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou { const _local_4 = this.getSelectedRoomObjectData(roomId); - if(!_local_4) return; + if (!_local_4) return; const _local_5 = (this._roomEngine.getRoomObject(roomId, objectId, category) as IRoomObjectController); - if(!_local_5) return; + if (!_local_5) return; - if(!this._roomEngine || !this._roomEngine.events) return; + if (!this._roomEngine || !this._roomEngine.events) return; this._roomEngine.events.dispatchEvent(new RoomEngineObjectPlacedOnUserEvent(RoomEngineObjectEvent.PLACED_ON_USER, roomId, objectId, category, _local_4.id, _local_4.category)); } public setSelectedObject(roomId: number, objectId: number, category: number): void { - if(!this._roomEngine) return; + if (!this._roomEngine) return; const eventDispatcher = this._roomEngine.events; - if(!eventDispatcher) return; + if (!eventDispatcher) return; - switch(category) + switch (category) { case RoomObjectCategory.UNIT: case RoomObjectCategory.FLOOR: case RoomObjectCategory.WALL: - if(category === RoomObjectCategory.UNIT) + if (category === RoomObjectCategory.UNIT) { this.deselectObject(roomId); this.setSelectedAvatar(roomId, objectId, true); @@ -2010,13 +2010,13 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou { this.setSelectedAvatar(roomId, 0, false); - if(objectId !== this._selectedObjectId) + if (objectId !== this._selectedObjectId) { this.deselectObject(roomId); const roomObject = this._roomEngine.getRoomObject(roomId, objectId, category); - if(roomObject && roomObject.logic) + if (roomObject && roomObject.logic) { roomObject.logic.processUpdateMessage(new ObjectSelectedMessage(true)); @@ -2034,11 +2034,11 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private deselectObject(roomId: number): void { - if(this._selectedObjectId === -1) return; + if (this._selectedObjectId === -1) return; const object = this._roomEngine.getRoomObject(roomId, this._selectedObjectId, this._selectedObjectCategory); - if(object && object.logic) + if (object && object.logic) { object.logic.processUpdateMessage(new ObjectSelectedMessage(false)); @@ -2049,12 +2049,12 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou public setSelectedAvatar(k: number, _arg_2: number, _arg_3: boolean): void { - if(!this._roomEngine) return; + if (!this._roomEngine) return; const _local_4 = RoomObjectCategory.UNIT; const _local_5 = this._roomEngine.getRoomObject(k, this._selectedAvatarId, _local_4); - if(_local_5 && _local_5.logic) + if (_local_5 && _local_5.logic) { _local_5.logic.processUpdateMessage(new ObjectAvatarSelectedMessage(false)); @@ -2063,11 +2063,11 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou let _local_6 = false; - if(_arg_3) + if (_arg_3) { const _local_5 = this._roomEngine.getRoomObject(k, _arg_2, _local_4); - if(_local_5 && _local_5.logic) + if (_local_5 && _local_5.logic) { _local_5.logic.processUpdateMessage(new ObjectAvatarSelectedMessage(true)); @@ -2077,34 +2077,34 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou const location = _local_5.getLocation(); - if(location) this._roomEngine.connection.send(new RoomUnitLookComposer(~~(location.x), ~~(location.y))); + if (location) this._roomEngine.connection.send(new RoomUnitLookComposer(~~(location.x), ~~(location.y))); } } const selectionArrow = this._roomEngine.getRoomObjectSelectionArrow(k); - if(selectionArrow && selectionArrow.logic) + if (selectionArrow && selectionArrow.logic) { - if(_local_6 && !this._roomEngine.isPlayingGame()) selectionArrow.logic.processUpdateMessage(new ObjectVisibilityUpdateMessage(ObjectVisibilityUpdateMessage.ENABLED)); + if (_local_6 && !this._roomEngine.isPlayingGame()) selectionArrow.logic.processUpdateMessage(new ObjectVisibilityUpdateMessage(ObjectVisibilityUpdateMessage.ENABLED)); else selectionArrow.logic.processUpdateMessage(new ObjectVisibilityUpdateMessage(ObjectVisibilityUpdateMessage.DISABLED)); } } private resetSelectedObjectData(roomId: number): void { - if(!this._roomEngine) return; + if (!this._roomEngine) return; this._roomEngine.removeObjectMoverIconSprite(); const selectedData = this.getSelectedRoomObjectData(roomId); - if(selectedData) + if (selectedData) { - if((selectedData.operation === RoomObjectOperationType.OBJECT_MOVE) || (selectedData.operation === RoomObjectOperationType.OBJECT_MOVE_TO)) + if ((selectedData.operation === RoomObjectOperationType.OBJECT_MOVE) || (selectedData.operation === RoomObjectOperationType.OBJECT_MOVE_TO)) { const roomObject = this._roomEngine.getRoomObject(roomId, selectedData.id, selectedData.category); - if(roomObject && (selectedData.operation !== RoomObjectOperationType.OBJECT_MOVE_TO)) + if (roomObject && (selectedData.operation !== RoomObjectOperationType.OBJECT_MOVE_TO)) { roomObject.setLocation(selectedData.loc); roomObject.setDirection(selectedData.dir); @@ -2112,7 +2112,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou this.setFurnitureAlphaMultiplier(roomObject, 1); - if(selectedData.category === RoomObjectCategory.WALL) + if (selectedData.category === RoomObjectCategory.WALL) { this._roomEngine.updateRoomObjectMask(roomId, selectedData.id, true); } @@ -2120,12 +2120,12 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou this.updateSelectedObjectData(roomId, selectedData.id, selectedData.category, selectedData.loc, selectedData.dir, RoomObjectOperationType.OBJECT_MOVE, selectedData.typeId, selectedData.instanceData, selectedData.stuffData, selectedData.state, selectedData.animFrame, selectedData.posture); } - else if((selectedData.operation === RoomObjectOperationType.OBJECT_PLACE)) + else if ((selectedData.operation === RoomObjectOperationType.OBJECT_PLACE)) { const objectId = selectedData.id; const category = selectedData.category; - switch(category) + switch (category) { case RoomObjectCategory.FLOOR: this._roomEngine.removeRoomObjectFloor(roomId, objectId); @@ -2145,14 +2145,14 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private getSelectedRoomObjectData(roomId: number): ISelectedRoomObjectData { - if(!this._roomEngine) return null; + if (!this._roomEngine) return null; return this._roomEngine.getSelectedRoomObjectData(roomId); } private setFurnitureAlphaMultiplier(object: IRoomObjectController, multiplier: number): void { - if(!object || !object.model) return; + if (!object || !object.model) return; object.model.setValue(RoomObjectVariable.FURNITURE_ALPHA_MULTIPLIER, multiplier); } @@ -2173,7 +2173,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou { this.resetSelectedObjectData(roomId); - if(!this._roomEngine) return; + if (!this._roomEngine) return; const selectedData = new SelectedRoomObjectData(id, category, operation, location, direction, typeId, instanceData, stuffData, state, frameNumber, posture); @@ -2182,7 +2182,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private updateSelectedObjectData(roomId: number, id: number, category: number, location: IVector3D, direction: IVector3D, operation: string, typeId: number = 0, instanceData: string = null, stuffData: IObjectData = null, state: number = -1, frameNumber: number = -1, posture: string = null): void { - if(!this._roomEngine) return null; + if (!this._roomEngine) return null; const selectedData = new SelectedRoomObjectData(id, category, operation, location, direction, typeId, instanceData, stuffData, state, frameNumber, posture); @@ -2191,7 +2191,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private handleUserPlace(roomObject: IRoomObjectController, x: number, y: number, wallGeometry: ILegacyWallGeometry): boolean { - if(!wallGeometry.isRoomTile(x, y)) return false; + if (!wallGeometry.isRoomTile(x, y)) return false; roomObject.setLocation(new Vector3d(x, y, wallGeometry.getHeight(x, y))); diff --git a/src/nitro/room/index.ts b/src/nitro/room/index.ts index bbfec3e8..6cb04ddc 100644 --- a/src/nitro/room/index.ts +++ b/src/nitro/room/index.ts @@ -1,4 +1,3 @@ -export * from './events'; export * from './ImageResult'; export * from './messages'; export * from './object'; diff --git a/src/nitro/room/object/logic/avatar/AvatarLogic.ts b/src/nitro/room/object/logic/avatar/AvatarLogic.ts index 1bb6eebd..841601af 100644 --- a/src/nitro/room/object/logic/avatar/AvatarLogic.ts +++ b/src/nitro/room/object/logic/avatar/AvatarLogic.ts @@ -1,9 +1,9 @@ import { AvatarAction, IRoomGeometry, IRoomObjectModel, RoomObjectVariable, Vector3d } from '../../../../../api'; +import { RoomObjectFurnitureActionEvent, RoomObjectMoveEvent } from '../../../../../events'; import { GetTickerTime } from '../../../../../pixi-proxy'; import { RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room'; import { MouseEventType } from '../../../../ui'; -import { RoomObjectFurnitureActionEvent, RoomObjectMoveEvent } from '../../../events'; import { ObjectAvatarCarryObjectUpdateMessage, ObjectAvatarChatUpdateMessage, ObjectAvatarDanceUpdateMessage, ObjectAvatarEffectUpdateMessage, ObjectAvatarExpressionUpdateMessage, ObjectAvatarFigureUpdateMessage, ObjectAvatarFlatControlUpdateMessage, ObjectAvatarGestureUpdateMessage, ObjectAvatarMutedUpdateMessage, ObjectAvatarOwnMessage, ObjectAvatarPlayerValueUpdateMessage, ObjectAvatarPlayingGameUpdateMessage, ObjectAvatarPostureUpdateMessage, ObjectAvatarSelectedMessage, ObjectAvatarSignUpdateMessage, ObjectAvatarSleepUpdateMessage, ObjectAvatarTypingUpdateMessage, ObjectAvatarUpdateMessage, ObjectAvatarUseObjectUpdateMessage } from '../../../messages'; import { MovingObjectLogic } from '../MovingObjectLogic'; diff --git a/src/nitro/room/object/logic/furniture/FurnitureAchievementResolutionLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureAchievementResolutionLogic.ts index 0c35f2e0..07f32de0 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureAchievementResolutionLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureAchievementResolutionLogic.ts @@ -1,6 +1,6 @@ import { RoomObjectVariable } from '../../../../../api'; +import { RoomObjectBadgeAssetEvent, RoomObjectWidgetRequestEvent } from '../../../../../events'; import { RoomObjectEvent, RoomObjectUpdateMessage } from '../../../../../room'; -import { RoomObjectBadgeAssetEvent, RoomObjectWidgetRequestEvent } from '../../../events'; import { ObjectGroupBadgeUpdateMessage, ObjectSelectedMessage } from '../../../messages'; import { FurnitureBadgeDisplayLogic } from './FurnitureBadgeDisplayLogic'; @@ -24,17 +24,17 @@ export class FurnitureAchievementResolutionLogic extends FurnitureBadgeDisplayLo { super.processUpdateMessage(message); - if(message instanceof ObjectGroupBadgeUpdateMessage) + if (message instanceof ObjectGroupBadgeUpdateMessage) { - if(message.assetName !== 'loading_icon') + if (message.assetName !== 'loading_icon') { this.object.model.setValue(RoomObjectVariable.FURNITURE_BADGE_VISIBLE_IN_STATE, FurnitureAchievementResolutionLogic.BADGE_VISIBLE_IN_STATE); } } - if(message instanceof ObjectSelectedMessage) + if (message instanceof ObjectSelectedMessage) { - if(!this.eventDispatcher || !this.object) return; + if (!this.eventDispatcher || !this.object) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.CLOSE_FURNI_CONTEXT_MENU, this.object)); } @@ -42,11 +42,11 @@ export class FurnitureAchievementResolutionLogic extends FurnitureBadgeDisplayLo public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; let event: RoomObjectEvent = null; - switch(this.object.getState(0)) + switch (this.object.getState(0)) { case FurnitureAchievementResolutionLogic.STATE_RESOLUTION_NOT_STARTED: case FurnitureAchievementResolutionLogic.STATE_RESOLUTION_IN_PROGRESS: @@ -60,12 +60,12 @@ export class FurnitureAchievementResolutionLogic extends FurnitureBadgeDisplayLo break; } - if(event) this.eventDispatcher.dispatchEvent(event); + if (event) this.eventDispatcher.dispatchEvent(event); } protected updateBadge(badgeId: string): void { - if(badgeId === FurnitureAchievementResolutionLogic.ACH_NOT_SET) return; + if (badgeId === FurnitureAchievementResolutionLogic.ACH_NOT_SET) return; super.updateBadge(badgeId); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureBadgeDisplayLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureBadgeDisplayLogic.ts index 99a78e19..238247fe 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureBadgeDisplayLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureBadgeDisplayLogic.ts @@ -1,7 +1,7 @@ import { RoomObjectVariable, StringDataType } from '../../../../../api'; +import { RoomObjectBadgeAssetEvent, RoomObjectWidgetRequestEvent } from '../../../../../events'; import { GetTickerTime } from '../../../../../pixi-proxy'; import { RoomObjectUpdateMessage } from '../../../../../room'; -import { RoomObjectBadgeAssetEvent, RoomObjectWidgetRequestEvent } from '../../../events'; import { ObjectDataUpdateMessage, ObjectGroupBadgeUpdateMessage } from '../../../messages'; import { FurnitureLogic } from './FurnitureLogic'; diff --git a/src/nitro/room/object/logic/furniture/FurnitureChangeStateWhenStepOnLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureChangeStateWhenStepOnLogic.ts index d3621175..253ebc49 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureChangeStateWhenStepOnLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureChangeStateWhenStepOnLogic.ts @@ -1,5 +1,5 @@ import { IAssetData, RoomObjectVariable } from '../../../../../api'; -import { RoomToObjectOwnAvatarMoveEvent } from '../../../events'; +import { RoomToObjectOwnAvatarMoveEvent } from '../../../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureChangeStateWhenStepOnLogic extends FurnitureLogic @@ -15,33 +15,33 @@ export class FurnitureChangeStateWhenStepOnLogic extends FurnitureLogic { super.initialize(asset); - if(this.eventDispatcher) this.eventDispatcher.addEventListener(RoomToObjectOwnAvatarMoveEvent.ROAME_MOVE_TO, this.onRoomToObjectOwnAvatarMoveEvent); + if (this.eventDispatcher) this.eventDispatcher.addEventListener(RoomToObjectOwnAvatarMoveEvent.ROAME_MOVE_TO, this.onRoomToObjectOwnAvatarMoveEvent); } public tearDown(): void { - if(this.eventDispatcher) this.eventDispatcher.removeEventListener(RoomToObjectOwnAvatarMoveEvent.ROAME_MOVE_TO, this.onRoomToObjectOwnAvatarMoveEvent); + if (this.eventDispatcher) this.eventDispatcher.removeEventListener(RoomToObjectOwnAvatarMoveEvent.ROAME_MOVE_TO, this.onRoomToObjectOwnAvatarMoveEvent); super.tearDown(); } private onRoomToObjectOwnAvatarMoveEvent(event: RoomToObjectOwnAvatarMoveEvent): void { - if(!event || !this.object) return; + if (!event || !this.object) return; const location = this.object.getLocation(); const targetLocation = event.targetLocation; - if(!targetLocation) return; + if (!targetLocation) return; let sizeX = this.object.model.getValue(RoomObjectVariable.FURNITURE_SIZE_X); let sizeY = this.object.model.getValue(RoomObjectVariable.FURNITURE_SIZE_Y); const direction = (((Math.floor(this.object.getDirection().x) + 45) % 360) / 90); - if((direction === 1) || (direction === 3)) [sizeX, sizeY] = [sizeY, sizeX]; + if ((direction === 1) || (direction === 3)) [sizeX, sizeY] = [sizeY, sizeX]; - if(((targetLocation.x >= location.x) && (targetLocation.x < (location.x + sizeX))) && ((targetLocation.y >= location.y) && (targetLocation.y < (location.y + sizeY)))) + if (((targetLocation.x >= location.x) && (targetLocation.x < (location.x + sizeX))) && ((targetLocation.y >= location.y) && (targetLocation.y < (location.y + sizeY)))) { this.object.setState(1, 0); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureClothingChangeLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureClothingChangeLogic.ts index e71a1ae3..9b55d4a1 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureClothingChangeLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureClothingChangeLogic.ts @@ -1,6 +1,6 @@ import { IAssetData, RoomObjectVariable } from '../../../../../api'; +import { RoomObjectWidgetRequestEvent } from '../../../../../events'; import { RoomObjectUpdateMessage } from '../../../../../room'; -import { RoomObjectWidgetRequestEvent } from '../../../events'; import { ObjectDataUpdateMessage } from '../../../messages'; import { FurnitureLogic } from './FurnitureLogic'; @@ -26,22 +26,22 @@ export class FurnitureClothingChangeLogic extends FurnitureLogic { super.processUpdateMessage(message); - if(message instanceof ObjectDataUpdateMessage) message.data && this.updateClothingData(message.data.getLegacyString()); + if (message instanceof ObjectDataUpdateMessage) message.data && this.updateClothingData(message.data.getLegacyString()); } private updateClothingData(furnitureData: string): void { - if(!furnitureData || !furnitureData.length) return; + if (!furnitureData || !furnitureData.length) return; const [boyClothing, girlClothing] = furnitureData.split(','); - if(boyClothing && boyClothing.length) this.object.model.setValue(RoomObjectVariable.FURNITURE_CLOTHING_BOY, boyClothing); - if(girlClothing && girlClothing.length) this.object.model.setValue(RoomObjectVariable.FURNITURE_CLOTHING_GIRL, girlClothing); + if (boyClothing && boyClothing.length) this.object.model.setValue(RoomObjectVariable.FURNITURE_CLOTHING_BOY, boyClothing); + if (girlClothing && girlClothing.length) this.object.model.setValue(RoomObjectVariable.FURNITURE_CLOTHING_GIRL, girlClothing); } public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.CLOTHING_CHANGE, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureCounterClockLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureCounterClockLogic.ts index cebd64b7..77823166 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureCounterClockLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureCounterClockLogic.ts @@ -1,7 +1,7 @@ import { IRoomGeometry } from '../../../../../api'; +import { RoomObjectStateChangedEvent } from '../../../../../events'; import { RoomObjectEvent, RoomSpriteMouseEvent } from '../../../../../room'; import { MouseEventType } from '../../../../ui'; -import { RoomObjectStateChangedEvent } from '../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureCounterClockLogic extends FurnitureLogic @@ -15,14 +15,14 @@ export class FurnitureCounterClockLogic extends FurnitureLogic public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if(!event || !geometry || !this.object) return; + if (!event || !geometry || !this.object) return; let objectEvent: RoomObjectEvent = null; - switch(event.type) + switch (event.type) { case MouseEventType.DOUBLE_CLICK: - switch(event.spriteTag) + switch (event.spriteTag) { case 'start_stop': objectEvent = new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_CHANGE, this.object, 1); @@ -32,7 +32,7 @@ export class FurnitureCounterClockLogic extends FurnitureLogic break; } - if(this.eventDispatcher && objectEvent) + if (this.eventDispatcher && objectEvent) { this.eventDispatcher.dispatchEvent(objectEvent); @@ -46,7 +46,7 @@ export class FurnitureCounterClockLogic extends FurnitureLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_CHANGE, this.object, 1)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureCreditLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureCreditLogic.ts index 33432f0b..7441621a 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureCreditLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureCreditLogic.ts @@ -1,5 +1,5 @@ import { IAssetData, RoomObjectVariable } from '../../../../../api'; -import { RoomObjectWidgetRequestEvent } from '../../../events'; +import { RoomObjectWidgetRequestEvent } from '../../../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureCreditLogic extends FurnitureLogic @@ -19,9 +19,9 @@ export class FurnitureCreditLogic extends FurnitureLogic let creditValue = 0; - if(asset.logic) + if (asset.logic) { - if(asset.logic.credits && (asset.logic.credits !== '') && (asset.logic.credits.length > 0)) creditValue = parseInt(asset.logic.credits); + if (asset.logic.credits && (asset.logic.credits !== '') && (asset.logic.credits.length > 0)) creditValue = parseInt(asset.logic.credits); } this.object.model.setValue(RoomObjectVariable.FURNITURE_CREDIT_VALUE, creditValue); @@ -29,7 +29,7 @@ export class FurnitureCreditLogic extends FurnitureLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.CREDITFURNI, this.object)); diff --git a/src/nitro/room/object/logic/furniture/FurnitureCuckooClockLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureCuckooClockLogic.ts index cfdc1f84..7a305ae0 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureCuckooClockLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureCuckooClockLogic.ts @@ -1,5 +1,5 @@ +import { RoomObjectPlaySoundIdEvent } from '../../../../../events'; import { RoomObjectUpdateMessage } from '../../../../../room'; -import { RoomObjectPlaySoundIdEvent } from '../../../events'; import { ObjectDataUpdateMessage } from '../../../messages'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; @@ -9,7 +9,7 @@ export class FurnitureCuckooClockLogic extends FurnitureMultiStateLogic public getEventTypes(): string[] { - const types = [ RoomObjectPlaySoundIdEvent.PLAY_SOUND_AT_PITCH ]; + const types = [RoomObjectPlaySoundIdEvent.PLAY_SOUND_AT_PITCH]; return this.mergeTypes(super.getEventTypes(), types); } @@ -18,9 +18,9 @@ export class FurnitureCuckooClockLogic extends FurnitureMultiStateLogic { super.processUpdateMessage(message); - if(message instanceof ObjectDataUpdateMessage) + if (message instanceof ObjectDataUpdateMessage) { - if((this._state !== -1) && (message.state !== this._state)) + if ((this._state !== -1) && (message.state !== this._state)) { this.dispatchSoundEvent(this.object.location.z); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureCustomStackHeightLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureCustomStackHeightLogic.ts index 00015d9f..9c8a7c4c 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureCustomStackHeightLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureCustomStackHeightLogic.ts @@ -1,5 +1,5 @@ import { IAssetData, RoomObjectVariable } from '../../../../../api'; -import { RoomObjectWidgetRequestEvent } from '../../../events'; +import { RoomObjectWidgetRequestEvent } from '../../../../../events'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; export class FurnitureCustomStackHeightLogic extends FurnitureMultiStateLogic @@ -17,12 +17,12 @@ export class FurnitureCustomStackHeightLogic extends FurnitureMultiStateLogic { super.initialize(asset); - if(this.object && this.object.model) this.object.model.setValue(RoomObjectVariable.FURNITURE_ALWAYS_STACKABLE, 1); + if (this.object && this.object.model) this.object.model.setValue(RoomObjectVariable.FURNITURE_ALWAYS_STACKABLE, 1); } public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.STACK_HEIGHT, this.object)); diff --git a/src/nitro/room/object/logic/furniture/FurnitureDiceLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureDiceLogic.ts index c61697ef..3e63b6ef 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureDiceLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureDiceLogic.ts @@ -1,7 +1,7 @@ import { IRoomGeometry } from '../../../../../api'; +import { RoomObjectFurnitureActionEvent } from '../../../../../events'; import { RoomObjectEvent, RoomSpriteMouseEvent } from '../../../../../room'; import { MouseEventType } from '../../../../ui'; -import { RoomObjectFurnitureActionEvent } from '../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureDiceLogic extends FurnitureLogic @@ -26,16 +26,16 @@ export class FurnitureDiceLogic extends FurnitureLogic public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if(!event || !geometry || !this.object) return; + if (!event || !geometry || !this.object) return; let objectEvent: RoomObjectEvent = null; - switch(event.type) + switch (event.type) { case MouseEventType.DOUBLE_CLICK: - if(this._noTags) + if (this._noTags) { - if(((!(this._noTagsLastStateActivate)) || (this.object.getState(0) === 0)) || (this.object.getState(0) === 100)) + if (((!(this._noTagsLastStateActivate)) || (this.object.getState(0) === 0)) || (this.object.getState(0) === 100)) { objectEvent = new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.DICE_ACTIVATE, this.object); @@ -50,18 +50,18 @@ export class FurnitureDiceLogic extends FurnitureLogic } else { - if(((event.spriteTag === 'activate') || (this.object.getState(0) === 0)) || (this.object.getState(0) === 100)) + if (((event.spriteTag === 'activate') || (this.object.getState(0) === 0)) || (this.object.getState(0) === 100)) { objectEvent = new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.DICE_ACTIVATE, this.object); } - else if(event.spriteTag === 'deactivate') + else if (event.spriteTag === 'deactivate') { objectEvent = new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.DICE_OFF, this.object); } } - if(objectEvent && this.eventDispatcher) this.eventDispatcher.dispatchEvent(objectEvent); + if (objectEvent && this.eventDispatcher) this.eventDispatcher.dispatchEvent(objectEvent); return; } diff --git a/src/nitro/room/object/logic/furniture/FurnitureEcotronBoxLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureEcotronBoxLogic.ts index afdf0a86..af1a4f2e 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureEcotronBoxLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureEcotronBoxLogic.ts @@ -1,4 +1,4 @@ -import { RoomObjectWidgetRequestEvent } from '../../../events'; +import { RoomObjectWidgetRequestEvent } from '../../../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureEcotronBoxLogic extends FurnitureLogic @@ -14,7 +14,7 @@ export class FurnitureEcotronBoxLogic extends FurnitureLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.ECOTRONBOX, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureEditableInternalLinkLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureEditableInternalLinkLogic.ts index 4432f1d4..41196e80 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureEditableInternalLinkLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureEditableInternalLinkLogic.ts @@ -1,7 +1,7 @@ import { IAssetData, IRoomGeometry, RoomObjectVariable } from '../../../../../api'; +import { RoomObjectWidgetRequestEvent } from '../../../../../events'; import { RoomSpriteMouseEvent } from '../../../../../room'; import { MouseEventType } from '../../../../ui'; -import { RoomObjectWidgetRequestEvent } from '../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureEditableInternalLinkLogic extends FurnitureLogic @@ -28,11 +28,11 @@ export class FurnitureEditableInternalLinkLogic extends FurnitureLogic { super.initialize(asset); - if(asset.logic) + if (asset.logic) { - if(asset.logic.action) + if (asset.logic.action) { - if(asset.logic.action.startState === 1) this._showStateOnceRendered = true; + if (asset.logic.action.startState === 1) this._showStateOnceRendered = true; } } } @@ -41,11 +41,11 @@ export class FurnitureEditableInternalLinkLogic extends FurnitureLogic { super.update(time); - if(!this._showStateOnceRendered) return; + if (!this._showStateOnceRendered) return; this._updateCount++; - if(this._showStateOnceRendered && (this._updateCount > 20)) + if (this._showStateOnceRendered && (this._updateCount > 20)) { this.setAutomaticStateIndex(1); @@ -55,9 +55,9 @@ export class FurnitureEditableInternalLinkLogic extends FurnitureLogic private setAutomaticStateIndex(state: number): void { - if(!this.object) return; + if (!this.object) return; - if(this.object.model) + if (this.object.model) { this.object.model.setValue(RoomObjectVariable.FURNITURE_AUTOMATIC_STATE_INDEX, state); } @@ -65,9 +65,9 @@ export class FurnitureEditableInternalLinkLogic extends FurnitureLogic public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if(!event || !geometry) return; + if (!event || !geometry) return; - if(event.type === MouseEventType.DOUBLE_CLICK) + if (event.type === MouseEventType.DOUBLE_CLICK) { this.setAutomaticStateIndex(0); } @@ -77,7 +77,7 @@ export class FurnitureEditableInternalLinkLogic extends FurnitureLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.INERNAL_LINK, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureEditableRoomLinkLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureEditableRoomLinkLogic.ts index 7b6f7950..7c137cfa 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureEditableRoomLinkLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureEditableRoomLinkLogic.ts @@ -1,5 +1,5 @@ import { IAssetData, RoomObjectVariable } from '../../../../../api'; -import { RoomObjectWidgetRequestEvent } from '../../../events'; +import { RoomObjectWidgetRequestEvent } from '../../../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureEditableRoomLinkLogic extends FurnitureLogic @@ -17,11 +17,11 @@ export class FurnitureEditableRoomLinkLogic extends FurnitureLogic { super.initialize(asset); - if(asset.logic) + if (asset.logic) { - if(asset.logic.action) + if (asset.logic.action) { - if(asset.logic.action.link && (asset.logic.action.link !== '') && (asset.logic.action.link.length > 0)) + if (asset.logic.action.link && (asset.logic.action.link !== '') && (asset.logic.action.link.length > 0)) { (this.object && this.object.model && this.object.model.setValue(RoomObjectVariable.FURNITURE_INTERNAL_LINK, asset.logic.action.link)); } @@ -31,7 +31,7 @@ export class FurnitureEditableRoomLinkLogic extends FurnitureLogic protected onDispose(): void { - if(this._timer) + if (this._timer) { clearTimeout(this._timer); @@ -43,9 +43,9 @@ export class FurnitureEditableRoomLinkLogic extends FurnitureLogic private setAutomaticStateIndex(state: number): void { - if(!this.object) return; + if (!this.object) return; - if(this.object.model) + if (this.object.model) { this.object.model.setValue(RoomObjectVariable.FURNITURE_AUTOMATIC_STATE_INDEX, state); } @@ -55,7 +55,7 @@ export class FurnitureEditableRoomLinkLogic extends FurnitureLogic { this.setAutomaticStateIndex(1); - if(this._timer) + if (this._timer) { clearTimeout(this._timer); @@ -69,7 +69,7 @@ export class FurnitureEditableRoomLinkLogic extends FurnitureLogic this._timer = null; }, 2500); - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.ROOM_LINK, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureEffectBoxLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureEffectBoxLogic.ts index 699d0a49..844bf72d 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureEffectBoxLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureEffectBoxLogic.ts @@ -1,5 +1,5 @@ +import { RoomObjectWidgetRequestEvent } from '../../../../../events'; import { ContextMenuEnum } from '../../../../ui'; -import { RoomObjectWidgetRequestEvent } from '../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureEffectBoxLogic extends FurnitureLogic @@ -15,7 +15,7 @@ export class FurnitureEffectBoxLogic extends FurnitureLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.EFFECTBOX_OPEN_DIALOG, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureExternalImageLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureExternalImageLogic.ts index 429c5023..82676ec2 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureExternalImageLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureExternalImageLogic.ts @@ -1,5 +1,5 @@ import { IAssetData, RoomObjectVariable } from '../../../../../api'; -import { RoomObjectWidgetRequestEvent } from '../../../events'; +import { RoomObjectWidgetRequestEvent } from '../../../../../events'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; export class FurnitureExternalImageLogic extends FurnitureMultiStateLogic @@ -17,15 +17,15 @@ export class FurnitureExternalImageLogic extends FurnitureMultiStateLogic { super.initialize(asset); - if(!asset) return; + if (!asset) return; - if(this.object && this.object.model) + if (this.object && this.object.model) { let maskType = ''; - if(asset.logic) + if (asset.logic) { - if(asset.logic.maskType && (asset.logic.maskType !== '') && (asset.logic.maskType.length > 0)) maskType = asset.logic.maskType; + if (asset.logic.maskType && (asset.logic.maskType !== '') && (asset.logic.maskType.length > 0)) maskType = asset.logic.maskType; } this.object.model.setValue(RoomObjectVariable.FURNITURE_USES_PLANE_MASK, 0); @@ -35,7 +35,7 @@ export class FurnitureExternalImageLogic extends FurnitureMultiStateLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.EXTERNAL_IMAGE, this.object)); diff --git a/src/nitro/room/object/logic/furniture/FurnitureFireworksLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureFireworksLogic.ts index 9a78ad22..025a5cff 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureFireworksLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureFireworksLogic.ts @@ -1,7 +1,7 @@ import { IAssetData, IParticleSystem, IRoomGeometry, RoomObjectVariable } from '../../../../../api'; +import { RoomObjectStateChangedEvent } from '../../../../../events'; import { RoomObjectEvent, RoomSpriteMouseEvent } from '../../../../../room'; import { MouseEventType } from '../../../../ui'; -import { RoomObjectStateChangedEvent } from '../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureFireworksLogic extends FurnitureLogic @@ -17,9 +17,9 @@ export class FurnitureFireworksLogic extends FurnitureLogic { super.initialize(asset); - if(asset.logic) + if (asset.logic) { - if(asset.logic.particleSystems && asset.logic.particleSystems.length) + if (asset.logic.particleSystems && asset.logic.particleSystems.length) { this.object.model.setValue(RoomObjectVariable.FURNITURE_FIREWORKS_DATA, asset.logic.particleSystems); } @@ -28,14 +28,14 @@ export class FurnitureFireworksLogic extends FurnitureLogic public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if(!event || !geometry || !this.object) return; + if (!event || !geometry || !this.object) return; let objectEvent: RoomObjectEvent = null; - switch(event.type) + switch (event.type) { case MouseEventType.DOUBLE_CLICK: - switch(event.spriteTag) + switch (event.spriteTag) { case 'start_stop': objectEvent = new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_CHANGE, this.object, 1); @@ -45,7 +45,7 @@ export class FurnitureFireworksLogic extends FurnitureLogic break; } - if(this.eventDispatcher && objectEvent) + if (this.eventDispatcher && objectEvent) { this.eventDispatcher.dispatchEvent(objectEvent); @@ -59,7 +59,7 @@ export class FurnitureFireworksLogic extends FurnitureLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_CHANGE, this.object, 0)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureFloorHoleLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureFloorHoleLogic.ts index 1caa3305..6c67390d 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureFloorHoleLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureFloorHoleLogic.ts @@ -1,6 +1,6 @@ import { RoomObjectVariable, Vector3d } from '../../../../../api'; +import { RoomObjectFloorHoleEvent } from '../../../../../events'; import { RoomObjectUpdateMessage } from '../../../../../room'; -import { RoomObjectFloorHoleEvent } from '../../../events'; import { ObjectDataUpdateMessage } from '../../../messages'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; @@ -28,7 +28,7 @@ export class FurnitureFloorHoleLogic extends FurnitureMultiStateLogic protected onDispose(): void { - if(this._currentState === FurnitureFloorHoleLogic.STATE_HOLE) + if (this._currentState === FurnitureFloorHoleLogic.STATE_HOLE) { this.eventDispatcher.dispatchEvent(new RoomObjectFloorHoleEvent(RoomObjectFloorHoleEvent.REMOVE_HOLE, this.object)); } @@ -47,26 +47,26 @@ export class FurnitureFloorHoleLogic extends FurnitureMultiStateLogic { super.processUpdateMessage(message); - if(!this.object) return; + if (!this.object) return; - if(message instanceof ObjectDataUpdateMessage) + if (message instanceof ObjectDataUpdateMessage) { this.handleStateUpdate(this.object.getState(0)); } const location = this.object.getLocation(); - if(!this._currentLocation) + if (!this._currentLocation) { this._currentLocation = new Vector3d(); } else { - if((location.x !== this._currentLocation.x) || (location.y !== this._currentLocation.y)) + if ((location.x !== this._currentLocation.x) || (location.y !== this._currentLocation.y)) { - if(this._currentState === FurnitureFloorHoleLogic.STATE_HOLE) + if (this._currentState === FurnitureFloorHoleLogic.STATE_HOLE) { - if(this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectFloorHoleEvent(RoomObjectFloorHoleEvent.ADD_HOLE, this.object)); + if (this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectFloorHoleEvent(RoomObjectFloorHoleEvent.ADD_HOLE, this.object)); } } } @@ -76,16 +76,16 @@ export class FurnitureFloorHoleLogic extends FurnitureMultiStateLogic private handleStateUpdate(state: number): void { - if(state === this._currentState) return; + if (state === this._currentState) return; - if(this.eventDispatcher) + if (this.eventDispatcher) { - if(state === FurnitureFloorHoleLogic.STATE_HOLE) + if (state === FurnitureFloorHoleLogic.STATE_HOLE) { this.eventDispatcher.dispatchEvent(new RoomObjectFloorHoleEvent(RoomObjectFloorHoleEvent.ADD_HOLE, this.object)); } - else if(this._currentState === FurnitureFloorHoleLogic.STATE_HOLE) + else if (this._currentState === FurnitureFloorHoleLogic.STATE_HOLE) { this.eventDispatcher.dispatchEvent(new RoomObjectFloorHoleEvent(RoomObjectFloorHoleEvent.REMOVE_HOLE, this.object)); } @@ -96,14 +96,14 @@ export class FurnitureFloorHoleLogic extends FurnitureMultiStateLogic private handleAutomaticStateUpdate(): void { - if(!this.object) return; + if (!this.object) return; const model = this.object.model; - if(!model) return; + if (!model) return; const stateIndex = model.getValue(RoomObjectVariable.FURNITURE_AUTOMATIC_STATE_INDEX); - if(!isNaN(stateIndex)) this.handleStateUpdate((stateIndex % 2)); + if (!isNaN(stateIndex)) this.handleStateUpdate((stateIndex % 2)); } } diff --git a/src/nitro/room/object/logic/furniture/FurnitureFriendFurniLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureFriendFurniLogic.ts index d1f5d578..2e8a92c1 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureFriendFurniLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureFriendFurniLogic.ts @@ -1,7 +1,7 @@ import { IAssetData, RoomObjectVariable, StringDataType } from '../../../../../api'; +import { RoomObjectWidgetRequestEvent } from '../../../../../events'; import { RoomObjectUpdateMessage } from '../../../../../room'; import { ContextMenuEnum } from '../../../../ui'; -import { RoomObjectWidgetRequestEvent } from '../../../events'; import { ObjectDataUpdateMessage } from '../../../messages'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; @@ -17,16 +17,16 @@ export class FurnitureFriendFurniLogic extends FurnitureMultiStateLogic { super.initialize(asset); - if(this.object) this.object.model.setValue(RoomObjectVariable.FURNITURE_FRIENDFURNI_ENGRAVING, this.engravingDialogType); + if (this.object) this.object.model.setValue(RoomObjectVariable.FURNITURE_FRIENDFURNI_ENGRAVING, this.engravingDialogType); } public processUpdateMessage(message: RoomObjectUpdateMessage): void { - if(message instanceof ObjectDataUpdateMessage) + if (message instanceof ObjectDataUpdateMessage) { const data = (message.data as StringDataType); - if(data) + if (data) { this._state = data.state; } @@ -48,9 +48,9 @@ export class FurnitureFriendFurniLogic extends FurnitureMultiStateLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; - if(this._state === FurnitureFriendFurniLogic.STATE_LOCKED) + if (this._state === FurnitureFriendFurniLogic.STATE_LOCKED) { this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.FRIEND_FURNITURE_ENGRAVING, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureGroupForumTerminalLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureGroupForumTerminalLogic.ts index b5366630..9be4b2d3 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureGroupForumTerminalLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureGroupForumTerminalLogic.ts @@ -1,5 +1,5 @@ import { RoomObjectVariable } from '../../../../../api'; -import { RoomObjectWidgetRequestEvent } from '../../../events'; +import { RoomObjectWidgetRequestEvent } from '../../../../../events'; import { FurnitureGuildCustomizedLogic } from './FurnitureGuildCustomizedLogic'; export class FurnitureGroupForumTerminalLogic extends FurnitureGuildCustomizedLogic @@ -22,7 +22,7 @@ export class FurnitureGroupForumTerminalLogic extends FurnitureGuildCustomizedLo public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.INERNAL_LINK, this.object)); diff --git a/src/nitro/room/object/logic/furniture/FurnitureGuildCustomizedLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureGuildCustomizedLogic.ts index 10c55e20..2531b7b7 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureGuildCustomizedLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureGuildCustomizedLogic.ts @@ -1,8 +1,8 @@ import { IRoomGeometry, RoomObjectVariable, StringDataType } from '../../../../../api'; +import { RoomObjectBadgeAssetEvent, RoomObjectWidgetRequestEvent } from '../../../../../events'; import { GetTickerTime } from '../../../../../pixi-proxy'; import { RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room'; import { MouseEventType } from '../../../../ui'; -import { RoomObjectBadgeAssetEvent, RoomObjectWidgetRequestEvent } from '../../../events'; import { ObjectDataUpdateMessage, ObjectGroupBadgeUpdateMessage, ObjectSelectedMessage } from '../../../messages'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; diff --git a/src/nitro/room/object/logic/furniture/FurnitureHabboWheelLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureHabboWheelLogic.ts index de8d69a7..cfba25d7 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureHabboWheelLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureHabboWheelLogic.ts @@ -1,4 +1,4 @@ -import { RoomObjectFurnitureActionEvent } from '../../../events'; +import { RoomObjectFurnitureActionEvent } from '../../../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureHabboWheelLogic extends FurnitureLogic @@ -12,7 +12,7 @@ export class FurnitureHabboWheelLogic extends FurnitureLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.USE_HABBOWHEEL, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureHighScoreLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureHighScoreLogic.ts index 6f03eae7..28fbc392 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureHighScoreLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureHighScoreLogic.ts @@ -1,6 +1,6 @@ import { RoomObjectVariable } from '../../../../../api'; +import { RoomObjectWidgetRequestEvent } from '../../../../../events'; import { RoomObjectUpdateMessage } from '../../../../../room'; -import { RoomObjectWidgetRequestEvent } from '../../../events'; import { ObjectDataUpdateMessage } from '../../../messages'; import { FurnitureLogic } from './FurnitureLogic'; @@ -17,7 +17,7 @@ export class FurnitureHighScoreLogic extends FurnitureLogic public tearDown(): void { - if(this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) + if (this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) { this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.HIDE_HIGH_SCORE_DISPLAY, this.object)); } @@ -29,11 +29,11 @@ export class FurnitureHighScoreLogic extends FurnitureLogic { super.processUpdateMessage(message); - if(this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) !== 1) return; + if (this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) !== 1) return; - if(message instanceof ObjectDataUpdateMessage) + if (message instanceof ObjectDataUpdateMessage) { - if(message.state === FurnitureHighScoreLogic.SHOW_WIDGET_IN_STATE) + if (message.state === FurnitureHighScoreLogic.SHOW_WIDGET_IN_STATE) { this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.HIGH_SCORE_DISPLAY, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureHockeyScoreLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureHockeyScoreLogic.ts index e656c710..eee51303 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureHockeyScoreLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureHockeyScoreLogic.ts @@ -1,7 +1,7 @@ import { IRoomGeometry } from '../../../../../api'; +import { RoomObjectStateChangedEvent } from '../../../../../events'; import { RoomObjectEvent, RoomSpriteMouseEvent } from '../../../../../room'; import { MouseEventType } from '../../../../ui'; -import { RoomObjectStateChangedEvent } from '../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureHockeyScoreLogic extends FurnitureLogic @@ -15,14 +15,14 @@ export class FurnitureHockeyScoreLogic extends FurnitureLogic public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if(!event || !geometry || !this.object) return; + if (!event || !geometry || !this.object) return; let objectEvent: RoomObjectEvent = null; - switch(event.type) + switch (event.type) { case MouseEventType.DOUBLE_CLICK: - switch(event.spriteTag) + switch (event.spriteTag) { case 'off': objectEvent = new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_CHANGE, this.object, 3); @@ -30,7 +30,7 @@ export class FurnitureHockeyScoreLogic extends FurnitureLogic } break; case MouseEventType.MOUSE_CLICK: - switch(event.spriteTag) + switch (event.spriteTag) { case 'inc': objectEvent = new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_CHANGE, this.object, 2); @@ -42,7 +42,7 @@ export class FurnitureHockeyScoreLogic extends FurnitureLogic break; } - if(this.eventDispatcher && objectEvent) + if (this.eventDispatcher && objectEvent) { this.eventDispatcher.dispatchEvent(objectEvent); @@ -54,7 +54,7 @@ export class FurnitureHockeyScoreLogic extends FurnitureLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_CHANGE, this.object, 3)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureInternalLinkLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureInternalLinkLogic.ts index 144164f7..e2b29b23 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureInternalLinkLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureInternalLinkLogic.ts @@ -1,7 +1,7 @@ import { IAssetData, IRoomGeometry, RoomObjectVariable } from '../../../../../api'; +import { RoomObjectWidgetRequestEvent } from '../../../../../events'; import { RoomSpriteMouseEvent } from '../../../../../room'; import { MouseEventType } from '../../../../ui'; -import { RoomObjectWidgetRequestEvent } from '../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureInternalLinkLogic extends FurnitureLogic @@ -22,13 +22,13 @@ export class FurnitureInternalLinkLogic extends FurnitureLogic { super.initialize(asset); - if(asset.logic) + if (asset.logic) { - if(asset.logic.action) + if (asset.logic.action) { this.object.model.setValue(RoomObjectVariable.FURNITURE_INTERNAL_LINK, asset.logic.action.link); - if(asset.logic.action.startState === 1) this._showStateOnceRendered = true; + if (asset.logic.action.startState === 1) this._showStateOnceRendered = true; } } } @@ -37,11 +37,11 @@ export class FurnitureInternalLinkLogic extends FurnitureLogic { super.update(time); - if(!this._showStateOnceRendered) return; + if (!this._showStateOnceRendered) return; this._updateCount++; - if(this._showStateOnceRendered && (this._updateCount === 20)) + if (this._showStateOnceRendered && (this._updateCount === 20)) { this.setAutomaticStateIndex(1); @@ -51,9 +51,9 @@ export class FurnitureInternalLinkLogic extends FurnitureLogic private setAutomaticStateIndex(state: number): void { - if(!this.object) return; + if (!this.object) return; - if(this.object.model) + if (this.object.model) { this.object.model.setValue(RoomObjectVariable.FURNITURE_AUTOMATIC_STATE_INDEX, state); } @@ -61,9 +61,9 @@ export class FurnitureInternalLinkLogic extends FurnitureLogic public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if(!event || !geometry) return; + if (!event || !geometry) return; - if((event.type === MouseEventType.DOUBLE_CLICK) && this._showStateOnceRendered) + if ((event.type === MouseEventType.DOUBLE_CLICK) && this._showStateOnceRendered) { this.setAutomaticStateIndex(0); } @@ -73,7 +73,7 @@ export class FurnitureInternalLinkLogic extends FurnitureLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.INERNAL_LINK, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureJukeboxLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureJukeboxLogic.ts index 8b8e68d4..428bb12c 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureJukeboxLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureJukeboxLogic.ts @@ -1,7 +1,7 @@ import { RoomObjectVariable } from '../../../../../api'; +import { RoomObjectFurnitureActionEvent, RoomObjectStateChangedEvent, RoomObjectWidgetRequestEvent } from '../../../../../events'; import { RoomObjectUpdateMessage } from '../../../../../room'; import { RoomWidgetEnumItemExtradataParameter } from '../../../../ui'; -import { RoomObjectFurnitureActionEvent, RoomObjectStateChangedEvent, RoomObjectWidgetRequestEvent } from '../../../events'; import { ObjectDataUpdateMessage } from '../../../messages'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; @@ -35,29 +35,29 @@ export class FurnitureJukeboxLogic extends FurnitureMultiStateLogic { super.processUpdateMessage(message); - if(this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) !== 1) return; + if (this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) !== 1) return; - if(!this._isInitialized) this.requestInit(); + if (!this._isInitialized) this.requestInit(); this.object.model.setValue(RoomWidgetEnumItemExtradataParameter.INFOSTAND_EXTRA_PARAM, RoomWidgetEnumItemExtradataParameter.JUKEBOX); - if(message instanceof ObjectDataUpdateMessage) + if (message instanceof ObjectDataUpdateMessage) { const state = this.object.getState(0); - if(state !== this._currentState) + if (state !== this._currentState) { this._currentState = state; - if(state === 1) this.requestPlayList(); - else if(state === 0) this.requestStopPlaying(); + if (state === 1) this.requestPlayList(); + else if (state === 0) this.requestStopPlaying(); } } } private requestInit(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this._disposeEventsAllowed = true; @@ -68,7 +68,7 @@ export class FurnitureJukeboxLogic extends FurnitureMultiStateLogic private requestPlayList(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this._disposeEventsAllowed = true; @@ -77,21 +77,21 @@ export class FurnitureJukeboxLogic extends FurnitureMultiStateLogic private requestStopPlaying(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.JUKEBOX_MACHINE_STOP, this.object)); } private requestDispose(): void { - if(!this._disposeEventsAllowed || !this.object || !this.eventDispatcher) return; + if (!this._disposeEventsAllowed || !this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.JUKEBOX_DISPOSE, this.object)); } public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.JUKEBOX_PLAYLIST_EDITOR, this.object)); this.eventDispatcher.dispatchEvent(new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_CHANGE, this.object, -1)); diff --git a/src/nitro/room/object/logic/furniture/FurnitureLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureLogic.ts index 11f20def..e884a8fe 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureLogic.ts @@ -1,8 +1,8 @@ import { IAssetData, IRoomGeometry, IRoomObjectController, IRoomObjectModel, IVector3D, RoomObjectVariable, Vector3d } from '../../../../../api'; +import { RoomObjectRoomAdEvent, RoomObjectStateChangedEvent, RoomObjectWidgetRequestEvent } from '../../../../../events'; import { RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room'; import { Nitro } from '../../../../Nitro'; import { MouseEventType } from '../../../../ui'; -import { RoomObjectRoomAdEvent, RoomObjectStateChangedEvent, RoomObjectWidgetRequestEvent } from '../../../events'; import { ObjectDataUpdateMessage, ObjectHeightUpdateMessage, ObjectItemDataUpdateMessage, ObjectMoveUpdateMessage, ObjectSelectedMessage } from '../../../messages'; import { MovingObjectLogic } from '../MovingObjectLogic'; @@ -47,12 +47,12 @@ export class FurnitureLogic extends MovingObjectLogic this._storedRotateMessage = null; this._directionInitialized = false; - if(FurnitureLogic.BOUNCING_STEPS === -1) + if (FurnitureLogic.BOUNCING_STEPS === -1) { FurnitureLogic.BOUNCING_STEPS = Nitro.instance.getConfiguration('furni.rotation.bounce.steps', 8); } - if(FurnitureLogic.BOUNCING_Z === -1) + if (FurnitureLogic.BOUNCING_Z === -1) { FurnitureLogic.BOUNCING_Z = Nitro.instance.getConfiguration('furni.rotation.bounce.height', 0.0625); } @@ -70,28 +70,28 @@ export class FurnitureLogic extends MovingObjectLogic RoomObjectRoomAdEvent.ROOM_AD_FURNI_DOUBLE_CLICK, RoomObjectRoomAdEvent.ROOM_AD_FURNI_CLICK]; - if(this.widget) types.push(RoomObjectWidgetRequestEvent.OPEN_WIDGET, RoomObjectWidgetRequestEvent.CLOSE_WIDGET); + if (this.widget) types.push(RoomObjectWidgetRequestEvent.OPEN_WIDGET, RoomObjectWidgetRequestEvent.CLOSE_WIDGET); - if(this.contextMenu) types.push(RoomObjectWidgetRequestEvent.OPEN_FURNI_CONTEXT_MENU, RoomObjectWidgetRequestEvent.CLOSE_FURNI_CONTEXT_MENU); + if (this.contextMenu) types.push(RoomObjectWidgetRequestEvent.OPEN_FURNI_CONTEXT_MENU, RoomObjectWidgetRequestEvent.CLOSE_FURNI_CONTEXT_MENU); return this.mergeTypes(super.getEventTypes(), types); } public initialize(asset: IAssetData): void { - if(!asset) return; + if (!asset) return; const model = this.object && this.object.model; - if(!model) return; + if (!model) return; - if(asset.logic) + if (asset.logic) { - if(asset.logic.model) + if (asset.logic.model) { const dimensions = asset.logic.model.dimensions; - if(dimensions) + if (dimensions) { this._sizeX = dimensions.x; this._sizeY = dimensions.y; @@ -104,19 +104,19 @@ export class FurnitureLogic extends MovingObjectLogic const directions = asset.logic.model.directions; - if(directions && directions.length) + if (directions && directions.length) { - for(const direction of directions) this._directions.push(direction); + for (const direction of directions) this._directions.push(direction); this._directions.sort((a, b) => (a - b)); } } - if(asset.logic.customVars) + if (asset.logic.customVars) { const variables = asset.logic.customVars.variables; - if(variables && variables.length) + if (variables && variables.length) { model.setValue(RoomObjectVariable.FURNITURE_CUSTOM_VARIABLES, variables); } @@ -145,7 +145,7 @@ export class FurnitureLogic extends MovingObjectLogic { super.setObject(object); - if(object && object.getLocation().length) this._directionInitialized = true; + if (object && object.getLocation().length) this._directionInitialized = true; } protected getAdClickUrl(model: IRoomObjectModel): string @@ -155,7 +155,7 @@ export class FurnitureLogic extends MovingObjectLogic protected handleAdClick(objectId: number, objectType: string, clickUrl: string): void { - if(!this.eventDispatcher) return; + if (!this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectRoomAdEvent(RoomObjectRoomAdEvent.ROOM_AD_FURNI_CLICK, this.object)); } @@ -164,31 +164,31 @@ export class FurnitureLogic extends MovingObjectLogic { super.update(time); - if(this._bouncingStep > 0) + if (this._bouncingStep > 0) { this._bouncingStep++; - if(this._bouncingStep > FurnitureLogic.BOUNCING_STEPS) this._bouncingStep = 0; + if (this._bouncingStep > FurnitureLogic.BOUNCING_STEPS) this._bouncingStep = 0; } } public processUpdateMessage(message: RoomObjectUpdateMessage): void { - if(message instanceof ObjectDataUpdateMessage) + if (message instanceof ObjectDataUpdateMessage) { this.processDataUpdateMessage(message); return; } - if(message instanceof ObjectHeightUpdateMessage) + if (message instanceof ObjectHeightUpdateMessage) { this.processObjectHeightUpdateMessage(message); return; } - if(message instanceof ObjectItemDataUpdateMessage) + if (message instanceof ObjectItemDataUpdateMessage) { this.processItemDataUpdateMessage(message); @@ -197,16 +197,16 @@ export class FurnitureLogic extends MovingObjectLogic this._mouseOver = false; - if(message.location && message.direction) + if (message.location && message.direction) { - if(!(message instanceof ObjectMoveUpdateMessage)) + if (!(message instanceof ObjectMoveUpdateMessage)) { const direction = this.object.getDirection(); const location = this.object.getLocation(); - if((direction.x !== message.direction.x) && this._directionInitialized) + if ((direction.x !== message.direction.x) && this._directionInitialized) { - if((location.x === message.location.x) && (location.y === message.location.y) && (location.z === message.location.z)) + if ((location.x === message.location.x) && (location.y === message.location.y) && (location.z === message.location.z)) { this._bouncingStep = 1; this._storedRotateMessage = new RoomObjectUpdateMessage(message.location, message.direction); @@ -219,9 +219,9 @@ export class FurnitureLogic extends MovingObjectLogic this._directionInitialized = true; } - if(message instanceof ObjectSelectedMessage) + if (message instanceof ObjectSelectedMessage) { - if(this.contextMenu && this.eventDispatcher && this.object) + if (this.contextMenu && this.eventDispatcher && this.object) { const eventType = (message.selected) ? RoomObjectWidgetRequestEvent.OPEN_FURNI_CONTEXT_MENU : RoomObjectWidgetRequestEvent.CLOSE_FURNI_CONTEXT_MENU; @@ -234,27 +234,27 @@ export class FurnitureLogic extends MovingObjectLogic private processDataUpdateMessage(message: ObjectDataUpdateMessage): void { - if(!message) return; + if (!message) return; this.object.setState(message.state, 0); - if(message.data) message.data.writeRoomObjectModel(this.object.model); + if (message.data) message.data.writeRoomObjectModel(this.object.model); - if(message.extra !== null) this.object.model.setValue(RoomObjectVariable.FURNITURE_EXTRAS, message.extra.toString()); + if (message.extra !== null) this.object.model.setValue(RoomObjectVariable.FURNITURE_EXTRAS, message.extra.toString()); this.object.model.setValue(RoomObjectVariable.FURNITURE_STATE_UPDATE_TIME, this.lastUpdateTime); } private processObjectHeightUpdateMessage(message: ObjectHeightUpdateMessage): void { - if(!message) return; + if (!message) return; this.object.model.setValue(RoomObjectVariable.FURNITURE_SIZE_Z, message.height); } private processItemDataUpdateMessage(message: ObjectItemDataUpdateMessage): void { - if(!message) return; + if (!message) return; this.object.model.setValue(RoomObjectVariable.FURNITURE_ITEMDATA, message.data); } @@ -263,10 +263,10 @@ export class FurnitureLogic extends MovingObjectLogic { const adUrl = this.getAdClickUrl(this.object.model); - switch(event.type) + switch (event.type) { case MouseEventType.MOUSE_MOVE: - if(this.eventDispatcher) + if (this.eventDispatcher) { const mouseEvent = new RoomObjectMouseEvent(RoomObjectMouseEvent.MOUSE_MOVE, this.object, event.eventId, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown); @@ -279,11 +279,11 @@ export class FurnitureLogic extends MovingObjectLogic } return; case MouseEventType.ROLL_OVER: - if(!this._mouseOver) + if (!this._mouseOver) { - if(this.eventDispatcher) + if (this.eventDispatcher) { - if(adUrl && (adUrl.indexOf('http') === 0)) + if (adUrl && (adUrl.indexOf('http') === 0)) { this.eventDispatcher.dispatchEvent(new RoomObjectRoomAdEvent(RoomObjectRoomAdEvent.ROOM_AD_TOOLTIP_SHOW, this.object)); } @@ -302,11 +302,11 @@ export class FurnitureLogic extends MovingObjectLogic } return; case MouseEventType.ROLL_OUT: - if(this._mouseOver) + if (this._mouseOver) { - if(this.eventDispatcher) + if (this.eventDispatcher) { - if(adUrl && (adUrl.indexOf('http') === 0)) + if (adUrl && (adUrl.indexOf('http') === 0)) { this.eventDispatcher.dispatchEvent(new RoomObjectRoomAdEvent(RoomObjectRoomAdEvent.ROOM_AD_TOOLTIP_HIDE, this.object)); } @@ -328,7 +328,7 @@ export class FurnitureLogic extends MovingObjectLogic this.useObject(); return; case MouseEventType.MOUSE_CLICK: - if(this.eventDispatcher) + if (this.eventDispatcher) { const mouseEvent = new RoomObjectMouseEvent(RoomObjectMouseEvent.CLICK, this.object, event.eventId, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown); @@ -339,16 +339,16 @@ export class FurnitureLogic extends MovingObjectLogic this.eventDispatcher.dispatchEvent(mouseEvent); - if(adUrl && (adUrl.indexOf('http') === 0)) + if (adUrl && (adUrl.indexOf('http') === 0)) { this.eventDispatcher.dispatchEvent(new RoomObjectRoomAdEvent(RoomObjectRoomAdEvent.ROOM_AD_TOOLTIP_HIDE, this.object)); } - if(adUrl && adUrl.length) this.handleAdClick(this.object.id, this.object.type, adUrl); + if (adUrl && adUrl.length) this.handleAdClick(this.object.id, this.object.type, adUrl); } return; case MouseEventType.MOUSE_DOWN: - if(this.eventDispatcher) + if (this.eventDispatcher) { const mouseEvent = new RoomObjectMouseEvent(RoomObjectMouseEvent.MOUSE_DOWN, this.object, event.eventId, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown); @@ -356,7 +356,7 @@ export class FurnitureLogic extends MovingObjectLogic } return; case MouseEventType.MOUSE_DOWN_LONG: - if(this.eventDispatcher) + if (this.eventDispatcher) { const mouseEvent = new RoomObjectMouseEvent(RoomObjectMouseEvent.MOUSE_DOWN_LONG, this.object, event.eventId, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown); @@ -368,20 +368,20 @@ export class FurnitureLogic extends MovingObjectLogic protected getLocationOffset(): IVector3D { - if(this._bouncingStep <= 0) return null; + if (this._bouncingStep <= 0) return null; this._locationOffset.x = 0; this._locationOffset.y = 0; - if(this._bouncingStep <= (FurnitureLogic.BOUNCING_STEPS / 2)) + if (this._bouncingStep <= (FurnitureLogic.BOUNCING_STEPS / 2)) { this._locationOffset.z = FurnitureLogic.BOUNCING_Z * this._bouncingStep; } else { - if(this._bouncingStep <= FurnitureLogic.BOUNCING_STEPS) + if (this._bouncingStep <= FurnitureLogic.BOUNCING_STEPS) { - if(this._storedRotateMessage) + if (this._storedRotateMessage) { super.processUpdateMessage(this._storedRotateMessage); @@ -397,27 +397,27 @@ export class FurnitureLogic extends MovingObjectLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; const clickUrl = this.getAdClickUrl(this.object.model); - if(clickUrl && clickUrl.length) + if (clickUrl && clickUrl.length) { this.eventDispatcher.dispatchEvent(new RoomObjectRoomAdEvent(RoomObjectRoomAdEvent.ROOM_AD_FURNI_DOUBLE_CLICK, this.object, null, clickUrl)); } - if(this.widget) this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.OPEN_WIDGET, this.object)); + if (this.widget) this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.OPEN_WIDGET, this.object)); this.eventDispatcher.dispatchEvent(new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_CHANGE, this.object)); } public tearDown(): void { - if(this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) + if (this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) { - if(this.widget) this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.CLOSE_WIDGET, this.object)); + if (this.widget) this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.CLOSE_WIDGET, this.object)); - if(this.contextMenu) this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.CLOSE_FURNI_CONTEXT_MENU, this.object)); + if (this.contextMenu) this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.CLOSE_FURNI_CONTEXT_MENU, this.object)); } super.tearDown(); diff --git a/src/nitro/room/object/logic/furniture/FurnitureMannequinLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureMannequinLogic.ts index 14b9996d..074720d5 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureMannequinLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureMannequinLogic.ts @@ -1,6 +1,6 @@ import { MapDataType, RoomObjectVariable } from '../../../../../api'; +import { RoomObjectWidgetRequestEvent } from '../../../../../events'; import { RoomObjectUpdateMessage } from '../../../../../room'; -import { RoomObjectWidgetRequestEvent } from '../../../events'; import { ObjectDataUpdateMessage } from '../../../messages'; import { FurnitureLogic } from './FurnitureLogic'; @@ -21,7 +21,7 @@ export class FurnitureMannequinLogic extends FurnitureLogic { super.processUpdateMessage(message); - if(message instanceof ObjectDataUpdateMessage) + if (message instanceof ObjectDataUpdateMessage) { message.data.writeRoomObjectModel(this.object.model); @@ -31,7 +31,7 @@ export class FurnitureMannequinLogic extends FurnitureLogic private processObjectData(): void { - if(!this.object || !this.object.model) return; + if (!this.object || !this.object.model) return; const data = new MapDataType(); @@ -44,7 +44,7 @@ export class FurnitureMannequinLogic extends FurnitureLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.MANNEQUIN, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureMonsterplantSeedLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureMonsterplantSeedLogic.ts index faadd8bb..6af1d684 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureMonsterplantSeedLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureMonsterplantSeedLogic.ts @@ -1,5 +1,5 @@ +import { RoomObjectWidgetRequestEvent } from '../../../../../events'; import { ContextMenuEnum } from '../../../../ui'; -import { RoomObjectWidgetRequestEvent } from '../../../events'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; export class FurnitureMonsterplantSeedLogic extends FurnitureMultiStateLogic @@ -13,7 +13,7 @@ export class FurnitureMonsterplantSeedLogic extends FurnitureMultiStateLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.MONSTERPLANT_SEED_PLANT_CONFIRMATION_DIALOG, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureMultiStateLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureMultiStateLogic.ts index 4cf4a341..35035851 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureMultiStateLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureMultiStateLogic.ts @@ -1,7 +1,7 @@ import { IRoomGeometry } from '../../../../../api'; +import { RoomObjectFurnitureActionEvent } from '../../../../../events'; import { RoomSpriteMouseEvent } from '../../../../../room'; import { MouseEventType } from '../../../../ui'; -import { RoomObjectFurnitureActionEvent } from '../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureMultiStateLogic extends FurnitureLogic @@ -15,9 +15,9 @@ export class FurnitureMultiStateLogic extends FurnitureLogic public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if(!event || !geometry || !this.object) return; + if (!event || !geometry || !this.object) return; - switch(event.type) + switch (event.type) { case MouseEventType.ROLL_OVER: this.eventDispatcher && this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.MOUSE_BUTTON, this.object)); diff --git a/src/nitro/room/object/logic/furniture/FurnitureMysteryBoxLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureMysteryBoxLogic.ts index 9a6ee439..def2844d 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureMysteryBoxLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureMysteryBoxLogic.ts @@ -1,5 +1,5 @@ +import { RoomObjectWidgetRequestEvent } from '../../../../../events'; import { ContextMenuEnum } from '../../../../ui'; -import { RoomObjectWidgetRequestEvent } from '../../../events'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; export class FurnitureMysteryBoxLogic extends FurnitureMultiStateLogic @@ -13,7 +13,7 @@ export class FurnitureMysteryBoxLogic extends FurnitureMultiStateLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.MYSTERYBOX_OPEN_DIALOG, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureMysteryTrophyLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureMysteryTrophyLogic.ts index f23ecd0c..03834a44 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureMysteryTrophyLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureMysteryTrophyLogic.ts @@ -1,5 +1,5 @@ +import { RoomObjectWidgetRequestEvent } from '../../../../../events'; import { ContextMenuEnum } from '../../../../ui'; -import { RoomObjectWidgetRequestEvent } from '../../../events'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; export class FurnitureMysteryTrophyLogic extends FurnitureMultiStateLogic @@ -13,7 +13,7 @@ export class FurnitureMysteryTrophyLogic extends FurnitureMultiStateLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.MYSTERYTROPHY_OPEN_DIALOG, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureOneWayDoorLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureOneWayDoorLogic.ts index 55fe52ff..7b36ae75 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureOneWayDoorLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureOneWayDoorLogic.ts @@ -1,4 +1,4 @@ -import { RoomObjectFurnitureActionEvent } from '../../../events'; +import { RoomObjectFurnitureActionEvent } from '../../../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureOneWayDoorLogic extends FurnitureLogic @@ -12,7 +12,7 @@ export class FurnitureOneWayDoorLogic extends FurnitureLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.ENTER_ONEWAYDOOR, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurniturePetCustomizationLogic.ts b/src/nitro/room/object/logic/furniture/FurniturePetCustomizationLogic.ts index 751e9d55..2d1dccdf 100644 --- a/src/nitro/room/object/logic/furniture/FurniturePetCustomizationLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurniturePetCustomizationLogic.ts @@ -1,7 +1,7 @@ import { RoomObjectVariable } from '../../../../../api'; +import { RoomObjectWidgetRequestEvent } from '../../../../../events'; import { RoomObjectUpdateMessage } from '../../../../../room'; import { RoomWidgetEnumItemExtradataParameter } from '../../../../ui'; -import { RoomObjectWidgetRequestEvent } from '../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurniturePetCustomizationLogic extends FurnitureLogic @@ -17,9 +17,9 @@ export class FurniturePetCustomizationLogic extends FurnitureLogic { super.processUpdateMessage(message); - if(!this.object) return; + if (!this.object) return; - if(this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) + if (this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) { this.object.model.setValue(RoomWidgetEnumItemExtradataParameter.INFOSTAND_EXTRA_PARAM, RoomWidgetEnumItemExtradataParameter.USABLE_PRODUCT); } @@ -27,7 +27,7 @@ export class FurniturePetCustomizationLogic extends FurnitureLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.PET_PRODUCT_MENU, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurniturePlaceholderLogic.ts b/src/nitro/room/object/logic/furniture/FurniturePlaceholderLogic.ts index e8054254..46a5d08f 100644 --- a/src/nitro/room/object/logic/furniture/FurniturePlaceholderLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurniturePlaceholderLogic.ts @@ -1,4 +1,4 @@ -import { RoomObjectWidgetRequestEvent } from '../../../events'; +import { RoomObjectWidgetRequestEvent } from '../../../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurniturePlaceholderLogic extends FurnitureLogic @@ -14,7 +14,7 @@ export class FurniturePlaceholderLogic extends FurnitureLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.PLACEHOLDER, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurniturePresentLogic.ts b/src/nitro/room/object/logic/furniture/FurniturePresentLogic.ts index 7e527249..8a7a9fec 100644 --- a/src/nitro/room/object/logic/furniture/FurniturePresentLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurniturePresentLogic.ts @@ -1,7 +1,7 @@ import { IAssetData, IParticleSystem, IRoomGeometry, MapDataType, RoomObjectVariable } from '../../../../../api'; +import { RoomObjectFurnitureActionEvent, RoomObjectWidgetRequestEvent } from '../../../../../events'; import { RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room'; import { MouseEventType } from '../../../../ui'; -import { RoomObjectFurnitureActionEvent, RoomObjectWidgetRequestEvent } from '../../../events'; import { ObjectDataUpdateMessage, ObjectModelDataUpdateMessage } from '../../../messages'; import { FurnitureLogic } from './FurnitureLogic'; @@ -26,9 +26,9 @@ export class FurniturePresentLogic extends FurnitureLogic { super.initialize(asset); - if(asset.logic) + if (asset.logic) { - if(asset.logic.particleSystems && asset.logic.particleSystems.length) + if (asset.logic.particleSystems && asset.logic.particleSystems.length) { this.object.model.setValue(RoomObjectVariable.FURNITURE_FIREWORKS_DATA, asset.logic.particleSystems); } @@ -39,16 +39,16 @@ export class FurniturePresentLogic extends FurnitureLogic { super.processUpdateMessage(message); - if(message instanceof ObjectDataUpdateMessage) + if (message instanceof ObjectDataUpdateMessage) { message.data.writeRoomObjectModel(this.object.model); this.updateStuffData(); } - if(message instanceof ObjectModelDataUpdateMessage) + if (message instanceof ObjectModelDataUpdateMessage) { - if(message.numberKey === RoomObjectVariable.FURNITURE_DISABLE_PICKING_ANIMATION) + if (message.numberKey === RoomObjectVariable.FURNITURE_DISABLE_PICKING_ANIMATION) { this.object.model.setValue(RoomObjectVariable.FURNITURE_DISABLE_PICKING_ANIMATION, message.numberValue); } @@ -57,7 +57,7 @@ export class FurniturePresentLogic extends FurnitureLogic private updateStuffData(): void { - if(!this.object || !this.object.model) return; + if (!this.object || !this.object.model) return; const stuffData = new MapDataType(); @@ -66,7 +66,7 @@ export class FurniturePresentLogic extends FurnitureLogic const message = stuffData.getValue(FurniturePresentLogic.MESSAGE); const data = this.object.model.getValue(RoomObjectVariable.FURNITURE_DATA); - if(!message && (typeof data === 'string')) + if (!message && (typeof data === 'string')) { this.object.model.setValue(RoomObjectVariable.FURNITURE_DATA, data.substr(1)); } @@ -82,16 +82,16 @@ export class FurniturePresentLogic extends FurnitureLogic private writeToModel(key: string, value: string): void { - if(!value) return; + if (!value) return; this.object.model.setValue(key, value); } public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if(!event || !geometry || !this.object) return; + if (!event || !geometry || !this.object) return; - switch(event.type) + switch (event.type) { case MouseEventType.ROLL_OVER: this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.MOUSE_BUTTON, this.object)); @@ -106,7 +106,7 @@ export class FurniturePresentLogic extends FurnitureLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.PRESENT, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurniturePurchaseableClothingLogic.ts b/src/nitro/room/object/logic/furniture/FurniturePurchaseableClothingLogic.ts index dde59861..c0804b19 100644 --- a/src/nitro/room/object/logic/furniture/FurniturePurchaseableClothingLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurniturePurchaseableClothingLogic.ts @@ -1,5 +1,5 @@ +import { RoomObjectWidgetRequestEvent } from '../../../../../events'; import { ContextMenuEnum } from '../../../../ui'; -import { RoomObjectWidgetRequestEvent } from '../../../events'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; export class FurniturePurchaseableClothingLogic extends FurnitureMultiStateLogic @@ -16,7 +16,7 @@ export class FurniturePurchaseableClothingLogic extends FurnitureMultiStateLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.PURCHASABLE_CLOTHING_CONFIRMATION_DIALOG, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureRandomStateLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureRandomStateLogic.ts index 521a8fde..5de901c4 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureRandomStateLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureRandomStateLogic.ts @@ -1,4 +1,4 @@ -import { RoomObjectStateChangedEvent } from '../../../events'; +import { RoomObjectStateChangedEvent } from '../../../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureRandomStateLogic extends FurnitureLogic @@ -14,7 +14,7 @@ export class FurnitureRandomStateLogic extends FurnitureLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_RANDOM, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureRentableSpaceLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureRentableSpaceLogic.ts index 2d0f868e..ce45f2a6 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureRentableSpaceLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureRentableSpaceLogic.ts @@ -1,7 +1,7 @@ import { RoomObjectVariable } from '../../../../../api'; import { AdvancedMap } from '../../../../../core'; +import { RoomObjectDataRequestEvent } from '../../../../../events'; import { RoomWidgetEnum } from '../../../../ui'; -import { RoomObjectDataRequestEvent } from '../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureRentableSpaceLogic extends FurnitureLogic @@ -19,9 +19,9 @@ export class FurnitureRentableSpaceLogic extends FurnitureLogic { super.update(time); - if(this.object && this.object.model) + if (this.object && this.object.model) { - if(!this.object.model.getValue(RoomObjectVariable.SESSION_CURRENT_USER_ID)) + if (!this.object.model.getValue(RoomObjectVariable.SESSION_CURRENT_USER_ID)) { this.eventDispatcher.dispatchEvent(new RoomObjectDataRequestEvent(RoomObjectDataRequestEvent.RODRE_CURRENT_USER_ID, this.object)); } @@ -29,9 +29,9 @@ export class FurnitureRentableSpaceLogic extends FurnitureLogic const renterId = this.object.model.getValue>(RoomObjectVariable.FURNITURE_DATA).getValue('renterId'); const userId = this.object.model.getValue(RoomObjectVariable.SESSION_CURRENT_USER_ID); - if(renterId) + if (renterId) { - if(parseInt(renterId) === userId) this.object.setState(2, 0); + if (parseInt(renterId) === userId) this.object.setState(2, 0); else this.object.setState(1, 0); } else diff --git a/src/nitro/room/object/logic/furniture/FurnitureRoomBackgroundColorLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureRoomBackgroundColorLogic.ts index d96614ab..2bf1a01f 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureRoomBackgroundColorLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureRoomBackgroundColorLogic.ts @@ -1,7 +1,7 @@ import { IRoomGeometry, NumberDataType, RoomObjectVariable } from '../../../../../api'; +import { RoomObjectHSLColorEnableEvent, RoomObjectWidgetRequestEvent } from '../../../../../events'; import { RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room'; import { MouseEventType } from '../../../../ui'; -import { RoomObjectHSLColorEnableEvent, RoomObjectWidgetRequestEvent } from '../../../events'; import { ObjectDataUpdateMessage } from '../../../messages'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; @@ -29,13 +29,13 @@ export class FurnitureRoomBackgroundColorLogic extends FurnitureMultiStateLogic protected onDispose(): void { - if(this._roomColorUpdated) + if (this._roomColorUpdated) { - if(this.eventDispatcher && this.object) + if (this.eventDispatcher && this.object) { const realRoomObject = this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT); - if(realRoomObject === 1) + if (realRoomObject === 1) { this.eventDispatcher.dispatchEvent(new RoomObjectHSLColorEnableEvent(RoomObjectHSLColorEnableEvent.ROOM_BACKGROUND_COLOR, this.object, false, 0, 0, 0)); } @@ -51,19 +51,19 @@ export class FurnitureRoomBackgroundColorLogic extends FurnitureMultiStateLogic { super.processUpdateMessage(message); - if(message instanceof ObjectDataUpdateMessage) + if (message instanceof ObjectDataUpdateMessage) { message.data.writeRoomObjectModel(this.object.model); const realRoomObject = this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT); - if(realRoomObject === 1) this.processColorUpdate(); + if (realRoomObject === 1) this.processColorUpdate(); } } private processColorUpdate(): void { - if(!this.object || !this.object.model) return; + if (!this.object || !this.object.model) return; const numberData = new NumberDataType(); @@ -74,7 +74,7 @@ export class FurnitureRoomBackgroundColorLogic extends FurnitureMultiStateLogic const saturation = numberData.getValue(2); const lightness = numberData.getValue(3); - if((state > -1) && (hue > -1) && (saturation > -1) && (lightness > -1)) + if ((state > -1) && (hue > -1) && (saturation > -1) && (lightness > -1)) { this.object.model.setValue(RoomObjectVariable.FURNITURE_ROOM_BACKGROUND_COLOR_HUE, hue); this.object.model.setValue(RoomObjectVariable.FURNITURE_ROOM_BACKGROUND_COLOR_SATURATION, saturation); @@ -82,7 +82,7 @@ export class FurnitureRoomBackgroundColorLogic extends FurnitureMultiStateLogic this.object.setState(state, 0); - if(this.eventDispatcher) + if (this.eventDispatcher) { this.eventDispatcher.dispatchEvent(new RoomObjectHSLColorEnableEvent(RoomObjectHSLColorEnableEvent.ROOM_BACKGROUND_COLOR, this.object, (state === 1), hue, saturation, lightness)); } @@ -93,9 +93,9 @@ export class FurnitureRoomBackgroundColorLogic extends FurnitureMultiStateLogic public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if(!event || !geometry || !this.object) return; + if (!event || !geometry || !this.object) return; - switch(event.type) + switch (event.type) { case MouseEventType.DOUBLE_CLICK: (this.eventDispatcher && this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.BACKGROUND_COLOR, this.object))); diff --git a/src/nitro/room/object/logic/furniture/FurnitureRoomBillboardLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureRoomBillboardLogic.ts index 5753a769..a07da9a6 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureRoomBillboardLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureRoomBillboardLogic.ts @@ -1,6 +1,6 @@ import { IRoomObjectModel, RoomObjectVariable } from '../../../../../api'; +import { RoomObjectRoomAdEvent } from '../../../../../events'; import { HabboWebTools } from '../../../../utils'; -import { RoomObjectRoomAdEvent } from '../../../events'; import { FurnitureRoomBrandingLogic } from './FurnitureRoomBrandingLogic'; export class FurnitureRoomBillboardLogic extends FurnitureRoomBrandingLogic @@ -19,13 +19,13 @@ export class FurnitureRoomBillboardLogic extends FurnitureRoomBrandingLogic protected handleAdClick(objectId: number, objectType: string, clickUrl: string): void { - if(clickUrl.indexOf('http') === 0) + if (clickUrl.indexOf('http') === 0) { HabboWebTools.openWebPage(clickUrl); return; } - if(this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectRoomAdEvent(RoomObjectRoomAdEvent.ROOM_AD_FURNI_CLICK, this.object, '', clickUrl)); + if (this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectRoomAdEvent(RoomObjectRoomAdEvent.ROOM_AD_FURNI_CLICK, this.object, '', clickUrl)); } } diff --git a/src/nitro/room/object/logic/furniture/FurnitureRoomBrandingLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureRoomBrandingLogic.ts index d8059b08..09a123a7 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureRoomBrandingLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureRoomBrandingLogic.ts @@ -1,10 +1,10 @@ import { BaseTexture, Texture } from '@pixi/core'; import { decompressFrames, parseGIF } from 'gifuct-js'; import { IAssetData, IRoomGeometry, MapDataType, RoomObjectVariable } from '../../../../../api'; +import { RoomObjectRoomAdEvent } from '../../../../../events'; import { RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room'; import { Nitro } from '../../../../Nitro'; import { MouseEventType, RoomWidgetEnumItemExtradataParameter } from '../../../../ui'; -import { RoomObjectRoomAdEvent } from '../../../events'; import { ObjectAdUpdateMessage, ObjectDataUpdateMessage } from '../../../messages'; import { FurnitureLogic } from './FurnitureLogic'; @@ -39,7 +39,7 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic { super.initialize(asset); - if(this._disableFurnitureSelection) + if (this._disableFurnitureSelection) { this.object.model.setValue(RoomObjectVariable.FURNITURE_SELECTION_DISABLED, 1); } @@ -49,14 +49,14 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic { super.processUpdateMessage(message); - if(message instanceof ObjectDataUpdateMessage) this.processAdDataUpdateMessage(message); + if (message instanceof ObjectDataUpdateMessage) this.processAdDataUpdateMessage(message); - if(message instanceof ObjectAdUpdateMessage) this.processAdUpdate(message); + if (message instanceof ObjectAdUpdateMessage) this.processAdUpdate(message); } private processAdDataUpdateMessage(message: ObjectDataUpdateMessage): void { - if(!message) return; + if (!message) return; const objectData = new MapDataType(); @@ -64,12 +64,12 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic const state = parseInt(objectData.getValue(FurnitureRoomBrandingLogic.STATE)); - if(!isNaN(state) && (this.object.getState(0) !== state)) this.object.setState(state, 0); + if (!isNaN(state) && (this.object.getState(0) !== state)) this.object.setState(state, 0); const imageUrl = objectData.getValue(FurnitureRoomBrandingLogic.IMAGEURL_KEY); const existingUrl = this.object.model.getValue(RoomObjectVariable.FURNITURE_BRANDING_IMAGE_URL); - if(!existingUrl || (existingUrl !== imageUrl)) + if (!existingUrl || (existingUrl !== imageUrl)) { this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_IMAGE_URL, imageUrl); this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_IMAGE_STATUS, 0); @@ -79,13 +79,13 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic const clickUrl = objectData.getValue(FurnitureRoomBrandingLogic.CLICKURL_KEY); - if(clickUrl) + if (clickUrl) { const existingUrl = this.object.model.getValue(RoomObjectVariable.FURNITURE_BRANDING_URL); - if(!existingUrl || existingUrl !== clickUrl) + if (!existingUrl || existingUrl !== clickUrl) { - if(this.object.model) this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_URL, clickUrl); + if (this.object.model) this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_URL, clickUrl); } } @@ -93,13 +93,13 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic const offsetY = parseInt(objectData.getValue(FurnitureRoomBrandingLogic.OFFSETY_KEY)); const offsetZ = parseInt(objectData.getValue(FurnitureRoomBrandingLogic.OFFSETZ_KEY)); - if(!isNaN(offsetX)) this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_OFFSET_X, offsetX); - if(!isNaN(offsetY)) this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_OFFSET_Y, offsetY); - if(!isNaN(offsetZ)) this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_OFFSET_Z, offsetZ); + if (!isNaN(offsetX)) this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_OFFSET_X, offsetX); + if (!isNaN(offsetY)) this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_OFFSET_Y, offsetY); + if (!isNaN(offsetZ)) this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_OFFSET_Z, offsetZ); let options = (((FurnitureRoomBrandingLogic.IMAGEURL_KEY + '=') + ((imageUrl !== null) ? imageUrl : '')) + '\t'); - if(this._hasClickUrl) + if (this._hasClickUrl) { options = (options + (((FurnitureRoomBrandingLogic.CLICKURL_KEY + '=') + ((clickUrl !== null) ? clickUrl : '')) + '\t')); } @@ -113,9 +113,9 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic private processAdUpdate(message: ObjectAdUpdateMessage): void { - if(!message || !this.object) return; + if (!message || !this.object) return; - switch(message.type) + switch (message.type) { case ObjectAdUpdateMessage.IMAGE_LOADED: this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_IMAGE_STATUS, 1); @@ -128,9 +128,9 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if(!event || !geometry) return; + if (!event || !geometry) return; - if((event.type === MouseEventType.MOUSE_MOVE) || (event.type === MouseEventType.DOUBLE_CLICK)) return; + if ((event.type === MouseEventType.MOUSE_MOVE) || (event.type === MouseEventType.DOUBLE_CLICK)) return; super.mouseEvent(event, geometry); } @@ -139,14 +139,14 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic { const model = this.object && this.object.model; - if(!model) return; + if (!model) return; const imageUrl = model.getValue(RoomObjectVariable.FURNITURE_BRANDING_IMAGE_URL); const imageStatus = model.getValue(RoomObjectVariable.FURNITURE_BRANDING_IMAGE_STATUS); - if(!imageUrl || (imageUrl === '') || (imageStatus === 1)) return; + if (!imageUrl || (imageUrl === '') || (imageStatus === 1)) return; - if(imageUrl.endsWith('.gif')) + if (imageUrl.endsWith('.gif')) { this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_IS_ANIMATED, true); @@ -164,23 +164,23 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic let frame = new Uint8Array(wh * 4); - for(let ind = 0; ind < frames.length; ind++) + for (let ind = 0; ind < frames.length; ind++) { - if(ind > 0) frame = frame.slice(0); + if (ind > 0) frame = frame.slice(0); const pixels = frames[ind].pixels; const colorTable = frames[ind].colorTable; const trans = frames[ind].transparentIndex; const dims = frames[ind].dims; - for(let j = 0; j < dims.height; j++) + for (let j = 0; j < dims.height; j++) { - for(let i = 0; i < dims.width; i++) + for (let i = 0; i < dims.width; i++) { const pixel = pixels[j * dims.width + i]; const coord = (j + dims.top) * width + (i + dims.left); - if(trans !== pixel) + if (trans !== pixel) { const c = colorTable[pixel]; @@ -211,15 +211,15 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic { const asset = Nitro.instance.core && Nitro.instance.core.asset; - if(!asset) return; + if (!asset) return; const texture = asset.getTexture(imageUrl); - if(!texture) + if (!texture) { asset.downloadAsset(imageUrl, (flag: boolean) => { - if(flag) + if (flag) { this.processUpdateMessage(new ObjectAdUpdateMessage(ObjectAdUpdateMessage.IMAGE_LOADED)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureRoomDimmerLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureRoomDimmerLogic.ts index 9c915985..3786f3f1 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureRoomDimmerLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureRoomDimmerLogic.ts @@ -1,6 +1,6 @@ import { RoomObjectVariable } from '../../../../../api'; +import { RoomObjectDimmerStateUpdateEvent, RoomObjectWidgetRequestEvent } from '../../../../../events'; import { RoomObjectUpdateMessage } from '../../../../../room'; -import { RoomObjectDimmerStateUpdateEvent, RoomObjectWidgetRequestEvent } from '../../../events'; import { ObjectDataUpdateMessage } from '../../../messages'; import { FurnitureLogic } from './FurnitureLogic'; @@ -28,13 +28,13 @@ export class FurnitureRoomDimmerLogic extends FurnitureLogic protected onDispose(): void { - if(this._roomColorUpdated) + if (this._roomColorUpdated) { - if(this.eventDispatcher && this.object) + if (this.eventDispatcher && this.object) { const realRoomObject = this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT); - if(realRoomObject === 1) + if (realRoomObject === 1) { this.eventDispatcher.dispatchEvent(new RoomObjectDimmerStateUpdateEvent(this.object, 0, 1, 1, 0xFFFFFF, 0xFF)); this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.WIDGET_REMOVE_DIMMER, this.object)); @@ -49,15 +49,15 @@ export class FurnitureRoomDimmerLogic extends FurnitureLogic public processUpdateMessage(message: RoomObjectUpdateMessage): void { - if(message instanceof ObjectDataUpdateMessage) + if (message instanceof ObjectDataUpdateMessage) { - if(message.data) + if (message.data) { const extra = message.data.getLegacyString(); const realRoomObject = this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT); - if(realRoomObject === 1) this.processDimmerData(extra); + if (realRoomObject === 1) this.processDimmerData(extra); super.processUpdateMessage(new ObjectDataUpdateMessage(this.getStateFromDimmerData(extra), message.data)); } @@ -70,22 +70,22 @@ export class FurnitureRoomDimmerLogic extends FurnitureLogic private getStateFromDimmerData(data: string): number { - if(!data) return 0; + if (!data) return 0; const parts = data.split(','); - if(parts.length >= 5) return (parseInt(parts[0]) - 1); + if (parts.length >= 5) return (parseInt(parts[0]) - 1); return 0; } private processDimmerData(data: string): void { - if(!data) return; + if (!data) return; const parts = data.split(','); - if(parts.length >= 5) + if (parts.length >= 5) { const state = this.getStateFromDimmerData(data); const presetId = parseInt(parts[1]); @@ -95,13 +95,13 @@ export class FurnitureRoomDimmerLogic extends FurnitureLogic let colorCode = parseInt(color.substr(1), 16); let brightness = parseInt(parts[4]); - if(!state) + if (!state) { colorCode = 0xFFFFFF; brightness = 0xFF; } - if(this.eventDispatcher && this.object) + if (this.eventDispatcher && this.object) { this.eventDispatcher.dispatchEvent(new RoomObjectDimmerStateUpdateEvent(this.object, state, presetId, effectId, colorCode, brightness)); @@ -112,7 +112,7 @@ export class FurnitureRoomDimmerLogic extends FurnitureLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.DIMMER, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureSoundBlockLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureSoundBlockLogic.ts index 4bf7f54b..68b2c6e8 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureSoundBlockLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureSoundBlockLogic.ts @@ -1,6 +1,6 @@ import { IAssetData, RoomObjectVariable } from '../../../../../api'; +import { RoomObjectSamplePlaybackEvent } from '../../../../../events'; import { RoomObjectUpdateMessage } from '../../../../../room'; -import { RoomObjectSamplePlaybackEvent } from '../../../events'; import { ObjectDataUpdateMessage } from '../../../messages'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; @@ -31,9 +31,9 @@ export class FurnitureSoundBlockLogic extends FurnitureMultiStateLogic { super.initialize(asset); - if(asset.logic) + if (asset.logic) { - if(asset.logic.soundSample) + if (asset.logic.soundSample) { this._sampleId = asset.logic.soundSample.id; this._noPitch = asset.logic.soundSample.noPitch; @@ -45,7 +45,7 @@ export class FurnitureSoundBlockLogic extends FurnitureMultiStateLogic protected onDispose(): void { - if(this._state !== FurnitureSoundBlockLogic.STATE_UNINITIALIZED) + if (this._state !== FurnitureSoundBlockLogic.STATE_UNINITIALIZED) { this.eventDispatcher.dispatchEvent(new RoomObjectSamplePlaybackEvent(RoomObjectSamplePlaybackEvent.ROOM_OBJECT_DISPOSED, this.object, this._sampleId)); } @@ -57,27 +57,27 @@ export class FurnitureSoundBlockLogic extends FurnitureMultiStateLogic { super.processUpdateMessage(message); - if(message instanceof ObjectDataUpdateMessage) this.updateSoundBlockMessage(message); + if (message instanceof ObjectDataUpdateMessage) this.updateSoundBlockMessage(message); } private updateSoundBlockMessage(message: ObjectDataUpdateMessage): void { - if(!message) return; + if (!message) return; const model = this.object && this.object.model; const location = this.object && this.object.location; - if(!model || !location) return; + if (!model || !location) return; - if(this._state === FurnitureSoundBlockLogic.STATE_UNINITIALIZED && model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) + if (this._state === FurnitureSoundBlockLogic.STATE_UNINITIALIZED && model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) { this._lastLocZ = location.z; this.eventDispatcher.dispatchEvent(new RoomObjectSamplePlaybackEvent(RoomObjectSamplePlaybackEvent.ROOM_OBJECT_INITIALIZED, this.object, this._sampleId, this.getPitchForHeight(location.z))); } - if(this._state !== FurnitureSoundBlockLogic.STATE_UNINITIALIZED && model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) + if (this._state !== FurnitureSoundBlockLogic.STATE_UNINITIALIZED && model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) { - if(this._lastLocZ !== location.z) + if (this._lastLocZ !== location.z) { this._lastLocZ = location.z; this.eventDispatcher.dispatchEvent(new RoomObjectSamplePlaybackEvent(RoomObjectSamplePlaybackEvent.CHANGE_PITCH, this.object, this._sampleId, this.getPitchForHeight(location.z))); @@ -85,7 +85,7 @@ export class FurnitureSoundBlockLogic extends FurnitureMultiStateLogic } - if(this._state !== FurnitureSoundBlockLogic.STATE_UNINITIALIZED && message.state !== this._state) + if (this._state !== FurnitureSoundBlockLogic.STATE_UNINITIALIZED && message.state !== this._state) { this.playSoundAt(location.z); } @@ -95,7 +95,7 @@ export class FurnitureSoundBlockLogic extends FurnitureMultiStateLogic private playSoundAt(height: number): void { - if(!this.object) return; + if (!this.object) return; const pitch: number = this.getPitchForHeight(height); @@ -106,11 +106,11 @@ export class FurnitureSoundBlockLogic extends FurnitureMultiStateLogic private getPitchForHeight(height: number): number { - if(this._noPitch) return 1; + if (this._noPitch) return 1; let heightScaled: number = (height * 2); - if(heightScaled > FurnitureSoundBlockLogic.HIGHEST_SEMITONE) + if (heightScaled > FurnitureSoundBlockLogic.HIGHEST_SEMITONE) { heightScaled = Math.min(0, (FurnitureSoundBlockLogic.LOWEST_SEMITONE + ((heightScaled - FurnitureSoundBlockLogic.HIGHEST_SEMITONE) - 1))); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureSoundMachineLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureSoundMachineLogic.ts index 5fa62ebc..aa57c7ce 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureSoundMachineLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureSoundMachineLogic.ts @@ -1,7 +1,7 @@ import { RoomObjectVariable } from '../../../../../api'; +import { RoomObjectFurnitureActionEvent } from '../../../../../events'; import { RoomObjectUpdateMessage } from '../../../../../room'; import { RoomWidgetEnumItemExtradataParameter } from '../../../../ui'; -import { RoomObjectFurnitureActionEvent } from '../../../events'; import { ObjectDataUpdateMessage } from '../../../messages'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; @@ -34,29 +34,29 @@ export class FurnitureSoundMachineLogic extends FurnitureMultiStateLogic { super.processUpdateMessage(message); - if(this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) !== 1) return; + if (this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) !== 1) return; - if(!this._isInitialized) this.requestInit(); + if (!this._isInitialized) this.requestInit(); this.object.model.setValue(RoomWidgetEnumItemExtradataParameter.INFOSTAND_EXTRA_PARAM, RoomWidgetEnumItemExtradataParameter.JUKEBOX); - if(message instanceof ObjectDataUpdateMessage) + if (message instanceof ObjectDataUpdateMessage) { const state = this.object.getState(0); - if(state !== this._currentState) + if (state !== this._currentState) { this._currentState = state; - if(state === 1) this.requestPlayList(); - else if(state === 0) this.requestStopPlaying(); + if (state === 1) this.requestPlayList(); + else if (state === 0) this.requestStopPlaying(); } } } private requestInit(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this._disposeEventsAllowed = true; @@ -67,7 +67,7 @@ export class FurnitureSoundMachineLogic extends FurnitureMultiStateLogic private requestPlayList(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this._disposeEventsAllowed = true; @@ -76,14 +76,14 @@ export class FurnitureSoundMachineLogic extends FurnitureMultiStateLogic private requestStopPlaying(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.SOUND_MACHINE_STOP, this.object)); } private requestDispose(): void { - if(!this._disposeEventsAllowed || !this.object || !this.eventDispatcher) return; + if (!this._disposeEventsAllowed || !this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.SOUND_MACHINE_DISPOSE, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureStickieLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureStickieLogic.ts index b1efb9dd..2952793d 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureStickieLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureStickieLogic.ts @@ -1,6 +1,6 @@ import { IAssetData, RoomObjectVariable } from '../../../../../api'; +import { RoomObjectFurnitureActionEvent, RoomObjectWidgetRequestEvent } from '../../../../../events'; import { RoomObjectUpdateMessage } from '../../../../../room'; -import { RoomObjectFurnitureActionEvent, RoomObjectWidgetRequestEvent } from '../../../events'; import { ObjectItemDataUpdateMessage } from '../../../messages'; import { FurnitureLogic } from './FurnitureLogic'; @@ -24,14 +24,14 @@ export class FurnitureStickieLogic extends FurnitureLogic this.updateColor(); - if(this.object) this.object.model.setValue(RoomObjectVariable.FURNITURE_IS_STICKIE, ''); + if (this.object) this.object.model.setValue(RoomObjectVariable.FURNITURE_IS_STICKIE, ''); } public processUpdateMessage(message: RoomObjectUpdateMessage): void { super.processUpdateMessage(message); - if(message instanceof ObjectItemDataUpdateMessage) + if (message instanceof ObjectItemDataUpdateMessage) { this.eventDispatcher && this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.STICKIE, this.object)); } @@ -41,20 +41,20 @@ export class FurnitureStickieLogic extends FurnitureLogic protected updateColor(): void { - if(!this.object) return; + if (!this.object) return; const furnitureData = this.object.model.getValue(RoomObjectVariable.FURNITURE_DATA); let colorIndex = FurnitureStickieLogic.STICKIE_COLORS.indexOf(furnitureData); - if(colorIndex < 0) colorIndex = 3; + if (colorIndex < 0) colorIndex = 3; this.object.model.setValue(RoomObjectVariable.FURNITURE_COLOR, (colorIndex + 1)); } public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.STICKIE, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureTrophyLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureTrophyLogic.ts index b373979d..456e8c64 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureTrophyLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureTrophyLogic.ts @@ -1,4 +1,4 @@ -import { RoomObjectWidgetRequestEvent } from '../../../events'; +import { RoomObjectWidgetRequestEvent } from '../../../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureTrophyLogic extends FurnitureLogic @@ -12,7 +12,7 @@ export class FurnitureTrophyLogic extends FurnitureLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.TROPHY, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureWelcomeGiftLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureWelcomeGiftLogic.ts index f014b6ad..81f5133d 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureWelcomeGiftLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureWelcomeGiftLogic.ts @@ -1,18 +1,18 @@ import { IRoomGeometry } from '../../../../../api'; +import { RoomObjectStateChangedEvent } from '../../../../../events'; import { RoomSpriteMouseEvent } from '../../../../../room'; import { MouseEventType } from '../../../../ui'; -import { RoomObjectStateChangedEvent } from '../../../events'; import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; export class FurnitureWelcomeGiftLogic extends FurnitureMultiStateLogic { public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if(!event || !geometry) return; + if (!event || !geometry) return; - if(event.type === MouseEventType.DOUBLE_CLICK) + if (event.type === MouseEventType.DOUBLE_CLICK) { - if(this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_CHANGE, this.object)); + if (this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_CHANGE, this.object)); } super.mouseEvent(event, geometry); diff --git a/src/nitro/room/object/logic/furniture/FurnitureYoutubeLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureYoutubeLogic.ts index a2ab5701..b2606937 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureYoutubeLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureYoutubeLogic.ts @@ -1,5 +1,5 @@ import { RoomObjectVariable } from '../../../../../api'; -import { RoomObjectDataRequestEvent, RoomObjectWidgetRequestEvent } from '../../../events'; +import { RoomObjectDataRequestEvent, RoomObjectWidgetRequestEvent } from '../../../../../events'; import { FurnitureLogic } from './FurnitureLogic'; export class FurnitureYoutubeLogic extends FurnitureLogic @@ -18,7 +18,7 @@ export class FurnitureYoutubeLogic extends FurnitureLogic { super.update(time); - if(!this.object.model.getValue(RoomObjectVariable.SESSION_URL_PREFIX)) + if (!this.object.model.getValue(RoomObjectVariable.SESSION_URL_PREFIX)) { this.eventDispatcher.dispatchEvent(new RoomObjectDataRequestEvent(RoomObjectDataRequestEvent.RODRE_URL_PREFIX, this.object)); } @@ -26,7 +26,7 @@ export class FurnitureYoutubeLogic extends FurnitureLogic public useObject(): void { - if(!this.object || !this.eventDispatcher) return; + if (!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.YOUTUBE, this.object)); } diff --git a/src/nitro/room/object/logic/pet/PetLogic.ts b/src/nitro/room/object/logic/pet/PetLogic.ts index 1204ceba..2dbc3724 100644 --- a/src/nitro/room/object/logic/pet/PetLogic.ts +++ b/src/nitro/room/object/logic/pet/PetLogic.ts @@ -1,8 +1,8 @@ import { IAssetData, IRoomGeometry, IRoomObjectModel, PetType, RoomObjectVariable, Vector3d } from '../../../../../api'; +import { RoomObjectMoveEvent } from '../../../../../events'; import { RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room'; import { PetFigureData } from '../../../../avatar'; import { MouseEventType } from '../../../../ui'; -import { RoomObjectMoveEvent } from '../../../events'; import { ObjectAvatarChatUpdateMessage, ObjectAvatarExperienceUpdateMessage, ObjectAvatarFigureUpdateMessage, ObjectAvatarPetGestureUpdateMessage, ObjectAvatarPostureUpdateMessage, ObjectAvatarSelectedMessage, ObjectAvatarSleepUpdateMessage, ObjectAvatarUpdateMessage } from '../../../messages'; import { MovingObjectLogic } from '../MovingObjectLogic'; @@ -44,21 +44,21 @@ export class PetLogic extends MovingObjectLogic public initialize(asset: IAssetData): void { - if(!asset) return; + if (!asset) return; const model = this.object && this.object.model; - if(!model) return; + if (!model) return; - if(asset.logic) + if (asset.logic) { - if(asset.logic.model) + if (asset.logic.model) { const directions = asset.logic.model.directions; - if(directions && directions.length) + if (directions && directions.length) { - for(const direction of directions) this._directions.push(direction); + for (const direction of directions) this._directions.push(direction); this._directions.sort(); } @@ -70,9 +70,9 @@ export class PetLogic extends MovingObjectLogic public dispose(): void { - if(this._selected && this.object) + if (this._selected && this.object) { - if(this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectMoveEvent(RoomObjectMoveEvent.OBJECT_REMOVED, this.object)); + if (this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectMoveEvent(RoomObjectMoveEvent.OBJECT_REMOVED, this.object)); } this._directions = null; @@ -83,15 +83,15 @@ export class PetLogic extends MovingObjectLogic { super.update(totalTimeRunning); - if(this._selected && this.object) + if (this._selected && this.object) { - if(this.eventDispatcher) + if (this.eventDispatcher) { const location = this.object.getLocation(); - if(((!this._reportedLocation || (this._reportedLocation.x !== location.x)) || (this._reportedLocation.y !== location.y)) || (this._reportedLocation.z !== location.z)) + if (((!this._reportedLocation || (this._reportedLocation.x !== location.x)) || (this._reportedLocation.y !== location.y)) || (this._reportedLocation.z !== location.z)) { - if(!this._reportedLocation) this._reportedLocation = new Vector3d(); + if (!this._reportedLocation) this._reportedLocation = new Vector3d(); this._reportedLocation.assign(location); @@ -100,21 +100,21 @@ export class PetLogic extends MovingObjectLogic } } - if(this.object && this.object.model) this.updateModel(totalTimeRunning, this.object.model); + if (this.object && this.object.model) this.updateModel(totalTimeRunning, this.object.model); } private updateModel(time: number, model: IRoomObjectModel): void { - if((this._gestureEndTimestamp > 0) && (time > this._gestureEndTimestamp)) + if ((this._gestureEndTimestamp > 0) && (time > this._gestureEndTimestamp)) { model.setValue(RoomObjectVariable.FIGURE_GESTURE, null); this._gestureEndTimestamp = 0; } - if(this._talkingEndTimestamp > 0) + if (this._talkingEndTimestamp > 0) { - if(time > this._talkingEndTimestamp) + if (time > this._talkingEndTimestamp) { model.setValue(RoomObjectVariable.FIGURE_TALK, 0); @@ -122,7 +122,7 @@ export class PetLogic extends MovingObjectLogic } } - if((this._expressionEndTimestamp > 0) && (time > this._expressionEndTimestamp)) + if ((this._expressionEndTimestamp > 0) && (time > this._expressionEndTimestamp)) { model.setValue(RoomObjectVariable.FIGURE_EXPRESSION, 0); @@ -132,22 +132,22 @@ export class PetLogic extends MovingObjectLogic public processUpdateMessage(message: RoomObjectUpdateMessage): void { - if(!message || !this.object) return; + if (!message || !this.object) return; super.processUpdateMessage(message); const model = this.object && this.object.model; - if(!model) return; + if (!model) return; - if(message instanceof ObjectAvatarUpdateMessage) + if (message instanceof ObjectAvatarUpdateMessage) { model.setValue(RoomObjectVariable.HEAD_DIRECTION, message.headDirection); return; } - if(message instanceof ObjectAvatarFigureUpdateMessage) + if (message instanceof ObjectAvatarFigureUpdateMessage) { const petFigureData = new PetFigureData(message.figure); @@ -164,14 +164,14 @@ export class PetLogic extends MovingObjectLogic return; } - if(message instanceof ObjectAvatarPostureUpdateMessage) + if (message instanceof ObjectAvatarPostureUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_POSTURE, message.postureType); return; } - if(message instanceof ObjectAvatarChatUpdateMessage) + if (message instanceof ObjectAvatarChatUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_TALK, 1); @@ -180,14 +180,14 @@ export class PetLogic extends MovingObjectLogic return; } - if(message instanceof ObjectAvatarSleepUpdateMessage) + if (message instanceof ObjectAvatarSleepUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_SLEEP, message.isSleeping ? 1 : 0); return; } - if(message instanceof ObjectAvatarPetGestureUpdateMessage) + if (message instanceof ObjectAvatarPetGestureUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_GESTURE, message.gesture); @@ -196,7 +196,7 @@ export class PetLogic extends MovingObjectLogic return; } - if(message instanceof ObjectAvatarSelectedMessage) + if (message instanceof ObjectAvatarSelectedMessage) { this._selected = message.selected; this._reportedLocation = null; @@ -204,7 +204,7 @@ export class PetLogic extends MovingObjectLogic return; } - if(message instanceof ObjectAvatarExperienceUpdateMessage) + if (message instanceof ObjectAvatarExperienceUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_EXPERIENCE_TIMESTAMP, this.time); model.setValue(RoomObjectVariable.FIGURE_GAINED_EXPERIENCE, message.gainedExperience); @@ -217,7 +217,7 @@ export class PetLogic extends MovingObjectLogic { let eventType: string = null; - switch(event.type) + switch (event.type) { case MouseEventType.MOUSE_CLICK: eventType = RoomObjectMouseEvent.CLICK; @@ -227,14 +227,14 @@ export class PetLogic extends MovingObjectLogic case MouseEventType.MOUSE_DOWN: { const petType = this.object.model.getValue(RoomObjectVariable.PET_TYPE); - if(petType === PetType.MONSTERPLANT) + if (petType === PetType.MONSTERPLANT) { - if(this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectMouseEvent(RoomObjectMouseEvent.MOUSE_DOWN, this.object, event.eventId, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown)); + if (this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectMouseEvent(RoomObjectMouseEvent.MOUSE_DOWN, this.object, event.eventId, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown)); } break; } } - if(eventType && this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectMouseEvent(eventType, this.object, event.eventId, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown)); + if (eventType && this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectMouseEvent(eventType, this.object, event.eventId, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown)); } } diff --git a/src/nitro/room/object/logic/room/RoomLogic.ts b/src/nitro/room/object/logic/room/RoomLogic.ts index 071a7b5a..e4a85067 100644 --- a/src/nitro/room/object/logic/room/RoomLogic.ts +++ b/src/nitro/room/object/logic/room/RoomLogic.ts @@ -1,9 +1,9 @@ import { Point } from '@pixi/math'; import { IRoomGeometry, IRoomObjectModel, RoomObjectVariable, Vector3d } from '../../../../../api'; +import { RoomObjectTileMouseEvent, RoomObjectWallMouseEvent } from '../../../../../events'; import { ColorConverter, RoomObjectEvent, RoomObjectLogicBase, RoomObjectMouseEvent, RoomObjectUpdateMessage, RoomSpriteMouseEvent } from '../../../../../room'; import { Nitro } from '../../../../Nitro'; import { MouseEventType } from '../../../../ui'; -import { RoomObjectTileMouseEvent, RoomObjectWallMouseEvent } from '../../../events'; import { ObjectRoomColorUpdateMessage, ObjectRoomFloorHoleUpdateMessage, ObjectRoomMapUpdateMessage, ObjectRoomMaskUpdateMessage, ObjectRoomPlanePropertyUpdateMessage, ObjectRoomPlaneVisibilityUpdateMessage, ObjectRoomUpdateMessage } from '../../../messages'; import { RoomMapData } from '../../RoomMapData'; import { RoomPlaneBitmapMaskData } from '../../RoomPlaneBitmapMaskData'; @@ -57,14 +57,14 @@ export class RoomLogic extends RoomObjectLogicBase { super.dispose(); - if(this._planeParser) + if (this._planeParser) { this._planeParser.dispose(); this._planeParser = null; } - if(this._planeBitmapMaskParser) + if (this._planeBitmapMaskParser) { this._planeBitmapMaskParser.dispose(); @@ -74,11 +74,11 @@ export class RoomLogic extends RoomObjectLogicBase public initialize(roomMap: RoomMapData): void { - if(!roomMap || !this.object) return; + if (!roomMap || !this.object) return; - if(!(roomMap instanceof RoomMapData)) return; + if (!(roomMap instanceof RoomMapData)) return; - if(!this._planeParser.initializeFromMapData(roomMap)) return; + if (!this._planeParser.initializeFromMapData(roomMap)) return; this.object.model.setValue(RoomObjectVariable.ROOM_MAP_DATA, roomMap); this.object.model.setValue(RoomObjectVariable.ROOM_BACKGROUND_COLOR, 0xFFFFFF); @@ -95,13 +95,13 @@ export class RoomLogic extends RoomObjectLogicBase this.updateBackgroundColor(time); - if(this._needsMapUpdate) + if (this._needsMapUpdate) { - if(this._lastHoleUpdate && (time - this._lastHoleUpdate) < 5) return; + if (this._lastHoleUpdate && (time - this._lastHoleUpdate) < 5) return; const model = this.object && this.object.model; - if(model) + if (model) { const mapData = this._planeParser.getMapData(); @@ -119,12 +119,12 @@ export class RoomLogic extends RoomObjectLogicBase private updateBackgroundColor(k: number): void { - if(!this.object || !this._colorChangedTime) return; + if (!this.object || !this._colorChangedTime) return; let color = this._color; let newColor = this._light; - if((k - this._colorChangedTime) >= this._colorTransitionLength) + if ((k - this._colorChangedTime) >= this._colorTransitionLength) { color = this._targetColor; newColor = this._targetLight; @@ -158,60 +158,60 @@ export class RoomLogic extends RoomObjectLogicBase _local_5 = ((_local_5 & 0xFFFF00) + newColor); color = ColorConverter.hslToRGB(_local_5); - if(this.object.model) this.object.model.setValue(RoomObjectVariable.ROOM_BACKGROUND_COLOR, color); + if (this.object.model) this.object.model.setValue(RoomObjectVariable.ROOM_BACKGROUND_COLOR, color); } public processUpdateMessage(message: RoomObjectUpdateMessage): void { - if(!message || !this.object) return; + if (!message || !this.object) return; const model = this.object.model; - if(!model) return; + if (!model) return; - if(message instanceof ObjectRoomUpdateMessage) + if (message instanceof ObjectRoomUpdateMessage) { this.onObjectRoomUpdateMessage(message, model); return; } - if(message instanceof ObjectRoomMaskUpdateMessage) + if (message instanceof ObjectRoomMaskUpdateMessage) { this.onObjectRoomMaskUpdateMessage(message, model); return; } - if(message instanceof ObjectRoomPlaneVisibilityUpdateMessage) + if (message instanceof ObjectRoomPlaneVisibilityUpdateMessage) { this.onObjectRoomPlaneVisibilityUpdateMessage(message, model); return; } - if(message instanceof ObjectRoomPlanePropertyUpdateMessage) + if (message instanceof ObjectRoomPlanePropertyUpdateMessage) { this.onObjectRoomPlanePropertyUpdateMessage(message, model); return; } - if(message instanceof ObjectRoomFloorHoleUpdateMessage) + if (message instanceof ObjectRoomFloorHoleUpdateMessage) { this.onObjectRoomFloorHoleUpdateMessage(message, model); return; } - if(message instanceof ObjectRoomColorUpdateMessage) + if (message instanceof ObjectRoomColorUpdateMessage) { this.onObjectRoomColorUpdateMessage(message, model); return; } - if(message instanceof ObjectRoomMapUpdateMessage) + if (message instanceof ObjectRoomMapUpdateMessage) { this.onObjectRoomMapUpdateMessage(message); } @@ -219,7 +219,7 @@ export class RoomLogic extends RoomObjectLogicBase private onObjectRoomUpdateMessage(message: ObjectRoomUpdateMessage, model: IRoomObjectModel): void { - switch(message.type) + switch (message.type) { case ObjectRoomUpdateMessage.ROOM_FLOOR_UPDATE: model.setValue(RoomObjectVariable.ROOM_FLOOR_TYPE, message.value); @@ -238,12 +238,12 @@ export class RoomLogic extends RoomObjectLogicBase let maskType: string = null; let update = false; - switch(message.type) + switch (message.type) { case ObjectRoomMaskUpdateMessage.ADD_MASK: maskType = RoomPlaneBitmapMaskData.WINDOW; - if(message.maskCategory === ObjectRoomMaskUpdateMessage.HOLE) maskType = RoomPlaneBitmapMaskData.HOLE; + if (message.maskCategory === ObjectRoomMaskUpdateMessage.HOLE) maskType = RoomPlaneBitmapMaskData.HOLE; this._planeBitmapMaskParser.addMask(message.maskId, message.maskType, message.maskLocation, maskType); @@ -255,16 +255,16 @@ export class RoomLogic extends RoomObjectLogicBase } - if(update) _arg_2.setValue(RoomObjectVariable.ROOM_PLANE_MASK_XML, this._planeBitmapMaskParser.getXML()); + if (update) _arg_2.setValue(RoomObjectVariable.ROOM_PLANE_MASK_XML, this._planeBitmapMaskParser.getXML()); } private onObjectRoomPlaneVisibilityUpdateMessage(message: ObjectRoomPlaneVisibilityUpdateMessage, model: IRoomObjectModel): void { let visible = 0; - if(message.visible) visible = 1; + if (message.visible) visible = 1; - switch(message.type) + switch (message.type) { case ObjectRoomPlaneVisibilityUpdateMessage.FLOOR_VISIBILITY: model.setValue(RoomObjectVariable.ROOM_FLOOR_VISIBILITY, visible); @@ -278,7 +278,7 @@ export class RoomLogic extends RoomObjectLogicBase private onObjectRoomPlanePropertyUpdateMessage(message: ObjectRoomPlanePropertyUpdateMessage, model: IRoomObjectModel): void { - switch(message.type) + switch (message.type) { case ObjectRoomPlanePropertyUpdateMessage.FLOOR_THICKNESS: model.setValue(RoomObjectVariable.ROOM_FLOOR_THICKNESS, message.value); @@ -291,7 +291,7 @@ export class RoomLogic extends RoomObjectLogicBase private onObjectRoomFloorHoleUpdateMessage(message: ObjectRoomFloorHoleUpdateMessage, model: IRoomObjectModel): void { - switch(message.type) + switch (message.type) { case ObjectRoomFloorHoleUpdateMessage.ADD: this._planeParser.addFloorHole(message.id, message.x, message.y, message.width, message.height); @@ -308,7 +308,7 @@ export class RoomLogic extends RoomObjectLogicBase private onObjectRoomColorUpdateMessage(message: ObjectRoomColorUpdateMessage, model: IRoomObjectModel): void { - if(!message || !model) return; + if (!message || !model) return; this._originalColor = this._color; this._originalLight = this._light; @@ -316,7 +316,7 @@ export class RoomLogic extends RoomObjectLogicBase this._targetLight = message.light; this._colorChangedTime = this.time; - if(this._skipColorTransition) + if (this._skipColorTransition) this._colorTransitionLength = 0; else this._colorTransitionLength = 1500; @@ -326,7 +326,7 @@ export class RoomLogic extends RoomObjectLogicBase private onObjectRoomMapUpdateMessage(message: ObjectRoomMapUpdateMessage): void { - if(!message || !message.mapData) return; + if (!message || !message.mapData) return; this.object.model.setValue(RoomObjectVariable.ROOM_MAP_DATA, message.mapData); this.object.model.setValue(RoomObjectVariable.ROOM_FLOOR_HOLE_UPDATE_TIME, this.time); @@ -336,20 +336,20 @@ export class RoomLogic extends RoomObjectLogicBase public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if(!event || !geometry || !this.object || !this.object.model) return; + if (!event || !geometry || !this.object || !this.object.model) return; const tag = event.spriteTag; let planeId = 0; - if(tag && (tag.indexOf('@') >= 0)) + if (tag && (tag.indexOf('@') >= 0)) { planeId = parseInt(tag.substr(tag.indexOf('@') + 1)); } - if((planeId < 1) || (planeId > this._planeParser.planeCount)) + if ((planeId < 1) || (planeId > this._planeParser.planeCount)) { - if(event.type === MouseEventType.ROLL_OUT) + if (event.type === MouseEventType.ROLL_OUT) { this.object.model.setValue(RoomObjectVariable.ROOM_SELECTED_PLANE, 0); } @@ -367,12 +367,12 @@ export class RoomLogic extends RoomObjectLogicBase const planeNormalDirection = this._planeParser.getPlaneNormalDirection(planeId); const planeType = this._planeParser.getPlaneType(planeId); - if(((((planeLocation == null) || (planeLeftSide == null)) || (planeRightSide == null)) || (planeNormalDirection == null))) return; + if (((((planeLocation == null) || (planeLeftSide == null)) || (planeRightSide == null)) || (planeNormalDirection == null))) return; const leftSideLength = planeLeftSide.length; const rightSideLength = planeRightSide.length; - if(((leftSideLength == 0) || (rightSideLength == 0))) return; + if (((leftSideLength == 0) || (rightSideLength == 0))) return; const screenX = event.screenX; const screenY = event.screenY; @@ -380,7 +380,7 @@ export class RoomLogic extends RoomObjectLogicBase planePosition = geometry.getPlanePosition(screenPoint, planeLocation, planeLeftSide, planeRightSide); - if(!planePosition) + if (!planePosition) { this.object.model.setValue(RoomObjectVariable.ROOM_SELECTED_PLANE, 0); @@ -396,7 +396,7 @@ export class RoomLogic extends RoomObjectLogicBase const tileY = _local_18.y; const tileZ = _local_18.z; - if(((((planePosition.x >= 0) && (planePosition.x < leftSideLength)) && (planePosition.y >= 0)) && (planePosition.y < rightSideLength))) + if (((((planePosition.x >= 0) && (planePosition.x < leftSideLength)) && (planePosition.y >= 0)) && (planePosition.y < rightSideLength))) { this.object.model.setValue(RoomObjectVariable.ROOM_SELECTED_X, tileX); this.object.model.setValue(RoomObjectVariable.ROOM_SELECTED_Y, tileY); @@ -412,30 +412,30 @@ export class RoomLogic extends RoomObjectLogicBase let eventType: string = null; - if((event.type === MouseEventType.MOUSE_MOVE) || (event.type === MouseEventType.ROLL_OVER)) eventType = RoomObjectMouseEvent.MOUSE_MOVE; - else if((event.type === MouseEventType.MOUSE_CLICK)) eventType = RoomObjectMouseEvent.CLICK; + if ((event.type === MouseEventType.MOUSE_MOVE) || (event.type === MouseEventType.ROLL_OVER)) eventType = RoomObjectMouseEvent.MOUSE_MOVE; + else if ((event.type === MouseEventType.MOUSE_CLICK)) eventType = RoomObjectMouseEvent.CLICK; - switch(event.type) + switch (event.type) { case MouseEventType.MOUSE_MOVE: case MouseEventType.ROLL_OVER: case MouseEventType.MOUSE_CLICK: { let newEvent: RoomObjectEvent = null; - if(planeType === RoomPlaneData.PLANE_FLOOR) + if (planeType === RoomPlaneData.PLANE_FLOOR) { newEvent = new RoomObjectTileMouseEvent(eventType, this.object, event.eventId, tileX, tileY, tileZ, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown); } - else if((planeType === RoomPlaneData.PLANE_WALL) || (planeType === RoomPlaneData.PLANE_LANDSCAPE)) + else if ((planeType === RoomPlaneData.PLANE_WALL) || (planeType === RoomPlaneData.PLANE_LANDSCAPE)) { let direction = 90; - if(planeNormalDirection) + if (planeNormalDirection) { direction = (planeNormalDirection.x + 90); - if(direction > 360) direction -= 360; + if (direction > 360) direction -= 360; } const _local_27 = ((planeLeftSide.length * planePosition.x) / leftSideLength); @@ -444,7 +444,7 @@ export class RoomLogic extends RoomObjectLogicBase newEvent = new RoomObjectWallMouseEvent(eventType, this.object, event.eventId, planeLocation, planeLeftSide, planeRightSide, _local_27, _local_28, direction, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown); } - if(this.eventDispatcher) this.eventDispatcher.dispatchEvent(newEvent); + if (this.eventDispatcher) this.eventDispatcher.dispatchEvent(newEvent); return; } diff --git a/src/nitro/room/preview/RoomPreviewer.ts b/src/nitro/room/preview/RoomPreviewer.ts index 2f32895e..58f874bd 100644 --- a/src/nitro/room/preview/RoomPreviewer.ts +++ b/src/nitro/room/preview/RoomPreviewer.ts @@ -3,10 +3,10 @@ import { Container, DisplayObject } from '@pixi/display'; import { Point, Rectangle } from '@pixi/math'; import { Sprite } from '@pixi/sprite'; import { IGetImageListener, IImageResult, IObjectData, IRoomEngine, IRoomObjectController, IRoomRenderingCanvas, IVector3D, LegacyDataType, RoomObjectCategory, RoomObjectUserType, RoomObjectVariable, Vector3d } from '../../../api'; +import { RoomEngineEvent, RoomEngineObjectEvent } from '../../../events'; import { GetTickerTime, NitroSprite } from '../../../pixi-proxy'; import { RoomId } from '../../../room'; import { FloorHeightMapMessageParser, RoomEntryTileMessageParser } from '../../communication'; -import { RoomEngineEvent, RoomEngineObjectEvent } from '../events'; import { ObjectRoomMapUpdateMessage } from '../messages'; import { RoomPlaneParser } from '../object/RoomPlaneParser'; import { RoomEngine } from '../RoomEngine'; diff --git a/src/nitro/session/RoomPetData.ts b/src/nitro/session/RoomPetData.ts index 828ffb21..40c38f47 100644 --- a/src/nitro/session/RoomPetData.ts +++ b/src/nitro/session/RoomPetData.ts @@ -1,4 +1,6 @@ -export class RoomPetData +import { IRoomPetData } from '../../api'; + +export class RoomPetData implements IRoomPetData { private _id: number; private _level: number; diff --git a/src/nitro/session/RoomSession.ts b/src/nitro/session/RoomSession.ts index 71b95bca..994e1db2 100644 --- a/src/nitro/session/RoomSession.ts +++ b/src/nitro/session/RoomSession.ts @@ -1,7 +1,7 @@ import { IConnection, IRoomSession, RoomControllerLevel, RoomTradingLevelEnum } from '../../api'; import { Disposable } from '../../core'; +import { RoomSessionEvent } from '../../events'; import { BotRemoveComposer, CompostPlantMessageComposer, FurnitureMultiStateComposer, HarvestPetMessageComposer, MoodlightSettingsComposer, MoodlightSettingsSaveComposer, MoodlightTogggleStateComposer, OpenPresentComposer, PetMountComposer, PetRemoveComposer, PollAnswerComposer, PollRejectComposer, PollStartComposer, RemovePetSaddleComposer, RoomAmbassadorAlertComposer, RoomBanUserComposer, RoomDoorbellAccessComposer, RoomEnterComposer, RoomGiveRightsComposer, RoomKickUserComposer, RoomModerationSettings, RoomMuteUserComposer, RoomTakeRightsComposer, RoomUnitActionComposer, RoomUnitChatComposer, RoomUnitChatShoutComposer, RoomUnitChatWhisperComposer, RoomUnitDanceComposer, RoomUnitPostureComposer, RoomUnitSignComposer, RoomUnitTypingStartComposer, RoomUnitTypingStopComposer, TogglePetBreedingComposer, TogglePetRidingComposer, UsePetProductComposer, UserMottoComposer } from '../communication'; -import { RoomSessionEvent } from './events'; import { UserDataManager } from './UserDataManager'; export class RoomSession extends Disposable implements IRoomSession @@ -48,7 +48,7 @@ export class RoomSession extends Disposable implements IRoomSession protected onDispose(): void { - if(this._userData) + if (this._userData) { this._userData.dispose(); @@ -60,16 +60,16 @@ export class RoomSession extends Disposable implements IRoomSession public setConnection(connection: IConnection): void { - if(this._connection || !connection) return; + if (this._connection || !connection) return; this._connection = connection; - if(this._userData) this._userData.setConnection(connection); + if (this._userData) this._userData.setConnection(connection); } public setControllerLevel(level: number): void { - if((level >= RoomControllerLevel.NONE) && (level <= RoomControllerLevel.MODERATOR)) + if ((level >= RoomControllerLevel.NONE) && (level <= RoomControllerLevel.MODERATOR)) { this._controllerLevel = level; @@ -91,7 +91,7 @@ export class RoomSession extends Disposable implements IRoomSession public start(): boolean { - if(this._state !== RoomSessionEvent.CREATED || !this._connection) return false; + if (this._state !== RoomSessionEvent.CREATED || !this._connection) return false; this._state = RoomSessionEvent.STARTED; @@ -100,7 +100,7 @@ export class RoomSession extends Disposable implements IRoomSession private enterRoom(): boolean { - if(!this._connection) return false; + if (!this._connection) return false; this._connection.send(new RoomEnterComposer(this._roomId, this._password)); @@ -109,7 +109,7 @@ export class RoomSession extends Disposable implements IRoomSession public reset(roomId: number): void { - if(roomId === this._roomId) return; + if (roomId === this._roomId) return; this._roomId = roomId; } @@ -131,7 +131,7 @@ export class RoomSession extends Disposable implements IRoomSession public sendChatTypingMessage(isTyping: boolean): void { - if(isTyping) this._connection.send(new RoomUnitTypingStartComposer()); + if (isTyping) this._connection.send(new RoomUnitTypingStartComposer()); else this._connection.send(new RoomUnitTypingStopComposer()); } @@ -152,7 +152,7 @@ export class RoomSession extends Disposable implements IRoomSession public sendSignMessage(sign: number): void { - if((sign < 0) || (sign > 17)) return; + if ((sign < 0) || (sign > 17)) return; this._connection.send(new RoomUnitSignComposer(sign)); } @@ -227,21 +227,21 @@ export class RoomSession extends Disposable implements IRoomSession public pickupPet(id: number): void { - if(!this._connection) return; + if (!this._connection) return; this._connection.send(new PetRemoveComposer(id)); } public pickupBot(id: number): void { - if(!this._connection) return; + if (!this._connection) return; this._connection.send(new BotRemoveComposer(id)); } public requestMoodlightSettings(): void { - if(!this._connection) return; + if (!this._connection) return; this._connection.send(new MoodlightSettingsComposer()); } diff --git a/src/nitro/session/RoomSessionManager.ts b/src/nitro/session/RoomSessionManager.ts index b141b1a7..3d6d99ca 100644 --- a/src/nitro/session/RoomSessionManager.ts +++ b/src/nitro/session/RoomSessionManager.ts @@ -1,7 +1,6 @@ import { INitroCommunicationManager, IRoomEngine, IRoomHandlerListener, IRoomSession, IRoomSessionManager } from '../../api'; import { NitroManager } from '../../core'; -import { RoomEngineEvent } from '../room'; -import { RoomSessionEvent } from './events'; +import { RoomEngineEvent, RoomSessionEvent } from '../../events'; import { BaseHandler, GenericErrorHandler, PollHandler, RoomChatHandler, RoomDataHandler, RoomDimmerPresetsHandler, RoomPermissionsHandler, RoomPresentHandler, RoomSessionHandler, RoomUsersHandler, WordQuizHandler } from './handler'; import { RoomSession } from './RoomSession'; @@ -54,7 +53,7 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana { const connection = this._communication && this._communication.connection; - if(!connection) return; + if (!connection) return; this._handlers.push( new RoomChatHandler(connection, this), @@ -72,11 +71,11 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana private setHandlers(session: IRoomSession): void { - if(!this._handlers || !this._handlers.length) return; + if (!this._handlers || !this._handlers.length) return; - for(const handler of this._handlers) + for (const handler of this._handlers) { - if(!handler) continue; + if (!handler) continue; handler.setRoomId(session.roomId); } @@ -89,7 +88,7 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana private processPendingSession(): void { - if(!this._pendingSession || !this._roomEngine.ready) return; + if (!this._pendingSession || !this._roomEngine.ready) return; this.addSession(this._pendingSession); @@ -100,7 +99,7 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana { const existing = this._sessions.get(this.getRoomId(id)); - if(!existing) return null; + if (!existing) return null; return existing; } @@ -117,7 +116,7 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana private addSession(roomSession: IRoomSession): boolean { - if(!this._roomEngine.ready) + if (!this._roomEngine.ready) { this._pendingSession = roomSession; @@ -126,7 +125,7 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana this._sessionStarting = true; - if(this._sessions.get(this.getRoomId(roomSession.roomId))) + if (this._sessions.get(this.getRoomId(roomSession.roomId))) { this.removeSession(roomSession.roomId, false); } @@ -146,11 +145,11 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana public startSession(session: IRoomSession): boolean { - if(session.state === RoomSessionEvent.STARTED) return false; + if (session.state === RoomSessionEvent.STARTED) return false; this._sessionStarting = false; - if(!session.start()) + if (!session.start()) { this.removeSession(session.roomId); @@ -168,7 +167,7 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana { const session = this.getSession(id); - if(!session) return; + if (!session) return; this._sessions.delete(this.getRoomId(id)); @@ -181,9 +180,9 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana { const session = this.getSession(id); - if(!session) return; + if (!session) return; - switch(type) + switch (type) { case RoomSessionHandler.RS_CONNECTED: return; @@ -199,7 +198,7 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana { const existing = this.getSession(fromRoomId); - if(!existing) return; + if (!existing) return; this._sessions.delete(this.getRoomId(fromRoomId)); diff --git a/src/nitro/session/SessionDataManager.ts b/src/nitro/session/SessionDataManager.ts index 82a98a35..fddcdc41 100644 --- a/src/nitro/session/SessionDataManager.ts +++ b/src/nitro/session/SessionDataManager.ts @@ -1,12 +1,11 @@ import { Resource, Texture } from '@pixi/core'; -import { IFurnitureData, IFurnitureDataListener, IGroupInformationManager, IMessageComposer, INitroCommunicationManager, IProductData, IProductDataListener, ISessionDataManager, NoobnessLevelEnum, SecurityLevel } from '../../api'; -import { NitroEvent, NitroManager } from '../../core'; +import { IFurnitureData, IFurnitureDataListener, IGroupInformationManager, IMessageComposer, INitroCommunicationManager, INitroEvent, IProductData, IProductDataListener, ISessionDataManager, NoobnessLevelEnum, SecurityLevel } from '../../api'; +import { NitroManager } from '../../core'; +import { MysteryBoxKeysUpdateEvent, NitroSettingsEvent, SessionDataPreferencesEvent, UserNameUpdateEvent } from '../../events'; import { AvailabilityStatusMessageEvent, ChangeUserNameResultMessageEvent, FigureUpdateEvent, InClientLinkEvent, MysteryBoxKeysEvent, NoobnessLevelMessageEvent, PetRespectComposer, RoomReadyMessageEvent, RoomUnitChatComposer, UserInfoEvent, UserNameChangeMessageEvent, UserPermissionsEvent, UserRespectComposer } from '../communication'; -import { NitroSettingsEvent } from '../events'; import { Nitro } from '../Nitro'; import { HabboWebTools } from '../utils/HabboWebTools'; import { BadgeImageManager } from './badge/BadgeImageManager'; -import { MysteryBoxKeysUpdateEvent, SessionDataPreferencesEvent, UserNameUpdateEvent } from './events'; import { FurnitureDataLoader } from './furniture/FurnitureDataLoader'; import { GroupInformationManager } from './GroupInformationManager'; import { IgnoredUsersManager } from './IgnoredUsersManager'; @@ -121,14 +120,14 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana { this.destroyFurnitureData(); - if(this._ignoredUsersManager) + if (this._ignoredUsersManager) { this._ignoredUsersManager.dispose(); this._ignoredUsersManager = null; } - if(this._groupInformationManager) + if (this._groupInformationManager) { this._groupInformationManager.dispose(); @@ -174,7 +173,7 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana private loadBadgeImageManager(): void { - if(this._badgeImageManager) return; + if (this._badgeImageManager) return; this._badgeImageManager = new BadgeImageManager(Nitro.instance.core.asset, this); this._badgeImageManager.init(); @@ -182,34 +181,34 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana public hasProductData(listener: IProductDataListener): boolean { - if(this._productsReady) return true; + if (this._productsReady) return true; - if(listener && (this._pendingProductListeners.indexOf(listener) === -1)) this._pendingProductListeners.push(listener); + if (listener && (this._pendingProductListeners.indexOf(listener) === -1)) this._pendingProductListeners.push(listener); return false; } public getAllFurnitureData(listener: IFurnitureDataListener): IFurnitureData[] { - if(!this._furnitureReady) + if (!this._furnitureReady) { - if(this._pendingFurnitureListeners.indexOf(listener) === -1) this._pendingFurnitureListeners.push(listener); + if (this._pendingFurnitureListeners.indexOf(listener) === -1) this._pendingFurnitureListeners.push(listener); return null; } const furnitureData: IFurnitureData[] = []; - for(const data of this._floorItems.values()) + for (const data of this._floorItems.values()) { - if(!data) continue; + if (!data) continue; furnitureData.push(data); } - for(const data of this._wallItems.values()) + for (const data of this._wallItems.values()) { - if(!data) continue; + if (!data) continue; furnitureData.push(data); } @@ -219,18 +218,18 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana public removePendingFurniDataListener(listener: IFurnitureDataListener): void { - if(!this._pendingFurnitureListeners) return; + if (!this._pendingFurnitureListeners) return; const index = this._pendingFurnitureListeners.indexOf(listener); - if(index === -1) return; + if (index === -1) return; this._pendingFurnitureListeners.splice(index, 1); } private onUserFigureEvent(event: FigureUpdateEvent): void { - if(!event || !event.connection) return; + if (!event || !event.connection) return; this._figure = event.getParser().figure; this._gender = event.getParser().gender; @@ -240,13 +239,13 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana private onUserInfoEvent(event: UserInfoEvent): void { - if(!event || !event.connection) return; + if (!event || !event.connection) return; this.resetUserInfo(); const userInfo = event.getParser().userInfo; - if(!userInfo) return; + if (!userInfo) return; this._userId = userInfo.userId; this._name = userInfo.username; @@ -263,7 +262,7 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana private onUserPermissionsEvent(event: UserPermissionsEvent): void { - if(!event || !event.connection) return; + if (!event || !event.connection) return; this._clubLevel = event.getParser().clubLevel; this._securityLevel = event.getParser().securityLevel; @@ -272,11 +271,11 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana private onAvailabilityStatusMessageEvent(event: AvailabilityStatusMessageEvent): void { - if(!event || !event.connection) return; + if (!event || !event.connection) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; this._systemOpen = parser.isOpen; this._systemShutdown = parser.onShutdown; @@ -285,13 +284,13 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana private onChangeNameUpdateEvent(event: ChangeUserNameResultMessageEvent): void { - if(!event || !event.connection) return; + if (!event || !event.connection) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; - if(parser.resultCode !== ChangeUserNameResultMessageEvent.NAME_OK) return; + if (parser.resultCode !== ChangeUserNameResultMessageEvent.NAME_OK) return; this._canChangeName = false; @@ -300,13 +299,13 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana private onUserNameChangeMessageEvent(event: UserNameChangeMessageEvent): void { - if(!event || !event.connection) return; + if (!event || !event.connection) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; - if(parser.webId !== this.userId) return; + if (parser.webId !== this.userId) return; this._name = parser.newName; this._canChangeName = false; @@ -316,63 +315,63 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana private onRoomModelNameEvent(event: RoomReadyMessageEvent): void { - if(!event) return; + if (!event) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; HabboWebTools.roomVisited(parser.roomId); } - private onFurnitureDataReadyEvent(event: NitroEvent): void + private onFurnitureDataReadyEvent(event: INitroEvent): void { this._furnitureData.removeEventListener(FurnitureDataLoader.FURNITURE_DATA_READY, this.onFurnitureDataReadyEvent); this._furnitureReady = true; - if(!this._furnitureListenersNotified) + if (!this._furnitureListenersNotified) { this._furnitureListenersNotified = true; - if(this._pendingFurnitureListeners && this._pendingFurnitureListeners.length) + if (this._pendingFurnitureListeners && this._pendingFurnitureListeners.length) { - for(const listener of this._pendingFurnitureListeners) listener && listener.loadFurnitureData(); + for (const listener of this._pendingFurnitureListeners) listener && listener.loadFurnitureData(); } } this._pendingProductListeners = []; } - private onProductDataReadyEvent(event: NitroEvent): void + private onProductDataReadyEvent(event: INitroEvent): void { this._productData.removeEventListener(ProductDataLoader.PDP_PRODUCT_DATA_READY, this.onProductDataReadyEvent); this._productsReady = true; - for(const listener of this._pendingProductListeners) listener && listener.loadProductData(); + for (const listener of this._pendingProductListeners) listener && listener.loadProductData(); this._pendingProductListeners = []; } private onInClientLinkEvent(event: InClientLinkEvent): void { - if(!event) return; + if (!event) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; Nitro.instance.createLinkEvent(parser.link); } private onMysteryBoxKeysEvent(event: MysteryBoxKeysEvent): void { - if(!event) return; + if (!event) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; this.events.dispatchEvent(new MysteryBoxKeysUpdateEvent(parser.boxColor, parser.keyColor)); } @@ -381,7 +380,7 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana { this._noobnessLevel = event.getParser().noobnessLevel; - if(this._noobnessLevel !== NoobnessLevelEnum.OLD_IDENTITY) + if (this._noobnessLevel !== NoobnessLevelEnum.OLD_IDENTITY) { Nitro.instance.core.configuration.setValue('new.identity', 1); } @@ -397,7 +396,7 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana private destroyFurnitureData(): void { - if(!this._furnitureData) return; + if (!this._furnitureData) return; this._furnitureData.dispose(); @@ -406,7 +405,7 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana private destroyProductData(): void { - if(!this._productData) return; + if (!this._productData) return; this._productData.dispose(); @@ -417,18 +416,18 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana { const existing = this._floorItems.get(id); - if(!existing) return null; + if (!existing) return null; return existing; } public getFloorItemDataByName(name: string): IFurnitureData { - if(!name || !this._floorItems || !this._floorItems.size) return null; + if (!name || !this._floorItems || !this._floorItems.size) return null; - for(const item of this._floorItems.values()) + for (const item of this._floorItems.values()) { - if(!item || (item.className !== name)) continue; + if (!item || (item.className !== name)) continue; return item; } @@ -438,18 +437,18 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana { const existing = this._wallItems.get(id); - if(!existing) return null; + if (!existing) return null; return existing; } public getWallItemDataByName(name: string): IFurnitureData { - if(!name || !this._wallItems || !this._wallItems.size) return null; + if (!name || !this._wallItems || !this._wallItems.size) return null; - for(const item of this._wallItems.values()) + for (const item of this._wallItems.values()) { - if(!item || (item.className !== name)) continue; + if (!item || (item.className !== name)) continue; return item; } @@ -457,7 +456,7 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana public getProductData(type: string): IProductData { - if(!this._productsReady) this.loadProductData(); + if (!this._productsReady) this.loadProductData(); return this._products.get(type); } @@ -499,7 +498,7 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana public giveRespect(userId: number): void { - if((userId < 0) || (this._respectsLeft <= 0)) return; + if ((userId < 0) || (this._respectsLeft <= 0)) return; this.send(new UserRespectComposer(userId)); @@ -508,7 +507,7 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana public givePetRespect(petId: number): void { - if((petId < 0) || (this._respectsPetLeft <= 0)) return; + if ((petId < 0) || (this._respectsPetLeft <= 0)) return; this.send(new PetRespectComposer(petId)); diff --git a/src/nitro/session/badge/BadgeImageManager.ts b/src/nitro/session/badge/BadgeImageManager.ts index b2d965c3..5da303bd 100644 --- a/src/nitro/session/badge/BadgeImageManager.ts +++ b/src/nitro/session/badge/BadgeImageManager.ts @@ -1,9 +1,9 @@ import { Resource, Texture } from '@pixi/core'; import { IAssetManager, IDisposable, IMessageEvent } from '../../../api'; +import { BadgeImageReadyEvent } from '../../../events'; import { NitroContainer, NitroSprite, NitroTexture, TextureUtils } from '../../../pixi-proxy'; import { GroupBadgePartsEvent } from '../../communication'; import { Nitro } from '../../Nitro'; -import { BadgeImageReadyEvent } from '../events'; import { SessionDataManager } from './../SessionDataManager'; import { BadgeInfo } from './BadgeInfo'; import { GroupBadge } from './GroupBadge'; @@ -44,21 +44,21 @@ export class BadgeImageManager implements IDisposable public init(): void { - if(this._sessionDataManager && this._sessionDataManager.communication) + if (this._sessionDataManager && this._sessionDataManager.communication) { this._messages = [ new GroupBadgePartsEvent(this.onGroupBadgePartsEvent.bind(this)) ]; - for(const message of this._messages) this._sessionDataManager.communication.registerMessageEvent(message); + for (const message of this._messages) this._sessionDataManager.communication.registerMessageEvent(message); } } public dispose(): void { - if(this._messages && this._messages.length) + if (this._messages && this._messages.length) { - for(const message of this._messages) this._sessionDataManager.communication.removeMessageEvent(message); + for (const message of this._messages) this._sessionDataManager.communication.removeMessageEvent(message); this._messages = null; } @@ -70,7 +70,7 @@ export class BadgeImageManager implements IDisposable { let badge = this.getBadgeTexture(badgeName, type); - if(!badge && load) badge = this.getBadgePlaceholder(); + if (!badge && load) badge = this.getBadgePlaceholder(); return badge; } @@ -84,7 +84,7 @@ export class BadgeImageManager implements IDisposable public loadBadgeImage(badgeName: string, type: string = BadgeImageManager.NORMAL_BADGE): string { - if(this._assets.getTexture(this.getBadgeUrl(badgeName, type))) return badgeName; + if (this._assets.getTexture(this.getBadgeUrl(badgeName, type))) return badgeName; this.getBadgeTexture(badgeName, type); @@ -95,38 +95,38 @@ export class BadgeImageManager implements IDisposable { const url = this.getBadgeUrl(badgeName, type); - if(!url || !url.length) return null; + if (!url || !url.length) return null; const existing = this._assets.getTexture(url); - if(existing) return existing.clone(); + if (existing) return existing.clone(); - if(type === BadgeImageManager.NORMAL_BADGE) + if (type === BadgeImageManager.NORMAL_BADGE) { - if(this._requestedBadges.get(badgeName)) return null; + if (this._requestedBadges.get(badgeName)) return null; this._requestedBadges.set(badgeName, true); this._assets.downloadAsset(url, (flag: boolean) => { - if(flag) + if (flag) { this._requestedBadges.delete(badgeName); const texture = this._assets.getTexture(url); - if(texture && this._sessionDataManager) this._sessionDataManager.events.dispatchEvent(new BadgeImageReadyEvent(badgeName, texture.clone())); + if (texture && this._sessionDataManager) this._sessionDataManager.events.dispatchEvent(new BadgeImageReadyEvent(badgeName, texture.clone())); } }); } - else if(type === BadgeImageManager.GROUP_BADGE) + else if (type === BadgeImageManager.GROUP_BADGE) { - if(this._groupBadgesQueue.get(badgeName)) return; + if (this._groupBadgesQueue.get(badgeName)) return; this._groupBadgesQueue.set(badgeName, true); - if(this._readyToGenerateGroupBadges) this.loadGroupBadge(badgeName); + if (this._readyToGenerateGroupBadges) this.loadGroupBadge(badgeName); } return null; @@ -137,7 +137,7 @@ export class BadgeImageManager implements IDisposable const url = (Nitro.instance.getConfiguration('images.url') + '/loading_icon.png'); const existing = this._assets.getTexture(url); - if(!existing) return null; + if (!existing) return null; return existing.clone(); } @@ -146,7 +146,7 @@ export class BadgeImageManager implements IDisposable { let url = null; - switch(type) + switch (type) { case BadgeImageManager.NORMAL_BADGE: url = (Nitro.instance.getConfiguration('badge.asset.url')).replace('%badgename%', badge); @@ -164,7 +164,7 @@ export class BadgeImageManager implements IDisposable const groupBadge = new GroupBadge(badgeCode); const partMatches = [...badgeCode.matchAll(/[b|s][0-9]{4,6}/g)]; - for(const partMatch of partMatches) + for (const partMatch of partMatches) { const partCode = partMatch[0]; const shortMethod = (partCode.length === 6); @@ -190,28 +190,28 @@ export class BadgeImageManager implements IDisposable container.addChild(tempSprite); - for(const part of groupBadge.parts) + for (const part of groupBadge.parts) { let isFirst = true; const partNames = ((part.type === 'b') ? this._groupBases.get(part.key) : this._groupSymbols.get(part.key)); - if(partNames) + if (partNames) { - for(const partName of partNames) + for (const partName of partNames) { - if(!partName || !partName.length) continue; + if (!partName || !partName.length) continue; const texture = this._assets.getTexture(`badgepart_${partName}`); - if(!texture) continue; + if (!texture) continue; const { x, y } = part.calculatePosition(texture); const sprite = new NitroSprite(texture); sprite.position.set(x, y); - if(isFirst) sprite.tint = parseInt(this._groupPartColors.get(part.color), 16); + if (isFirst) sprite.tint = parseInt(this._groupPartColors.get(part.color), 16); isFirst = false; @@ -226,16 +226,16 @@ export class BadgeImageManager implements IDisposable const texture = TextureUtils.generateTexture(container); this._assets.setTexture(groupBadge.code, texture); - if(this._sessionDataManager) this._sessionDataManager.events.dispatchEvent(new BadgeImageReadyEvent(groupBadge.code, texture)); + if (this._sessionDataManager) this._sessionDataManager.events.dispatchEvent(new BadgeImageReadyEvent(groupBadge.code, texture)); } private onGroupBadgePartsEvent(event: GroupBadgePartsEvent): void { - if(!event) return; + if (!event) return; const data = event.getParser(); - if(!data) return; + if (!data) return; data.bases.forEach((names, id) => this._groupBases.set(id, names.map(val => val.replace('.png', '').replace('.gif', '')))); @@ -244,7 +244,7 @@ export class BadgeImageManager implements IDisposable this._groupPartColors = data.partColors; this._readyToGenerateGroupBadges = true; - for(const badgeCode of this._groupBadgesQueue.keys()) this.loadGroupBadge(badgeCode); + for (const badgeCode of this._groupBadgesQueue.keys()) this.loadGroupBadge(badgeCode); } public get disposed(): boolean diff --git a/src/nitro/session/furniture/FurnitureDataLoader.ts b/src/nitro/session/furniture/FurnitureDataLoader.ts index 5837c435..b190585a 100644 --- a/src/nitro/session/furniture/FurnitureDataLoader.ts +++ b/src/nitro/session/furniture/FurnitureDataLoader.ts @@ -1,5 +1,6 @@ import { FurnitureType, IFurnitureData, INitroLocalizationManager } from '../../../api'; -import { EventDispatcher, NitroEvent, NitroLogger } from '../../../core'; +import { EventDispatcher, NitroLogger } from '../../../core'; +import { NitroEvent } from '../../../events'; import { FurnitureData } from './FurnitureData'; export class FurnitureDataLoader extends EventDispatcher @@ -24,7 +25,7 @@ export class FurnitureDataLoader extends EventDispatcher public loadFurnitureData(url: string): void { - if(!url) return; + if (!url) return; fetch(url) .then(response => response.json()) @@ -34,20 +35,20 @@ export class FurnitureDataLoader extends EventDispatcher private onFurnitureDataLoaded(data: { [index: string]: any }): void { - if(!data) return; + if (!data) return; - if((typeof data.roomitemtypes == 'undefined') || (typeof data.wallitemtypes == 'undefined')) this._nitroLogger.warn('Could not find `roomitemtypes` or `wallitemtypes` in furnidata.'); + if ((typeof data.roomitemtypes == 'undefined') || (typeof data.wallitemtypes == 'undefined')) this._nitroLogger.warn('Could not find `roomitemtypes` or `wallitemtypes` in furnidata.'); - if(data.roomitemtypes) this.parseFloorItems(data.roomitemtypes); + if (data.roomitemtypes) this.parseFloorItems(data.roomitemtypes); - if(data.wallitemtypes) this.parseWallItems(data.wallitemtypes); + if (data.wallitemtypes) this.parseWallItems(data.wallitemtypes); this.dispatchEvent(new NitroEvent(FurnitureDataLoader.FURNITURE_DATA_READY)); } private onFurnitureDataError(error: Error): void { - if(!error) return; + if (!error) return; console.error(error); @@ -56,21 +57,21 @@ export class FurnitureDataLoader extends EventDispatcher private parseFloorItems(data: any): void { - if(!data || !data.furnitype) return; + if (!data || !data.furnitype) return; - for(const furniture of data.furnitype) + for (const furniture of data.furnitype) { - if(!furniture) continue; + if (!furniture) continue; const colors: number[] = []; - if(furniture.partcolors) + if (furniture.partcolors) { - for(const color of furniture.partcolors.color) + for (const color of furniture.partcolors.color) { let colorCode = (color as string); - if(colorCode.charAt(0) === '#') + if (colorCode.charAt(0) === '#') { colorCode = colorCode.replace('#', ''); @@ -98,11 +99,11 @@ export class FurnitureDataLoader extends EventDispatcher private parseWallItems(data: any): void { - if(!data || !data.furnitype) return; + if (!data || !data.furnitype) return; - for(const furniture of data.furnitype) + for (const furniture of data.furnitype) { - if(!furniture) continue; + if (!furniture) continue; const furnitureData = new FurnitureData(FurnitureType.WALL, furniture.id, furniture.classname, furniture.classname, furniture.category, furniture.name, furniture.description, furniture.revision, 0, 0, 0, null, false, 0, furniture.adurl, furniture.offerid, furniture.buyout, furniture.rentofferid, furniture.rentbuyout, furniture.bc, null, furniture.specialtype, false, false, false, furniture.excludeddynamic, furniture.furniline, furniture.environment, furniture.rare); @@ -114,9 +115,9 @@ export class FurnitureDataLoader extends EventDispatcher private updateLocalizations(furniture: FurnitureData): void { - if(!this._localization) return; + if (!this._localization) return; - switch(furniture.type) + switch (furniture.type) { case FurnitureType.FLOOR: this._localization.setValue(('roomItem.name.' + furniture.id), furniture.name); diff --git a/src/nitro/session/handler/GenericErrorHandler.ts b/src/nitro/session/handler/GenericErrorHandler.ts index 1f3310ae..c9016478 100644 --- a/src/nitro/session/handler/GenericErrorHandler.ts +++ b/src/nitro/session/handler/GenericErrorHandler.ts @@ -1,6 +1,6 @@ import { GenericErrorEnum, IConnection, IRoomHandlerListener } from '../../../api'; +import { RoomSessionErrorMessageEvent } from '../../../events'; import { GenericErrorEvent } from '../../communication'; -import { RoomSessionErrorMessageEvent } from '../events'; import { BaseHandler } from './BaseHandler'; export class GenericErrorHandler extends BaseHandler @@ -14,19 +14,19 @@ export class GenericErrorHandler extends BaseHandler private onRoomGenericError(event: GenericErrorEvent): void { - if(!(event instanceof GenericErrorEvent)) return; + if (!(event instanceof GenericErrorEvent)) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const roomSession = this.listener.getSession(this.roomId); - if(!roomSession) return; + if (!roomSession) return; let type: string = null; - switch(parser.errorCode) + switch (parser.errorCode) { case GenericErrorEnum.KICKED_OUT_OF_ROOM: type = RoomSessionErrorMessageEvent.RSEME_KICKED; @@ -35,7 +35,7 @@ export class GenericErrorHandler extends BaseHandler return; } - if(!type || type.length == 0) return; + if (!type || type.length == 0) return; this.listener.events.dispatchEvent(new RoomSessionErrorMessageEvent(type, roomSession)); } diff --git a/src/nitro/session/handler/PollHandler.ts b/src/nitro/session/handler/PollHandler.ts index 0501b418..bb6388af 100644 --- a/src/nitro/session/handler/PollHandler.ts +++ b/src/nitro/session/handler/PollHandler.ts @@ -1,6 +1,6 @@ import { IConnection, IRoomHandlerListener } from '../../../api'; +import { RoomSessionPollEvent } from '../../../events'; import { PollContentsEvent, PollErrorEvent, PollOfferEvent } from '../../communication'; -import { RoomSessionPollEvent } from '../events'; import { BaseHandler } from './BaseHandler'; export class PollHandler extends BaseHandler @@ -16,15 +16,15 @@ export class PollHandler extends BaseHandler private onPollContentsEvent(event: PollContentsEvent): void { - if(!this.listener) return; + if (!this.listener) return; const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const pollEvent = new RoomSessionPollEvent(RoomSessionPollEvent.CONTENT, session, parser.id); @@ -39,15 +39,15 @@ export class PollHandler extends BaseHandler private onPollOfferEvent(event: PollOfferEvent): void { - if(!this.listener) return; + if (!this.listener) return; const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const pollEvent = new RoomSessionPollEvent(RoomSessionPollEvent.OFFER, session, parser.id); @@ -59,15 +59,15 @@ export class PollHandler extends BaseHandler private onPollErrorEvent(event: PollErrorEvent): void { - if(!this.listener) return; + if (!this.listener) return; const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const pollEvent = new RoomSessionPollEvent(RoomSessionPollEvent.ERROR, session, -1); pollEvent.headline = '???'; diff --git a/src/nitro/session/handler/RoomChatHandler.ts b/src/nitro/session/handler/RoomChatHandler.ts index 091543a5..fc63ce51 100644 --- a/src/nitro/session/handler/RoomChatHandler.ts +++ b/src/nitro/session/handler/RoomChatHandler.ts @@ -1,7 +1,7 @@ import { IConnection, IRoomHandlerListener } from '../../../api'; +import { RoomSessionChatEvent } from '../../../events'; import { FloodControlEvent, PetRespectNoficationEvent, PetSupplementedNotificationEvent, PetSupplementTypeEnum, RemainingMuteEvent, RespectReceivedEvent, RoomUnitChatEvent, RoomUnitChatShoutEvent, RoomUnitChatWhisperEvent, RoomUnitHandItemReceivedEvent } from '../../communication'; import { SystemChatStyleEnum } from '../../ui/widget/enums/SystemChatStyleEnum'; -import { RoomSessionChatEvent } from '../events'; import { BaseHandler } from './BaseHandler'; export class RoomChatHandler extends BaseHandler @@ -23,20 +23,20 @@ export class RoomChatHandler extends BaseHandler private onRoomUnitChatEvent(event: RoomUnitChatEvent): void { - if(!this.listener) return; + if (!this.listener) return; const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; let chatType: number = RoomSessionChatEvent.CHAT_TYPE_SPEAK; - if(event instanceof RoomUnitChatShoutEvent) chatType = RoomSessionChatEvent.CHAT_TYPE_SHOUT; - else if(event instanceof RoomUnitChatWhisperEvent) chatType = RoomSessionChatEvent.CHAT_TYPE_WHISPER; + if (event instanceof RoomUnitChatShoutEvent) chatType = RoomSessionChatEvent.CHAT_TYPE_SHOUT; + else if (event instanceof RoomUnitChatWhisperEvent) chatType = RoomSessionChatEvent.CHAT_TYPE_WHISPER; const chatEvent = new RoomSessionChatEvent(RoomSessionChatEvent.CHAT_EVENT, session, parser.roomIndex, parser.message, chatType, parser.bubble); @@ -45,86 +45,86 @@ export class RoomChatHandler extends BaseHandler private onRoomUnitHandItemReceivedEvent(event: RoomUnitHandItemReceivedEvent): void { - if(!this.listener) return; + if (!this.listener) return; const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; this.listener.events.dispatchEvent(new RoomSessionChatEvent(RoomSessionChatEvent.CHAT_EVENT, session, parser.giverUserId, '', RoomSessionChatEvent.CHAT_TYPE_HAND_ITEM_RECEIVED, SystemChatStyleEnum.GENERIC, null, parser.handItemType)); } private onRespectReceivedEvent(event: RespectReceivedEvent): void { - if(!this.listener) return; + if (!this.listener) return; const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const userData = session.userDataManager.getUserData(parser.userId); - if(!userData) return; + if (!userData) return; this.listener.events.dispatchEvent(new RoomSessionChatEvent(RoomSessionChatEvent.CHAT_EVENT, session, userData.roomIndex, '', RoomSessionChatEvent.CHAT_TYPE_RESPECT, SystemChatStyleEnum.GENERIC)); } private onPetRespectNoficationEvent(event: PetRespectNoficationEvent): void { - if(!this.listener) return; + if (!this.listener) return; const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const petData = session.userDataManager.getPetData(parser.petData.id); - if(!petData) return; + if (!petData) return; let chatType = RoomSessionChatEvent.CHAT_TYPE_PETRESPECT; - if(parser.isTreat) chatType = RoomSessionChatEvent.CHAT_TYPE_PETTREAT; + if (parser.isTreat) chatType = RoomSessionChatEvent.CHAT_TYPE_PETTREAT; this.listener.events.dispatchEvent(new RoomSessionChatEvent(RoomSessionChatEvent.CHAT_EVENT, session, petData.roomIndex, '', chatType, SystemChatStyleEnum.GENERIC)); } private onPetSupplementedNotificationEvent(event: PetSupplementedNotificationEvent): void { - if(!this.listener) return; + if (!this.listener) return; const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const petData = session.userDataManager.getPetData(parser.petId); - if(!petData) return; + if (!petData) return; let userRoomIndex = -1; const userData = session.userDataManager.getUserData(parser.userId); - if(userData) userRoomIndex = userData.roomIndex; + if (userData) userRoomIndex = userData.roomIndex; let chatType = RoomSessionChatEvent.CHAT_TYPE_PETREVIVE; - switch(parser.supplementType) + switch (parser.supplementType) { case PetSupplementTypeEnum.REVIVE: chatType = RoomSessionChatEvent.CHAT_TYPE_PETREVIVE; @@ -142,15 +142,15 @@ export class RoomChatHandler extends BaseHandler private onFloodControlEvent(event: FloodControlEvent): void { - if(!this.listener) return; + if (!this.listener) return; const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const seconds = parser.seconds; @@ -159,15 +159,15 @@ export class RoomChatHandler extends BaseHandler private onRemainingMuteEvent(event: RemainingMuteEvent): void { - if(!this.listener) return; + if (!this.listener) return; const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; this.listener.events.dispatchEvent(new RoomSessionChatEvent(RoomSessionChatEvent.CHAT_EVENT, session, session.ownRoomIndex, '', RoomSessionChatEvent.CHAT_TYPE_MUTE_REMAINING, SystemChatStyleEnum.GENERIC, null, parser.seconds)); } diff --git a/src/nitro/session/handler/RoomDataHandler.ts b/src/nitro/session/handler/RoomDataHandler.ts index 9543ef6e..5a48bd3c 100644 --- a/src/nitro/session/handler/RoomDataHandler.ts +++ b/src/nitro/session/handler/RoomDataHandler.ts @@ -1,6 +1,6 @@ import { IConnection, IRoomHandlerListener } from '../../../api'; +import { RoomSessionEvent, RoomSessionPropertyUpdateEvent } from '../../../events'; import { GetGuestRoomResultEvent } from '../../communication'; -import { RoomSessionEvent, RoomSessionPropertyUpdateEvent } from '../events'; import { BaseHandler } from './BaseHandler'; export class RoomDataHandler extends BaseHandler @@ -14,17 +14,17 @@ export class RoomDataHandler extends BaseHandler private onGetGuestRoomResultEvent(event: GetGuestRoomResultEvent): void { - if(!(event instanceof GetGuestRoomResultEvent)) return; + if (!(event instanceof GetGuestRoomResultEvent)) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; - if(parser.roomForward) return; + if (parser.roomForward) return; const roomSession = this.listener.getSession(this.roomId); - if(!roomSession) return; + if (!roomSession) return; const roomData = parser.data; diff --git a/src/nitro/session/handler/RoomDimmerPresetsHandler.ts b/src/nitro/session/handler/RoomDimmerPresetsHandler.ts index 58bde132..35f4460c 100644 --- a/src/nitro/session/handler/RoomDimmerPresetsHandler.ts +++ b/src/nitro/session/handler/RoomDimmerPresetsHandler.ts @@ -1,6 +1,6 @@ import { IConnection, IRoomHandlerListener } from '../../../api'; +import { RoomSessionDimmerPresetsEvent } from '../../../events'; import { RoomDimmerPresetsEvent } from '../../communication'; -import { RoomSessionDimmerPresetsEvent } from '../events'; import { BaseHandler } from './BaseHandler'; export class RoomDimmerPresetsHandler extends BaseHandler @@ -14,15 +14,15 @@ export class RoomDimmerPresetsHandler extends BaseHandler private onRoomDimmerPresets(event: RoomDimmerPresetsEvent): void { - if(!event) return; + if (!event) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; const presetEvent = new RoomSessionDimmerPresetsEvent(RoomSessionDimmerPresetsEvent.ROOM_DIMMER_PRESETS, session); @@ -30,11 +30,11 @@ export class RoomDimmerPresetsHandler extends BaseHandler let i = 0; - while(i < parser.presetCount) + while (i < parser.presetCount) { const preset = parser.getPreset(i); - if(preset) presetEvent.storePreset(preset.id, preset.type, preset.color, preset.brightness); + if (preset) presetEvent.storePreset(preset.id, preset.type, preset.color, preset.brightness); i++; } diff --git a/src/nitro/session/handler/RoomPresentHandler.ts b/src/nitro/session/handler/RoomPresentHandler.ts index e7ae7f5a..f4c4a7b7 100644 --- a/src/nitro/session/handler/RoomPresentHandler.ts +++ b/src/nitro/session/handler/RoomPresentHandler.ts @@ -1,6 +1,6 @@ import { IConnection, IRoomHandlerListener } from '../../../api'; +import { RoomSessionPresentEvent } from '../../../events'; import { PresentOpenedMessageEvent } from '../../communication'; -import { RoomSessionPresentEvent } from '../events'; import { BaseHandler } from './BaseHandler'; export class RoomPresentHandler extends BaseHandler @@ -9,24 +9,24 @@ export class RoomPresentHandler extends BaseHandler { super(connection, listener); - if(!connection) return; + if (!connection) return; connection.addMessageEvent(new PresentOpenedMessageEvent(this.onFurnitureGiftOpenedEvent.bind(this))); } private onFurnitureGiftOpenedEvent(event: PresentOpenedMessageEvent): void { - if(!event) return; + if (!event) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; - if(this.listener && this.listener.events) this.listener.events.dispatchEvent( + if (this.listener && this.listener.events) this.listener.events.dispatchEvent( new RoomSessionPresentEvent(RoomSessionPresentEvent.RSPE_PRESENT_OPENED, session, parser.classId, parser.itemType, parser.productCode, parser.placedItemId, parser.placedItemType, parser.placedInRoom, parser.petFigureString)); diff --git a/src/nitro/session/handler/RoomSessionHandler.ts b/src/nitro/session/handler/RoomSessionHandler.ts index c7fd76a4..e578e378 100644 --- a/src/nitro/session/handler/RoomSessionHandler.ts +++ b/src/nitro/session/handler/RoomSessionHandler.ts @@ -1,7 +1,6 @@ import { IConnection, IRoomHandlerListener } from '../../../api'; +import { RoomSessionDoorbellEvent, RoomSessionSpectatorModeEvent } from '../../../events'; import { DesktopViewEvent, FlatAccessDeniedMessageEvent, GoToFlatMessageComposer, RoomDoorbellAcceptedEvent, RoomEnterEvent, RoomReadyMessageEvent, YouAreSpectatorMessageEvent } from '../../communication'; -import { RoomSessionDoorbellEvent } from '../events'; -import { RoomSessionSpectatorModeEvent } from './../events'; import { BaseHandler } from './BaseHandler'; export class RoomSessionHandler extends BaseHandler @@ -24,19 +23,19 @@ export class RoomSessionHandler extends BaseHandler private onRoomEnterEvent(event: RoomEnterEvent): void { - if(!(event instanceof RoomEnterEvent)) return; + if (!(event instanceof RoomEnterEvent)) return; - if(this.listener) this.listener.sessionUpdate(this.roomId, RoomSessionHandler.RS_CONNECTED); + if (this.listener) this.listener.sessionUpdate(this.roomId, RoomSessionHandler.RS_CONNECTED); } private onRoomReadyMessageEvent(event: RoomReadyMessageEvent): void { - if(!(event instanceof RoomReadyMessageEvent)) return; + if (!(event instanceof RoomReadyMessageEvent)) return; const fromRoomId = this.roomId; const toRoomId = event.getParser().roomId; - if(this.listener) + if (this.listener) { this.listener.sessionReinitialize(fromRoomId, toRoomId); this.listener.sessionUpdate(this.roomId, RoomSessionHandler.RS_READY); @@ -45,32 +44,32 @@ export class RoomSessionHandler extends BaseHandler private onDesktopViewEvent(event: DesktopViewEvent): void { - if(!(event instanceof DesktopViewEvent)) return; + if (!(event instanceof DesktopViewEvent)) return; - if(this.listener) this.listener.sessionUpdate(this.roomId, RoomSessionHandler.RS_DISCONNECTED); + if (this.listener) this.listener.sessionUpdate(this.roomId, RoomSessionHandler.RS_DISCONNECTED); } private onRoomDoorbellAcceptedEvent(event: RoomDoorbellAcceptedEvent): void { - if(!(event instanceof RoomDoorbellAcceptedEvent) || !this.listener) return; + if (!(event instanceof RoomDoorbellAcceptedEvent) || !this.listener) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const username = parser.userName; - if(!username || !username.length) + if (!username || !username.length) { this.connection.send(new GoToFlatMessageComposer(this.roomId)); } else { - if(this.listener.events) + if (this.listener.events) { const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; this.listener.events.dispatchEvent(new RoomSessionDoorbellEvent(RoomSessionDoorbellEvent.RSDE_ACCEPTED, session, username)); } @@ -79,25 +78,25 @@ export class RoomSessionHandler extends BaseHandler private onRoomDoorbellRejectedEvent(event: FlatAccessDeniedMessageEvent): void { - if(!(event instanceof FlatAccessDeniedMessageEvent) || !this.listener) return; + if (!(event instanceof FlatAccessDeniedMessageEvent) || !this.listener) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const username = parser.userName; - if(!username || !username.length) + if (!username || !username.length) { this.listener.sessionUpdate(this.roomId, RoomSessionHandler.RS_DISCONNECTED); } else { - if(this.listener.events) + if (this.listener.events) { const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; this.listener.events.dispatchEvent(new RoomSessionDoorbellEvent(RoomSessionDoorbellEvent.RSDE_REJECTED, session, username)); } @@ -106,11 +105,11 @@ export class RoomSessionHandler extends BaseHandler private onYouAreSpectatorMessageEvent(event: YouAreSpectatorMessageEvent): void { - if(this.listener) + if (this.listener) { const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; session.isSpectator = true; this.listener.events.dispatchEvent(new RoomSessionSpectatorModeEvent(RoomSessionSpectatorModeEvent.SPECTATOR_MODE, session)); diff --git a/src/nitro/session/handler/RoomUsersHandler.ts b/src/nitro/session/handler/RoomUsersHandler.ts index c5a9ff62..32e9bd9f 100644 --- a/src/nitro/session/handler/RoomUsersHandler.ts +++ b/src/nitro/session/handler/RoomUsersHandler.ts @@ -1,6 +1,6 @@ import { IConnection, IRoomHandlerListener, IRoomUserData } from '../../../api'; +import { RoomSessionDanceEvent, RoomSessionDoorbellEvent, RoomSessionErrorMessageEvent, RoomSessionFavoriteGroupUpdateEvent, RoomSessionFriendRequestEvent, RoomSessionPetFigureUpdateEvent, RoomSessionPetInfoUpdateEvent, RoomSessionPetStatusUpdateEvent, RoomSessionUserBadgesEvent, RoomSessionUserDataUpdateEvent, RoomSessionUserFigureUpdateEvent } from '../../../events'; import { BotErrorEvent, DoorbellMessageEvent, FavoriteMembershipUpdateMessageEvent, NewFriendRequestEvent, PetFigureUpdateEvent, PetInfoEvent, PetPlacingErrorEvent, PetStatusUpdateEvent, RoomUnitDanceEvent, RoomUnitEvent, RoomUnitInfoEvent, RoomUnitRemoveEvent, UserCurrentBadgesEvent, UserNameChangeMessageEvent } from '../../communication'; -import { RoomSessionDanceEvent, RoomSessionDoorbellEvent, RoomSessionErrorMessageEvent, RoomSessionFavoriteGroupUpdateEvent, RoomSessionFriendRequestEvent, RoomSessionPetFigureUpdateEvent, RoomSessionPetInfoUpdateEvent, RoomSessionPetStatusUpdateEvent, RoomSessionUserBadgesEvent, RoomSessionUserDataUpdateEvent, RoomSessionUserFigureUpdateEvent } from '../events'; import { RoomPetData } from '../RoomPetData'; import { RoomUserData } from '../RoomUserData'; import { BaseHandler } from './BaseHandler'; @@ -29,21 +29,21 @@ export class RoomUsersHandler extends BaseHandler private onRoomUnitEvent(event: RoomUnitEvent): void { - if(!this.listener) return; + if (!this.listener) return; const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; const users = event.getParser().users; const usersToAdd: IRoomUserData[] = []; - if(users && users.length) + if (users && users.length) { - for(const user of users) + for (const user of users) { - if(!user) continue; + if (!user) continue; const userData = new RoomUserData(user.roomIndex); @@ -70,7 +70,7 @@ export class RoomUsersHandler extends BaseHandler userData.botSkills = user.botSkills; userData.isModerator = user.isModerator; - if(!session.userDataManager.getUserData(user.roomIndex)) usersToAdd.push(userData); + if (!session.userDataManager.getUserData(user.roomIndex)) usersToAdd.push(userData); session.userDataManager.updateUserData(userData); } @@ -81,15 +81,15 @@ export class RoomUsersHandler extends BaseHandler private onRoomUnitInfoEvent(event: RoomUnitInfoEvent): void { - if(!this.listener) return; + if (!this.listener) return; const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; session.userDataManager.updateFigure(parser.unitId, parser.figure, parser.gender, false, false); session.userDataManager.updateMotto(parser.unitId, parser.motto); @@ -101,41 +101,41 @@ export class RoomUsersHandler extends BaseHandler private onRoomUnitRemoveEvent(event: RoomUnitRemoveEvent): void { - if(!this.listener) return; + if (!this.listener) return; const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; session.userDataManager.removeUserData(event.getParser().unitId); } private onRoomUnitDanceEvent(event: RoomUnitDanceEvent): void { - if(!this.listener) return; + if (!this.listener) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; this.listener.events.dispatchEvent(new RoomSessionDanceEvent(session, parser.unitId, parser.danceId)); } private onUserCurrentBadgesEvent(event: UserCurrentBadgesEvent): void { - if(!this.listener) return; + if (!this.listener) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; session.userDataManager.setUserBadges(parser.userId, parser.badges); @@ -144,49 +144,49 @@ export class RoomUsersHandler extends BaseHandler private onRoomDoorbellEvent(event: DoorbellMessageEvent): void { - if(!this.listener) return; + if (!this.listener) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const username = parser.userName; - if(!username || !username.length) return; + if (!username || !username.length) return; const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; this.listener.events.dispatchEvent(new RoomSessionDoorbellEvent(RoomSessionDoorbellEvent.DOORBELL, session, username)); } private onUserNameChangeMessageEvent(event: UserNameChangeMessageEvent): void { - if(!this.listener) return; + if (!this.listener) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; session.userDataManager.updateName(parser.id, parser.newName); } private onNewFriendRequestEvent(event: NewFriendRequestEvent): void { - if(!this.listener) return; + if (!this.listener) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; const request = parser.request; @@ -195,15 +195,15 @@ export class RoomUsersHandler extends BaseHandler private onPetInfoEvent(event: PetInfoEvent): void { - if(!this.listener) return; + if (!this.listener) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; const petData = new RoomPetData(); @@ -239,15 +239,15 @@ export class RoomUsersHandler extends BaseHandler private onPetStatusUpdateEvent(event: PetStatusUpdateEvent): void { - if(!this.listener) return; + if (!this.listener) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; session.userDataManager.updatePetBreedingStatus(parser.roomIndex, parser.canBreed, parser.canHarvest, parser.canRevive, parser.hasBreedingPermission); @@ -256,15 +256,15 @@ export class RoomUsersHandler extends BaseHandler private onPetFigureUpdateEvent(event: PetFigureUpdateEvent): void { - if(!this.listener) return; + if (!this.listener) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; const figure = parser.figureData.figuredata; @@ -275,21 +275,21 @@ export class RoomUsersHandler extends BaseHandler private onPetPlacingError(event: PetPlacingErrorEvent): void { - if(!event) return; + if (!event) return; - if(!this.listener) return; + if (!this.listener) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; let type: string = null; - switch(parser.errorCode) + switch (parser.errorCode) { case 0: type = RoomSessionErrorMessageEvent.RSEME_PETS_FORBIDDEN_IN_HOTEL; @@ -311,28 +311,28 @@ export class RoomUsersHandler extends BaseHandler break; } - if(!type || type.length == 0) return; + if (!type || type.length == 0) return; this.listener.events.dispatchEvent(new RoomSessionErrorMessageEvent(type, session)); } private onBotError(event: BotErrorEvent): void { - if(!event) return; + if (!event) return; - if(!this.listener) return; + if (!this.listener) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; let type: string = null; - switch(parser.errorCode) + switch (parser.errorCode) { case 0: type = RoomSessionErrorMessageEvent.RSEME_BOTS_FORBIDDEN_IN_HOTEL; @@ -351,23 +351,23 @@ export class RoomUsersHandler extends BaseHandler break; } - if(!type || type.length == 0) return; + if (!type || type.length == 0) return; this.listener.events.dispatchEvent(new RoomSessionErrorMessageEvent(type, session)); } private onFavoriteMembershipUpdateMessageEvent(event: FavoriteMembershipUpdateMessageEvent): void { - if(!this.listener) return; + if (!this.listener) return; const parser = event.getParser(); const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; const userData = session.userDataManager.getUserDataByIndex(parser.roomIndex); - if(!userData) return; + if (!userData) return; userData.groupId = parser.groupId; userData.groupName = parser.groupName; diff --git a/src/nitro/session/handler/WordQuizHandler.ts b/src/nitro/session/handler/WordQuizHandler.ts index 9bcacd3e..6330397a 100644 --- a/src/nitro/session/handler/WordQuizHandler.ts +++ b/src/nitro/session/handler/WordQuizHandler.ts @@ -1,6 +1,6 @@ import { IConnection, IRoomHandlerListener } from '../../../api'; +import { RoomSessionWordQuizEvent } from '../../../events'; import { QuestionAnsweredEvent, QuestionEvent, QuestionFinishedEvent } from '../../communication'; -import { RoomSessionWordQuizEvent } from '../events'; import { BaseHandler } from './BaseHandler'; export class WordQuizHandler extends BaseHandler @@ -16,15 +16,15 @@ export class WordQuizHandler extends BaseHandler private onQuestionEvent(event: QuestionEvent): void { - if(!this.listener) return; + if (!this.listener) return; const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const quizEvent = new RoomSessionWordQuizEvent(RoomSessionWordQuizEvent.QUESTION, session, parser.pollId); @@ -39,15 +39,15 @@ export class WordQuizHandler extends BaseHandler private onQuestionAnsweredEvent(event: QuestionAnsweredEvent): void { - if(!this.listener) return; + if (!this.listener) return; const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const quizEvent = new RoomSessionWordQuizEvent(RoomSessionWordQuizEvent.ANSWERED, session, parser.userId); @@ -60,15 +60,15 @@ export class WordQuizHandler extends BaseHandler private onQuestionFinishedEvent(event: QuestionFinishedEvent): void { - if(!this.listener) return; + if (!this.listener) return; const session = this.listener.getSession(this.roomId); - if(!session) return; + if (!session) return; const parser = event.getParser(); - if(!parser) return; + if (!parser) return; const quizEvent = new RoomSessionWordQuizEvent(RoomSessionWordQuizEvent.FINISHED, session); quizEvent.questionId = parser.questionId; diff --git a/src/nitro/session/index.ts b/src/nitro/session/index.ts index 6e4e20da..69272cc9 100644 --- a/src/nitro/session/index.ts +++ b/src/nitro/session/index.ts @@ -1,6 +1,6 @@ export * from './badge'; -export * from './events'; export * from './furniture'; +export * from './GroupInformationManager'; export * from './HabboClubLevelEnum'; export * from './handler'; export * from './IgnoredUsersManager'; diff --git a/src/nitro/session/product/ProductDataLoader.ts b/src/nitro/session/product/ProductDataLoader.ts index d0cd07f8..01360245 100644 --- a/src/nitro/session/product/ProductDataLoader.ts +++ b/src/nitro/session/product/ProductDataLoader.ts @@ -1,5 +1,6 @@ import { IProductData } from '../../../api'; -import { EventDispatcher, NitroEvent } from '../../../core'; +import { EventDispatcher } from '../../../core'; +import { NitroEvent } from '../../../events'; import { ProductData } from './ProductData'; export class ProductDataLoader extends EventDispatcher @@ -23,7 +24,7 @@ export class ProductDataLoader extends EventDispatcher public loadProductData(url: string): void { - if(!url) return; + if (!url) return; fetch(url) .then(response => response.json()) @@ -33,7 +34,7 @@ export class ProductDataLoader extends EventDispatcher private onProductDataLoadedEvent(data: { [index: string]: any }): void { - if(!data) return; + if (!data) return; this.parseProducts(data.productdata); @@ -42,15 +43,15 @@ export class ProductDataLoader extends EventDispatcher private onProductDataError(error: Error): void { - if(!error) return; + if (!error) return; this.dispatchEvent(new NitroEvent(ProductDataLoader.PDP_PRODUCT_DATA_FAILED)); } private parseProducts(data: { [index: string]: any }): void { - if(!data) return; + if (!data) return; - for(const product of data.product) (product && this._products.set(product.code, new ProductData(product.code, product.name, product.description))); + for (const product of data.product) (product && this._products.set(product.code, new ProductData(product.code, product.name, product.description))); } } diff --git a/src/nitro/sound/SoundManager.ts b/src/nitro/sound/SoundManager.ts index 3296b61b..aba59c77 100644 --- a/src/nitro/sound/SoundManager.ts +++ b/src/nitro/sound/SoundManager.ts @@ -1,8 +1,7 @@ -import { IAdvancedMap, IMusicManager, ISoundManager } from '../../api'; -import { AdvancedMap, NitroEvent, NitroManager } from '../../core'; -import { NitroSettingsEvent, NitroSoundEvent } from '../events'; +import { IAdvancedMap, IMusicManager, INitroEvent, ISoundManager } from '../../api'; +import { AdvancedMap, NitroManager } from '../../core'; +import { NitroSettingsEvent, NitroSoundEvent, RoomEngineEvent, RoomEngineObjectEvent, RoomEngineSamplePlaybackEvent } from '../../events'; import { Nitro } from '../Nitro'; -import { RoomEngineEvent, RoomEngineObjectEvent, RoomEngineSamplePlaybackEvent } from '../room'; import { MusicManager } from './music'; export class SoundManager extends NitroManager implements ISoundManager @@ -60,7 +59,7 @@ export class SoundManager extends NitroManager implements ISoundManager Nitro.instance.events.removeEventListener(NitroSoundEvent.PLAY_SOUND, this.onEvent); } - private onEvent(event: NitroEvent) + private onEvent(event: INitroEvent) { switch (event.type) { diff --git a/src/nitro/sound/events/SoundManagerEvent.ts b/src/nitro/sound/events/SoundManagerEvent.ts index 411e715c..117bdf3d 100644 --- a/src/nitro/sound/events/SoundManagerEvent.ts +++ b/src/nitro/sound/events/SoundManagerEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../../core'; +import { NitroEvent } from '../../../events'; export class SoundManagerEvent extends NitroEvent { diff --git a/src/nitro/sound/music/MusicManager.ts b/src/nitro/sound/music/MusicManager.ts index 0c15d2c3..ec1ee249 100644 --- a/src/nitro/sound/music/MusicManager.ts +++ b/src/nitro/sound/music/MusicManager.ts @@ -1,8 +1,8 @@ -import { IMusicManager } from '../../../api'; -import { NitroEvent, NitroManager } from '../../../core'; +import { IMusicManager, INitroEvent } from '../../../api'; +import { NitroManager } from '../../../core'; +import { RoomObjectSoundMachineEvent } from '../../../events'; import { GetSongInfoMessageComposer, JukeboxPlayListFullMessageEvent, JukeboxSongDisksMessageEvent, NowPlayingMessageEvent, SongInfoEntry, TraxSongInfoMessageEvent, UserSongDisksInventoryMessageEvent } from '../../communication'; import { Nitro } from '../../Nitro'; -import { RoomObjectSoundMachineEvent } from '../../room/events'; import { SongStartRequestData } from '../common'; import { SoundManagerEvent } from '../events'; import { MusicPriorities } from './MusicPriorities'; @@ -75,7 +75,7 @@ export class MusicManager extends NitroManager implements IMusicManager this.events.removeEventListener(SoundManagerEvent.TRAX_SONG_COMPLETE, this.onEvent); } - private onEvent(event: NitroEvent): void + private onEvent(event: INitroEvent): void { } diff --git a/src/room/events/RoomContentLoadedEvent.ts b/src/room/events/RoomContentLoadedEvent.ts index 9fc24c47..c52851f1 100644 --- a/src/room/events/RoomContentLoadedEvent.ts +++ b/src/room/events/RoomContentLoadedEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../core'; +import { NitroEvent } from '../../events'; export class RoomContentLoadedEvent extends NitroEvent { diff --git a/src/room/events/RoomObjectEvent.ts b/src/room/events/RoomObjectEvent.ts index 8f6de867..231ef3fd 100644 --- a/src/room/events/RoomObjectEvent.ts +++ b/src/room/events/RoomObjectEvent.ts @@ -1,5 +1,5 @@ import { IRoomObject } from '../../api'; -import { NitroEvent } from '../../core'; +import { NitroEvent } from '../../events'; export class RoomObjectEvent extends NitroEvent { @@ -19,14 +19,14 @@ export class RoomObjectEvent extends NitroEvent public get objectId(): number { - if(!this._object) return -1; + if (!this._object) return -1; return this._object.id; } public get objectType(): string { - if(!this._object) return null; + if (!this._object) return null; return this._object.type; } diff --git a/src/room/events/RoomToObjectEvent.ts b/src/room/events/RoomToObjectEvent.ts index 930511d0..52c05131 100644 --- a/src/room/events/RoomToObjectEvent.ts +++ b/src/room/events/RoomToObjectEvent.ts @@ -1,4 +1,4 @@ -import { NitroEvent } from '../../core'; +import { NitroEvent } from '../../events'; export class RoomToObjectEvent extends NitroEvent {