diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomChatMessage.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomChatMessage.java index 294d2749..882469e2 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomChatMessage.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomChatMessage.java @@ -39,7 +39,7 @@ public class RoomChatMessage implements Runnable, ISerialize, DatabaseLoggable { private byte emotion; public RoomChatMessage(MessageHandler message) { - if (message.packet.getMessageId() == Incoming.RoomUserWhisperEvent) { + if (message.packet.getMessageId() == Incoming.WhisperEvent) { String data = message.packet.readString(); this.targetHabbo = message.client.getHabbo().getHabboInfo().getCurrentRoom().getHabbo(data.split(" ")[0]); this.message = data.substring(data.split(" ")[0].length() + 1); diff --git a/src/main/java/com/eu/habbo/messages/PacketManager.java b/src/main/java/com/eu/habbo/messages/PacketManager.java index 9ffa15eb..d8bbbac5 100644 --- a/src/main/java/com/eu/habbo/messages/PacketManager.java +++ b/src/main/java/com/eu/habbo/messages/PacketManager.java @@ -235,7 +235,7 @@ public class PacketManager { this.registerHandler(Incoming.GetCatalogIndexEvent, RequestCatalogModeEvent.class); this.registerHandler(Incoming.RequestCatalogIndexEvent, RequestCatalogIndexEvent.class); this.registerHandler(Incoming.RequestCatalogPageEvent, RequestCatalogPageEvent.class); - this.registerHandler(Incoming.CatalogBuyItemAsGiftEvent, CatalogBuyItemAsGiftEvent.class); + this.registerHandler(Incoming.PurchaseFromCatalogAsGiftEvent, CatalogBuyItemAsGiftEvent.class); this.registerHandler(Incoming.CatalogBuyItemEvent, CatalogBuyItemEvent.class); this.registerHandler(Incoming.RedeemVoucherEvent, RedeemVoucherEvent.class); this.registerHandler(Incoming.GetRecyclerStatusEvent, ReloadRecyclerEvent.class); @@ -245,16 +245,16 @@ public class PacketManager { this.registerHandler(Incoming.TakeBackItemEvent, TakeBackItemEvent.class); this.registerHandler(Incoming.RequestOffersEvent, RequestOffersEvent.class); this.registerHandler(Incoming.RequestItemInfoEvent, RequestItemInfoEvent.class); - this.registerHandler(Incoming.BuyItemEvent, BuyItemEvent.class); + this.registerHandler(Incoming.BuyMarketplaceOfferEvent, BuyItemEvent.class); this.registerHandler(Incoming.RequestSellItemEvent, RequestSellItemEvent.class); this.registerHandler(Incoming.SellItemEvent, SellItemEvent.class); this.registerHandler(Incoming.RequestCreditsEvent, RequestCreditsEvent.class); - this.registerHandler(Incoming.RequestPetBreedsEvent, RequestPetBreedsEvent.class); + this.registerHandler(Incoming.GetSellablePetPalettesEvent, RequestPetBreedsEvent.class); this.registerHandler(Incoming.CheckPetNameEvent, CheckPetNameEvent.class); this.registerHandler(Incoming.GetClubDataEvent, RequestClubDataEvent.class); this.registerHandler(Incoming.RequestClubGiftsEvent, RequestClubGiftsEvent.class); this.registerHandler(Incoming.CatalogSearchedItemEvent, CatalogSearchedItemEvent.class); - this.registerHandler(Incoming.PurchaseTargetOfferEvent, PurchaseTargetOfferEvent.class); + this.registerHandler(Incoming.PurchaseTargetedOfferEvent, PurchaseTargetOfferEvent.class); this.registerHandler(Incoming.TargetOfferStateEvent, TargetOfferStateEvent.class); this.registerHandler(Incoming.CatalogSelectClubGiftEvent, CatalogSelectClubGiftEvent.class); this.registerHandler(Incoming.RequestClubCenterEvent, RequestClubCenterEvent.class); @@ -278,7 +278,7 @@ public class PacketManager { } private void registerFriends() throws Exception { - this.registerHandler(Incoming.RequestFriendsEvent, RequestFriendsEvent.class); + this.registerHandler(Incoming.GetMOTDEvent, RequestFriendsEvent.class); this.registerHandler(Incoming.ChangeRelationEvent, ChangeRelationEvent.class); this.registerHandler(Incoming.RemoveFriendEvent, RemoveFriendEvent.class); this.registerHandler(Incoming.HabboSearchEvent, SearchUserEvent.class); @@ -308,14 +308,14 @@ public class PacketManager { this.registerHandler(Incoming.UserWearBadgeEvent, UserWearBadgeEvent.class); this.registerHandler(Incoming.RequestWearingBadgesEvent, RequestWearingBadgesEvent.class); this.registerHandler(Incoming.SetSoundSettingsEvent, SaveUserVolumesEvent.class); - this.registerHandler(Incoming.SaveBlockCameraFollowEvent, SaveBlockCameraFollowEvent.class); + this.registerHandler(Incoming.SetRoomCameraPreferencesEvent, SaveBlockCameraFollowEvent.class); this.registerHandler(Incoming.SetIgnoreRoomInvitesEvent, SaveIgnoreRoomInvitesEvent.class); this.registerHandler(Incoming.SetChatPreferencesEvent, SavePreferOldChatEvent.class); this.registerHandler(Incoming.AvatarEffectActivatedEvent, ActivateEffectEvent.class); this.registerHandler(Incoming.AvatarEffectSelectedEvent, EnableEffectEvent.class); this.registerHandler(Incoming.EventLogEvent, UserActivityEvent.class); this.registerHandler(Incoming.NewUserExperienceScriptProceedEvent, UserNuxEvent.class); - this.registerHandler(Incoming.PickNewUserGiftEvent, PickNewUserGiftEvent.class); + this.registerHandler(Incoming.NewUserExperienceGetGiftsEvent, PickNewUserGiftEvent.class); this.registerHandler(Incoming.CheckUserNameEvent, ChangeNameCheckUsernameEvent.class); this.registerHandler(Incoming.ChangeUserNameEvent, ConfirmChangeNameEvent.class); this.registerHandler(Incoming.SetChatStylePreferenceEvent, ChangeChatBubbleEvent.class); @@ -333,7 +333,7 @@ public class PacketManager { this.registerHandler(Incoming.RequestTagsEvent, RequestTagsEvent.class); this.registerHandler(Incoming.SearchRoomsByTagEvent, SearchRoomsByTagEvent.class); this.registerHandler(Incoming.SearchRoomsEvent, SearchRoomsEvent.class); - this.registerHandler(Incoming.SearchRoomsFriendsNowEvent, SearchRoomsFriendsNowEvent.class); + this.registerHandler(Incoming.RoomsWhereMyFriendsAreSearchEvent, SearchRoomsFriendsNowEvent.class); this.registerHandler(Incoming.SearchRoomsFriendsOwnEvent, SearchRoomsFriendsOwnEvent.class); this.registerHandler(Incoming.SearchRoomsWithRightsEvent, SearchRoomsWithRightsEvent.class); this.registerHandler(Incoming.SearchRoomsInGroupEvent, SearchRoomsInGroupEvent.class); @@ -341,21 +341,21 @@ public class PacketManager { this.registerHandler(Incoming.SearchRoomsVisitedEvent, SearchRoomsVisitedEvent.class); this.registerHandler(Incoming.RequestNewNavigatorDataEvent, RequestNewNavigatorDataEvent.class); this.registerHandler(Incoming.RequestNewNavigatorRoomsEvent, RequestNewNavigatorRoomsEvent.class); - this.registerHandler(Incoming.NewNavigatorActionEvent, NewNavigatorActionEvent.class); - this.registerHandler(Incoming.RequestNavigatorSettingsEvent, RequestNavigatorSettingsEvent.class); + this.registerHandler(Incoming.ForwardToSomeRoomEvent, NewNavigatorActionEvent.class); + this.registerHandler(Incoming.GetUserEventCatsEvent, RequestNavigatorSettingsEvent.class); this.registerHandler(Incoming.SaveWindowSettingsEvent, SaveWindowSettingsEvent.class); this.registerHandler(Incoming.RequestDeleteRoomEvent, RequestDeleteRoomEvent.class); this.registerHandler(Incoming.NavigatorSetSearchCodeViewModeEvent, NavigatorCategoryListModeEvent.class); - this.registerHandler(Incoming.NavigatorCollapseCategoryEvent, NavigatorCollapseCategoryEvent.class); + this.registerHandler(Incoming.NavigatorAddCollapsedCategoryEvent, NavigatorCollapseCategoryEvent.class); this.registerHandler(Incoming.NavigatorUncollapseCategoryEvent, NavigatorUncollapseCategoryEvent.class); this.registerHandler(Incoming.AddSavedSearchEvent, AddSavedSearchEvent.class); - this.registerHandler(Incoming.DeleteSavedSearchEvent, DeleteSavedSearchEvent.class); + this.registerHandler(Incoming.NavigatorDeleteSavedSearchEvent, DeleteSavedSearchEvent.class); } private void registerHotelview() throws Exception { this.registerHandler(Incoming.QuitEvent, HotelViewEvent.class); this.registerHandler(Incoming.HotelViewRequestBonusRareEvent, HotelViewRequestBonusRareEvent.class); - this.registerHandler(Incoming.RequestNewsListEvent, RequestNewsListEvent.class); + this.registerHandler(Incoming.GetPromoArticlesEvent, RequestNewsListEvent.class); this.registerHandler(Incoming.HotelViewDataEvent, HotelViewDataEvent.class); this.registerHandler(Incoming.HotelViewRequestBadgeRewardEvent, HotelViewRequestBadgeRewardEvent.class); this.registerHandler(Incoming.HotelViewClaimBadgeRewardEvent, HotelViewClaimBadgeRewardEvent.class); @@ -377,14 +377,14 @@ public class PacketManager { this.registerHandler(Incoming.RequestRoomHeightmapEvent, RequestRoomHeightmapEvent.class); this.registerHandler(Incoming.RoomVoteEvent, RoomVoteEvent.class); this.registerHandler(Incoming.RequestRoomDataEvent, RequestRoomDataEvent.class); - this.registerHandler(Incoming.RoomSettingsSaveEvent, RoomSettingsSaveEvent.class); + this.registerHandler(Incoming.SaveRoomSettingsEvent, RoomSettingsSaveEvent.class); this.registerHandler(Incoming.PlaceObjectEvent, RoomPlaceItemEvent.class); this.registerHandler(Incoming.RotateMoveItemEvent, RotateMoveItemEvent.class); this.registerHandler(Incoming.MoveWallItemEvent, MoveWallItemEvent.class); this.registerHandler(Incoming.RoomPickupItemEvent, RoomPickupItemEvent.class); this.registerHandler(Incoming.RoomPlacePaintEvent, RoomPlacePaintEvent.class); - this.registerHandler(Incoming.RoomUserStartTypingEvent, RoomUserStartTypingEvent.class); - this.registerHandler(Incoming.RoomUserStopTypingEvent, RoomUserStopTypingEvent.class); + this.registerHandler(Incoming.StartTypingEvent, RoomUserStartTypingEvent.class); + this.registerHandler(Incoming.CancelTypingEvent, RoomUserStopTypingEvent.class); this.registerHandler(Incoming.ToggleFloorItemEvent, ToggleFloorItemEvent.class); this.registerHandler(Incoming.ToggleWallItemEvent, ToggleWallItemEvent.class); this.registerHandler(Incoming.RoomBackgroundEvent, RoomBackgroundEvent.class); @@ -399,11 +399,11 @@ public class PacketManager { this.registerHandler(Incoming.RoomUserLookAtPoint, RoomUserLookAtPoint.class); this.registerHandler(Incoming.ChatEvent, RoomUserTalkEvent.class); this.registerHandler(Incoming.RoomUserShoutEvent, RoomUserShoutEvent.class); - this.registerHandler(Incoming.RoomUserWhisperEvent, RoomUserWhisperEvent.class); + this.registerHandler(Incoming.WhisperEvent, RoomUserWhisperEvent.class); this.registerHandler(Incoming.RoomUserActionEvent, RoomUserActionEvent.class); this.registerHandler(Incoming.RoomUserSitEvent, RoomUserSitEvent.class); this.registerHandler(Incoming.RoomUserDanceEvent, RoomUserDanceEvent.class); - this.registerHandler(Incoming.RoomUserSignEvent, RoomUserSignEvent.class); + this.registerHandler(Incoming.SignEvent, RoomUserSignEvent.class); this.registerHandler(Incoming.RoomUserWalkEvent, RoomUserWalkEvent.class); this.registerHandler(Incoming.RoomUserGiveRespectEvent, RoomUserGiveRespectEvent.class); this.registerHandler(Incoming.RoomUserGiveRightsEvent, RoomUserGiveRightsEvent.class); @@ -411,33 +411,33 @@ public class PacketManager { this.registerHandler(Incoming.RequestRoomRightsEvent, RequestRoomRightsEvent.class); this.registerHandler(Incoming.RoomRemoveAllRightsEvent, RoomRemoveAllRightsEvent.class); this.registerHandler(Incoming.RoomUserRemoveRightsEvent, RoomUserRemoveRightsEvent.class); - this.registerHandler(Incoming.BotPlaceEvent, BotPlaceEvent.class); + this.registerHandler(Incoming.PlaceBotEvent, BotPlaceEvent.class); this.registerHandler(Incoming.BotPickupEvent, BotPickupEvent.class); this.registerHandler(Incoming.BotSaveSettingsEvent, BotSaveSettingsEvent.class); - this.registerHandler(Incoming.BotSettingsEvent, BotSettingsEvent.class); - this.registerHandler(Incoming.TriggerDiceEvent, TriggerDiceEvent.class); - this.registerHandler(Incoming.CloseDiceEvent, CloseDiceEvent.class); + this.registerHandler(Incoming.GetBotCommandConfigurationDataEvent, BotSettingsEvent.class); + this.registerHandler(Incoming.ThrowDiceEvent, TriggerDiceEvent.class); + this.registerHandler(Incoming.DiceOffEvent, CloseDiceEvent.class); this.registerHandler(Incoming.TriggerColorWheelEvent, TriggerColorWheelEvent.class); this.registerHandler(Incoming.RedeemItemEvent, RedeemItemEvent.class); this.registerHandler(Incoming.PetPlaceEvent, PetPlaceEvent.class); this.registerHandler(Incoming.RoomUserKickEvent, RoomUserKickEvent.class); this.registerHandler(Incoming.SetStackHelperHeightEvent, SetStackHelperHeightEvent.class); this.registerHandler(Incoming.TriggerOneWayGateEvent, TriggerOneWayGateEvent.class); - this.registerHandler(Incoming.HandleDoorbellEvent, HandleDoorbellEvent.class); + this.registerHandler(Incoming.LetUserInEvent, HandleDoorbellEvent.class); this.registerHandler(Incoming.RedeemClothingEvent, RedeemClothingEvent.class); this.registerHandler(Incoming.PostItPlaceEvent, PostItPlaceEvent.class); this.registerHandler(Incoming.PostItRequestDataEvent, PostItRequestDataEvent.class); this.registerHandler(Incoming.PostItSaveDataEvent, PostItSaveDataEvent.class); this.registerHandler(Incoming.PostItDeleteEvent, PostItDeleteEvent.class); - this.registerHandler(Incoming.MoodLightSaveSettingsEvent, MoodLightSaveSettingsEvent.class); + this.registerHandler(Incoming.RoomDimmerSavePresetEvent, MoodLightSaveSettingsEvent.class); this.registerHandler(Incoming.RentSpaceEvent, RentSpaceEvent.class); - this.registerHandler(Incoming.RentSpaceCancelEvent, RentSpaceCancelEvent.class); - this.registerHandler(Incoming.SetHomeRoomEvent, SetHomeRoomEvent.class); + this.registerHandler(Incoming.RentableSpaceCancelRentEvent, RentSpaceCancelEvent.class); + this.registerHandler(Incoming.UpdateHomeRoomEvent, SetHomeRoomEvent.class); this.registerHandler(Incoming.RoomUserGiveHandItemEvent, RoomUserGiveHandItemEvent.class); this.registerHandler(Incoming.RoomMuteEvent, RoomMuteEvent.class); - this.registerHandler(Incoming.RequestRoomWordFilterEvent, RequestRoomWordFilterEvent.class); + this.registerHandler(Incoming.GetCustomRoomFilterEvent, RequestRoomWordFilterEvent.class); this.registerHandler(Incoming.RoomWordFilterModifyEvent, RoomWordFilterModifyEvent.class); - this.registerHandler(Incoming.RoomStaffPickEvent, RoomStaffPickEvent.class); + this.registerHandler(Incoming.ToggleStaffPickEvent, RoomStaffPickEvent.class); this.registerHandler(Incoming.RoomRequestBannedUsersEvent, RoomRequestBannedUsersEvent.class); this.registerHandler(Incoming.JukeBoxRequestTrackCodeEvent, JukeBoxRequestTrackCodeEvent.class); this.registerHandler(Incoming.JukeBoxRequestTrackDataEvent, JukeBoxRequestTrackDataEvent.class); @@ -445,7 +445,7 @@ public class PacketManager { this.registerHandler(Incoming.JukeBoxRemoveSoundTrackEvent, JukeBoxRemoveSoundTrackEvent.class); this.registerHandler(Incoming.GetNowPlayingEvent, JukeBoxRequestPlayListEvent.class); this.registerHandler(Incoming.JukeBoxEventOne, JukeBoxEventOne.class); - this.registerHandler(Incoming.JukeBoxEventTwo, JukeBoxEventTwo.class); + this.registerHandler(Incoming.GetJukeboxPlayListEvent, JukeBoxEventTwo.class); this.registerHandler(Incoming.SavePostItStickyPoleEvent, SavePostItStickyPoleEvent.class); this.registerHandler(Incoming.GetRoomAdPurchaseInfoEvent, RequestPromotionRoomsEvent.class); this.registerHandler(Incoming.BuyRoomPromotionEvent, BuyRoomPromotionEvent.class); @@ -453,9 +453,9 @@ public class PacketManager { this.registerHandler(Incoming.IgnoreUserEvent, IgnoreRoomUserEvent.class); this.registerHandler(Incoming.UnIgnoreRoomUserEvent, UnIgnoreRoomUserEvent.class); this.registerHandler(Incoming.RoomUserMuteEvent, RoomUserMuteEvent.class); - this.registerHandler(Incoming.RoomUserBanEvent, RoomUserBanEvent.class); + this.registerHandler(Incoming.BanUserWithDurationEvent, RoomUserBanEvent.class); this.registerHandler(Incoming.UnbanRoomUserEvent, UnbanRoomUserEvent.class); - this.registerHandler(Incoming.RequestRoomUserTagsEvent, RequestRoomUserTagsEvent.class); + this.registerHandler(Incoming.GetUserTagsEvent, RequestRoomUserTagsEvent.class); this.registerHandler(Incoming.YoutubeRequestPlaylists, YoutubeRequestPlaylists.class); this.registerHandler(Incoming.YoutubeRequestStateChange, YoutubeRequestStateChange.class); this.registerHandler(Incoming.YoutubeRequestPlaylistChange, YoutubeRequestPlaylistChange.class); @@ -466,7 +466,7 @@ public class PacketManager { } void registerPolls() throws Exception { - this.registerHandler(Incoming.CancelPollEvent, CancelPollEvent.class); + this.registerHandler(Incoming.PollRejectEvent, CancelPollEvent.class); this.registerHandler(Incoming.PollStartEvent, GetPollDataEvent.class); this.registerHandler(Incoming.AnswerPollEvent, AnswerPollEvent.class); } @@ -475,10 +475,10 @@ public class PacketManager { this.registerHandler(Incoming.ModToolRequestRoomInfoEvent, ModToolRequestRoomInfoEvent.class); this.registerHandler(Incoming.ModToolRequestRoomChatlogEvent, ModToolRequestRoomChatlogEvent.class); this.registerHandler(Incoming.ModToolRequestUserInfoEvent, ModToolRequestUserInfoEvent.class); - this.registerHandler(Incoming.ModToolPickTicketEvent, ModToolPickTicketEvent.class); + this.registerHandler(Incoming.PickIssuesEvent, ModToolPickTicketEvent.class); this.registerHandler(Incoming.ModToolCloseTicketEvent, ModToolCloseTicketEvent.class); - this.registerHandler(Incoming.ModToolReleaseTicketEvent, ModToolReleaseTicketEvent.class); - this.registerHandler(Incoming.ModToolAlertEvent, ModToolAlertEvent.class); + this.registerHandler(Incoming.ReleaseIssuesEvent, ModToolReleaseTicketEvent.class); + this.registerHandler(Incoming.ModMessageEvent, ModToolAlertEvent.class); this.registerHandler(Incoming.ModToolWarnEvent, ModToolWarnEvent.class); this.registerHandler(Incoming.ModToolKickEvent, ModToolKickEvent.class); this.registerHandler(Incoming.ModToolRoomAlertEvent, ModToolRoomAlertEvent.class); @@ -486,31 +486,31 @@ public class PacketManager { this.registerHandler(Incoming.ModToolRequestRoomVisitsEvent, ModToolRequestRoomVisitsEvent.class); this.registerHandler(Incoming.ModToolRequestIssueChatlogEvent, ModToolRequestIssueChatlogEvent.class); this.registerHandler(Incoming.ModToolRequestRoomUserChatlogEvent, ModToolRequestRoomUserChatlogEvent.class); - this.registerHandler(Incoming.ModToolRequestUserChatlogEvent, ModToolRequestUserChatlogEvent.class); + this.registerHandler(Incoming.GetUserChatlogEvent, ModToolRequestUserChatlogEvent.class); this.registerHandler(Incoming.ModToolSanctionAlertEvent, ModToolSanctionAlertEvent.class); - this.registerHandler(Incoming.ModToolSanctionMuteEvent, ModToolSanctionMuteEvent.class); + this.registerHandler(Incoming.ModMuteEvent, ModToolSanctionMuteEvent.class); this.registerHandler(Incoming.ModToolSanctionBanEvent, ModToolSanctionBanEvent.class); this.registerHandler(Incoming.ModToolSanctionTradeLockEvent, ModToolSanctionTradeLockEvent.class); - this.registerHandler(Incoming.ModToolIssueChangeTopicEvent, ModToolIssueChangeTopicEvent.class); + this.registerHandler(Incoming.ModToolSanctionEvent, ModToolIssueChangeTopicEvent.class); this.registerHandler(Incoming.ModToolIssueDefaultSanctionEvent, ModToolIssueDefaultSanctionEvent.class); this.registerHandler(Incoming.RequestReportRoomEvent, RequestReportRoomEvent.class); this.registerHandler(Incoming.RequestReportUserBullyingEvent, RequestReportUserBullyingEvent.class); this.registerHandler(Incoming.ReportBullyEvent, ReportBullyEvent.class); - this.registerHandler(Incoming.ReportEvent, ReportEvent.class); + this.registerHandler(Incoming.CallForHelpEvent, ReportEvent.class); this.registerHandler(Incoming.ReportFriendPrivateChatEvent, ReportFriendPrivateChatEvent.class); this.registerHandler(Incoming.ReportThreadEvent, ReportThreadEvent.class); - this.registerHandler(Incoming.ReportCommentEvent, ReportCommentEvent.class); + this.registerHandler(Incoming.CallForHelpFromForumMessageEvent, ReportCommentEvent.class); this.registerHandler(Incoming.ReportPhotoEvent, ReportPhotoEvent.class); } void registerTrading() throws Exception { - this.registerHandler(Incoming.TradeStartEvent, TradeStartEvent.class); + this.registerHandler(Incoming.OpenTradingEvent, TradeStartEvent.class); this.registerHandler(Incoming.TradeOfferItemEvent, TradeOfferItemEvent.class); this.registerHandler(Incoming.AddItemsToTradeEvent, TradeOfferMultipleItemsEvent.class); this.registerHandler(Incoming.TradeCancelOfferItemEvent, TradeCancelOfferItemEvent.class); this.registerHandler(Incoming.TradeAcceptEvent, TradeAcceptEvent.class); - this.registerHandler(Incoming.TradeUnAcceptEvent, TradeUnAcceptEvent.class); + this.registerHandler(Incoming.UnacceptTradingEvent, TradeUnAcceptEvent.class); this.registerHandler(Incoming.TradeConfirmEvent, TradeConfirmEvent.class); this.registerHandler(Incoming.TradeCloseEvent, TradeCloseEvent.class); this.registerHandler(Incoming.TradeCancelEvent, TradeCancelEvent.class); @@ -525,19 +525,19 @@ public class PacketManager { this.registerHandler(Incoming.RequestGuildMembersEvent, RequestGuildMembersEvent.class); this.registerHandler(Incoming.RequestGuildJoinEvent, RequestGuildJoinEvent.class); this.registerHandler(Incoming.GuildChangeNameDescEvent, GuildChangeNameDescEvent.class); - this.registerHandler(Incoming.GuildChangeBadgeEvent, GuildChangeBadgeEvent.class); - this.registerHandler(Incoming.GuildChangeColorsEvent, GuildChangeColorsEvent.class); + this.registerHandler(Incoming.UpdateGuildBadgeEvent, GuildChangeBadgeEvent.class); + this.registerHandler(Incoming.UpdateGuildColorsEvent, GuildChangeColorsEvent.class); this.registerHandler(Incoming.GuildRemoveAdminEvent, GuildRemoveAdminEvent.class); this.registerHandler(Incoming.GuildRemoveMemberEvent, GuildRemoveMemberEvent.class); this.registerHandler(Incoming.GuildChangeSettingsEvent, GuildChangeSettingsEvent.class); this.registerHandler(Incoming.GuildAcceptMembershipEvent, GuildAcceptMembershipEvent.class); - this.registerHandler(Incoming.GuildDeclineMembershipEvent, GuildDeclineMembershipEvent.class); + this.registerHandler(Incoming.RejectMembershipRequestEvent, GuildDeclineMembershipEvent.class); this.registerHandler(Incoming.GuildSetAdminEvent, GuildSetAdminEvent.class); this.registerHandler(Incoming.GuildSetFavoriteEvent, GuildSetFavoriteEvent.class); this.registerHandler(Incoming.RequestOwnGuildsEvent, RequestOwnGuildsEvent.class); this.registerHandler(Incoming.RequestGuildFurniWidgetEvent, RequestGuildFurniWidgetEvent.class); this.registerHandler(Incoming.GuildConfirmRemoveMemberEvent, GuildConfirmRemoveMemberEvent.class); - this.registerHandler(Incoming.GuildRemoveFavoriteEvent, GuildRemoveFavoriteEvent.class); + this.registerHandler(Incoming.DeselectFavouriteHabboGroupEvent, GuildRemoveFavoriteEvent.class); this.registerHandler(Incoming.DeactivateGuildEvent, GuildDeleteEvent.class); this.registerHandler(Incoming.GuildForumListEvent, GuildForumListEvent.class); this.registerHandler(Incoming.GuildForumThreadsEvent, GuildForumThreadsEvent.class); @@ -546,7 +546,7 @@ public class PacketManager { this.registerHandler(Incoming.GuildForumUpdateSettingsEvent, GuildForumUpdateSettingsEvent.class); this.registerHandler(Incoming.GuildForumThreadsMessagesEvent, GuildForumThreadsMessagesEvent.class); this.registerHandler(Incoming.GuildForumModerateMessageEvent, GuildForumModerateMessageEvent.class); - this.registerHandler(Incoming.GuildForumModerateThreadEvent, GuildForumModerateThreadEvent.class); + this.registerHandler(Incoming.ModerateThreadEvent, GuildForumModerateThreadEvent.class); this.registerHandler(Incoming.GuildForumThreadUpdateEvent, GuildForumThreadUpdateEvent.class); this.registerHandler(Incoming.GetHabboGuildBadgesMessageEvent, GetHabboGuildBadgesMessageEvent.class); @@ -560,16 +560,16 @@ public class PacketManager { void registerPets() throws Exception { this.registerHandler(Incoming.RequestPetInformationEvent, RequestPetInformationEvent.class); - this.registerHandler(Incoming.PetPickupEvent, PetPickupEvent.class); + this.registerHandler(Incoming.RemovePetFromFlatEvent, PetPickupEvent.class); this.registerHandler(Incoming.ScratchPetEvent, ScratchPetEvent.class); this.registerHandler(Incoming.RequestPetTrainingPanelEvent, RequestPetTrainingPanelEvent.class); this.registerHandler(Incoming.CustomizePetWithFurniEvent, PetUseItemEvent.class); - this.registerHandler(Incoming.HorseRideSettingsEvent, PetRideSettingsEvent.class); + this.registerHandler(Incoming.TogglePetRidingPermissionEvent, PetRideSettingsEvent.class); this.registerHandler(Incoming.MountPetEvent, PetRideEvent.class); - this.registerHandler(Incoming.HorseRemoveSaddleEvent, HorseRemoveSaddleEvent.class); + this.registerHandler(Incoming.RemoveSaddleFromPetEvent, HorseRemoveSaddleEvent.class); this.registerHandler(Incoming.ToggleMonsterplantBreedableEvent, ToggleMonsterplantBreedableEvent.class); this.registerHandler(Incoming.CompostMonsterplantEvent, CompostMonsterplantEvent.class); - this.registerHandler(Incoming.BreedMonsterplantsEvent, BreedMonsterplantsEvent.class); + this.registerHandler(Incoming.BreedPetsEvent, BreedMonsterplantsEvent.class); this.registerHandler(Incoming.MovePetEvent, MovePetEvent.class); this.registerHandler(Incoming.PetPackageNameEvent, PetPackageNameEvent.class); this.registerHandler(Incoming.StopBreedingEvent, StopBreedingEvent.class); @@ -577,7 +577,7 @@ public class PacketManager { } void registerWired() throws Exception { - this.registerHandler(Incoming.WiredTriggerSaveDataEvent, WiredTriggerSaveDataEvent.class); + this.registerHandler(Incoming.UpdateTriggerEvent, WiredTriggerSaveDataEvent.class); this.registerHandler(Incoming.WiredEffectSaveDataEvent, WiredEffectSaveDataEvent.class); this.registerHandler(Incoming.WiredConditionSaveDataEvent, WiredConditionSaveDataEvent.class); this.registerHandler(Incoming.WiredApplySetConditionsEvent, WiredApplySetConditionsEvent.class); @@ -585,14 +585,14 @@ public class PacketManager { void registerUnknown() throws Exception { this.registerHandler(Incoming.RequestResolutionEvent, RequestResolutionEvent.class); - this.registerHandler(Incoming.RequestTalenTrackEvent, RequestTalentTrackEvent.class); + this.registerHandler(Incoming.GetTalentTrackEvent, RequestTalentTrackEvent.class); this.registerHandler(Incoming.GetBadgePointLimitsEvent, GetBadgePointLimitsEvent.class); this.registerHandler(Incoming.MySanctionStatusEvent, MySanctionStatusEvent.class); } void registerFloorPlanEditor() throws Exception { this.registerHandler(Incoming.FloorPlanEditorSaveEvent, FloorPlanEditorSaveEvent.class); - this.registerHandler(Incoming.FloorPlanEditorRequestBlockedTilesEvent, FloorPlanEditorRequestBlockedTilesEvent.class); + this.registerHandler(Incoming.GetOccupiedTilesEvent, FloorPlanEditorRequestBlockedTilesEvent.class); this.registerHandler(Incoming.FloorPlanEditorRequestDoorSettingsEvent, FloorPlanEditorRequestDoorSettingsEvent.class); } @@ -602,14 +602,14 @@ public class PacketManager { } void registerGuides() throws Exception { - this.registerHandler(Incoming.RequestGuideToolEvent, RequestGuideToolEvent.class); + this.registerHandler(Incoming.GuideSessionOnDutyUpdateEvent, RequestGuideToolEvent.class); this.registerHandler(Incoming.RequestGuideAssistanceEvent, RequestGuideAssistanceEvent.class); this.registerHandler(Incoming.GuideUserTypingEvent, GuideUserTypingEvent.class); this.registerHandler(Incoming.GuideReportHelperEvent, GuideReportHelperEvent.class); this.registerHandler(Incoming.GuideRecommendHelperEvent, GuideRecommendHelperEvent.class); this.registerHandler(Incoming.GuideUserMessageEvent, GuideUserMessageEvent.class); this.registerHandler(Incoming.GuideCancelHelpRequestEvent, GuideCancelHelpRequestEvent.class); - this.registerHandler(Incoming.GuideHandleHelpRequestEvent, GuideHandleHelpRequestEvent.class); + this.registerHandler(Incoming.GuideSessionGuideDecidesEvent, GuideHandleHelpRequestEvent.class); this.registerHandler(Incoming.GuideInviteUserEvent, GuideInviteUserEvent.class); this.registerHandler(Incoming.GuideSessionGetRequesterRoomEvent, GuideVisitUserEvent.class); this.registerHandler(Incoming.GuideCloseHelpRequestEvent, GuideCloseHelpRequestEvent.class); @@ -631,14 +631,14 @@ public class PacketManager { this.registerHandler(Incoming.CameraRoomPictureEvent, CameraRoomPictureEvent.class); this.registerHandler(Incoming.RequestCameraConfigurationEvent, RequestCameraConfigurationEvent.class); this.registerHandler(Incoming.CameraPurchaseEvent, CameraPurchaseEvent.class); - this.registerHandler(Incoming.CameraRoomThumbnailEvent, CameraRoomThumbnailEvent.class); + this.registerHandler(Incoming.RenderRoomThumbnailEvent, CameraRoomThumbnailEvent.class); this.registerHandler(Incoming.CameraPublishToWebEvent, CameraPublishToWebEvent.class); } void registerGameCenter() throws Exception { this.registerHandler(Incoming.GameCenterRequestGamesEvent, GameCenterRequestGamesEvent.class); this.registerHandler(Incoming.GameCenterRequestAccountStatusEvent, GameCenterRequestAccountStatusEvent.class); - this.registerHandler(Incoming.GameCenterJoinGameEvent, GameCenterJoinGameEvent.class); + this.registerHandler(Incoming.JoinQueueEvent, GameCenterJoinGameEvent.class); this.registerHandler(Incoming.GetWeeklyGameRewardWinnersEvent, GameCenterLoadGameEvent.class); this.registerHandler(Incoming.GameCenterLeaveGameEvent, GameCenterLeaveGameEvent.class); this.registerHandler(Incoming.GameCenterEvent, GameCenterEvent.class); diff --git a/src/main/java/com/eu/habbo/messages/incoming/Incoming.java b/src/main/java/com/eu/habbo/messages/incoming/Incoming.java index adacfba3..d75b6f0f 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/Incoming.java +++ b/src/main/java/com/eu/habbo/messages/incoming/Incoming.java @@ -8,9 +8,9 @@ public class Incoming { public static final int AvatarEffectSelectedEvent = 1752; public static final int EventLogEvent = 3457; public static final int NavigatorSetSearchCodeViewModeEvent = 1202; - public static final int NavigatorCollapseCategoryEvent = 1834; + public static final int NavigatorAddCollapsedCategoryEvent = 1834; public static final int NavigatorUncollapseCategoryEvent = 637; - public static final int PickNewUserGiftEvent = 1822; + public static final int NewUserExperienceGetGiftsEvent = 1822; public static final int FootballGateSaveLookEvent = 924; public static final int MannequinSaveLookEvent = 2209; public static final int RequestCatalogPageEvent = 412; @@ -19,19 +19,20 @@ public class Incoming { public static final int MountPetEvent = 1036; public static final int RequestCreateRoomEvent = 2752; public static final int SaveMottoEvent = 2228; - public static final int ModToolAlertEvent = 1840; + public static final int ModMessageEvent = 1840; public static final int TradeAcceptEvent = 3863; public static final int GetCatalogIndexEvent = 1195; public static final int RequestUserCreditsEvent = 273; + public static final int GetFaqTextEvent = 1849; public static final int FriendPrivateMessageEvent = 3567; - public static final int CloseDiceEvent = 1533; + public static final int DiceOffEvent = 1533; public static final int RoomUserRemoveRightsEvent = 2064; public static final int RoomRemoveRightsEvent = 3182; - public static final int GuildDeclineMembershipEvent = 1894; + public static final int RejectMembershipRequestEvent = 1894; public static final int AnswerPollEvent = 3505; public static final int UserWearBadgeEvent = 644; public static final int RoomVoteEvent = 3582; - public static final int RoomUserSignEvent = 1975; + public static final int SignEvent = 1975; public static final int RequestUserDataEvent = 357; public static final int RoomUserShoutEvent = 2085; public static final int ScratchPetEvent = 3202; @@ -46,10 +47,10 @@ public class Incoming { public static final int CatalogBuyClubDiscountEvent = 3407; public static final int RequestGuildMembersEvent = 312; public static final int RequestPetInformationEvent = 2934; - public static final int RoomUserWhisperEvent = 1543; + public static final int WhisperEvent = 1543; public static final int ModToolRequestUserInfoEvent = 3295; public static final int RotateMoveItemEvent = 248; - public static final int CancelPollEvent = 1773; + public static final int PollRejectEvent = 1773; public static final int RequestRoomLoadEvent = 2312; public static final int RequestGuildPartsEvent = 813; public static final int RoomPlacePaintEvent = 711; @@ -65,17 +66,18 @@ public class Incoming { public static final int HotelViewDataEvent = 2912; public static final int RoomUserDanceEvent = 2080; public static final int RequestUserProfileEvent = 3265; - public static final int SearchRoomsFriendsNowEvent = 1786; + public static final int RoomsWhereMyFriendsAreSearchEvent = 1786; public static final int SetStackHelperHeightEvent = 3839; public static final int RedeemVoucherEvent = 339; public static final int CustomizePetWithFurniEvent = 1328; - public static final int HorseRemoveSaddleEvent = 186; - public static final int BuyItemEvent = 1603; + public static final int RemoveSaddleFromPetEvent = 186; + public static final int BuyMarketplaceOfferEvent = 1603; public static final int AdvertisingSaveEvent = 3608; + public static final int BuyMarketplaceTokensEvent = 1866; public static final int RoomCompetitionInitEvent = 1334; public static final int RequestPetTrainingPanelEvent = 2161; public static final int RoomBackgroundEvent = 2880; - public static final int RequestNewsListEvent = 1827; + public static final int GetPromoArticlesEvent = 1827; public static final int RequestPromotedRoomsEvent = 2908; public static final int GuildSetAdminEvent = 2894; public static final int GetClubDataEvent = 3285; @@ -94,32 +96,34 @@ public class Incoming { public static final int ModToolRequestRoomChatlogEvent = 2587; public static final int UserSaveLookEvent = 2730; public static final int ToggleFloorItemEvent = 99; - public static final int TradeUnAcceptEvent = 1444; - public static final int WiredTriggerSaveDataEvent = 1520; + public static final int UnacceptTradingEvent = 1444; + public static final int UpdateTriggerEvent = 1520; public static final int RoomRemoveAllRightsEvent = 2683; public static final int TakeBackItemEvent = 434; public static final int OpenRecycleBoxEvent = 3558; public static final int GuildChangeNameDescEvent = 3137; + public static final int Game2ExitGameEvent = 1445; + public static final int HarvestPetEvent = 1521; public static final int RequestSellItemEvent = 848; public static final int ModToolChangeRoomSettingsEvent = 3260; - public static final int ModToolRequestUserChatlogEvent = 1391;//203 + public static final int GetUserChatlogEvent = 1391;//203 public static final int GuildChangeSettingsEvent = 3435; public static final int RoomUserDropHandItemEvent = 2814; public static final int RequestProfileFriendsEvent = 2138; public static final int TradeCancelOfferItemEvent = 3845; - public static final int TriggerDiceEvent = 1990; + public static final int ThrowDiceEvent = 1990; public static final int PollStartEvent = 109; public static final int MachineIDEvent = 2490; public static final int RequestDiscountEvent = 223; public static final int RequestFriendRequestEvent = 2448; - public static final int RoomSettingsSaveEvent = 1969; + public static final int SaveRoomSettingsEvent = 1969; public static final int AcceptFriendEvent = 137; public static final int DeclineFriendRequest = 2890; //835; //TODO public static final int ReleaseVersionEvent = 4000;//4000 public static final int InitDiffieHandshake = 3110; public static final int CompleteDiffieHandshake = 773; public static final int SearchRoomsMyFavoriteEvent = 2578; - public static final int TradeStartEvent = 1481; + public static final int OpenTradingEvent = 1481; public static final int RequestTargetOfferEvent = 2487; public static final int ChangeRelationEvent = 3768; public static final int RoomUserSitEvent = 2235; @@ -128,28 +132,28 @@ public class Incoming { public static final int MoveWallItemEvent = 168; public static final int SearchRoomsEvent = 3943; public static final int RequestHighestScoreRoomsEvent = 2939; - public static final int CatalogBuyItemAsGiftEvent = 1411; + public static final int PurchaseFromCatalogAsGiftEvent = 1411; public static final int RoomUserGiveRespectEvent = 2694; public static final int RemoveFriendEvent = 1689; public static final int SearchRoomsFriendsOwnEvent = 2266; public static final int GuildSetFavoriteEvent = 3549; public static final int PetPlaceEvent = 2647; - public static final int BotSettingsEvent = 1986; + public static final int GetBotCommandConfigurationDataEvent = 1986; public static final int StalkFriendEvent = 3997; public static final int RoomPickupItemEvent = 3456; public static final int RedeemItemEvent = 3115; - public static final int RequestFriendsEvent = 1523; + public static final int GetMOTDEvent = 1523; public static final int RequestAchievementsEvent = 219; - public static final int GuildChangeColorsEvent = 1764; + public static final int UpdateGuildColorsEvent = 1764; public static final int RequestInventoryBadgesEvent = 2769; public static final int HotelViewInventoryEvent = 3500; - public static final int RequestPetBreedsEvent = 1756; - public static final int GuildChangeBadgeEvent = 1991; + public static final int GetSellablePetPalettesEvent = 1756; + public static final int UpdateGuildBadgeEvent = 1991; public static final int ModToolBanEvent = -1; public static final int SaveWardrobeEvent = 800; public static final int QuitEvent = 105; - public static final int ModToolPickTicketEvent = 15; - public static final int ModToolReleaseTicketEvent = 1572; + public static final int PickIssuesEvent = 15; + public static final int ReleaseIssuesEvent = 1572; public static final int ModToolCloseTicketEvent = 2067; public static final int TriggerColorWheelEvent = 2144; public static final int BuildersClubPlaceRoomItemEvent = 1051; @@ -175,26 +179,27 @@ public class Incoming { public static final int RequestMyRoomsEvent = 2277; public static final int RequestCreditsEvent = 2650; public static final int SearchRoomsInGroupEvent = 39; - public static final int HorseRideSettingsEvent = 1472; - public static final int HandleDoorbellEvent = 1644; + public static final int TogglePetRidingPermissionEvent = 1472; + public static final int LetUserInEvent = 1644; public static final int RoomUserKickEvent = 1320; public static final int PlaceObjectEvent = 1258; public static final int RequestInventoryBotsEvent = 3848; public static final int RequestUserWardrobeEvent = 2742; public static final int RequestRoomRightsEvent = 3385; public static final int RequestGuildBuyRoomsEvent = 798; - public static final int BotPlaceEvent = 1592; + public static final int PlaceBotEvent = 1592; public static final int SearchRoomsWithRightsEvent = 272; public static final int HotelViewRequestBonusRareEvent = 957; public static final int GuildRemoveAdminEvent = 722; public static final int RequestRoomSettingsEvent = 3129; public static final int RequestOffersEvent = 2407; public static final int RequestUserCitizinShipEvent = 2127; - public static final int RoomUserStopTypingEvent = 1474; - public static final int RoomUserStartTypingEvent = 1597; + public static final int CancelTypingEvent = 1474; + public static final int StartTypingEvent = 1597; public static final int GetGuildEditInfoEvent = 1004; + public static final int Game2RequestFullStatusUpdateEvent = 1598; public static final int RequestUserClubEvent = 3166; - public static final int PetPickupEvent = 1581; + public static final int RemovePetFromFlatEvent = 1581; public static final int RequestOwnGuildsEvent = 367; public static final int SearchRoomsVisitedEvent = 2264; public static final int TradeOfferItemEvent = 3107; @@ -213,73 +218,77 @@ public class Incoming { public static final int RequestGuildFurniWidgetEvent = 2651; public static final int RequestOwnItemsEvent = 2105; public static final int RequestReportRoomEvent = 3267; - public static final int ReportEvent = 1691; + public static final int CallForHelpEvent = 1691; public static final int TriggerOneWayGateEvent = 2765; public static final int FloorPlanEditorSaveEvent = 875; public static final int FloorPlanEditorRequestDoorSettingsEvent = 3559; - public static final int FloorPlanEditorRequestBlockedTilesEvent = 1687; + public static final int GetOccupiedTilesEvent = 1687; public static final int GetBadgePointLimitsEvent = 1371; - public static final int RequestTalenTrackEvent = 196; + public static final int GetTalentTrackEvent = 196; public static final int RequestNewNavigatorDataEvent = 2110; + public static final int StartCampaignEvent = 1697; public static final int RequestNewNavigatorRoomsEvent = 249; public static final int RedeemClothingEvent = 3374; - public static final int NewNavigatorActionEvent = 1703; + public static final int ForwardToSomeRoomEvent = 1703; public static final int PostItPlaceEvent = 2248; public static final int PostItRequestDataEvent = 3964; public static final int PostItSaveDataEvent = 3666; public static final int PostItDeleteEvent = 3336; + public static final int ForwardToACompetitionRoomEvent = 172; + public static final int SetPhoneNumberVerificationStatusEvent = 1379; public static final int UseRandomStateItemEvent = 3617; public static final int MySanctionStatusEvent = 2746; - public static final int MoodLightSaveSettingsEvent = 1648; + public static final int RoomDimmerSavePresetEvent = 1648; public static final int ModToolRequestIssueChatlogEvent = 211; public static final int ModToolRequestRoomUserChatlogEvent = -1; public static final int GetIgnoredUsersEvent = 3878; public static final int RequestClubGiftsEvent = 487; public static final int RentSpaceEvent = 2946; - public static final int RentSpaceCancelEvent = 1667; + public static final int RentableSpaceCancelRentEvent = 1667; public static final int RequestInitFriendsEvent = 2781; public static final int RequestCameraConfigurationEvent = 796; public static final int PingEvent = 295; public static final int FindNewFriendsEvent = 516; public static final int InviteFriendsEvent = 1276; - public static final int GuildRemoveFavoriteEvent = 1820; + public static final int DeselectFavouriteHabboGroupEvent = 1820; public static final int DeactivateGuildEvent = 1134; - public static final int SetHomeRoomEvent = 1740; + public static final int UpdateHomeRoomEvent = 1740; public static final int RoomUserGiveHandItemEvent = 2941; public static final int AmbassadorVisitCommandEvent = 2970; public static final int AmbassadorAlertCommandEvent = 2996; public static final int SetSoundSettingsEvent = 1367; public static final int SetChatPreferencesEvent = 1262; public static final int SetIgnoreRoomInvitesEvent = 1086; - public static final int SaveBlockCameraFollowEvent = 1461; + public static final int SetRoomCameraPreferencesEvent = 1461; public static final int RoomMuteEvent = 3637; - public static final int RequestRoomWordFilterEvent = 1911; + public static final int GetCustomRoomFilterEvent = 1911; public static final int RoomWordFilterModifyEvent = 3001; - public static final int RequestRoomUserTagsEvent = 17; + public static final int GetUserTagsEvent = 17; public static final int CatalogSearchedItemEvent = 2594; public static final int JukeBoxRequestTrackCodeEvent = 3189; public static final int JukeBoxRequestTrackDataEvent = 3082; - public static final int RoomStaffPickEvent = 1918; + public static final int ToggleStaffPickEvent = 1918; public static final int RoomRequestBannedUsersEvent = 2267; public static final int GetNowPlayingEvent = 1325; public static final int JukeBoxEventOne = 2304; - public static final int JukeBoxEventTwo = 1435; + public static final int GetJukeboxPlayListEvent = 1435; public static final int RoomUserMuteEvent = 3485; //public static final int JukeBoxEventThree = 3846; public static final int RequestDeleteRoomEvent = 532; + public static final int VoteForRoomEvent = 143; public static final int GetRoomAdPurchaseInfoEvent = 1075; public static final int BuyRoomPromotionEvent = 777; public static final int EditRoomPromotionMessageEvent = 3991; - public static final int RequestGuideToolEvent = 1922; + public static final int GuideSessionOnDutyUpdateEvent = 1922; public static final int RequestGuideAssistanceEvent = 3338; public static final int GuideUserTypingEvent = 519; public static final int GuideReportHelperEvent = 3969; public static final int GuideRecommendHelperEvent = 477; public static final int GuideUserMessageEvent = 3899; public static final int GuideCancelHelpRequestEvent = 291; - public static final int GuideHandleHelpRequestEvent = 1424; + public static final int GuideSessionGuideDecidesEvent = 1424; public static final int GuideSessionGetRequesterRoomEvent = 1052; public static final int GuideInviteUserEvent = 234; public static final int GuideCloseHelpRequestEvent = 887; @@ -291,7 +300,7 @@ public class Incoming { public static final int RequestReportUserBullyingEvent = 3786; public static final int ReportBullyEvent = 3060; public static final int CameraRoomPictureEvent = 3226; - public static final int CameraRoomThumbnailEvent = 1982; + public static final int RenderRoomThumbnailEvent = 1982; public static final int SavePostItStickyPoleEvent = 3283; public static final int HotelViewClaimBadgeEvent = 3077; public static final int GetCommunityGoalProgressEvent = 1145; @@ -303,18 +312,19 @@ public class Incoming { public static final int UnIgnoreRoomUserEvent = 2061; public static final int GetIsOfferGiftableEvent = 1347; public static final int UnbanRoomUserEvent = 992; - public static final int RoomUserBanEvent = 1477; - public static final int RequestNavigatorSettingsEvent = 1782; + public static final int BanUserWithDurationEvent = 1477; + public static final int GetUserEventCatsEvent = 1782; public static final int GetIsBadgeRequestFulfilledEvent = 1364; public static final int AddSavedSearchEvent = 2226; public static final int WhisperGroupEvent = 1118; - public static final int DeleteSavedSearchEvent = 1954; + public static final int NavigatorDeleteSavedSearchEvent = 1954; public static final int SaveWindowSettingsEvent = 3159; public static final int GetHabboGuildBadgesMessageEvent = 21; public static final int UpdateUIFlagsEvent = 2313; public static final int ReportThreadEvent = 534; - public static final int ReportCommentEvent = 1412; + public static final int CallForHelpFromForumMessageEvent = 1412; public static final int ReportPhotoEvent = 2492; + public static final int FriendListUpdateEvent = 1419; public static final int GetCraftingRecipeEvent = 1173; public static final int RequestCraftingRecipesAvailableEvent = 3086; @@ -339,7 +349,7 @@ public class Incoming { public static final int JukeBoxRemoveSoundTrackEvent = 3050; public static final int ToggleMonsterplantBreedableEvent = 3379; public static final int CompostMonsterplantEvent = 3835; - public static final int BreedMonsterplantsEvent = 1638; + public static final int BreedPetsEvent = 1638; public static final int MovePetEvent = 3449; public static final int PetPackageNameEvent = 3698; @@ -349,19 +359,19 @@ public class Incoming { public static final int CameraPublishToWebEvent = 2068; public static final int InterstitialShownEvent = 1109; - public static final int GameCenterJoinGameEvent = 1458; + public static final int JoinQueueEvent = 1458; public static final int GetWeeklyGameRewardWinnersEvent = 1054; public static final int GameCenterEvent = 2914; public static final int GameCenterLeaveGameEvent = 3207; public static final int ExtendRentOrBuyoutFurniEvent = 1071; public static final int ModToolSanctionAlertEvent = 229; - public static final int ModToolSanctionMuteEvent = 1945; + public static final int ModMuteEvent = 1945; public static final int ModToolSanctionBanEvent = 2766; public static final int ModToolSanctionTradeLockEvent = 3742; public static final int NewUserExperienceScriptProceedEvent = 1299; public static final int ReportFriendPrivateChatEvent = 2950; - public static final int ModToolIssueChangeTopicEvent = 1392; + public static final int ModToolSanctionEvent = 1392; public static final int ModToolIssueDefaultSanctionEvent = 2717; public static final int TradeCancelEvent = 2341; @@ -371,7 +381,7 @@ public class Incoming { public static final int HotelViewRequestLTDAvailabilityEvent = 410; public static final int HotelViewRequestSecondsUntilEvent = 271; - public static final int PurchaseTargetOfferEvent = 1826; + public static final int PurchaseTargetedOfferEvent = 1826; public static final int TargetOfferStateEvent = 2041; public static final int StopBreedingEvent = 2713; public static final int ConfirmPetBreedingEvent = 3382; @@ -384,9 +394,9 @@ public class Incoming { public static final int GuildForumUpdateSettingsEvent = 2214; public static final int GuildForumThreadsMessagesEvent = 232; public static final int GuildForumModerateMessageEvent = 286; - public static final int GuildForumModerateThreadEvent = 1397; + public static final int ModerateThreadEvent = 1397; public static final int GuildForumThreadUpdateEvent = 3045; - public static final int GuildForumMarkAsReadEvent = 1855; + public static final int UpdateForumReadMarkerEvent = 1855; public static final int UNKNOWN_SNOWSTORM_6000 = 6000;