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 b8bb11ce..05fa9758 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/Outgoing.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/Outgoing.java @@ -41,20 +41,20 @@ public class Outgoing { public final static int CloseConnectionMessageComposer = 122; public final static int FriendListUpdateComposer = 2800; public final static int ObjectUpdateMessageComposer = 3776; - public final static int RoomAccessDeniedComposer = 878; + public final static int FlatAccessDeniedMessageComposer = 878; public final static int GuildFurniContextMenuInfoMessageComposer = 3293; public final static int GiftWrappingConfigurationComposer = 2234; - public final static int UserClubComposer = 954; - public final static int InventoryBadgesComposer = 717; + public final static int ScrSendUserInfoComposer = 954; + public final static int BadgesComposer = 717; public final static int UserTypingMessageComposer = 1717; - public final static int GuildJoinErrorComposer = 762; + public final static int HabboGroupJoinFailedMessageComposer = 762; public final static int UserFlatCatsComposer = 1562; public final static int BadgePointLimitsComposer = 2501; - public final static int MarketplaceItemInfoComposer = 725; + public final static int MarketplaceItemStatsComposer = 725; public final static int HeightMapComposer = 2753; public final static int ModeratorActionResultMessageComposer = 2335; public final static int IssueDeletedMessageComposer = 3192; - public final static int RoomRightsComposer = 780; + public final static int YouAreControllerMessageComposer = 780; public final static int SlideObjectBundleMessageComposer = 3207; public final static int PollOfferComposer = 3785; public final static int GuildMembershipRejectedMessageComposer = 2445; @@ -68,7 +68,7 @@ public class Outgoing { public final static int InitDiffieHandshakeComposer = 1347; public final static int CompleteDiffieHandshakeComposer = 3885; public final static int UserObjectComposer = 2725; - public final static int UserSearchResultComposer = 973; + public final static int HabboSearchResultComposer = 973; public final static int RoomVisitsComposer = 1752; public final static int RoomUserRespectComposer = 2815; public final static int RoomChatSettingsMessageComposer = 1191; @@ -79,7 +79,7 @@ public class Outgoing { 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 GuestRoomSearchResultComposer = 52; public final static int RoomReadyMessageComposer = 2031; public final static int RoomRatingComposer = 482; public final static int DoorbellMessageComposer = 2309; @@ -87,7 +87,7 @@ public class Outgoing { public final static int AvailabilityStatusMessageComposer = 2033; public final static int GuildMembershipUpdatedMessageComposer = 265; public final static int ObjectsMessageComposer = 1778; - public final static int InventoryItemsComposer = 994; + public final static int FurniListComposer = 994; public final static int ChatMessageComposer = 1446; public final static int TradingOpenComposer = 2505; public final static int FurniListAddOrUpdateComposer = 104; @@ -101,7 +101,7 @@ public class Outgoing { 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 GetGuestRoomResultComposer = 687; public final static int PopularRoomTagsResultComposer = 2012; public final static int FurniListInvalidateComposer = 3151; public final static int PetRemovedFromInventoryComposer = 3253; @@ -113,7 +113,7 @@ public class Outgoing { 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 CatalogPageMessageComposer = 804; public final static int BuildersClubFurniCountMessageComposer = 3828; public final static int ChangeUserNameResultMessageEvent = 118; public final static int ObjectAddMessageComposer = 1534; @@ -123,9 +123,10 @@ public class Outgoing { public final static int RoomPropertyMessageComposer = 2454; public final static int MarketplaceConfigurationComposer = 1823; public final static int BotAddedToInventoryComposer = 1352; - public final static int FriendRequestErrorComposer = 892; + public final static int IsOfferGiftableMessageComposer = 761;//todo? + public final static int MessengerErrorComposer = 892; public final static int GuildMembersComposer = 1200; - public final static int RoomOpenComposer = 758; + public final static int OpenConnectionMessageComposer = 758; public final static int RoomChatlogComposer = 3434; public final static int BundleDiscountRulesetMessageComposer = 2347; public final static int MarketplaceCancelOfferResultComposer = 3264; @@ -135,18 +136,19 @@ public class Outgoing { public final static int CatalogPagesListComposer = 1032; public final static int LimitedEditionSoldOutComposer = 377; public final static int CatalogPublishedMessageComposer = 1866; - public final static int PurchaseOKComposer = 869; + public final static int PurchaseOKMessageComposer = 869; public final static int ItemUpdateMessageComposer = 2009; public final static int TradingAcceptComposer = 2568; public final static int ItemAddMessageComposer = 2187; public final static int RoomEntryInfoComposer = -1; public final static int CurrentTimingCodeMessageComposer = 1745; - public final static int PresentItemOpenedComposer = 56; - public final static int RoomUserRemoveRightsComposer = 84; + public final static int PresentOpenedMessageComposer = 56; + public final static int NoSuchFlatComposer = 84; + public final static int Game2InArenaQueueMessageComposer = 872; public final static int UserBCLimitsComposer = -1; public final static int PetTrainingPanelComposer = 1164; - public final static int RoomPaneComposer = 749; - public final static int RedeemVoucherErrorComposer = 714; + public final static int RoomEntryInfoMessageComposer = 749; + public final static int VoucherRedeemErrorMessageComposer = 714; public final static int FlatCreatedComposer = 1304; public final static int HabboBroadcastMessageComposer = 3801; public final static int GuildEditorDataMessageComposer = 2238; @@ -155,7 +157,7 @@ public class Outgoing { public final static int BotErrorComposer = 639; public final static int GamePlayerValueMessageComposer = 2324; public final static int FriendRequestsComposer = 280; - public final static int MarketplaceSellItemComposer = 54; + public final static int MarketplaceCanMakeOfferResult = 54; public final static int HabboClubOffersMessageComposer = 2405; public final static int RelationshipStatusInfoComposer = 2016; public final static int MarketPlaceOwnOffersComposer = 3884; @@ -168,25 +170,26 @@ public class Outgoing { public final static int PetInfoMessageComposer = 2901; public final static int RoomVisualizationSettingsComposer = 3547; public final static int PetAddedToInventoryComposer = 2101; - public final static int UpdateStackHeightComposer = 558; + public final static int HeightMapUpdateMessageComposer = 558; public final static int BotRemovedFromInventoryComposer = 233; - public final static int RoomEnterErrorComposer = 899; + public final static int CantConnectMessageComposer = 899; public final static int PollContentsComposer = 2997; public final static int GenericErrorComposer = 1600; + public final static int AvailabilityTimeMessageComposer = 600;//todo? public final static int ItemsComposer = 1369; public final static int AvatarEffectMessageComposer = 1167; public final static int SellablePetPalettesMessageComposer = 3331; - public final static int ModToolIssueChatlogComposer = 607; + public final static int CfhChatlogComposer = 607; public final static int ExpressionMessageComposer = 1631; public final static int BotCommandConfigurationComposer = 1618; public final static int ExtendedProfileMessageComposer = 3898; public final static int MiniMailUnreadCountComposer = 2803; public final static int AchievementsScoreComposer = 1968; - public final static int PetLevelUpComposer = 859; + public final static int PetLevelNotificationComposer = 859; public final static int HabboActivityPointNotificationMessageComposer = 2275; public final static int CallForHelpPendingCallsMessageComposer = 1121; - public final static int ModToolIssueHandledComposer = 934; - public final static int FloodCounterComposer = 566; + public final static int IssueCloseNotificationMessageComposer = 934; + public final static int FloodControlMessageComposer = 566; public final static int WiredValidationErrorComposer = 156; public final static int RoomEntryTileMessageComposer = 1664; public final static int RoomOccupiedTilesMessageComposer = 3990; @@ -205,8 +208,8 @@ public class Outgoing { public final static int CallForHelpReplyMessageComposer = 3796; public final static int AchievementsComposer = 305; public final static int AchievementComposer = 2107; - public final static int AchievementUnlockedComposer = 806; - public final static int ClubGiftsComposer = 619; + public final static int HabboAchievementNotificationMessageComposer = 806; + public final static int ClubGiftInfoComposer = 619; public final static int UniqueMachineIDComposer = 1488; public final static int LatencyPingResponseMessageComposer = 10; public final static int ModeratorToolPreferencesComposer = 1576; @@ -216,8 +219,8 @@ public class Outgoing { 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 MysteryBoxStartComposer = 3201; + public final static int MysteryBoxClosingComposer = 596; public final static int GotMysteryBoxPrizeMessageComposer = 3712; public final static int RentableSpaceStatusMessageComposer = 3559; public final static int RentableSpaceRentOkMessageComposer = 2046; @@ -231,12 +234,12 @@ public class Outgoing { public final static int RoomInviteErrorComposer = 462; public final static int RequestSpamWallPostItMessageComposer = 2366; public final static int AchievementResolutionProgressMessageComposer = 3370; - public final static int ClubGiftReceivedComposer = 659; + public final static int ClubGiftSelectedComposer = 659; public final static int OneWayDoorStatusMessageComposer = 2376; public final static int ObjectDataUpdateMessageComposer = 2547; public final static int UpdateMessageMessageComposer = 324; public final static int QuestionInfoComposer = -1; - public final static int TalentTrackEmailVerifiedComposer = 612; + public final static int EmailStatusResultComposer = 612; public final static int ChangeEmailResultComposer = 1815; public final static int AvatarEffectSelectedMessageComposer = 3473; public final static int GroupMembershipRequestedMessageComposer = 1180; @@ -252,13 +255,13 @@ public class Outgoing { public final static int GuideSessionDetachedMessageComposer = 138; public final static int GuideSessionStartedComposer = 3209; public final static int GuideSessionEndedMessageComposer = 1456; - public final static int GuideSessionErrorComposer = 673; - public final static int GuideSessionMessageComposer = 841; + public final static int GuideSessionErrorMessageComposer = 673; + public final static int GuideSessionMessageMessageComposer = 841; public final static int GuideSessionRequesterRoomMessageComposer = 1847; public final static int GuideSessionInvitedToGuideRoomMessageComposer = 219; public final static int GuideSessionPartnerIsTypingComposer = 1016; public final static int GuideOnDutyStatusMessageComposer = 1548; - public final static int GuardianNewReportReceivedComposer = 735; + public final static int ChatReviewSessionOfferedToGuideMessageComposer = 735; public final static int ChatReviewSessionStartedMessageComposer = 143; public final static int ChatReviewSessionVotingStatusMessageComposer = 1829; public final static int ChatReviewSessionResultsMessageComposer = 3276; @@ -302,51 +305,51 @@ public class Outgoing { public final static int UserNameChangedMessageComposer = 2182; 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 FriendFurniCancelLockMessageComposer = 770; + public final static int OpenPetPackageResultMessageComposer = 546; public final static int WeeklyGameRewardWinnersComposer = 3097; public final static int TargetedOfferNotFoundComposer = 1237; public final static int TargetedOfferComposer = 119; public final static int OpenPetPackageRequestedMessageComposer = 2380; public final static int PhoneCollectionStateMessageComposer = 2890; - public final static int VerifyMobilePhoneCodeWindowComposer = 800; - public final static int VerifyMobilePhoneDoneComposer = 91; + public final static int TryPhoneNumberResultMessageComposer = 800; + public final static int TryVerificationCodeResultMessageComposer = 91; public final static int HandItemReceivedMessageComposer = 354; - public final static int MutedWhisperComposer = 826; + public final static int RemainingMutePeriodComposer = 826; public final static int ElementPointerMessageComposer = 1787; public final static int GuideTicketResolutionMessageComposer = 2674; public final static int RoomAdPurchaseInfoComposer = 2468; public final static int NotEnoughBalanceMessageComposer = 3914; public final static int OfferRewardDeliveredMessageComposer = 2125; - public final static int NewYearResolutionComposer = 66; + public final static int AchievementResolutionsMessageComposer = 66; public final static int WelcomeGiftChangeEmailResultComposer = 2293; public final static int FurniRentOrBuyoutOfferMessageComposer = 35; public final static int CitizenshipVipOfferPromoEnabledComposer = 2278; public final static int CategoriesWithVisitorCountComposer = 1455; public final static int ThumbnailStatusMessageComposer = 3595; public final static int RoomSettingsSaveErrorComposer = 1555; - public final static int GuildAcceptMemberErrorComposer = 818; - public final static int MostUselessErrorAlertComposer = 662; + public final static int GuildMemberMgmtFailedMessageComposer = 818; + public final static int PollErrorComposer = 662; public final static int GameAchievementsMessageComposer = 1689; public final static int ConfirmBreedingRequestComposer = 634; public final static int RoomUserQuestionAnsweredComposer = -1; public final static int PetBreedingComposer = 1746; - public final static int CustomNotificationComposer = 909; + public final static int CustomUserNotificationMessageComposer = 909; public final static int UpdateStackHeightTileHeightComposer = 2816; public final static int HotelViewCustomTimerComposer = -1; public final static int MarketplaceMakeOfferResult = 1359; public final static int QuizDataMessageComposer = 2927; public final static int FavoriteMembershipUpdateMessageComposer = 3403; public final static int RoomAdErrorComposer = 1759; - public final static int NewNavigatorSettingsComposer = 518; + public final static int NewNavigatorPreferencesComposer = 518; public final static int CameraPublishStatusMessageComposer = 2057; public final static int RoomInviteComposer = 3870; public final static int GuideReportingStatusMessageComposer = 3463; public final static int CameraSnapshotMessageComposer = 463; // todo? - public final static int UnknownHelperComposer = 77; + public final static int CallForHelpPendingCallsDeletedMessageComposer = 77; public final static int CallForHelpDisabledNotifyMessageComposer = 1651; public final static int SleepMessageComposer = 1797; - public final static int QuestCompletedComposer = 949; + public final static int QuestCompletedMessageComposer = 949; public final static int FurnitureAliasesMessageComposer = 1723; public final static int RoomForwardMessageComposer = 160; public final static int AvatarEffectActivatedMessageComposer = 1959; @@ -357,16 +360,16 @@ public class Outgoing { 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 TalentLevelUpComposer = 638; 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 AcceptFriendResultComposer = 896; public final static int InitCameraMessageComposer = 3878; public final static int NestBreedingSuccessComposer = 2527; public final static int UserUnbannedFromRoomComposer = 3429; public final static int CommunityGoalProgressMessageComposer = 2525; - public final static int UserClassificationComposer = 966; + public final static int UserClassificationMessageComposer = 966; public final static int CanCreateRoomEventComposer = 2599; public final static int GroupDetailsChangedMessageComposer = 1459; public final static int YoutubeDisplayPlaylistsComposer = 1112; @@ -403,7 +406,7 @@ public class Outgoing { public final static int BotForceOpenContextMenuComposer = 296; public final static int FaqSearchResultsMessageComposer = 1551; //todo public final static int Game2WeeklyLeaderboardComposer = 2196; - public final static int UnknownComposer_1165 = 904; + public final static int GameInviteMessageComposer = 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 IsUserPartOfCompetitionMessageComposer = 3841; @@ -418,7 +421,7 @@ public class Outgoing { public final static int CampaignCalendarDataMessageComposer = 2531; public final static int CompetitionRoomsDataMessageComposer = 3954; public final static int WeeklyGameRewardComposer = 2641; - public final static int NewYearResolutionCompletedComposer = 740; + public final static int AchievementResolutionCompletedMessageComposer = 740; public final static int Game2GameDirectoryStatusMessageComposer = 2246; //todo? public final static int TradingNoSuchItemComposer = 2873; public final static int CampaignCalendarDoorOpenedMessageComposer = 2551; @@ -433,7 +436,7 @@ public class Outgoing { public final static int UseObjectMessageComposer = 1774; //todo? public final static int HotelMergeNameChangeComposer = 1663; public final static int RoomThumbnailUpdateResultComposer = 1927; //todo? - public final static int UnknownComposer_2698 = 563; + public final static int CheckUserNameResultMessageComposer = 563; public final static int DirectSMSClubBuyAvailableMessageComposer = 195; // todo? public final static int HabboWayQuizComposer1 = 3379; public final static int TradingYouAreNotAllowedComposer = 3058; @@ -466,8 +469,8 @@ public class Outgoing { 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 BotSkillListUpdateComposer = 69; + public final static int ExtendedProfileChangedMessageComposer = 876; public final static int JoiningQueueFailedMessageComposer = 3035; public final static int CatalogPageExpirationComposer = 2668; public final static int GameStatusMessageComposer = 3805; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementUnlockedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementUnlockedComposer.java index ca2449f3..527078a0 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementUnlockedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementUnlockedComposer.java @@ -18,7 +18,7 @@ public class AchievementUnlockedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.AchievementUnlockedComposer); + this.response.init(Outgoing.HabboAchievementNotificationMessageComposer); AchievementLevel level = this.achievement.getLevelForProgress(this.habbo.getHabboStats().getAchievementProgress(this.achievement)); this.response.appendInt(this.achievement.id); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentLevelUpdateComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentLevelUpdateComposer.java index 3a515350..c76cabc5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentLevelUpdateComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentLevelUpdateComposer.java @@ -18,7 +18,7 @@ public class TalentLevelUpdateComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.TalentLevelUpdateComposer); + this.response.init(Outgoing.TalentLevelUpComposer); this.response.appendString(this.talentTrackType.name()); this.response.appendInt(this.talentTrackLevel.level); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPageComposer.java index 0f4d8bd5..612abc9f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPageComposer.java @@ -32,7 +32,7 @@ public class CatalogPageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CatalogPageComposer); + this.response.init(Outgoing.CatalogPageMessageComposer); this.response.appendInt(this.page.getId()); this.response.appendString(this.mode); this.page.serialize(this.response); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubGiftsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubGiftsComposer.java index e45b4822..af9621a5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubGiftsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubGiftsComposer.java @@ -7,13 +7,10 @@ import com.eu.habbo.habbohotel.catalog.CatalogPageLayouts; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -import gnu.trove.iterator.TIntObjectIterator; -import gnu.trove.procedure.TObjectProcedure; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.NoSuchElementException; public class ClubGiftsComposer extends MessageComposer { @@ -29,7 +26,7 @@ public class ClubGiftsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ClubGiftsComposer); + this.response.init(Outgoing.ClubGiftInfoComposer); this.response.appendInt(this.daysTillNextGift); //Days Until Next Gift this.response.appendInt(this.availableGifts); //Gift Selectable diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/PurchaseOKComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/PurchaseOKComposer.java index 1750480a..91d496bf 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/PurchaseOKComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/PurchaseOKComposer.java @@ -18,7 +18,7 @@ public class PurchaseOKComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PurchaseOKComposer); + this.response.init(Outgoing.PurchaseOKMessageComposer); if (this.catalogItem != null) { this.catalogItem.serialize(this.response); } else { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/RedeemVoucherErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/RedeemVoucherErrorComposer.java index 1632021f..40e26ce5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/RedeemVoucherErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/RedeemVoucherErrorComposer.java @@ -16,7 +16,7 @@ public class RedeemVoucherErrorComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RedeemVoucherErrorComposer); + this.response.init(Outgoing.VoucherRedeemErrorMessageComposer); this.response.appendString(this.code + ""); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemInfoComposer.java index f9f5f6ec..4c020b0e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemInfoComposer.java @@ -14,7 +14,7 @@ public class MarketplaceItemInfoComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.MarketplaceItemInfoComposer); + this.response.init(Outgoing.MarketplaceItemStatsComposer); MarketPlace.serializeItemInfo(this.itemId, this.response); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceSellItemComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceSellItemComposer.java index 0834ed4c..8a702260 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceSellItemComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceSellItemComposer.java @@ -21,7 +21,7 @@ public class MarketplaceSellItemComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.MarketplaceSellItemComposer); + this.response.init(Outgoing.MarketplaceCanMakeOfferResult); this.response.appendInt(this.errorCode); this.response.appendInt(this.valueA); this.response.appendInt(this.valueB); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxCloseComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxCloseComposer.java index c1593cea..9fae2095 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxCloseComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxCloseComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class MysticBoxCloseComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.MysticBoxCloseComposer); + this.response.init(Outgoing.MysteryBoxClosingComposer); return this.response; } } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxStartOpenComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxStartOpenComposer.java index b88c73cc..242bc987 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxStartOpenComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxStartOpenComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class MysticBoxStartOpenComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.MysticBoxStartOpenComposer); + this.response.init(Outgoing.MysteryBoxStartComposer); return this.response; } } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionCompletedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionCompletedComposer.java index 741b9443..7cc8e797 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionCompletedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionCompletedComposer.java @@ -13,7 +13,7 @@ public class NewYearResolutionCompletedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.NewYearResolutionCompletedComposer); + this.response.init(Outgoing.AchievementResolutionCompletedMessageComposer); this.response.appendString(this.badge); this.response.appendString(this.badge); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionComposer.java index 7b2a4252..1affd7e8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionComposer.java @@ -8,7 +8,7 @@ public class NewYearResolutionComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { //:test 817 i:230 i:1 i:1 i:1 s:NY2013RES i:3 i:0 i:60000000 - this.response.init(Outgoing.NewYearResolutionComposer); + this.response.init(Outgoing.AchievementResolutionsMessageComposer); this.response.appendInt(230); //reward ID or item id? (stuffId) this.response.appendInt(2); //count diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestErrorComposer.java index 84ebe13b..7ae8ab70 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestErrorComposer.java @@ -18,7 +18,7 @@ public class FriendRequestErrorComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FriendRequestErrorComposer); + this.response.init(Outgoing.MessengerErrorComposer); this.response.appendInt(0); this.response.appendInt(this.errorCode); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/UserSearchResultComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/UserSearchResultComposer.java index 7c66c3de..323bd6f6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/UserSearchResultComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/UserSearchResultComposer.java @@ -26,7 +26,7 @@ public class UserSearchResultComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UserSearchResultComposer); + this.response.init(Outgoing.HabboSearchResultComposer); List u = new ArrayList<>(); for (MessengerBuddy buddy : this.users) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/CustomNotificationComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/CustomNotificationComposer.java index 2e1a52de..fb8fab02 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/CustomNotificationComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/CustomNotificationComposer.java @@ -19,7 +19,7 @@ public class CustomNotificationComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CustomNotificationComposer); + this.response.init(Outgoing.CustomUserNotificationMessageComposer); this.response.appendInt(this.type); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianNewReportReceivedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianNewReportReceivedComposer.java index 02d23875..a2122117 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianNewReportReceivedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianNewReportReceivedComposer.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class GuardianNewReportReceivedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuardianNewReportReceivedComposer); + this.response.init(Outgoing.ChatReviewSessionOfferedToGuideMessageComposer); this.response.appendInt(Emulator.getConfig().getInt("guardians.accept.timer")); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionErrorComposer.java index 1776a3e4..19ebec9a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionErrorComposer.java @@ -17,7 +17,7 @@ public class GuideSessionErrorComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuideSessionErrorComposer); + this.response.init(Outgoing.GuideSessionErrorMessageComposer); this.response.appendInt(this.errorCode); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionMessageComposer.java index fdf74f78..a7d83088 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionMessageComposer.java @@ -14,7 +14,7 @@ public class GuideSessionMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuideSessionMessageComposer); + this.response.init(Outgoing.GuideSessionMessageMessageComposer); this.response.appendString(this.message.message); //Message this.response.appendInt(this.message.userId); //Sender ID return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildAcceptMemberErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildAcceptMemberErrorComposer.java index 460e6da8..2450694a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildAcceptMemberErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildAcceptMemberErrorComposer.java @@ -19,7 +19,7 @@ public class GuildAcceptMemberErrorComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuildAcceptMemberErrorComposer); + this.response.init(Outgoing.GuildMemberMgmtFailedMessageComposer); this.response.appendInt(this.guildId); this.response.appendInt(this.errorCode); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildJoinErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildJoinErrorComposer.java index 00716bfb..2918f38e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildJoinErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildJoinErrorComposer.java @@ -21,7 +21,7 @@ public class GuildJoinErrorComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuildJoinErrorComposer); + this.response.init(Outgoing.HabboGroupJoinFailedMessageComposer); this.response.appendInt(this.code); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryBadgesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryBadgesComposer.java index e9dd505c..79db04d5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryBadgesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryBadgesComposer.java @@ -21,7 +21,7 @@ public class InventoryBadgesComposer extends MessageComposer { THashSet equippedBadges = new THashSet<>(); - this.response.init(Outgoing.InventoryBadgesComposer); + this.response.init(Outgoing.BadgesComposer); this.response.appendInt(this.habbo.getInventory().getBadgesComponent().getBadges().size()); for (HabboBadge badge : this.habbo.getInventory().getBadgesComponent().getBadges()) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryItemsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryItemsComposer.java index a8a24ed0..df5cb5ae 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryItemsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryItemsComposer.java @@ -27,7 +27,7 @@ public class InventoryItemsComposer extends MessageComposer implements TIntObjec @Override protected ServerMessage composeInternal() { try { - this.response.init(Outgoing.InventoryItemsComposer); + this.response.init(Outgoing.FurniListComposer); this.response.appendInt(this.totalFragments); this.response.appendInt(this.fragmentNumber - 1); this.response.appendInt(this.items.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueChatlogComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueChatlogComposer.java index fbbc23ac..70241046 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueChatlogComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueChatlogComposer.java @@ -33,7 +33,7 @@ public class ModToolIssueChatlogComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ModToolIssueChatlogComposer); + this.response.init(Outgoing.CfhChatlogComposer); this.response.appendInt(this.issue.id); this.response.appendInt(this.issue.senderId); this.response.appendInt(this.issue.reportedId); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueHandledComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueHandledComposer.java index 0cdc7ee3..fe4c5706 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueHandledComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueHandledComposer.java @@ -24,7 +24,7 @@ public class ModToolIssueHandledComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ModToolIssueHandledComposer); + this.response.init(Outgoing.IssueCloseNotificationMessageComposer); this.response.appendInt(this.code); this.response.appendString(this.message); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSettingsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSettingsComposer.java index da4025a4..021c6f32 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSettingsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSettingsComposer.java @@ -14,7 +14,7 @@ public class NewNavigatorSettingsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.NewNavigatorSettingsComposer); + this.response.init(Outgoing.NewNavigatorPreferencesComposer); this.response.appendInt(this.windowSettings.x); this.response.appendInt(this.windowSettings.y); this.response.appendInt(this.windowSettings.width); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/PrivateRoomsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/PrivateRoomsComposer.java index 41682c85..0ceec7db 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/PrivateRoomsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/PrivateRoomsComposer.java @@ -21,7 +21,7 @@ public class PrivateRoomsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { try { - this.response.init(Outgoing.PrivateRoomsComposer); + this.response.init(Outgoing.GuestRoomSearchResultComposer); this.response.appendInt(2); this.response.appendString(""); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestCompletedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestCompletedComposer.java index dddf6a81..51fca74f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestCompletedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestCompletedComposer.java @@ -16,7 +16,7 @@ public class QuestCompletedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.QuestCompletedComposer); + this.response.init(Outgoing.QuestCompletedMessageComposer); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/FloodCounterComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/FloodCounterComposer.java index 90f747bd..de4ec51e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/FloodCounterComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/FloodCounterComposer.java @@ -13,7 +13,7 @@ public class FloodCounterComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FloodCounterComposer); + this.response.init(Outgoing.FloodControlMessageComposer); this.response.appendInt(this.time); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomAccessDeniedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomAccessDeniedComposer.java index 728a23b1..d0fc51c8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomAccessDeniedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomAccessDeniedComposer.java @@ -13,7 +13,7 @@ public class RoomAccessDeniedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomAccessDeniedComposer); + this.response.init(Outgoing.FlatAccessDeniedMessageComposer); this.response.appendString(this.habbo); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomDataComposer.java index 895cacc6..6dd4f750 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomDataComposer.java @@ -23,7 +23,7 @@ public class RoomDataComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomDataComposer); + this.response.init(Outgoing.GetGuestRoomResultComposer); this.response.appendBoolean(this.enterRoom); this.response.appendInt(this.room.getId()); this.response.appendString(this.room.getName()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEnterErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEnterErrorComposer.java index a2ec60e7..ba84f272 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEnterErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEnterErrorComposer.java @@ -30,7 +30,7 @@ public class RoomEnterErrorComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomEnterErrorComposer); + this.response.init(Outgoing.CantConnectMessageComposer); this.response.appendInt(this.errorCode); this.response.appendString(this.queError); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomOpenComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomOpenComposer.java index b695c747..af2e16e6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomOpenComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomOpenComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class RoomOpenComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomOpenComposer); + this.response.init(Outgoing.OpenConnectionMessageComposer); return this.response; } } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPaneComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPaneComposer.java index db8e3929..e2439d15 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPaneComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPaneComposer.java @@ -16,7 +16,7 @@ public class RoomPaneComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomPaneComposer); + this.response.init(Outgoing.RoomEntryInfoMessageComposer); this.response.appendInt(this.room.getId()); this.response.appendBoolean(this.roomOwner); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRightsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRightsComposer.java index 23e5e4cc..5163a4df 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRightsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRightsComposer.java @@ -14,7 +14,7 @@ public class RoomRightsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomRightsComposer); + this.response.init(Outgoing.YouAreControllerMessageComposer); this.response.appendInt(this.type.level); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/UpdateStackHeightComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/UpdateStackHeightComposer.java index a6d5d643..c16a69f2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/UpdateStackHeightComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/UpdateStackHeightComposer.java @@ -32,7 +32,7 @@ public class UpdateStackHeightComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { //TODO: maybe do this another way? doesn't seem to be very clean but gets the job done - this.response.init(Outgoing.UpdateStackHeightComposer); + this.response.init(Outgoing.HeightMapUpdateMessageComposer); if (this.updateTiles != null) { // prevent overflow. Byte max value is 127 if(this.updateTiles.size() > 127) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PresentItemOpenedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PresentItemOpenedComposer.java index fea440e1..fef960db 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PresentItemOpenedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PresentItemOpenedComposer.java @@ -18,7 +18,7 @@ public class PresentItemOpenedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PresentItemOpenedComposer); + this.response.init(Outgoing.PresentOpenedMessageComposer); this.response.appendString(this.item.getBaseItem().getType().code.toLowerCase()); this.response.appendInt(this.item.getBaseItem().getSpriteId()); this.response.appendString(this.item.getBaseItem().getName()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniFinishedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniFinishedComposer.java index ddeb2ff1..cf541f20 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniFinishedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniFinishedComposer.java @@ -14,7 +14,7 @@ public class LoveLockFurniFinishedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.LoveLockFurniFinishedComposer); + this.response.init(Outgoing.FriendFurniCancelLockMessageComposer); this.response.appendInt(this.loveLock.getId()); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetLevelUpComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetLevelUpComposer.java index f3bf2bf9..9eb0e556 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetLevelUpComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetLevelUpComposer.java @@ -14,7 +14,7 @@ public class PetLevelUpComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PetLevelUpComposer); + this.response.init(Outgoing.PetLevelNotificationComposer); this.response.appendInt(this.pet.getId()); this.response.appendString(this.pet.getName()); this.response.appendInt(this.pet.getLevel()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetPackageNameValidationComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetPackageNameValidationComposer.java index 9d99ade4..e6adbf21 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetPackageNameValidationComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetPackageNameValidationComposer.java @@ -23,7 +23,7 @@ public class PetPackageNameValidationComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PetPackageNameValidationComposer); + this.response.init(Outgoing.OpenPetPackageResultMessageComposer); this.response.appendInt(this.itemId); this.response.appendInt(this.errorCode); this.response.appendString(this.errorString); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRemoveRightsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRemoveRightsComposer.java index ccf56264..c9285ef8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRemoveRightsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRemoveRightsComposer.java @@ -16,7 +16,7 @@ public class RoomUserRemoveRightsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomUserRemoveRightsComposer); + this.response.init(Outgoing.NoSuchFlatComposer); this.response.appendInt(this.room.getId()); this.response.appendInt(this.habboId); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/MessengerErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/MessengerErrorComposer.java index c16dee3c..cb2f819a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/MessengerErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/MessengerErrorComposer.java @@ -15,7 +15,7 @@ public class MessengerErrorComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.MessengerErrorComposer); + this.response.init(Outgoing.AcceptFriendResultComposer); this.response.appendInt(this.errors.size()); for (Map.Entry entry : this.errors.entrySet()) { this.response.appendInt(entry.getKey()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/MostUselessErrorAlertComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/MostUselessErrorAlertComposer.java index 65978271..8f27830f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/MostUselessErrorAlertComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/MostUselessErrorAlertComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class MostUselessErrorAlertComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.MostUselessErrorAlertComposer); + this.response.init(Outgoing.PollErrorComposer); //EMpty Body return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/TalentTrackEmailVerifiedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/TalentTrackEmailVerifiedComposer.java index 119a0b36..6997c8f7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/TalentTrackEmailVerifiedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/TalentTrackEmailVerifiedComposer.java @@ -17,7 +17,7 @@ public class TalentTrackEmailVerifiedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.TalentTrackEmailVerifiedComposer); + this.response.init(Outgoing.EmailStatusResultComposer); this.response.appendString(this.email); this.response.appendBoolean(this.unknownB1); this.response.appendBoolean(this.unknownB2); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownGuildComposer3.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownGuildComposer3.java index c82577c7..94da3ee3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownGuildComposer3.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownGuildComposer3.java @@ -13,7 +13,7 @@ public class UnknownGuildComposer3 extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UnknownGuildComposer3); + this.response.init(Outgoing.ExtendedProfileChangedMessageComposer); this.response.appendInt(this.userId); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownHelperComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownHelperComposer.java index ed2f4104..617781fe 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownHelperComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownHelperComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class UnknownHelperComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UnknownHelperComposer); + this.response.init(Outgoing.CallForHelpPendingCallsDeletedMessageComposer); //Empty body return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownRoomDesktopComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownRoomDesktopComposer.java index d535af23..23f68308 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownRoomDesktopComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownRoomDesktopComposer.java @@ -17,7 +17,7 @@ public class UnknownRoomDesktopComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UnknownRoomDesktopComposer); + this.response.init(Outgoing.BotSkillListUpdateComposer); this.response.appendInt(this.unknownInt1); this.response.appendInt(this.unknownMap.size()); for (Map.Entry entry : this.unknownMap.entrySet()) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UserClassificationComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UserClassificationComposer.java index f7c3213a..6cab2380 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UserClassificationComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UserClassificationComposer.java @@ -16,7 +16,7 @@ public class UserClassificationComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UserClassificationComposer); + this.response.init(Outgoing.UserClassificationMessageComposer); this.response.appendInt(this.info.size()); for (Pair> set : this.info) { this.response.appendInt(set.getKey()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/ChangeNameCheckResultComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/ChangeNameCheckResultComposer.java index e451a884..e253a897 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/ChangeNameCheckResultComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/ChangeNameCheckResultComposer.java @@ -26,7 +26,7 @@ public class ChangeNameCheckResultComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UnknownComposer_2698); + this.response.init(Outgoing.CheckUserNameResultMessageComposer); this.response.appendInt(this.status); this.response.appendString(this.name); this.response.appendInt(this.suggestions.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/ClubGiftReceivedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/ClubGiftReceivedComposer.java index de0755f4..abe2b567 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/ClubGiftReceivedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/ClubGiftReceivedComposer.java @@ -18,7 +18,7 @@ public class ClubGiftReceivedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ClubGiftReceivedComposer); + this.response.init(Outgoing.ClubGiftSelectedComposer); this.response.appendString(this.name); this.response.appendInt(this.items.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/MutedWhisperComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/MutedWhisperComposer.java index 1db3310f..910962f1 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/MutedWhisperComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/MutedWhisperComposer.java @@ -13,7 +13,7 @@ public class MutedWhisperComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.MutedWhisperComposer); + this.response.init(Outgoing.RemainingMutePeriodComposer); this.response.appendInt(this.seconds); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserClubComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserClubComposer.java index 695561d2..53611957 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserClubComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserClubComposer.java @@ -4,15 +4,10 @@ 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.habbohotel.users.subscriptions.SubscriptionManager; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -import java.time.Period; -import java.util.Date; -import java.util.concurrent.TimeUnit; - public class UserClubComposer extends MessageComposer { private final Habbo habbo; private final String subscriptionType; @@ -44,7 +39,7 @@ public class UserClubComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UserClubComposer); + this.response.init(Outgoing.ScrSendUserInfoComposer); this.response.appendString(this.subscriptionType.toLowerCase()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneCodeWindowComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneCodeWindowComposer.java index f2923d4c..520a8609 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneCodeWindowComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneCodeWindowComposer.java @@ -15,7 +15,7 @@ public class VerifyMobilePhoneCodeWindowComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.VerifyMobilePhoneCodeWindowComposer); + this.response.init(Outgoing.TryPhoneNumberResultMessageComposer); this.response.appendInt(this.unknownInt1); this.response.appendInt(this.unknownInt2); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneDoneComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneDoneComposer.java index b91fca9f..897ed92d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneDoneComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneDoneComposer.java @@ -15,7 +15,7 @@ public class VerifyMobilePhoneDoneComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.VerifyMobilePhoneDoneComposer); + this.response.init(Outgoing.TryVerificationCodeResultMessageComposer); this.response.appendInt(this.unknownInt1); this.response.appendInt(this.unknownInt2); return this.response;