Updates to incoming.java

This commit is contained in:
Harmonic 2022-04-19 09:16:07 -07:00 committed by Harmonic
parent 3eebdf6880
commit 9e08840dce
4 changed files with 49 additions and 41 deletions

View File

@ -5,8 +5,8 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.eu.habbo</groupId>
<artifactId>Habbo</artifactId>
<version>4.0.0</version>
<artifactId>Morningstar</artifactId>
<version>4.0-DEVPREVIEW</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

View File

@ -48,8 +48,7 @@ public final class Emulator {
"██╔████╔██║██║ ██║██████╔╝██╔██╗ ██║██║██╔██╗ ██║██║ ███╗███████╗ ██║ ███████║██████╔╝\n" +
"██║╚██╔╝██║██║ ██║██╔══██╗██║╚██╗██║██║██║╚██╗██║██║ ██║╚════██║ ██║ ██╔══██║██╔══██╗\n" +
"██║ ╚═╝ ██║╚██████╔╝██║ ██║██║ ╚████║██║██║ ╚████║╚██████╔╝███████║ ██║ ██║ ██║██║ ██║\n" +
"╚═╝ ╚═╝ ╚═════╝ ╚═╝ ╚═╝╚═╝ ╚═══╝╚═╝╚═╝ ╚═══╝ ╚═════╝ ╚══════╝ ╚═╝ ╚═╝ ╚═╝╚═╝ ╚═╝\n" +
"If u use this build on a live hotel and ask for help ill just send you a picture of wullez ass" ;
"╚═╝ ╚═╝ ╚═════╝ ╚═╝ ╚═╝╚═╝ ╚═══╝╚═╝╚═╝ ╚═══╝ ╚═════╝ ╚══════╝ ╚═╝ ╚═╝ ╚═╝╚═╝ ╚═╝\n";
@ -86,6 +85,7 @@ public final class Emulator {
public static void promptEnterKey(){
System.out.println("\n");
System.out.println("This is a developer preview build. Your plugins for Arcturus Morningstar 3.x will NOT work on this build.");
System.out.println("Press \"ENTER\" if you agree to the terms stated above...");
Scanner scanner = new Scanner(System.in);
scanner.nextLine();
@ -113,7 +113,7 @@ public final class Emulator {
System.out.println(logo);
// Checks if this is a BETA build before allowing them to continue.
if (PREVIEW.toLowerCase().contains("beta")) {
if (PREVIEW.toLowerCase().contains("preview") ) {
System.out.println();
promptEnterKey();
}
@ -207,7 +207,7 @@ public final class Emulator {
private static void setBuild() {
if (Emulator.class.getProtectionDomain().getCodeSource() == null) {
build = "UNKNOWN";
build = "4.0 Developer Preview Branch";
return;
}
@ -224,7 +224,7 @@ public final class Emulator {
for (int i = 0; i < mdbytes.length; i++)
sb.append(Integer.toString((mdbytes[i] & 0xff) + 0x100, 16).substring(1));
} catch (Exception e) {
build = "UNKNOWN";
build = "4.0 Developer Preview Branch";
return;
}

View File

@ -232,13 +232,13 @@ public class PacketManager {
this.registerHandler(Incoming.RequestDiscountEvent, RequestDiscountEvent.class);
this.registerHandler(Incoming.RequestGiftConfigurationEvent, RequestGiftConfigurationEvent.class);
this.registerHandler(Incoming.GetMarketplaceConfigEvent, RequestMarketplaceConfigEvent.class);
this.registerHandler(Incoming.RequestCatalogModeEvent, RequestCatalogModeEvent.class);
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.CatalogBuyItemEvent, CatalogBuyItemEvent.class);
this.registerHandler(Incoming.RedeemVoucherEvent, RedeemVoucherEvent.class);
this.registerHandler(Incoming.ReloadRecyclerEvent, ReloadRecyclerEvent.class);
this.registerHandler(Incoming.GetRecyclerStatusEvent, ReloadRecyclerEvent.class);
this.registerHandler(Incoming.RecycleEvent, RecycleEvent.class);
this.registerHandler(Incoming.OpenRecycleBoxEvent, OpenRecycleBoxEvent.class);
this.registerHandler(Incoming.RequestOwnItemsEvent, RequestOwnItemsEvent.class);
@ -281,9 +281,9 @@ public class PacketManager {
this.registerHandler(Incoming.RequestFriendsEvent, RequestFriendsEvent.class);
this.registerHandler(Incoming.ChangeRelationEvent, ChangeRelationEvent.class);
this.registerHandler(Incoming.RemoveFriendEvent, RemoveFriendEvent.class);
this.registerHandler(Incoming.SearchUserEvent, SearchUserEvent.class);
this.registerHandler(Incoming.HabboSearchEvent, SearchUserEvent.class);
this.registerHandler(Incoming.FriendRequestEvent, FriendRequestEvent.class);
this.registerHandler(Incoming.AcceptFriendRequest, AcceptFriendRequestEvent.class);
this.registerHandler(Incoming.AcceptFriendEvent, AcceptFriendRequestEvent.class);
this.registerHandler(Incoming.DeclineFriendRequest, DeclineFriendRequestEvent.class);
this.registerHandler(Incoming.FriendPrivateMessageEvent, FriendPrivateMessageEvent.class);
this.registerHandler(Incoming.RequestFriendRequestEvent, RequestFriendRequestsEvent.class);
@ -307,14 +307,14 @@ public class PacketManager {
this.registerHandler(Incoming.UserSaveLookEvent, UserSaveLookEvent.class);
this.registerHandler(Incoming.UserWearBadgeEvent, UserWearBadgeEvent.class);
this.registerHandler(Incoming.RequestWearingBadgesEvent, RequestWearingBadgesEvent.class);
this.registerHandler(Incoming.SaveUserVolumesEvent, SaveUserVolumesEvent.class);
this.registerHandler(Incoming.SetSoundSettingsEvent, SaveUserVolumesEvent.class);
this.registerHandler(Incoming.SaveBlockCameraFollowEvent, SaveBlockCameraFollowEvent.class);
this.registerHandler(Incoming.SetIgnoreRoomInvitesEvent, SaveIgnoreRoomInvitesEvent.class);
this.registerHandler(Incoming.SavePreferOldChatEvent, SavePreferOldChatEvent.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.UserNuxEvent, UserNuxEvent.class);
this.registerHandler(Incoming.NewUserExperienceScriptProceedEvent, UserNuxEvent.class);
this.registerHandler(Incoming.PickNewUserGiftEvent, PickNewUserGiftEvent.class);
this.registerHandler(Incoming.CheckUserNameEvent, ChangeNameCheckUsernameEvent.class);
this.registerHandler(Incoming.ChangeUserNameEvent, ConfirmChangeNameEvent.class);
@ -378,7 +378,7 @@ public class PacketManager {
this.registerHandler(Incoming.RoomVoteEvent, RoomVoteEvent.class);
this.registerHandler(Incoming.RequestRoomDataEvent, RequestRoomDataEvent.class);
this.registerHandler(Incoming.RoomSettingsSaveEvent, RoomSettingsSaveEvent.class);
this.registerHandler(Incoming.RoomPlaceItemEvent, RoomPlaceItemEvent.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);
@ -397,7 +397,7 @@ public class PacketManager {
this.registerHandler(Incoming.MoodLightTurnOnEvent, MoodLightTurnOnEvent.class);
this.registerHandler(Incoming.RoomUserDropHandItemEvent, RoomUserDropHandItemEvent.class);
this.registerHandler(Incoming.RoomUserLookAtPoint, RoomUserLookAtPoint.class);
this.registerHandler(Incoming.RoomUserTalkEvent, RoomUserTalkEvent.class);
this.registerHandler(Incoming.ChatEvent, RoomUserTalkEvent.class);
this.registerHandler(Incoming.RoomUserShoutEvent, RoomUserShoutEvent.class);
this.registerHandler(Incoming.RoomUserWhisperEvent, RoomUserWhisperEvent.class);
this.registerHandler(Incoming.RoomUserActionEvent, RoomUserActionEvent.class);
@ -443,7 +443,7 @@ public class PacketManager {
this.registerHandler(Incoming.JukeBoxRequestTrackDataEvent, JukeBoxRequestTrackDataEvent.class);
this.registerHandler(Incoming.JukeBoxAddSoundTrackEvent, JukeBoxAddSoundTrackEvent.class);
this.registerHandler(Incoming.JukeBoxRemoveSoundTrackEvent, JukeBoxRemoveSoundTrackEvent.class);
this.registerHandler(Incoming.JukeBoxRequestPlayListEvent, JukeBoxRequestPlayListEvent.class);
this.registerHandler(Incoming.GetNowPlayingEvent, JukeBoxRequestPlayListEvent.class);
this.registerHandler(Incoming.JukeBoxEventOne, JukeBoxEventOne.class);
this.registerHandler(Incoming.JukeBoxEventTwo, JukeBoxEventTwo.class);
this.registerHandler(Incoming.SavePostItStickyPoleEvent, SavePostItStickyPoleEvent.class);
@ -507,7 +507,7 @@ public class PacketManager {
void registerTrading() throws Exception {
this.registerHandler(Incoming.TradeStartEvent, TradeStartEvent.class);
this.registerHandler(Incoming.TradeOfferItemEvent, TradeOfferItemEvent.class);
this.registerHandler(Incoming.TradeOfferMultipleItemsEvent, TradeOfferMultipleItemsEvent.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);
@ -563,7 +563,7 @@ public class PacketManager {
this.registerHandler(Incoming.PetPickupEvent, PetPickupEvent.class);
this.registerHandler(Incoming.ScratchPetEvent, ScratchPetEvent.class);
this.registerHandler(Incoming.RequestPetTrainingPanelEvent, RequestPetTrainingPanelEvent.class);
this.registerHandler(Incoming.PetUseItemEvent, PetUseItemEvent.class);
this.registerHandler(Incoming.CustomizePetWithFurniEvent, PetUseItemEvent.class);
this.registerHandler(Incoming.HorseRideSettingsEvent, PetRideSettingsEvent.class);
this.registerHandler(Incoming.MountPetEvent, PetRideEvent.class);
this.registerHandler(Incoming.HorseRemoveSaddleEvent, HorseRemoveSaddleEvent.class);
@ -586,7 +586,7 @@ public class PacketManager {
void registerUnknown() throws Exception {
this.registerHandler(Incoming.RequestResolutionEvent, RequestResolutionEvent.class);
this.registerHandler(Incoming.RequestTalenTrackEvent, RequestTalentTrackEvent.class);
this.registerHandler(Incoming.BadgePointLimitsEvent, GetBadgePointLimitsEvent.class);
this.registerHandler(Incoming.GetBadgePointLimitsEvent, GetBadgePointLimitsEvent.class);
this.registerHandler(Incoming.MySanctionStatusEvent, MySanctionStatusEvent.class);
}
@ -620,10 +620,10 @@ public class PacketManager {
}
void registerCrafting() throws Exception {
this.registerHandler(Incoming.RequestCraftingRecipesEvent, RequestCraftingRecipesEvent.class);
this.registerHandler(Incoming.GetCraftingRecipeEvent, RequestCraftingRecipesEvent.class);
this.registerHandler(Incoming.CraftingAddRecipeEvent, CraftingAddRecipeEvent.class);
this.registerHandler(Incoming.CraftingCraftItemEvent, CraftingCraftItemEvent.class);
this.registerHandler(Incoming.CraftingCraftSecretEvent, CraftingCraftSecretEvent.class);
this.registerHandler(Incoming.CraftSecretEvent, CraftingCraftSecretEvent.class);
this.registerHandler(Incoming.RequestCraftingRecipesAvailableEvent, RequestCraftingRecipesAvailableEvent.class);
}

View File

@ -21,7 +21,7 @@ public class Incoming {
public static final int SaveMottoEvent = 2228;
public static final int ModToolAlertEvent = 1840;
public static final int TradeAcceptEvent = 3863;
public static final int RequestCatalogModeEvent = 1195;
public static final int GetCatalogIndexEvent = 1195;
public static final int RequestUserCreditsEvent = 273;
public static final int FriendPrivateMessageEvent = 3567;
public static final int CloseDiceEvent = 1533;
@ -61,17 +61,18 @@ public class Incoming {
public static final int ToggleWallItemEvent = 210;
public static final int ForwardToARandomPromotedRoomEvent = 10;
public static final int MyFrequentRoomHistorySearchEvent = 1002;
public static final int RoomUserTalkEvent = 1314;
public static final int ChatEvent = 1314;
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 SetStackHelperHeightEvent = 3839;
public static final int RedeemVoucherEvent = 339;
public static final int PetUseItemEvent = 1328;
public static final int CustomizePetWithFurniEvent = 1328;
public static final int HorseRemoveSaddleEvent = 186;
public static final int BuyItemEvent = 1603;
public static final int AdvertisingSaveEvent = 3608;
public static final int RoomCompetitionInitEvent = 1334;
public static final int RequestPetTrainingPanelEvent = 2161;
public static final int RoomBackgroundEvent = 2880;
public static final int RequestNewsListEvent = 1827;
@ -112,9 +113,9 @@ public class Incoming {
public static final int RequestDiscountEvent = 223;
public static final int RequestFriendRequestEvent = 2448;
public static final int RoomSettingsSaveEvent = 1969;
public static final int AcceptFriendRequest = 137;
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 ReleaseVersionEvent = 4000;//4000
public static final int InitDiffieHandshake = 3110;
public static final int CompleteDiffieHandshake = 773;
public static final int SearchRoomsMyFavoriteEvent = 2578;
@ -153,17 +154,18 @@ public class Incoming {
public static final int TriggerColorWheelEvent = 2144;
public static final int BuildersClubPlaceRoomItemEvent = 1051;
public static final int SearchRoomsByTagEvent = -1;//1956
public static final int RequestPublicRoomsEvent = 1229;
public static final int GetOfficialRoomsEvent = 1229;
public static final int RequestResolutionEvent = 359;
public static final int RequestInventoryItemsEvent = 3150;
public static final int ModToolRoomAlertEvent = 3842;
public static final int WiredEffectSaveDataEvent = 2281;
public static final int WiredApplySetConditionsEvent = 3373;
public static final int Game2GetWeeklyFriendsLeaderboardEvent = 1232;
public static final int CheckPetNameEvent = 2109;
public static final int SecureLoginEvent = 2419;
public static final int BotSaveSettingsEvent = 2624;
public static final int RequestGuildBuyEvent = 230;
public static final int SearchUserEvent = 1210;
public static final int HabboSearchEvent = 1210;
public static final int GuildConfirmRemoveMemberEvent = 3593;
public static final int GuildRemoveMemberEvent = 593;
public static final int WiredConditionSaveDataEvent = 3203;
@ -176,7 +178,7 @@ public class Incoming {
public static final int HorseRideSettingsEvent = 1472;
public static final int HandleDoorbellEvent = 1644;
public static final int RoomUserKickEvent = 1320;
public static final int RoomPlaceItemEvent = 1258;
public static final int PlaceObjectEvent = 1258;
public static final int RequestInventoryBotsEvent = 3848;
public static final int RequestUserWardrobeEvent = 2742;
public static final int RequestRoomRightsEvent = 3385;
@ -196,11 +198,14 @@ public class Incoming {
public static final int RequestOwnGuildsEvent = 367;
public static final int SearchRoomsVisitedEvent = 2264;
public static final int TradeOfferItemEvent = 3107;
public static final int TradeOfferMultipleItemsEvent = 1263;
public static final int AddItemsToTradeEvent = 1263;
public static final int TradeConfirmEvent = 2760;
public static final int RoomUserGiveRightsEvent = 808;
public static final int UpdateRoomCategoryAndTradeSettingsEvent = 1265;
public static final int SendRoomInviteEvent = 1276;
public static final int GetQuizQuestionsEvent = 1296;
public static final int RequestGuildInfoEvent = 2991;
public static final int ReloadRecyclerEvent = 1342;
public static final int GetRecyclerStatusEvent = 1342;
public static final int RoomUserActionEvent = 2456;
public static final int RequestGiftConfigurationEvent = 418;
public static final int RequestRoomDataEvent = 2230;
@ -213,7 +218,7 @@ public class Incoming {
public static final int FloorPlanEditorSaveEvent = 875;
public static final int FloorPlanEditorRequestDoorSettingsEvent = 3559;
public static final int FloorPlanEditorRequestBlockedTilesEvent = 1687;
public static final int BadgePointLimitsEvent = 1371;
public static final int GetBadgePointLimitsEvent = 1371;
public static final int RequestTalenTrackEvent = 196;
public static final int RequestNewNavigatorDataEvent = 2110;
public static final int RequestNewNavigatorRoomsEvent = 249;
@ -245,8 +250,8 @@ public class Incoming {
public static final int RoomUserGiveHandItemEvent = 2941;
public static final int AmbassadorVisitCommandEvent = 2970;
public static final int AmbassadorAlertCommandEvent = 2996;
public static final int SaveUserVolumesEvent = 1367;
public static final int SavePreferOldChatEvent = 1262;
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 RoomMuteEvent = 3637;
@ -258,7 +263,7 @@ public class Incoming {
public static final int JukeBoxRequestTrackDataEvent = 3082;
public static final int RoomStaffPickEvent = 1918;
public static final int RoomRequestBannedUsersEvent = 2267;
public static final int JukeBoxRequestPlayListEvent = 1325;
public static final int GetNowPlayingEvent = 1325;
public static final int JukeBoxEventOne = 2304;
public static final int JukeBoxEventTwo = 1435;
public static final int RoomUserMuteEvent = 3485;
@ -290,14 +295,17 @@ public class Incoming {
public static final int SavePostItStickyPoleEvent = 3283;
public static final int HotelViewClaimBadgeEvent = 3077;
public static final int GetCommunityGoalProgressEvent = 1145;
public static final int HotelViewRequestConcurrentUsersEvent = 1343;
public static final int GetConcurrentUsersGoalProgressEvent = 1343;
public static final int HotelViewConcurrentUsersButtonEvent = 3872;
public static final int FriendRequestQuestCompleteEvent = 1148;
public static final int PeerUsersClassificationEvent = 1160;
public static final int IgnoreUserEvent = 1117;
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 GetIsBadgeRequestFulfilledEvent = 1364;
public static final int AddSavedSearchEvent = 2226;
public static final int WhisperGroupEvent = 1118;
public static final int DeleteSavedSearchEvent = 1954;
@ -308,12 +316,12 @@ public class Incoming {
public static final int ReportCommentEvent = 1412;
public static final int ReportPhotoEvent = 2492;
public static final int RequestCraftingRecipesEvent = 1173;
public static final int GetCraftingRecipeEvent = 1173;
public static final int RequestCraftingRecipesAvailableEvent = 3086;
public static final int CraftingAddRecipeEvent = 633;
public static final int CraftingCraftItemEvent = 3591;
public static final int CraftingCraftSecretEvent = 1251;
public static final int CraftSecretEvent = 1251;
public static final int GetSeasonalQuestsOnlyEvent = 1190;
public static final int AdventCalendarOpenDayEvent = 2257;
public static final int AdventCalendarForceOpenEvent = 3889;
public static final int CameraPurchaseEvent = 2408;
@ -350,7 +358,7 @@ public class Incoming {
public static final int ModToolSanctionMuteEvent = 1945;
public static final int ModToolSanctionBanEvent = 2766;
public static final int ModToolSanctionTradeLockEvent = 3742;
public static final int UserNuxEvent = 1299;
public static final int NewUserExperienceScriptProceedEvent = 1299;
public static final int ReportFriendPrivateChatEvent = 2950;
public static final int ModToolIssueChangeTopicEvent = 1392;