From 963d892934912f8c21a49fc4458e090cc16d548e Mon Sep 17 00:00:00 2001 From: Harmonic Date: Fri, 15 Apr 2022 06:36:36 -0700 Subject: [PATCH] Refactoring Outgoing Packet Composer Names Part 4 --- .../eu/habbo/messages/outgoing/Outgoing.java | 66 +++++++++---------- .../outgoing/catalog/ClubDataComposer.java | 3 +- .../outgoing/catalog/DiscountComposer.java | 2 +- .../catalog/GiftConfigurationComposer.java | 2 +- .../friends/FriendRequestComposer.java | 2 +- .../GameCenterGameListComposer.java | 2 +- .../basejump/BaseJumpJoinQueueComposer.java | 2 +- ...ckMonthlyClubGiftNotificationComposer.java | 2 +- ...uideSessionInvitedToGuideRoomComposer.java | 2 +- .../outgoing/guilds/GuildPartsComposer.java | 2 +- ...uildForumsUnreadMessagesCountComposer.java | 2 +- .../inventory/EffectsListRemoveComposer.java | 2 +- .../outgoing/inventory/RemoveBotComposer.java | 2 +- .../modtool/ModToolSanctionInfoComposer.java | 5 +- .../outgoing/quests/QuestComposer.java | 2 +- .../rooms/DoorbellAddUserComposer.java | 2 +- .../outgoing/rooms/FreezeLivesComposer.java | 2 +- .../outgoing/rooms/RoomNoRightsComposer.java | 2 +- .../rooms/RoomQueueStatusMessage.java | 2 +- .../rooms/items/AddWallItemComposer.java | 2 +- .../rooms/items/ItemStateComposer.java | 2 +- .../rooms/items/PostItDataComposer.java | 2 +- .../items/PostItStickyPoleOpenComposer.java | 2 +- .../rooms/pets/PetPackageComposer.java | 2 +- .../rooms/users/RoomUserDanceComposer.java | 2 +- .../users/RoomUserNameChangedComposer.java | 2 +- .../users/RoomUsersAddGuildBadgeComposer.java | 2 +- .../users/RoomUsersGuildBadgesComposer.java | 2 +- .../unknown/VipTutorialsStartComposer.java | 2 +- .../unknown/WelcomeGiftErrorComposer.java | 2 +- .../outgoing/users/UserPointsComposer.java | 2 +- .../eu/habbo/messages/rcon/FriendRequest.java | 2 +- 32 files changed, 65 insertions(+), 67 deletions(-) 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 0094d101..02e50f12 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/Outgoing.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/Outgoing.java @@ -15,7 +15,7 @@ public class Outgoing { public final static int FlatControllersComposer = 1284; public final static int CarryObjectMessageComposer = 1474; public final static int RoomUsersComposer = 374; - public final static int FriendRequestComposer = 2219; + public final static int NewFriendRequestComposer = 2219; public final static int GuildBoughtComposer = 2808; public final static int AddUserBadgeComposer = 2493; public final static int RecyclerCompleteComposer = 468; @@ -43,7 +43,7 @@ public class Outgoing { public final static int FloorItemUpdateComposer = 3776; public final static int RoomAccessDeniedComposer = 878; public final static int GuildFurniWidgetComposer = 3293; - public final static int GiftConfigurationComposer = 2234; + public final static int GiftWrappingConfigurationComposer = 2234; public final static int UserClubComposer = 954; public final static int InventoryBadgesComposer = 717; public final static int UserTypingMessageComposer = 1717; @@ -52,7 +52,7 @@ public class Outgoing { public final static int InventoryAchievementsComposer = 2501; public final static int MarketplaceItemInfoComposer = 725; public final static int RoomRelativeMapComposer = 2753; - public final static int ModToolComposerTwo = 2335; + public final static int ModeratorActionResultMessageComposer = 2335; public final static int ModToolComposerOne = 3192; public final static int RoomRightsComposer = 780; public final static int ObjectOnRollerComposer = 3207; @@ -82,7 +82,7 @@ public class Outgoing { public final static int PrivateRoomsComposer = 52; public final static int RoomReadyMessageComposer = 2031; public final static int RoomScoreComposer = 482; - public final static int DoorbellAddUserComposer = 2309; + public final static int DoorbellMessageComposer = 2309; public final static int SecureLoginOKComposer = 2491; public final static int AvailabilityStatusMessageComposer = 2033; public final static int GuildMemberUpdateComposer = 265; @@ -97,7 +97,7 @@ public class Outgoing { public final static int GuildListComposer = 420; public final static int RecyclerLogicComposer = 3164; public final static int UserHomeRoomComposer = 2875; - public final static int RoomUserDanceComposer = 2233; + public final static int DanceMessageComposer = 2233; public final static int RoomSettingsUpdatedComposer = 3297; public final static int PurchaseErrorMessageComposer = 1404; public final static int RoomDataComposer = 687; @@ -126,7 +126,7 @@ public class Outgoing { public final static int GuildMembersComposer = 1200; // PRODUCTION-201611291003-338511768 public final static int RoomOpenComposer = 758; // PRODUCTION-201611291003-338511768 public final static int ModToolRoomChatlogComposer = 3434; // PRODUCTION-201611291003-338511768 - public final static int DiscountComposer = 2347; // PRODUCTION-201611291003-338511768 + public final static int BundleDiscountRulesetMessageComposer = 2347; // PRODUCTION-201611291003-338511768 public final static int MarketplaceCancelSaleComposer = 3264; // PRODUCTION-201611291003-338511768 public final static int RoomPetRespectComposer = 2788; // PRODUCTION-201611291003-338511768 public final static int RoomSettingsDataComposer = 1498; // PRODUCTION-201611291003-338511768 @@ -137,7 +137,7 @@ public class Outgoing { public final static int PurchaseOKComposer = 869; // PRODUCTION-201611291003-338511768 public final static int ItemUpdateMessageComposer = 2009; // PRODUCTION-201611291003-338511768 public final static int TradeAcceptedComposer = 2568; // PRODUCTION-201611291003-338511768 - public final static int AddWallItemComposer = 2187; // PRODUCTION-201611291003-338511768 + public final static int ItemAddMessageComposer = 2187; // PRODUCTION-201611291003-338511768 public final static int RoomEntryInfoComposer = -1; // PRODUCTION-201611291003-338511768 public final static int CurrentTimingCodeMessageComposer = 1745; // PRODUCTION-201611291003-338511768 public final static int PresentItemOpenedComposer = 56; // PRODUCTION-201611291003-338511768 @@ -148,14 +148,14 @@ public class Outgoing { public final static int RedeemVoucherErrorComposer = 714; // PRODUCTION-201611291003-338511768 public final static int FlatCreatedComposer = 1304; // PRODUCTION-201611291003-338511768 public final static int GenericAlertComposer = 3801; // PRODUCTION-201611291003-338511768 - public final static int GroupPartsComposer = 2238; // PRODUCTION-201611291003-338511768 + public final static int GuildEditorDataMessageComposer = 2238; // PRODUCTION-201611291003-338511768 public final static int ModToolIssueInfoComposer = 3609; // PRODUCTION-201611291003-338511768 public final static int RoomUserWhisperComposer = 2704; // PRODUCTION-201611291003-338511768 public final static int BotErrorComposer = 639; // PRODUCTION-201611291003-338511768 - public final static int FreezeLivesComposer = 2324; // PRODUCTION-201611291003-338511768 + public final static int GamePlayerValueMessageComposer = 2324; // PRODUCTION-201611291003-338511768 public final static int LoadFriendRequestsComposer = 280; // PRODUCTION-201611291003-338511768 public final static int MarketplaceSellItemComposer = 54; // PRODUCTION-201611291003-338511768 - public final static int ClubDataComposer = 2405; // PRODUCTION-201611291003-338511768 + public final static int HabboClubOffersMessageComposer = 2405; // PRODUCTION-201611291003-338511768 public final static int RelationshipStatusInfoComposer = 2016; // PRODUCTION-201611291003-338511768 public final static int MarketplaceOwnItemsComposer = 3884; // PRODUCTION-201611291003-338511768 public final static int RoomOwnerComposer = 339; // PRODUCTION-201611291003-338511768 @@ -168,7 +168,7 @@ public class Outgoing { public final static int RoomThicknessComposer = 3547; // PRODUCTION-201611291003-338511768 public final static int PetAddedToInventoryComposer = 2101; // PRODUCTION-201611291003-338511768 public final static int UpdateStackHeightComposer = 558; // PRODUCTION-201611291003-338511768 - public final static int RemoveBotComposer = 233; // PRODUCTION-201611291003-338511768 + public final static int BotRemovedFromInventoryComposer = 233; // PRODUCTION-201611291003-338511768 public final static int RoomEnterErrorComposer = 899; // PRODUCTION-201611291003-338511768 public final static int PollQuestionsComposer = 2997; // PRODUCTION-201611291003-338511768 public final static int GenericErrorComposer = 1600; // PRODUCTION-201611291003-338511768 @@ -182,7 +182,7 @@ public class Outgoing { public final static int MinimailCountComposer = 2803; // PRODUCTION-201611291003-338511768 public final static int AchievementsScoreComposer = 1968; // PRODUCTION-201611291003-338511768 public final static int PetLevelUpComposer = 859; // PRODUCTION-201611291003-338511768 - public final static int UserPointsComposer = 2275; // PRODUCTION-201611291003-338511768 + public final static int HabboActivityPointNotificationMessageComposer = 2275; // PRODUCTION-201611291003-338511768 public final static int CallForHelpPendingCallsMessageComposer = 1121; // PRODUCTION-201611291003-338511768 public final static int ModToolIssueHandledComposer = 934; // PRODUCTION-201611291003-338511768 public final static int FloodCounterComposer = 566; // PRODUCTION-201611291003-338511768 @@ -199,7 +199,7 @@ public class Outgoing { public final static int CollapsedCategoriesComposer = 1543; // PRODUCTION-201611291003-338511768 public final static int NewNavigatorLiftedRoomsComposer = 3104; // PRODUCTION-201611291003-338511768 public final static int NewNavigatorSavedSearchesComposer = 3984; // PRODUCTION-201611291003-338511768 - public final static int PostItDataComposer = 2202; // PRODUCTION-201611291003-338511768 + public final static int ItemDataUpdateMessageComposer = 2202; // PRODUCTION-201611291003-338511768 public final static int ModToolReportReceivedAlertComposer = 3635; // PRODUCTION-201611291003-338511768 public final static int ModToolIssueResponseAlertComposer = 3796; // PRODUCTION-201611291003-338511768 public final static int AchievementListComposer = 305; // PRODUCTION-201611291003-338511768 @@ -229,10 +229,10 @@ public class Outgoing { public final static int BaseJumpLoadGameURLComposer = 2624; // PRODUCTION-201611291003-338511768 public final static int UserTagsMessageComposer = 1255; // PRODUCTION-201611291003-338511768 public final static int RoomInviteErrorComposer = 462; // PRODUCTION-201611291003-338511768 - public final static int PostItStickyPoleOpenComposer = 2366; // PRODUCTION-201611291003-338511768 + public final static int RequestSpamWallPostItMessageComposer = 2366; // PRODUCTION-201611291003-338511768 public final static int NewYearResolutionProgressComposer = 3370; // PRODUCTION-201611291003-338511768 public final static int ClubGiftReceivedComposer = 659; // PRODUCTION-201611291003-338511768 - public final static int ItemStateComposer = 2376; // PRODUCTION-201611291003-338511768 + public final static int OneWayDoorStatusMessageComposer = 2376; // PRODUCTION-201611291003-338511768 public final static int ItemExtraDataComposer = 2547; // PRODUCTION-201611291003-338511768 public final static int PostUpdateMessageComposer = 324; // PRODUCTION-201611291003-338511768 //NotSure Needs Testing @@ -243,7 +243,7 @@ public class Outgoing { public final static int GroupMembershipRequestedMessageComposer = 1180; // PRODUCTION-201611291003-338511768 - public final static int GuildForumsUnreadMessagesCountComposer = 2379; // PRODUCTION-201611291003-338511768 + public final static int UnreadForumsCountMessageComposer = 2379; // PRODUCTION-201611291003-338511768 public final static int PostThreadMessageComposer = 1862; // PRODUCTION-201611291003-338511768 public final static int PostMessageMessageComposer = 2049; // PRODUCTION-201611291003-338511768 public final static int GuildForumDataComposer = 3011; // PRODUCTION-201611291003-338511768 @@ -260,7 +260,7 @@ public class Outgoing { public final static int GuideSessionErrorComposer = 673; // PRODUCTION-201611291003-338511768 public final static int GuideSessionMessageComposer = 841; // PRODUCTION-201611291003-338511768 public final static int GuideSessionRequesterRoomMessageComposer = 1847; // PRODUCTION-201611291003-338511768 - public final static int GuideSessionInvitedToGuideRoomComposer = 219; // PRODUCTION-201611291003-338511768 + public final static int GuideSessionInvitedToGuideRoomMessageComposer = 219; // PRODUCTION-201611291003-338511768 public final static int GuideSessionPartnerIsTypingComposer = 1016; // PRODUCTION-201611291003-338511768 public final static int GuideOnDutyStatusMessageComposer = 1548; // PRODUCTION-201611291003-338511768 @@ -273,10 +273,10 @@ public class Outgoing { public final static int RoomMutedComposer = 2533; // PRODUCTION-201611291003-338511768 public final static int HideDoorbellComposer = 3783; // PRODUCTION-201611291003-338511768 - public final static int RoomQueueStatusMessage = 2208; // PRODUCTION-201611291003-338511768 + public final static int RoomQueueStatusMessageComposer = 2208; // PRODUCTION-201611291003-338511768 public final static int YouAreSpectatorMessageEvent = 1033; // PRODUCTION-201611291003-338511768 - public final static int EffectsListRemoveComposer = 2228; // PRODUCTION-201611291003-338511768 + public final static int AvatarEffectExpiredMessageComposer = 2228; // PRODUCTION-201611291003-338511768 public final static int OldPublicRoomsComposer = 2726; // PRODUCTION-201611291003-338511768 public final static int ItemStateComposer2 = 3431; // PRODUCTION-201611291003-338511768 @@ -295,14 +295,14 @@ public class Outgoing { public final static int MOTDNotificationComposer = 2035; // PRODUCTION-201611291003-338511768 public final static int AccountSafetyLockStatusChangeMessageComposer = 1243; // PRODUCTION-201611291003-338511768 public final static int CloseWebPageComposer = 426; // PRODUCTION-201611291003-338511768 - public final static int PickMonthlyClubGiftNotificationComposer = 2188; // PRODUCTION-201611291003-338511768 + public final static int ClubGiftNotificationComposer = 2188; // PRODUCTION-201611291003-338511768 public final static int RemoveGuildFromRoomComposer = 3129; // PRODUCTION-201611291003-338511768 public final static int BannedUsersFromRoomComposer = 1869; // PRODUCTION-201611291003-338511768 public final static int NoOwnedRoomsAlertMessageComposer = 2064; // PRODUCTION-201611291003-338511768 public final static int ObjectsDataUpdateMessageComposer = 1453; // PRODUCTION-201611291003-338511768 public final static int WelcomeGiftComposer = 2707; // PRODUCTION-201611291003-338511768 public final static int SimplePollStartComposer = 2665; // PRODUCTION-201611291003-338511768 - public final static int RoomNoRightsComposer = 2392; // PRODUCTION-201611291003-338511768 + public final static int YouAreNotControllerMessageComposer = 2392; // PRODUCTION-201611291003-338511768 public final static int GuildEditFailComposer = 3988; // PRODUCTION-201611291003-338511768 public final static int MiniMailNewMessageComposer = 1911; // PRODUCTION-201611291003-338511768 public final static int RoomFilterWordsComposer = 2937; // PRODUCTION-201611291003-338511768 @@ -311,7 +311,7 @@ public class Outgoing { public final static int UpdateUserLookComposer = 2429; // PRODUCTION-201611291003-338511768 public final static int IgnoreResultMessageComposer = 207; // PRODUCTION-201611291003-338511768 public final static int ConfirmBreedingResultComposer = 1625; // PRODUCTION-201611291003-338511768 - public final static int RoomUserNameChangedComposer = 2182; // PRODUCTION-201611291003-338511768 + public final static int UserNameChangedMessageComposer = 2182; // PRODUCTION-201611291003-338511768 public final static int LoveLockFurniStartComposer = 3753; // PRODUCTION-201611291003-338511768 public final static int LoveLockFurniFriendConfirmedComposer = 382; // PRODUCTION-201611291003-338511768 public final static int LoveLockFurniFinishedComposer = 770; // PRODUCTION-201611291003-338511768 @@ -319,7 +319,7 @@ public class Outgoing { public final static int GameCenterFeaturedPlayersComposer = 3097; // PRODUCTION-201611291003-338511768 public final static int TargetedOfferNotFoundComposer = 1237; // PRODUCTION-201611291003-338511768 public final static int TargetedOfferComposer = 119; // PRODUCTION-201611291003-338511768 - public final static int LeprechaunStarterBundleComposer = 2380; // PRODUCTION-201611291003-338511768 + public final static int OpenPetPackageRequestedMessageComposer = 2380; // PRODUCTION-201611291003-338511768 public final static int VerifyMobilePhoneWindowComposer = 2890; // PRODUCTION-201611291003-338511768 public final static int VerifyMobilePhoneCodeWindowComposer = 800; // PRODUCTION-201611291003-338511768 public final static int VerifyMobilePhoneDoneComposer = 91; // PRODUCTION-201611291003-338511768 @@ -331,9 +331,9 @@ public class Outgoing { public final static int NotEnoughPointsTypeComposer = 3914; // PRODUCTION-201611291003-338511768 public final static int OfferRewardDeliveredMessageComposer = 2125; // PRODUCTION-201611291003-338511768 public final static int NewYearResolutionComposer = 66; // PRODUCTION-201611291003-338511768 - public final static int WelcomeGiftErrorComposer = 2293; // PRODUCTION-201611291003-338511768 + public final static int WelcomeGiftChangeEmailResultComposer = 2293; // PRODUCTION-201611291003-338511768 public final static int RentableItemBuyOutPriceComposer = 35; // PRODUCTION-201611291003-338511768 - public final static int VipTutorialsStartComposer = 2278; // PRODUCTION-201611291003-338511768 + public final static int CitizenshipVipOfferPromoEnabledComposer = 2278; // PRODUCTION-201611291003-338511768 public final static int CategoriesWithVisitorCountComposer = 1455; // PRODUCTION-201611291003-338511768 public final static int CameraRoomThumbnailSavedComposer = 3595; // PRODUCTION-201611291003-338511768 public final static int RoomSettingsSaveErrorComposer = 1555; // PRODUCTION-201611291003-338511768 @@ -393,7 +393,7 @@ public class Outgoing { public final static int CommunityGoalVoteMessageComposer = 1435; // PRODUCTION-201611291003-338511768 public final static int CatalogSearchResultComposer = 3388; // PRODUCTION-201611291003-338511768 public final static int FindFriendsProcessResultComposer = 1210; // PRODUCTION-201611291003-338511768 - public final static int QuestComposer = 230; // PRODUCTION-201611291003-338511768 + public final static int QuestMessageComposer = 230; // PRODUCTION-201611291003-338511768 public final static int ModToolSanctionDataComposer = 2782; // PRODUCTION-201611291003-338511768 public final static int RoomEventComposer = 1840; @@ -422,28 +422,28 @@ public class Outgoing { public final static int EffectsListAddComposer = 2867; // PRODUCTION-201611291003-338511768 public final static int UnknownComposer_1188 = 1437; // PRODUCTION-201611291003-338511768 // this string name isnt readable via any source. public final static int SubmitCompetitionRoomComposer = 3841; // PRODUCTION-201611291003-338511768 - public final static int GameAchievementsListComposer = 2265; // PRODUCTION-201611291003-338511768 + public final static int UserGameAchievementsMessageComposer = 2265; // PRODUCTION-201611291003-338511768 public final static int TradingOtherNotAllowedComposer = 1254; // PRODUCTION-201611291003-338511768 public final static int UnloadGameMessageComposer = 1715; // PRODUCTION-201611291003-338511768 public final static int UnknownComposer_137 = 2897; // PRODUCTION-201611291003-338511768 public final static int GameCenterAccountInfoComposer = 2893; // PRODUCTION-201611291003-338511768 - public final static int UnknowComposer_1390 = 2270; // PRODUCTION-201611291003-338511768 + public final static int Game2WeeklyFriendsLeaderboardComposer = 2270; // PRODUCTION-201611291003-338511768 public final static int BaseJumpLoadGameComposer = 3654; // PRODUCTION-201611291003-338511768 public final static int UnknowComposer_1427 = 3319; // PRODUCTION-201611291003-338511768 public final static int AdventCalendarDataComposer = 2531; // PRODUCTION-201611291003-338511768 public final static int UnknownComposer_152 = 3954; // PRODUCTION-201611291003-338511768 public final static int UnknownComposer_1577 = 2641; // PRODUCTION-201611291003-338511768 public final static int NewYearResolutionCompletedComposer = 740; // PRODUCTION-201611291003-338511768 - public final static int UnknownComposer_1741 = 2246; // PRODUCTION-201611291003-338511768 + public final static int Game2GameDirectoryStatusMessageComposer = 2246; // PRODUCTION-201611291003-338511768 //todo? public final static int UnknownComposer_1744 = 2873; // PRODUCTION-201611291003-338511768 public final static int AdventCalendarProductComposer = 2551; // PRODUCTION-201611291003-338511768 - public final static int ModToolSanctionInfoComposer = 2221; // PRODUCTION-201611291003-338511768 + public final static int SanctionStatusComposer = 2221; // PRODUCTION-201611291003-338511768 public final static int UnknownComposer_1965 = 3292; // PRODUCTION-201611291003-338511768 public final static int GuideSessionPartnerIsPlayingComposer = 448; // PRODUCTION-201611291003-338511768 public final static int LeftQueueMessageComposer = 1477; // PRODUCTION-201611291003-338511768 public final static int Game2WeeklySmallLeaderboardComposer = 3512; // PRODUCTION-201611291003-338511768 - public final static int GameCenterGameListComposer = 222; // PRODUCTION-201611291003-338511768 - public final static int RoomUsersGuildBadgesComposer = 2402; // PRODUCTION-201611291003-338511768 + public final static int GameListMessageComposer = 222; // PRODUCTION-201611291003-338511768 + public final static int HabboGroupBadgesMessageComposer = 2402; // PRODUCTION-201611291003-338511768 public final static int UseObjectMessageComposer = 1774; // PRODUCTION-201611291003-338511768 //todo? public final static int HotelMergeNameChangeComposer = 1663; // PRODUCTION-201611291003-338511768 public final static int RoomThumbnailUpdateResultComposer = 1927; // PRODUCTION-201611291003-338511768 //todo? @@ -498,7 +498,7 @@ public class Outgoing { public final static int PingComposer = 3928; public final static int TradingWaitingConfirmComposer = 2720; - public final static int BaseJumpJoinQueueComposer = 2260; + public final static int JoinedQueueMessageComposer = 2260; public final static int ClubCenterDataComposer = 3277; public final static int QuestionFinishedComposer = 1066; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubDataComposer.java index 96188ad2..35a3808f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubDataComposer.java @@ -7,7 +7,6 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -import java.util.Calendar; import java.util.List; public class ClubDataComposer extends MessageComposer { @@ -21,7 +20,7 @@ public class ClubDataComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ClubDataComposer); + this.response.init(Outgoing.HabboClubOffersMessageComposer); List offers = Emulator.getGameEnvironment().getCatalogManager().getClubOffers(); this.response.appendInt(offers.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/DiscountComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/DiscountComposer.java index 387e2a2e..8842e4ec 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/DiscountComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/DiscountComposer.java @@ -13,7 +13,7 @@ public class DiscountComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.DiscountComposer); + this.response.init(Outgoing.BundleDiscountRulesetMessageComposer); this.response.appendInt(MAXIMUM_ALLOWED_ITEMS); this.response.appendInt(DISCOUNT_BATCH_SIZE); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/GiftConfigurationComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/GiftConfigurationComposer.java index 77328100..3c091c3d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/GiftConfigurationComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/GiftConfigurationComposer.java @@ -15,7 +15,7 @@ public class GiftConfigurationComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GiftConfigurationComposer); + this.response.init(Outgoing.GiftWrappingConfigurationComposer); this.response.appendBoolean(true); this.response.appendInt(Emulator.getConfig().getInt("hotel.gifts.special.price", 2)); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestComposer.java index 005ac3d8..e611c2d5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestComposer.java @@ -14,7 +14,7 @@ public class FriendRequestComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FriendRequestComposer); + this.response.init(Outgoing.NewFriendRequestComposer); 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/gamecenter/GameCenterGameListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterGameListComposer.java index f8f1e25c..d6574818 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterGameListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterGameListComposer.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class GameCenterGameListComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GameCenterGameListComposer); + this.response.init(Outgoing.GameListMessageComposer); this.response.appendInt(2);//Count this.response.appendInt(0); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpJoinQueueComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpJoinQueueComposer.java index 6df404f1..46d1987f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpJoinQueueComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpJoinQueueComposer.java @@ -13,7 +13,7 @@ public class BaseJumpJoinQueueComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.BaseJumpJoinQueueComposer); + this.response.init(Outgoing.JoinedQueueMessageComposer); this.response.appendInt(this.gameId); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/PickMonthlyClubGiftNotificationComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/PickMonthlyClubGiftNotificationComposer.java index bae14e70..c8468ef4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/PickMonthlyClubGiftNotificationComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/PickMonthlyClubGiftNotificationComposer.java @@ -13,7 +13,7 @@ public class PickMonthlyClubGiftNotificationComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PickMonthlyClubGiftNotificationComposer); + this.response.init(Outgoing.ClubGiftNotificationComposer); this.response.appendInt(this.count); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionInvitedToGuideRoomComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionInvitedToGuideRoomComposer.java index 15a7fd32..a12a1f7d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionInvitedToGuideRoomComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionInvitedToGuideRoomComposer.java @@ -15,7 +15,7 @@ public class GuideSessionInvitedToGuideRoomComposer extends MessageComposer { //Helper invites noob @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuideSessionInvitedToGuideRoomComposer); + this.response.init(Outgoing.GuideSessionInvitedToGuideRoomMessageComposer); this.response.appendInt(this.room != null ? this.room.getId() : 0); this.response.appendString(this.room != null ? this.room.getName() : ""); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildPartsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildPartsComposer.java index 01cf5cf7..555880ee 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildPartsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildPartsComposer.java @@ -9,7 +9,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class GuildPartsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GroupPartsComposer); + this.response.init(Outgoing.GuildEditorDataMessageComposer); this.response.appendInt(Emulator.getGameEnvironment().getGuildManager().getBases().size()); for (GuildPart part : Emulator.getGameEnvironment().getGuildManager().getBases()) { this.response.appendInt(part.id); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumsUnreadMessagesCountComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumsUnreadMessagesCountComposer.java index e9897471..0060556e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumsUnreadMessagesCountComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumsUnreadMessagesCountComposer.java @@ -13,7 +13,7 @@ public class GuildForumsUnreadMessagesCountComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuildForumsUnreadMessagesCountComposer); + this.response.init(Outgoing.UnreadForumsCountMessageComposer); this.response.appendInt(this.count); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListRemoveComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListRemoveComposer.java index f9d8020c..869a16ad 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListRemoveComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListRemoveComposer.java @@ -14,7 +14,7 @@ public class EffectsListRemoveComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.EffectsListRemoveComposer); + this.response.init(Outgoing.AvatarEffectExpiredMessageComposer); this.response.appendInt(this.effect.effect); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemoveBotComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemoveBotComposer.java index cda6dc61..c9816e1f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemoveBotComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemoveBotComposer.java @@ -14,7 +14,7 @@ public class RemoveBotComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RemoveBotComposer); + this.response.init(Outgoing.BotRemovedFromInventoryComposer); this.response.appendInt(this.bot.getId()); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolSanctionInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolSanctionInfoComposer.java index e343f675..259020a5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolSanctionInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolSanctionInfoComposer.java @@ -12,7 +12,6 @@ import gnu.trove.map.hash.THashMap; import org.joda.time.DateTime; import java.util.ArrayList; -import java.util.Arrays; import java.util.Date; public class ModToolSanctionInfoComposer extends MessageComposer { @@ -56,7 +55,7 @@ public class ModToolSanctionInfoComposer extends MessageComposer { tradeLockedUntil = new Date((long) item.tradeLockedUntil * 1000); } - this.response.init(Outgoing.ModToolSanctionInfoComposer); + this.response.init(Outgoing.SanctionStatusComposer); this.response.appendBoolean(prevItem != null && prevItem.probationTimestamp > 0); // has prev sanction this.response.appendBoolean(item.probationTimestamp >= Emulator.getIntUnixTimestamp()); // is on probation @@ -84,7 +83,7 @@ public class ModToolSanctionInfoComposer extends MessageComposer { } private ServerMessage cleanResponse() { - this.response.init(Outgoing.ModToolSanctionInfoComposer); + this.response.init(Outgoing.SanctionStatusComposer); this.response.appendBoolean(false); // has prev sanction this.response.appendBoolean(false); // is on probation diff --git a/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestComposer.java index f95a4056..6f7426e7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestComposer.java @@ -13,7 +13,7 @@ public class QuestComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.QuestComposer); + this.response.init(Outgoing.QuestMessageComposer); this.response.append(this.quest); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/DoorbellAddUserComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/DoorbellAddUserComposer.java index 0f678902..beb4d06d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/DoorbellAddUserComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/DoorbellAddUserComposer.java @@ -13,7 +13,7 @@ public class DoorbellAddUserComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.DoorbellAddUserComposer); + this.response.init(Outgoing.DoorbellMessageComposer); this.response.appendString(this.habbo); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/FreezeLivesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/FreezeLivesComposer.java index c4bf6d91..3e0b45df 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/FreezeLivesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/FreezeLivesComposer.java @@ -14,7 +14,7 @@ public class FreezeLivesComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FreezeLivesComposer); + this.response.init(Outgoing.GamePlayerValueMessageComposer); this.response.appendInt(this.gamePlayer.getHabbo().getRoomUnit().getId()); this.response.appendInt(this.gamePlayer.getLives()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomNoRightsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomNoRightsComposer.java index 6f4fc613..1246f063 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomNoRightsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomNoRightsComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class RoomNoRightsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomNoRightsComposer); + this.response.init(Outgoing.YouAreNotControllerMessageComposer); return this.response; } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomQueueStatusMessage.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomQueueStatusMessage.java index 4425c29d..641d83d7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomQueueStatusMessage.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomQueueStatusMessage.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class RoomQueueStatusMessage extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomQueueStatusMessage); + this.response.init(Outgoing.RoomQueueStatusMessageComposer); this.response.appendInt(1); //Count { this.response.appendString("TEST"); //Name diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/AddWallItemComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/AddWallItemComposer.java index 300eec19..73a155a3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/AddWallItemComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/AddWallItemComposer.java @@ -16,7 +16,7 @@ public class AddWallItemComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.AddWallItemComposer); + this.response.init(Outgoing.ItemAddMessageComposer); this.item.serializeWallData(this.response); this.response.appendString(this.itemOwnerName); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemStateComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemStateComposer.java index 792b96a3..7efab333 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemStateComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemStateComposer.java @@ -14,7 +14,7 @@ public class ItemStateComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ItemStateComposer); + this.response.init(Outgoing.OneWayDoorStatusMessageComposer); this.response.appendInt(this.item.getId()); try { int state = Integer.valueOf(this.item.getExtradata()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItDataComposer.java index 497317af..807064af 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItDataComposer.java @@ -18,7 +18,7 @@ public class PostItDataComposer extends MessageComposer { this.postIt.setExtradata("FFFF33"); } - this.response.init(Outgoing.PostItDataComposer); + this.response.init(Outgoing.ItemDataUpdateMessageComposer); this.response.appendString(this.postIt.getId() + ""); this.response.appendString(this.postIt.getExtradata()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItStickyPoleOpenComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItStickyPoleOpenComposer.java index e4151744..840f2e45 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItStickyPoleOpenComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItStickyPoleOpenComposer.java @@ -14,7 +14,7 @@ public class PostItStickyPoleOpenComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PostItStickyPoleOpenComposer); + this.response.init(Outgoing.RequestSpamWallPostItMessageComposer); this.response.appendInt(this.item == null ? -1234 : this.item.getId()); this.response.appendString(""); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetPackageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetPackageComposer.java index 70f8d918..20f4332f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetPackageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetPackageComposer.java @@ -14,7 +14,7 @@ public class PetPackageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.LeprechaunStarterBundleComposer); + this.response.init(Outgoing.OpenPetPackageRequestedMessageComposer); this.response.appendInt(this.item.getId()); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserDanceComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserDanceComposer.java index f0900df7..a5e23bbb 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserDanceComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserDanceComposer.java @@ -14,7 +14,7 @@ public class RoomUserDanceComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomUserDanceComposer); + this.response.init(Outgoing.DanceMessageComposer); this.response.appendInt(this.roomUnit.getId()); this.response.appendInt(this.roomUnit.getDanceType().getType()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserNameChangedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserNameChangedComposer.java index 3e43c471..f7440598 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserNameChangedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserNameChangedComposer.java @@ -30,7 +30,7 @@ public class RoomUserNameChangedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomUserNameChangedComposer); + this.response.init(Outgoing.UserNameChangedMessageComposer); this.response.appendInt(this.userId); this.response.appendInt(this.roomId); this.response.appendString(this.name); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersAddGuildBadgeComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersAddGuildBadgeComposer.java index b8340394..601d9ebc 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersAddGuildBadgeComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersAddGuildBadgeComposer.java @@ -14,7 +14,7 @@ public class RoomUsersAddGuildBadgeComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomUsersGuildBadgesComposer); + this.response.init(Outgoing.HabboGroupBadgesMessageComposer); this.response.appendInt(1); this.response.appendInt(this.guild.getId()); this.response.appendString(this.guild.getBadge()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersGuildBadgesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersGuildBadgesComposer.java index babb2980..578d49a8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersGuildBadgesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersGuildBadgesComposer.java @@ -15,7 +15,7 @@ public class RoomUsersGuildBadgesComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomUsersGuildBadgesComposer); + this.response.init(Outgoing.HabboGroupBadgesMessageComposer); this.response.appendInt(this.guildBadges.size()); this.guildBadges.forEachEntry(new TObjectObjectProcedure() { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/VipTutorialsStartComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/VipTutorialsStartComposer.java index 3c2412c5..b2a74167 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/VipTutorialsStartComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/VipTutorialsStartComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class VipTutorialsStartComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.VipTutorialsStartComposer); + this.response.init(Outgoing.CitizenshipVipOfferPromoEnabledComposer); //Empty Body return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftErrorComposer.java index afb1fde5..6a9899d9 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftErrorComposer.java @@ -18,7 +18,7 @@ public class WelcomeGiftErrorComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.WelcomeGiftErrorComposer); + this.response.init(Outgoing.WelcomeGiftChangeEmailResultComposer); this.response.appendInt(this.error); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserPointsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserPointsComposer.java index 19ffa00c..56997c6c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserPointsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserPointsComposer.java @@ -17,7 +17,7 @@ public class UserPointsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UserPointsComposer); + this.response.init(Outgoing.HabboActivityPointNotificationMessageComposer); this.response.appendInt(this.currentAmount); this.response.appendInt(this.amountAdded); this.response.appendInt(this.type); diff --git a/src/main/java/com/eu/habbo/messages/rcon/FriendRequest.java b/src/main/java/com/eu/habbo/messages/rcon/FriendRequest.java index 59d0bf3b..f61546b6 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/FriendRequest.java +++ b/src/main/java/com/eu/habbo/messages/rcon/FriendRequest.java @@ -34,7 +34,7 @@ public class FriendRequest extends RCONMessage { target.getClient().sendResponse(new MessageComposer() { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FriendRequestComposer); + this.response.init(Outgoing.NewFriendRequestComposer); this.response.appendInt(info.getId()); this.response.appendString(info.getUsername()); this.response.appendString(info.getLook());