Refactoring Outgoing Part 381 - yay

src/main/java/com/eu/habbo/messages/outgoing/Outgoing.java

@@ -15,17 +15,18 @@ public class Outgoing {
     public final static int CarryObjectMessageComposer = 1474;
     public final static int RoomUsersComposer = 374;
     public final static int NewFriendRequestComposer = 2219;
-    public final static int GuildBoughtComposer = 2808;
+    public final static int GuildCreatedMessageComposer = 2808;
     public final static int BadgeReceivedComposer = 2493;
     public final static int RecyclerCompleteComposer = 468;
     public final static int GuildCreationInfoMessageComposer = 2159;
-    public final static int FriendsComposer = 3130;
+    public final static int FriendListFragmentMessageComposer = 3130;
-    public final static int StalkErrorComposer = 3048;
+    public final static int FollowFriendFailedComposer = 3048;
     public final static int TradeCloseWindowComposer = 1001;
     public final static int ObjectRemoveMessageComposer = 2703;
     public final static int InventoryPetsComposer = 3522;
     public final static int UserCreditsComposer = 3475;
     public final static int WiredTriggerDataComposer = 383;
+    public final static int Game2UserLeftGameMessageComposer = 383;
     public final static int TradingCloseComposer = 1373;
     public final static int ModToolUserChatlogComposer = 3377;
     public final static int HabboGroupDetailsMessageComposer = 1702;
@@ -33,12 +34,12 @@ public class Outgoing {
     public final static int ApproveNameMessageComposer = 1503;
     public final static int TradingOpenFailedComposer = 217;
     public final static int UnseenItemsComposer = 2103;
-    public final static int InventoryBotsComposer = 3086;
+    public final static int BotInventoryComposer = 3086;
     public final static int CanCreateRoomComposer = 378;
     public final static int MarketplaceBuyOfferResultComposer = 2032;
     public final static int BonusRareInfoMessageComposer = 1533;
     public final static int CloseConnectionMessageComposer = 122;
-    public final static int UpdateFriendComposer = 2800;
+    public final static int FriendListUpdateComposer = 2800;
     public final static int FloorItemUpdateComposer = 3776;
     public final static int RoomAccessDeniedComposer = 878;
     public final static int GuildFurniWidgetComposer = 3293;
@@ -50,17 +51,18 @@ public class Outgoing {
     public final static int UserFlatCatsComposer = 1562;
     public final static int BadgePointLimitsComposer = 2501;
     public final static int MarketplaceItemInfoComposer = 725;
-    public final static int RoomRelativeMapComposer = 2753;
+    public final static int HeightMapComposer = 2753;
     public final static int ModeratorActionResultMessageComposer = 2335;
-    public final static int ModToolComposerOne = 3192;
+    public final static int IssueDeletedMessageComposer = 3192;
     public final static int RoomRightsComposer = 780;
-    public final static int ObjectOnRollerComposer = 3207;
+    public final static int SlideObjectBundleMessageComposer = 3207;
     public final static int PollStartComposer = 3785;
     public final static int GuildMembershipRejectedMessageComposer = 2445;
     public final static int PerkAllowancesComposer = 2586;
     public final static int TalentTrackLevelMessageEvent = 1203;
     public final static int PublicRoomsComposer = -1;//error 404
     public final static int MarketplaceOffersComposer = 680;
+    public final static int FaqCategoriesMessageComposer = 2756;
     public final static int ModeratorInitMessageComposer = 2696;
     public final static int UserBadgesComposer = 1087;
     public final static int GuildManageComposer = 3965;
@@ -74,9 +76,10 @@ public class Outgoing {
     public final static int RoomChatSettingsMessageComposer = 1191;
     public final static int FurniListRemoveComposer = 159;
     public final static int UserRemoveMessageComposer = 2661;
+    public final static int FaqCategoryMessageComposer = 2819;
     public final static int FloorHeightMapComposer = 1301;
     public final static int PetFigureUpdateComposer = 1924;
-    public final static int PetErrorComposer = 2913;
+    public final static int PetPlacingErrorComposer = 2913;
     public final static int TradingItemListComposer = 2024;
     public final static int PrivateRoomsComposer = 52;
     public final static int RoomReadyMessageComposer = 2031;
@@ -90,22 +93,23 @@ public class Outgoing {
     public final static int ChatMessageComposer = 1446;
     public final static int TradingOpenComposer = 2505;
     public final static int FurniListAddOrUpdateComposer = 104;
-    public final static int ModToolIssueUpdateComposer = 3150;
+    public final static int IssuePickFailedMessageComposer = 3150;
     public final static int MeMenuSettingsComposer = 513;
     public final static int ModeratorRoomInfoComposer = 1333;
     public final static int GuildListComposer = 420;
-    public final static int RecyclerLogicComposer = 3164;
+    public final static int RecyclerPrizesComposer = 3164;
-    public final static int UserHomeRoomComposer = 2875;
+    public final static int NavigatorSettingsComposer = 2875;
     public final static int DanceMessageComposer = 2233;
+    public final static int Game2StopCounterMessageComposer = 2233;
     public final static int RoomSettingsUpdatedComposer = 3297;
     public final static int PurchaseErrorMessageComposer = 1404;
     public final static int RoomDataComposer = 687;
     public final static int PopularRoomTagsResultComposer = 2012;
-    public final static int InventoryRefreshComposer = 3151;
+    public final static int FurniListInvalidateComposer = 3151;
     public final static int RemovePetComposer = 3253;
-    public final static int RemoveWallItemComposer = 3208;
+    public final static int ItemRemoveMessageComposer = 3208;
     public final static int TradeCompleteComposer = 2369;
-    public final static int NewsWidgetsComposer = 286;
+    public final static int PromoArticlesMessageComposer = 286;
     public final static int WiredEffectDataComposer = 1434;
     public final static int NotificationDialogMessageComposer = 1992;
     public final static int ReloadRecyclerComposer = 3433;
@@ -116,7 +120,7 @@ public class Outgoing {
     public final static int ChangeUserNameResultMessageEvent = 118;
     public final static int ObjectAddMessageComposer = 1534;
     public final static int EnableNotificationsComposer = 3284;
-    public final static int HallOfFameComposer = 3005;
+    public final static int CommunityGoalHallOfFameMessageComposer = 3005;
     public final static int WiredSavedComposer = 1155;
     public final static int RoomPropertyMessageComposer = 2454;
     public final static int MarketplaceConfigurationComposer = 1823;
@@ -127,7 +131,7 @@ public class Outgoing {
     public final static int ModToolRoomChatlogComposer = 3434;
     public final static int BundleDiscountRulesetMessageComposer = 2347;
     public final static int MarketplaceCancelSaleComposer = 3264;
-    public final static int RoomPetRespectComposer = 2788;
+    public final static int PetRespectNotificationComposer = 2788;
     public final static int RoomSettingsDataComposer = 1498;
     public final static int TalentTrackComposer = 3406;
     public final static int CatalogPagesListComposer = 1032;
@@ -152,24 +156,24 @@ public class Outgoing {
     public final static int WhisperMessageComposer = 2704;
     public final static int BotErrorComposer = 639;
     public final static int GamePlayerValueMessageComposer = 2324;
-    public final static int LoadFriendRequestsComposer = 280;
+    public final static int FriendRequestsComposer = 280;
     public final static int MarketplaceSellItemComposer = 54;
     public final static int HabboClubOffersMessageComposer = 2405;
     public final static int RelationshipStatusInfoComposer = 2016;
     public final static int MarketplaceOwnItemsComposer = 3884;
     public final static int RoomOwnerComposer = 339;
     public final static int WiredConditionDataComposer = 1108;
-    public final static int ModToolUserInfoComposer = 2866;
+    public final static int ModeratorUserInfoComposer = 2866;
     public final static int UserWardrobeComposer = 3315;
     public final static int PetExperienceComposer = 2156;
     public final static int NewConsoleMessageComposer = 1587;
-    public final static int PetInformationComposer = 2901;
+    public final static int PetInfoMessageComposer = 2901;
     public final static int RoomThicknessComposer = 3547;
     public final static int PetAddedToInventoryComposer = 2101;
     public final static int UpdateStackHeightComposer = 558;
     public final static int BotRemovedFromInventoryComposer = 233;
     public final static int RoomEnterErrorComposer = 899;
-    public final static int PollQuestionsComposer = 2997;
+    public final static int PollContentsComposer = 2997;
     public final static int GenericErrorComposer = 1600;
     public final static int ItemsComposer = 1369;
     public final static int AvatarEffectMessageComposer = 1167;
@@ -178,7 +182,7 @@ public class Outgoing {
     public final static int ExpressionMessageComposer = 1631;
     public final static int BotCommandConfigurationComposer = 1618;
     public final static int UserProfileComposer = 3898;
-    public final static int MinimailCountComposer = 2803;
+    public final static int MiniMailUnreadCountComposer = 2803;
     public final static int AchievementsScoreComposer = 1968;
     public final static int PetLevelUpComposer = 859;
     public final static int HabboActivityPointNotificationMessageComposer = 2275;
@@ -196,12 +200,12 @@ public class Outgoing {
     public final static int NewUserIdentityComposer = 3738;
     public final static int NewNavigatorEventCategoriesComposer = 3244;
     public final static int CollapsedCategoriesComposer = 1543;
-    public final static int NewNavigatorLiftedRoomsComposer = 3104;
+    public final static int NavigatorLiftedRoomsComposer = 3104;
     public final static int NewNavigatorSavedSearchesComposer = 3984;
     public final static int ItemDataUpdateMessageComposer = 2202;
     public final static int ModToolReportReceivedAlertComposer = 3635;
     public final static int ModToolIssueResponseAlertComposer = 3796;
-    public final static int AchievementListComposer = 305;
+    public final static int AchievementsComposer = 305;
     public final static int AchievementComposer = 2107;
     public final static int AchievementUnlockedComposer = 806;
     public final static int ClubGiftsComposer = 619;
@@ -210,9 +214,9 @@ public class Outgoing {
     public final static int ModeratorToolPreferencesComposer = 1576;
     public final static int FaqClientFaqsMessageComposer = 2492; // todo
     public final static int IsFirstLoginOfDayComposer = 793;  //Quest Engine
-    public final static int MysteryBoxKeysComposer = 2833;  //Mysterbox
+    public final static int MysteryBoxKeysMessageComposer = 2833;  //Mysterbox
     public final static int IgnoredUsersMessageComposer = 126;
-    public final static int NewNavigatorMetaDataComposer = 3052;
+    public final static int NavigatorMetaDataComposer = 3052;
     public final static int NavigatorSearchResultBlocksComposer = 2690;
     public final static int MysticBoxStartOpenComposer = 3201;
     public final static int MysticBoxCloseComposer = 596;
@@ -221,7 +225,7 @@ public class Outgoing {
     public final static int RentableSpaceRentOkMessageComposer = 2046;
     public final static int RentableSpaceRentFailedMessageComposer = 1868;
     public final static int GuildMemberFurniCountInHQMessageComposer = 1876;
-    public final static int HotelViewBadgeButtonConfigComposer = 2998;
+    public final static int IsBadgeRequestFulfilledComposer = 2998;
     public final static int EpicPopupFrameComposer = 3945;
     public final static int LoadGameUrlMessageComposer = 2624;
     public final static int UserTagsMessageComposer = 1255;
@@ -231,7 +235,7 @@ public class Outgoing {
     public final static int ClubGiftReceivedComposer = 659;
     public final static int OneWayDoorStatusMessageComposer = 2376;
     public final static int ObjectDataUpdateMessageComposer = 2547;
-    public final static int PostUpdateMessageComposer = 324;
+    public final static int UpdateMessageMessageComposer = 324;
     public final static int QuestionInfoComposer = -1;
     public final static int TalentTrackEmailVerifiedComposer = 612;
     public final static int ChangeEmailResultComposer = 1815;
@@ -240,12 +244,12 @@ public class Outgoing {
     public final static int UnreadForumsCountMessageComposer = 2379;
     public final static int PostThreadMessageComposer = 1862;
     public final static int PostMessageMessageComposer = 2049;
-    public final static int GuildForumDataComposer = 3011;
+    public final static int ForumDataMessageComposer = 3011;
     public final static int GuildForumCommentsComposer = 509;
     public final static int UnknownGuildForumComposer6 = -1;
     public final static int UnknownGuildForumComposer7 = -1;
     public final static int GuildForumThreadsComposer = 1073;
-    public final static int GuildForumListComposer = 3001;
+    public final static int ForumsListMessageComposer = 3001;
     public final static int UpdateThreadMessageComposer = 2528;
     public final static int GuideSessionAttachedMessageComposer = 1591;
     public final static int GuideSessionDetachedMessageComposer = 138;
@@ -261,13 +265,13 @@ public class Outgoing {
     public final static int ChatReviewSessionStartedMessageComposer = 143;
     public final static int ChatReviewSessionVotingStatusMessageComposer = 1829;
     public final static int GuardianVotingResultComposer = 3276;
-    public final static int GuardianVotingTimeEnded = 30;
+    public final static int ChatReviewSessionDetachedMessageComposer = 30;
     public final static int MuteAllInRoomComposer = 2533;
     public final static int HideDoorbellComposer = 3783;
     public final static int RoomQueueStatusMessageComposer = 2208;
     public final static int YouAreSpectatorMessageEvent = 1033;
     public final static int AvatarEffectExpiredMessageComposer = 2228;
-    public final static int OldPublicRoomsComposer = 2726;
+    public final static int OfficialRoomsComposer = 2726;
     public final static int ItemStateComposer2 = 3431;
     public final static int HotelWillCloseInMinutesComposer = 1050;
     public final static int MaintenanceStatusMessageComposer = 1350;
@@ -283,7 +287,7 @@ public class Outgoing {
     public final static int AccountSafetyLockStatusChangeMessageComposer = 1243;
     public final static int CloseWebPageComposer = 426;
     public final static int ClubGiftNotificationComposer = 2188;
-    public final static int RemoveGuildFromRoomComposer = 3129;
+    public final static int HabboGroupDeactivatedMessageComposer = 3129;
     public final static int BannedUsersFromRoomComposer = 1869;
     public final static int NoOwnedRoomsAlertMessageComposer = 2064;
     public final static int ObjectsDataUpdateMessageComposer = 1453;
@@ -292,7 +296,7 @@ public class Outgoing {
     public final static int YouAreNotControllerMessageComposer = 2392;
     public final static int GuildEditFailComposer = 3988;
     public final static int MiniMailNewMessageComposer = 1911;
-    public final static int RoomFilterWordsComposer = 2937;
+    public final static int RoomFilterSettingsMessageComposer = 2937;
     public final static int VerifyMobileNumberComposer = 3639;
     public final static int NewUserGiftComposer = 3575;
     public final static int FigureUpdateComposer = 2429;
@@ -303,11 +307,11 @@ public class Outgoing {
     public final static int LoveLockFurniFriendConfirmedComposer = 382;
     public final static int LoveLockFurniFinishedComposer = 770;
     public final static int PetPackageNameValidationComposer = 546;
-    public final static int GameCenterFeaturedPlayersComposer = 3097;
+    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 VerifyMobilePhoneWindowComposer = 2890;
+    public final static int PhoneCollectionStateMessageComposer = 2890;
     public final static int VerifyMobilePhoneCodeWindowComposer = 800;
     public final static int VerifyMobilePhoneDoneComposer = 91;
     public final static int RoomUserReceivedHandItemComposer = 354;
@@ -334,7 +338,7 @@ public class Outgoing {
     public final static int UpdateStackHeightTileHeightComposer = 2816;
     public final static int HotelViewCustomTimerComposer = -1;
     public final static int MarketplaceMakeOfferResult = 1359;
-    public final static int HabboWayQuizComposer2 = 2927;
+    public final static int QuizDataMessageComposer = 2927;
     public final static int GuildFavoriteRoomUserUpdateComposer = 3403;
     public final static int RoomAdErrorComposer = 1759;
     public final static int NewNavigatorSettingsComposer = 518;
@@ -350,14 +354,15 @@ public class Outgoing {
     public final static int AvatarEffectActivatedMessageComposer = 1959;
     public final static int CompetitionEntrySubmitResultComposer = 1177;
     public final static int ExtendClubMessageComposer = 3964;
-    public final static int HotelViewConcurrentUsersComposer = 2737;
+    public final static int ConcurrentUsersGoalProgressMessageComposer = 2737;
     public final static int InventoryAddEffectComposer = -1;//error 404
     public final static int _Str_16258_Composer = 1660; //todo?
+    public final static int _Str_16667_Composer = 1660; //todo?
     public final static int Game2JoiningGameFailedMessageComposer = 1730; // todo?
     public final static int TalentLevelUpdateComposer = 638;
     public final static int BullyReportedMessageComposer = 3285;
     public final static int SeasonalQuestsMessageComposer = 1122;  // todo 14/04/22
-    public final static int FriendToolbarNotificationComposer = 3082;
+    public final static int FriendNotificationComposer = 3082;
     public final static int MessengerErrorComposer = 896;
     public final static int CameraPriceComposer = 3878;
     public final static int NestBreedingSuccessComposer = 2527;
@@ -381,7 +386,7 @@ public class Outgoing {
     public final static int CatalogSearchResultComposer = 3388;
     public final static int FindFriendsProcessResultComposer = 1210;
     public final static int QuestMessageComposer = 230;
-    public final static int ModToolSanctionDataComposer = 2782;
+    public final static int CfhSanctionMessageComposer = 2782;
     public final static int RoomEventComposer = 1840;
     public final static int UserSongDisksInventoryMessageComposer = 2602;
     public final static int JukeBoxNowPlayingMessageComposer = 469;
@@ -401,14 +406,14 @@ public class Outgoing {
     public final static int FaqSearchResultsMessageComposer = 1551;  //todo
     public final static int Game2WeeklyLeaderboardComposer = 2196;
     public final static int UnknownComposer_1165 = 904;
-    public final static int EffectsListAddComposer = 2867;
+    public final static int AvatarEffectAddedMessageComposer = 2867;
     public final static int UnknownComposer_1188 = 1437;  // this string name isnt readable via any source.
     public final static int SubmitCompetitionRoomComposer = 3841;
     public final static int UserGameAchievementsMessageComposer = 2265;
     public final static int TradingOtherNotAllowedComposer = 1254;
     public final static int UnloadGameMessageComposer = 1715;
-    public final static int UnknownComposer_137 = 2897;
+    public final static int RoomSettingsErrorComposer = 2897;
-    public final static int GameCenterAccountInfoComposer = 2893;
+    public final static int Game2AccountGameStatusMessageComposer = 2893;
     public final static int Game2WeeklyFriendsLeaderboardComposer = 2270;
     public final static int BaseJumpLoadGameComposer = 3654;
     public final static int UnknowComposer_1427 = 3319;
@@ -417,7 +422,7 @@ public class Outgoing {
     public final static int WeeklyGameRewardComposer = 2641;
     public final static int NewYearResolutionCompletedComposer = 740;
     public final static int Game2GameDirectoryStatusMessageComposer = 2246;  //todo?
-    public final static int UnknownComposer_1744 = 2873;
+    public final static int TradingNoSuchItemComposer = 2873;
     public final static int CampaignCalendarDoorOpenedMessageComposer = 2551;
     public final static int SanctionStatusComposer = 2221;
     public final static int UnknownComposer_1965 = 3292;
@@ -432,9 +437,9 @@ public class Outgoing {
     public final static int UnknownComposer_2698 = 563;
     public final static int DirectSMSClubBuyAvailableMessageComposer = 195; // todo?
     public final static int HabboWayQuizComposer1 = 3379;
-    public final static int YouTradingDisabledComposer = 3058;
+    public final static int TradingYouAreNotAllowedComposer = 3058;
     public final static int RoomFloorThicknessUpdatedComposer = 3786;
-    public final static int CameraPurchaseSuccesfullComposer = 2783;
+    public final static int CameraPurchaseOKMessageComposer = 2783;
     public final static int CompetitionStatusMessageComposer = 133;
     public final static int CameraURLComposer = 3696;
     public final static int HotelViewCatalogPageExpiringComposer = 690;
@@ -450,10 +455,10 @@ public class Outgoing {
     public final static int SeasonalCalendarDailyOfferMessageComposer = 1889;
     public final static int InClientLinkMessageComposer = 2023;
     public final static int CatalogPageWithEarliestExpiryMessageComposer = 2515;
-    public final static int UnknownHabboWayQuizComposer = 2772;
+    public final static int QuizResultsMessageComposer = 2772;
-    public final static int PetLevelUpdatedComposer = 2824;
+    public final static int PetLevelUpdateComposer = 2824;
-    public final static int QuestExpiredComposer = 3027;
+    public final static int QuestCancelledMessageComposer = 3027;
-    public final static int UnknownTradeComposer = 3128;
+    public final static int TradingNotOpenComposer = 3128;
     public final static int UnknownMessengerErrorComposer = 3359;
     public final static int UnknownComposer8 = 3441;
     public final static int RemoveRoomEventComposer = 3479;
@@ -464,6 +469,7 @@ public class Outgoing {
     public final static int HotelViewSecondsUntilComposer = 3926;
     public final static int UnknownRoomDesktopComposer = 69;
     public final static int UnknownGuildComposer3 = 876;
+    public final static int JoiningQueueFailedMessageComposer = 3035;
     public final static int CatalogPageExpirationComposer = 2668;
     public final static int GameCenterGameComposer = 3805;
 

src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementListComposer.java

@@ -22,7 +22,7 @@ public class AchievementListComposer extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.AchievementListComposer);
+        this.response.init(Outgoing.AchievementsComposer);
 
         try {
             this.response.appendInt(Emulator.getGameEnvironment().getAchievementManager().getAchievements().size());

src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPurchaseSuccesfullComposer.java

@@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing;
 public class CameraPurchaseSuccesfullComposer extends MessageComposer {
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.CameraPurchaseSuccesfullComposer);
+        this.response.init(Outgoing.CameraPurchaseOKMessageComposer);
         return this.response;
     }
 }

src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerLogicComposer.java

@@ -12,7 +12,7 @@ import java.util.Map;
 public class RecyclerLogicComposer extends MessageComposer {
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.RecyclerLogicComposer);
+        this.response.init(Outgoing.RecyclerPrizesComposer);
         this.response.appendInt(Emulator.getGameEnvironment().getCatalogManager().prizes.size());
         for (Map.Entry<Integer, THashSet<Item>> map : Emulator.getGameEnvironment().getCatalogManager().prizes.entrySet()) {
             this.response.appendInt(map.getKey());

src/main/java/com/eu/habbo/messages/outgoing/friends/FriendNotificationComposer.java

@@ -25,7 +25,7 @@ public class FriendNotificationComposer extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.FriendToolbarNotificationComposer);
+        this.response.init(Outgoing.FriendNotificationComposer);
         this.response.appendString(this.userId + "");
         this.response.appendInt(this.type);
         this.response.appendString(this.data);

src/main/java/com/eu/habbo/messages/outgoing/friends/FriendsComposer.java

@@ -28,7 +28,7 @@ public class FriendsComposer extends MessageComposer {
     @Override
     protected ServerMessage composeInternal() {
         try {
-            this.response.init(Outgoing.FriendsComposer);
+            this.response.init(Outgoing.FriendListFragmentMessageComposer);
 
             this.response.appendInt(this.totalPages);
             this.response.appendInt(this.pageIndex);

src/main/java/com/eu/habbo/messages/outgoing/friends/LoadFriendRequestsComposer.java

@@ -15,7 +15,7 @@ public class LoadFriendRequestsComposer extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.LoadFriendRequestsComposer);
+        this.response.init(Outgoing.FriendRequestsComposer);
 
         synchronized (this.habbo.getMessenger().getFriendRequests()) {
             this.response.appendInt(this.habbo.getMessenger().getFriendRequests().size());

src/main/java/com/eu/habbo/messages/outgoing/friends/RemoveFriendComposer.java

@@ -19,7 +19,7 @@ public class RemoveFriendComposer extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.UpdateFriendComposer);
+        this.response.init(Outgoing.FriendListUpdateComposer);
 
         this.response.appendInt(0);
         this.response.appendInt(this.unfriendIds.size());

src/main/java/com/eu/habbo/messages/outgoing/friends/StalkErrorComposer.java

@@ -18,7 +18,7 @@ public class StalkErrorComposer extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.StalkErrorComposer);
+        this.response.init(Outgoing.FollowFriendFailedComposer);
         this.response.appendInt(this.errorCode);
         return this.response;
     }

src/main/java/com/eu/habbo/messages/outgoing/friends/UpdateFriendComposer.java

@@ -33,7 +33,7 @@ public class UpdateFriendComposer extends MessageComposer {
     @Override
     protected ServerMessage composeInternal() {
 
-        this.response.init(Outgoing.UpdateFriendComposer);
+        this.response.init(Outgoing.FriendListUpdateComposer);
         if (this.habbo != null && !this.habbo.getHabboInfo().getMessengerCategories().isEmpty()) {
 
             List<MessengerCategory> messengerCategories = this.habbo.getHabboInfo().getMessengerCategories();

src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterAccountInfoComposer.java

@@ -15,7 +15,7 @@ public class GameCenterAccountInfoComposer extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.GameCenterAccountInfoComposer);
+        this.response.init(Outgoing.Game2AccountGameStatusMessageComposer);
         this.response.appendInt(this.gameId);
         this.response.appendInt(this.gamesLeft);
         this.response.appendInt(1);

src/main/java/com/eu/habbo/messages/outgoing/generic/MinimailCountComposer.java

@@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing;
 public class MinimailCountComposer extends MessageComposer {
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.MinimailCountComposer);
+        this.response.init(Outgoing.MiniMailUnreadCountComposer);
         this.response.appendInt(0);
         return this.response;
     }

src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/PetErrorComposer.java

@@ -20,7 +20,7 @@ public class PetErrorComposer extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.PetErrorComposer);
+        this.response.init(Outgoing.PetPlacingErrorComposer);
         this.response.appendInt(this.errorCode);
         return this.response;
     }

src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingTimeEnded.java

@@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing;
 public class GuardianVotingTimeEnded extends MessageComposer {
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.GuardianVotingTimeEnded);
+        this.response.init(Outgoing.ChatReviewSessionDetachedMessageComposer);
         return this.response;
     }
 }

src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildBoughtComposer.java

@@ -14,7 +14,7 @@ public class GuildBoughtComposer extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.GuildBoughtComposer);
+        this.response.init(Outgoing.GuildCreatedMessageComposer);
         this.response.appendInt(this.guild.getRoomId());
         this.response.appendInt(this.guild.getId());
         return this.response;

src/main/java/com/eu/habbo/messages/outgoing/guilds/RemoveGuildFromRoomComposer.java

@@ -13,7 +13,7 @@ public class RemoveGuildFromRoomComposer extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.RemoveGuildFromRoomComposer);
+        this.response.init(Outgoing.HabboGroupDeactivatedMessageComposer);
         this.response.appendInt(this.guildId);
         return this.response;
     }

src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumDataComposer.java

@@ -103,7 +103,7 @@ public class GuildForumDataComposer extends MessageComposer {
     protected ServerMessage composeInternal() {
 
         try {
-            this.response.init(Outgoing.GuildForumDataComposer);
+            this.response.init(Outgoing.ForumDataMessageComposer);
             serializeForumData(this.response, guild, habbo);
 
             GuildMember member = Emulator.getGameEnvironment().getGuildManager().getGuildMember(guild, habbo);

src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumListComposer.java

@@ -5,7 +5,6 @@ import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
-import gnu.trove.set.hash.THashSet;
 
 import java.util.Iterator;
 import java.util.Set;
@@ -25,7 +24,7 @@ public class GuildForumListComposer extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.GuildForumListComposer);
+        this.response.init(Outgoing.ForumsListMessageComposer);
         this.response.appendInt(this.mode);
         this.response.appendInt(this.guilds.size());
 

src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/PostUpdateMessageComposer.java

@@ -18,7 +18,7 @@ public class PostUpdateMessageComposer extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.PostUpdateMessageComposer);
+        this.response.init(Outgoing.UpdateMessageMessageComposer);
 
         this.response.appendInt(this.guildId); //guild_id
         this.response.appendInt(this.threadId); //thread_id

src/main/java/com/eu/habbo/messages/outgoing/habboway/HabboWayQuizComposer2.java

@@ -15,7 +15,7 @@ public class HabboWayQuizComposer2 extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.HabboWayQuizComposer2);
+        this.response.init(Outgoing.QuizDataMessageComposer);
         this.response.appendString(this.name);
         this.response.appendInt(this.items.length);
         for (int item : this.items) {

src/main/java/com/eu/habbo/messages/outgoing/hotelview/HallOfFameComposer.java

@@ -19,7 +19,7 @@ public class HallOfFameComposer extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.HallOfFameComposer);
+        this.response.init(Outgoing.CommunityGoalHallOfFameMessageComposer);
         this.response.appendString(this.hallOfFame.getCompetitionName());
         this.response.appendInt(this.hallOfFame.getWinners().size());
 

src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewBadgeButtonConfigComposer.java

@@ -15,7 +15,7 @@ public class HotelViewBadgeButtonConfigComposer extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.HotelViewBadgeButtonConfigComposer);
+        this.response.init(Outgoing.IsBadgeRequestFulfilledComposer);
         this.response.appendString(this.badge);
         this.response.appendBoolean(this.enabled);
         return this.response;

src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewConcurrentUsersComposer.java

@@ -21,7 +21,7 @@ public class HotelViewConcurrentUsersComposer extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.HotelViewConcurrentUsersComposer);
+        this.response.init(Outgoing.ConcurrentUsersGoalProgressMessageComposer);
         this.response.appendInt(this.state);
         this.response.appendInt(this.userCount);
         this.response.appendInt(this.goal);

src/main/java/com/eu/habbo/messages/outgoing/hotelview/NewsListComposer.java

@@ -10,7 +10,7 @@ import com.eu.habbo.messages.outgoing.Outgoing;
 public class NewsListComposer extends MessageComposer {
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.NewsWidgetsComposer);
+        this.response.init(Outgoing.PromoArticlesMessageComposer);
         NewsList newsList = Emulator.getGameEnvironment().getHotelViewManager().getNewsList();
 
         this.response.appendInt(newsList.getNewsWidgets().size());

src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListAddComposer.java

@@ -15,7 +15,7 @@ public class EffectsListAddComposer extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.EffectsListAddComposer);
+        this.response.init(Outgoing.AvatarEffectAddedMessageComposer);
         this.response.appendInt(this.effect.effect); //Type
         this.response.appendInt(0); //Unknown Costume?
         this.response.appendInt(effect.duration > 0 ? effect.duration : Integer.MAX_VALUE); //Duration

src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryBotsComposer.java

@@ -16,7 +16,7 @@ public class InventoryBotsComposer extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.InventoryBotsComposer);
+        this.response.init(Outgoing.BotInventoryComposer);
 
         THashMap<Integer, Bot> userBots = this.habbo.getInventory().getBotsComponent().getBots();
         this.response.appendInt(userBots.size());

src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryRefreshComposer.java

@@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing;
 public class InventoryRefreshComposer extends MessageComposer {
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.InventoryRefreshComposer);
+        this.response.init(Outgoing.FurniListInvalidateComposer);
         return this.response;
     }
 }

src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueUpdateComposer.java

@@ -14,7 +14,7 @@ public class ModToolIssueUpdateComposer extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.ModToolIssueUpdateComposer);
+        this.response.init(Outgoing.IssuePickFailedMessageComposer);
         this.issue.serialize(this.response);
         return this.response;
     }

src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java

@@ -25,7 +25,7 @@ public class ModToolUserInfoComposer extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.ModToolUserInfoComposer);
+        this.response.init(Outgoing.ModeratorUserInfoComposer);
         try {
             int totalBans = 0;
 

src/main/java/com/eu/habbo/messages/outgoing/mysterybox/MysteryBoxKeysComposer.java

@@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing;
 public class MysteryBoxKeysComposer extends MessageComposer {
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.MysteryBoxKeysComposer);
+        this.response.init(Outgoing.MysteryBoxKeysMessageComposer);
         this.response.appendString(""); //Box color
         this.response.appendString(""); //Key color
         return this.response;

src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorLiftedRoomsComposer.java

@@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing;
 public class NewNavigatorLiftedRoomsComposer extends MessageComposer {
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.NewNavigatorLiftedRoomsComposer);
+        this.response.init(Outgoing.NavigatorLiftedRoomsComposer);
         this.response.appendInt(0);
         return this.response;
     }

src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorMetaDataComposer.java

@@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing;
 public class NewNavigatorMetaDataComposer extends MessageComposer {
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.NewNavigatorMetaDataComposer);
+        this.response.init(Outgoing.NavigatorMetaDataComposer);
         this.response.appendInt(4);
         this.response.appendString("official_view");
         this.response.appendInt(0);

src/main/java/com/eu/habbo/messages/outgoing/polls/PollQuestionsComposer.java

@@ -15,7 +15,7 @@ public class PollQuestionsComposer extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.PollQuestionsComposer);
+        this.response.init(Outgoing.PollContentsComposer);
 
         this.response.appendInt(this.poll.id);
         this.response.appendString(this.poll.title);

src/main/java/com/eu/habbo/messages/outgoing/quests/QuestExpiredComposer.java

@@ -13,7 +13,7 @@ public class QuestExpiredComposer extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.QuestExpiredComposer);
+        this.response.init(Outgoing.QuestCancelledMessageComposer);
         this.response.appendBoolean(this.expired);
         return this.response;
     }

src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFilterWordsComposer.java

@@ -14,7 +14,7 @@ public class RoomFilterWordsComposer extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.RoomFilterWordsComposer);
+        this.response.init(Outgoing.RoomFilterSettingsMessageComposer);
 
         this.response.appendInt(this.room.getWordFilterWords().size());
 

src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRelativeMapComposer.java

@@ -16,7 +16,7 @@ public class RoomRelativeMapComposer extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.RoomRelativeMapComposer);
+        this.response.init(Outgoing.HeightMapComposer);
         this.response.appendInt(this.room.getLayout().getMapSize() / this.room.getLayout().getMapSizeY());
         this.response.appendInt(this.room.getLayout().getMapSize());
         for (short y = 0; y < this.room.getLayout().getMapSizeY(); y++) {

src/main/java/com/eu/habbo/messages/outgoing/rooms/items/FloorItemOnRollerComposer.java

@@ -6,9 +6,7 @@ import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
-import com.eu.habbo.messages.outgoing.rooms.UpdateStackHeightComposer;
 import gnu.trove.set.hash.THashSet;
-import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
 
 public class FloorItemOnRollerComposer extends MessageComposer {
     private final HabboItem item;
@@ -47,7 +45,7 @@ public class FloorItemOnRollerComposer extends MessageComposer {
         short oldX = this.item.getX();
         short oldY = this.item.getY();
 
-        this.response.init(Outgoing.ObjectOnRollerComposer);
+        this.response.init(Outgoing.SlideObjectBundleMessageComposer);
         this.response.appendInt(this.oldLocation != null ? this.oldLocation.x : this.item.getX());
         this.response.appendInt(this.oldLocation != null ? this.oldLocation.y : this.item.getY());
         this.response.appendInt(this.newLocation.x);

src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RemoveWallItemComposer.java

@@ -14,7 +14,7 @@ public class RemoveWallItemComposer extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.RemoveWallItemComposer);
+        this.response.init(Outgoing.ItemRemoveMessageComposer);
         this.response.appendString(this.item.getId() + "");
         this.response.appendInt(this.item.getUserId());
         return this.response;

src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetInformationComposer.java

@@ -25,7 +25,7 @@ public class PetInformationComposer extends MessageComposer {
     @Override
     protected ServerMessage composeInternal() {
         double days = Math.floor((Emulator.getIntUnixTimestamp() - this.pet.getCreated()) / (3600 * 24));
-        this.response.init(Outgoing.PetInformationComposer);
+        this.response.init(Outgoing.PetInfoMessageComposer);
         this.response.appendInt(this.pet.getId());
         this.response.appendString(this.pet.getName());
         if (this.pet instanceof MonsterplantPet) {

src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetLevelUpdatedComposer.java

@@ -14,7 +14,7 @@ public class PetLevelUpdatedComposer extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.PetLevelUpdatedComposer);
+        this.response.init(Outgoing.PetLevelUpdateComposer);
         this.response.appendInt(this.pet.getRoomUnit().getId());
         this.response.appendInt(this.pet.getId());
         this.response.appendInt(this.pet.getLevel());

src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetRespectComposer.java

@@ -24,7 +24,7 @@ public class RoomPetRespectComposer extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.RoomPetRespectComposer);
+        this.response.init(Outgoing.PetRespectNotificationComposer);
         this.response.appendInt(this.type);
         this.response.appendInt(100);
         this.pet.serialize(this.response);

src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUnitOnRollerComposer.java

@@ -5,12 +5,10 @@ import com.eu.habbo.habbohotel.items.interactions.InteractionRoller;
 import com.eu.habbo.habbohotel.rooms.Room;
 import com.eu.habbo.habbohotel.rooms.RoomTile;
 import com.eu.habbo.habbohotel.rooms.RoomUnit;
-import com.eu.habbo.habbohotel.users.Habbo;
 import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
-import gnu.trove.set.hash.THashSet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -54,7 +52,7 @@ public class RoomUnitOnRollerComposer extends MessageComposer {
         if (!this.room.isLoaded())
             return null;
 
-        this.response.init(Outgoing.ObjectOnRollerComposer);
+        this.response.init(Outgoing.SlideObjectBundleMessageComposer);
         this.response.appendInt(this.oldLocation.x);
         this.response.appendInt(this.oldLocation.y);
         this.response.appendInt(this.newLocation.x);

src/main/java/com/eu/habbo/messages/outgoing/trading/TradeCompleteComposer.java

@@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing;
 public class TradeCompleteComposer extends MessageComposer {
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.UnknownTradeComposer);
+        this.response.init(Outgoing.TradingNotOpenComposer);
         return this.response;
     }
 }

src/main/java/com/eu/habbo/messages/outgoing/trading/YouTradingDisabledComposer.java

@@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing;
 public class YouTradingDisabledComposer extends MessageComposer {
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.YouTradingDisabledComposer);
+        this.response.init(Outgoing.TradingYouAreNotAllowedComposer);
         return this.response;
     }
 }

src/main/java/com/eu/habbo/messages/outgoing/unknown/ModToolComposerOne.java

@@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing;
 public class ModToolComposerOne extends MessageComposer {
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.ModToolComposerOne);
+        this.response.init(Outgoing.IssueDeletedMessageComposer);
 
 
         return this.response;

src/main/java/com/eu/habbo/messages/outgoing/unknown/ModToolSanctionDataComposer.java

@@ -18,7 +18,7 @@ public class ModToolSanctionDataComposer extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.ModToolSanctionDataComposer);
+        this.response.init(Outgoing.CfhSanctionMessageComposer);
         this.response.appendInt(this.unknownInt1);
         this.response.appendInt(this.accountId);
         this.sanction.serialize(this.response);

src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownHabboWayQuizComposer.java

@@ -17,7 +17,7 @@ public class UnknownHabboWayQuizComposer extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.UnknownHabboWayQuizComposer);
+        this.response.init(Outgoing.QuizResultsMessageComposer);
         this.response.appendString(this.unknownString);
         this.response.appendInt(this.unknownIntegerList.size());
         for (Integer i : this.unknownIntegerList) {

src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownTradeComposer.java

@@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing;
 public class UnknownTradeComposer extends MessageComposer {
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.UnknownTradeComposer);
+        this.response.init(Outgoing.TradingNotOpenComposer);
         //Empty Body
         return this.response;
     }

src/main/java/com/eu/habbo/messages/outgoing/users/UserHomeRoomComposer.java

@@ -15,7 +15,7 @@ public class UserHomeRoomComposer extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.UserHomeRoomComposer);
+        this.response.init(Outgoing.NavigatorSettingsComposer);
         this.response.appendInt(this.homeRoom);
         this.response.appendInt(this.roomToEnter);
         return this.response;

src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneWindowComposer.java

@@ -17,7 +17,7 @@ public class VerifyMobilePhoneWindowComposer extends MessageComposer {
 
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.VerifyMobilePhoneWindowComposer);
+        this.response.init(Outgoing.PhoneCollectionStateMessageComposer);
         this.response.appendInt(this.unknownInt1);
         this.response.appendInt(this.unknownInt2);
         this.response.appendInt(this.unknownInt3);