From f6dd2efbd21251b353d8dab923bbfaba38bc9d17 Mon Sep 17 00:00:00 2001 From: Bill Date: Wed, 5 Jan 2022 22:07:01 -0500 Subject: [PATCH] Random changes --- public/renderer-config.json.example | 2 +- .../handlers/FurniturePresentWidgetHandler.ts | 2 +- src/api/nitro/session/GetFurnitureData.ts | 2 +- .../card/grid/item/NitroCardGridItemView.tsx | 2 +- src/views/Styles.scss | 2 - .../information/GroupInformationView.tsx | 2 +- src/views/hc-center/HcCenterView.tsx | 38 ++++++++++++++++++- src/views/main/MainView.tsx | 4 +- .../common/NotificationUtilities.ts | 2 +- .../common/ProductImageUtility.ts | 2 +- .../gift-opening/FurnitureGiftOpeningView.tsx | 2 +- .../views/furni/InfoStandWidgetFurniView.tsx | 2 +- .../shared/furni-image/FurniImageView.tsx | 2 +- 13 files changed, 48 insertions(+), 16 deletions(-) diff --git a/public/renderer-config.json.example b/public/renderer-config.json.example index 0372ba95..82263393 100644 --- a/public/renderer-config.json.example +++ b/public/renderer-config.json.example @@ -28,7 +28,7 @@ "system.animation.fps": 24, "system.limits.fps": false, "system.dispatcher.log": false, - "system.packet.log": true, + "system.packet.log": false, "system.pong.manually": true, "system.pong.interval.ms": 20000, "room.color.skip.transition": true, diff --git a/src/api/nitro/room/widgets/handlers/FurniturePresentWidgetHandler.ts b/src/api/nitro/room/widgets/handlers/FurniturePresentWidgetHandler.ts index 745ed868..2b1f3ed2 100644 --- a/src/api/nitro/room/widgets/handlers/FurniturePresentWidgetHandler.ts +++ b/src/api/nitro/room/widgets/handlers/FurniturePresentWidgetHandler.ts @@ -1,7 +1,7 @@ import { IFurnitureData, IGetImageListener, NitroEvent, NitroRenderTexture, PetFigureData, RoomObjectCategory, RoomObjectVariable, RoomSessionPresentEvent, RoomWidgetEnum, TextureUtils, Vector3d } from '@nitrots/nitro-renderer'; import { GetSessionDataManager, IsOwnerOfFurniture } from '../../..'; import { GetRoomEngine, LocalizeText } from '../../../..'; -import { ProductTypeEnum } from '../../../../../views/catalog/common/ProductTypeEnum'; +import { ProductTypeEnum } from '../../../../../components/catalog/common/ProductTypeEnum'; import { RoomWidgetUpdateEvent, RoomWidgetUpdatePresentDataEvent } from '../events'; import { RoomWidgetFurniToWidgetMessage, RoomWidgetPresentOpenMessage } from '../messages'; import { RoomWidgetMessage } from '../messages/RoomWidgetMessage'; diff --git a/src/api/nitro/session/GetFurnitureData.ts b/src/api/nitro/session/GetFurnitureData.ts index 485f4b73..6958e5c7 100644 --- a/src/api/nitro/session/GetFurnitureData.ts +++ b/src/api/nitro/session/GetFurnitureData.ts @@ -1,6 +1,6 @@ import { IFurnitureData } from '@nitrots/nitro-renderer'; import { GetSessionDataManager } from '.'; -import { ProductTypeEnum } from '../../../views/catalog/common/ProductTypeEnum'; +import { ProductTypeEnum } from '../../../components/catalog/common/ProductTypeEnum'; export function GetFurnitureData(furniClassId: number, productType: string): IFurnitureData { diff --git a/src/layout/card/grid/item/NitroCardGridItemView.tsx b/src/layout/card/grid/item/NitroCardGridItemView.tsx index e6edcf93..ee28d3b9 100644 --- a/src/layout/card/grid/item/NitroCardGridItemView.tsx +++ b/src/layout/card/grid/item/NitroCardGridItemView.tsx @@ -1,6 +1,6 @@ import { FC, useMemo } from 'react'; import { ItemCountView } from '../../../../views/shared/item-count/ItemCountView'; -import { LimitedEditionStyledNumberView } from '../../../../views/shared/limited-edition/styled-number/LimitedEditionStyledNumberView'; +import { LimitedEditionStyledNumberView } from '../../../../views/shared/limited-edition/LimitedEditionStyledNumberView'; import { NitroCardGridItemViewProps } from './NitroCardGridItemView.types'; export const NitroCardGridItemView: FC = props => diff --git a/src/views/Styles.scss b/src/views/Styles.scss index 708fceb6..c9e18a5e 100644 --- a/src/views/Styles.scss +++ b/src/views/Styles.scss @@ -1,6 +1,5 @@ @import "./shared/Shared"; @import "./camera/CameraWidgetView"; -@import "./catalog/CatalogView"; @import "./friends/FriendsView"; @import "./groups/GroupView"; @import "./hotel-view/HotelView"; @@ -12,7 +11,6 @@ @import "./right-side/RightSideView"; @import "./room/RoomView"; @import "./room-host/RoomHostView"; -@import "./toolbar/ToolbarView"; @import "./wired/WiredView"; @import "./mod-tools/ModToolsView"; @import "./user-settings/UserSettingsView"; diff --git a/src/views/groups/views/information/GroupInformationView.tsx b/src/views/groups/views/information/GroupInformationView.tsx index 198565c4..7f149698 100644 --- a/src/views/groups/views/information/GroupInformationView.tsx +++ b/src/views/groups/views/information/GroupInformationView.tsx @@ -4,8 +4,8 @@ import { CreateLinkEvent, GetSessionDataManager, LocalizeText, TryVisitRoom } fr import { GetGroupManager } from '../../../../api/groups/GetGroupManager'; import { GetGroupMembers } from '../../../../api/groups/GetGroupMembers'; import { TryJoinGroup } from '../../../../api/groups/TryJoinGroup'; +import { CatalogPageName } from '../../../../components/catalog/common/CatalogPageName'; import { SendMessageHook } from '../../../../hooks'; -import { CatalogPageName } from '../../../catalog/common/CatalogPageName'; import { BadgeImageView } from '../../../shared/badge-image/BadgeImageView'; import { GroupMembershipType } from '../../common/GroupMembershipType'; import { GroupType } from '../../common/GroupType'; diff --git a/src/views/hc-center/HcCenterView.tsx b/src/views/hc-center/HcCenterView.tsx index 01e19d29..4c210b7c 100644 --- a/src/views/hc-center/HcCenterView.tsx +++ b/src/views/hc-center/HcCenterView.tsx @@ -1,9 +1,9 @@ -import { ClubGiftInfoEvent, FriendlyTime, GetClubGiftInfo, RequestBadgesComposer, ScrKickbackData, ScrSendKickbackInfoMessageEvent, UserInfoEvent, UserSubscriptionEvent } from '@nitrots/nitro-renderer'; +import { ClubGiftInfoEvent, FriendlyTime, GetClubGiftInfo, ILinkEventTracker, RequestBadgesComposer, ScrKickbackData, ScrSendKickbackInfoMessageEvent, UserInfoEvent, UserSubscriptionEvent } from '@nitrots/nitro-renderer'; import { BadgesEvent, FigureUpdateEvent } from '@nitrots/nitro-renderer/src'; import { ScrGetKickbackInfoMessageComposer } from '@nitrots/nitro-renderer/src/nitro/communication/messages/outgoing/user/ScrGetKickbackInfoMessageComposer'; import { FC, useCallback, useEffect, useState } from 'react'; import { OverlayTrigger, Popover } from 'react-bootstrap'; -import { CreateLinkEvent, GetConfiguration, LocalizeText } from '../../api'; +import { AddEventLinkTracker, CreateLinkEvent, GetConfiguration, LocalizeText, RemoveLinkEventTracker } from '../../api'; import { HcCenterEvent } from '../../events/hc-center/HcCenterEvent'; import { CreateMessageHook, SendMessageHook, useUiEvent } from '../../hooks'; import { NitroCardContentView, NitroCardHeaderView, NitroCardView } from '../../layout'; @@ -27,6 +27,40 @@ export const HcCenterView: FC<{}> = props => const [badgeCode, setBadgeCode] = useState(BadgeResolver.default_badge); + const linkReceived = useCallback((url: string) => + { + const parts = url.split('/'); + + if(parts.length < 2) return; + + switch(parts[1]) + { + case 'open': + if(parts.length > 2) + { + switch(parts[2]) + { + case 'hccenter': + setIsVisible(true); + break; + } + } + return; + } + }, []); + + useEffect(() => + { + const linkTracker: ILinkEventTracker = { + linkReceived, + eventUrlPrefix: 'habboUI/' + }; + + AddEventLinkTracker(linkTracker); + + return () => RemoveLinkEventTracker(linkTracker); + }, [ linkReceived]); + const onUserInfoEvent = useCallback((event: UserInfoEvent) => { const parser = event.getParser(); diff --git a/src/views/main/MainView.tsx b/src/views/main/MainView.tsx index 5256aa51..945abb57 100644 --- a/src/views/main/MainView.tsx +++ b/src/views/main/MainView.tsx @@ -3,12 +3,13 @@ import { FC, useCallback, useEffect, useState } from 'react'; import { AddEventLinkTracker, GetCommunication, RemoveLinkEventTracker } from '../../api'; import { AchievementsView } from '../../components/achievements/AchievementsView'; import { AvatarEditorView } from '../../components/avatar-editor/AvatarEditorView'; +import { CatalogView } from '../../components/catalog/CatalogView'; import { InventoryView } from '../../components/inventory/InventoryView'; +import { ToolbarView } from '../../components/toolbar/ToolbarView'; import { useRoomSessionManagerEvent } from '../../hooks/events/nitro/session/room-session-manager-event'; import { TransitionAnimation, TransitionAnimationTypes } from '../../layout'; import { CameraWidgetView } from '../camera/CameraWidgetView'; import { CampaignView } from '../campaign/CampaignView'; -import { CatalogView } from '../catalog/CatalogView'; import { ChatHistoryView } from '../chat-history/ChatHistoryView'; import { FloorplanEditorView } from '../floorplan-editor/FloorplanEditorView'; import { FriendsView } from '../friends/FriendsView'; @@ -21,7 +22,6 @@ import { NavigatorView } from '../navigator/NavigatorView'; import { NitropediaView } from '../nitropedia/NitropediaView'; import { RightSideView } from '../right-side/RightSideView'; import { RoomHostView } from '../room-host/RoomHostView'; -import { ToolbarView } from '../toolbar/ToolbarView'; import { UserProfileView } from '../user-profile/UserProfileView'; import { UserSettingsView } from '../user-settings/UserSettingsView'; import { WiredView } from '../wired/WiredView'; diff --git a/src/views/notification-center/common/NotificationUtilities.ts b/src/views/notification-center/common/NotificationUtilities.ts index c14dda6a..25f82259 100644 --- a/src/views/notification-center/common/NotificationUtilities.ts +++ b/src/views/notification-center/common/NotificationUtilities.ts @@ -1,9 +1,9 @@ import { HabboWebTools, RoomEnterEffect } from '@nitrots/nitro-renderer'; import { CreateLinkEvent, GetConfiguration, GetNitroInstance, LocalizeText } from '../../../api'; +import { CatalogPageName } from '../../../components/catalog/common/CatalogPageName'; import { NotificationAlertEvent, NotificationConfirmEvent } from '../../../events'; import { NotificationBubbleEvent } from '../../../events/notification-center/NotificationBubbleEvent'; import { dispatchUiEvent } from '../../../hooks'; -import { CatalogPageName } from '../../catalog/common/CatalogPageName'; import { NotificationAlertType } from './NotificationAlertType'; import { NotificationBubbleType } from './NotificationBubbleType'; diff --git a/src/views/notification-center/common/ProductImageUtility.ts b/src/views/notification-center/common/ProductImageUtility.ts index 9078754c..dc67348b 100644 --- a/src/views/notification-center/common/ProductImageUtility.ts +++ b/src/views/notification-center/common/ProductImageUtility.ts @@ -1,6 +1,6 @@ import { CatalogPageMessageProductData } from '@nitrots/nitro-renderer'; import { GetRoomEngine } from '../../../api'; -import { FurniCategory } from '../../catalog/common/FurniCategory'; +import { FurniCategory } from '../../../components/catalog/common/FurniCategory'; export class ProductImageUtility { diff --git a/src/views/room/widgets/furniture/gift-opening/FurnitureGiftOpeningView.tsx b/src/views/room/widgets/furniture/gift-opening/FurnitureGiftOpeningView.tsx index 3348cada..3ded35e9 100644 --- a/src/views/room/widgets/furniture/gift-opening/FurnitureGiftOpeningView.tsx +++ b/src/views/room/widgets/furniture/gift-opening/FurnitureGiftOpeningView.tsx @@ -1,11 +1,11 @@ import { RoomObjectCategory, RoomObjectOperationType } from '@nitrots/nitro-renderer'; import { FC, useCallback, useMemo, useState } from 'react'; import { CreateLinkEvent, GetRoomEngine, GetSessionDataManager, LocalizeText, RoomWidgetPresentOpenMessage, RoomWidgetUpdatePresentDataEvent, RoomWidgetUpdateRoomObjectEvent } from '../../../../../api'; +import { ProductTypeEnum } from '../../../../../components/catalog/common/ProductTypeEnum'; import { BatchUpdates } from '../../../../../hooks'; import { CreateEventDispatcherHook } from '../../../../../hooks/events/event-dispatcher.base'; import { NitroCardContentView, NitroCardHeaderView, NitroCardView, NitroLayoutButton, NitroLayoutFlex, NitroLayoutFlexColumn, NitroLayoutGiftCardView, NitroLayoutGrid, NitroLayoutGridColumn } from '../../../../../layout'; import { NitroLayoutBase } from '../../../../../layout/base'; -import { ProductTypeEnum } from '../../../../catalog/common/ProductTypeEnum'; import { useRoomContext } from '../../../context/RoomContext'; const FLOOR: string = 'floor'; diff --git a/src/views/room/widgets/infostand/views/furni/InfoStandWidgetFurniView.tsx b/src/views/room/widgets/infostand/views/furni/InfoStandWidgetFurniView.tsx index 35f5f4cf..d848327d 100644 --- a/src/views/room/widgets/infostand/views/furni/InfoStandWidgetFurniView.tsx +++ b/src/views/room/widgets/infostand/views/furni/InfoStandWidgetFurniView.tsx @@ -4,7 +4,7 @@ import { CreateLinkEvent, GetGroupInformation, GetRoomEngine, LocalizeText, Room import { CreateMessageHook, SendMessageHook } from '../../../../../../hooks'; import { UserProfileIconView } from '../../../../../../layout'; import { BadgeImageView } from '../../../../../shared/badge-image/BadgeImageView'; -import { LimitedEditionCompactPlateView } from '../../../../../shared/limited-edition/compact-plate/LimitedEditionCompactPlateView'; +import { LimitedEditionCompactPlateView } from '../../../../../shared/limited-edition/LimitedEditionCompactPlateView'; import { RarityLevelView } from '../../../../../shared/rarity-level/RarityLevelView'; import { useRoomContext } from '../../../../context/RoomContext'; import { InfoStandBaseView } from '../base/InfoStandBaseView'; diff --git a/src/views/shared/furni-image/FurniImageView.tsx b/src/views/shared/furni-image/FurniImageView.tsx index 63c006ca..5acc2017 100644 --- a/src/views/shared/furni-image/FurniImageView.tsx +++ b/src/views/shared/furni-image/FurniImageView.tsx @@ -1,7 +1,7 @@ import { IGetImageListener, ImageResult, TextureUtils, Vector3d } from '@nitrots/nitro-renderer'; import { FC, useCallback, useEffect, useState } from 'react'; import { GetRoomEngine } from '../../../api'; -import { ProductTypeEnum } from '../../catalog/common/ProductTypeEnum'; +import { ProductTypeEnum } from '../../../components/catalog/common/ProductTypeEnum'; import { FurniImageViewProps } from './FurniImageView.types'; export const FurniImageView: FC = props =>