From e4349b6369a535911aeaae3cb82d9440076903d8 Mon Sep 17 00:00:00 2001 From: Harmonic Date: Fri, 22 Apr 2022 06:40:49 -0700 Subject: [PATCH] Finished refactoring incoming.java list Still todo: rename all event files. --- .../com/eu/habbo/messages/PacketManager.java | 196 +++++++------- .../eu/habbo/messages/incoming/Incoming.java | 245 ++++++++++-------- 2 files changed, 240 insertions(+), 201 deletions(-) diff --git a/src/main/java/com/eu/habbo/messages/PacketManager.java b/src/main/java/com/eu/habbo/messages/PacketManager.java index d4762bf5..8e37ab98 100644 --- a/src/main/java/com/eu/habbo/messages/PacketManager.java +++ b/src/main/java/com/eu/habbo/messages/PacketManager.java @@ -228,49 +228,49 @@ public class PacketManager { } private void registerCatalog() throws Exception { - this.registerHandler(Incoming.RequestRecylerLogicEvent, RequestRecyclerLogicEvent.class); + this.registerHandler(Incoming.GetRecyclerPrizesEvent, RequestRecyclerLogicEvent.class); this.registerHandler(Incoming.GetBundleDiscountRulesetEvent, RequestDiscountEvent.class); - this.registerHandler(Incoming.RequestGiftConfigurationEvent, RequestGiftConfigurationEvent.class); + this.registerHandler(Incoming.GetGiftWrappingConfigurationEvent, RequestGiftConfigurationEvent.class); this.registerHandler(Incoming.GetMarketplaceConfigurationEvent, RequestMarketplaceConfigEvent.class); this.registerHandler(Incoming.GetCatalogIndexEvent, RequestCatalogModeEvent.class); this.registerHandler(Incoming.BuildersClubQueryFurniCountEvent, RequestCatalogIndexEvent.class); - this.registerHandler(Incoming.RequestCatalogPageEvent, RequestCatalogPageEvent.class); + this.registerHandler(Incoming.GetCatalogPageEvent, RequestCatalogPageEvent.class); this.registerHandler(Incoming.PurchaseFromCatalogAsGiftEvent, CatalogBuyItemAsGiftEvent.class); - this.registerHandler(Incoming.CatalogBuyItemEvent, CatalogBuyItemEvent.class); + this.registerHandler(Incoming.PurchaseFromCatalogEvent, CatalogBuyItemEvent.class); this.registerHandler(Incoming.RedeemVoucherEvent, RedeemVoucherEvent.class); this.registerHandler(Incoming.GetRecyclerStatusEvent, ReloadRecyclerEvent.class); this.registerHandler(Incoming.RecycleItemsEvent, RecycleEvent.class); - this.registerHandler(Incoming.OpenRecycleBoxEvent, OpenRecycleBoxEvent.class); + this.registerHandler(Incoming.PresentOpenEvent, OpenRecycleBoxEvent.class); this.registerHandler(Incoming.GetMarketplaceOwnOffersEvent, RequestOwnItemsEvent.class); - this.registerHandler(Incoming.TakeBackItemEvent, TakeBackItemEvent.class); + this.registerHandler(Incoming.CancelMarketplaceOfferEvent, TakeBackItemEvent.class); this.registerHandler(Incoming.GetMarketplaceOffersEvent, RequestOffersEvent.class); - this.registerHandler(Incoming.RequestItemInfoEvent, RequestItemInfoEvent.class); + this.registerHandler(Incoming.GetMarketplaceItemStatsEvent, RequestItemInfoEvent.class); this.registerHandler(Incoming.BuyMarketplaceOfferEvent, BuyItemEvent.class); - this.registerHandler(Incoming.RequestSellItemEvent, RequestSellItemEvent.class); - this.registerHandler(Incoming.SellItemEvent, SellItemEvent.class); + this.registerHandler(Incoming.GetMarketplaceCanMakeOfferEvent, RequestSellItemEvent.class); + this.registerHandler(Incoming.MakeOfferEvent, SellItemEvent.class); this.registerHandler(Incoming.RedeemMarketplaceOfferCreditsEvent, RequestCreditsEvent.class); this.registerHandler(Incoming.GetSellablePetPalettesEvent, RequestPetBreedsEvent.class); this.registerHandler(Incoming.ApproveNameEvent, CheckPetNameEvent.class); - this.registerHandler(Incoming.GetClubDataEvent, RequestClubDataEvent.class); - this.registerHandler(Incoming.RequestClubGiftsEvent, RequestClubGiftsEvent.class); + this.registerHandler(Incoming.GetClubOffersEvent, RequestClubDataEvent.class); + this.registerHandler(Incoming.GetClubGiftInfo, RequestClubGiftsEvent.class); this.registerHandler(Incoming.GetProductOfferEvent, CatalogSearchedItemEvent.class); this.registerHandler(Incoming.PurchaseTargetedOfferEvent, PurchaseTargetOfferEvent.class); this.registerHandler(Incoming.SetTargetedOfferStateEvent, TargetOfferStateEvent.class); this.registerHandler(Incoming.SelectClubGiftEvent, CatalogSelectClubGiftEvent.class); - this.registerHandler(Incoming.RequestClubCenterEvent, RequestClubCenterEvent.class); - this.registerHandler(Incoming.GetHabboClubExtendOfferEvent, CatalogRequestClubDiscountEvent.class); - this.registerHandler(Incoming.CatalogBuyClubDiscountEvent, CatalogBuyClubDiscountEvent.class); + this.registerHandler(Incoming.ScrGetKickbackInfoEvent, RequestClubCenterEvent.class); + this.registerHandler(Incoming.BuildersClubPlaceWallItemEvent, CatalogRequestClubDiscountEvent.class); + this.registerHandler(Incoming.PurchaseVipMembershipExtensionEvent, CatalogBuyClubDiscountEvent.class); } private void registerEvent() throws Exception { this.registerHandler(Incoming.OpenCampaignCalendarDoorAsStaffEvent, AdventCalendarOpenDayEvent.class); - this.registerHandler(Incoming.AdventCalendarForceOpenEvent, AdventCalendarForceOpenEvent.class); + this.registerHandler(Incoming.OpenCampaignCalendarDoorEvent, AdventCalendarForceOpenEvent.class); } private void registerHandshake() throws Exception { - this.registerHandler(Incoming.ReleaseVersionEvent, ReleaseVersionEvent.class); + this.registerHandler(Incoming.ClientHelloEvent, ReleaseVersionEvent.class); this.registerHandler(Incoming.InitDiffieHandshakeEvent, InitDiffieHandshakeEvent.class); - this.registerHandler(Incoming.CompleteDiffieHandshake, CompleteDiffieHandshakeEvent.class); + this.registerHandler(Incoming.CompleteDiffieHandshakeEvent, CompleteDiffieHandshakeEvent.class); this.registerHandler(Incoming.SSOTicketEvent, SecureLoginEvent.class); this.registerHandler(Incoming.UniqueIDEvent, MachineIDEvent.class); this.registerHandler(Incoming.GetIgnoredUsersEvent, GetIgnoredUsersEvent.class); @@ -279,22 +279,22 @@ public class PacketManager { private void registerFriends() throws Exception { this.registerHandler(Incoming.GetMOTDEvent, RequestFriendsEvent.class); - this.registerHandler(Incoming.ChangeRelationEvent, ChangeRelationEvent.class); + this.registerHandler(Incoming.SetRelationshipStatusEvent, ChangeRelationEvent.class); this.registerHandler(Incoming.RemoveFriendEvent, RemoveFriendEvent.class); this.registerHandler(Incoming.HabboSearchEvent, SearchUserEvent.class); this.registerHandler(Incoming.RequestFriendEvent, FriendRequestEvent.class); this.registerHandler(Incoming.AcceptFriendEvent, AcceptFriendRequestEvent.class); this.registerHandler(Incoming.DeclineFriendEvent, DeclineFriendRequestEvent.class); - this.registerHandler(Incoming.FriendPrivateMessageEvent, FriendPrivateMessageEvent.class); + this.registerHandler(Incoming.SendMsgEvent, FriendPrivateMessageEvent.class); this.registerHandler(Incoming.GetFriendRequestsEvent, RequestFriendRequestsEvent.class); - this.registerHandler(Incoming.StalkFriendEvent, StalkFriendEvent.class); + this.registerHandler(Incoming.VisitUserEvent, StalkFriendEvent.class); this.registerHandler(Incoming.MessengerInitEvent, RequestInitFriendsEvent.class); this.registerHandler(Incoming.FindNewFriendsEvent, FindNewFriendsEvent.class); this.registerHandler(Incoming.SendRoomInviteEvent, InviteFriendsEvent.class); } private void registerUsers() throws Exception { - this.registerHandler(Incoming.RequestUserDataEvent, RequestUserDataEvent.class); + this.registerHandler(Incoming.InfoRetrieveEvent, RequestUserDataEvent.class); this.registerHandler(Incoming.GetCreditsInfoEvent, RequestUserCreditsEvent.class); this.registerHandler(Incoming.ScrGetUserInfoEvent, RequestUserClubEvent.class); this.registerHandler(Incoming.GetSoundSettingsEvent, RequestMeMenuSettingsEvent.class); @@ -302,10 +302,10 @@ public class PacketManager { this.registerHandler(Incoming.GetExtendedProfileEvent, RequestUserProfileEvent.class); this.registerHandler(Incoming.GetRelationshipStatusInfoEvent, RequestProfileFriendsEvent.class); this.registerHandler(Incoming.GetWardrobeEvent, RequestUserWardrobeEvent.class); - this.registerHandler(Incoming.SaveWardrobeEvent, SaveWardrobeEvent.class); + this.registerHandler(Incoming.SaveWardrobeOutfitEvent, SaveWardrobeEvent.class); this.registerHandler(Incoming.ChangeMottoEvent, SaveMottoEvent.class); this.registerHandler(Incoming.UpdateFigureDataEvent, UserSaveLookEvent.class); - this.registerHandler(Incoming.UserWearBadgeEvent, UserWearBadgeEvent.class); + this.registerHandler(Incoming.SetActivatedBadgesEvent, UserWearBadgeEvent.class); this.registerHandler(Incoming.GetSelectedBadgesEvent, RequestWearingBadgesEvent.class); this.registerHandler(Incoming.SetSoundSettingsEvent, SaveUserVolumesEvent.class); this.registerHandler(Incoming.SetRoomCameraPreferencesEvent, SaveBlockCameraFollowEvent.class); @@ -330,13 +330,13 @@ public class PacketManager { this.registerHandler(Incoming.CanCreateRoomEvent, RequestCanCreateRoomEvent.class); this.registerHandler(Incoming.GetUnreadForumsCountEvent, RequestPromotedRoomsEvent.class); this.registerHandler(Incoming.CreateFlatEvent, RequestCreateRoomEvent.class); - this.registerHandler(Incoming.RequestTagsEvent, RequestTagsEvent.class); + this.registerHandler(Incoming.GetPopularRoomTagsEvent, RequestTagsEvent.class); this.registerHandler(Incoming.SearchRoomsByTagEvent, SearchRoomsByTagEvent.class); - this.registerHandler(Incoming.SearchRoomsEvent, SearchRoomsEvent.class); + this.registerHandler(Incoming.RoomTextSearchEvent, SearchRoomsEvent.class); this.registerHandler(Incoming.RoomsWhereMyFriendsAreSearchEvent, SearchRoomsFriendsNowEvent.class); this.registerHandler(Incoming.MyFriendsRoomsSearchEvent, SearchRoomsFriendsOwnEvent.class); this.registerHandler(Incoming.MyRoomRightsSearchEvent, SearchRoomsWithRightsEvent.class); - this.registerHandler(Incoming.SearchRoomsInGroupEvent, SearchRoomsInGroupEvent.class); + this.registerHandler(Incoming.MyGuildBasesSearchEvent, SearchRoomsInGroupEvent.class); this.registerHandler(Incoming.MyFavouriteRoomsSearchEvent, SearchRoomsMyFavouriteEvent.class); this.registerHandler(Incoming.MyRoomHistorySearchEvent, SearchRoomsVisitedEvent.class); this.registerHandler(Incoming.NewNavigatorInitEvent, RequestNewNavigatorDataEvent.class); @@ -344,59 +344,59 @@ public class PacketManager { this.registerHandler(Incoming.ForwardToSomeRoomEvent, NewNavigatorActionEvent.class); this.registerHandler(Incoming.GetUserEventCatsEvent, RequestNavigatorSettingsEvent.class); this.registerHandler(Incoming.SetNewNavigatorWindowPreferencesEvent, SaveWindowSettingsEvent.class); - this.registerHandler(Incoming.RequestDeleteRoomEvent, RequestDeleteRoomEvent.class); + this.registerHandler(Incoming.DeleteRoomEvent, RequestDeleteRoomEvent.class); this.registerHandler(Incoming.NavigatorSetSearchCodeViewModeEvent, NavigatorCategoryListModeEvent.class); this.registerHandler(Incoming.NavigatorAddCollapsedCategoryEvent, NavigatorCollapseCategoryEvent.class); - this.registerHandler(Incoming.NavigatorUncollapseCategoryEvent, NavigatorUncollapseCategoryEvent.class); + this.registerHandler(Incoming.NavigatorRemoveCollapsedCategoryEvent, NavigatorUncollapseCategoryEvent.class); this.registerHandler(Incoming.NavigatorAddSavedSearchEvent, AddSavedSearchEvent.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.GetBonusRareInfoEvent, HotelViewRequestBonusRareEvent.class); this.registerHandler(Incoming.GetPromoArticlesEvent, RequestNewsListEvent.class); this.registerHandler(Incoming.GetCurrentTimingCodeEvent, HotelViewDataEvent.class); this.registerHandler(Incoming.HotelViewRequestBadgeRewardEvent, HotelViewRequestBadgeRewardEvent.class); this.registerHandler(Incoming.HotelViewClaimBadgeRewardEvent, HotelViewClaimBadgeRewardEvent.class); - this.registerHandler(Incoming.HotelViewRequestLTDAvailabilityEvent, HotelViewRequestLTDAvailabilityEvent.class); + this.registerHandler(Incoming.GetLimitedOfferAppearingNextEvent, HotelViewRequestLTDAvailabilityEvent.class); this.registerHandler(Incoming.HotelViewRequestSecondsUntilEvent, HotelViewRequestSecondsUntilEvent.class); } private void registerInventory() throws Exception { this.registerHandler(Incoming.GetBadgesEvent, RequestInventoryBadgesEvent.class); - this.registerHandler(Incoming.RequestInventoryBotsEvent, RequestInventoryBotsEvent.class); + this.registerHandler(Incoming.GetBotInventoryEvent, RequestInventoryBotsEvent.class); this.registerHandler(Incoming.RequestFurniInventoryEvent, RequestInventoryItemsEvent.class); - this.registerHandler(Incoming.HotelViewInventoryEvent, RequestInventoryItemsEvent.class); + this.registerHandler(Incoming.RequestFurniInventoryWhenNotInRoomEvent, RequestInventoryItemsEvent.class); this.registerHandler(Incoming.GetPetInventoryEvent, RequestInventoryPetsEvent.class); } void registerRooms() throws Exception { this.registerHandler(Incoming.OpenFlatConnectionEvent, RequestRoomLoadEvent.class); - this.registerHandler(Incoming.RequestHeightmapEvent, RequestRoomHeightmapEvent.class); + this.registerHandler(Incoming.GetFurnitureAliasesEvent, RequestRoomHeightmapEvent.class); this.registerHandler(Incoming.GetRoomEntryDataEvent, RequestRoomHeightmapEvent.class); - this.registerHandler(Incoming.RoomVoteEvent, RoomVoteEvent.class); + this.registerHandler(Incoming.RateFlatEvent, RoomVoteEvent.class); this.registerHandler(Incoming.GetGuestRoomEvent, RequestRoomDataEvent.class); this.registerHandler(Incoming.SaveRoomSettingsEvent, RoomSettingsSaveEvent.class); this.registerHandler(Incoming.PlaceObjectEvent, RoomPlaceItemEvent.class); this.registerHandler(Incoming.MoveObjectEvent, RotateMoveItemEvent.class); this.registerHandler(Incoming.MoveWallItemEvent, MoveWallItemEvent.class); - this.registerHandler(Incoming.RoomPickupItemEvent, RoomPickupItemEvent.class); - this.registerHandler(Incoming.RoomPlacePaintEvent, RoomPlacePaintEvent.class); + this.registerHandler(Incoming.PickupObjectEvent, RoomPickupItemEvent.class); + this.registerHandler(Incoming.RequestRoomPropertySet, RoomPlacePaintEvent.class); this.registerHandler(Incoming.StartTypingEvent, RoomUserStartTypingEvent.class); this.registerHandler(Incoming.CancelTypingEvent, RoomUserStopTypingEvent.class); - this.registerHandler(Incoming.ToggleFloorItemEvent, ToggleFloorItemEvent.class); + this.registerHandler(Incoming.UseFurnitureEvent, ToggleFloorItemEvent.class); this.registerHandler(Incoming.UseWallItemEvent, ToggleWallItemEvent.class); this.registerHandler(Incoming.SetRoomBackgroundColorDataEvent, RoomBackgroundEvent.class); this.registerHandler(Incoming.SetMannequinNameEvent, MannequinSaveNameEvent.class); this.registerHandler(Incoming.SetMannequinFigureEvent, MannequinSaveLookEvent.class); - this.registerHandler(Incoming.FootballGateSaveLookEvent, FootballGateSaveLookEvent.class); - this.registerHandler(Incoming.AdvertisingSaveEvent, AdvertisingSaveEvent.class); + this.registerHandler(Incoming.SetClothingChangeDataEvent, FootballGateSaveLookEvent.class); + this.registerHandler(Incoming.SetObjectDataEvent, AdvertisingSaveEvent.class); this.registerHandler(Incoming.GetRoomSettingsEvent, RequestRoomSettingsEvent.class); this.registerHandler(Incoming.RoomDimmerGetPresetsEvent, MoodLightSettingsEvent.class); this.registerHandler(Incoming.RoomDimmerChangeStateEvent, MoodLightTurnOnEvent.class); this.registerHandler(Incoming.DropCarryItemEvent, RoomUserDropHandItemEvent.class); - this.registerHandler(Incoming.RoomUserLookAtPoint, RoomUserLookAtPoint.class); + this.registerHandler(Incoming.LookToEvent, RoomUserLookAtPoint.class); this.registerHandler(Incoming.ChatEvent, RoomUserTalkEvent.class); this.registerHandler(Incoming.ShoutEvent, RoomUserShoutEvent.class); this.registerHandler(Incoming.WhisperEvent, RoomUserWhisperEvent.class); @@ -404,15 +404,15 @@ public class PacketManager { this.registerHandler(Incoming.ChangePostureEvent, RoomUserSitEvent.class); this.registerHandler(Incoming.DanceEvent, RoomUserDanceEvent.class); this.registerHandler(Incoming.SignEvent, RoomUserSignEvent.class); - this.registerHandler(Incoming.RoomUserWalkEvent, RoomUserWalkEvent.class); + this.registerHandler(Incoming.MoveAvatarEvent, RoomUserWalkEvent.class); this.registerHandler(Incoming.RespectUserEvent, RoomUserGiveRespectEvent.class); - this.registerHandler(Incoming.RoomUserGiveRightsEvent, RoomUserGiveRightsEvent.class); + this.registerHandler(Incoming.AssignRightsEvent, RoomUserGiveRightsEvent.class); this.registerHandler(Incoming.RemoveOwnRoomRightsRoomEvent, RoomRemoveRightsEvent.class); - this.registerHandler(Incoming.RequestRoomRightsEvent, RequestRoomRightsEvent.class); + this.registerHandler(Incoming.GetFlatControllersEvent, RequestRoomRightsEvent.class); this.registerHandler(Incoming.RemoveAllRightsEvent, RoomRemoveAllRightsEvent.class); this.registerHandler(Incoming.RemoveRightsEvent, RoomUserRemoveRightsEvent.class); this.registerHandler(Incoming.PlaceBotEvent, BotPlaceEvent.class); - this.registerHandler(Incoming.BotPickupEvent, BotPickupEvent.class); + this.registerHandler(Incoming.RemoveBotFromFlatEvent, BotPickupEvent.class); this.registerHandler(Incoming.CommandBotEvent, BotSaveSettingsEvent.class); this.registerHandler(Incoming.GetBotCommandConfigurationDataEvent, BotSettingsEvent.class); this.registerHandler(Incoming.ThrowDiceEvent, TriggerDiceEvent.class); @@ -421,48 +421,48 @@ public class PacketManager { this.registerHandler(Incoming.CreditFurniRedeemEvent, RedeemItemEvent.class); this.registerHandler(Incoming.PlacePetEvent, PetPlaceEvent.class); this.registerHandler(Incoming.RoomUserKickEvent, RoomUserKickEvent.class); - this.registerHandler(Incoming.SetStackHelperHeightEvent, SetStackHelperHeightEvent.class); + this.registerHandler(Incoming.SetCustomStackingHeightEvent, SetStackHelperHeightEvent.class); this.registerHandler(Incoming.EnterOneWayDoorEvent, TriggerOneWayGateEvent.class); this.registerHandler(Incoming.LetUserInEvent, HandleDoorbellEvent.class); - this.registerHandler(Incoming.RedeemClothingEvent, RedeemClothingEvent.class); + this.registerHandler(Incoming.CustomizeAvatarWithFurniEvent, RedeemClothingEvent.class); this.registerHandler(Incoming.PlacePostItEvent, PostItPlaceEvent.class); - this.registerHandler(Incoming.PostItRequestDataEvent, PostItRequestDataEvent.class); - this.registerHandler(Incoming.PostItSaveDataEvent, PostItSaveDataEvent.class); - this.registerHandler(Incoming.PostItDeleteEvent, PostItDeleteEvent.class); + this.registerHandler(Incoming.GetItemDataEvent, PostItRequestDataEvent.class); + this.registerHandler(Incoming.SetItemDataEvent, PostItSaveDataEvent.class); + this.registerHandler(Incoming.RemoveItemEvent, PostItDeleteEvent.class); this.registerHandler(Incoming.RoomDimmerSavePresetEvent, MoodLightSaveSettingsEvent.class); this.registerHandler(Incoming.RentableSpaceRentEvent, RentSpaceEvent.class); this.registerHandler(Incoming.RentableSpaceCancelRentEvent, RentSpaceCancelEvent.class); this.registerHandler(Incoming.UpdateHomeRoomEvent, SetHomeRoomEvent.class); this.registerHandler(Incoming.PassCarryItemEvent, RoomUserGiveHandItemEvent.class); - this.registerHandler(Incoming.RoomMuteEvent, RoomMuteEvent.class); + this.registerHandler(Incoming.MuteAllInRoomEvent, RoomMuteEvent.class); this.registerHandler(Incoming.GetCustomRoomFilterEvent, RequestRoomWordFilterEvent.class); this.registerHandler(Incoming.UpdateRoomFilterEvent, RoomWordFilterModifyEvent.class); this.registerHandler(Incoming.SubmitRoomToCompetitionEvent, RoomStaffPickEvent.class); this.registerHandler(Incoming.GetBannedUsersFromRoomEvent, RoomRequestBannedUsersEvent.class); this.registerHandler(Incoming.GetOfficialSongIdEvent, JukeBoxRequestTrackCodeEvent.class); this.registerHandler(Incoming.GetSongInfoEvent, JukeBoxRequestTrackDataEvent.class); - this.registerHandler(Incoming.JukeBoxAddSoundTrackEvent, JukeBoxAddSoundTrackEvent.class); + this.registerHandler(Incoming.AddJukeboxDiskEvent, JukeBoxAddSoundTrackEvent.class); this.registerHandler(Incoming.RemoveJukeboxDiskEvent, JukeBoxRemoveSoundTrackEvent.class); this.registerHandler(Incoming.GetNowPlayingEvent, JukeBoxRequestPlayListEvent.class); this.registerHandler(Incoming.JukeBoxEventOne, JukeBoxEventOne.class); this.registerHandler(Incoming.GetJukeboxPlayListEvent, JukeBoxEventTwo.class); this.registerHandler(Incoming.AddSpamWallPostItEvent, SavePostItStickyPoleEvent.class); this.registerHandler(Incoming.GetRoomAdPurchaseInfoEvent, RequestPromotionRoomsEvent.class); - this.registerHandler(Incoming.BuyRoomPromotionEvent, BuyRoomPromotionEvent.class); - this.registerHandler(Incoming.EditRoomPromotionMessageEvent, UpdateRoomPromotionEvent.class); + this.registerHandler(Incoming.PurchaseRoomAdEvent, BuyRoomPromotionEvent.class); + this.registerHandler(Incoming.EditEventEvent, UpdateRoomPromotionEvent.class); this.registerHandler(Incoming.IgnoreUserEvent, IgnoreRoomUserEvent.class); this.registerHandler(Incoming.UnignoreUserEvent, UnIgnoreRoomUserEvent.class); this.registerHandler(Incoming.RoomUserMuteEvent, RoomUserMuteEvent.class); this.registerHandler(Incoming.BanUserWithDurationEvent, RoomUserBanEvent.class); - this.registerHandler(Incoming.UnbanRoomUserEvent, UnbanRoomUserEvent.class); + this.registerHandler(Incoming.UnbanUserFromRoomEvent, UnbanRoomUserEvent.class); this.registerHandler(Incoming.GetUserTagsEvent, RequestRoomUserTagsEvent.class); - this.registerHandler(Incoming.YoutubeRequestPlaylists, YoutubeRequestPlaylists.class); + this.registerHandler(Incoming.GetYoutubeDisplayStatusEvent, YoutubeRequestPlaylists.class); this.registerHandler(Incoming.ControlYoutubeDisplayPlaybackEvent, YoutubeRequestStateChange.class); this.registerHandler(Incoming.SetYoutubeDisplayPlaylistEvent, YoutubeRequestPlaylistChange.class); - this.registerHandler(Incoming.RoomFavoriteEvent, RoomFavoriteEvent.class); - this.registerHandler(Incoming.LoveLockStartConfirmEvent, LoveLockStartConfirmEvent.class); + this.registerHandler(Incoming.AddFavouriteRoomEvent, RoomFavoriteEvent.class); + this.registerHandler(Incoming.FriendFurniConfirmLockEvent, LoveLockStartConfirmEvent.class); this.registerHandler(Incoming.DeleteFavouriteRoomEvent, RoomUnFavoriteEvent.class); - this.registerHandler(Incoming.UseRandomStateItemEvent, UseRandomStateItemEvent.class); + this.registerHandler(Incoming.SetRandomStateEvent, UseRandomStateItemEvent.class); } void registerPolls() throws Exception { @@ -472,34 +472,34 @@ public class PacketManager { } void registerModTool() throws Exception { - this.registerHandler(Incoming.ModToolRequestRoomInfoEvent, ModToolRequestRoomInfoEvent.class); + this.registerHandler(Incoming.GetModeratorRoomInfoEvent, ModToolRequestRoomInfoEvent.class); this.registerHandler(Incoming.GetRoomChatlogEvent, ModToolRequestRoomChatlogEvent.class); - this.registerHandler(Incoming.ModToolRequestUserInfoEvent, ModToolRequestUserInfoEvent.class); + this.registerHandler(Incoming.GetModeratorUserInfoEvent, ModToolRequestUserInfoEvent.class); this.registerHandler(Incoming.PickIssuesEvent, ModToolPickTicketEvent.class); this.registerHandler(Incoming.CloseIssuesEvent, ModToolCloseTicketEvent.class); this.registerHandler(Incoming.ReleaseIssuesEvent, ModToolReleaseTicketEvent.class); this.registerHandler(Incoming.ModMessageEvent, ModToolAlertEvent.class); this.registerHandler(Incoming.ModToolWarnEvent, ModToolWarnEvent.class); this.registerHandler(Incoming.ModKickEvent, ModToolKickEvent.class); - this.registerHandler(Incoming.ModToolRoomAlertEvent, ModToolRoomAlertEvent.class); + this.registerHandler(Incoming.ModeratorActionEvent, ModToolRoomAlertEvent.class); this.registerHandler(Incoming.ModerateRoomEvent, ModToolChangeRoomSettingsEvent.class); - this.registerHandler(Incoming.ModToolRequestRoomVisitsEvent, ModToolRequestRoomVisitsEvent.class); + this.registerHandler(Incoming.GetRoomVisitsEvent, ModToolRequestRoomVisitsEvent.class); this.registerHandler(Incoming.GetCfhChatlogEvent, ModToolRequestIssueChatlogEvent.class); this.registerHandler(Incoming.ModToolRequestRoomUserChatlogEvent, ModToolRequestRoomUserChatlogEvent.class); this.registerHandler(Incoming.GetUserChatlogEvent, ModToolRequestUserChatlogEvent.class); this.registerHandler(Incoming.ModAlertEvent, ModToolSanctionAlertEvent.class); this.registerHandler(Incoming.ModMuteEvent, ModToolSanctionMuteEvent.class); this.registerHandler(Incoming.ModBanEvent, ModToolSanctionBanEvent.class); - this.registerHandler(Incoming.ModToolSanctionTradeLockEvent, ModToolSanctionTradeLockEvent.class); + this.registerHandler(Incoming.ModTradingLockEvent, ModToolSanctionTradeLockEvent.class); this.registerHandler(Incoming.ModToolSanctionEvent, ModToolIssueChangeTopicEvent.class); this.registerHandler(Incoming.CloseIssueDefaultActionEvent, ModToolIssueDefaultSanctionEvent.class); this.registerHandler(Incoming.GetPendingCallsForHelpEvent, RequestReportRoomEvent.class); - this.registerHandler(Incoming.RequestReportUserBullyingEvent, RequestReportUserBullyingEvent.class); + this.registerHandler(Incoming.GetGuideReportingStatusEvent, RequestReportUserBullyingEvent.class); this.registerHandler(Incoming.ChatReviewSessionCreateEvent, ReportBullyEvent.class); this.registerHandler(Incoming.CallForHelpEvent, ReportEvent.class); this.registerHandler(Incoming.CallForHelpFromIMEvent, ReportFriendPrivateChatEvent.class); - this.registerHandler(Incoming.ReportThreadEvent, ReportThreadEvent.class); + this.registerHandler(Incoming.CallForHelpFromForumThreadEvent, ReportThreadEvent.class); this.registerHandler(Incoming.CallForHelpFromForumMessageEvent, ReportCommentEvent.class); this.registerHandler(Incoming.CallForHelpFromPhotoEvent, ReportPhotoEvent.class); } @@ -508,8 +508,8 @@ public class PacketManager { this.registerHandler(Incoming.OpenTradingEvent, TradeStartEvent.class); this.registerHandler(Incoming.AddItemToTradeEvent, TradeOfferItemEvent.class); this.registerHandler(Incoming.AddItemsToTradeEvent, TradeOfferMultipleItemsEvent.class); - this.registerHandler(Incoming.TradeCancelOfferItemEvent, TradeCancelOfferItemEvent.class); - this.registerHandler(Incoming.TradeAcceptEvent, TradeAcceptEvent.class); + this.registerHandler(Incoming.RemoveItemFromTradeEvent, TradeCancelOfferItemEvent.class); + this.registerHandler(Incoming.AcceptTradingEvent, TradeAcceptEvent.class); this.registerHandler(Incoming.UnacceptTradingEvent, TradeUnAcceptEvent.class); this.registerHandler(Incoming.ConfirmAcceptTradingEvent, TradeConfirmEvent.class); this.registerHandler(Incoming.CloseTradingEvent, TradeCloseEvent.class); @@ -517,32 +517,32 @@ public class PacketManager { } void registerGuilds() throws Exception { - this.registerHandler(Incoming.RequestGuildBuyRoomsEvent, RequestGuildBuyRoomsEvent.class); - this.registerHandler(Incoming.RequestGuildPartsEvent, RequestGuildPartsEvent.class); + this.registerHandler(Incoming.GetGuildCreationInfoEvent, RequestGuildBuyRoomsEvent.class); + this.registerHandler(Incoming.GetGuildEditorDataEvent, RequestGuildPartsEvent.class); this.registerHandler(Incoming.CreateGuildEvent, RequestGuildBuyEvent.class); this.registerHandler(Incoming.GetHabboGroupDetailsEvent, RequestGuildInfoEvent.class); this.registerHandler(Incoming.GetGuildEditInfoEvent, RequestGuildManageEvent.class); this.registerHandler(Incoming.GetGuildMembersEvent, RequestGuildMembersEvent.class); - this.registerHandler(Incoming.RequestGuildJoinEvent, RequestGuildJoinEvent.class); + this.registerHandler(Incoming.JoinHabboGroupEvent, RequestGuildJoinEvent.class); this.registerHandler(Incoming.UpdateGuildIdentityEvent, GuildChangeNameDescEvent.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.RemoveAdminRightsFromMemberEvent, GuildRemoveAdminEvent.class); + this.registerHandler(Incoming.KickMemberEvent, GuildRemoveMemberEvent.class); + this.registerHandler(Incoming.UpdateGuildSettingsEvent, GuildChangeSettingsEvent.class); + this.registerHandler(Incoming.ApproveMembershipRequestEvent, GuildAcceptMembershipEvent.class); this.registerHandler(Incoming.RejectMembershipRequestEvent, GuildDeclineMembershipEvent.class); this.registerHandler(Incoming.AddAdminRightsToMemberEvent, GuildSetAdminEvent.class); - this.registerHandler(Incoming.GuildSetFavoriteEvent, GuildSetFavoriteEvent.class); - this.registerHandler(Incoming.RequestOwnGuildsEvent, RequestOwnGuildsEvent.class); + this.registerHandler(Incoming.SelectFavouriteHabboGroupEvent, GuildSetFavoriteEvent.class); + this.registerHandler(Incoming.GetGuildMembershipsEvent, RequestOwnGuildsEvent.class); this.registerHandler(Incoming.GetGuildFurniContextMenuInfoEvent, RequestGuildFurniWidgetEvent.class); - this.registerHandler(Incoming.GuildConfirmRemoveMemberEvent, GuildConfirmRemoveMemberEvent.class); + this.registerHandler(Incoming.GetMemberGuildItemCountEvent, GuildConfirmRemoveMemberEvent.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); + this.registerHandler(Incoming.GetForumsListEvent, GuildForumListEvent.class); + this.registerHandler(Incoming.GetThreadsEvent, GuildForumThreadsEvent.class); this.registerHandler(Incoming.GetForumStatsEvent, GuildForumDataEvent.class); - this.registerHandler(Incoming.GuildForumPostThreadEvent, GuildForumPostThreadEvent.class); + this.registerHandler(Incoming.PostMessageEvent, GuildForumPostThreadEvent.class); this.registerHandler(Incoming.UpdateForumSettingsEvent, GuildForumUpdateSettingsEvent.class); this.registerHandler(Incoming.GetMessagesEvent, GuildForumThreadsMessagesEvent.class); this.registerHandler(Incoming.ModerateMessageEvent, GuildForumModerateMessageEvent.class); @@ -567,11 +567,11 @@ public class PacketManager { this.registerHandler(Incoming.TogglePetRidingPermissionEvent, PetRideSettingsEvent.class); this.registerHandler(Incoming.MountPetEvent, PetRideEvent.class); this.registerHandler(Incoming.RemoveSaddleFromPetEvent, HorseRemoveSaddleEvent.class); - this.registerHandler(Incoming.ToggleMonsterplantBreedableEvent, ToggleMonsterplantBreedableEvent.class); - this.registerHandler(Incoming.CompostMonsterplantEvent, CompostMonsterplantEvent.class); + this.registerHandler(Incoming.TogglePetBreedingPermissionEvent, ToggleMonsterplantBreedableEvent.class); + this.registerHandler(Incoming.CompostPlantEvent, CompostMonsterplantEvent.class); this.registerHandler(Incoming.BreedPetsEvent, BreedMonsterplantsEvent.class); this.registerHandler(Incoming.MovePetEvent, MovePetEvent.class); - this.registerHandler(Incoming.PetPackageNameEvent, PetPackageNameEvent.class); + this.registerHandler(Incoming.OpenPetPackageEvent, PetPackageNameEvent.class); this.registerHandler(Incoming.CancelPetBreedingEvent, StopBreedingEvent.class); this.registerHandler(Incoming.ConfirmPetBreedingEvent, ConfirmPetBreedingEvent.class); } @@ -580,20 +580,20 @@ public class PacketManager { this.registerHandler(Incoming.UpdateTriggerEvent, WiredTriggerSaveDataEvent.class); this.registerHandler(Incoming.UpdateActionEvent, WiredEffectSaveDataEvent.class); this.registerHandler(Incoming.UpdateConditionEvent, WiredConditionSaveDataEvent.class); - this.registerHandler(Incoming.WiredApplySetConditionsEvent, WiredApplySetConditionsEvent.class); + this.registerHandler(Incoming.ApplySnapshotEvent, WiredApplySetConditionsEvent.class); } void registerUnknown() throws Exception { - this.registerHandler(Incoming.RequestResolutionEvent, RequestResolutionEvent.class); + this.registerHandler(Incoming.GetResolutionAchievementsEvent, RequestResolutionEvent.class); this.registerHandler(Incoming.GetTalentTrackEvent, RequestTalentTrackEvent.class); this.registerHandler(Incoming.GetBadgePointLimitsEvent, GetBadgePointLimitsEvent.class); this.registerHandler(Incoming.GetCfhStatusEvent, MySanctionStatusEvent.class); } void registerFloorPlanEditor() throws Exception { - this.registerHandler(Incoming.FloorPlanEditorSaveEvent, FloorPlanEditorSaveEvent.class); + this.registerHandler(Incoming.UpdateFloorPropertiesEvent, FloorPlanEditorSaveEvent.class); this.registerHandler(Incoming.GetOccupiedTilesEvent, FloorPlanEditorRequestBlockedTilesEvent.class); - this.registerHandler(Incoming.FloorPlanEditorRequestDoorSettingsEvent, FloorPlanEditorRequestDoorSettingsEvent.class); + this.registerHandler(Incoming.GetRoomEntryTileEvent, FloorPlanEditorRequestDoorSettingsEvent.class); } void registerAchievements() throws Exception { @@ -603,26 +603,26 @@ public class PacketManager { void registerGuides() throws Exception { 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.GuideSessionCreateEvent, RequestGuideAssistanceEvent.class); + this.registerHandler(Incoming.GuideSessionIsTypingEvent, GuideUserTypingEvent.class); + this.registerHandler(Incoming.GuideSessionReportEvent, GuideReportHelperEvent.class); + this.registerHandler(Incoming.GuideSessionFeedbackEvent, GuideRecommendHelperEvent.class); + this.registerHandler(Incoming.GuideSessionMessageEvent, GuideUserMessageEvent.class); this.registerHandler(Incoming.GuideSessionRequesterCancelsEvent, GuideCancelHelpRequestEvent.class); this.registerHandler(Incoming.GuideSessionGuideDecidesEvent, GuideHandleHelpRequestEvent.class); this.registerHandler(Incoming.GuideSessionInviteRequesterEvent, GuideInviteUserEvent.class); this.registerHandler(Incoming.GuideSessionGetRequesterRoomEvent, GuideVisitUserEvent.class); - this.registerHandler(Incoming.GuideCloseHelpRequestEvent, GuideCloseHelpRequestEvent.class); + this.registerHandler(Incoming.GuideSessionResolvedEvent, GuideCloseHelpRequestEvent.class); this.registerHandler(Incoming.ChatReviewGuideDetachedEvent, GuardianNoUpdatesWantedEvent.class); - this.registerHandler(Incoming.GuardianAcceptRequestEvent, GuardianAcceptRequestEvent.class); - this.registerHandler(Incoming.GuardianVoteEvent, GuardianVoteEvent.class); + this.registerHandler(Incoming.ChatReviewGuideDecidesOnOfferEvent, GuardianAcceptRequestEvent.class); + this.registerHandler(Incoming.ChatReviewGuideVoteEvent, GuardianVoteEvent.class); } void registerCrafting() throws Exception { this.registerHandler(Incoming.GetCraftingRecipeEvent, RequestCraftingRecipesEvent.class); - this.registerHandler(Incoming.CraftingAddRecipeEvent, CraftingAddRecipeEvent.class); - this.registerHandler(Incoming.CraftingCraftItemEvent, CraftingCraftItemEvent.class); + this.registerHandler(Incoming.GetCraftableProductsEvent, CraftingAddRecipeEvent.class); + this.registerHandler(Incoming.CraftEvent, CraftingCraftItemEvent.class); this.registerHandler(Incoming.CraftSecretEvent, CraftingCraftSecretEvent.class); this.registerHandler(Incoming.GetCraftingRecipesAvailableEvent, RequestCraftingRecipesAvailableEvent.class); } @@ -636,7 +636,7 @@ public class PacketManager { } void registerGameCenter() throws Exception { - this.registerHandler(Incoming.GameCenterRequestGamesEvent, GameCenterRequestGamesEvent.class); + this.registerHandler(Incoming.GetGameListEvent, GameCenterRequestGamesEvent.class); this.registerHandler(Incoming.GetGameStatusEvent, GameCenterRequestAccountStatusEvent.class); this.registerHandler(Incoming.JoinQueueEvent, GameCenterJoinGameEvent.class); this.registerHandler(Incoming.GetWeeklyGameRewardWinnersEvent, GameCenterLoadGameEvent.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 45ff211d..c231d63e 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/Incoming.java +++ b/src/main/java/com/eu/habbo/messages/incoming/Incoming.java @@ -9,60 +9,71 @@ public class Incoming { public static final int EventLogEvent = 3457; public static final int NavigatorSetSearchCodeViewModeEvent = 1202; public static final int NavigatorAddCollapsedCategoryEvent = 1834; - public static final int NavigatorUncollapseCategoryEvent = 637; + public static final int NavigatorRemoveCollapsedCategoryEvent = 637; public static final int NewUserExperienceGetGiftsEvent = 1822; - public static final int FootballGateSaveLookEvent = 924; + public static final int ShopTargetedOfferViewedEvent = 3483; + public static final int PhotoCompetitionEvent = 3959; + + public static final int SetClothingChangeDataEvent = 924; public static final int SetMannequinFigureEvent = 2209; - public static final int RequestCatalogPageEvent = 412; + public static final int GetCatalogPageEvent = 412; public static final int GetSelectedBadgesEvent = 2091; - public static final int BotPickupEvent = 3323; + public static final int RemoveBotFromFlatEvent = 3323; public static final int MountPetEvent = 1036; public static final int CreateFlatEvent = 2752; public static final int ChangeMottoEvent = 2228; public static final int ModMessageEvent = 1840; - public static final int TradeAcceptEvent = 3863; + public static final int AcceptTradingEvent = 3863; public static final int CallForHelpFromSelfieEvent = 2755; + public static final int GetQuestsEvent = 3333; + public static final int GetCatalogIndexEvent = 1195; public static final int GetCreditsInfoEvent = 273; public static final int GetFaqTextEvent = 1849; - public static final int FriendPrivateMessageEvent = 3567; + public static final int SendMsgEvent = 3567; public static final int DiceOffEvent = 1533; public static final int RemoveRightsEvent = 2064; public static final int RemoveOwnRoomRightsRoomEvent = 3182; 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 SetActivatedBadgesEvent = 644; + public static final int WelcomeGiftChangeEmailEvent = 66; + public static final int RateFlatEvent = 3582; public static final int SignEvent = 1975; - public static final int RequestUserDataEvent = 357; + public static final int InfoRetrieveEvent = 357; public static final int ShoutEvent = 2085; public static final int RespectPetEvent = 3202; - public static final int RoomUserWalkEvent = 3320; - public static final int RequestTagsEvent = 826; + public static final int MoveAvatarEvent = 3320; + public static final int GetPopularRoomTagsEvent = 826; public static final int GetMarketplaceConfigurationEvent = 2597; - public static final int RequestHeightmapEvent = 3898; + public static final int GetFurnitureAliasesEvent = 3898; public static final int CloseTradingEvent = 2551; - public static final int CatalogBuyItemEvent = 3492; + public static final int PurchaseFromCatalogEvent = 3492; public static final int GetEmailStatusEvent = 2557; public static final int Game2GetWeeklyLeaderboardEvent = 2565; + public static final int ResetUnseenItemIdsEvent = 3493; + public static final int GetSoundMachinePlayListEvent = 3498; + public static final int GetUserGameAchievementsEvent = 389; + public static final int GoToFlatEvent = 685; + public static final int SelectClubGiftEvent = 2276; - public static final int GetHabboClubExtendOfferEvent = 2462; - public static final int CatalogBuyClubDiscountEvent = 3407; + public static final int BuildersClubPlaceWallItemEvent = 2462; + public static final int PurchaseVipMembershipExtensionEvent = 3407; public static final int GetGuildMembersEvent = 312; public static final int GetPetInfoEvent = 2934; public static final int UpdateRoomThumbnailEvent = 2468; public static final int WhisperEvent = 1543; - public static final int ModToolRequestUserInfoEvent = 3295; + public static final int GetModeratorUserInfoEvent = 3295; public static final int MoveObjectEvent = 248; public static final int PollRejectEvent = 1773; public static final int OpenFlatConnectionEvent = 2312; - public static final int RequestGuildPartsEvent = 813; + public static final int GetGuildEditorDataEvent = 813; public static final int GetDailyQuestEvent = 2486; - public static final int RoomPlacePaintEvent = 711; + public static final int RequestRoomPropertySet = 711; public static final int PopularRoomsSearchEvent = 2758; - public static final int ModToolRequestRoomInfoEvent = 707; + public static final int GetModeratorRoomInfoEvent = 707; public static final int RequestFriendEvent = 3157; public static final int RecycleItemsEvent = 2771; public static final int GetUserFlatCatsEvent = 3027; //1371; @@ -74,12 +85,12 @@ public class Incoming { public static final int DanceEvent = 2080; public static final int GetExtendedProfileEvent = 3265; public static final int RoomsWhereMyFriendsAreSearchEvent = 1786; - public static final int SetStackHelperHeightEvent = 3839; + public static final int SetCustomStackingHeightEvent = 3839; public static final int RedeemVoucherEvent = 339; public static final int CustomizePetWithFurniEvent = 1328; public static final int RemoveSaddleFromPetEvent = 186; public static final int BuyMarketplaceOfferEvent = 1603; - public static final int AdvertisingSaveEvent = 3608; + public static final int SetObjectDataEvent = 3608; public static final int BuyMarketplaceTokensEvent = 1866; public static final int RoomCompetitionInitEvent = 1334; public static final int GetCommunityGoalHallOfFameEvent = 2167; @@ -88,46 +99,49 @@ public class Incoming { public static final int GetPromoArticlesEvent = 1827; public static final int GetUnreadForumsCountEvent = 2908; // wtf is this wrong? // previously RequestPromotedRoomsEvent public static final int AddAdminRightsToMemberEvent = 2894; - public static final int GetClubDataEvent = 3285; - public static final int RequestClubCenterEvent = 869; + public static final int GetClubOffersEvent = 3285; + public static final int ScrGetKickbackInfoEvent = 869; public static final int GetSoundSettingsEvent = 2388; public static final int SetMannequinNameEvent = 2850; - public static final int SellItemEvent = 3447; - public static final int GuildAcceptMembershipEvent = 3386; - public static final int RequestRecylerLogicEvent = 398; - public static final int RequestGuildJoinEvent = 998; + public static final int MakeOfferEvent = 3447; + public static final int ApproveMembershipRequestEvent = 3386; + public static final int GetRecyclerPrizesEvent = 398; + public static final int JoinHabboGroupEvent = 998; public static final int RejectQuestEvent = 2397; public static final int GetGameAchievementsEvent = 2399; public static final int BuildersClubQueryFurniCountEvent = 2529; public static final int MyRecommendedRoomsEvent = 2537; - + public static final int GetHabboBasicMembershipExtendOfferEvent = 603; public static final int GetPetInventoryEvent = 3095; - public static final int ModToolRequestRoomVisitsEvent = 3526; + public static final int GetRoomVisitsEvent = 3526; public static final int ModToolWarnEvent = -1;//3763 - public static final int RequestItemInfoEvent = 3288; + public static final int GetMarketplaceItemStatsEvent = 3288; public static final int GetRoomChatlogEvent = 2587; public static final int UpdateFigureDataEvent = 2730; - public static final int ToggleFloorItemEvent = 99; + public static final int UseFurnitureEvent = 99; public static final int UnacceptTradingEvent = 1444; public static final int UpdateTriggerEvent = 1520; public static final int RemoveAllRightsEvent = 2683; - public static final int TakeBackItemEvent = 434; - public static final int OpenRecycleBoxEvent = 3558; + public static final int CancelMarketplaceOfferEvent = 434; + public static final int PresentOpenEvent = 3558; public static final int UpdateGuildIdentityEvent = 3137; public static final int ModToolPreferencesEvent = 31; public static final int Game2ExitGameEvent = 1445; public static final int HarvestPetEvent = 1521; public static final int GetCommunityGoalEarnedPrizesEvent = 2688; - public static final int RequestSellItemEvent = 848; + public static final int GetMarketplaceCanMakeOfferEvent = 848; public static final int ModerateRoomEvent = 3260; public static final int GetUserChatlogEvent = 1391;//203 public static final int PurchaseBasicMembershipExtensionEvent = 2735; public static final int ResetPhoneNumberStateEvent = 2741; - public static final int GuildChangeSettingsEvent = 3435; + public static final int GetFaqCategoryEvent = 3445; + public static final int LagWarningReportEvent = 3847; + public static final int ForwardToRandomCompetitionRoomEvent = 865; + public static final int UpdateGuildSettingsEvent = 3435; public static final int DropCarryItemEvent = 2814; public static final int GetRelationshipStatusInfoEvent = 2138; - public static final int TradeCancelOfferItemEvent = 3845; + public static final int RemoveItemFromTradeEvent = 3845; public static final int ThrowDiceEvent = 1990; public static final int PollStartEvent = 109; public static final int UniqueIDEvent = 2490; @@ -137,38 +151,40 @@ public class Incoming { public static final int GuideAdvertisementReadEvent = 2455; public static final int AcceptFriendEvent = 137; public static final int DeclineFriendEvent = 2890; //835; //TODO - public static final int ReleaseVersionEvent = 4000;//4000 + public static final int ClientHelloEvent = 4000;//4000 public static final int InitDiffieHandshakeEvent = 3110; - public static final int CompleteDiffieHandshake = 773; + public static final int CompleteDiffieHandshakeEvent = 773; public static final int MyFavouriteRoomsSearchEvent = 2578; public static final int OpenTradingEvent = 1481; public static final int GetNextTargetedOfferEvent = 2487; - public static final int ChangeRelationEvent = 3768; + public static final int SetRelationshipStatusEvent = 3768; public static final int ChangePostureEvent = 2235; public static final int CanCreateRoomEvent = 2128; public static final int ModKickEvent = 2582; public static final int MoveWallItemEvent = 168; - public static final int SearchRoomsEvent = 3943; + public static final int RoomTextSearchEvent = 3943; public static final int RoomsWithHighestScoreSearchEvent = 2939; public static final int PurchaseFromCatalogAsGiftEvent = 1411; public static final int RespectUserEvent = 2694; public static final int RemoveFriendEvent = 1689; public static final int MyFriendsRoomsSearchEvent = 2266; - public static final int GuildSetFavoriteEvent = 3549; + public static final int SelectFavouriteHabboGroupEvent = 3549; + public static final int PetSelectedEvent = 549; public static final int PlacePetEvent = 2647; public static final int GetBotCommandConfigurationDataEvent = 1986; - public static final int StalkFriendEvent = 3997; - public static final int RoomPickupItemEvent = 3456; + public static final int VisitUserEvent = 3997; + public static final int PickupObjectEvent = 3456; public static final int CreditFurniRedeemEvent = 3115; public static final int GetMOTDEvent = 1523; public static final int GetAchievementsEvent = 219; public static final int UpdateGuildColorsEvent = 1764; public static final int GetBadgesEvent = 2769; - public static final int HotelViewInventoryEvent = 3500; + public static final int RequestFurniInventoryWhenNotInRoomEvent = 3500; 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 SaveWardrobeOutfitEvent = 800; + public static final int GetDirectClubBuyAvailableEvent = 801; public static final int MysteryBoxWaitingCanceledEvent = 2012; public static final int SearchFaqsEvent = 2031; public static final int QuitEvent = 105; @@ -179,48 +195,58 @@ public class Incoming { public static final int BuildersClubPlaceRoomItemEvent = 1051; public static final int SearchRoomsByTagEvent = -1;//1956 public static final int GetOfficialRoomsEvent = 1229; - public static final int RequestResolutionEvent = 359; + public static final int GetResolutionAchievementsEvent = 359; public static final int RequestFurniInventoryEvent = 3150; - public static final int ModToolRoomAlertEvent = 3842; + public static final int ModeratorActionEvent = 3842; public static final int UpdateActionEvent = 2281; - public static final int WiredApplySetConditionsEvent = 3373; + public static final int ApplySnapshotEvent = 3373; public static final int Game2GetWeeklyFriendsLeaderboardEvent = 1232; public static final int ApproveNameEvent = 2109; public static final int RoomAdPurchaseInitiatedEvent = 2283; + public static final int GetTargetedOfferEvent = 596; + public static final int RoomUsersClassificationEvent = 2285; public static final int SSOTicketEvent = 2419; public static final int CommandBotEvent = 2624; public static final int CreateGuildEvent = 230; public static final int HabboSearchEvent = 1210; - public static final int GuildConfirmRemoveMemberEvent = 3593; - public static final int GuildRemoveMemberEvent = 593; + public static final int GetMemberGuildItemCountEvent = 3593; + public static final int KickMemberEvent = 593; public static final int UpdateConditionEvent = 3203; - public static final int RoomUserLookAtPoint = 3301; + public static final int LookToEvent = 3301; public static final int OpenWelcomeGiftEvent = 2638; + public static final int SetRoomSessionTagsEvent = 3305; + public static final int IgnoreUserIdEvent = 3314; + public static final int AcceptQuestEvent = 3604; + public static final int DeletePendingCallsForHelpEvent = 3605; + + public static final int GetThreadEvent = 3900; public static final int RoomDimmerChangeStateEvent = 2296; public static final int RoomDimmerGetPresetsEvent = 2813; public static final int MyRoomsSearchEvent = 2277; public static final int RedeemMarketplaceOfferCreditsEvent = 2650; - public static final int SearchRoomsInGroupEvent = 39; + public static final int MyGuildBasesSearchEvent = 39; 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 GetBotInventoryEvent = 3848; public static final int VerifyCodeEvent = 2721; public static final int GetWardrobeEvent = 2742; - public static final int RequestRoomRightsEvent = 3385; - public static final int RequestGuildBuyRoomsEvent = 798; + public static final int GetFlatControllersEvent = 3385; + public static final int GetGuildCreationInfoEvent = 798; public static final int CancelEventEvent = 2725; public static final int PlaceBotEvent = 1592; + public static final int LatencyPingReportEvent = 96; public static final int MyRoomRightsSearchEvent = 272; - public static final int HotelViewRequestBonusRareEvent = 957; - public static final int GuildRemoveAdminEvent = 722; + public static final int GetBonusRareInfoEvent = 957; + public static final int RemoveAdminRightsFromMemberEvent = 722; public static final int GetRoomSettingsEvent = 3129; public static final int CancelQuestEvent = 3133; public static final int GetCatalogPageWithEarliestExpiryEvent = 3135; - + public static final int GetCatalogPageExpirationEvent = 742; + public static final int GiveSupplementToPetEvent = 749; public static final int GetMarketplaceOffersEvent = 2407; public static final int GetTalentTrackLevelEvent = 2127; public static final int CancelTypingEvent = 1474; @@ -229,18 +255,18 @@ public class Incoming { public static final int Game2RequestFullStatusUpdateEvent = 1598; public static final int ScrGetUserInfoEvent = 3166; public static final int RemovePetFromFlatEvent = 1581; - public static final int RequestOwnGuildsEvent = 367; + public static final int GetGuildMembershipsEvent = 367; public static final int MyRoomHistorySearchEvent = 2264; public static final int AddItemToTradeEvent = 3107; public static final int AddItemsToTradeEvent = 1263; public static final int ConfirmAcceptTradingEvent = 2760; - public static final int RoomUserGiveRightsEvent = 808; + public static final int AssignRightsEvent = 808; public static final int UpdateRoomCategoryAndTradeSettingsEvent = 1265; public static final int GetQuizQuestionsEvent = 1296; public static final int GetHabboGroupDetailsEvent = 2991; public static final int GetRecyclerStatusEvent = 1342; public static final int AvatarExpressionEvent = 2456; - public static final int RequestGiftConfigurationEvent = 418; + public static final int GetGiftWrappingConfigurationEvent = 418; public static final int GetGuestRoomEvent = 2230; public static final int GetRoomEntryDataEvent = 2300; public static final int GetGuildFurniContextMenuInfoEvent = 2651; @@ -248,9 +274,11 @@ public class Incoming { public static final int GetPendingCallsForHelpEvent = 3267; public static final int CallForHelpEvent = 1691; public static final int EnterOneWayDoorEvent = 2765; - public static final int FloorPlanEditorSaveEvent = 875; - public static final int FloorPlanEditorRequestDoorSettingsEvent = 3559; + public static final int UpdateFloorPropertiesEvent = 875; + public static final int GetRoomEntryTileEvent = 3559; public static final int RoomAdEventTabViewedEvent = 2668; + public static final int CompetitionRoomsSearchEvent = 433; + public static final int ApproveAllMembershipRequestsEvent = 882; public static final int GetOccupiedTilesEvent = 1687; public static final int GetBadgePointLimitsEvent = 1371; @@ -259,15 +287,17 @@ public class Incoming { public static final int StartCampaignEvent = 1697; public static final int ExtendRentOrBuyoutStripItemEvent = 2115; public static final int NewNavigatorSearchEvent = 249; - public static final int RedeemClothingEvent = 3374; + public static final int CustomizeAvatarWithFurniEvent = 3374; public static final int ForwardToSomeRoomEvent = 1703; public static final int PlacePostItEvent = 2248; - public static final int PostItRequestDataEvent = 3964; - public static final int PostItSaveDataEvent = 3666; - public static final int PostItDeleteEvent = 3336; + public static final int GetItemDataEvent = 3964; + public static final int SetItemDataEvent = 3666; + public static final int RemoveItemEvent = 3336; public static final int ForwardToACompetitionRoomEvent = 172; + public static final int ChangeEmailEvent = 3965; + public static final int SetPhoneNumberVerificationStatusEvent = 1379; - public static final int UseRandomStateItemEvent = 3617; + public static final int SetRandomStateEvent = 3617; public static final int GetExtendedProfileByNameEvent = 2249; public static final int GetCfhStatusEvent = 2746; public static final int OpenQuestTrackerEvent = 2750; @@ -276,7 +306,7 @@ public class Incoming { public static final int GetCfhChatlogEvent = 211; public static final int ModToolRequestRoomUserChatlogEvent = -1; public static final int GetIgnoredUsersEvent = 3878; - public static final int RequestClubGiftsEvent = 487; + public static final int GetClubGiftInfo = 487; public static final int RentableSpaceRentEvent = 2946; public static final int RentableSpaceCancelRentEvent = 1667; public static final int MessengerInitEvent = 2781; @@ -295,7 +325,7 @@ public class Incoming { public static final int SetChatPreferencesEvent = 1262; public static final int SetIgnoreRoomInvitesEvent = 1086; public static final int SetRoomCameraPreferencesEvent = 1461; - public static final int RoomMuteEvent = 3637; + public static final int MuteAllInRoomEvent = 3637; public static final int GetCustomRoomFilterEvent = 1911; public static final int UpdateRoomFilterEvent = 3001; public static final int GetUserTagsEvent = 17; @@ -310,32 +340,36 @@ public class Incoming { public static final int JukeBoxEventOne = 2304; 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 DeleteRoomEvent = 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 PurchaseRoomAdEvent = 777; + public static final int EditEventEvent = 3991; + public static final int TryPhoneNumberEvent = 790; + public static final int ActivateQuestEvent = 793; + public static final int RedeemCommunityGoalPrizeEvent = 90; + 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 GuideSessionCreateEvent = 3338; + public static final int GuideSessionIsTypingEvent = 519; + public static final int GuideSessionReportEvent = 3969; + public static final int GuideSessionFeedbackEvent = 477; + public static final int GuideSessionMessageEvent = 3899; public static final int GuideSessionRequesterCancelsEvent = 291; public static final int GuideSessionGuideDecidesEvent = 1424; public static final int GuideSessionGetRequesterRoomEvent = 1052; public static final int GuideSessionInviteRequesterEvent = 234; - public static final int GuideCloseHelpRequestEvent = 887; + public static final int GuideSessionResolvedEvent = 887; public static final int Game2GameChatEvent = 2502; public static final int GetInterstitialEvent = 2519; public static final int ChatReviewGuideDetachedEvent = 2501; - public static final int GuardianVoteEvent = 3961; + public static final int ChatReviewGuideVoteEvent = 3961; public static final int VersionCheckEvent = 1053; - public static final int GuardianAcceptRequestEvent = 3365; + public static final int ChatReviewGuideDecidesOnOfferEvent = 3365; public static final int RequestAchievementConfigurationEvent = -1; - public static final int RequestReportUserBullyingEvent = 3786; + public static final int GetGuideReportingStatusEvent = 3786; public static final int ChatReviewSessionCreateEvent = 3060; + public static final int AcceptGameInviteEvent = 3802; public static final int OpenMysteryTrophyEvent = 3074; public static final int RenderRoomEvent = 3226; public static final int PerformanceLogEvent = 3230; @@ -345,14 +379,14 @@ public class Incoming { public static final int GetCommunityGoalProgressEvent = 1145; public static final int GetSeasonalCalendarDailyOfferEvent = 3257; public static final int GetConcurrentUsersGoalProgressEvent = 1343; - public static final int HotelViewConcurrentUsersButtonEvent = 3872; + public static final int GetConcurrentUsersRewardEvent = 3872; public static final int FriendRequestQuestCompleteEvent = 1148; public static final int PeerUsersClassificationEvent = 1160; public static final int Game2CheckGameDirectoryStatusEvent = 3259; public static final int IgnoreUserEvent = 1117; public static final int UnignoreUserEvent = 2061; public static final int GetIsOfferGiftableEvent = 1347; - public static final int UnbanRoomUserEvent = 992; + public static final int UnbanUserFromRoomEvent = 992; public static final int BanUserWithDurationEvent = 1477; public static final int GetUserEventCatsEvent = 1782; public static final int GetIsBadgeRequestFulfilledEvent = 1364; @@ -362,42 +396,44 @@ public class Incoming { public static final int SetNewNavigatorWindowPreferencesEvent = 3159; public static final int GetHabboGroupBadgesEvent = 21; public static final int UpdateUIFlagsEvent = 2313; - public static final int ReportThreadEvent = 534; + public static final int CallForHelpFromForumThreadEvent = 534; public static final int CallForHelpFromForumMessageEvent = 1412; public static final int CallForHelpFromPhotoEvent = 2492; public static final int FriendListUpdateEvent = 1419; public static final int GetIsUserPartOfCompetitionEvent = 2077; - + public static final int RentableSpaceStatusEvent = 872; public static final int GetCraftingRecipeEvent = 1173; public static final int GetCraftingRecipesAvailableEvent = 3086; - public static final int CraftingAddRecipeEvent = 633; - public static final int CraftingCraftItemEvent = 3591; + public static final int GetCraftableProductsEvent = 633; + public static final int CraftEvent = 3591; public static final int CraftSecretEvent = 1251; public static final int GetSeasonalQuestsOnlyEvent = 1190; public static final int OpenCampaignCalendarDoorAsStaffEvent = 2257; - public static final int AdventCalendarForceOpenEvent = 3889; + public static final int OpenCampaignCalendarDoorEvent = 3889; public static final int PurchasePhotoEvent = 2408; - public static final int RoomFavoriteEvent = 3817; + public static final int AddFavouriteRoomEvent = 3817; public static final int DeleteFavouriteRoomEvent = 309; public static final int Game2LoadStageReadyEvent = 2415; public static final int DisconnectEvent = 2445; public static final int ChangeQueueEvent = 3093; - public static final int YoutubeRequestPlaylists = 336; + public static final int GetYoutubeDisplayStatusEvent = 336; public static final int ControlYoutubeDisplayPlaybackEvent = 3005; public static final int SetYoutubeDisplayPlaylistEvent = 2069; public static final int RoomAdEventTabAdClickedEvent = 2412; public static final int HotelViewRequestBadgeRewardEvent = 2318; public static final int HotelViewClaimBadgeRewardEvent = -1; - public static final int JukeBoxAddSoundTrackEvent = 753; + public static final int AddJukeboxDiskEvent = 753; public static final int RemoveJukeboxDiskEvent = 3050; - public static final int ToggleMonsterplantBreedableEvent = 3379; - public static final int CompostMonsterplantEvent = 3835; + public static final int TogglePetBreedingPermissionEvent = 3379; + public static final int CompostPlantEvent = 3835; public static final int BreedPetsEvent = 1638; public static final int MovePetEvent = 3449; - public static final int PetPackageNameEvent = 3698; + public static final int OpenPetPackageEvent = 3698; + public static final int PostQuizAnswersEvent = 3720; + public static final int RoomNetworkOpenConnectionEvent = 3736; - public static final int GameCenterRequestGamesEvent = 741; + public static final int GetGameListEvent = 741; public static final int GetGameStatusEvent = 3171; public static final int Game2GetAccountGameStatusEvent = 11; public static final int PublishPhotoEvent = 2068; @@ -411,7 +447,7 @@ public class Incoming { public static final int ModAlertEvent = 229; public static final int ModMuteEvent = 1945; public static final int ModBanEvent = 2766; - public static final int ModToolSanctionTradeLockEvent = 3742; + public static final int ModTradingLockEvent = 3742; public static final int NewUserExperienceScriptProceedEvent = 1299; public static final int PassCarryItemToPetEvent = 2768; public static final int GuildBaseSearchEvent = 2930; @@ -422,9 +458,11 @@ public class Incoming { public static final int ConfirmDeclineTradingEvent = 2341; public static final int SetChatStylePreferenceEvent = 1030; - public static final int LoveLockStartConfirmEvent = 3775; + public static final int FriendFurniConfirmLockEvent = 3775; + public static final int GetCategoriesWithUserCountEvent = 3782; - public static final int HotelViewRequestLTDAvailabilityEvent = 410; + + public static final int GetLimitedOfferAppearingNextEvent = 410; public static final int HotelViewRequestSecondsUntilEvent = 271; public static final int ResetUnseenItemsEvent = 2343; public static final int LeaveQueueEvent = 2384; @@ -435,10 +473,10 @@ public class Incoming { public static final int ConfirmPetBreedingEvent = 3382; - public static final int GuildForumListEvent = 873; - public static final int GuildForumThreadsEvent = 436; + public static final int GetForumsListEvent = 873; + public static final int GetThreadsEvent = 436; public static final int GetForumStatsEvent = 3149; // previously ConvertGlobalRoomIdEvent - public static final int GuildForumPostThreadEvent = 3529; + public static final int PostMessageEvent = 3529; public static final int UpdateForumSettingsEvent = 2214; public static final int GetMessagesEvent = 232; public static final int ModerateMessageEvent = 286; @@ -447,6 +485,7 @@ public class Incoming { public static final int UpdateForumReadMarkerEvent = 1855; public static final int UnblockGroupMemberEvent = 2864; public static final int ResetResolutionAchievementEvent = 3144; + public static final int CommunityGoalVoteEvent = 3536; public static final int UNKNOWN_SNOWSTORM_6000 = 6000; public static final int UNKNOWN_SNOWSTORM_6001 = 6001;