From 9263800612ed88b1643879ff772c90a41b41cbbc Mon Sep 17 00:00:00 2001 From: Harmonic Date: Fri, 15 Apr 2022 17:17:12 -0700 Subject: [PATCH] Refactoring Outgoing Part 382 - yay --- .../eu/habbo/core/RoomUserPetComposer.java | 2 +- .../eu/habbo/messages/outgoing/Outgoing.java | 205 +++++++++--------- .../talenttrack/TalentTrackComposer.java | 2 +- .../outgoing/camera/CameraPriceComposer.java | 2 +- .../CameraRoomThumbnailSavedComposer.java | 2 +- .../outgoing/camera/CameraURLComposer.java | 2 +- .../catalog/AlertLimitedSoldOutComposer.java | 2 +- .../AlertPurchaseUnavailableComposer.java | 2 +- .../outgoing/catalog/CatalogModeComposer.java | 2 +- .../catalog/CatalogSearchResultComposer.java | 2 +- .../catalog/ClubCenterDataComposer.java | 10 +- .../catalog/NotEnoughPointsTypeComposer.java | 2 +- .../outgoing/catalog/PetBreedsComposer.java | 2 +- .../catalog/RecyclerCompleteComposer.java | 2 +- .../catalog/RedeemVoucherOKComposer.java | 2 +- .../catalog/ReloadRecyclerComposer.java | 2 +- .../MarketplaceCancelSaleComposer.java | 2 +- .../MarketplaceOwnItemsComposer.java | 2 +- .../mysticbox/MysticBoxPrizeComposer.java | 2 +- .../NewYearResolutionProgressComposer.java | 2 +- .../FloorPlanEditorBlockedTilesComposer.java | 2 +- .../gamecenter/GameCenterGameComposer.java | 2 +- .../basejump/BaseJumpLoadGameComposer.java | 2 +- .../generic/alerts/GenericAlertComposer.java | 2 +- .../GuardianVotingResultComposer.java | 2 +- .../GuideSessionPartnerIsPlayingComposer.java | 2 +- .../guilds/GuildEditFailComposer.java | 2 +- .../GuildFavoriteRoomUserUpdateComposer.java | 2 +- .../guilds/GuildFurniWidgetComposer.java | 2 +- .../outgoing/guilds/GuildListComposer.java | 2 +- .../outgoing/guilds/GuildManageComposer.java | 2 +- .../forums/GuildForumCommentsComposer.java | 2 +- .../habboway/nux/NewUserGiftComposer.java | 2 +- .../habboway/nux/NewUserIdentityComposer.java | 2 +- .../EnableNotificationsComposer.java | 2 +- .../outgoing/handshake/PingComposer.java | 2 +- .../HotelViewNextLTDAvailableComposer.java | 2 +- .../HotelViewSecondsUntilComposer.java | 2 +- .../inventory/InventoryPetsComposer.java | 2 +- .../outgoing/inventory/RemovePetComposer.java | 2 +- .../inventory/UserEffectsListComposer.java | 2 +- .../modtool/BullyReportRequestComposer.java | 2 +- .../modtool/BullyReportedMessageComposer.java | 2 +- .../modtool/CfhTopicsMessageComposer.java | 2 +- .../modtool/ModToolIssueInfoComposer.java | 2 +- .../ModToolIssueResponseAlertComposer.java | 2 +- .../ModToolReportReceivedAlertComposer.java | 2 +- .../modtool/ModToolRoomChatlogComposer.java | 2 +- .../modtool/ModToolUserChatlogComposer.java | 2 +- .../NewNavigatorEventCategoriesComposer.java | 2 +- .../NewNavigatorSavedSearchesComposer.java | 3 +- .../outgoing/polls/PollStartComposer.java | 2 +- .../outgoing/quests/QuestsComposer.java | 2 +- .../outgoing/rooms/HideDoorbellComposer.java | 2 +- .../outgoing/rooms/RoomOwnerComposer.java | 2 +- .../outgoing/rooms/RoomScoreComposer.java | 2 +- .../rooms/RoomSettingsUpdatedComposer.java | 2 +- .../outgoing/rooms/RoomThicknessComposer.java | 2 +- .../rooms/items/FloorItemUpdateComposer.java | 2 +- .../rooms/items/ItemIntStateComposer.java | 2 +- .../JukeBoxNowPlayingMessageComposer.java | 2 +- .../jukebox/JukeBoxPlayListComposer.java | 2 +- .../jukebox/JukeBoxTrackDataComposer.java | 2 +- .../LoveLockFurniFriendConfirmedComposer.java | 2 +- .../lovelock/LoveLockFurniStartComposer.java | 2 +- .../RentableSpaceInfoComposer.java | 2 +- .../outgoing/rooms/pets/RoomPetComposer.java | 2 +- .../rooms/users/RoomUserDataComposer.java | 2 +- .../RoomUserReceivedHandItemComposer.java | 2 +- .../rooms/users/RoomUserUnbannedComposer.java | 2 +- .../rooms/users/RoomUsersComposer.java | 2 +- .../unknown/CloseWebPageComposer.java | 2 +- .../unknown/EpicPopupFrameComposer.java | 2 +- .../outgoing/unknown/ErrorLoginComposer.java | 2 +- .../unknown/ExtendClubMessageComposer.java | 2 +- .../unknown/RemoveRoomEventComposer.java | 2 +- .../RentableItemBuyOutPriceComposer.java | 2 +- .../RoomCategoryUpdateMessageComposer.java | 2 +- .../unknown/UnknownAvatarEditorComposer.java | 2 +- .../unknown/UnknownCompetitionComposer.java | 2 +- .../outgoing/unknown/UnknownComposer8.java | 2 +- .../UnknownMessengerErrorComposer.java | 2 +- .../unknown/UnknownRoomViewerComposer.java | 2 +- .../users/MeMenuSettingsComposer.java | 2 +- .../outgoing/users/UserCreditsComposer.java | 2 +- .../users/UserPermissionsComposer.java | 2 +- .../outgoing/users/UserProfileComposer.java | 2 +- .../outgoing/users/UserWardrobeComposer.java | 2 +- .../VerifyMobileNumberComposer.java | 2 +- 89 files changed, 190 insertions(+), 200 deletions(-) diff --git a/src/main/java/com/eu/habbo/core/RoomUserPetComposer.java b/src/main/java/com/eu/habbo/core/RoomUserPetComposer.java index d593d1ff..cdd54557 100644 --- a/src/main/java/com/eu/habbo/core/RoomUserPetComposer.java +++ b/src/main/java/com/eu/habbo/core/RoomUserPetComposer.java @@ -20,7 +20,7 @@ public class RoomUserPetComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomUsersComposer); + this.response.init(Outgoing.UsersComposer); this.response.appendInt(1); this.response.appendInt(this.habbo.getHabboInfo().getId()); this.response.appendString(this.habbo.getHabboInfo().getUsername()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/Outgoing.java b/src/main/java/com/eu/habbo/messages/outgoing/Outgoing.java index 822c6487..b8bb11ce 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/Outgoing.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/Outgoing.java @@ -2,35 +2,35 @@ package com.eu.habbo.messages.outgoing; public class Outgoing { public static final int PetStatusUpdateComposer = 1907; - public final static int CfhTopicsMessageComposer = 325; + public final static int CfhTopicsInitComposer = 325; public final static int FavouritesComposer = 151; public final static int ActivityPointsMessageComposer = 2018; - public final static int RedeemVoucherOKComposer = 3336; + public final static int VoucherRedeemOkMessageComposer = 3336; public final static int ShoutMessageComposer = 1036; public final static int UserUpdateComposer = 1640; - public final static int RoomUserDataComposer = 3920; + public final static int UserChangeMessageComposer = 3920; public final static int FlatControllerAddedComposer = 2088; public final static int FlatControllerRemovedComposer = 1327; public final static int FlatControllersComposer = 1284; public final static int CarryObjectMessageComposer = 1474; - public final static int RoomUsersComposer = 374; + public final static int UsersComposer = 374; public final static int NewFriendRequestComposer = 2219; public final static int GuildCreatedMessageComposer = 2808; public final static int BadgeReceivedComposer = 2493; - public final static int RecyclerCompleteComposer = 468; + public final static int RecyclerFinishedComposer = 468; public final static int GuildCreationInfoMessageComposer = 2159; public final static int FriendListFragmentMessageComposer = 3130; public final static int FollowFriendFailedComposer = 3048; public final static int TradeCloseWindowComposer = 1001; public final static int ObjectRemoveMessageComposer = 2703; - public final static int InventoryPetsComposer = 3522; - public final static int UserCreditsComposer = 3475; + public final static int PetInventoryComposer = 3522; + public final static int CreditBalanceComposer = 3475; public final static int WiredTriggerDataComposer = 383; public final static int Game2UserLeftGameMessageComposer = 383; public final static int TradingCloseComposer = 1373; - public final static int ModToolUserChatlogComposer = 3377; + public final static int UserChatlogComposer = 3377; public final static int HabboGroupDetailsMessageComposer = 1702; - public final static int UserPermissionsComposer = 411; + public final static int UserRightsMessageComposer = 411; public final static int ApproveNameMessageComposer = 1503; public final static int TradingOpenFailedComposer = 217; public final static int UnseenItemsComposer = 2103; @@ -40,9 +40,9 @@ public class Outgoing { public final static int BonusRareInfoMessageComposer = 1533; public final static int CloseConnectionMessageComposer = 122; public final static int FriendListUpdateComposer = 2800; - public final static int FloorItemUpdateComposer = 3776; + public final static int ObjectUpdateMessageComposer = 3776; public final static int RoomAccessDeniedComposer = 878; - public final static int GuildFurniWidgetComposer = 3293; + public final static int GuildFurniContextMenuInfoMessageComposer = 3293; public final static int GiftWrappingConfigurationComposer = 2234; public final static int UserClubComposer = 954; public final static int InventoryBadgesComposer = 717; @@ -56,17 +56,15 @@ public class Outgoing { public final static int IssueDeletedMessageComposer = 3192; public final static int RoomRightsComposer = 780; public final static int SlideObjectBundleMessageComposer = 3207; - public final static int PollStartComposer = 3785; + public final static int PollOfferComposer = 3785; public final static int GuildMembershipRejectedMessageComposer = 2445; public final static int PerkAllowancesComposer = 2586; public final static int TalentTrackLevelMessageEvent = 1203; - public final static int PublicRoomsComposer = -1;//error 404 public final static int MarketplaceOffersComposer = 680; - public final static int FaqCategoriesMessageComposer = 2756; + public final static int FaqCategoriesMessageComposer = 2756; //todo? public final static int ModeratorInitMessageComposer = 2696; public final static int UserBadgesComposer = 1087; - public final static int GuildManageComposer = 3965; - public final static int RemoveFriendComposer = -1;//error 404 + public final static int GuildEditInfoMessageComposer = 3965; public final static int InitDiffieHandshakeComposer = 1347; public final static int CompleteDiffieHandshakeComposer = 3885; public final static int UserObjectComposer = 2725; @@ -76,14 +74,14 @@ public class Outgoing { public final static int RoomChatSettingsMessageComposer = 1191; public final static int FurniListRemoveComposer = 159; public final static int UserRemoveMessageComposer = 2661; - public final static int FaqCategoryMessageComposer = 2819; + public final static int FaqCategoryMessageComposer = 2819; //todo? public final static int FloorHeightMapComposer = 1301; public final static int PetFigureUpdateComposer = 1924; public final static int PetPlacingErrorComposer = 2913; public final static int TradingItemListComposer = 2024; public final static int PrivateRoomsComposer = 52; public final static int RoomReadyMessageComposer = 2031; - public final static int RoomScoreComposer = 482; + public final static int RoomRatingComposer = 482; public final static int DoorbellMessageComposer = 2309; public final static int AuthenticationOKMessageComposer = 2491; public final static int AvailabilityStatusMessageComposer = 2033; @@ -94,32 +92,32 @@ public class Outgoing { public final static int TradingOpenComposer = 2505; public final static int FurniListAddOrUpdateComposer = 104; public final static int IssuePickFailedMessageComposer = 3150; - public final static int MeMenuSettingsComposer = 513; + public final static int AccountPreferencesComposer = 513; public final static int ModeratorRoomInfoComposer = 1333; - public final static int GuildListComposer = 420; + public final static int GuildMembershipsMessageComposer = 420; public final static int RecyclerPrizesComposer = 3164; public final static int NavigatorSettingsComposer = 2875; public final static int DanceMessageComposer = 2233; - public final static int Game2StopCounterMessageComposer = 2233; - public final static int RoomSettingsUpdatedComposer = 3297; + public final static int Game2StopCounterMessageComposer = 2233; //todo? + public final static int RoomInfoUpdatedComposer = 3297; public final static int PurchaseErrorMessageComposer = 1404; public final static int RoomDataComposer = 687; public final static int PopularRoomTagsResultComposer = 2012; public final static int FurniListInvalidateComposer = 3151; - public final static int RemovePetComposer = 3253; + public final static int PetRemovedFromInventoryComposer = 3253; public final static int ItemRemoveMessageComposer = 3208; public final static int TradeCompleteComposer = 2369; public final static int PromoArticlesMessageComposer = 286; public final static int WiredEffectDataComposer = 1434; public final static int NotificationDialogMessageComposer = 1992; - public final static int ReloadRecyclerComposer = 3433; + public final static int RecyclerStatusComposer = 3433; public final static int RoomDimmerPresetsComposer = 2710; public final static int WiredRewardResultMessageComposer = 178; public final static int CatalogPageComposer = 804; - public final static int CatalogModeComposer = 3828; + public final static int BuildersClubFurniCountMessageComposer = 3828; public final static int ChangeUserNameResultMessageEvent = 118; public final static int ObjectAddMessageComposer = 1534; - public final static int EnableNotificationsComposer = 3284; + public final static int InfoFeedEnableMessageComposer = 3284; public final static int CommunityGoalHallOfFameMessageComposer = 3005; public final static int WiredSavedComposer = 1155; public final static int RoomPropertyMessageComposer = 2454; @@ -128,14 +126,14 @@ public class Outgoing { public final static int FriendRequestErrorComposer = 892; public final static int GuildMembersComposer = 1200; public final static int RoomOpenComposer = 758; - public final static int ModToolRoomChatlogComposer = 3434; + public final static int RoomChatlogComposer = 3434; public final static int BundleDiscountRulesetMessageComposer = 2347; - public final static int MarketplaceCancelSaleComposer = 3264; + public final static int MarketplaceCancelOfferResultComposer = 3264; public final static int PetRespectNotificationComposer = 2788; public final static int RoomSettingsDataComposer = 1498; - public final static int TalentTrackComposer = 3406; + public final static int TalentTrackMessageComposer = 3406; public final static int CatalogPagesListComposer = 1032; - public final static int AlertLimitedSoldOutComposer = 377; + public final static int LimitedEditionSoldOutComposer = 377; public final static int CatalogPublishedMessageComposer = 1866; public final static int PurchaseOKComposer = 869; public final static int ItemUpdateMessageComposer = 2009; @@ -150,9 +148,9 @@ public class Outgoing { public final static int RoomPaneComposer = 749; public final static int RedeemVoucherErrorComposer = 714; public final static int FlatCreatedComposer = 1304; - public final static int GenericAlertComposer = 3801; + public final static int HabboBroadcastMessageComposer = 3801; public final static int GuildEditorDataMessageComposer = 2238; - public final static int ModToolIssueInfoComposer = 3609; + public final static int IssueInfoMessageComposer = 3609; public final static int WhisperMessageComposer = 2704; public final static int BotErrorComposer = 639; public final static int GamePlayerValueMessageComposer = 2324; @@ -160,15 +158,15 @@ public class Outgoing { public final static int MarketplaceSellItemComposer = 54; public final static int HabboClubOffersMessageComposer = 2405; public final static int RelationshipStatusInfoComposer = 2016; - public final static int MarketplaceOwnItemsComposer = 3884; - public final static int RoomOwnerComposer = 339; + public final static int MarketPlaceOwnOffersComposer = 3884; + public final static int YouAreOwnerMessageComposer = 339; public final static int WiredConditionDataComposer = 1108; public final static int ModeratorUserInfoComposer = 2866; - public final static int UserWardrobeComposer = 3315; + public final static int WardrobeMessageComposer = 3315; public final static int PetExperienceComposer = 2156; public final static int NewConsoleMessageComposer = 1587; public final static int PetInfoMessageComposer = 2901; - public final static int RoomThicknessComposer = 3547; + public final static int RoomVisualizationSettingsComposer = 3547; public final static int PetAddedToInventoryComposer = 2101; public final static int UpdateStackHeightComposer = 558; public final static int BotRemovedFromInventoryComposer = 233; @@ -177,11 +175,11 @@ public class Outgoing { public final static int GenericErrorComposer = 1600; public final static int ItemsComposer = 1369; public final static int AvatarEffectMessageComposer = 1167; - public final static int PetBreedsComposer = 3331; + public final static int SellablePetPalettesMessageComposer = 3331; public final static int ModToolIssueChatlogComposer = 607; public final static int ExpressionMessageComposer = 1631; public final static int BotCommandConfigurationComposer = 1618; - public final static int UserProfileComposer = 3898; + public final static int ExtendedProfileMessageComposer = 3898; public final static int MiniMailUnreadCountComposer = 2803; public final static int AchievementsScoreComposer = 1968; public final static int PetLevelUpComposer = 859; @@ -191,20 +189,20 @@ public class Outgoing { public final static int FloodCounterComposer = 566; public final static int WiredValidationErrorComposer = 156; public final static int RoomEntryTileMessageComposer = 1664; - public final static int FloorPlanEditorBlockedTilesComposer = 3990; + public final static int RoomOccupiedTilesMessageComposer = 3990; public final static int BuildersClubSubscriptionStatusMessageComposer = 1452; public final static int RoomSettingsSavedComposer = 948; public final static int MessengerInitComposer = 1605; public final static int FigureSetIdsComposer = 1450; - public final static int UserEffectsListComposer = 340; - public final static int NewUserIdentityComposer = 3738; - public final static int NewNavigatorEventCategoriesComposer = 3244; + public final static int AvatarEffectsMessageComposer = 340; + public final static int NoobnessLevelMessageComposer = 3738; + public final static int UserEventCatsComposer = 3244; public final static int CollapsedCategoriesComposer = 1543; public final static int NavigatorLiftedRoomsComposer = 3104; - public final static int NewNavigatorSavedSearchesComposer = 3984; + public final static int NavigatorSavedSearchesComposer = 3984; public final static int ItemDataUpdateMessageComposer = 2202; - public final static int ModToolReportReceivedAlertComposer = 3635; - public final static int ModToolIssueResponseAlertComposer = 3796; + public final static int CallForHelpResultMessageComposer = 3635; + public final static int CallForHelpReplyMessageComposer = 3796; public final static int AchievementsComposer = 305; public final static int AchievementComposer = 2107; public final static int AchievementUnlockedComposer = 806; @@ -212,26 +210,27 @@ public class Outgoing { public final static int UniqueMachineIDComposer = 1488; public final static int LatencyPingResponseMessageComposer = 10; public final static int ModeratorToolPreferencesComposer = 1576; - public final static int FaqClientFaqsMessageComposer = 2492; // todo - public final static int IsFirstLoginOfDayComposer = 793; //Quest Engine - public final static int MysteryBoxKeysMessageComposer = 2833; //Mysterbox + public final static int FaqClientFaqsMessageComposer = 2492; //todo? + public final static int IsFirstLoginOfDayComposer = 793; + public final static int MysteryBoxKeysMessageComposer = 2833; public final static int IgnoredUsersMessageComposer = 126; public final static int NavigatorMetaDataComposer = 3052; public final static int NavigatorSearchResultBlocksComposer = 2690; public final static int MysticBoxStartOpenComposer = 3201; public final static int MysticBoxCloseComposer = 596; - public final static int MysticBoxPrizeComposer = 3712; - public final static int RentableSpaceInfoComposer = 3559; + public final static int GotMysteryBoxPrizeMessageComposer = 3712; + public final static int RentableSpaceStatusMessageComposer = 3559; public final static int RentableSpaceRentOkMessageComposer = 2046; public final static int RentableSpaceRentFailedMessageComposer = 1868; public final static int GuildMemberFurniCountInHQMessageComposer = 1876; public final static int IsBadgeRequestFulfilledComposer = 2998; - public final static int EpicPopupFrameComposer = 3945; + public final static int EpicPopupMessageComposer = 3945; + public final static int WeeklyCompetitiveFriendsLeaderboardComposer = 3560; public final static int LoadGameUrlMessageComposer = 2624; public final static int UserTagsMessageComposer = 1255; public final static int RoomInviteErrorComposer = 462; public final static int RequestSpamWallPostItMessageComposer = 2366; - public final static int NewYearResolutionProgressComposer = 3370; + public final static int AchievementResolutionProgressMessageComposer = 3370; public final static int ClubGiftReceivedComposer = 659; public final static int OneWayDoorStatusMessageComposer = 2376; public final static int ObjectDataUpdateMessageComposer = 2547; @@ -239,15 +238,13 @@ public class Outgoing { public final static int QuestionInfoComposer = -1; public final static int TalentTrackEmailVerifiedComposer = 612; public final static int ChangeEmailResultComposer = 1815; - public final static int UnknownAvatarEditorComposer = 3473; + public final static int AvatarEffectSelectedMessageComposer = 3473; public final static int GroupMembershipRequestedMessageComposer = 1180; public final static int UnreadForumsCountMessageComposer = 2379; public final static int PostThreadMessageComposer = 1862; public final static int PostMessageMessageComposer = 2049; public final static int ForumDataMessageComposer = 3011; - public final static int GuildForumCommentsComposer = 509; - public final static int UnknownGuildForumComposer6 = -1; - public final static int UnknownGuildForumComposer7 = -1; + public final static int ThreadMessagesMessageComposer = 509; public final static int GuildForumThreadsComposer = 1073; public final static int ForumsListMessageComposer = 3001; public final static int UpdateThreadMessageComposer = 2528; @@ -264,15 +261,15 @@ public class Outgoing { public final static int GuardianNewReportReceivedComposer = 735; public final static int ChatReviewSessionStartedMessageComposer = 143; public final static int ChatReviewSessionVotingStatusMessageComposer = 1829; - public final static int GuardianVotingResultComposer = 3276; + public final static int ChatReviewSessionResultsMessageComposer = 3276; public final static int ChatReviewSessionDetachedMessageComposer = 30; public final static int MuteAllInRoomComposer = 2533; - public final static int HideDoorbellComposer = 3783; + public final static int FlatAccessibleMessageComposer = 3783; public final static int RoomQueueStatusMessageComposer = 2208; public final static int YouAreSpectatorMessageEvent = 1033; public final static int AvatarEffectExpiredMessageComposer = 2228; public final static int OfficialRoomsComposer = 2726; - public final static int ItemStateComposer2 = 3431; + public final static int DiceValueMessageComposer = 3431; public final static int HotelWillCloseInMinutesComposer = 1050; public final static int MaintenanceStatusMessageComposer = 1350; public final static int HotelClosesAndWillOpenAtComposer = 2771; @@ -285,7 +282,7 @@ public class Outgoing { public final static int PetReceivedMessageComposer = 1111; public final static int MOTDNotificationComposer = 2035; public final static int AccountSafetyLockStatusChangeMessageComposer = 1243; - public final static int CloseWebPageComposer = 426; + public final static int RestoreClientMessageComposer = 426; public final static int ClubGiftNotificationComposer = 2188; public final static int HabboGroupDeactivatedMessageComposer = 3129; public final static int BannedUsersFromRoomComposer = 1869; @@ -294,17 +291,17 @@ public class Outgoing { public final static int WelcomeGiftStatusComposer = 2707; public final static int QuestionComposer = 2665; public final static int YouAreNotControllerMessageComposer = 2392; - public final static int GuildEditFailComposer = 3988; + public final static int GuildEditFailedMessageComposer = 3988; public final static int MiniMailNewMessageComposer = 1911; public final static int RoomFilterSettingsMessageComposer = 2937; - public final static int VerifyMobileNumberComposer = 3639; - public final static int NewUserGiftComposer = 3575; + public final static int NewUserExperienceNotCompleteComposer = 3639; + public final static int NewUserExperienceGiftOfferComposer = 3575; public final static int FigureUpdateComposer = 2429; public final static int IgnoreResultMessageComposer = 207; public final static int ConfirmBreedingResultComposer = 1625; public final static int UserNameChangedMessageComposer = 2182; - public final static int LoveLockFurniStartComposer = 3753; - public final static int LoveLockFurniFriendConfirmedComposer = 382; + public final static int FriendFurniStartConfirmationMessageComposer = 3753; + public final static int FriendFurniOtherLockConfirmedMessageComposer = 382; public final static int LoveLockFurniFinishedComposer = 770; public final static int PetPackageNameValidationComposer = 546; public final static int WeeklyGameRewardWinnersComposer = 3097; @@ -314,19 +311,19 @@ public class Outgoing { public final static int PhoneCollectionStateMessageComposer = 2890; public final static int VerifyMobilePhoneCodeWindowComposer = 800; public final static int VerifyMobilePhoneDoneComposer = 91; - public final static int RoomUserReceivedHandItemComposer = 354; + public final static int HandItemReceivedMessageComposer = 354; public final static int MutedWhisperComposer = 826; public final static int ElementPointerMessageComposer = 1787; public final static int GuideTicketResolutionMessageComposer = 2674; public final static int RoomAdPurchaseInfoComposer = 2468; - public final static int NotEnoughPointsTypeComposer = 3914; + public final static int NotEnoughBalanceMessageComposer = 3914; public final static int OfferRewardDeliveredMessageComposer = 2125; public final static int NewYearResolutionComposer = 66; public final static int WelcomeGiftChangeEmailResultComposer = 2293; - public final static int RentableItemBuyOutPriceComposer = 35; + public final static int FurniRentOrBuyoutOfferMessageComposer = 35; public final static int CitizenshipVipOfferPromoEnabledComposer = 2278; public final static int CategoriesWithVisitorCountComposer = 1455; - public final static int CameraRoomThumbnailSavedComposer = 3595; + public final static int ThumbnailStatusMessageComposer = 3595; public final static int RoomSettingsSaveErrorComposer = 1555; public final static int GuildAcceptMemberErrorComposer = 818; public final static int MostUselessErrorAlertComposer = 662; @@ -339,12 +336,13 @@ public class Outgoing { public final static int HotelViewCustomTimerComposer = -1; public final static int MarketplaceMakeOfferResult = 1359; public final static int QuizDataMessageComposer = 2927; - public final static int GuildFavoriteRoomUserUpdateComposer = 3403; + public final static int FavoriteMembershipUpdateMessageComposer = 3403; public final static int RoomAdErrorComposer = 1759; public final static int NewNavigatorSettingsComposer = 518; public final static int CameraPublishStatusMessageComposer = 2057; public final static int RoomInviteComposer = 3870; - public final static int BullyReportRequestComposer = 3463; + public final static int GuideReportingStatusMessageComposer = 3463; + public final static int CameraSnapshotMessageComposer = 463; // todo? public final static int UnknownHelperComposer = 77; public final static int CallForHelpDisabledNotifyMessageComposer = 1651; public final static int SleepMessageComposer = 1797; @@ -353,20 +351,20 @@ public class Outgoing { public final static int RoomForwardMessageComposer = 160; public final static int AvatarEffectActivatedMessageComposer = 1959; public final static int CompetitionEntrySubmitResultComposer = 1177; - public final static int ExtendClubMessageComposer = 3964; + public final static int HabboClubExtendOfferMessageComposer = 3964; public final static int ConcurrentUsersGoalProgressMessageComposer = 2737; - public final static int InventoryAddEffectComposer = -1;//error 404 public final static int _Str_16258_Composer = 1660; //todo? - public final static int _Str_16667_Composer = 1660; //todo? + public final static int _Str_17054_Composer = 416; //todo? + public final static int _Str_16667_Composer = 3099; //todo? public final static int Game2JoiningGameFailedMessageComposer = 1730; // todo? public final static int TalentLevelUpdateComposer = 638; - public final static int BullyReportedMessageComposer = 3285; + public final static int GuideTicketCreationResultMessageComposer = 3285; public final static int SeasonalQuestsMessageComposer = 1122; // todo 14/04/22 public final static int FriendNotificationComposer = 3082; public final static int MessengerErrorComposer = 896; - public final static int CameraPriceComposer = 3878; + public final static int InitCameraMessageComposer = 3878; public final static int NestBreedingSuccessComposer = 2527; - public final static int RoomUserUnbannedComposer = 3429; + public final static int UserUnbannedFromRoomComposer = 3429; public final static int CommunityGoalProgressMessageComposer = 2525; public final static int UserClassificationComposer = 966; public final static int CanCreateRoomEventComposer = 2599; @@ -374,27 +372,27 @@ public class Outgoing { public final static int YoutubeDisplayPlaylistsComposer = 1112; public final static int YoutubeDisplayVideoMessageComposer = 1411; public final static int YoutubeControlVideoMessageComposer = 1554; - public final static int RoomCategoryUpdateMessageComposer = 3896; - public final static int QuestsComposer = 3625; + public final static int ShowEnforceRoomCategoryDialogComposer = 3896; + public final static int QuestsMessageComposer = 3625; public final static int GiftReceiverNotFoundComposer = 1517; public final static int ConvertedRoomIdComposer = 1331; public final static int FavouriteChangedComposer = 2524; - public final static int AlertPurchaseUnavailableComposer = 3770; + public final static int PurchaseNotAllowedMessageComposer = 3770; public final static int GoToBreedingNestFailureComposer = 2621; public final static int QuestDailyMessageComposer = 1878; //todo? public final static int CommunityGoalVoteMessageComposer = 1435; - public final static int CatalogSearchResultComposer = 3388; + public final static int ProductOfferComposer = 3388; public final static int FindFriendsProcessResultComposer = 1210; public final static int QuestMessageComposer = 230; public final static int CfhSanctionMessageComposer = 2782; public final static int RoomEventComposer = 1840; public final static int UserSongDisksInventoryMessageComposer = 2602; - public final static int JukeBoxNowPlayingMessageComposer = 469; + public final static int NowPlayingMessageComposer = 469; public final static int JukeBoxPlaylistFullMessageComposer = 105; public final static int PlayListMessageComposer = 1748; public final static int PlayListSongAddedMessageComposer = 1140; - public final static int JukeBoxPlayListComposer = 34; - public final static int JukeBoxTrackDataComposer = 3365; + public final static int JukeboxSongDisksMessageComposer = 34; + public final static int TraxSongInfoMessageComposer = 3365; public final static int OfficialSongIdMessageComposer = 1381; public final static int CraftableProductsComposer = 1000; public final static int CraftingRecipeComposer = 2774; @@ -408,28 +406,29 @@ public class Outgoing { public final static int UnknownComposer_1165 = 904; public final static int AvatarEffectAddedMessageComposer = 2867; public final static int UnknownComposer_1188 = 1437; // this string name isnt readable via any source. - public final static int SubmitCompetitionRoomComposer = 3841; + public final static int IsUserPartOfCompetitionMessageComposer = 3841; public final static int UserGameAchievementsMessageComposer = 2265; public final static int TradingOtherNotAllowedComposer = 1254; public final static int UnloadGameMessageComposer = 1715; public final static int RoomSettingsErrorComposer = 2897; public final static int Game2AccountGameStatusMessageComposer = 2893; public final static int Game2WeeklyFriendsLeaderboardComposer = 2270; - public final static int BaseJumpLoadGameComposer = 3654; - public final static int UnknowComposer_1427 = 3319; + public final static int LoadGameMessageComposer = 3654; + public final static int CommunityGoalEarnedPrizesMessageComposer = 3319; public final static int CampaignCalendarDataMessageComposer = 2531; - public final static int UnknownComposer_152 = 3954; + public final static int CompetitionRoomsDataMessageComposer = 3954; public final static int WeeklyGameRewardComposer = 2641; public final static int NewYearResolutionCompletedComposer = 740; public final static int Game2GameDirectoryStatusMessageComposer = 2246; //todo? public final static int TradingNoSuchItemComposer = 2873; public final static int CampaignCalendarDoorOpenedMessageComposer = 2551; public final static int SanctionStatusComposer = 2221; - public final static int UnknownComposer_1965 = 3292; - public final static int GuideSessionPartnerIsPlayingComposer = 448; + public final static int FaqTextMessageComposer = 3292; + public final static int YouArePlayingGameMessageComposer = 448; public final static int LeftQueueMessageComposer = 1477; - public final static int Game2WeeklySmallLeaderboardComposer = 3512; + public final static int WeeklyCompetitiveLeaderboardComposer = 3512; public final static int GameListMessageComposer = 222; + public final static int BotReceivedMessageComposer = 3684; //todo? public final static int HabboGroupBadgesMessageComposer = 2402; public final static int UseObjectMessageComposer = 1774; //todo? public final static int HotelMergeNameChangeComposer = 1663; @@ -441,13 +440,13 @@ public class Outgoing { public final static int RoomFloorThicknessUpdatedComposer = 3786; public final static int CameraPurchaseOKMessageComposer = 2783; public final static int CompetitionStatusMessageComposer = 133; - public final static int CameraURLComposer = 3696; + public final static int CameraStorageUrlMessageComposer = 3696; public final static int HotelViewCatalogPageExpiringComposer = 690; public final static int QuestionAnsweredComposer = 2589; - public final static int PingComposer = 3928; + public final static int PingMessageComposer = 3928; public final static int TradingConfirmationComposer = 2720; public final static int JoinedQueueMessageComposer = 2260; - public final static int ClubCenterDataComposer = 3277; + public final static int ScrSendKickbackInfoMessageComposer = 3277; public final static int QuestionFinishedComposer = 1066; public final static int PostItPlacedComposer = 1501; public final static int InterstitialMessageComposer = 1808; @@ -459,19 +458,19 @@ public class Outgoing { public final static int PetLevelUpdateComposer = 2824; public final static int QuestCancelledMessageComposer = 3027; public final static int TradingNotOpenComposer = 3128; - public final static int UnknownMessengerErrorComposer = 3359; - public final static int UnknownComposer8 = 3441; - public final static int RemoveRoomEventComposer = 3479; - public final static int UnknownCompetitionComposer = 3506; - public final static int UnknownRoomViewerComposer = 3523; - public final static int ErrorLoginComposer = 4000; - public final static int HotelViewNextLTDAvailableComposer = 44; - public final static int HotelViewSecondsUntilComposer = 3926; + public final static int InstantMessageErrorComposer = 3359; + public final static int PetSupplementedNotificationComposer = 3441; + public final static int RoomEventCancelComposer = 3479; + public final static int CompetitionVotingInfoMessageComposer = 3506; + public final static int IdentityAccountsComposer = 3523; + public final static int DisconnectReasonComposer = 4000; + public final static int LimitedOfferAppearingNextMessageComposer = 44; + public final static int SecondsUntilMessageComposer = 3926; public final static int UnknownRoomDesktopComposer = 69; public final static int UnknownGuildComposer3 = 876; public final static int JoiningQueueFailedMessageComposer = 3035; public final static int CatalogPageExpirationComposer = 2668; - public final static int GameCenterGameComposer = 3805; + public final static int GameStatusMessageComposer = 3805; public static final int SnowStormGameStartedComposer = 5000; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentTrackComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentTrackComposer.java index 87515a2b..7c821a70 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentTrackComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentTrackComposer.java @@ -24,7 +24,7 @@ public class TalentTrackComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.TalentTrackComposer); + this.response.init(Outgoing.TalentTrackMessageComposer); this.response.appendString(this.type.name().toLowerCase()); LinkedHashMap talentTrackLevels = Emulator.getGameEnvironment().getAchievementManager().getTalenTrackLevels(this.type); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPriceComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPriceComposer.java index 133352c9..9b39bebb 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPriceComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPriceComposer.java @@ -17,7 +17,7 @@ public class CameraPriceComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CameraPriceComposer); + this.response.init(Outgoing.InitCameraMessageComposer); this.response.appendInt(this.credits); this.response.appendInt(this.points); this.response.appendInt(this.pointsType); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraRoomThumbnailSavedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraRoomThumbnailSavedComposer.java index 39279844..7225d4b0 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraRoomThumbnailSavedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraRoomThumbnailSavedComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class CameraRoomThumbnailSavedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CameraRoomThumbnailSavedComposer); + this.response.init(Outgoing.ThumbnailStatusMessageComposer); return this.response; } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraURLComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraURLComposer.java index 414f6f57..6e25d3cb 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraURLComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraURLComposer.java @@ -13,7 +13,7 @@ public class CameraURLComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CameraURLComposer); + this.response.init(Outgoing.CameraStorageUrlMessageComposer); this.response.appendString(this.URL); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertLimitedSoldOutComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertLimitedSoldOutComposer.java index d6688e42..5b350dc7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertLimitedSoldOutComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertLimitedSoldOutComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class AlertLimitedSoldOutComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.AlertLimitedSoldOutComposer); + this.response.init(Outgoing.LimitedEditionSoldOutComposer); return this.response; } } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertPurchaseUnavailableComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertPurchaseUnavailableComposer.java index fb4f8095..9cc78f5a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertPurchaseUnavailableComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertPurchaseUnavailableComposer.java @@ -16,7 +16,7 @@ public class AlertPurchaseUnavailableComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.AlertPurchaseUnavailableComposer); + this.response.init(Outgoing.PurchaseNotAllowedMessageComposer); this.response.appendInt(this.code); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogModeComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogModeComposer.java index 4c45a1db..649dafc6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogModeComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogModeComposer.java @@ -13,7 +13,7 @@ public class CatalogModeComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CatalogModeComposer); + this.response.init(Outgoing.BuildersClubFurniCountMessageComposer); this.response.appendInt(this.mode); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogSearchResultComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogSearchResultComposer.java index 640683db..a7758f5d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogSearchResultComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogSearchResultComposer.java @@ -14,7 +14,7 @@ public class CatalogSearchResultComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CatalogSearchResultComposer); + this.response.init(Outgoing.ProductOfferComposer); this.item.serialize(this.response); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubCenterDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubCenterDataComposer.java index 64e4a3f0..2446637b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubCenterDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubCenterDataComposer.java @@ -1,17 +1,9 @@ package com.eu.habbo.messages.outgoing.catalog; -import com.eu.habbo.Emulator; -import com.eu.habbo.habbohotel.users.Habbo; -import com.eu.habbo.habbohotel.users.subscriptions.Subscription; -import com.eu.habbo.habbohotel.users.subscriptions.SubscriptionHabboClub; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Map; - public class ClubCenterDataComposer extends MessageComposer { public final int currentHcStreak; public final String firstSubDate; @@ -37,7 +29,7 @@ public class ClubCenterDataComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ClubCenterDataComposer); + this.response.init(Outgoing.ScrSendKickbackInfoMessageComposer); this.response.appendInt(this.currentHcStreak); // currentHcStreak (days) this.response.appendString(this.firstSubDate); // firstSubscriptionDate (dd-mm-yyyy) this.response.appendDouble(this.kickbackPercentage); // kickbackPercentage (e.g. 0.1 for 10%) diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/NotEnoughPointsTypeComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/NotEnoughPointsTypeComposer.java index ec20a8ae..eb56840f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/NotEnoughPointsTypeComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/NotEnoughPointsTypeComposer.java @@ -17,7 +17,7 @@ public class NotEnoughPointsTypeComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.NotEnoughPointsTypeComposer); + this.response.init(Outgoing.NotEnoughBalanceMessageComposer); this.response.appendBoolean(this.isCredits); this.response.appendBoolean(this.isPixels); this.response.appendInt(this.pointsType); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetBreedsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetBreedsComposer.java index a469dfa0..51d29a3d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetBreedsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetBreedsComposer.java @@ -19,7 +19,7 @@ public class PetBreedsComposer extends MessageComposer { protected ServerMessage composeInternal() { if (this.petRaces == null) return null; - this.response.init(Outgoing.PetBreedsComposer); + this.response.init(Outgoing.SellablePetPalettesMessageComposer); this.response.appendString(this.petName); this.response.appendInt(this.petRaces.size()); for (PetRace race : this.petRaces) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerCompleteComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerCompleteComposer.java index 54cfc606..239909ed 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerCompleteComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerCompleteComposer.java @@ -16,7 +16,7 @@ public class RecyclerCompleteComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RecyclerCompleteComposer); + this.response.init(Outgoing.RecyclerFinishedComposer); this.response.appendInt(this.code); this.response.appendInt(0); //prize ID. return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/RedeemVoucherOKComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/RedeemVoucherOKComposer.java index b1988773..2bbd7a45 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/RedeemVoucherOKComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/RedeemVoucherOKComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class RedeemVoucherOKComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RedeemVoucherOKComposer); + this.response.init(Outgoing.VoucherRedeemOkMessageComposer); this.response.appendString(""); this.response.appendString(""); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ReloadRecyclerComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ReloadRecyclerComposer.java index a6432eeb..9e4bec78 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ReloadRecyclerComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ReloadRecyclerComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class ReloadRecyclerComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ReloadRecyclerComposer); + this.response.init(Outgoing.RecyclerStatusComposer); this.response.appendInt(1); this.response.appendInt(0); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCancelSaleComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCancelSaleComposer.java index 97d24627..1a166ba1 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCancelSaleComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCancelSaleComposer.java @@ -16,7 +16,7 @@ public class MarketplaceCancelSaleComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.MarketplaceCancelSaleComposer); + this.response.init(Outgoing.MarketplaceCancelOfferResultComposer); this.response.appendInt(this.offer.getOfferId()); this.response.appendBoolean(this.success); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOwnItemsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOwnItemsComposer.java index b02c1c0e..fcd512c5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOwnItemsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOwnItemsComposer.java @@ -21,7 +21,7 @@ public class MarketplaceOwnItemsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.MarketplaceOwnItemsComposer); + this.response.init(Outgoing.MarketPlaceOwnOffersComposer); this.response.appendInt(this.habbo.getInventory().getSoldPriceTotal()); this.response.appendInt(this.habbo.getInventory().getMarketplaceItems().size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxPrizeComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxPrizeComposer.java index f5e95b3d..9ec347e9 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxPrizeComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxPrizeComposer.java @@ -15,7 +15,7 @@ public class MysticBoxPrizeComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.MysticBoxPrizeComposer); + this.response.init(Outgoing.GotMysteryBoxPrizeMessageComposer); this.response.appendString(this.type); this.response.appendInt(this.itemId); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionProgressComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionProgressComposer.java index c478f2e8..b3c1761b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionProgressComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionProgressComposer.java @@ -23,7 +23,7 @@ public class NewYearResolutionProgressComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.NewYearResolutionProgressComposer); + this.response.init(Outgoing.AchievementResolutionProgressMessageComposer); this.response.appendInt(this.stuffId); this.response.appendInt(this.achievementId); this.response.appendString(this.achievementName); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/FloorPlanEditorBlockedTilesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/FloorPlanEditorBlockedTilesComposer.java index 3cccbe14..138e4c34 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/FloorPlanEditorBlockedTilesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/FloorPlanEditorBlockedTilesComposer.java @@ -16,7 +16,7 @@ public class FloorPlanEditorBlockedTilesComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FloorPlanEditorBlockedTilesComposer); + this.response.init(Outgoing.RoomOccupiedTilesMessageComposer); THashSet tileList = this.room.getLockedTiles(); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterGameComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterGameComposer.java index 2d28e932..fd4823d2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterGameComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterGameComposer.java @@ -18,7 +18,7 @@ public class GameCenterGameComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GameCenterGameComposer); + this.response.init(Outgoing.GameStatusMessageComposer); this.response.appendInt(this.gameId); this.response.appendInt(this.status); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLoadGameComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLoadGameComposer.java index 99d4c66e..5a76ccab 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLoadGameComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLoadGameComposer.java @@ -19,7 +19,7 @@ public class BaseJumpLoadGameComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.BaseJumpLoadGameComposer); + this.response.init(Outgoing.LoadGameMessageComposer); if (this.game == 3) { this.response.appendInt(3); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericAlertComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericAlertComposer.java index 2b4d597a..5ca00df2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericAlertComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericAlertComposer.java @@ -18,7 +18,7 @@ public class GenericAlertComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GenericAlertComposer); + this.response.init(Outgoing.HabboBroadcastMessageComposer); this.response.appendString(this.message); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingResultComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingResultComposer.java index a0f50fc6..2c242311 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingResultComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingResultComposer.java @@ -20,7 +20,7 @@ public class GuardianVotingResultComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuardianVotingResultComposer); + this.response.init(Outgoing.ChatReviewSessionResultsMessageComposer); this.response.appendInt(this.ticket.getVerdict().getType()); //Final Verdict this.response.appendInt(this.vote.type.getType()); //Your vote diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionPartnerIsPlayingComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionPartnerIsPlayingComposer.java index 496368a7..a6f1f262 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionPartnerIsPlayingComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionPartnerIsPlayingComposer.java @@ -13,7 +13,7 @@ public class GuideSessionPartnerIsPlayingComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuideSessionPartnerIsPlayingComposer); + this.response.init(Outgoing.YouArePlayingGameMessageComposer); this.response.appendBoolean(this.isPlaying); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditFailComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditFailComposer.java index 17780d84..bc5b0004 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditFailComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditFailComposer.java @@ -18,7 +18,7 @@ public class GuildEditFailComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuildEditFailComposer); + this.response.init(Outgoing.GuildEditFailedMessageComposer); this.response.appendInt(this.errorCode); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFavoriteRoomUserUpdateComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFavoriteRoomUserUpdateComposer.java index 37df2118..91bf3ec9 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFavoriteRoomUserUpdateComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFavoriteRoomUserUpdateComposer.java @@ -17,7 +17,7 @@ public class GuildFavoriteRoomUserUpdateComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuildFavoriteRoomUserUpdateComposer); + this.response.init(Outgoing.FavoriteMembershipUpdateMessageComposer); this.response.appendInt(this.roomUnit.getId()); this.response.appendInt(this.guild != null ? this.guild.getId() : 0); this.response.appendInt(this.guild != null ? this.guild.getState().state : 3); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFurniWidgetComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFurniWidgetComposer.java index e4373209..8759dad3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFurniWidgetComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFurniWidgetComposer.java @@ -21,7 +21,7 @@ public class GuildFurniWidgetComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuildFurniWidgetComposer); + this.response.init(Outgoing.GuildFurniContextMenuInfoMessageComposer); this.response.appendInt(item.getId()); this.response.appendInt(this.guild.getId()); this.response.appendString(this.guild.getName()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildListComposer.java index 82965f0b..0cc82f50 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildListComposer.java @@ -19,7 +19,7 @@ public class GuildListComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuildListComposer); + this.response.init(Outgoing.GuildMembershipsMessageComposer); this.response.appendInt(this.guilds.size()); for (Guild guild : this.guilds) { this.response.appendInt(guild.getId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildManageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildManageComposer.java index 7983974b..95a33445 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildManageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildManageComposer.java @@ -14,7 +14,7 @@ public class GuildManageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuildManageComposer); + this.response.init(Outgoing.GuildEditInfoMessageComposer); this.response.appendInt(1); this.response.appendInt(guild.getRoomId()); this.response.appendString(guild.getRoomName()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumCommentsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumCommentsComposer.java index ecafc480..ea1118fd 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumCommentsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumCommentsComposer.java @@ -22,7 +22,7 @@ public class GuildForumCommentsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuildForumCommentsComposer); + this.response.init(Outgoing.ThreadMessagesMessageComposer); this.response.appendInt(this.guildId); //guild_id this.response.appendInt(this.threadId); //thread_id diff --git a/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserGiftComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserGiftComposer.java index ec2a8b49..d2731ec0 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserGiftComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserGiftComposer.java @@ -16,7 +16,7 @@ public class NewUserGiftComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.NewUserGiftComposer); + this.response.init(Outgoing.NewUserExperienceGiftOfferComposer); this.response.appendInt(this.options.size()); for (List option : this.options) { this.response.appendInt(1); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserIdentityComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserIdentityComposer.java index 13c03ace..6c722542 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserIdentityComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserIdentityComposer.java @@ -14,7 +14,7 @@ public class NewUserIdentityComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.NewUserIdentityComposer); + this.response.init(Outgoing.NoobnessLevelMessageComposer); this.response.appendInt(this.habbo.noobStatus()); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/handshake/EnableNotificationsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/handshake/EnableNotificationsComposer.java index 575cd174..2a7085c7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/handshake/EnableNotificationsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/handshake/EnableNotificationsComposer.java @@ -13,7 +13,7 @@ public class EnableNotificationsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.EnableNotificationsComposer); + this.response.init(Outgoing.InfoFeedEnableMessageComposer); this.response.appendBoolean(this.enabled); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/handshake/PingComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/handshake/PingComposer.java index a8300686..1eae57d6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/handshake/PingComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/handshake/PingComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class PingComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PingComposer); + this.response.init(Outgoing.PingMessageComposer); return this.response; } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewNextLTDAvailableComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewNextLTDAvailableComposer.java index d922cebf..6ea30882 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewNextLTDAvailableComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewNextLTDAvailableComposer.java @@ -19,7 +19,7 @@ public class HotelViewNextLTDAvailableComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.HotelViewNextLTDAvailableComposer); + this.response.init(Outgoing.LimitedOfferAppearingNextMessageComposer); this.response.appendInt(this.time); this.response.appendInt(this.pageId); this.response.appendInt(this.itemId); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewSecondsUntilComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewSecondsUntilComposer.java index 91538dcc..485fec01 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewSecondsUntilComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewSecondsUntilComposer.java @@ -15,7 +15,7 @@ public class HotelViewSecondsUntilComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.HotelViewSecondsUntilComposer); + this.response.init(Outgoing.SecondsUntilMessageComposer); this.response.appendString(this.dateString); this.response.appendInt(this.seconds); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryPetsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryPetsComposer.java index a0f97408..9f8ec284 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryPetsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryPetsComposer.java @@ -18,7 +18,7 @@ public class InventoryPetsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.InventoryPetsComposer); + this.response.init(Outgoing.PetInventoryComposer); this.response.appendInt(1); this.response.appendInt(1); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemovePetComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemovePetComposer.java index af495d2e..3d7cd3b6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemovePetComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemovePetComposer.java @@ -14,7 +14,7 @@ public class RemovePetComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RemovePetComposer); + this.response.init(Outgoing.PetRemovedFromInventoryComposer); this.response.appendInt(this.petId); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/UserEffectsListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/UserEffectsListComposer.java index 13e42b52..f68e7d1b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/UserEffectsListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/UserEffectsListComposer.java @@ -21,7 +21,7 @@ public class UserEffectsListComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UserEffectsListComposer); + this.response.init(Outgoing.AvatarEffectsMessageComposer); if (this.habbo == null || this.habbo.getInventory() == null || this.habbo.getInventory().getEffectsComponent() == null || this.habbo.getInventory().getEffectsComponent().effects == null) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportRequestComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportRequestComposer.java index 9d648542..5f0b4dd9 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportRequestComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportRequestComposer.java @@ -20,7 +20,7 @@ public class BullyReportRequestComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.BullyReportRequestComposer); + this.response.init(Outgoing.GuideReportingStatusMessageComposer); this.response.appendInt(this.errorCode); if (this.errorCode == ONGOING_HELPER_CASE) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportedMessageComposer.java index bca14d5c..129df101 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportedMessageComposer.java @@ -19,7 +19,7 @@ public class BullyReportedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.BullyReportedMessageComposer); + this.response.init(Outgoing.GuideTicketCreationResultMessageComposer); this.response.appendInt(this.code); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/CfhTopicsMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/CfhTopicsMessageComposer.java index 5a7f3eea..935044cc 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/CfhTopicsMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/CfhTopicsMessageComposer.java @@ -11,7 +11,7 @@ import gnu.trove.procedure.TObjectProcedure; public class CfhTopicsMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CfhTopicsMessageComposer); + this.response.init(Outgoing.CfhTopicsInitComposer); this.response.appendInt(Emulator.getGameEnvironment().getModToolManager().getCfhCategories().valueCollection().size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueInfoComposer.java index 6abe7b2e..7a5a65a3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueInfoComposer.java @@ -14,7 +14,7 @@ public class ModToolIssueInfoComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ModToolIssueInfoComposer); + this.response.init(Outgoing.IssueInfoMessageComposer); this.issue.serialize(this.response); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueResponseAlertComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueResponseAlertComposer.java index 3be76632..1ae656c3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueResponseAlertComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueResponseAlertComposer.java @@ -13,7 +13,7 @@ public class ModToolIssueResponseAlertComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ModToolIssueResponseAlertComposer); + this.response.init(Outgoing.CallForHelpReplyMessageComposer); this.response.appendString(this.message); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolReportReceivedAlertComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolReportReceivedAlertComposer.java index 6f6315e8..a5062fc5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolReportReceivedAlertComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolReportReceivedAlertComposer.java @@ -19,7 +19,7 @@ public class ModToolReportReceivedAlertComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ModToolReportReceivedAlertComposer); + this.response.init(Outgoing.CallForHelpResultMessageComposer); this.response.appendInt(this.errorCode); this.response.appendString(this.message); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolRoomChatlogComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolRoomChatlogComposer.java index 50ec9796..9ac9503d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolRoomChatlogComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolRoomChatlogComposer.java @@ -21,7 +21,7 @@ public class ModToolRoomChatlogComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ModToolRoomChatlogComposer); + this.response.init(Outgoing.RoomChatlogComposer); this.response.appendByte(1); this.response.appendShort(2); this.response.appendString("roomName"); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserChatlogComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserChatlogComposer.java index 19ed914d..98eeae6a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserChatlogComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserChatlogComposer.java @@ -23,7 +23,7 @@ public class ModToolUserChatlogComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ModToolUserChatlogComposer); + this.response.init(Outgoing.UserChatlogComposer); this.response.appendInt(this.userId); this.response.appendString(this.username); this.response.appendInt(this.set.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorEventCategoriesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorEventCategoriesComposer.java index 8537682d..7e382038 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorEventCategoriesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorEventCategoriesComposer.java @@ -13,7 +13,7 @@ public class NewNavigatorEventCategoriesComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.NewNavigatorEventCategoriesComposer); + this.response.init(Outgoing.UserEventCatsComposer); this.response.appendInt(NewNavigatorEventCategoriesComposer.CATEGORIES.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSavedSearchesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSavedSearchesComposer.java index 2f613c69..2cd6a70d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSavedSearchesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSavedSearchesComposer.java @@ -5,7 +5,6 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -import java.util.HashSet; import java.util.List; public class NewNavigatorSavedSearchesComposer extends MessageComposer { @@ -17,7 +16,7 @@ public class NewNavigatorSavedSearchesComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.NewNavigatorSavedSearchesComposer); + this.response.init(Outgoing.NavigatorSavedSearchesComposer); this.response.appendInt(this.searches.size()); for (NavigatorSavedSearch search : this.searches) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/polls/PollStartComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/polls/PollStartComposer.java index 3486d2f6..caa5762e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/polls/PollStartComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/polls/PollStartComposer.java @@ -14,7 +14,7 @@ public class PollStartComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PollStartComposer); + this.response.init(Outgoing.PollOfferComposer); this.response.appendInt(this.poll.id); this.response.appendString(this.poll.title); this.response.appendString(this.poll.thanksMessage); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestsComposer.java index 60d877e3..bb792721 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestsComposer.java @@ -18,7 +18,7 @@ public class QuestsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.QuestsComposer); + this.response.init(Outgoing.QuestsMessageComposer); this.response.appendInt(this.quests.size()); for (Quest quest : this.quests) { this.response.append(quest); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/HideDoorbellComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/HideDoorbellComposer.java index e9a49ee7..85b2469b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/HideDoorbellComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/HideDoorbellComposer.java @@ -13,7 +13,7 @@ public class HideDoorbellComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.HideDoorbellComposer); + this.response.init(Outgoing.FlatAccessibleMessageComposer); this.response.appendString(this.username); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomOwnerComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomOwnerComposer.java index ccdc6316..980900f2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomOwnerComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomOwnerComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class RoomOwnerComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomOwnerComposer); + this.response.init(Outgoing.YouAreOwnerMessageComposer); return this.response; } } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomScoreComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomScoreComposer.java index e3e7eb7d..e5f93dd0 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomScoreComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomScoreComposer.java @@ -15,7 +15,7 @@ public class RoomScoreComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomScoreComposer); + this.response.init(Outgoing.RoomRatingComposer); this.response.appendInt(this.score); this.response.appendBoolean(this.canVote); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsUpdatedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsUpdatedComposer.java index 7e1041b6..14f070b8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsUpdatedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsUpdatedComposer.java @@ -14,7 +14,7 @@ public class RoomSettingsUpdatedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomSettingsUpdatedComposer); + this.response.init(Outgoing.RoomInfoUpdatedComposer); this.response.appendInt(this.room.getId()); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomThicknessComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomThicknessComposer.java index 9a1c9ea0..4710f9f7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomThicknessComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomThicknessComposer.java @@ -14,7 +14,7 @@ public class RoomThicknessComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomThicknessComposer); + this.response.init(Outgoing.RoomVisualizationSettingsComposer); this.response.appendBoolean(this.room.isHideWall()); this.response.appendInt(this.room.getWallSize()); this.response.appendInt(this.room.getFloorSize()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/FloorItemUpdateComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/FloorItemUpdateComposer.java index df9cf6f2..c167a03f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/FloorItemUpdateComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/FloorItemUpdateComposer.java @@ -16,7 +16,7 @@ public class FloorItemUpdateComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FloorItemUpdateComposer); + this.response.init(Outgoing.ObjectUpdateMessageComposer); this.item.serializeFloorData(this.response); this.response.appendInt(this.item instanceof InteractionGift ? ((((InteractionGift) this.item).getColorId() * 1000) + ((InteractionGift) this.item).getRibbonId()) : (this.item instanceof InteractionMusicDisc ? ((InteractionMusicDisc) this.item).getSongId() : item.isUsable() ? 0 : 0)); this.item.serializeExtradata(this.response); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemIntStateComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemIntStateComposer.java index af739f27..4edfbed5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemIntStateComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemIntStateComposer.java @@ -15,7 +15,7 @@ public class ItemIntStateComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ItemStateComposer2); + this.response.init(Outgoing.DiceValueMessageComposer); this.response.appendInt(this.id); this.response.appendInt(this.value); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxNowPlayingMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxNowPlayingMessageComposer.java index 9e8f0c64..6a8db90b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxNowPlayingMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxNowPlayingMessageComposer.java @@ -18,7 +18,7 @@ public class JukeBoxNowPlayingMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.JukeBoxNowPlayingMessageComposer); + this.response.init(Outgoing.NowPlayingMessageComposer); if (this.track != null) { this.response.appendInt(this.track.getId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListComposer.java index 29c82b72..200f9097 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListComposer.java @@ -18,7 +18,7 @@ public class JukeBoxPlayListComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.JukeBoxPlayListComposer); + this.response.init(Outgoing.JukeboxSongDisksMessageComposer); this.response.appendInt(this.totalLength); //Dunno //TODO Total play length? this.response.appendInt(this.songs.size()); for (InteractionMusicDisc soundTrack : this.songs) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxTrackDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxTrackDataComposer.java index 77fbb08e..92015e96 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxTrackDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxTrackDataComposer.java @@ -16,7 +16,7 @@ public class JukeBoxTrackDataComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.JukeBoxTrackDataComposer); + this.response.init(Outgoing.TraxSongInfoMessageComposer); this.response.appendInt(this.tracks.size()); for (SoundTrack track : this.tracks) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniFriendConfirmedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniFriendConfirmedComposer.java index 660fbe95..592520e5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniFriendConfirmedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniFriendConfirmedComposer.java @@ -14,7 +14,7 @@ public class LoveLockFurniFriendConfirmedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.LoveLockFurniFriendConfirmedComposer); + this.response.init(Outgoing.FriendFurniOtherLockConfirmedMessageComposer); this.response.appendInt(this.loveLock.getId()); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniStartComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniStartComposer.java index 20cb7c90..d5149bc6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniStartComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniStartComposer.java @@ -14,7 +14,7 @@ public class LoveLockFurniStartComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.LoveLockFurniStartComposer); + this.response.init(Outgoing.FriendFurniStartConfirmationMessageComposer); this.response.appendInt(this.loveLock.getId()); this.response.appendBoolean(true); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceInfoComposer.java index cbefc155..037290ec 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceInfoComposer.java @@ -42,7 +42,7 @@ public class RentableSpaceInfoComposer extends MessageComposer { if (!(this.item instanceof InteractionRentableSpace)) return null; - this.response.init(Outgoing.RentableSpaceInfoComposer); + this.response.init(Outgoing.RentableSpaceStatusMessageComposer); this.response.appendBoolean(((InteractionRentableSpace) this.item).isRented()); //In Use this.response.appendInt(this.errorCode); //Error code. this.response.appendInt(((InteractionRentableSpace) this.item).getRenterId()); //User ID diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetComposer.java index c515a694..56e52bca 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetComposer.java @@ -22,7 +22,7 @@ public class RoomPetComposer extends MessageComposer implements TIntObjectProced @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomUsersComposer); + this.response.init(Outgoing.UsersComposer); this.response.appendInt(this.pets.size()); this.pets.forEachEntry(this); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserDataComposer.java index 322a7ac7..3ced4383 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserDataComposer.java @@ -14,7 +14,7 @@ public class RoomUserDataComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomUserDataComposer); + this.response.init(Outgoing.UserChangeMessageComposer); this.response.appendInt(this.habbo.getRoomUnit() == null ? -1 : this.habbo.getRoomUnit().getId()); this.response.appendString(this.habbo.getHabboInfo().getLook()); this.response.appendString(this.habbo.getHabboInfo().getGender().name() + ""); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserReceivedHandItemComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserReceivedHandItemComposer.java index 121ca4ea..f8fe427f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserReceivedHandItemComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserReceivedHandItemComposer.java @@ -16,7 +16,7 @@ public class RoomUserReceivedHandItemComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomUserReceivedHandItemComposer); + this.response.init(Outgoing.HandItemReceivedMessageComposer); this.response.appendInt(this.from.getId()); this.response.appendInt(this.handItem); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserUnbannedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserUnbannedComposer.java index 8390e131..9069b77f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserUnbannedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserUnbannedComposer.java @@ -16,7 +16,7 @@ public class RoomUserUnbannedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomUserUnbannedComposer); + this.response.init(Outgoing.UserUnbannedFromRoomComposer); this.response.appendInt(this.room.getId()); this.response.appendInt(this.userId); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersComposer.java index 4b53f9c6..dce83f2a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersComposer.java @@ -34,7 +34,7 @@ public class RoomUsersComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomUsersComposer); + this.response.init(Outgoing.UsersComposer); if (this.habbo != null) { this.response.appendInt(1); this.response.appendInt(this.habbo.getHabboInfo().getId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/CloseWebPageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/CloseWebPageComposer.java index a5b22a21..d8cd0f18 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/CloseWebPageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/CloseWebPageComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class CloseWebPageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CloseWebPageComposer); + this.response.init(Outgoing.RestoreClientMessageComposer); //Empty body return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/EpicPopupFrameComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/EpicPopupFrameComposer.java index 0fc2e05e..b958fdd3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/EpicPopupFrameComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/EpicPopupFrameComposer.java @@ -14,7 +14,7 @@ public class EpicPopupFrameComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.EpicPopupFrameComposer); + this.response.init(Outgoing.EpicPopupMessageComposer); this.response.appendString(this.assetURI); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ErrorLoginComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ErrorLoginComposer.java index 80546dd3..95517eff 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ErrorLoginComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ErrorLoginComposer.java @@ -13,7 +13,7 @@ public class ErrorLoginComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ErrorLoginComposer); + this.response.init(Outgoing.DisconnectReasonComposer); this.response.appendInt(this.errorCode); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ExtendClubMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ExtendClubMessageComposer.java index 8225c519..271f23dc 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ExtendClubMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ExtendClubMessageComposer.java @@ -25,7 +25,7 @@ public class ExtendClubMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ExtendClubMessageComposer); + this.response.init(Outgoing.HabboClubExtendOfferMessageComposer); this.offer.serialize(this.response, this.habbo.getHabboStats().getClubExpireTimestamp()); this.response.appendInt(this.normalCreditCost); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RemoveRoomEventComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RemoveRoomEventComposer.java index 1f052d53..fbd8985a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RemoveRoomEventComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RemoveRoomEventComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class RemoveRoomEventComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RemoveRoomEventComposer); + this.response.init(Outgoing.RoomEventCancelComposer); //Empty Body return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RentableItemBuyOutPriceComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RentableItemBuyOutPriceComposer.java index 75b5f6db..6e150c38 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RentableItemBuyOutPriceComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RentableItemBuyOutPriceComposer.java @@ -23,7 +23,7 @@ public class RentableItemBuyOutPriceComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RentableItemBuyOutPriceComposer); + this.response.init(Outgoing.FurniRentOrBuyoutOfferMessageComposer); this.response.appendBoolean(this.unknownBoolean1); this.response.appendString(this.unknownString1); this.response.appendBoolean(this.unknownBoolean2); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomCategoryUpdateMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomCategoryUpdateMessageComposer.java index a726d903..4a53c073 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomCategoryUpdateMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomCategoryUpdateMessageComposer.java @@ -13,7 +13,7 @@ public class RoomCategoryUpdateMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomCategoryUpdateMessageComposer); + this.response.init(Outgoing.ShowEnforceRoomCategoryDialogComposer); this.response.appendInt(this.unknownInt1); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownAvatarEditorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownAvatarEditorComposer.java index 5ff0d0c5..64bba946 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownAvatarEditorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownAvatarEditorComposer.java @@ -13,7 +13,7 @@ public class UnknownAvatarEditorComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UnknownAvatarEditorComposer); + this.response.init(Outgoing.AvatarEffectSelectedMessageComposer); this.response.appendInt(this.type); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownCompetitionComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownCompetitionComposer.java index 903e322c..232a730f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownCompetitionComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownCompetitionComposer.java @@ -19,7 +19,7 @@ public class UnknownCompetitionComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UnknownCompetitionComposer); + this.response.init(Outgoing.CompetitionVotingInfoMessageComposer); this.response.appendInt(this.unknownInt1); this.response.appendString(this.unknownString1); this.response.appendInt(this.unknownInt2); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownComposer8.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownComposer8.java index 99417c98..b66880fa 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownComposer8.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownComposer8.java @@ -17,7 +17,7 @@ public class UnknownComposer8 extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UnknownComposer8); + this.response.init(Outgoing.PetSupplementedNotificationComposer); this.response.appendInt(this.unknownInt1); this.response.appendInt(this.userId); this.response.appendInt(this.unknownInt2); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownMessengerErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownMessengerErrorComposer.java index 5f62eecd..6eefc7a7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownMessengerErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownMessengerErrorComposer.java @@ -17,7 +17,7 @@ public class UnknownMessengerErrorComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UnknownMessengerErrorComposer); + this.response.init(Outgoing.InstantMessageErrorComposer); this.response.appendInt(this.errorCode); this.response.appendInt(this.userId); this.response.appendString(this.message); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownRoomViewerComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownRoomViewerComposer.java index 703a08e6..70dc98a4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownRoomViewerComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownRoomViewerComposer.java @@ -15,7 +15,7 @@ public class UnknownRoomViewerComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UnknownRoomViewerComposer); + this.response.init(Outgoing.IdentityAccountsComposer); this.response.appendInt(this.unknownMap.size()); for (Map.Entry entry : this.unknownMap.entrySet()) { this.response.appendInt(entry.getKey()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/MeMenuSettingsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/MeMenuSettingsComposer.java index 73b2d1d9..e61c7bf8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/MeMenuSettingsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/MeMenuSettingsComposer.java @@ -14,7 +14,7 @@ public class MeMenuSettingsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.MeMenuSettingsComposer); + this.response.init(Outgoing.AccountPreferencesComposer); this.response.appendInt(this.habbo.getHabboStats().volumeSystem); this.response.appendInt(this.habbo.getHabboStats().volumeFurni); this.response.appendInt(this.habbo.getHabboStats().volumeTrax); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserCreditsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserCreditsComposer.java index 70c89ae6..341fd946 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserCreditsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserCreditsComposer.java @@ -14,7 +14,7 @@ public class UserCreditsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UserCreditsComposer); + this.response.init(Outgoing.CreditBalanceComposer); this.response.appendString(this.habbo.getHabboInfo().getCredits() + ".0"); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserPermissionsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserPermissionsComposer.java index d7c5809e..9091c803 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserPermissionsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserPermissionsComposer.java @@ -18,7 +18,7 @@ public class UserPermissionsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UserPermissionsComposer); + this.response.init(Outgoing.UserRightsMessageComposer); this.response.appendInt(this.clubLevel); this.response.appendInt(this.habbo.getHabboInfo().getRank().getLevel()); this.response.appendBoolean(this.habbo.hasPermission(Permission.ACC_AMBASSADOR)); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserProfileComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserProfileComposer.java index 7a535652..402f6f26 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserProfileComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserProfileComposer.java @@ -44,7 +44,7 @@ public class UserProfileComposer extends MessageComposer { if (this.habboInfo == null) return null; - this.response.init(Outgoing.UserProfileComposer); + this.response.init(Outgoing.ExtendedProfileMessageComposer); this.response.appendInt(this.habboInfo.getId()); this.response.appendString(this.habboInfo.getUsername()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserWardrobeComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserWardrobeComposer.java index 912fab51..f017f356 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserWardrobeComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserWardrobeComposer.java @@ -14,7 +14,7 @@ public class UserWardrobeComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UserWardrobeComposer); + this.response.init(Outgoing.WardrobeMessageComposer); this.response.appendInt(1); this.response.appendInt(this.wardrobeComponent.getLooks().size()); for (WardrobeComponent.WardrobeItem wardrobeItem : this.wardrobeComponent.getLooks().values()) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobileNumberComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobileNumberComposer.java index c763d4b1..5df6b68c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobileNumberComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobileNumberComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class VerifyMobileNumberComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.VerifyMobileNumberComposer); + this.response.init(Outgoing.NewUserExperienceNotCompleteComposer); return this.response; } } \ No newline at end of file