From a97a7d5ae2aaa55f329eb71e988f0b00fe9591ad Mon Sep 17 00:00:00 2001 From: Harmonic Date: Sat, 16 Apr 2022 11:15:11 -0700 Subject: [PATCH] Refactored all outgoing composer names beginning with C --- .../com/eu/habbo/habbohotel/bots/Bot.java | 2 +- .../campaign/calendar/CalendarManager.java | 4 +-- .../habbohotel/catalog/CatalogManager.java | 6 ++--- .../catalog/marketplace/MarketPlace.java | 6 ++--- .../habbohotel/commands/CalendarCommand.java | 5 ++-- .../habbohotel/commands/HandItemCommand.java | 4 +-- .../commands/MassCreditsCommand.java | 4 +-- .../habbohotel/commands/PullCommand.java | 4 +-- .../habbohotel/commands/PushCommand.java | 4 +-- .../habbohotel/commands/RoomItemCommand.java | 4 +-- .../habbo/habbohotel/commands/SayCommand.java | 4 +-- .../habbohotel/commands/SuperPullCommand.java | 4 +-- .../commands/UpdateCatalogCommand.java | 2 +- .../habbohotel/guides/GuardianTicket.java | 10 +++---- .../InteractionCostumeHopper.java | 4 +-- .../InteractionHabboClubGate.java | 6 ++--- .../InteractionHabboClubHopper.java | 4 +-- .../pets/InteractionPetBreedingNest.java | 4 +-- .../com/eu/habbo/habbohotel/pets/Pet.java | 4 +-- .../com/eu/habbo/habbohotel/rooms/Room.java | 10 +++---- .../habbo/habbohotel/rooms/RoomManager.java | 26 +++++++++---------- .../com/eu/habbo/habbohotel/users/Habbo.java | 4 +-- .../habbo/habbohotel/users/HabboManager.java | 2 +- .../subscriptions/SubscriptionHabboClub.java | 8 +++--- .../camera/CameraPublishToWebEvent.java | 4 +-- .../incoming/camera/CameraPurchaseEvent.java | 4 +-- .../catalog/CatalogBuyClubDiscountEvent.java | 4 +-- .../incoming/catalog/CatalogBuyItemEvent.java | 4 +-- .../CatalogRequestClubDiscountEvent.java | 7 ----- .../catalog/CatalogSelectClubGiftEvent.java | 4 +-- .../catalog/RequestCatalogPageEvent.java | 4 +-- .../catalog/RequestClubGiftsEvent.java | 4 +-- .../guides/GuideReportHelperEvent.java | 4 +-- .../incoming/handshake/SecureLoginEvent.java | 8 +++--- .../hotelview/HotelViewDataEvent.java | 8 +++--- .../incoming/hotelview/HotelViewEvent.java | 4 +-- .../hotelview/RequestNewsListEvent.java | 8 +++--- .../ModToolRequestIssueChatlogEvent.java | 4 +-- .../incoming/modtool/ReportBullyEvent.java | 4 +-- .../incoming/modtool/ReportCommentEvent.java | 4 +-- .../incoming/modtool/ReportEvent.java | 8 +++--- .../modtool/ReportFriendPrivateChatEvent.java | 4 +-- .../incoming/modtool/ReportPhotoEvent.java | 5 ++-- .../incoming/modtool/ReportThreadEvent.java | 4 +-- .../modtool/RequestReportRoomEvent.java | 4 +-- .../RequestNewNavigatorDataEvent.java | 2 +- .../incoming/rooms/HandleDoorbellEvent.java | 4 +-- .../incoming/rooms/items/RedeemItemEvent.java | 4 +-- .../users/RoomUserDropHandItemEvent.java | 4 +-- .../users/ChangeNameCheckUsernameEvent.java | 17 ++++++------ .../users/ConfirmChangeNameEvent.java | 10 +++---- .../users/RequestUserCreditsEvent.java | 4 +-- ...> CameraPublishStatusMessageComposer.java} | 4 +-- ...a => CameraPurchaseOKMessageComposer.java} | 2 +- ...a => CameraStorageUrlMessageComposer.java} | 4 +-- ... => CompetitionStatusMessageComposer.java} | 4 +-- ...r.java => CatalogPageMessageComposer.java} | 4 +-- ...a => CatalogPublishedMessageComposer.java} | 2 +- ...omposer.java => ClubGiftInfoComposer.java} | 4 +-- ... CampaignCalendarDataMessageComposer.java} | 8 +++--- ...ignCalendarDoorOpenedMessageComposer.java} | 4 +-- ...java => ClubGiftNotificationComposer.java} | 4 +-- ...ustomUserNotificationMessageComposer.java} | 4 +-- ...ReviewSessionDetachedMessageComposer.java} | 2 +- ...SessionOfferedToGuideMessageComposer.java} | 2 +- ...tReviewSessionResultsMessageComposer.java} | 4 +-- ...tReviewSessionStartedMessageComposer.java} | 4 +-- ...ewSessionVotingStatusMessageComposer.java} | 4 +-- ...ageWithEarliestExpiryMessageComposer.java} | 4 +-- ...va => CloseConnectionMessageComposer.java} | 2 +- ...mmunityGoalHallOfFameMessageComposer.java} | 4 +-- ...CommunityGoalProgressMessageComposer.java} | 22 ++++++++-------- ... => CommunityGoalVoteMessageComposer.java} | 4 +-- ...rentUsersGoalProgressMessageComposer.java} | 4 +-- ... => CurrentTimingCodeMessageComposer.java} | 4 +-- ...ForHelpDisabledNotifyMessageComposer.java} | 2 +- ...llForHelpPendingCallsMessageComposer.java} | 4 +-- ...a => CallForHelpReplyMessageComposer.java} | 4 +-- ... => CallForHelpResultMessageComposer.java} | 4 +-- ...gComposer.java => CfhChatlogComposer.java} | 6 ++--- ...mposer.java => CfhTopicsInitComposer.java} | 12 ++++----- ...r.java => CanCreateRoomEventComposer.java} | 2 +- ...> CategoriesWithVisitorCountComposer.java} | 4 +-- ....java => CollapsedCategoriesComposer.java} | 2 +- ...r.java => CantConnectMessageComposer.java} | 6 ++--- ...va => ConfirmBreedingRequestComposer.java} | 4 +-- ...ava => ConfirmBreedingResultComposer.java} | 4 +-- ...r.java => CarryObjectMessageComposer.java} | 4 +-- ... => ChangeUserNameResultMessageEvent.java} | 4 +-- ...Composer.java => ChatMessageComposer.java} | 4 +-- ...lpPendingCallsDeletedMessageComposer.java} | 2 +- ...r.java => CfhSanctionMessageComposer.java} | 4 +-- ...er.java => ChangeEmailResultComposer.java} | 4 +-- ...izenshipVipOfferPromoEnabledComposer.java} | 2 +- ...CompetitionVotingInfoMessageComposer.java} | 4 +-- ...oser.java => ConvertedRoomIdComposer.java} | 4 +-- ...> CheckUserNameResultMessageComposer.java} | 4 +-- ...ser.java => ClubGiftSelectedComposer.java} | 4 +-- ...mposer.java => CreditBalanceComposer.java} | 4 +-- .../eu/habbo/messages/rcon/UpdateCatalog.java | 2 +- .../incoming/CameraResultURLEvent.java | 4 +-- .../runnables/HabboGiveHandItemToHabbo.java | 6 ++--- .../runnables/RoomUnitGiveHanditem.java | 4 +-- 103 files changed, 246 insertions(+), 256 deletions(-) rename src/main/java/com/eu/habbo/messages/outgoing/camera/{CameraPublishWaitMessageComposer.java => CameraPublishStatusMessageComposer.java} (82%) rename src/main/java/com/eu/habbo/messages/outgoing/camera/{CameraPurchaseSuccesfullComposer.java => CameraPurchaseOKMessageComposer.java} (83%) rename src/main/java/com/eu/habbo/messages/outgoing/camera/{CameraURLComposer.java => CameraStorageUrlMessageComposer.java} (78%) rename src/main/java/com/eu/habbo/messages/outgoing/camera/{CameraCompetitionStatusComposer.java => CompetitionStatusMessageComposer.java} (80%) rename src/main/java/com/eu/habbo/messages/outgoing/catalog/{CatalogPageComposer.java => CatalogPageMessageComposer.java} (94%) rename src/main/java/com/eu/habbo/messages/outgoing/catalog/{CatalogUpdatedComposer.java => CatalogPublishedMessageComposer.java} (85%) rename src/main/java/com/eu/habbo/messages/outgoing/catalog/{ClubGiftsComposer.java => ClubGiftInfoComposer.java} (93%) rename src/main/java/com/eu/habbo/messages/outgoing/events/calendar/{AdventCalendarDataComposer.java => CampaignCalendarDataMessageComposer.java} (81%) rename src/main/java/com/eu/habbo/messages/outgoing/events/calendar/{AdventCalendarProductComposer.java => CampaignCalendarDoorOpenedMessageComposer.java} (91%) rename src/main/java/com/eu/habbo/messages/outgoing/generic/{PickMonthlyClubGiftNotificationComposer.java => ClubGiftNotificationComposer.java} (76%) rename src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/{CustomNotificationComposer.java => CustomUserNotificationMessageComposer.java} (84%) rename src/main/java/com/eu/habbo/messages/outgoing/guardians/{GuardianVotingTimeEnded.java => ChatReviewSessionDetachedMessageComposer.java} (82%) rename src/main/java/com/eu/habbo/messages/outgoing/guardians/{GuardianNewReportReceivedComposer.java => ChatReviewSessionOfferedToGuideMessageComposer.java} (85%) rename src/main/java/com/eu/habbo/messages/outgoing/guardians/{GuardianVotingResultComposer.java => ChatReviewSessionResultsMessageComposer.java} (87%) rename src/main/java/com/eu/habbo/messages/outgoing/guardians/{GuardianVotingRequestedComposer.java => ChatReviewSessionStartedMessageComposer.java} (91%) rename src/main/java/com/eu/habbo/messages/outgoing/guardians/{GuardianVotingVotesComposer.java => ChatReviewSessionVotingStatusMessageComposer.java} (84%) rename src/main/java/com/eu/habbo/messages/outgoing/hotelview/{HotelViewExpiringCatalogPageCommposer.java => CatalogPageWithEarliestExpiryMessageComposer.java} (80%) rename src/main/java/com/eu/habbo/messages/outgoing/hotelview/{HotelViewComposer.java => CloseConnectionMessageComposer.java} (84%) rename src/main/java/com/eu/habbo/messages/outgoing/hotelview/{HallOfFameComposer.java => CommunityGoalHallOfFameMessageComposer.java} (89%) rename src/main/java/com/eu/habbo/messages/outgoing/hotelview/{HotelViewCommunityGoalComposer.java => CommunityGoalProgressMessageComposer.java} (73%) rename src/main/java/com/eu/habbo/messages/outgoing/hotelview/{HotelViewHideCommunityVoteButtonComposer.java => CommunityGoalVoteMessageComposer.java} (76%) rename src/main/java/com/eu/habbo/messages/outgoing/hotelview/{HotelViewConcurrentUsersComposer.java => ConcurrentUsersGoalProgressMessageComposer.java} (82%) rename src/main/java/com/eu/habbo/messages/outgoing/hotelview/{HotelViewDataComposer.java => CurrentTimingCodeMessageComposer.java} (80%) rename src/main/java/com/eu/habbo/messages/outgoing/modtool/{HelperRequestDisabledComposer.java => CallForHelpDisabledNotifyMessageComposer.java} (83%) rename src/main/java/com/eu/habbo/messages/outgoing/modtool/{ReportRoomFormComposer.java => CallForHelpPendingCallsMessageComposer.java} (85%) rename src/main/java/com/eu/habbo/messages/outgoing/modtool/{ModToolIssueResponseAlertComposer.java => CallForHelpReplyMessageComposer.java} (78%) rename src/main/java/com/eu/habbo/messages/outgoing/modtool/{ModToolReportReceivedAlertComposer.java => CallForHelpResultMessageComposer.java} (83%) rename src/main/java/com/eu/habbo/messages/outgoing/modtool/{ModToolIssueChatlogComposer.java => CfhChatlogComposer.java} (92%) rename src/main/java/com/eu/habbo/messages/outgoing/modtool/{CfhTopicsMessageComposer.java => CfhTopicsInitComposer.java} (68%) rename src/main/java/com/eu/habbo/messages/outgoing/navigator/{CanCreateEventComposer.java => CanCreateRoomEventComposer.java} (87%) rename src/main/java/com/eu/habbo/messages/outgoing/navigator/{NewNavigatorCategoryUserCountComposer.java => CategoriesWithVisitorCountComposer.java} (83%) rename src/main/java/com/eu/habbo/messages/outgoing/navigator/{NewNavigatorCollapsedCategoriesComposer.java => CollapsedCategoriesComposer.java} (97%) rename src/main/java/com/eu/habbo/messages/outgoing/rooms/{RoomEnterErrorComposer.java => CantConnectMessageComposer.java} (85%) rename src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/{PetBreedingResultComposer.java => ConfirmBreedingRequestComposer.java} (95%) rename src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/{PetBreedingFailedComposer.java => ConfirmBreedingResultComposer.java} (81%) rename src/main/java/com/eu/habbo/messages/outgoing/rooms/users/{RoomUserHandItemComposer.java => CarryObjectMessageComposer.java} (82%) rename src/main/java/com/eu/habbo/messages/outgoing/rooms/users/{ChangeNameUpdatedComposer.java => ChangeUserNameResultMessageEvent.java} (82%) rename src/main/java/com/eu/habbo/messages/outgoing/rooms/users/{RoomUserTalkComposer.java => ChatMessageComposer.java} (83%) rename src/main/java/com/eu/habbo/messages/outgoing/unknown/{UnknownHelperComposer.java => CallForHelpPendingCallsDeletedMessageComposer.java} (82%) rename src/main/java/com/eu/habbo/messages/outgoing/unknown/{ModToolSanctionDataComposer.java => CfhSanctionMessageComposer.java} (91%) rename src/main/java/com/eu/habbo/messages/outgoing/unknown/{TalentTrackEmailFailedComposer.java => ChangeEmailResultComposer.java} (79%) rename src/main/java/com/eu/habbo/messages/outgoing/unknown/{VipTutorialsStartComposer.java => CitizenshipVipOfferPromoEnabledComposer.java} (83%) rename src/main/java/com/eu/habbo/messages/outgoing/unknown/{UnknownCompetitionComposer.java => CompetitionVotingInfoMessageComposer.java} (81%) rename src/main/java/com/eu/habbo/messages/outgoing/unknown/{ConvertedForwardToRoomComposer.java => ConvertedRoomIdComposer.java} (80%) rename src/main/java/com/eu/habbo/messages/outgoing/users/{ChangeNameCheckResultComposer.java => CheckUserNameResultMessageComposer.java} (86%) rename src/main/java/com/eu/habbo/messages/outgoing/users/{ClubGiftReceivedComposer.java => ClubGiftSelectedComposer.java} (86%) rename src/main/java/com/eu/habbo/messages/outgoing/users/{UserCreditsComposer.java => CreditBalanceComposer.java} (83%) diff --git a/src/main/java/com/eu/habbo/habbohotel/bots/Bot.java b/src/main/java/com/eu/habbo/habbohotel/bots/Bot.java index b1149aa9..93eaa9f6 100644 --- a/src/main/java/com/eu/habbo/habbohotel/bots/Bot.java +++ b/src/main/java/com/eu/habbo/habbohotel/bots/Bot.java @@ -217,7 +217,7 @@ public class Bot implements Runnable { return; this.chatTimestamp = Emulator.getIntUnixTimestamp(); - this.room.botChat(new RoomUserTalkComposer(new RoomChatMessage(event.message, this.roomUnit, RoomChatMessageBubbles.getBubble(this.getBubbleId()))).compose()); + this.room.botChat(new ChatMessageComposer(new RoomChatMessage(event.message, this.roomUnit, RoomChatMessageBubbles.getBubble(this.getBubbleId()))).compose()); if (message.equals("o/") || message.equals("_o/")) { this.room.sendComposer(new RoomUserActionComposer(this.roomUnit, RoomUserAction.WAVE).compose()); diff --git a/src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarManager.java b/src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarManager.java index 1336f88f..73f435bf 100644 --- a/src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarManager.java @@ -2,7 +2,7 @@ package com.eu.habbo.habbohotel.campaign.calendar; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.Habbo; -import com.eu.habbo.messages.outgoing.events.calendar.AdventCalendarProductComposer; +import com.eu.habbo.messages.outgoing.events.calendar.CampaignCalendarDoorOpenedMessageComposer; import com.eu.habbo.plugin.events.users.calendar.UserClaimRewardEvent; import gnu.trove.map.hash.THashMap; import org.slf4j.Logger; @@ -134,7 +134,7 @@ public class CalendarManager { } habbo.getHabboStats().calendarRewardsClaimed.add(new CalendarRewardClaimed(habbo.getHabboInfo().getId(), campaign.getId(), day, object.getId(), new Timestamp(System.currentTimeMillis()))); - habbo.getClient().sendResponse(new AdventCalendarProductComposer(true, object, habbo)); + habbo.getClient().sendResponse(new CampaignCalendarDoorOpenedMessageComposer(true, object, habbo)); object.give(habbo); try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("INSERT INTO calendar_rewards_claimed (user_id, campaign_id, day, reward_id, timestamp) VALUES (?, ?, ?, ?, ?)")) { statement.setInt(1, habbo.getHabboInfo().getId()); diff --git a/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java b/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java index e0173bc3..e083a785 100644 --- a/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java @@ -26,7 +26,7 @@ import com.eu.habbo.messages.outgoing.inventory.AddPetComposer; import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.modtool.ModToolIssueHandledComposer; import com.eu.habbo.messages.outgoing.users.BadgeReceivedComposer; -import com.eu.habbo.messages.outgoing.users.UserCreditsComposer; +import com.eu.habbo.messages.outgoing.users.CreditBalanceComposer; import com.eu.habbo.messages.outgoing.users.UserPointsComposer; import com.eu.habbo.plugin.events.emulator.EmulatorLoadCatalogManagerEvent; import com.eu.habbo.plugin.events.users.catalog.UserCatalogFurnitureBoughtEvent; @@ -552,7 +552,7 @@ public class CatalogManager { if (voucher.credits > 0) { client.getHabbo().getHabboInfo().addCredits(voucher.credits); - client.sendResponse(new UserCreditsComposer(client.getHabbo())); + client.sendResponse(new CreditBalanceComposer(client.getHabbo())); } if (voucher.catalogItemId > 0) { @@ -1071,7 +1071,7 @@ public class CatalogManager { if (!free && !habbo.getClient().getHabbo().hasPermission(Permission.ACC_INFINITE_CREDITS)) { if (purchasedEvent.totalCredits > 0) { habbo.getClient().getHabbo().getHabboInfo().addCredits(-purchasedEvent.totalCredits); - habbo.getClient().sendResponse(new UserCreditsComposer(habbo.getClient().getHabbo())); + habbo.getClient().sendResponse(new CreditBalanceComposer(habbo.getClient().getHabbo())); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/catalog/marketplace/MarketPlace.java b/src/main/java/com/eu/habbo/habbohotel/catalog/marketplace/MarketPlace.java index ec8dadfb..a6aa88b4 100644 --- a/src/main/java/com/eu/habbo/habbohotel/catalog/marketplace/MarketPlace.java +++ b/src/main/java/com/eu/habbo/habbohotel/catalog/marketplace/MarketPlace.java @@ -11,7 +11,7 @@ import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceCancelSaleC import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.inventory.RemoveHabboItemComposer; -import com.eu.habbo.messages.outgoing.users.UserCreditsComposer; +import com.eu.habbo.messages.outgoing.users.CreditBalanceComposer; import com.eu.habbo.plugin.events.marketplace.MarketPlaceItemCancelledEvent; import com.eu.habbo.plugin.events.marketplace.MarketPlaceItemOfferedEvent; import com.eu.habbo.plugin.events.marketplace.MarketPlaceItemSoldEvent; @@ -284,7 +284,7 @@ public class MarketPlace { client.getHabbo().givePoints(MARKETPLACE_CURRENCY, -event.price); } - client.sendResponse(new UserCreditsComposer(client.getHabbo())); + client.sendResponse(new CreditBalanceComposer(client.getHabbo())); client.sendResponse(new AddHabboItemComposer(item)); client.sendResponse(new InventoryRefreshComposer()); client.sendResponse(new MarketplaceBuyErrorComposer(MarketplaceBuyErrorComposer.REFRESH, 0, offerId, price)); @@ -385,7 +385,7 @@ public class MarketPlace { } else { client.getHabbo().givePoints(MARKETPLACE_CURRENCY, credits); } - client.sendResponse(new UserCreditsComposer(client.getHabbo())); + client.sendResponse(new CreditBalanceComposer(client.getHabbo())); } private static void removeUser(MarketPlaceOffer offer) { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/CalendarCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/CalendarCommand.java index 1cc03971..92e3467c 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/CalendarCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/CalendarCommand.java @@ -3,11 +3,10 @@ package com.eu.habbo.habbohotel.commands; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.campaign.calendar.CalendarCampaign; import com.eu.habbo.habbohotel.gameclients.GameClient; -import com.eu.habbo.messages.outgoing.events.calendar.AdventCalendarDataComposer; +import com.eu.habbo.messages.outgoing.events.calendar.CampaignCalendarDataMessageComposer; import com.eu.habbo.messages.outgoing.habboway.nux.NuxAlertComposer; import java.sql.Timestamp; -import java.time.Duration; import java.util.Date; import static java.time.temporal.ChronoUnit.DAYS; @@ -33,7 +32,7 @@ public class CalendarCommand extends Command { int daysBetween = (int) DAYS.between(new Timestamp(campaign.getStartTimestamp() * 1000L).toInstant(), new Date().toInstant()); if (daysBetween >= 0) { - gameClient.sendResponse(new AdventCalendarDataComposer(campaign.getName(), campaign.getImage(), campaign.getTotalDays(), daysBetween, gameClient.getHabbo().getHabboStats().calendarRewardsClaimed, campaign.getLockExpired())); + gameClient.sendResponse(new CampaignCalendarDataMessageComposer(campaign.getName(), campaign.getImage(), campaign.getTotalDays(), daysBetween, gameClient.getHabbo().getHabboStats().calendarRewardsClaimed, campaign.getLockExpired())); gameClient.sendResponse(new NuxAlertComposer("openView/calendar")); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/HandItemCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/HandItemCommand.java index 1cef1e9a..1a81d880 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/HandItemCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/HandItemCommand.java @@ -2,7 +2,7 @@ package com.eu.habbo.habbohotel.commands; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.gameclients.GameClient; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserHandItemComposer; +import com.eu.habbo.messages.outgoing.rooms.users.CarryObjectMessageComposer; public class HandItemCommand extends Command { public HandItemCommand() { @@ -16,7 +16,7 @@ public class HandItemCommand extends Command { if (gameClient.getHabbo().getHabboInfo().getCurrentRoom() != null) { int effectId = Integer.parseInt(params[1]); gameClient.getHabbo().getRoomUnit().setHandItem(effectId); - gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RoomUserHandItemComposer(gameClient.getHabbo().getRoomUnit()).compose()); + gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new CarryObjectMessageComposer(gameClient.getHabbo().getRoomUnit()).compose()); } } catch (Exception e) { //Don't handle incorrect parse exceptions :P diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/MassCreditsCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/MassCreditsCommand.java index 6c7d279a..7028183d 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/MassCreditsCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/MassCreditsCommand.java @@ -4,7 +4,7 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles; import com.eu.habbo.habbohotel.users.Habbo; -import com.eu.habbo.messages.outgoing.users.UserCreditsComposer; +import com.eu.habbo.messages.outgoing.users.CreditBalanceComposer; import java.util.Map; @@ -30,7 +30,7 @@ public class MassCreditsCommand extends Command { Habbo habbo = set.getValue(); habbo.giveCredits(amount); - habbo.getClient().sendResponse(new UserCreditsComposer(habbo)); + habbo.getClient().sendResponse(new CreditBalanceComposer(habbo)); if (habbo.getHabboInfo().getCurrentRoom() != null) habbo.whisper(Emulator.getTexts().getValue("commands.generic.cmd_credits.received").replace("%amount%", amount + ""), RoomChatMessageBubbles.ALERT); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/PullCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/PullCommand.java index 3a45e0aa..497bc4c4 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/PullCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/PullCommand.java @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles; import com.eu.habbo.habbohotel.rooms.RoomTile; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboGender; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserTalkComposer; +import com.eu.habbo.messages.outgoing.rooms.users.ChatMessageComposer; public class PullCommand extends Command { public PullCommand() { @@ -41,7 +41,7 @@ public class PullCommand extends Command { return true; } habbo.getRoomUnit().setGoalLocation(tile); - gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RoomUserTalkComposer(new RoomChatMessage(Emulator.getTexts().getValue("commands.succes.cmd_pull.pull").replace("%user%", params[1]).replace("%gender_name%", (gameClient.getHabbo().getHabboInfo().getGender().equals(HabboGender.M) ? Emulator.getTexts().getValue("gender.him") : Emulator.getTexts().getValue("gender.her"))), gameClient.getHabbo(), gameClient.getHabbo(), RoomChatMessageBubbles.NORMAL)).compose()); + gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new ChatMessageComposer(new RoomChatMessage(Emulator.getTexts().getValue("commands.succes.cmd_pull.pull").replace("%user%", params[1]).replace("%gender_name%", (gameClient.getHabbo().getHabboInfo().getGender().equals(HabboGender.M) ? Emulator.getTexts().getValue("gender.him") : Emulator.getTexts().getValue("gender.her"))), gameClient.getHabbo(), gameClient.getHabbo(), RoomChatMessageBubbles.NORMAL)).compose()); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/PushCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/PushCommand.java index d9518c0e..f8fcd57b 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/PushCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/PushCommand.java @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles; import com.eu.habbo.habbohotel.rooms.RoomTile; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboGender; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserTalkComposer; +import com.eu.habbo.messages.outgoing.rooms.users.ChatMessageComposer; public class PushCommand extends Command { public PushCommand() { @@ -38,7 +38,7 @@ public class PushCommand extends Command { return true; } habbo.getRoomUnit().setGoalLocation(tFrontTarget); - gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RoomUserTalkComposer(new RoomChatMessage(Emulator.getTexts().getValue("commands.succes.cmd_push.push").replace("%user%", params[1]).replace("%gender_name%", (gameClient.getHabbo().getHabboInfo().getGender().equals(HabboGender.M) ? Emulator.getTexts().getValue("gender.him") : Emulator.getTexts().getValue("gender.her"))), gameClient.getHabbo(), gameClient.getHabbo(), RoomChatMessageBubbles.NORMAL)).compose()); + gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new ChatMessageComposer(new RoomChatMessage(Emulator.getTexts().getValue("commands.succes.cmd_push.push").replace("%user%", params[1]).replace("%gender_name%", (gameClient.getHabbo().getHabboInfo().getGender().equals(HabboGender.M) ? Emulator.getTexts().getValue("gender.him") : Emulator.getTexts().getValue("gender.her"))), gameClient.getHabbo(), gameClient.getHabbo(), RoomChatMessageBubbles.NORMAL)).compose()); } } else { gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_push.cant_reach").replace("%user%", params[1]), RoomChatMessageBubbles.ALERT); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/RoomItemCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/RoomItemCommand.java index d0bfbae2..a1a6f3a6 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/RoomItemCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/RoomItemCommand.java @@ -4,7 +4,7 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles; import com.eu.habbo.habbohotel.users.Habbo; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserHandItemComposer; +import com.eu.habbo.messages.outgoing.rooms.users.CarryObjectMessageComposer; public class RoomItemCommand extends Command { public RoomItemCommand() { @@ -31,7 +31,7 @@ public class RoomItemCommand extends Command { for (Habbo habbo : gameClient.getHabbo().getHabboInfo().getCurrentRoom().getHabbos()) { habbo.getRoomUnit().setHandItem(itemId); - habbo.getHabboInfo().getCurrentRoom().sendComposer(new RoomUserHandItemComposer(habbo.getRoomUnit()).compose()); + habbo.getHabboInfo().getCurrentRoom().sendComposer(new CarryObjectMessageComposer(habbo.getRoomUnit()).compose()); } if (itemId > 0) { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/SayCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/SayCommand.java index 64addc34..71466d38 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/SayCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/SayCommand.java @@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.rooms.RoomChatMessage; import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles; import com.eu.habbo.habbohotel.users.Habbo; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserTalkComposer; +import com.eu.habbo.messages.outgoing.rooms.users.ChatMessageComposer; public class SayCommand extends Command { public SayCommand() { @@ -38,7 +38,7 @@ public class SayCommand extends Command { } } - target.getHabboInfo().getCurrentRoom().sendComposer(new RoomUserTalkComposer(new RoomChatMessage(message.toString(), target, RoomChatMessageBubbles.NORMAL)).compose()); + target.getHabboInfo().getCurrentRoom().sendComposer(new ChatMessageComposer(new RoomChatMessage(message.toString(), target, RoomChatMessageBubbles.NORMAL)).compose()); gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_say").replace("%user%", params[1]).replace("%message%", message.toString()), RoomChatMessageBubbles.ALERT); return true; } diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/SuperPullCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/SuperPullCommand.java index edb29eae..53bbe0ce 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/SuperPullCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/SuperPullCommand.java @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles; import com.eu.habbo.habbohotel.rooms.RoomTile; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboGender; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserTalkComposer; +import com.eu.habbo.messages.outgoing.rooms.users.ChatMessageComposer; public class SuperPullCommand extends Command { public SuperPullCommand() { @@ -34,7 +34,7 @@ public class SuperPullCommand extends Command { return true; } habbo.getRoomUnit().setGoalLocation(tile); - gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RoomUserTalkComposer(new RoomChatMessage(Emulator.getTexts().getValue("commands.succes.cmd_pull.pull").replace("%user%", params[1]).replace("%gender_name%", (gameClient.getHabbo().getHabboInfo().getGender().equals(HabboGender.M) ? Emulator.getTexts().getValue("gender.him") : Emulator.getTexts().getValue("gender.her"))), gameClient.getHabbo(), gameClient.getHabbo(), RoomChatMessageBubbles.NORMAL)).compose()); + gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new ChatMessageComposer(new RoomChatMessage(Emulator.getTexts().getValue("commands.succes.cmd_pull.pull").replace("%user%", params[1]).replace("%gender_name%", (gameClient.getHabbo().getHabboInfo().getGender().equals(HabboGender.M) ? Emulator.getTexts().getValue("gender.him") : Emulator.getTexts().getValue("gender.her"))), gameClient.getHabbo(), gameClient.getHabbo(), RoomChatMessageBubbles.NORMAL)).compose()); } } return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateCatalogCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateCatalogCommand.java index 09230735..fd6ffcfd 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateCatalogCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateCatalogCommand.java @@ -15,7 +15,7 @@ public class UpdateCatalogCommand extends Command { @Override public boolean handle(GameClient gameClient, String[] params) { Emulator.getGameEnvironment().getCatalogManager().initialize(); - Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new CatalogUpdatedComposer()); + Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new CatalogPublishedMessageComposer()); Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new BuildersClubFurniCountMessageComposer(0)); Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new BundleDiscountRulesetMessageComposer()); Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new MarketplaceConfigComposer()); diff --git a/src/main/java/com/eu/habbo/habbohotel/guides/GuardianTicket.java b/src/main/java/com/eu/habbo/habbohotel/guides/GuardianTicket.java index 75d4cc53..571afc85 100644 --- a/src/main/java/com/eu/habbo/habbohotel/guides/GuardianTicket.java +++ b/src/main/java/com/eu/habbo/habbohotel/guides/GuardianTicket.java @@ -41,7 +41,7 @@ public class GuardianTicket { public void requestToVote(Habbo guardian) { - guardian.getClient().sendResponse(new GuardianNewReportReceivedComposer()); + guardian.getClient().sendResponse(new ChatReviewSessionOfferedToGuideMessageComposer()); this.votes.put(guardian, new GuardianVote(this.guardianCount, guardian)); @@ -53,7 +53,7 @@ public class GuardianTicket { GuardianVote vote = this.votes.get(guardian); if (vote != null && vote.type == GuardianVoteType.SEARCHING) { - guardian.getClient().sendResponse(new GuardianVotingRequestedComposer(this)); + guardian.getClient().sendResponse(new ChatReviewSessionStartedMessageComposer(this)); vote.type = GuardianVoteType.WAITING; this.updateVotes(); } @@ -72,7 +72,7 @@ public class GuardianTicket { this.getVoteForGuardian(guardian).ignore = true; - guardian.getClient().sendResponse(new GuardianVotingTimeEnded()); + guardian.getClient().sendResponse(new ChatReviewSessionDetachedMessageComposer()); this.updateVotes(); } @@ -95,7 +95,7 @@ public class GuardianTicket { if (set.getValue().type == GuardianVoteType.WAITING || set.getValue().type == GuardianVoteType.NOT_VOTED || set.getValue().ignore || set.getValue().type == GuardianVoteType.SEARCHING) continue; - set.getKey().getClient().sendResponse(new GuardianVotingVotesComposer(this, set.getKey())); + set.getKey().getClient().sendResponse(new ChatReviewSessionVotingStatusMessageComposer(this, set.getKey())); } } } @@ -135,7 +135,7 @@ public class GuardianTicket { if (set.getValue().type == GuardianVoteType.ACCEPTABLY || set.getValue().type == GuardianVoteType.BADLY || set.getValue().type == GuardianVoteType.AWFULLY) { - set.getKey().getClient().sendResponse(new GuardianVotingResultComposer(this, set.getValue())); + set.getKey().getClient().sendResponse(new ChatReviewSessionResultsMessageComposer(this, set.getValue())); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionCostumeHopper.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionCostumeHopper.java index a73106f3..96e83953 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionCostumeHopper.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionCostumeHopper.java @@ -3,7 +3,7 @@ package com.eu.habbo.habbohotel.items.interactions; import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.items.Item; import com.eu.habbo.habbohotel.rooms.Room; -import com.eu.habbo.messages.outgoing.generic.alerts.CustomNotificationComposer; +import com.eu.habbo.messages.outgoing.generic.alerts.CustomUserNotificationMessageComposer; import java.sql.ResultSet; import java.sql.SQLException; @@ -22,7 +22,7 @@ public class InteractionCostumeHopper extends InteractionHopper { if (client.getHabbo().getRoomUnit().getEffectId() > 0) { super.onClick(client, room, objects); } else { - client.sendResponse(new CustomNotificationComposer(CustomNotificationComposer.HOPPER_NO_COSTUME)); + client.sendResponse(new CustomUserNotificationMessageComposer(CustomUserNotificationMessageComposer.HOPPER_NO_COSTUME)); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionHabboClubGate.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionHabboClubGate.java index f356d4d3..fe76c514 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionHabboClubGate.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionHabboClubGate.java @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.items.interactions.interfaces.ConditionalGate; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomUnit; import com.eu.habbo.habbohotel.users.Habbo; -import com.eu.habbo.messages.outgoing.generic.alerts.CustomNotificationComposer; +import com.eu.habbo.messages.outgoing.generic.alerts.CustomUserNotificationMessageComposer; import com.eu.habbo.threading.runnables.CloseGate; import java.sql.ResultSet; @@ -52,7 +52,7 @@ public class InteractionHabboClubGate extends InteractionDefault implements Cond if (this.canWalkOn(client.getHabbo().getRoomUnit(), room, null)) { super.onClick(client, room, objects); } else { - client.sendResponse(new CustomNotificationComposer(CustomNotificationComposer.GATE_NO_HC)); + client.sendResponse(new CustomUserNotificationMessageComposer(CustomUserNotificationMessageComposer.GATE_NO_HC)); } } } @@ -70,7 +70,7 @@ public class InteractionHabboClubGate extends InteractionDefault implements Cond return; room.getHabbo(roomUnit).getClient().sendResponse( - new CustomNotificationComposer(CustomNotificationComposer.GATE_NO_HC) + new CustomUserNotificationMessageComposer(CustomUserNotificationMessageComposer.GATE_NO_HC) ); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionHabboClubHopper.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionHabboClubHopper.java index 1fb38ffa..e4b03e71 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionHabboClubHopper.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionHabboClubHopper.java @@ -4,7 +4,7 @@ import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.items.Item; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomTile; -import com.eu.habbo.messages.outgoing.generic.alerts.CustomNotificationComposer; +import com.eu.habbo.messages.outgoing.generic.alerts.CustomUserNotificationMessageComposer; import java.sql.ResultSet; import java.sql.SQLException; @@ -23,7 +23,7 @@ public class InteractionHabboClubHopper extends InteractionHopper { if (client.getHabbo().getHabboStats().hasActiveClub()) { super.onClick(client, room, objects); } else { - client.sendResponse(new CustomNotificationComposer(CustomNotificationComposer.HOPPER_NO_HC)); + client.sendResponse(new CustomUserNotificationMessageComposer(CustomUserNotificationMessageComposer.HOPPER_NO_HC)); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetBreedingNest.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetBreedingNest.java index 9ec50ff9..6a9ed734 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetBreedingNest.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetBreedingNest.java @@ -13,7 +13,7 @@ import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.rooms.pets.PetPackageNameValidationComposer; import com.eu.habbo.messages.outgoing.rooms.pets.breeding.PetBreedingCompleted; -import com.eu.habbo.messages.outgoing.rooms.pets.breeding.PetBreedingResultComposer; +import com.eu.habbo.messages.outgoing.rooms.pets.breeding.ConfirmBreedingRequestComposer; import com.eu.habbo.threading.runnables.QueryDeleteHabboItem; import java.sql.ResultSet; @@ -68,7 +68,7 @@ public class InteractionPetBreedingNest extends HabboItem { Habbo ownerPetTwo = room.getHabbo(this.petTwo.getUserId()); if (ownerPetOne != null && ownerPetTwo != null && this.petOne.getPetData().getType() == this.petTwo.getPetData().getType() && this.petOne.getPetData().getOffspringType() != -1) { - ownerPetTwo.getClient().sendResponse(new PetBreedingResultComposer(this.getId(), this.petOne.getPetData().getOffspringType(), this.petOne, ownerPetOne.getHabboInfo().getUsername(), this.petTwo, ownerPetTwo.getHabboInfo().getUsername())); + ownerPetTwo.getClient().sendResponse(new ConfirmBreedingRequestComposer(this.getId(), this.petOne.getPetData().getOffspringType(), this.petOne, ownerPetOne.getHabboInfo().getUsername(), this.petTwo, ownerPetTwo.getHabboInfo().getUsername())); this.setExtradata("1"); room.updateItem(this); } diff --git a/src/main/java/com/eu/habbo/habbohotel/pets/Pet.java b/src/main/java/com/eu/habbo/habbohotel/pets/Pet.java index afd7e035..c2c27bc9 100644 --- a/src/main/java/com/eu/habbo/habbohotel/pets/Pet.java +++ b/src/main/java/com/eu/habbo/habbohotel/pets/Pet.java @@ -11,7 +11,7 @@ import com.eu.habbo.messages.outgoing.rooms.pets.PetLevelUpdatedComposer; import com.eu.habbo.messages.outgoing.rooms.pets.RoomPetExperienceComposer; import com.eu.habbo.messages.outgoing.rooms.pets.RoomPetRespectComposer; import com.eu.habbo.messages.outgoing.rooms.users.RoomUserRemoveComposer; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserTalkComposer; +import com.eu.habbo.messages.outgoing.rooms.users.ChatMessageComposer; import com.eu.habbo.plugin.events.pets.PetTalkEvent; import gnu.trove.map.hash.THashMap; import org.slf4j.Logger; @@ -109,7 +109,7 @@ public class Pet implements ISerialize, Runnable { RoomChatMessage chatMessage = new RoomChatMessage(message, this.roomUnit, RoomChatMessageBubbles.NORMAL); PetTalkEvent talkEvent = new PetTalkEvent(this, chatMessage); if (!Emulator.getPluginManager().fireEvent(talkEvent).isCancelled()) { - this.room.petChat(new RoomUserTalkComposer(chatMessage).compose()); + this.room.petChat(new ChatMessageComposer(chatMessage).compose()); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java index 1705d42d..30c840bb 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java @@ -39,7 +39,7 @@ import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.generic.alerts.GenericAlertComposer; import com.eu.habbo.messages.outgoing.generic.alerts.GenericErrorMessagesComposer; import com.eu.habbo.messages.outgoing.guilds.GuildInfoComposer; -import com.eu.habbo.messages.outgoing.hotelview.HotelViewComposer; +import com.eu.habbo.messages.outgoing.hotelview.CloseConnectionMessageComposer; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.AddPetComposer; import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; @@ -946,7 +946,7 @@ public class Room implements Comparable, ISerialize, Runnable { Emulator.getGameEnvironment().getRoomManager().leaveRoom(habbo, this); } - this.sendComposer(new HotelViewComposer().compose()); + this.sendComposer(new CloseConnectionMessageComposer().compose()); this.currentHabbos.clear(); @@ -3257,7 +3257,7 @@ public class Room implements Comparable, ISerialize, Runnable { } } } else if (chatType == RoomChatType.TALK) { - ServerMessage message = new RoomUserTalkComposer(roomChatMessage).compose(); + ServerMessage message = new ChatMessageComposer(roomChatMessage).compose(); boolean noChatLimit = habbo.hasPermission(Permission.ACC_CHAT_NO_LIMIT); for (Habbo h : this.getHabbos()) { @@ -3330,7 +3330,7 @@ public class Room implements Comparable, ISerialize, Runnable { RoomChatMessage itemMessage = new RoomChatMessage(Emulator.getTexts().getValue(item.getBaseItem().getName() + ".message." + randomValue, item.getBaseItem().getName() + ".message." + randomValue + " not found!"), habbo, RoomChatMessageBubbles.getBubble(Emulator.getConfig().getInt(item.getBaseItem().getName() + ".message.bubble", RoomChatMessageBubbles.PARROT.getType()))); - this.sendComposer(new RoomUserTalkComposer(itemMessage).compose()); + this.sendComposer(new ChatMessageComposer(itemMessage).compose()); try { item.onClick(habbo.getClient(), this, new Object[0]); @@ -4149,7 +4149,7 @@ public class Room implements Comparable, ISerialize, Runnable { public void giveHandItem(RoomUnit roomUnit, int handItem) { roomUnit.setHandItem(handItem); - this.sendComposer(new RoomUserHandItemComposer(roomUnit).compose()); + this.sendComposer(new CarryObjectMessageComposer(roomUnit).compose()); } public void updateItem(HabboItem item) { diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java index 32778605..239a8cdc 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java @@ -30,7 +30,7 @@ import com.eu.habbo.habbohotel.wired.WiredHandler; import com.eu.habbo.habbohotel.wired.WiredTriggerType; import com.eu.habbo.messages.incoming.users.UserNuxEvent; import com.eu.habbo.messages.outgoing.generic.alerts.GenericErrorMessagesComposer; -import com.eu.habbo.messages.outgoing.hotelview.HotelViewComposer; +import com.eu.habbo.messages.outgoing.hotelview.CloseConnectionMessageComposer; import com.eu.habbo.messages.outgoing.polls.PollStartComposer; import com.eu.habbo.messages.outgoing.polls.infobus.SimplePollAnswersComposer; import com.eu.habbo.messages.outgoing.polls.infobus.SimplePollStartComposer; @@ -499,21 +499,21 @@ public class RoomManager { return; if (habbo.getHabboInfo().getLoadingRoom() != 0 && room.getId() != habbo.getHabboInfo().getLoadingRoom()) { - habbo.getClient().sendResponse(new HotelViewComposer()); + habbo.getClient().sendResponse(new CloseConnectionMessageComposer()); habbo.getHabboInfo().setLoadingRoom(0); return; } if (Emulator.getPluginManager().fireEvent(new UserEnterRoomEvent(habbo, room)).isCancelled()) { if (habbo.getHabboInfo().getCurrentRoom() == null) { - habbo.getClient().sendResponse(new HotelViewComposer()); + habbo.getClient().sendResponse(new CloseConnectionMessageComposer()); habbo.getHabboInfo().setLoadingRoom(0); return; } } if (room.isBanned(habbo) && !habbo.hasPermission(Permission.ACC_ANYROOMOWNER) && !habbo.hasPermission(Permission.ACC_ENTERANYROOM)) { - habbo.getClient().sendResponse(new RoomEnterErrorComposer(RoomEnterErrorComposer.ROOM_ERROR_BANNED)); + habbo.getClient().sendResponse(new CantConnectMessageComposer(CantConnectMessageComposer.ROOM_ERROR_BANNED)); return; } @@ -548,7 +548,7 @@ public class RoomManager { if (!rightsFound) { habbo.getClient().sendResponse(new RoomAccessDeniedComposer("")); - habbo.getClient().sendResponse(new HotelViewComposer()); + habbo.getClient().sendResponse(new CloseConnectionMessageComposer()); habbo.getHabboInfo().setLoadingRoom(0); return; } @@ -561,11 +561,11 @@ public class RoomManager { this.openRoom(habbo, room, doorLocation); else { habbo.getClient().sendResponse(new GenericErrorMessagesComposer(GenericErrorMessagesComposer.WRONG_PASSWORD_USED)); - habbo.getClient().sendResponse(new HotelViewComposer()); + habbo.getClient().sendResponse(new CloseConnectionMessageComposer()); habbo.getHabboInfo().setLoadingRoom(0); } } else { - habbo.getClient().sendResponse(new HotelViewComposer()); + habbo.getClient().sendResponse(new CloseConnectionMessageComposer()); habbo.getHabboInfo().setLoadingRoom(0); } } @@ -621,12 +621,12 @@ public class RoomManager { habbo.getRoomUnit().setRoomUnitType(RoomUnitType.USER); if (room.isBanned(habbo)) { - habbo.getClient().sendResponse(new RoomEnterErrorComposer(RoomEnterErrorComposer.ROOM_ERROR_BANNED)); + habbo.getClient().sendResponse(new CantConnectMessageComposer(CantConnectMessageComposer.ROOM_ERROR_BANNED)); return; } if (room.getUserCount() >= room.getUsersMax() && !habbo.hasPermission(Permission.ACC_FULLROOMS) && !room.hasRights(habbo)) { - habbo.getClient().sendResponse(new RoomEnterErrorComposer(RoomEnterErrorComposer.ROOM_ERROR_GUESTROOM_FULL)); + habbo.getClient().sendResponse(new CantConnectMessageComposer(CantConnectMessageComposer.ROOM_ERROR_GUESTROOM_FULL)); return; } @@ -681,7 +681,7 @@ public class RoomManager { public void enterRoom(final Habbo habbo, final Room room) { if (habbo.getHabboInfo().getLoadingRoom() != room.getId()) { if (habbo.getHabboInfo().getLoadingRoom() != 0) { - habbo.getClient().sendResponse(new HotelViewComposer()); + habbo.getClient().sendResponse(new CloseConnectionMessageComposer()); } return; } @@ -843,7 +843,7 @@ public class RoomManager { } if (roomHabbo.getRoomUnit().getHandItem() > 0) { - habbo.getClient().sendResponse(new RoomUserHandItemComposer(roomHabbo.getRoomUnit())); + habbo.getClient().sendResponse(new CarryObjectMessageComposer(roomHabbo.getRoomUnit())); } if (roomHabbo.getRoomUnit().getEffectId() > 0) { @@ -946,7 +946,7 @@ public class RoomManager { room.removeHabbo(habbo, true); if (redirectToHotelView) { - habbo.getClient().sendResponse(new HotelViewComposer()); + habbo.getClient().sendResponse(new CloseConnectionMessageComposer()); } habbo.getHabboInfo().setCurrentRoom(null); habbo.getRoomUnit().isKicked = false; @@ -1539,7 +1539,7 @@ public class RoomManager { if (habbo != null) { if (habbo.getHabboInfo().getCurrentRoom() == room) { room.removeHabbo(habbo, true); - habbo.getClient().sendResponse(new RoomEnterErrorComposer(RoomEnterErrorComposer.ROOM_ERROR_BANNED)); + habbo.getClient().sendResponse(new CantConnectMessageComposer(CantConnectMessageComposer.ROOM_ERROR_BANNED)); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java b/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java index f0ae2aab..180c9ce1 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java @@ -232,7 +232,7 @@ public class Habbo implements Runnable { this.getHabboInfo().addCredits(event.credits); - if (this.client != null) this.client.sendResponse(new UserCreditsComposer(this.client.getHabbo())); + if (this.client != null) this.client.sendResponse(new CreditBalanceComposer(this.client.getHabbo())); } @@ -288,7 +288,7 @@ public class Habbo implements Runnable { public void talk(String message, RoomChatMessageBubbles bubble) { if (this.getRoomUnit().isInRoom()) { - this.getHabboInfo().getCurrentRoom().sendComposer(new RoomUserTalkComposer(new RoomChatMessage(message, this.client.getHabbo().getRoomUnit(), bubble)).compose()); + this.getHabboInfo().getCurrentRoom().sendComposer(new ChatMessageComposer(new RoomChatMessage(message, this.client.getHabbo().getRoomUnit(), bubble)).compose()); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/users/HabboManager.java b/src/main/java/com/eu/habbo/habbohotel/users/HabboManager.java index 423863dd..aeacaa4b 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/HabboManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/HabboManager.java @@ -274,7 +274,7 @@ public class HabboManager { } habbo.getHabboInfo().run(); - habbo.getClient().sendResponse(new CatalogUpdatedComposer()); + habbo.getClient().sendResponse(new CatalogPublishedMessageComposer()); habbo.getClient().sendResponse(new BuildersClubFurniCountMessageComposer(0)); habbo.getClient().sendResponse(new BundleDiscountRulesetMessageComposer()); habbo.getClient().sendResponse(new MarketplaceConfigComposer()); diff --git a/src/main/java/com/eu/habbo/habbohotel/users/subscriptions/SubscriptionHabboClub.java b/src/main/java/com/eu/habbo/habbohotel/users/subscriptions/SubscriptionHabboClub.java index 0c7fc193..d0e701cb 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/subscriptions/SubscriptionHabboClub.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/subscriptions/SubscriptionHabboClub.java @@ -11,7 +11,7 @@ import com.eu.habbo.habbohotel.users.HabboInfo; import com.eu.habbo.habbohotel.users.HabboStats; import com.eu.habbo.habbohotel.users.clothingvalidation.ClothingValidationManager; import com.eu.habbo.messages.outgoing.catalog.ClubCenterDataComposer; -import com.eu.habbo.messages.outgoing.generic.PickMonthlyClubGiftNotificationComposer; +import com.eu.habbo.messages.outgoing.generic.ClubGiftNotificationComposer; import com.eu.habbo.messages.outgoing.rooms.users.RoomUserDataComposer; import com.eu.habbo.messages.outgoing.users.*; import gnu.trove.map.hash.THashMap; @@ -84,7 +84,7 @@ public class SubscriptionHabboClub extends Subscription { if (habbo != null && habbo.getClient() != null) { if (habbo.getHabboStats().getRemainingClubGifts() > 0) { - habbo.getClient().sendResponse(new PickMonthlyClubGiftNotificationComposer(habbo.getHabboStats().getRemainingClubGifts())); + habbo.getClient().sendResponse(new ClubGiftNotificationComposer(habbo.getHabboStats().getRemainingClubGifts())); } if ((Emulator.getIntUnixTimestamp() - habbo.getHabboStats().hcMessageLastModified) < 60) { @@ -318,7 +318,7 @@ public class SubscriptionHabboClub extends Subscription { progressAchievement(habbo.getHabboInfo()); if (habbo.getHabboStats().getRemainingClubGifts() > 0) { - habbo.getClient().sendResponse(new PickMonthlyClubGiftNotificationComposer(habbo.getHabboStats().getRemainingClubGifts())); + habbo.getClient().sendResponse(new ClubGiftNotificationComposer(habbo.getHabboStats().getRemainingClubGifts())); } try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); @@ -376,7 +376,7 @@ public class SubscriptionHabboClub extends Subscription { case "credit": case "coin": habbo.getClient().getHabbo().getHabboInfo().addCredits(amount); - habbo.getClient().sendResponse(new UserCreditsComposer(habbo.getClient().getHabbo())); + habbo.getClient().sendResponse(new CreditBalanceComposer(habbo.getClient().getHabbo())); break; case "diamonds": diff --git a/src/main/java/com/eu/habbo/messages/incoming/camera/CameraPublishToWebEvent.java b/src/main/java/com/eu/habbo/messages/incoming/camera/CameraPublishToWebEvent.java index 9d63b55a..3bfd8b34 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/camera/CameraPublishToWebEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/camera/CameraPublishToWebEvent.java @@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.camera; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.camera.CameraPublishWaitMessageComposer; +import com.eu.habbo.messages.outgoing.camera.CameraPublishStatusMessageComposer; import com.eu.habbo.messages.outgoing.catalog.NotEnoughPointsTypeComposer; import com.eu.habbo.plugin.events.users.UserPublishPictureEvent; import org.slf4j.Logger; @@ -59,6 +59,6 @@ public class CameraPublishToWebEvent extends MessageHandler { } } - this.client.sendResponse(new CameraPublishWaitMessageComposer(isOk, cooldownLeft, isOk ? this.client.getHabbo().getHabboInfo().getPhotoURL() : "")); + this.client.sendResponse(new CameraPublishStatusMessageComposer(isOk, cooldownLeft, isOk ? this.client.getHabbo().getHabboInfo().getPhotoURL() : "")); } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/incoming/camera/CameraPurchaseEvent.java b/src/main/java/com/eu/habbo/messages/incoming/camera/CameraPurchaseEvent.java index 173f3ca3..65c60c46 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/camera/CameraPurchaseEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/camera/CameraPurchaseEvent.java @@ -4,7 +4,7 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.achievements.AchievementManager; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.camera.CameraPurchaseSuccesfullComposer; +import com.eu.habbo.messages.outgoing.camera.CameraPurchaseOKMessageComposer; import com.eu.habbo.messages.outgoing.catalog.NotEnoughPointsTypeComposer; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; @@ -44,7 +44,7 @@ public class CameraPurchaseEvent extends MessageHandler { this.client.getHabbo().getInventory().getItemsComponent().addItem(photoItem); - this.client.sendResponse(new CameraPurchaseSuccesfullComposer()); + this.client.sendResponse(new CameraPurchaseOKMessageComposer()); this.client.sendResponse(new AddHabboItemComposer(photoItem)); this.client.sendResponse(new InventoryRefreshComposer()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyClubDiscountEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyClubDiscountEvent.java index 63613b51..017d258f 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyClubDiscountEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyClubDiscountEvent.java @@ -9,7 +9,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.catalog.AlertPurchaseFailedComposer; import com.eu.habbo.messages.outgoing.catalog.PurchaseOKComposer; import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; -import com.eu.habbo.messages.outgoing.users.UserCreditsComposer; +import com.eu.habbo.messages.outgoing.users.CreditBalanceComposer; import com.eu.habbo.messages.outgoing.users.ActivityPointsMessageComposer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -68,7 +68,7 @@ public class CatalogBuyClubDiscountEvent extends MessageHandler { } if (totalCredits > 0) - this.client.sendResponse(new UserCreditsComposer(this.client.getHabbo())); + this.client.sendResponse(new CreditBalanceComposer(this.client.getHabbo())); if (totalDuckets > 0) this.client.sendResponse(new ActivityPointsMessageComposer(this.client.getHabbo())); diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemEvent.java index 96ed760f..63957886 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemEvent.java @@ -107,7 +107,7 @@ public class CatalogBuyItemEvent extends MessageHandler { ((RoomBundleLayout) page).buyRoom(this.client.getHabbo()); if (!this.client.getHabbo().hasPermission(Permission.ACC_INFINITE_CREDITS)) { //if the player has this perm disabled this.client.getHabbo().getHabboInfo().addCredits(-roomBundleItem.getCredits()); // takes their credits away - this.client.sendResponse(new UserCreditsComposer(this.client.getHabbo())); // Sends the updated currency composer window + this.client.sendResponse(new CreditBalanceComposer(this.client.getHabbo())); // Sends the updated currency composer window } if (!this.client.getHabbo().hasPermission(Permission.ACC_INFINITE_POINTS)) { //if the player has this perm disabled this.client.getHabbo().getHabboInfo().addCurrencyAmount(roomBundleItem.getPointsType(), -roomBundleItem.getPoints()); // takes their points away @@ -196,7 +196,7 @@ public class CatalogBuyItemEvent extends MessageHandler { this.client.sendResponse(new UserClubComposer(this.client.getHabbo()));*/ if (totalCredits > 0) - this.client.sendResponse(new UserCreditsComposer(this.client.getHabbo())); + this.client.sendResponse(new CreditBalanceComposer(this.client.getHabbo())); if (totalDuckets > 0) this.client.sendResponse(new ActivityPointsMessageComposer(this.client.getHabbo())); diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogRequestClubDiscountEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogRequestClubDiscountEvent.java index 1d5bc5c6..d535ae90 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogRequestClubDiscountEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogRequestClubDiscountEvent.java @@ -1,18 +1,11 @@ package com.eu.habbo.messages.incoming.catalog; import com.eu.habbo.Emulator; -import com.eu.habbo.habbohotel.catalog.CatalogItem; -import com.eu.habbo.habbohotel.catalog.CatalogPage; -import com.eu.habbo.habbohotel.catalog.CatalogPageLayouts; import com.eu.habbo.habbohotel.catalog.ClubOffer; -import com.eu.habbo.habbohotel.items.Item; import com.eu.habbo.habbohotel.users.subscriptions.Subscription; import com.eu.habbo.habbohotel.users.subscriptions.SubscriptionHabboClub; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.catalog.AlertPurchaseFailedComposer; import com.eu.habbo.messages.outgoing.unknown.ExtendClubMessageComposer; -import com.eu.habbo.messages.outgoing.users.ClubGiftReceivedComposer; -import gnu.trove.set.hash.THashSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogSelectClubGiftEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogSelectClubGiftEvent.java index e4d6794d..104bed7e 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogSelectClubGiftEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogSelectClubGiftEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.catalog.CatalogPageLayouts; import com.eu.habbo.habbohotel.items.Item; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.catalog.*; -import com.eu.habbo.messages.outgoing.users.ClubGiftReceivedComposer; +import com.eu.habbo.messages.outgoing.users.ClubGiftSelectedComposer; import gnu.trove.set.hash.THashSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -71,7 +71,7 @@ public class CatalogSelectClubGiftEvent extends MessageHandler { this.client.getHabbo().getHabboStats().hcGiftsClaimed++; Emulator.getThreading().run(this.client.getHabbo().getHabboStats()); - this.client.sendResponse(new ClubGiftReceivedComposer(itemName, itemsGiven)); + this.client.sendResponse(new ClubGiftSelectedComposer(itemName, itemsGiven)); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestCatalogPageEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestCatalogPageEvent.java index 0198c01e..9f090909 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestCatalogPageEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestCatalogPageEvent.java @@ -4,7 +4,7 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.catalog.CatalogPage; import com.eu.habbo.habbohotel.modtool.ScripterManager; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.catalog.CatalogPageComposer; +import com.eu.habbo.messages.outgoing.catalog.CatalogPageMessageComposer; public class RequestCatalogPageEvent extends MessageHandler { @@ -18,7 +18,7 @@ public class RequestCatalogPageEvent extends MessageHandler { if (catalogPageId > 0 && page != null) { if (page.getRank() <= this.client.getHabbo().getHabboInfo().getRank().getId() && page.isEnabled()) { - this.client.sendResponse(new CatalogPageComposer(page, this.client.getHabbo(), offerId, mode)); + this.client.sendResponse(new CatalogPageMessageComposer(page, this.client.getHabbo(), offerId, mode)); } else { if (!page.isVisible()) { ScripterManager.scripterDetected(this.client, Emulator.getTexts().getValue("scripter.warning.catalog.page").replace("%username%", this.client.getHabbo().getHabboInfo().getUsername()).replace("%pagename%", page.getCaption())); diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestClubGiftsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestClubGiftsEvent.java index 777e65fd..4017a233 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestClubGiftsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestClubGiftsEvent.java @@ -1,12 +1,12 @@ package com.eu.habbo.messages.incoming.catalog; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.catalog.ClubGiftsComposer; +import com.eu.habbo.messages.outgoing.catalog.ClubGiftInfoComposer; public class RequestClubGiftsEvent extends MessageHandler { @Override public void handle() throws Exception { - this.client.sendResponse(new ClubGiftsComposer( + this.client.sendResponse(new ClubGiftInfoComposer( (int) Math.floor(this.client.getHabbo().getHabboStats().getTimeTillNextClubGift() / 86400.0), this.client.getHabbo().getHabboStats().getRemainingClubGifts(), (int) Math.floor(this.client.getHabbo().getHabboStats().getPastTimeAsClub() / 86400.0) diff --git a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideReportHelperEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideReportHelperEvent.java index 2b51c31c..36d293f5 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideReportHelperEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideReportHelperEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.guides.GuideSessionDetachedComposer; import com.eu.habbo.messages.outgoing.guides.GuideSessionEndedComposer; -import com.eu.habbo.messages.outgoing.modtool.ModToolReportReceivedAlertComposer; +import com.eu.habbo.messages.outgoing.modtool.CallForHelpResultMessageComposer; public class GuideReportHelperEvent extends MessageHandler { @Override @@ -35,7 +35,7 @@ public class GuideReportHelperEvent extends MessageHandler { Emulator.getGameEnvironment().getModToolManager().addTicket(issue); Emulator.getGameEnvironment().getModToolManager().updateTicketToMods(issue); - this.client.sendResponse(new ModToolReportReceivedAlertComposer(ModToolReportReceivedAlertComposer.REPORT_RECEIVED, message)); + this.client.sendResponse(new CallForHelpResultMessageComposer(CallForHelpResultMessageComposer.REPORT_RECEIVED, message)); this.client.sendResponse(new GuideSessionDetachedComposer()); this.client.sendResponse(new GuideSessionEndedComposer(GuideSessionEndedComposer.HELP_CASE_CLOSED)); diff --git a/src/main/java/com/eu/habbo/messages/incoming/handshake/SecureLoginEvent.java b/src/main/java/com/eu/habbo/messages/incoming/handshake/SecureLoginEvent.java index 018bef1e..49ac0f11 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/handshake/SecureLoginEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/handshake/SecureLoginEvent.java @@ -18,7 +18,7 @@ import com.eu.habbo.messages.NoAuthMessage; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.catalog.TargetedOfferComposer; -import com.eu.habbo.messages.outgoing.events.calendar.AdventCalendarDataComposer; +import com.eu.habbo.messages.outgoing.events.calendar.CampaignCalendarDataMessageComposer; import com.eu.habbo.messages.outgoing.gamecenter.GameCenterAccountInfoComposer; import com.eu.habbo.messages.outgoing.gamecenter.GameCenterGameListComposer; import com.eu.habbo.messages.outgoing.generic.alerts.GenericAlertComposer; @@ -31,7 +31,7 @@ import com.eu.habbo.messages.outgoing.handshake.AvailabilityStatusMessageCompose import com.eu.habbo.messages.outgoing.handshake.PingComposer; import com.eu.habbo.messages.outgoing.inventory.BadgePointLimitsComposer; import com.eu.habbo.messages.outgoing.inventory.AvatarEffectsMessageComposer; -import com.eu.habbo.messages.outgoing.modtool.CfhTopicsMessageComposer; +import com.eu.habbo.messages.outgoing.modtool.CfhTopicsInitComposer; import com.eu.habbo.messages.outgoing.modtool.ModToolComposer; import com.eu.habbo.messages.outgoing.modtool.ModToolSanctionInfoComposer; import com.eu.habbo.messages.outgoing.navigator.*; @@ -212,7 +212,7 @@ public class SecureLoginEvent extends MessageHandler { messages.add(new IsFirstLoginOfDayComposer(true).compose()); messages.add(new MysteryBoxKeysComposer().compose()); messages.add(new BuildersClubSubscriptionStatusMessageComposer().compose()); - messages.add(new CfhTopicsMessageComposer().compose()); + messages.add(new CfhTopicsInitComposer().compose()); messages.add(new FavoriteRoomsCountComposer(this.client.getHabbo()).compose()); messages.add(new GameCenterGameListComposer().compose()); messages.add(new GameCenterAccountInfoComposer(3, 100).compose()); @@ -229,7 +229,7 @@ public class SecureLoginEvent extends MessageHandler { if (campaign != null) { long daysBetween = DAYS.between(new Timestamp(campaign.getStartTimestamp() * 1000L).toInstant(), new Date().toInstant()); if (daysBetween >= 0) { - messages.add(new AdventCalendarDataComposer(campaign.getName(), campaign.getImage(), campaign.getTotalDays(), (int) daysBetween, this.client.getHabbo().getHabboStats().calendarRewardsClaimed, campaign.getLockExpired()).compose()); + messages.add(new CampaignCalendarDataMessageComposer(campaign.getName(), campaign.getImage(), campaign.getTotalDays(), (int) daysBetween, this.client.getHabbo().getHabboStats().calendarRewardsClaimed, campaign.getLockExpired()).compose()); if(Emulator.getConfig().getBoolean("hotel.login.show.calendar", false)) { messages.add(new NuxAlertComposer("openView/calendar").compose()); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewDataEvent.java index 16f7fefd..b87b0b3f 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewDataEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewDataEvent.java @@ -1,7 +1,7 @@ package com.eu.habbo.messages.incoming.hotelview; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.hotelview.HotelViewDataComposer; +import com.eu.habbo.messages.outgoing.hotelview.CurrentTimingCodeMessageComposer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -20,9 +20,9 @@ public class HotelViewDataEvent extends MessageHandler { for (String s : d) { if (s.contains(",")) { - this.client.sendResponse(new HotelViewDataComposer(s, s.split(",")[s.split(",").length - 1])); + this.client.sendResponse(new CurrentTimingCodeMessageComposer(s, s.split(",")[s.split(",").length - 1])); } else { - this.client.sendResponse(new HotelViewDataComposer(data, s)); + this.client.sendResponse(new CurrentTimingCodeMessageComposer(data, s)); } break; @@ -30,7 +30,7 @@ public class HotelViewDataEvent extends MessageHandler { //this.client.sendResponse(new HotelViewDataComposer("2013-05-08 13:0", "gamesmaker")); } else { - this.client.sendResponse(new HotelViewDataComposer(data, data.split(",")[data.split(",").length - 1])); + this.client.sendResponse(new CurrentTimingCodeMessageComposer(data, data.split(",")[data.split(",").length - 1])); } } catch (Exception e) { LOGGER.error("Caught exception", e); diff --git a/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewEvent.java b/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewEvent.java index 67dddaa3..1bb7d3bb 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewEvent.java @@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.hotelview; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.hotelview.HotelViewComposer; +import com.eu.habbo.messages.outgoing.hotelview.CloseConnectionMessageComposer; public class HotelViewEvent extends MessageHandler { @Override @@ -22,7 +22,7 @@ public class HotelViewEvent extends MessageHandler { } else { this.client.getHabbo().getHabboInfo().setRoomQueueId(0); } - this.client.sendResponse(new HotelViewComposer()); + this.client.sendResponse(new CloseConnectionMessageComposer()); } if (this.client.getHabbo().getRoomUnit() != null) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/hotelview/RequestNewsListEvent.java b/src/main/java/com/eu/habbo/messages/incoming/hotelview/RequestNewsListEvent.java index d3928dc2..d6b28951 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/hotelview/RequestNewsListEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/hotelview/RequestNewsListEvent.java @@ -2,15 +2,15 @@ package com.eu.habbo.messages.incoming.hotelview; import com.eu.habbo.Emulator; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.hotelview.HallOfFameComposer; -import com.eu.habbo.messages.outgoing.hotelview.HotelViewDataComposer; +import com.eu.habbo.messages.outgoing.hotelview.CommunityGoalHallOfFameMessageComposer; +import com.eu.habbo.messages.outgoing.hotelview.CurrentTimingCodeMessageComposer; import com.eu.habbo.messages.outgoing.hotelview.NewsListComposer; public class RequestNewsListEvent extends MessageHandler { @Override public void handle() throws Exception { - this.client.sendResponse(new HotelViewDataComposer("2013-05-08 13:0", "gamesmaker")); - this.client.sendResponse(new HallOfFameComposer(Emulator.getGameEnvironment().getHotelViewManager().getHallOfFame())); + this.client.sendResponse(new CurrentTimingCodeMessageComposer("2013-05-08 13:0", "gamesmaker")); + this.client.sendResponse(new CommunityGoalHallOfFameMessageComposer(Emulator.getGameEnvironment().getHotelViewManager().getHallOfFame())); this.client.sendResponse(new NewsListComposer()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestIssueChatlogEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestIssueChatlogEvent.java index 4eb2756e..e8cd8c6e 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestIssueChatlogEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestIssueChatlogEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.modtool.*; import com.eu.habbo.habbohotel.permissions.Permission; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.modtool.ModToolIssueChatlogComposer; +import com.eu.habbo.messages.outgoing.modtool.CfhChatlogComposer; import java.util.ArrayList; import java.util.List; @@ -67,7 +67,7 @@ public class ModToolRequestIssueChatlogEvent extends MessageHandler { if (room != null) { roomName = room.getName(); } - this.client.sendResponse(new ModToolIssueChatlogComposer(issue, chatlog, roomName, chatlogType)); + this.client.sendResponse(new CfhChatlogComposer(issue, chatlog, roomName, chatlogType)); } } else { ScripterManager.scripterDetected(this.client, Emulator.getTexts().getValue("scripter.warning.modtools.chatlog").replace("%username%", this.client.getHabbo().getHabboInfo().getUsername())); diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportBullyEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportBullyEvent.java index f2207f2c..51cc6cd1 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportBullyEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportBullyEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.modtool.BullyReportedMessageComposer; -import com.eu.habbo.messages.outgoing.modtool.HelperRequestDisabledComposer; +import com.eu.habbo.messages.outgoing.modtool.CallForHelpDisabledNotifyMessageComposer; import java.util.ArrayList; @@ -15,7 +15,7 @@ public class ReportBullyEvent extends MessageHandler { @Override public void handle() throws Exception { if (this.client.getHabbo().getHabboStats().allowTalk()) { - this.client.sendResponse(new HelperRequestDisabledComposer()); + this.client.sendResponse(new CallForHelpDisabledNotifyMessageComposer()); return; } diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportCommentEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportCommentEvent.java index b21849ba..f91e352d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportCommentEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportCommentEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.modtool.ModToolIssue; import com.eu.habbo.habbohotel.modtool.ModToolTicketType; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.modtool.ModToolReportReceivedAlertComposer; +import com.eu.habbo.messages.outgoing.modtool.CallForHelpResultMessageComposer; import com.eu.habbo.threading.runnables.InsertModToolIssue; public class ReportCommentEvent extends MessageHandler { @@ -36,7 +36,7 @@ public class ReportCommentEvent extends MessageHandler { issue.commentId = commentId; new InsertModToolIssue(issue).run(); - this.client.sendResponse(new ModToolReportReceivedAlertComposer(ModToolReportReceivedAlertComposer.REPORT_RECEIVED, message)); + this.client.sendResponse(new CallForHelpResultMessageComposer(CallForHelpResultMessageComposer.REPORT_RECEIVED, message)); Emulator.getGameEnvironment().getModToolManager().addTicket(issue); Emulator.getGameEnvironment().getModToolManager().updateTicketToMods(issue); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportEvent.java index 22a81fc1..2bf3885f 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportEvent.java @@ -17,7 +17,7 @@ public class ReportEvent extends MessageHandler { @Override public void handle() throws Exception { if (!this.client.getHabbo().getHabboStats().allowTalk()) { - this.client.sendResponse(new HelperRequestDisabledComposer()); + this.client.sendResponse(new CallForHelpDisabledNotifyMessageComposer()); return; } @@ -31,7 +31,7 @@ public class ReportEvent extends MessageHandler { List issues = Emulator.getGameEnvironment().getModToolManager().openTicketsForHabbo(this.client.getHabbo()); if (!issues.isEmpty()) { //this.client.sendResponse(new GenericAlertComposer("You've got still a pending ticket. Wait till the moderators are done reviewing your ticket.")); - this.client.sendResponse(new ReportRoomFormComposer(issues)); + this.client.sendResponse(new CallForHelpPendingCallsMessageComposer(issues)); return; } @@ -66,7 +66,7 @@ public class ReportEvent extends MessageHandler { Emulator.getGameEnvironment().getModToolManager().addTicket(issue); Emulator.getGameEnvironment().getModToolManager().updateTicketToMods(issue); - this.client.sendResponse(new ModToolReportReceivedAlertComposer(ModToolReportReceivedAlertComposer.REPORT_RECEIVED, cfhTopic.reply)); + this.client.sendResponse(new CallForHelpResultMessageComposer(CallForHelpResultMessageComposer.REPORT_RECEIVED, cfhTopic.reply)); if (cfhTopic != null) { if (cfhTopic.action != CfhActionType.MODS) { @@ -91,7 +91,7 @@ public class ReportEvent extends MessageHandler { issue.category = topic; new InsertModToolIssue(issue).run(); - this.client.sendResponse(new ModToolReportReceivedAlertComposer(ModToolReportReceivedAlertComposer.REPORT_RECEIVED, message)); + this.client.sendResponse(new CallForHelpResultMessageComposer(CallForHelpResultMessageComposer.REPORT_RECEIVED, message)); Emulator.getGameEnvironment().getModToolManager().addTicket(issue); Emulator.getGameEnvironment().getModToolManager().updateTicketToMods(issue); diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportFriendPrivateChatEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportFriendPrivateChatEvent.java index 81d83c8c..728f7aad 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportFriendPrivateChatEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportFriendPrivateChatEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboInfo; import com.eu.habbo.habbohotel.users.HabboManager; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.modtool.HelperRequestDisabledComposer; +import com.eu.habbo.messages.outgoing.modtool.CallForHelpDisabledNotifyMessageComposer; import com.eu.habbo.threading.runnables.InsertModToolIssue; import java.util.ArrayList; @@ -17,7 +17,7 @@ public class ReportFriendPrivateChatEvent extends MessageHandler { @Override public void handle() throws Exception { if (!this.client.getHabbo().getHabboStats().allowTalk()) { - this.client.sendResponse(new HelperRequestDisabledComposer()); + this.client.sendResponse(new CallForHelpDisabledNotifyMessageComposer()); return; } diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportPhotoEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportPhotoEvent.java index c929941a..c47df6ed 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportPhotoEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportPhotoEvent.java @@ -9,9 +9,8 @@ import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.HabboInfo; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.modtool.ModToolReportReceivedAlertComposer; +import com.eu.habbo.messages.outgoing.modtool.CallForHelpResultMessageComposer; import com.eu.habbo.threading.runnables.InsertModToolIssue; -import com.google.gson.JsonParser; public class ReportPhotoEvent extends MessageHandler { @Override @@ -50,7 +49,7 @@ public class ReportPhotoEvent extends MessageHandler { new InsertModToolIssue(issue).run(); - this.client.sendResponse(new ModToolReportReceivedAlertComposer(ModToolReportReceivedAlertComposer.REPORT_RECEIVED, "")); + this.client.sendResponse(new CallForHelpResultMessageComposer(CallForHelpResultMessageComposer.REPORT_RECEIVED, "")); Emulator.getGameEnvironment().getModToolManager().addTicket(issue); Emulator.getGameEnvironment().getModToolManager().updateTicketToMods(issue); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportThreadEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportThreadEvent.java index 50bcab89..01a47f99 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportThreadEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportThreadEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.modtool.ModToolIssue; import com.eu.habbo.habbohotel.modtool.ModToolTicketType; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.modtool.ModToolReportReceivedAlertComposer; +import com.eu.habbo.messages.outgoing.modtool.CallForHelpResultMessageComposer; import com.eu.habbo.threading.runnables.InsertModToolIssue; public class ReportThreadEvent extends MessageHandler { @@ -34,7 +34,7 @@ public class ReportThreadEvent extends MessageHandler { issue.threadId = threadId; new InsertModToolIssue(issue).run(); - this.client.sendResponse(new ModToolReportReceivedAlertComposer(ModToolReportReceivedAlertComposer.REPORT_RECEIVED, message)); + this.client.sendResponse(new CallForHelpResultMessageComposer(CallForHelpResultMessageComposer.REPORT_RECEIVED, message)); Emulator.getGameEnvironment().getModToolManager().addTicket(issue); Emulator.getGameEnvironment().getModToolManager().updateTicketToMods(issue); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/RequestReportRoomEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/RequestReportRoomEvent.java index 0dc7800b..1a73f5b4 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/RequestReportRoomEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/RequestReportRoomEvent.java @@ -2,11 +2,11 @@ package com.eu.habbo.messages.incoming.modtool; import com.eu.habbo.Emulator; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.modtool.ReportRoomFormComposer; +import com.eu.habbo.messages.outgoing.modtool.CallForHelpPendingCallsMessageComposer; public class RequestReportRoomEvent extends MessageHandler { @Override public void handle() throws Exception { - this.client.sendResponse(new ReportRoomFormComposer(Emulator.getGameEnvironment().getModToolManager().openTicketsForHabbo(this.client.getHabbo()))); + this.client.sendResponse(new CallForHelpPendingCallsMessageComposer(Emulator.getGameEnvironment().getModToolManager().openTicketsForHabbo(this.client.getHabbo()))); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNewNavigatorDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNewNavigatorDataEvent.java index 6bc2a215..6350d328 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNewNavigatorDataEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNewNavigatorDataEvent.java @@ -9,7 +9,7 @@ public class RequestNewNavigatorDataEvent extends MessageHandler { this.client.sendResponse(new NewNavigatorSettingsComposer(this.client.getHabbo().getHabboStats().navigatorWindowSettings)); this.client.sendResponse(new NewNavigatorMetaDataComposer()); this.client.sendResponse(new NewNavigatorLiftedRoomsComposer()); - this.client.sendResponse(new NewNavigatorCollapsedCategoriesComposer()); + this.client.sendResponse(new CollapsedCategoriesComposer()); this.client.sendResponse(new NewNavigatorSavedSearchesComposer(this.client.getHabbo().getHabboInfo().getSavedSearches())); this.client.sendResponse(new NewNavigatorEventCategoriesComposer()); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/HandleDoorbellEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/HandleDoorbellEvent.java index e521a7cb..5d5f089d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/HandleDoorbellEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/HandleDoorbellEvent.java @@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.rooms; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.hotelview.HotelViewComposer; +import com.eu.habbo.messages.outgoing.hotelview.CloseConnectionMessageComposer; import com.eu.habbo.messages.outgoing.rooms.HideDoorbellComposer; import com.eu.habbo.messages.outgoing.rooms.RoomAccessDeniedComposer; @@ -24,7 +24,7 @@ public class HandleDoorbellEvent extends MessageHandler { Emulator.getGameEnvironment().getRoomManager().enterRoom(habbo, this.client.getHabbo().getHabboInfo().getCurrentRoom().getId(), "", true); } else { habbo.getClient().sendResponse(new RoomAccessDeniedComposer("")); - habbo.getClient().sendResponse(new HotelViewComposer()); + habbo.getClient().sendResponse(new CloseConnectionMessageComposer()); } habbo.getHabboInfo().setRoomQueueId(0); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemItemEvent.java index 4c7bf265..79efa01b 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemItemEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemItemEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.rooms.UpdateStackHeightComposer; import com.eu.habbo.messages.outgoing.rooms.items.RemoveFloorItemComposer; -import com.eu.habbo.messages.outgoing.users.UserCreditsComposer; +import com.eu.habbo.messages.outgoing.users.CreditBalanceComposer; import com.eu.habbo.messages.outgoing.users.ActivityPointsMessageComposer; import com.eu.habbo.plugin.events.furniture.FurnitureRedeemedEvent; import com.eu.habbo.threading.runnables.QueryDeleteHabboItem; @@ -108,7 +108,7 @@ public class RedeemItemEvent extends MessageHandler { switch (furniRedeemEvent.currencyID) { case FurnitureRedeemedEvent.CREDITS: this.client.getHabbo().getHabboInfo().addCredits(furniRedeemEvent.amount); - this.client.sendResponse(new UserCreditsComposer(this.client.getHabbo())); + this.client.sendResponse(new CreditBalanceComposer(this.client.getHabbo())); break; case FurnitureRedeemedEvent.DIAMONDS: diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserDropHandItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserDropHandItemEvent.java index c57318cd..fe84b534 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserDropHandItemEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserDropHandItemEvent.java @@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.rooms.users; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserHandItemComposer; +import com.eu.habbo.messages.outgoing.rooms.users.CarryObjectMessageComposer; public class RoomUserDropHandItemEvent extends MessageHandler { @Override @@ -11,7 +11,7 @@ public class RoomUserDropHandItemEvent extends MessageHandler { this.client.getHabbo().getRoomUnit().setHandItem(0); if (room != null) { room.unIdle(this.client.getHabbo()); - room.sendComposer(new RoomUserHandItemComposer(this.client.getHabbo().getRoomUnit()).compose()); + room.sendComposer(new CarryObjectMessageComposer(this.client.getHabbo().getRoomUnit()).compose()); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/ChangeNameCheckUsernameEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/ChangeNameCheckUsernameEvent.java index a287e651..86c571d5 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/ChangeNameCheckUsernameEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/ChangeNameCheckUsernameEvent.java @@ -3,8 +3,7 @@ package com.eu.habbo.messages.incoming.users; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.HabboManager; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserNameChangedComposer; -import com.eu.habbo.messages.outgoing.users.ChangeNameCheckResultComposer; +import com.eu.habbo.messages.outgoing.users.CheckUserNameResultMessageComposer; import java.util.ArrayList; import java.util.List; @@ -19,21 +18,21 @@ public class ChangeNameCheckUsernameEvent extends MessageHandler { String name = this.packet.readString(); - int errorCode = ChangeNameCheckResultComposer.AVAILABLE; + int errorCode = CheckUserNameResultMessageComposer.AVAILABLE; List suggestions = new ArrayList<>(4); if (name.length() < 3) { - errorCode = ChangeNameCheckResultComposer.TOO_SHORT; + errorCode = CheckUserNameResultMessageComposer.TOO_SHORT; } else if (name.length() > 15) { - errorCode = ChangeNameCheckResultComposer.TOO_LONG; + errorCode = CheckUserNameResultMessageComposer.TOO_LONG; } else if (name.equalsIgnoreCase(this.client.getHabbo().getHabboInfo().getUsername()) || HabboManager.getOfflineHabboInfo(name) != null || ConfirmChangeNameEvent.changingUsernames.contains(name.toLowerCase())) { - errorCode = ChangeNameCheckResultComposer.TAKEN_WITH_SUGGESTIONS; + errorCode = CheckUserNameResultMessageComposer.TAKEN_WITH_SUGGESTIONS; suggestions.add(name + Emulator.getRandom().nextInt(9999)); suggestions.add(name + Emulator.getRandom().nextInt(9999)); suggestions.add(name + Emulator.getRandom().nextInt(9999)); suggestions.add(name + Emulator.getRandom().nextInt(9999)); } else if (!Emulator.getGameEnvironment().getWordFilter().filter(name, this.client.getHabbo()).equalsIgnoreCase(name)) { - errorCode = ChangeNameCheckResultComposer.NOT_VALID; + errorCode = CheckUserNameResultMessageComposer.NOT_VALID; } else { String checkName = name; for (char c : VALID_CHARACTERS.toCharArray()) { @@ -41,12 +40,12 @@ public class ChangeNameCheckUsernameEvent extends MessageHandler { } if (!checkName.isEmpty()) { - errorCode = ChangeNameCheckResultComposer.NOT_VALID; + errorCode = CheckUserNameResultMessageComposer.NOT_VALID; } else { this.client.getHabbo().getHabboStats().changeNameChecked = name; } } - this.client.sendResponse(new ChangeNameCheckResultComposer(errorCode, name, suggestions)); + this.client.sendResponse(new CheckUserNameResultMessageComposer(errorCode, name, suggestions)); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/ConfirmChangeNameEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/ConfirmChangeNameEvent.java index 03e02149..1c6b68f4 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/ConfirmChangeNameEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/ConfirmChangeNameEvent.java @@ -5,9 +5,9 @@ import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.HabboInfo; import com.eu.habbo.habbohotel.users.HabboManager; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.users.ChangeNameUpdatedComposer; +import com.eu.habbo.messages.outgoing.rooms.users.ChangeUserNameResultMessageEvent; import com.eu.habbo.messages.outgoing.rooms.users.RoomUserNameChangedComposer; -import com.eu.habbo.messages.outgoing.users.ChangeNameCheckResultComposer; +import com.eu.habbo.messages.outgoing.users.CheckUserNameResultMessageComposer; import com.eu.habbo.messages.outgoing.users.UserDataComposer; import com.eu.habbo.plugin.events.users.UserNameChangedEvent; import org.slf4j.Logger; @@ -33,7 +33,7 @@ public class ConfirmChangeNameEvent extends MessageHandler { if (name.equalsIgnoreCase(this.client.getHabbo().getHabboInfo().getUsername())) { this.client.getHabbo().getHabboStats().allowNameChange = false; - this.client.sendResponse(new ChangeNameUpdatedComposer(this.client.getHabbo())); + this.client.sendResponse(new ChangeUserNameResultMessageEvent(this.client.getHabbo())); this.client.sendResponse(new RoomUserNameChangedComposer(this.client.getHabbo()).compose()); this.client.sendResponse(new UserDataComposer(this.client.getHabbo())); return; @@ -66,7 +66,7 @@ public class ConfirmChangeNameEvent extends MessageHandler { changingUsernames.remove(name); } - this.client.sendResponse(new ChangeNameUpdatedComposer(this.client.getHabbo())); + this.client.sendResponse(new ChangeUserNameResultMessageEvent(this.client.getHabbo())); if (this.client.getHabbo().getHabboInfo().getCurrentRoom() != null) { this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RoomUserNameChangedComposer(this.client.getHabbo()).compose()); @@ -87,7 +87,7 @@ public class ConfirmChangeNameEvent extends MessageHandler { LOGGER.error("Caught SQL exception", e); } } else { - this.client.sendResponse(new ChangeNameCheckResultComposer(ChangeNameCheckResultComposer.TAKEN_WITH_SUGGESTIONS, name, new ArrayList<>())); + this.client.sendResponse(new CheckUserNameResultMessageComposer(CheckUserNameResultMessageComposer.TAKEN_WITH_SUGGESTIONS, name, new ArrayList<>())); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserCreditsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserCreditsEvent.java index dc5ddd36..791ecf88 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserCreditsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserCreditsEvent.java @@ -1,13 +1,13 @@ package com.eu.habbo.messages.incoming.users; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.users.UserCreditsComposer; +import com.eu.habbo.messages.outgoing.users.CreditBalanceComposer; import com.eu.habbo.messages.outgoing.users.ActivityPointsMessageComposer; public class RequestUserCreditsEvent extends MessageHandler { @Override public void handle() { - this.client.sendResponse(new UserCreditsComposer(this.client.getHabbo())); + this.client.sendResponse(new CreditBalanceComposer(this.client.getHabbo())); this.client.sendResponse(new ActivityPointsMessageComposer(this.client.getHabbo())); } } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPublishWaitMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPublishStatusMessageComposer.java similarity index 82% rename from src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPublishWaitMessageComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPublishStatusMessageComposer.java index b5f49f07..bc0bba0d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPublishWaitMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPublishStatusMessageComposer.java @@ -4,12 +4,12 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class CameraPublishWaitMessageComposer extends MessageComposer { +public class CameraPublishStatusMessageComposer extends MessageComposer { public final boolean isOk; public final int cooldownSeconds; public final String extraDataId; - public CameraPublishWaitMessageComposer(boolean isOk, int cooldownSeconds, String extraDataId) { + public CameraPublishStatusMessageComposer(boolean isOk, int cooldownSeconds, String extraDataId) { this.isOk = isOk; this.cooldownSeconds = cooldownSeconds; this.extraDataId = extraDataId; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPurchaseSuccesfullComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPurchaseOKMessageComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPurchaseSuccesfullComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPurchaseOKMessageComposer.java index 1e96b76f..e07524a5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPurchaseSuccesfullComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPurchaseOKMessageComposer.java @@ -4,7 +4,7 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class CameraPurchaseSuccesfullComposer extends MessageComposer { +public class CameraPurchaseOKMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.CameraPurchaseOKMessageComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraURLComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraStorageUrlMessageComposer.java similarity index 78% rename from src/main/java/com/eu/habbo/messages/outgoing/camera/CameraURLComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/camera/CameraStorageUrlMessageComposer.java index 6e25d3cb..c5ebed72 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraURLComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraStorageUrlMessageComposer.java @@ -4,10 +4,10 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class CameraURLComposer extends MessageComposer { +public class CameraStorageUrlMessageComposer extends MessageComposer { private final String URL; - public CameraURLComposer(String url) { + public CameraStorageUrlMessageComposer(String url) { this.URL = url; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraCompetitionStatusComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/camera/CompetitionStatusMessageComposer.java similarity index 80% rename from src/main/java/com/eu/habbo/messages/outgoing/camera/CameraCompetitionStatusComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/camera/CompetitionStatusMessageComposer.java index 9e0906c5..cad2b7d2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraCompetitionStatusComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/camera/CompetitionStatusMessageComposer.java @@ -4,11 +4,11 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class CameraCompetitionStatusComposer extends MessageComposer { +public class CompetitionStatusMessageComposer extends MessageComposer { private final boolean unknownBoolean; private final String unknownString; - public CameraCompetitionStatusComposer(boolean unknownBoolean, String unknownString) { + public CompetitionStatusMessageComposer(boolean unknownBoolean, String unknownString) { this.unknownBoolean = unknownBoolean; this.unknownString = unknownString; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPageMessageComposer.java similarity index 94% rename from src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPageComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPageMessageComposer.java index 612abc9f..7efd39af 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPageMessageComposer.java @@ -17,13 +17,13 @@ import java.util.Collections; import java.util.List; import java.util.Map; -public class CatalogPageComposer extends MessageComposer { +public class CatalogPageMessageComposer extends MessageComposer { private final CatalogPage page; private final Habbo habbo; private final int offerId; private final String mode; - public CatalogPageComposer(CatalogPage page, Habbo habbo, int offerId, String mode) { + public CatalogPageMessageComposer(CatalogPage page, Habbo habbo, int offerId, String mode) { this.page = page; this.habbo = habbo; this.offerId = offerId; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogUpdatedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPublishedMessageComposer.java similarity index 85% rename from src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogUpdatedComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPublishedMessageComposer.java index e6122021..cbcfac3e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogUpdatedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPublishedMessageComposer.java @@ -4,7 +4,7 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class CatalogUpdatedComposer extends MessageComposer { +public class CatalogPublishedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.CatalogPublishedMessageComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubGiftsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubGiftInfoComposer.java similarity index 93% rename from src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubGiftsComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubGiftInfoComposer.java index af9621a5..3c606087 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubGiftsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubGiftInfoComposer.java @@ -12,13 +12,13 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -public class ClubGiftsComposer extends MessageComposer { +public class ClubGiftInfoComposer extends MessageComposer { private final int daysTillNextGift; private final int availableGifts; private final int daysAsHc; - public ClubGiftsComposer(int daysTillNextGift, int availableGifts, int daysAsHc) { + public ClubGiftInfoComposer(int daysTillNextGift, int availableGifts, int daysAsHc) { this.daysTillNextGift = daysTillNextGift; this.availableGifts = availableGifts; this.daysAsHc = daysAsHc; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/AdventCalendarDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/CampaignCalendarDataMessageComposer.java similarity index 81% rename from src/main/java/com/eu/habbo/messages/outgoing/events/calendar/AdventCalendarDataComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/events/calendar/CampaignCalendarDataMessageComposer.java index 8d0653f2..7154b4dc 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/AdventCalendarDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/CampaignCalendarDataMessageComposer.java @@ -8,7 +8,7 @@ import gnu.trove.list.array.TIntArrayList; import java.util.ArrayList; -public class AdventCalendarDataComposer extends MessageComposer { +public class CampaignCalendarDataMessageComposer extends MessageComposer { private final String eventName; private final String campaignImage; private final int totalDays; @@ -16,7 +16,7 @@ public class AdventCalendarDataComposer extends MessageComposer { private final ArrayList unlocked; private final boolean lockExpired; - public AdventCalendarDataComposer(String eventName, String campaignImage, int totalDays, int currentDay, ArrayList unlocked, boolean lockExpired) { + public CampaignCalendarDataMessageComposer(String eventName, String campaignImage, int totalDays, int currentDay, ArrayList unlocked, boolean lockExpired) { this.eventName = eventName; this.campaignImage = campaignImage; this.totalDays = totalDays; @@ -44,7 +44,7 @@ public class AdventCalendarDataComposer extends MessageComposer { if(this.currentDay > 0) expired.remove(this.currentDay - 1); this.unlocked.forEach(claimed -> { - AdventCalendarDataComposer.this.response.appendInt(claimed.getDay()); + CampaignCalendarDataMessageComposer.this.response.appendInt(claimed.getDay()); expired.remove(claimed.getDay()); }); @@ -52,7 +52,7 @@ public class AdventCalendarDataComposer extends MessageComposer { if (this.lockExpired) { this.response.appendInt(expired.size()); expired.forEach(value -> { - AdventCalendarDataComposer.this.response.appendInt(value); + CampaignCalendarDataMessageComposer.this.response.appendInt(value); return true; }); } else { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/AdventCalendarProductComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/CampaignCalendarDoorOpenedMessageComposer.java similarity index 91% rename from src/main/java/com/eu/habbo/messages/outgoing/events/calendar/AdventCalendarProductComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/events/calendar/CampaignCalendarDoorOpenedMessageComposer.java index 08d218fc..8f46b07c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/AdventCalendarProductComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/CampaignCalendarDoorOpenedMessageComposer.java @@ -7,12 +7,12 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class AdventCalendarProductComposer extends MessageComposer { +public class CampaignCalendarDoorOpenedMessageComposer extends MessageComposer { public final boolean visible; public final CalendarRewardObject rewardObject; public final Habbo habbo; - public AdventCalendarProductComposer(boolean visible, CalendarRewardObject rewardObject, Habbo habbo) { + public CampaignCalendarDoorOpenedMessageComposer(boolean visible, CalendarRewardObject rewardObject, Habbo habbo) { this.visible = visible; this.rewardObject = rewardObject; this.habbo = habbo; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/PickMonthlyClubGiftNotificationComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/ClubGiftNotificationComposer.java similarity index 76% rename from src/main/java/com/eu/habbo/messages/outgoing/generic/PickMonthlyClubGiftNotificationComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/generic/ClubGiftNotificationComposer.java index c8468ef4..fdf792a2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/PickMonthlyClubGiftNotificationComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/ClubGiftNotificationComposer.java @@ -4,10 +4,10 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class PickMonthlyClubGiftNotificationComposer extends MessageComposer { +public class ClubGiftNotificationComposer extends MessageComposer { private final int count; - public PickMonthlyClubGiftNotificationComposer(int count) { + public ClubGiftNotificationComposer(int count) { this.count = count; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/CustomNotificationComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/CustomUserNotificationMessageComposer.java similarity index 84% rename from src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/CustomNotificationComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/CustomUserNotificationMessageComposer.java index fb8fab02..11c9c8cd 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/CustomNotificationComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/CustomUserNotificationMessageComposer.java @@ -4,7 +4,7 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class CustomNotificationComposer extends MessageComposer { +public class CustomUserNotificationMessageComposer extends MessageComposer { public static final int HOPPER_NO_COSTUME = 1; public static final int HOPPER_NO_HC = 2; public static final int GATE_NO_HC = 3; @@ -13,7 +13,7 @@ public class CustomNotificationComposer extends MessageComposer { private final int type; - public CustomNotificationComposer(int type) { + public CustomUserNotificationMessageComposer(int type) { this.type = type; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingTimeEnded.java b/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionDetachedMessageComposer.java similarity index 82% rename from src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingTimeEnded.java rename to src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionDetachedMessageComposer.java index d2283eb1..934c7c60 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingTimeEnded.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionDetachedMessageComposer.java @@ -4,7 +4,7 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class GuardianVotingTimeEnded extends MessageComposer { +public class ChatReviewSessionDetachedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.ChatReviewSessionDetachedMessageComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianNewReportReceivedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionOfferedToGuideMessageComposer.java similarity index 85% rename from src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianNewReportReceivedComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionOfferedToGuideMessageComposer.java index a2122117..b175aba7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianNewReportReceivedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionOfferedToGuideMessageComposer.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class GuardianNewReportReceivedComposer extends MessageComposer { +public class ChatReviewSessionOfferedToGuideMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.ChatReviewSessionOfferedToGuideMessageComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingResultComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionResultsMessageComposer.java similarity index 87% rename from src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingResultComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionResultsMessageComposer.java index 2c242311..64c96936 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingResultComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionResultsMessageComposer.java @@ -9,11 +9,11 @@ import com.eu.habbo.messages.outgoing.Outgoing; import java.util.Map; -public class GuardianVotingResultComposer extends MessageComposer { +public class ChatReviewSessionResultsMessageComposer extends MessageComposer { private final GuardianTicket ticket; private final GuardianVote vote; - public GuardianVotingResultComposer(GuardianTicket ticket, GuardianVote vote) { + public ChatReviewSessionResultsMessageComposer(GuardianTicket ticket, GuardianVote vote) { this.ticket = ticket; this.vote = vote; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingRequestedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionStartedMessageComposer.java similarity index 91% rename from src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingRequestedComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionStartedMessageComposer.java index 99045f1f..9c121abe 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingRequestedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionStartedMessageComposer.java @@ -9,10 +9,10 @@ import gnu.trove.map.hash.TIntIntHashMap; import java.util.Calendar; -public class GuardianVotingRequestedComposer extends MessageComposer { +public class ChatReviewSessionStartedMessageComposer extends MessageComposer { private final GuardianTicket ticket; - public GuardianVotingRequestedComposer(GuardianTicket ticket) { + public ChatReviewSessionStartedMessageComposer(GuardianTicket ticket) { this.ticket = ticket; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingVotesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionVotingStatusMessageComposer.java similarity index 84% rename from src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingVotesComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionVotingStatusMessageComposer.java index ee6d6bbc..fdea6627 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingVotesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionVotingStatusMessageComposer.java @@ -9,11 +9,11 @@ import com.eu.habbo.messages.outgoing.Outgoing; import java.util.ArrayList; -public class GuardianVotingVotesComposer extends MessageComposer { +public class ChatReviewSessionVotingStatusMessageComposer extends MessageComposer { private final GuardianTicket ticket; private final Habbo guardian; - public GuardianVotingVotesComposer(GuardianTicket ticket, Habbo guardian) { + public ChatReviewSessionVotingStatusMessageComposer(GuardianTicket ticket, Habbo guardian) { this.ticket = ticket; this.guardian = guardian; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewExpiringCatalogPageCommposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CatalogPageWithEarliestExpiryMessageComposer.java similarity index 80% rename from src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewExpiringCatalogPageCommposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/hotelview/CatalogPageWithEarliestExpiryMessageComposer.java index 53d4740a..af20d0c1 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewExpiringCatalogPageCommposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CatalogPageWithEarliestExpiryMessageComposer.java @@ -5,11 +5,11 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class HotelViewExpiringCatalogPageCommposer extends MessageComposer { +public class CatalogPageWithEarliestExpiryMessageComposer extends MessageComposer { private final CatalogPage page; private final String image; - public HotelViewExpiringCatalogPageCommposer(CatalogPage page, String image) { + public CatalogPageWithEarliestExpiryMessageComposer(CatalogPage page, String image) { this.page = page; this.image = image; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CloseConnectionMessageComposer.java similarity index 84% rename from src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/hotelview/CloseConnectionMessageComposer.java index cda16007..d7336679 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CloseConnectionMessageComposer.java @@ -4,7 +4,7 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class HotelViewComposer extends MessageComposer { +public class CloseConnectionMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.CloseConnectionMessageComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HallOfFameComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CommunityGoalHallOfFameMessageComposer.java similarity index 89% rename from src/main/java/com/eu/habbo/messages/outgoing/hotelview/HallOfFameComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/hotelview/CommunityGoalHallOfFameMessageComposer.java index 01b47ed3..044efada 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HallOfFameComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CommunityGoalHallOfFameMessageComposer.java @@ -10,10 +10,10 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -public class HallOfFameComposer extends MessageComposer { +public class CommunityGoalHallOfFameMessageComposer extends MessageComposer { private final HallOfFame hallOfFame; - public HallOfFameComposer(HallOfFame hallOfFame) { + public CommunityGoalHallOfFameMessageComposer(HallOfFame hallOfFame) { this.hallOfFame = hallOfFame; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCommunityGoalComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CommunityGoalProgressMessageComposer.java similarity index 73% rename from src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCommunityGoalComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/hotelview/CommunityGoalProgressMessageComposer.java index 5217b99f..8a4fe3ce 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCommunityGoalComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CommunityGoalProgressMessageComposer.java @@ -4,7 +4,7 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class HotelViewCommunityGoalComposer extends MessageComposer { +public class CommunityGoalProgressMessageComposer extends MessageComposer { private final boolean achieved; private final int personalContributionScore; private final int personalRank; @@ -16,16 +16,16 @@ public class HotelViewCommunityGoalComposer extends MessageComposer { private final int timeLeft; private final int[] rankData; - public HotelViewCommunityGoalComposer(boolean achieved, - int personalContributionScore, - int personalRank, - int totalAmount, - int communityHighestAchievedLevel, - int scoreRemainingUntilNextLevel, - int percentCompletionTowardsNextLevel, - String competitionName, - int timeLeft, - int[] rankData) { + public CommunityGoalProgressMessageComposer(boolean achieved, + int personalContributionScore, + int personalRank, + int totalAmount, + int communityHighestAchievedLevel, + int scoreRemainingUntilNextLevel, + int percentCompletionTowardsNextLevel, + String competitionName, + int timeLeft, + int[] rankData) { this.achieved = achieved; this.personalContributionScore = personalContributionScore; this.personalRank = personalRank; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewHideCommunityVoteButtonComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CommunityGoalVoteMessageComposer.java similarity index 76% rename from src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewHideCommunityVoteButtonComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/hotelview/CommunityGoalVoteMessageComposer.java index ede322bb..12230eed 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewHideCommunityVoteButtonComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CommunityGoalVoteMessageComposer.java @@ -4,10 +4,10 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class HotelViewHideCommunityVoteButtonComposer extends MessageComposer { +public class CommunityGoalVoteMessageComposer extends MessageComposer { private final boolean unknownBoolean; - public HotelViewHideCommunityVoteButtonComposer(boolean unknownBoolean) { + public CommunityGoalVoteMessageComposer(boolean unknownBoolean) { this.unknownBoolean = unknownBoolean; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewConcurrentUsersComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/ConcurrentUsersGoalProgressMessageComposer.java similarity index 82% rename from src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewConcurrentUsersComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/hotelview/ConcurrentUsersGoalProgressMessageComposer.java index f1ade5ec..22851e17 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewConcurrentUsersComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/ConcurrentUsersGoalProgressMessageComposer.java @@ -4,7 +4,7 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class HotelViewConcurrentUsersComposer extends MessageComposer { +public class ConcurrentUsersGoalProgressMessageComposer extends MessageComposer { public static final int ACTIVE = 0; public static final int HIDDEN = 2; public static final int ACHIEVED = 3; @@ -13,7 +13,7 @@ public class HotelViewConcurrentUsersComposer extends MessageComposer { private final int userCount; private final int goal; - public HotelViewConcurrentUsersComposer(int state, int userCount, int goal) { + public ConcurrentUsersGoalProgressMessageComposer(int state, int userCount, int goal) { this.state = state; this.userCount = userCount; this.goal = goal; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CurrentTimingCodeMessageComposer.java similarity index 80% rename from src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewDataComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/hotelview/CurrentTimingCodeMessageComposer.java index 430b9bcd..3a651f59 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CurrentTimingCodeMessageComposer.java @@ -4,11 +4,11 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class HotelViewDataComposer extends MessageComposer { +public class CurrentTimingCodeMessageComposer extends MessageComposer { private final String data; private final String key; - public HotelViewDataComposer(String data, String key) { + public CurrentTimingCodeMessageComposer(String data, String key) { this.data = data; this.key = key; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/HelperRequestDisabledComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/CallForHelpDisabledNotifyMessageComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/modtool/HelperRequestDisabledComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/modtool/CallForHelpDisabledNotifyMessageComposer.java index bb9d3f3e..6968ac1e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/HelperRequestDisabledComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/CallForHelpDisabledNotifyMessageComposer.java @@ -4,7 +4,7 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class HelperRequestDisabledComposer extends MessageComposer { +public class CallForHelpDisabledNotifyMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.CallForHelpDisabledNotifyMessageComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ReportRoomFormComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/CallForHelpPendingCallsMessageComposer.java similarity index 85% rename from src/main/java/com/eu/habbo/messages/outgoing/modtool/ReportRoomFormComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/modtool/CallForHelpPendingCallsMessageComposer.java index 15ffe49c..8c87d4f1 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ReportRoomFormComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/CallForHelpPendingCallsMessageComposer.java @@ -7,10 +7,10 @@ import com.eu.habbo.messages.outgoing.Outgoing; import java.util.List; -public class ReportRoomFormComposer extends MessageComposer { +public class CallForHelpPendingCallsMessageComposer extends MessageComposer { private final List pendingIssues; - public ReportRoomFormComposer(List issues) { + public CallForHelpPendingCallsMessageComposer(List issues) { this.pendingIssues = issues; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueResponseAlertComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/CallForHelpReplyMessageComposer.java similarity index 78% rename from src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueResponseAlertComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/modtool/CallForHelpReplyMessageComposer.java index 1ae656c3..61231b8b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueResponseAlertComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/CallForHelpReplyMessageComposer.java @@ -4,10 +4,10 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class ModToolIssueResponseAlertComposer extends MessageComposer { +public class CallForHelpReplyMessageComposer extends MessageComposer { private final String message; - public ModToolIssueResponseAlertComposer(String message) { + public CallForHelpReplyMessageComposer(String message) { this.message = message; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolReportReceivedAlertComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/CallForHelpResultMessageComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolReportReceivedAlertComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/modtool/CallForHelpResultMessageComposer.java index a5062fc5..1f376883 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolReportReceivedAlertComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/CallForHelpResultMessageComposer.java @@ -4,7 +4,7 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class ModToolReportReceivedAlertComposer extends MessageComposer { +public class CallForHelpResultMessageComposer extends MessageComposer { public static final int REPORT_RECEIVED = 0; public static final int REPORT_WINDOW = 1; public static final int REPORT_ABUSIVE = 2; @@ -12,7 +12,7 @@ public class ModToolReportReceivedAlertComposer extends MessageComposer { private final int errorCode; private final String message; - public ModToolReportReceivedAlertComposer(int errorCode, String message) { + public CallForHelpResultMessageComposer(int errorCode, String message) { this.errorCode = errorCode; this.message = message; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueChatlogComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/CfhChatlogComposer.java similarity index 92% rename from src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueChatlogComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/modtool/CfhChatlogComposer.java index 70241046..127aa3d3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueChatlogComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/CfhChatlogComposer.java @@ -11,20 +11,20 @@ import java.text.SimpleDateFormat; import java.util.Collections; import java.util.List; -public class ModToolIssueChatlogComposer extends MessageComposer { +public class CfhChatlogComposer extends MessageComposer { public static SimpleDateFormat format = new SimpleDateFormat("HH:mm"); private final ModToolIssue issue; private final List chatlog; private final String roomName; private ModToolIssueChatlogType type = ModToolIssueChatlogType.CHAT; - public ModToolIssueChatlogComposer(ModToolIssue issue, List chatlog, String roomName) { + public CfhChatlogComposer(ModToolIssue issue, List chatlog, String roomName) { this.issue = issue; this.chatlog = chatlog; this.roomName = roomName; } - public ModToolIssueChatlogComposer(ModToolIssue issue, List chatlog, String roomName, ModToolIssueChatlogType type) { + public CfhChatlogComposer(ModToolIssue issue, List chatlog, String roomName, ModToolIssueChatlogType type) { this.issue = issue; this.chatlog = chatlog; this.roomName = roomName; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/CfhTopicsMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/CfhTopicsInitComposer.java similarity index 68% rename from src/main/java/com/eu/habbo/messages/outgoing/modtool/CfhTopicsMessageComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/modtool/CfhTopicsInitComposer.java index 935044cc..19f55c0a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/CfhTopicsMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/CfhTopicsInitComposer.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; import gnu.trove.procedure.TObjectProcedure; -public class CfhTopicsMessageComposer extends MessageComposer { +public class CfhTopicsInitComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.CfhTopicsInitComposer); @@ -18,14 +18,14 @@ public class CfhTopicsMessageComposer extends MessageComposer { Emulator.getGameEnvironment().getModToolManager().getCfhCategories().forEachValue(new TObjectProcedure() { @Override public boolean execute(CfhCategory category) { - CfhTopicsMessageComposer.this.response.appendString(category.getName()); - CfhTopicsMessageComposer.this.response.appendInt(category.getTopics().valueCollection().size()); + CfhTopicsInitComposer.this.response.appendString(category.getName()); + CfhTopicsInitComposer.this.response.appendInt(category.getTopics().valueCollection().size()); category.getTopics().forEachValue(new TObjectProcedure() { @Override public boolean execute(CfhTopic topic) { - CfhTopicsMessageComposer.this.response.appendString(topic.name); - CfhTopicsMessageComposer.this.response.appendInt(topic.id); - CfhTopicsMessageComposer.this.response.appendString(topic.action.toString()); + CfhTopicsInitComposer.this.response.appendString(topic.name); + CfhTopicsInitComposer.this.response.appendInt(topic.id); + CfhTopicsInitComposer.this.response.appendString(topic.action.toString()); return true; } }); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/CanCreateEventComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/CanCreateRoomEventComposer.java similarity index 87% rename from src/main/java/com/eu/habbo/messages/outgoing/navigator/CanCreateEventComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/navigator/CanCreateRoomEventComposer.java index 84fb6dc7..81bd1cc2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/CanCreateEventComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/CanCreateRoomEventComposer.java @@ -4,7 +4,7 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class CanCreateEventComposer extends MessageComposer { +public class CanCreateRoomEventComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.CanCreateRoomEventComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorCategoryUserCountComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/CategoriesWithVisitorCountComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorCategoryUserCountComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/navigator/CategoriesWithVisitorCountComposer.java index 2857c4ea..7cf8b202 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorCategoryUserCountComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/CategoriesWithVisitorCountComposer.java @@ -7,10 +7,10 @@ import com.eu.habbo.messages.outgoing.Outgoing; import java.util.List; -public class NewNavigatorCategoryUserCountComposer extends MessageComposer { +public class CategoriesWithVisitorCountComposer extends MessageComposer { public final List roomCategories; - public NewNavigatorCategoryUserCountComposer(List roomCategories) { + public CategoriesWithVisitorCountComposer(List roomCategories) { this.roomCategories = roomCategories; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorCollapsedCategoriesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/CollapsedCategoriesComposer.java similarity index 97% rename from src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorCollapsedCategoriesComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/navigator/CollapsedCategoriesComposer.java index 461294dd..0cbf39a2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorCollapsedCategoriesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/CollapsedCategoriesComposer.java @@ -4,7 +4,7 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class NewNavigatorCollapsedCategoriesComposer extends MessageComposer { +public class CollapsedCategoriesComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.CollapsedCategoriesComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEnterErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/CantConnectMessageComposer.java similarity index 85% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEnterErrorComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/CantConnectMessageComposer.java index ba84f272..464eabbb 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEnterErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/CantConnectMessageComposer.java @@ -4,7 +4,7 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class RoomEnterErrorComposer extends MessageComposer { +public class CantConnectMessageComposer extends MessageComposer { public static final int ROOM_ERROR_GUESTROOM_FULL = 1; public static final int ROOM_ERROR_CANT_ENTER = 2; public static final int ROOM_ERROR_QUE = 3; @@ -18,12 +18,12 @@ public class RoomEnterErrorComposer extends MessageComposer { private final int errorCode; private final String queError; - public RoomEnterErrorComposer(int errorCode) { + public CantConnectMessageComposer(int errorCode) { this.errorCode = errorCode; this.queError = ""; } - public RoomEnterErrorComposer(int errorCode, String queError) { + public CantConnectMessageComposer(int errorCode, String queError) { this.errorCode = errorCode; this.queError = queError; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingResultComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/ConfirmBreedingRequestComposer.java similarity index 95% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingResultComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/ConfirmBreedingRequestComposer.java index be75530f..35d0daa2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingResultComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/ConfirmBreedingRequestComposer.java @@ -13,13 +13,13 @@ import org.apache.commons.math3.distribution.NormalDistribution; import java.util.ArrayList; -public class PetBreedingResultComposer extends MessageComposer { +public class ConfirmBreedingRequestComposer extends MessageComposer { private final int boxId; private final int petType; private final PetBreedingPet petOne; private final PetBreedingPet petTwo; - public PetBreedingResultComposer(int boxId, int petType, Pet petOne, String ownerPetOne, Pet petTwo, String ownerPetTwo) { + public ConfirmBreedingRequestComposer(int boxId, int petType, Pet petOne, String ownerPetOne, Pet petTwo, String ownerPetTwo) { this.boxId = boxId; this.petType = petType; this.petOne = new PetBreedingPet(petOne, ownerPetOne); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingFailedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/ConfirmBreedingResultComposer.java similarity index 81% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingFailedComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/ConfirmBreedingResultComposer.java index 37b3639e..b4f8be51 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingFailedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/ConfirmBreedingResultComposer.java @@ -4,11 +4,11 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class PetBreedingFailedComposer extends MessageComposer { +public class ConfirmBreedingResultComposer extends MessageComposer { private final int anInt1; private final int anInt2; - public PetBreedingFailedComposer(int anInt1, int anInt2) { + public ConfirmBreedingResultComposer(int anInt1, int anInt2) { this.anInt1 = anInt1; this.anInt2 = anInt2; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserHandItemComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/CarryObjectMessageComposer.java similarity index 82% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserHandItemComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/users/CarryObjectMessageComposer.java index 2cbeba80..f87b8cd7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserHandItemComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/CarryObjectMessageComposer.java @@ -5,10 +5,10 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class RoomUserHandItemComposer extends MessageComposer { +public class CarryObjectMessageComposer extends MessageComposer { private final RoomUnit roomUnit; - public RoomUserHandItemComposer(RoomUnit roomUnit) { + public CarryObjectMessageComposer(RoomUnit roomUnit) { this.roomUnit = roomUnit; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ChangeNameUpdatedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ChangeUserNameResultMessageEvent.java similarity index 82% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ChangeNameUpdatedComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ChangeUserNameResultMessageEvent.java index 6b20957f..855b3122 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ChangeNameUpdatedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ChangeUserNameResultMessageEvent.java @@ -5,10 +5,10 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class ChangeNameUpdatedComposer extends MessageComposer { +public class ChangeUserNameResultMessageEvent extends MessageComposer { private final Habbo habbo; - public ChangeNameUpdatedComposer(Habbo habbo) { + public ChangeUserNameResultMessageEvent(Habbo habbo) { this.habbo = habbo; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTalkComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ChatMessageComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTalkComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ChatMessageComposer.java index aec7dfa2..56af64dd 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTalkComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ChatMessageComposer.java @@ -5,10 +5,10 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class RoomUserTalkComposer extends MessageComposer { +public class ChatMessageComposer extends MessageComposer { private final RoomChatMessage roomChatMessage; - public RoomUserTalkComposer(RoomChatMessage roomChatMessage) { + public ChatMessageComposer(RoomChatMessage roomChatMessage) { this.roomChatMessage = roomChatMessage; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownHelperComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/CallForHelpPendingCallsDeletedMessageComposer.java similarity index 82% rename from src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownHelperComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/unknown/CallForHelpPendingCallsDeletedMessageComposer.java index 617781fe..257986a2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownHelperComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/CallForHelpPendingCallsDeletedMessageComposer.java @@ -4,7 +4,7 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class UnknownHelperComposer extends MessageComposer { +public class CallForHelpPendingCallsDeletedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.CallForHelpPendingCallsDeletedMessageComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ModToolSanctionDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/CfhSanctionMessageComposer.java similarity index 91% rename from src/main/java/com/eu/habbo/messages/outgoing/unknown/ModToolSanctionDataComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/unknown/CfhSanctionMessageComposer.java index 72439038..b6eed87c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ModToolSanctionDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/CfhSanctionMessageComposer.java @@ -5,12 +5,12 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class ModToolSanctionDataComposer extends MessageComposer { +public class CfhSanctionMessageComposer extends MessageComposer { private final int unknownInt1; private final int accountId; private final CFHSanction sanction; - public ModToolSanctionDataComposer(int unknownInt1, int accountId, CFHSanction sanction) { + public CfhSanctionMessageComposer(int unknownInt1, int accountId, CFHSanction sanction) { this.unknownInt1 = unknownInt1; this.accountId = accountId; this.sanction = sanction; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/TalentTrackEmailFailedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ChangeEmailResultComposer.java similarity index 79% rename from src/main/java/com/eu/habbo/messages/outgoing/unknown/TalentTrackEmailFailedComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/unknown/ChangeEmailResultComposer.java index ab1401ec..1c9a3988 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/TalentTrackEmailFailedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ChangeEmailResultComposer.java @@ -4,10 +4,10 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class TalentTrackEmailFailedComposer extends MessageComposer { +public class ChangeEmailResultComposer extends MessageComposer { private final int result; - public TalentTrackEmailFailedComposer(int result) { + public ChangeEmailResultComposer(int result) { this.result = result; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/VipTutorialsStartComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/CitizenshipVipOfferPromoEnabledComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/unknown/VipTutorialsStartComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/unknown/CitizenshipVipOfferPromoEnabledComposer.java index b2a74167..6901afb6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/VipTutorialsStartComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/CitizenshipVipOfferPromoEnabledComposer.java @@ -4,7 +4,7 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class VipTutorialsStartComposer extends MessageComposer { +public class CitizenshipVipOfferPromoEnabledComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.CitizenshipVipOfferPromoEnabledComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownCompetitionComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/CompetitionVotingInfoMessageComposer.java similarity index 81% rename from src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownCompetitionComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/unknown/CompetitionVotingInfoMessageComposer.java index 232a730f..5927b4b7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownCompetitionComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/CompetitionVotingInfoMessageComposer.java @@ -4,13 +4,13 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class UnknownCompetitionComposer extends MessageComposer { +public class CompetitionVotingInfoMessageComposer extends MessageComposer { private final int unknownInt1; private final String unknownString1; private final int unknownInt2; private final int unknownInt3; - public UnknownCompetitionComposer(int unknownInt1, String unknownString1, int unknownInt2, int unknownInt3) { + public CompetitionVotingInfoMessageComposer(int unknownInt1, String unknownString1, int unknownInt2, int unknownInt3) { this.unknownInt1 = unknownInt1; this.unknownString1 = unknownString1; this.unknownInt2 = unknownInt2; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ConvertedForwardToRoomComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ConvertedRoomIdComposer.java similarity index 80% rename from src/main/java/com/eu/habbo/messages/outgoing/unknown/ConvertedForwardToRoomComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/unknown/ConvertedRoomIdComposer.java index 900f08a8..74362c16 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ConvertedForwardToRoomComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ConvertedRoomIdComposer.java @@ -4,11 +4,11 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class ConvertedForwardToRoomComposer extends MessageComposer { +public class ConvertedRoomIdComposer extends MessageComposer { private final String unknownString1; private final int unknownInt1; - public ConvertedForwardToRoomComposer(String unknownString1, int unknownInt1) { + public ConvertedRoomIdComposer(String unknownString1, int unknownInt1) { this.unknownString1 = unknownString1; this.unknownInt1 = unknownInt1; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/ChangeNameCheckResultComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/CheckUserNameResultMessageComposer.java similarity index 86% rename from src/main/java/com/eu/habbo/messages/outgoing/users/ChangeNameCheckResultComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/users/CheckUserNameResultMessageComposer.java index e253a897..34ca358e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/ChangeNameCheckResultComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/CheckUserNameResultMessageComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; import java.util.List; -public class ChangeNameCheckResultComposer extends MessageComposer { +public class CheckUserNameResultMessageComposer extends MessageComposer { public static final int AVAILABLE = 0; public static final int TOO_SHORT = 2; public static final int TOO_LONG = 3; @@ -18,7 +18,7 @@ public class ChangeNameCheckResultComposer extends MessageComposer { private final String name; private final List suggestions; - public ChangeNameCheckResultComposer(int status, String name, List suggestions) { + public CheckUserNameResultMessageComposer(int status, String name, List suggestions) { this.status = status; this.name = name; this.suggestions = suggestions; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/ClubGiftReceivedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/ClubGiftSelectedComposer.java similarity index 86% rename from src/main/java/com/eu/habbo/messages/outgoing/users/ClubGiftReceivedComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/users/ClubGiftSelectedComposer.java index abe2b567..84d64b96 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/ClubGiftReceivedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/ClubGiftSelectedComposer.java @@ -6,12 +6,12 @@ import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; import gnu.trove.set.hash.THashSet; -public class ClubGiftReceivedComposer extends MessageComposer { +public class ClubGiftSelectedComposer extends MessageComposer { //:test 735 s:t i:1 s:s i:230 s:throne i:1 b:1 i:1 i:10; private final String name; private final THashSet items; - public ClubGiftReceivedComposer(String name, THashSet items) { + public ClubGiftSelectedComposer(String name, THashSet items) { this.name = name; this.items = items; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserCreditsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/CreditBalanceComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/users/UserCreditsComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/users/CreditBalanceComposer.java index 341fd946..10406977 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserCreditsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/CreditBalanceComposer.java @@ -5,10 +5,10 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class UserCreditsComposer extends MessageComposer { +public class CreditBalanceComposer extends MessageComposer { private final Habbo habbo; - public UserCreditsComposer(Habbo habbo) { + public CreditBalanceComposer(Habbo habbo) { this.habbo = habbo; } diff --git a/src/main/java/com/eu/habbo/messages/rcon/UpdateCatalog.java b/src/main/java/com/eu/habbo/messages/rcon/UpdateCatalog.java index 9b040b9c..f1ce6d2b 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/UpdateCatalog.java +++ b/src/main/java/com/eu/habbo/messages/rcon/UpdateCatalog.java @@ -14,7 +14,7 @@ public class UpdateCatalog extends RCONMessage @Override public void handle(Gson gson, JSONUpdateCatalog json) { Emulator.getGameEnvironment().getCatalogManager().initialize(); - Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new CatalogUpdatedComposer()); + Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new CatalogPublishedMessageComposer()); Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new BuildersClubFurniCountMessageComposer(0)); Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new BundleDiscountRulesetMessageComposer()); Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new MarketplaceConfigComposer()); diff --git a/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraResultURLEvent.java b/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraResultURLEvent.java index 61e0f012..2ee2028d 100644 --- a/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraResultURLEvent.java +++ b/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraResultURLEvent.java @@ -3,7 +3,7 @@ package com.eu.habbo.networking.camera.messages.incoming; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.achievements.AchievementManager; import com.eu.habbo.habbohotel.users.Habbo; -import com.eu.habbo.messages.outgoing.camera.CameraURLComposer; +import com.eu.habbo.messages.outgoing.camera.CameraStorageUrlMessageComposer; import com.eu.habbo.networking.camera.CameraIncomingMessage; import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; @@ -46,7 +46,7 @@ public class CameraResultURLEvent extends CameraIncomingMessage { if (habbo != null) { if (timestamp == habbo.getHabboInfo().getPhotoTimestamp()) { AchievementManager.progressAchievement(habbo, Emulator.getGameEnvironment().getAchievementManager().getAchievement("CameraPhotoCount"), 1); - habbo.getClient().sendResponse(new CameraURLComposer(URL)); + habbo.getClient().sendResponse(new CameraStorageUrlMessageComposer(URL)); habbo.getHabboInfo().setPhotoJSON(habbo.getHabboInfo().getPhotoJSON().replace("%room_id%", roomId + "").replace("%url%", URL)); habbo.getHabboInfo().setPhotoURL(URL); } diff --git a/src/main/java/com/eu/habbo/threading/runnables/HabboGiveHandItemToHabbo.java b/src/main/java/com/eu/habbo/threading/runnables/HabboGiveHandItemToHabbo.java index 16a59ec5..9a6eb5d8 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/HabboGiveHandItemToHabbo.java +++ b/src/main/java/com/eu/habbo/threading/runnables/HabboGiveHandItemToHabbo.java @@ -1,7 +1,7 @@ package com.eu.habbo.threading.runnables; import com.eu.habbo.habbohotel.users.Habbo; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserHandItemComposer; +import com.eu.habbo.messages.outgoing.rooms.users.CarryObjectMessageComposer; import com.eu.habbo.messages.outgoing.rooms.users.RoomUserReceivedHandItemComposer; public class HabboGiveHandItemToHabbo implements Runnable { @@ -25,12 +25,12 @@ public class HabboGiveHandItemToHabbo implements Runnable { if (itemId > 0) { this.from.getRoomUnit().setHandItem(0); - this.from.getHabboInfo().getCurrentRoom().sendComposer(new RoomUserHandItemComposer(this.from.getRoomUnit()).compose()); + this.from.getHabboInfo().getCurrentRoom().sendComposer(new CarryObjectMessageComposer(this.from.getRoomUnit()).compose()); this.target.getRoomUnit().lookAtPoint(this.from.getRoomUnit().getCurrentLocation()); this.target.getRoomUnit().statusUpdate(true); this.target.getClient().sendResponse(new RoomUserReceivedHandItemComposer(this.from.getRoomUnit(), itemId)); this.target.getRoomUnit().setHandItem(itemId); - this.target.getHabboInfo().getCurrentRoom().sendComposer(new RoomUserHandItemComposer(this.target.getRoomUnit()).compose()); + this.target.getHabboInfo().getCurrentRoom().sendComposer(new CarryObjectMessageComposer(this.target.getRoomUnit()).compose()); } } } diff --git a/src/main/java/com/eu/habbo/threading/runnables/RoomUnitGiveHanditem.java b/src/main/java/com/eu/habbo/threading/runnables/RoomUnitGiveHanditem.java index d70a6845..0f6491fd 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/RoomUnitGiveHanditem.java +++ b/src/main/java/com/eu/habbo/threading/runnables/RoomUnitGiveHanditem.java @@ -2,7 +2,7 @@ package com.eu.habbo.threading.runnables; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomUnit; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserHandItemComposer; +import com.eu.habbo.messages.outgoing.rooms.users.CarryObjectMessageComposer; public class RoomUnitGiveHanditem implements Runnable { private final RoomUnit roomUnit; @@ -19,7 +19,7 @@ public class RoomUnitGiveHanditem implements Runnable { public void run() { if (this.room != null && this.roomUnit.isInRoom()) { this.roomUnit.setHandItem(this.itemId); - this.room.sendComposer(new RoomUserHandItemComposer(this.roomUnit).compose()); + this.room.sendComposer(new CarryObjectMessageComposer(this.roomUnit).compose()); } } }