From 8c28bfd85a7b1df79be2735f2c7ddd4b801f5c3b Mon Sep 17 00:00:00 2001 From: Harmonic Date: Sat, 16 Apr 2022 16:02:01 -0700 Subject: [PATCH] Yet another refactoring commit. --- src/main/java/com/eu/habbo/Emulator.java | 5 +---- .../habbohotel/catalog/CatalogManager.java | 6 +++--- .../catalog/marketplace/MarketPlace.java | 16 +++++++-------- .../habbohotel/commands/AboutCommand.java | 5 ++--- .../commands/HotelAlertCommand.java | 4 ++-- .../commands/HotelAlertLinkCommand.java | 4 ++-- .../habbohotel/commands/PluginsCommand.java | 4 ++-- .../commands/PromoteTargetOfferCommand.java | 4 ++-- .../habbohotel/commands/RoomAlertCommand.java | 4 ++-- .../commands/StaffAlertCommand.java | 4 ++-- .../habbohotel/commands/TransformCommand.java | 4 ++-- .../commands/UpdateCalendarCommand.java | 2 -- .../commands/UpdateCatalogCommand.java | 4 ++-- .../interactions/InteractionColorWheel.java | 4 ++-- .../interactions/InteractionRoomOMatic.java | 4 ++-- .../pets/InteractionPetBreedingNest.java | 4 ++-- .../habbohotel/messenger/MessengerBuddy.java | 4 ++-- .../habbohotel/modtool/ModToolManager.java | 18 ++++++++--------- .../habbo/habbohotel/modtool/WordFilter.java | 4 ++-- .../com/eu/habbo/habbohotel/rooms/Room.java | 6 +++--- .../habbo/habbohotel/rooms/RoomManager.java | 4 ++-- .../habbo/habbohotel/rooms/TraxManager.java | 6 +++--- .../com/eu/habbo/habbohotel/users/Habbo.java | 6 +++--- .../habbo/habbohotel/users/HabboManager.java | 8 ++++---- .../catalog/CatalogBuyItemAsGiftEvent.java | 4 ++-- .../RequestMarketplaceConfigEvent.java | 4 ++-- .../marketplace/RequestItemInfoEvent.java | 4 ++-- .../marketplace/RequestOwnItemsEvent.java | 4 ++-- .../marketplace/RequestSellItemEvent.java | 6 +++--- .../catalog/marketplace/SellItemEvent.java | 8 ++++---- .../crafting/CraftingAddRecipeEvent.java | 4 ++-- .../crafting/CraftingCraftItemEvent.java | 4 ++-- .../crafting/CraftingCraftSecretEvent.java | 4 ++-- .../friends/AcceptFriendRequestEvent.java | 10 +++++----- .../incoming/friends/FriendRequestEvent.java | 17 ++++++++-------- .../gamecenter/GameCenterJoinGameEvent.java | 14 ++++++------- .../incoming/handshake/PingEvent.java | 4 ++-- .../incoming/handshake/SecureLoginEvent.java | 20 +++++++++---------- .../HotelViewRequestLTDAvailabilityEvent.java | 4 ++-- .../modtool/ModToolPickTicketEvent.java | 4 ++-- .../modtool/ModToolRequestRoomInfoEvent.java | 4 ++-- .../modtool/ModToolSanctionAlertEvent.java | 7 ++----- .../modtool/ModToolSanctionMuteEvent.java | 7 ++----- .../ModToolSanctionTradeLockEvent.java | 6 ++---- .../incoming/modtool/ReportEvent.java | 4 ++-- .../navigator/AddSavedSearchEvent.java | 4 ++-- .../navigator/DeleteSavedSearchEvent.java | 4 ++-- .../navigator/NewNavigatorActionEvent.java | 4 ++-- .../RequestNavigatorSettingsEvent.java | 4 ++-- .../RequestNewNavigatorDataEvent.java | 8 ++++---- .../RequestNewNavigatorRoomsEvent.java | 8 ++++---- .../incoming/rooms/RoomMuteEvent.java | 4 ++-- .../rooms/RoomRemoveAllRightsEvent.java | 4 ++-- .../incoming/rooms/SetHomeRoomEvent.java | 4 ++-- .../rooms/items/PostItDeleteEvent.java | 4 ++-- .../rooms/items/PostItPlaceEvent.java | 4 ++-- .../rooms/items/PostItRequestDataEvent.java | 4 ++-- .../rooms/items/jukebox/JukeBoxEventOne.java | 4 ++-- .../rooms/items/jukebox/JukeBoxEventTwo.java | 4 ++-- .../jukebox/JukeBoxRequestPlayListEvent.java | 4 ++-- ...ava => LimitedEditionSoldOutComposer.java} | 2 +- ...java => MarketPlaceOwnOffersComposer.java} | 6 +++--- ...=> MarketplaceBuyOfferResultComposer.java} | 4 ++-- ...ava => MarketplaceCanMakeOfferResult.java} | 4 ++-- ...MarketplaceCancelOfferResultComposer.java} | 4 ++-- ... => MarketplaceConfigurationComposer.java} | 2 +- ...java => MarketplaceItemStatsComposer.java} | 4 ++-- ...r.java => MarketplaceMakeOfferResult.java} | 4 ++-- ...er.java => MysteryBoxClosingComposer.java} | 2 +- ...oser.java => MysteryBoxStartComposer.java} | 2 +- ...poser.java => MessengerErrorComposer.java} | 4 ++-- ...er.java => NewConsoleMessageComposer.java} | 6 +++--- ...ser.java => NewFriendRequestComposer.java} | 4 ++-- ...r.java => JoinedQueueMessageComposer.java} | 4 ++-- ...ser.java => LeftQueueMessageComposer.java} | 2 +- ...oser.java => LoadGameMessageComposer.java} | 4 ++-- ...r.java => LoadGameUrlMessageComposer.java} | 2 +- ....java => MiniMailUnreadCountComposer.java} | 2 +- ...ser.java => MOTDNotificationComposer.java} | 6 +++--- ... => MaintenanceStatusMessageComposer.java} | 4 ++-- ...ser.java => ModeratorCautionComposer.java} | 4 ++-- ...ser.java => ModeratorMessageComposer.java} | 4 ++-- ...> NewUserExperienceGiftOfferComposer.java} | 4 ++-- ...java => NoobnessLevelMessageComposer.java} | 4 ++-- ...> LatencyPingResponseMessageComposer.java} | 4 ++-- ...tedOfferAppearingNextMessageComposer.java} | 4 ++-- ...ssueCloseNotificationMessageComposer.java} | 6 +++--- ...ser.java => IssueInfoMessageComposer.java} | 4 ++-- ...va => IssuePickFailedMessageComposer.java} | 4 ++-- ...java => ModeratorInitMessageComposer.java} | 4 ++-- ...er.java => ModeratorRoomInfoComposer.java} | 4 ++-- ... => ModeratorToolPreferencesComposer.java} | 4 ++-- ...er.java => ModeratorUserInfoComposer.java} | 6 +++--- ...ava => MysteryBoxKeysMessageComposer.java} | 2 +- ...java => NavigatorLiftedRoomsComposer.java} | 2 +- ...er.java => NavigatorMetaDataComposer.java} | 2 +- ...va => NavigatorSavedSearchesComposer.java} | 4 ++-- ... NavigatorSearchResultBlocksComposer.java} | 4 ++-- ...a => NewNavigatorPreferencesComposer.java} | 4 ++-- ... => NoOwnedRoomsAlertMessageComposer.java} | 2 +- ...mposer.java => MuteAllInRoomComposer.java} | 4 ++-- ...poser.java => ItemAddMessageComposer.java} | 4 ++-- ...ava => ItemDataUpdateMessageComposer.java} | 4 ++-- ...er.java => ItemRemoveMessageComposer.java} | 4 ++-- ...er.java => ItemUpdateMessageComposer.java} | 4 ++-- ...lItemsComposer.java => ItemsComposer.java} | 4 ++-- ...> JukeBoxPlaylistFullMessageComposer.java} | 2 +- ...a => JukeboxSongDisksMessageComposer.java} | 4 ++-- ....java => NestBreedingSuccessComposer.java} | 4 ++-- ...sComposer.java => NoSuchFlatComposer.java} | 4 ++-- ....java => IssueDeletedMessageComposer.java} | 2 +- ...r.java => MiniMailNewMessageComposer.java} | 2 +- ...er.java => NavigatorSettingsComposer.java} | 4 ++-- ...NewUserExperienceNotCompleteComposer.java} | 2 +- .../eu/habbo/messages/rcon/FriendRequest.java | 4 ++-- .../eu/habbo/messages/rcon/HotelAlert.java | 4 ++-- .../eu/habbo/messages/rcon/UpdateCatalog.java | 4 ++-- .../CameraAuthenticationTicketEvent.java | 4 ++-- 118 files changed, 271 insertions(+), 286 deletions(-) rename src/main/java/com/eu/habbo/messages/outgoing/catalog/{AlertLimitedSoldOutComposer.java => LimitedEditionSoldOutComposer.java} (84%) rename src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/{MarketplaceOwnItemsComposer.java => MarketPlaceOwnOffersComposer.java} (94%) rename src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/{MarketplaceBuyErrorComposer.java => MarketplaceBuyOfferResultComposer.java} (86%) rename src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/{MarketplaceSellItemComposer.java => MarketplaceCanMakeOfferResult.java} (84%) rename src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/{MarketplaceCancelSaleComposer.java => MarketplaceCancelOfferResultComposer.java} (80%) rename src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/{MarketplaceConfigComposer.java => MarketplaceConfigurationComposer.java} (91%) rename src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/{MarketplaceItemInfoComposer.java => MarketplaceItemStatsComposer.java} (82%) rename src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/{MarketplaceItemPostedComposer.java => MarketplaceMakeOfferResult.java} (85%) rename src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/{MysticBoxCloseComposer.java => MysteryBoxClosingComposer.java} (85%) rename src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/{MysticBoxStartOpenComposer.java => MysteryBoxStartComposer.java} (84%) rename src/main/java/com/eu/habbo/messages/outgoing/friends/{FriendRequestErrorComposer.java => MessengerErrorComposer.java} (86%) rename src/main/java/com/eu/habbo/messages/outgoing/friends/{FriendChatMessageComposer.java => NewConsoleMessageComposer.java} (90%) rename src/main/java/com/eu/habbo/messages/outgoing/friends/{FriendRequestComposer.java => NewFriendRequestComposer.java} (85%) rename src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/{BaseJumpJoinQueueComposer.java => JoinedQueueMessageComposer.java} (80%) rename src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/{BaseJumpLeaveQueueComposer.java => LeftQueueMessageComposer.java} (86%) rename src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/{BaseJumpLoadGameComposer.java => LoadGameMessageComposer.java} (94%) rename src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/{BaseJumpLoadGameURLComposer.java => LoadGameUrlMessageComposer.java} (90%) rename src/main/java/com/eu/habbo/messages/outgoing/generic/{MinimailCountComposer.java => MiniMailUnreadCountComposer.java} (85%) rename src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/{MessagesForYouComposer.java => MOTDNotificationComposer.java} (83%) rename src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/{HotelWillCloseInMinutesAndBackInComposer.java => MaintenanceStatusMessageComposer.java} (80%) rename src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/{StaffAlertWIthLinkAndOpenHabboWayComposer.java => ModeratorCautionComposer.java} (78%) rename src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/{StaffAlertWithLinkComposer.java => ModeratorMessageComposer.java} (81%) rename src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/{NewUserGiftComposer.java => NewUserExperienceGiftOfferComposer.java} (85%) rename src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/{NewUserIdentityComposer.java => NoobnessLevelMessageComposer.java} (81%) rename src/main/java/com/eu/habbo/messages/outgoing/handshake/{PongComposer.java => LatencyPingResponseMessageComposer.java} (78%) rename src/main/java/com/eu/habbo/messages/outgoing/hotelview/{HotelViewNextLTDAvailableComposer.java => LimitedOfferAppearingNextMessageComposer.java} (81%) rename src/main/java/com/eu/habbo/messages/outgoing/modtool/{ModToolIssueHandledComposer.java => IssueCloseNotificationMessageComposer.java} (79%) rename src/main/java/com/eu/habbo/messages/outgoing/modtool/{ModToolIssueInfoComposer.java => IssueInfoMessageComposer.java} (81%) rename src/main/java/com/eu/habbo/messages/outgoing/modtool/{ModToolIssueUpdateComposer.java => IssuePickFailedMessageComposer.java} (80%) rename src/main/java/com/eu/habbo/messages/outgoing/modtool/{ModToolComposer.java => ModeratorInitMessageComposer.java} (95%) rename src/main/java/com/eu/habbo/messages/outgoing/modtool/{ModToolRoomInfoComposer.java => ModeratorRoomInfoComposer.java} (91%) rename src/main/java/com/eu/habbo/messages/outgoing/modtool/{ModToolIssueHandlerDimensionsComposer.java => ModeratorToolPreferencesComposer.java} (82%) rename src/main/java/com/eu/habbo/messages/outgoing/modtool/{ModToolUserInfoComposer.java => ModeratorUserInfoComposer.java} (96%) rename src/main/java/com/eu/habbo/messages/outgoing/mysterybox/{MysteryBoxKeysComposer.java => MysteryBoxKeysMessageComposer.java} (87%) rename src/main/java/com/eu/habbo/messages/outgoing/navigator/{NewNavigatorLiftedRoomsComposer.java => NavigatorLiftedRoomsComposer.java} (84%) rename src/main/java/com/eu/habbo/messages/outgoing/navigator/{NewNavigatorMetaDataComposer.java => NavigatorMetaDataComposer.java} (91%) rename src/main/java/com/eu/habbo/messages/outgoing/navigator/{NewNavigatorSavedSearchesComposer.java => NavigatorSavedSearchesComposer.java} (85%) rename src/main/java/com/eu/habbo/messages/outgoing/navigator/{NewNavigatorSearchResultsComposer.java => NavigatorSearchResultBlocksComposer.java} (83%) rename src/main/java/com/eu/habbo/messages/outgoing/navigator/{NewNavigatorSettingsComposer.java => NewNavigatorPreferencesComposer.java} (84%) rename src/main/java/com/eu/habbo/messages/outgoing/navigator/{OpenRoomCreationWindowComposer.java => NoOwnedRoomsAlertMessageComposer.java} (83%) rename src/main/java/com/eu/habbo/messages/outgoing/rooms/{RoomMutedComposer.java => MuteAllInRoomComposer.java} (82%) rename src/main/java/com/eu/habbo/messages/outgoing/rooms/items/{AddWallItemComposer.java => ItemAddMessageComposer.java} (83%) rename src/main/java/com/eu/habbo/messages/outgoing/rooms/items/{PostItDataComposer.java => ItemDataUpdateMessageComposer.java} (85%) rename src/main/java/com/eu/habbo/messages/outgoing/rooms/items/{RemoveWallItemComposer.java => ItemRemoveMessageComposer.java} (83%) rename src/main/java/com/eu/habbo/messages/outgoing/rooms/items/{WallItemUpdateComposer.java => ItemUpdateMessageComposer.java} (83%) rename src/main/java/com/eu/habbo/messages/outgoing/rooms/items/{RoomWallItemsComposer.java => ItemsComposer.java} (93%) rename src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/{JukeBoxPlaylistFullComposer.java => JukeBoxPlaylistFullMessageComposer.java} (83%) rename src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/{JukeBoxPlayListComposer.java => JukeboxSongDisksMessageComposer.java} (85%) rename src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/{PetBreedingCompleted.java => NestBreedingSuccessComposer.java} (81%) rename src/main/java/com/eu/habbo/messages/outgoing/rooms/users/{RoomUserRemoveRightsComposer.java => NoSuchFlatComposer.java} (82%) rename src/main/java/com/eu/habbo/messages/outgoing/unknown/{ModToolComposerOne.java => IssueDeletedMessageComposer.java} (84%) rename src/main/java/com/eu/habbo/messages/outgoing/unknown/{MinimailNewMessageComposer.java => MiniMailNewMessageComposer.java} (85%) rename src/main/java/com/eu/habbo/messages/outgoing/users/{UserHomeRoomComposer.java => NavigatorSettingsComposer.java} (81%) rename src/main/java/com/eu/habbo/messages/outgoing/users/verification/{VerifyMobileNumberComposer.java => NewUserExperienceNotCompleteComposer.java} (83%) diff --git a/src/main/java/com/eu/habbo/Emulator.java b/src/main/java/com/eu/habbo/Emulator.java index 9eae8a4d..0a5595c9 100644 --- a/src/main/java/com/eu/habbo/Emulator.java +++ b/src/main/java/com/eu/habbo/Emulator.java @@ -114,7 +114,7 @@ public final class Emulator { // Checks if this is a BETA build before allowing them to continue. if (PREVIEW.toLowerCase().contains("beta")) { - System.out.println(""); + System.out.println(); promptEnterKey(); } LOGGER.info("eek. Has it really been a year?"); @@ -294,9 +294,6 @@ public final class Emulator { } Emulator.stopped = true; - // if (osName.startsWith("Windows") && (!classPath.contains("idea_rt.jar"))) { - // AnsiConsole.systemUninstall(); - // } try { if (Emulator.threading != null) 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 6f20553c..74f0f399 100644 --- a/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java @@ -24,7 +24,7 @@ import com.eu.habbo.messages.outgoing.inventory.BotAddedToInventoryComposer; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.AddPetComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer; -import com.eu.habbo.messages.outgoing.modtool.ModToolIssueHandledComposer; +import com.eu.habbo.messages.outgoing.modtool.IssueCloseNotificationMessageComposer; import com.eu.habbo.messages.outgoing.users.BadgeReceivedComposer; import com.eu.habbo.messages.outgoing.users.CreditBalanceComposer; import com.eu.habbo.messages.outgoing.users.HabboActivityPointNotificationMessageComposer; @@ -539,7 +539,7 @@ public class CatalogManager { } if (voucher.hasUserExhausted(habbo.getHabboInfo().getId())) { - client.sendResponse(new ModToolIssueHandledComposer("You have exceeded the limit for redeeming this voucher.")); + client.sendResponse(new IssueCloseNotificationMessageComposer("You have exceeded the limit for redeeming this voucher.")); return; } @@ -833,7 +833,7 @@ public class CatalogManager { if (item.isLimited()) { amount = 1; if (this.getLimitedConfig(item).available() == 0) { - habbo.getClient().sendResponse(new AlertLimitedSoldOutComposer()); + habbo.getClient().sendResponse(new LimitedEditionSoldOutComposer()); return; } 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 46bd64cf..78e10882 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 @@ -6,8 +6,8 @@ import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.incoming.catalog.marketplace.RequestOffersEvent; -import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceBuyErrorComposer; -import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceCancelSaleComposer; +import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceBuyOfferResultComposer; +import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceCancelOfferResultComposer; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListRemoveComposer; @@ -93,7 +93,7 @@ public class MarketPlace { while (set.next()) { HabboItem item = Emulator.getGameEnvironment().getItemManager().loadHabboItem(set); habbo.getInventory().getItemsComponent().addItem(item); - habbo.getClient().sendResponse(new MarketplaceCancelSaleComposer(offer, true)); + habbo.getClient().sendResponse(new MarketplaceCancelOfferResultComposer(offer, true)); habbo.getClient().sendResponse(new AddHabboItemComposer(item)); habbo.getClient().sendResponse(new FurniListInvalidateComposer()); } @@ -106,7 +106,7 @@ public class MarketPlace { } } catch (SQLException e) { LOGGER.error("Caught SQL exception", e); - habbo.getClient().sendResponse(new MarketplaceCancelSaleComposer(offer, false)); + habbo.getClient().sendResponse(new MarketplaceCancelOfferResultComposer(offer, false)); } } } @@ -256,7 +256,7 @@ public class MarketPlace { if (set.getInt("state") != 1) { sendErrorMessage(client, set.getInt("item_id"), offerId); } else if ((MARKETPLACE_CURRENCY == 0 && price > client.getHabbo().getHabboInfo().getCredits()) || (MARKETPLACE_CURRENCY > 0 && price > client.getHabbo().getHabboInfo().getCurrencyAmount(MARKETPLACE_CURRENCY))) { - client.sendResponse(new MarketplaceBuyErrorComposer(MarketplaceBuyErrorComposer.NOT_ENOUGH_CREDITS, 0, offerId, price)); + client.sendResponse(new MarketplaceBuyOfferResultComposer(MarketplaceBuyOfferResultComposer.NOT_ENOUGH_CREDITS, 0, offerId, price)); } else { try (PreparedStatement updateOffer = connection.prepareStatement("UPDATE marketplace_items SET state = 2, sold_timestamp = ? WHERE id = ?")) { updateOffer.setInt(1, Emulator.getIntUnixTimestamp()); @@ -287,7 +287,7 @@ public class MarketPlace { client.sendResponse(new CreditBalanceComposer(client.getHabbo())); client.sendResponse(new AddHabboItemComposer(item)); client.sendResponse(new FurniListInvalidateComposer()); - client.sendResponse(new MarketplaceBuyErrorComposer(MarketplaceBuyErrorComposer.REFRESH, 0, offerId, price)); + client.sendResponse(new MarketplaceBuyOfferResultComposer(MarketplaceBuyOfferResultComposer.REFRESH, 0, offerId, price)); if (habbo != null) { habbo.getInventory().getOffer(offerId).setState(MarketPlaceState.SOLD); @@ -320,10 +320,10 @@ public class MarketPlace { try (ResultSet countSet = statement.executeQuery()) { countSet.last(); if (countSet.getRow() == 0) - client.sendResponse(new MarketplaceBuyErrorComposer(MarketplaceBuyErrorComposer.SOLD_OUT, 0, offerId, 0)); + client.sendResponse(new MarketplaceBuyOfferResultComposer(MarketplaceBuyOfferResultComposer.SOLD_OUT, 0, offerId, 0)); else { countSet.first(); - client.sendResponse(new MarketplaceBuyErrorComposer(MarketplaceBuyErrorComposer.UPDATES, countSet.getInt("count"), countSet.getInt("id"), MarketPlace.calculateCommision(countSet.getInt("price")))); + client.sendResponse(new MarketplaceBuyOfferResultComposer(MarketplaceBuyOfferResultComposer.UPDATES, countSet.getInt("count"), countSet.getInt("id"), MarketPlace.calculateCommision(countSet.getInt("price")))); } } } catch (SQLException e) { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/AboutCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/AboutCommand.java index b3a111a9..b15499d4 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/AboutCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/AboutCommand.java @@ -3,8 +3,7 @@ package com.eu.habbo.habbohotel.commands; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.catalog.CatalogManager; import com.eu.habbo.habbohotel.gameclients.GameClient; -import com.eu.habbo.habbohotel.users.HabboManager; -import com.eu.habbo.messages.outgoing.generic.alerts.MessagesForYouComposer; +import com.eu.habbo.messages.outgoing.generic.alerts.MOTDNotificationComposer; import java.util.Collections; import java.util.concurrent.TimeUnit; @@ -49,7 +48,7 @@ public class AboutCommand extends Command { "Thanks for using Arcturus. Report issues on the forums. http://arcturus.wf \r\r" + " - The General"; gameClient.getHabbo().alert(message); - gameClient.sendResponse(new MessagesForYouComposer(Collections.singletonList(credits))); + gameClient.sendResponse(new MOTDNotificationComposer(Collections.singletonList(credits))); return true; } } diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/HotelAlertCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/HotelAlertCommand.java index 52a3d454..31aa0006 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/HotelAlertCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/HotelAlertCommand.java @@ -5,7 +5,7 @@ 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.ServerMessage; -import com.eu.habbo.messages.outgoing.generic.alerts.StaffAlertWithLinkComposer; +import com.eu.habbo.messages.outgoing.generic.alerts.ModeratorMessageComposer; import java.util.Map; @@ -23,7 +23,7 @@ public class HotelAlertCommand extends Command { message.append(params[i]).append(" "); } - ServerMessage msg = new StaffAlertWithLinkComposer(message + "\r\n-" + gameClient.getHabbo().getHabboInfo().getUsername(), "").compose(); + ServerMessage msg = new ModeratorMessageComposer(message + "\r\n-" + gameClient.getHabbo().getHabboInfo().getUsername(), "").compose(); for (Map.Entry set : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().entrySet()) { Habbo habbo = set.getValue(); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/HotelAlertLinkCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/HotelAlertLinkCommand.java index fca733f6..15fd3d21 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/HotelAlertLinkCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/HotelAlertLinkCommand.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.generic.alerts.StaffAlertWithLinkComposer; +import com.eu.habbo.messages.outgoing.generic.alerts.ModeratorMessageComposer; public class HotelAlertLinkCommand extends Command { public HotelAlertLinkCommand() { @@ -24,7 +24,7 @@ public class HotelAlertLinkCommand extends Command { message.append("\r\r-").append(gameClient.getHabbo().getHabboInfo().getUsername()).append(""); - Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new StaffAlertWithLinkComposer(message.toString(), url).compose()); + Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new ModeratorMessageComposer(message.toString(), url).compose()); return true; } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/PluginsCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/PluginsCommand.java index c468e0d1..ea3cd72f 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/PluginsCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/PluginsCommand.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.generic.alerts.MessagesForYouComposer; +import com.eu.habbo.messages.outgoing.generic.alerts.MOTDNotificationComposer; import com.eu.habbo.plugin.HabboPlugin; import java.util.Collections; @@ -22,7 +22,7 @@ public class PluginsCommand extends Command { if (Emulator.getConfig().getBoolean("commands.plugins.oldstyle")) { - gameClient.sendResponse(new MessagesForYouComposer(Collections.singletonList(message.toString()))); + gameClient.sendResponse(new MOTDNotificationComposer(Collections.singletonList(message.toString()))); } else { gameClient.getHabbo().alert(message.toString()); } diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/PromoteTargetOfferCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/PromoteTargetOfferCommand.java index 0ffe541a..de943796 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/PromoteTargetOfferCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/PromoteTargetOfferCommand.java @@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.catalog.TargetOffer; import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.outgoing.catalog.TargetedOfferComposer; -import com.eu.habbo.messages.outgoing.generic.alerts.MessagesForYouComposer; +import com.eu.habbo.messages.outgoing.generic.alerts.MOTDNotificationComposer; import gnu.trove.map.hash.THashMap; import java.util.ArrayList; @@ -43,7 +43,7 @@ public class PromoteTargetOfferCommand extends Command { } } - gameClient.sendResponse(new MessagesForYouComposer(message)); + gameClient.sendResponse(new MOTDNotificationComposer(message)); } else { int offerId = 0; try { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/RoomAlertCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/RoomAlertCommand.java index e71b6abe..6f6233e2 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/RoomAlertCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/RoomAlertCommand.java @@ -4,7 +4,7 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles; -import com.eu.habbo.messages.outgoing.modtool.ModToolIssueHandledComposer; +import com.eu.habbo.messages.outgoing.modtool.IssueCloseNotificationMessageComposer; public class RoomAlertCommand extends Command { public RoomAlertCommand() { @@ -28,7 +28,7 @@ public class RoomAlertCommand extends Command { Room room = gameClient.getHabbo().getHabboInfo().getCurrentRoom(); if (room != null) { - room.sendComposer(new ModToolIssueHandledComposer(message.toString()).compose()); + room.sendComposer(new IssueCloseNotificationMessageComposer(message.toString()).compose()); return true; } } diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/StaffAlertCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/StaffAlertCommand.java index d6e9487a..b227be3a 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/StaffAlertCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/StaffAlertCommand.java @@ -4,7 +4,7 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.messenger.Message; import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles; -import com.eu.habbo.messages.outgoing.friends.FriendChatMessageComposer; +import com.eu.habbo.messages.outgoing.friends.NewConsoleMessageComposer; public class StaffAlertCommand extends Command { public StaffAlertCommand() { @@ -20,7 +20,7 @@ public class StaffAlertCommand extends Command { } Emulator.getGameEnvironment().getHabboManager().staffAlert(message + "\r\n-" + gameClient.getHabbo().getHabboInfo().getUsername()); - Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new FriendChatMessageComposer(new Message(gameClient.getHabbo().getHabboInfo().getId(), -1, message.toString())).compose(), "acc_staff_chat", gameClient); + Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new NewConsoleMessageComposer(new Message(gameClient.getHabbo().getHabboInfo().getId(), -1, message.toString())).compose(), "acc_staff_chat", gameClient); } else { gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_staffalert.forgot_message"), RoomChatMessageBubbles.ALERT); } diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/TransformCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/TransformCommand.java index 39feb7c2..793f6475 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/TransformCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/TransformCommand.java @@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.pets.PetData; import com.eu.habbo.habbohotel.rooms.RoomUnit; import com.eu.habbo.habbohotel.rooms.RoomUnitType; -import com.eu.habbo.messages.outgoing.generic.alerts.MessagesForYouComposer; +import com.eu.habbo.messages.outgoing.generic.alerts.MOTDNotificationComposer; import com.eu.habbo.messages.outgoing.rooms.users.RoomUserRemoveComposer; import java.util.ArrayList; @@ -30,7 +30,7 @@ public class TransformCommand extends Command { petNames.append(line.replace("%id%", p.getType() + "").replace("%name%", p.getName())).append("\r"); } - gameClient.sendResponse(new MessagesForYouComposer(new String[]{petNames.toString()})); + gameClient.sendResponse(new MOTDNotificationComposer(new String[]{petNames.toString()})); return true; } else { String petName = params[1]; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateCalendarCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateCalendarCommand.java index a110c20b..777234c2 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateCalendarCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateCalendarCommand.java @@ -3,8 +3,6 @@ package com.eu.habbo.habbohotel.commands; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles; -import com.eu.habbo.messages.outgoing.catalog.*; -import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceConfigComposer; public class UpdateCalendarCommand extends Command { 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 67e00a04..df4feacd 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateCatalogCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateCatalogCommand.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.messages.outgoing.catalog.*; -import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceConfigComposer; +import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceConfigurationComposer; public class UpdateCatalogCommand extends Command { @@ -18,7 +18,7 @@ public class UpdateCatalogCommand extends Command { 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()); + Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new MarketplaceConfigurationComposer()); Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new GiftWrappingConfigurationComposer()); Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new RecyclerLogicComposer()); Emulator.getGameEnvironment().getCraftingManager().reload(); diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionColorWheel.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionColorWheel.java index 8105464c..03259db7 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionColorWheel.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionColorWheel.java @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomUnit; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.ServerMessage; -import com.eu.habbo.messages.outgoing.rooms.items.WallItemUpdateComposer; +import com.eu.habbo.messages.outgoing.rooms.items.ItemUpdateMessageComposer; import com.eu.habbo.threading.runnables.RandomDiceNumber; import java.sql.ResultSet; @@ -51,7 +51,7 @@ public class InteractionColorWheel extends HabboItem { if (this.rollTaks == null && !this.getExtradata().equalsIgnoreCase("-1")) { this.setExtradata("-1"); - room.sendComposer(new WallItemUpdateComposer(this).compose()); + room.sendComposer(new ItemUpdateMessageComposer(this).compose()); Emulator.getThreading().run(this); Emulator.getThreading().run(new RandomDiceNumber(this, room, this.getBaseItem().getStateCount()), 3000); } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionRoomOMatic.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionRoomOMatic.java index 28fa960e..3cbf73cb 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionRoomOMatic.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionRoomOMatic.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.navigator.OpenRoomCreationWindowComposer; +import com.eu.habbo.messages.outgoing.navigator.NoOwnedRoomsAlertMessageComposer; import java.sql.ResultSet; import java.sql.SQLException; @@ -20,7 +20,7 @@ public class InteractionRoomOMatic extends InteractionDefault { @Override public void onClick(GameClient client, Room room, Object[] objects) throws Exception { if (client != null) { - client.sendResponse(new OpenRoomCreationWindowComposer()); + client.sendResponse(new NoOwnedRoomsAlertMessageComposer()); } } } \ No newline at end of file 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 6a9ed734..c9a8f97c 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 @@ -12,7 +12,7 @@ import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.rooms.pets.PetPackageNameValidationComposer; -import com.eu.habbo.messages.outgoing.rooms.pets.breeding.PetBreedingCompleted; +import com.eu.habbo.messages.outgoing.rooms.pets.breeding.NestBreedingSuccessComposer; import com.eu.habbo.messages.outgoing.rooms.pets.breeding.ConfirmBreedingRequestComposer; import com.eu.habbo.threading.runnables.QueryDeleteHabboItem; @@ -159,7 +159,7 @@ public class InteractionPetBreedingNest extends HabboItem { offspring.run(); InteractionPetBreedingNest.this.freePets(); habbo.getHabboInfo().getCurrentRoom().removeHabboItem(box); - habbo.getClient().sendResponse(new PetBreedingCompleted(offspring.getId(), Emulator.getGameEnvironment().getPetManager().getRarityForOffspring(offspring))); + habbo.getClient().sendResponse(new NestBreedingSuccessComposer(offspring.getId(), Emulator.getGameEnvironment().getPetManager().getRarityForOffspring(offspring))); if (box.getBaseItem().getName().startsWith("pet_breeding_")) { String boxType = box.getBaseItem().getName().replace("pet_breeding_", ""); diff --git a/src/main/java/com/eu/habbo/habbohotel/messenger/MessengerBuddy.java b/src/main/java/com/eu/habbo/habbohotel/messenger/MessengerBuddy.java index d879d004..44ef0a0b 100644 --- a/src/main/java/com/eu/habbo/habbohotel/messenger/MessengerBuddy.java +++ b/src/main/java/com/eu/habbo/habbohotel/messenger/MessengerBuddy.java @@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboGender; import com.eu.habbo.messages.ISerialize; import com.eu.habbo.messages.ServerMessage; -import com.eu.habbo.messages.outgoing.friends.FriendChatMessageComposer; +import com.eu.habbo.messages.outgoing.friends.NewConsoleMessageComposer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -174,7 +174,7 @@ public class MessengerBuddy implements Runnable, ISerialize { chatMessage.setMessage(Emulator.getGameEnvironment().getWordFilter().filter(chatMessage.getMessage(), from)); } - habbo.getClient().sendResponse(new FriendChatMessageComposer(chatMessage)); + habbo.getClient().sendResponse(new NewConsoleMessageComposer(chatMessage)); } @Override diff --git a/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolManager.java b/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolManager.java index 3b8e5b3b..988c7de7 100644 --- a/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolManager.java @@ -9,9 +9,9 @@ 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.ClientMessage; -import com.eu.habbo.messages.outgoing.modtool.ModToolIssueHandledComposer; -import com.eu.habbo.messages.outgoing.modtool.ModToolIssueInfoComposer; -import com.eu.habbo.messages.outgoing.modtool.ModToolUserInfoComposer; +import com.eu.habbo.messages.outgoing.modtool.IssueCloseNotificationMessageComposer; +import com.eu.habbo.messages.outgoing.modtool.IssueInfoMessageComposer; +import com.eu.habbo.messages.outgoing.modtool.ModeratorUserInfoComposer; import com.eu.habbo.plugin.events.support.*; import com.eu.habbo.threading.runnables.InsertModToolIssue; import gnu.trove.TCollections; @@ -58,7 +58,7 @@ public class ModToolManager { statement.setInt(1, userId); try (ResultSet set = statement.executeQuery()) { while (set.next()) { - client.sendResponse(new ModToolUserInfoComposer(set)); + client.sendResponse(new ModeratorUserInfoComposer(set)); } } } catch (SQLException e) { @@ -402,7 +402,7 @@ public class ModToolManager { return; if (target != null) - alertedEvent.target.getClient().sendResponse(new ModToolIssueHandledComposer(alertedEvent.message)); + alertedEvent.target.getClient().sendResponse(new IssueCloseNotificationMessageComposer(alertedEvent.message)); } public void kick(Habbo moderator, Habbo target, String message) { @@ -592,7 +592,7 @@ public class ModToolManager { SupportTicketStatusChangedEvent event = new SupportTicketStatusChangedEvent(null, issue); if (!Emulator.getPluginManager().fireEvent(event).isCancelled()) { - Emulator.getGameEnvironment().getHabboManager().sendPacketToHabbosWithPermission(new ModToolIssueInfoComposer(issue).compose(), Permission.ACC_SUPPORTTOOL); + Emulator.getGameEnvironment().getHabboManager().sendPacketToHabbosWithPermission(new IssueInfoMessageComposer(issue).compose(), Permission.ACC_SUPPORTTOOL); } } @@ -624,7 +624,7 @@ public class ModToolManager { issue.updateInDatabase(); if (sender != null) { - sender.getClient().sendResponse(new ModToolIssueHandledComposer(ModToolIssueHandledComposer.USELESS)); + sender.getClient().sendResponse(new IssueCloseNotificationMessageComposer(IssueCloseNotificationMessageComposer.USELESS)); } this.updateTicketToMods(issue); @@ -636,7 +636,7 @@ public class ModToolManager { issue.state = ModToolTicketState.CLOSED; issue.updateInDatabase(); if (sender != null) { - sender.getClient().sendResponse(new ModToolIssueHandledComposer(ModToolIssueHandledComposer.ABUSIVE)); + sender.getClient().sendResponse(new IssueCloseNotificationMessageComposer(IssueCloseNotificationMessageComposer.ABUSIVE)); } this.updateTicketToMods(issue); @@ -649,7 +649,7 @@ public class ModToolManager { issue.updateInDatabase(); if (sender != null) { - sender.getClient().sendResponse(new ModToolIssueHandledComposer(ModToolIssueHandledComposer.HANDLED)); + sender.getClient().sendResponse(new IssueCloseNotificationMessageComposer(IssueCloseNotificationMessageComposer.HANDLED)); } this.updateTicketToMods(issue); diff --git a/src/main/java/com/eu/habbo/habbohotel/modtool/WordFilter.java b/src/main/java/com/eu/habbo/habbohotel/modtool/WordFilter.java index 8cd83a3c..a1dda3e2 100644 --- a/src/main/java/com/eu/habbo/habbohotel/modtool/WordFilter.java +++ b/src/main/java/com/eu/habbo/habbohotel/modtool/WordFilter.java @@ -4,7 +4,7 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.messenger.Message; import com.eu.habbo.habbohotel.rooms.RoomChatMessage; import com.eu.habbo.habbohotel.users.Habbo; -import com.eu.habbo.messages.outgoing.friends.FriendChatMessageComposer; +import com.eu.habbo.messages.outgoing.friends.NewConsoleMessageComposer; import com.eu.habbo.plugin.events.users.UserTriggerWordFilterEvent; import gnu.trove.iterator.hash.TObjectHashIterator; import gnu.trove.set.hash.THashSet; @@ -99,7 +99,7 @@ public class WordFilter { Emulator.getGameEnvironment().getModToolManager().quickTicket(roomChatMessage.getHabbo(), "Automatic WordFilter", roomChatMessage.getMessage()); if (Emulator.getConfig().getBoolean("notify.staff.chat.auto.report")) { - Emulator.getGameEnvironment().getHabboManager().sendPacketToHabbosWithPermission(new FriendChatMessageComposer(new Message(roomChatMessage.getHabbo().getHabboInfo().getId(), 0, Emulator.getTexts().getValue("warning.auto.report").replace("%user%", roomChatMessage.getHabbo().getHabboInfo().getUsername()).replace("%word%", word.key))).compose(), "acc_staff_chat"); + Emulator.getGameEnvironment().getHabboManager().sendPacketToHabbosWithPermission(new NewConsoleMessageComposer(new Message(roomChatMessage.getHabbo().getHabboInfo().getId(), 0, Emulator.getTexts().getValue("warning.auto.report").replace("%user%", roomChatMessage.getHabbo().getHabboInfo().getUsername()).replace("%word%", word.key))).compose(), "acc_staff_chat"); } return true; } 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 a426512e..abe99ee8 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java @@ -700,7 +700,7 @@ public class Room implements Comparable, ISerialize, Runnable { this.updateBotsAt(tile.x, tile.y); } } else if (item.getBaseItem().getType() == FurnitureType.WALL) { - this.sendComposer(new RemoveWallItemComposer(item).compose()); + this.sendComposer(new ItemRemoveMessageComposer(item).compose()); } Habbo habbo = (picker != null && picker.getHabboInfo().getId() == item.getId() ? picker : Emulator.getGameServer().getGameClientManager().getHabbo(item.getUserId())); @@ -4160,7 +4160,7 @@ public class Room implements Comparable, ISerialize, Runnable { this.sendComposer(new FloorItemUpdateComposer(item).compose()); this.updateTiles(this.getLayout().getTilesAt(this.layout.getTile(item.getX(), item.getY()), item.getBaseItem().getWidth(), item.getBaseItem().getLength(), item.getRotation())); } else if (item.getBaseItem().getType() == FurnitureType.WALL) { - this.sendComposer(new WallItemUpdateComposer(item).compose()); + this.sendComposer(new ItemUpdateMessageComposer(item).compose()); } } } @@ -4630,7 +4630,7 @@ public class Room implements Comparable, ISerialize, Runnable { if (!this.furniOwnerNames.containsKey(item.getUserId()) && owner != null) { this.furniOwnerNames.put(item.getUserId(), owner.getHabboInfo().getUsername()); } - this.sendComposer(new AddWallItemComposer(item, this.getFurniOwnerName(item.getUserId())).compose()); + this.sendComposer(new ItemAddMessageComposer(item, this.getFurniOwnerName(item.getUserId())).compose()); item.needsUpdate(true); this.addHabboItem(item); item.setRoomId(this.id); 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 1ecc40fa..b6663b61 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java @@ -36,7 +36,7 @@ import com.eu.habbo.messages.outgoing.polls.infobus.SimplePollAnswersComposer; import com.eu.habbo.messages.outgoing.polls.infobus.SimplePollStartComposer; import com.eu.habbo.messages.outgoing.rooms.*; import com.eu.habbo.messages.outgoing.rooms.items.RoomFloorItemsComposer; -import com.eu.habbo.messages.outgoing.rooms.items.RoomWallItemsComposer; +import com.eu.habbo.messages.outgoing.rooms.items.ItemsComposer; import com.eu.habbo.messages.outgoing.rooms.pets.RoomPetComposer; import com.eu.habbo.messages.outgoing.rooms.promotions.RoomPromotionMessageComposer; import com.eu.habbo.messages.outgoing.rooms.users.*; @@ -785,7 +785,7 @@ public class RoomManager { habbo.getClient().sendResponse(new GetGuestRoomResultComposer(room, habbo.getClient().getHabbo(), false, true)); - habbo.getClient().sendResponse(new RoomWallItemsComposer(room)); + habbo.getClient().sendResponse(new ItemsComposer(room)); { final THashSet floorItems = new THashSet<>(); diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/TraxManager.java b/src/main/java/com/eu/habbo/habbohotel/rooms/TraxManager.java index ed0c9a31..a209813e 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/TraxManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/TraxManager.java @@ -16,7 +16,7 @@ import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListRemoveComposer; import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxMySongsComposer; import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxNowPlayingMessageComposer; -import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxPlayListComposer; +import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeboxSongDisksMessageComposer; import gnu.trove.map.hash.THashMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -268,7 +268,7 @@ public class TraxManager implements Disposable { return; } - this.room.sendComposer(new JukeBoxPlayListComposer(this.songs, this.totalLength).compose()); + this.room.sendComposer(new JukeboxSongDisksMessageComposer(this.songs, this.totalLength).compose()); musicDisc.setRoomId(-1); musicDisc.needsUpdate(true); @@ -296,7 +296,7 @@ public class TraxManager implements Disposable { this.play(this.playingIndex); } - this.room.sendComposer(new JukeBoxPlayListComposer(this.songs, this.totalLength).compose()); + this.room.sendComposer(new JukeboxSongDisksMessageComposer(this.songs, this.totalLength).compose()); musicDisc.setRoomId(0); musicDisc.needsUpdate(true); 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 9673d1b8..af7730aa 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java @@ -307,7 +307,7 @@ public class Habbo implements Runnable { public void alert(String message) { if (Emulator.getConfig().getBoolean("hotel.alert.oldstyle")) { - this.client.sendResponse(new MessagesForYouComposer(new String[]{message})); + this.client.sendResponse(new MOTDNotificationComposer(new String[]{message})); } else { this.client.sendResponse(new HabboBroadcastMessageComposer(message)); } @@ -315,12 +315,12 @@ public class Habbo implements Runnable { public void alert(String[] messages) { - this.client.sendResponse(new MessagesForYouComposer(messages)); + this.client.sendResponse(new MOTDNotificationComposer(messages)); } public void alertWithUrl(String message, String url) { - this.client.sendResponse(new StaffAlertWithLinkComposer(message, url)); + this.client.sendResponse(new ModeratorMessageComposer(message, url)); } 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 86e7300e..133dda6b 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/HabboManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/HabboManager.java @@ -6,9 +6,9 @@ import com.eu.habbo.habbohotel.permissions.Permission; import com.eu.habbo.habbohotel.permissions.Rank; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.catalog.*; -import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceConfigComposer; +import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceConfigurationComposer; import com.eu.habbo.messages.outgoing.generic.alerts.HabboBroadcastMessageComposer; -import com.eu.habbo.messages.outgoing.modtool.ModToolComposer; +import com.eu.habbo.messages.outgoing.modtool.ModeratorInitMessageComposer; import com.eu.habbo.messages.outgoing.users.UserPerksComposer; import com.eu.habbo.messages.outgoing.users.UserPermissionsComposer; import com.eu.habbo.plugin.events.users.UserRankChangedEvent; @@ -270,14 +270,14 @@ public class HabboManager { habbo.getClient().sendResponse(new UserPerksComposer(habbo)); if (habbo.hasPermission(Permission.ACC_SUPPORTTOOL)) { - habbo.getClient().sendResponse(new ModToolComposer(habbo)); + habbo.getClient().sendResponse(new ModeratorInitMessageComposer(habbo)); } habbo.getHabboInfo().run(); habbo.getClient().sendResponse(new CatalogPublishedMessageComposer()); habbo.getClient().sendResponse(new BuildersClubFurniCountMessageComposer(0)); habbo.getClient().sendResponse(new BundleDiscountRulesetMessageComposer()); - habbo.getClient().sendResponse(new MarketplaceConfigComposer()); + habbo.getClient().sendResponse(new MarketplaceConfigurationComposer()); habbo.getClient().sendResponse(new GiftWrappingConfigurationComposer()); habbo.getClient().sendResponse(new RecyclerLogicComposer()); habbo.alert(Emulator.getTexts().getValue("commands.generic.cmd_give_rank.new_rank").replace("id", newRank.getName())); diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemAsGiftEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemAsGiftEvent.java index 42564c53..df66f335 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemAsGiftEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemAsGiftEvent.java @@ -162,7 +162,7 @@ public class CatalogBuyItemAsGiftEvent extends MessageHandler { if (item.isLimited()) { if (item.getLimitedStack() == item.getLimitedSells()) { - this.client.sendResponse(new AlertLimitedSoldOutComposer()); + this.client.sendResponse(new LimitedEditionSoldOutComposer()); return; } item.sellRare(); @@ -182,7 +182,7 @@ public class CatalogBuyItemAsGiftEvent extends MessageHandler { if (item.isLimited()) { count = 1; if (Emulator.getGameEnvironment().getCatalogManager().getLimitedConfig(item).available() == 0 && habbo != null) { - habbo.getClient().sendResponse(new AlertLimitedSoldOutComposer()); + habbo.getClient().sendResponse(new LimitedEditionSoldOutComposer()); return; } diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestMarketplaceConfigEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestMarketplaceConfigEvent.java index 8442fd6a..a11f4766 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestMarketplaceConfigEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestMarketplaceConfigEvent.java @@ -1,11 +1,11 @@ package com.eu.habbo.messages.incoming.catalog; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceConfigComposer; +import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceConfigurationComposer; public class RequestMarketplaceConfigEvent extends MessageHandler { @Override public void handle() throws Exception { - this.client.sendResponse(new MarketplaceConfigComposer()); + this.client.sendResponse(new MarketplaceConfigurationComposer()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RequestItemInfoEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RequestItemInfoEvent.java index 45c043f6..dd5e9eb9 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RequestItemInfoEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RequestItemInfoEvent.java @@ -1,7 +1,7 @@ package com.eu.habbo.messages.incoming.catalog.marketplace; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceItemInfoComposer; +import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceItemStatsComposer; public class RequestItemInfoEvent extends MessageHandler { @Override @@ -9,6 +9,6 @@ public class RequestItemInfoEvent extends MessageHandler { this.packet.readInt(); int id = this.packet.readInt(); - this.client.sendResponse(new MarketplaceItemInfoComposer(id)); + this.client.sendResponse(new MarketplaceItemStatsComposer(id)); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RequestOwnItemsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RequestOwnItemsEvent.java index ddfb95af..d975d0b2 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RequestOwnItemsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RequestOwnItemsEvent.java @@ -1,11 +1,11 @@ package com.eu.habbo.messages.incoming.catalog.marketplace; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceOwnItemsComposer; +import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketPlaceOwnOffersComposer; public class RequestOwnItemsEvent extends MessageHandler { @Override public void handle() throws Exception { - this.client.sendResponse(new MarketplaceOwnItemsComposer(this.client.getHabbo())); + this.client.sendResponse(new MarketPlaceOwnOffersComposer(this.client.getHabbo())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RequestSellItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RequestSellItemEvent.java index 452c74c7..01d4e66d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RequestSellItemEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RequestSellItemEvent.java @@ -2,14 +2,14 @@ package com.eu.habbo.messages.incoming.catalog.marketplace; import com.eu.habbo.habbohotel.catalog.marketplace.MarketPlace; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceSellItemComposer; +import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceCanMakeOfferResult; public class RequestSellItemEvent extends MessageHandler { @Override public void handle() throws Exception { if (MarketPlace.MARKETPLACE_ENABLED) - this.client.sendResponse(new MarketplaceSellItemComposer(1, 0, 0)); + this.client.sendResponse(new MarketplaceCanMakeOfferResult(1, 0, 0)); else - this.client.sendResponse(new MarketplaceSellItemComposer(3, 0, 0)); + this.client.sendResponse(new MarketplaceCanMakeOfferResult(3, 0, 0)); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/SellItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/SellItemEvent.java index f63df2b2..e4f1d408 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/SellItemEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/SellItemEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.modtool.ScripterManager; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.catalog.AlertPurchaseFailedComposer; -import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceItemPostedComposer; +import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceMakeOfferResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -16,7 +16,7 @@ public class SellItemEvent extends MessageHandler { @Override public void handle() throws Exception { if (!MarketPlace.MARKETPLACE_ENABLED) { - this.client.sendResponse(new MarketplaceItemPostedComposer(MarketplaceItemPostedComposer.MARKETPLACE_DISABLED)); + this.client.sendResponse(new MarketplaceMakeOfferResult(MarketplaceMakeOfferResult.MARKETPLACE_DISABLED)); return; } @@ -44,9 +44,9 @@ public class SellItemEvent extends MessageHandler { } if (MarketPlace.sellItem(this.client, item, credits)) { - this.client.sendResponse(new MarketplaceItemPostedComposer(MarketplaceItemPostedComposer.POST_SUCCESS)); + this.client.sendResponse(new MarketplaceMakeOfferResult(MarketplaceMakeOfferResult.POST_SUCCESS)); } else { - this.client.sendResponse(new MarketplaceItemPostedComposer(MarketplaceItemPostedComposer.FAILED_TECHNICAL_ERROR)); + this.client.sendResponse(new MarketplaceMakeOfferResult(MarketplaceMakeOfferResult.FAILED_TECHNICAL_ERROR)); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingAddRecipeEvent.java b/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingAddRecipeEvent.java index 277eb19d..0993280f 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingAddRecipeEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingAddRecipeEvent.java @@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.crafting; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.crafting.CraftingRecipe; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.catalog.AlertLimitedSoldOutComposer; +import com.eu.habbo.messages.outgoing.catalog.LimitedEditionSoldOutComposer; import com.eu.habbo.messages.outgoing.crafting.CraftingRecipeComposer; public class CraftingAddRecipeEvent extends MessageHandler { @@ -14,7 +14,7 @@ public class CraftingAddRecipeEvent extends MessageHandler { if (recipe != null) { if (!recipe.canBeCrafted()) { - this.client.sendResponse(new AlertLimitedSoldOutComposer()); + this.client.sendResponse(new LimitedEditionSoldOutComposer()); return; } diff --git a/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingCraftItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingCraftItemEvent.java index 1712101e..2c896964 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingCraftItemEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingCraftItemEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.crafting.CraftingRecipe; import com.eu.habbo.habbohotel.items.Item; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.catalog.AlertLimitedSoldOutComposer; +import com.eu.habbo.messages.outgoing.catalog.LimitedEditionSoldOutComposer; import com.eu.habbo.messages.outgoing.crafting.CraftingResultComposer; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer; @@ -27,7 +27,7 @@ public class CraftingCraftItemEvent extends MessageHandler { if (recipe != null) { if (!recipe.canBeCrafted()) { - this.client.sendResponse(new AlertLimitedSoldOutComposer()); + this.client.sendResponse(new LimitedEditionSoldOutComposer()); return; } diff --git a/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingCraftSecretEvent.java b/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingCraftSecretEvent.java index 8731fcf9..f78a900f 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingCraftSecretEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingCraftSecretEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.crafting.CraftingRecipe; import com.eu.habbo.habbohotel.items.Item; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.catalog.AlertLimitedSoldOutComposer; +import com.eu.habbo.messages.outgoing.catalog.LimitedEditionSoldOutComposer; import com.eu.habbo.messages.outgoing.crafting.CraftingResultComposer; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer; @@ -55,7 +55,7 @@ public class CraftingCraftSecretEvent extends MessageHandler { if (recipe != null) { if (!recipe.canBeCrafted()) { - this.client.sendResponse(new AlertLimitedSoldOutComposer()); + this.client.sendResponse(new LimitedEditionSoldOutComposer()); return; } diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/AcceptFriendRequestEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/AcceptFriendRequestEvent.java index d3f461bf..cf5c93e8 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/friends/AcceptFriendRequestEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/friends/AcceptFriendRequestEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.messenger.Messenger; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboInfo; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.friends.FriendRequestErrorComposer; +import com.eu.habbo.messages.outgoing.friends.MessengerErrorComposer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,7 +41,7 @@ public class AcceptFriendRequestEvent extends MessageHandler { HabboInfo habboInfo = getOfflineHabboInfo(userId); if(habboInfo == null) { - this.client.sendResponse(new FriendRequestErrorComposer(FriendRequestErrorComposer.TARGET_NOT_FOUND)); + this.client.sendResponse(new MessengerErrorComposer(MessengerErrorComposer.TARGET_NOT_FOUND)); this.client.getHabbo().getMessenger().deleteFriendRequests(userId, this.client.getHabbo().getHabboInfo().getId()); continue; } @@ -60,18 +60,18 @@ public class AcceptFriendRequestEvent extends MessageHandler { } if(target == null) { - this.client.sendResponse(new FriendRequestErrorComposer(FriendRequestErrorComposer.TARGET_NOT_FOUND)); + this.client.sendResponse(new MessengerErrorComposer(MessengerErrorComposer.TARGET_NOT_FOUND)); this.client.getHabbo().getMessenger().deleteFriendRequests(userId, this.client.getHabbo().getHabboInfo().getId()); continue; } if(this.client.getHabbo().getMessenger().getFriends().size() >= this.client.getHabbo().getHabboStats().maxFriends && !this.client.getHabbo().hasPermission("acc_infinite_friends")) { - this.client.sendResponse(new FriendRequestErrorComposer(FriendRequestErrorComposer.FRIEND_LIST_OWN_FULL)); + this.client.sendResponse(new MessengerErrorComposer(MessengerErrorComposer.FRIEND_LIST_OWN_FULL)); break; } if(target.getMessenger().getFriends().size() >= target.getHabboStats().maxFriends && !target.hasPermission("acc_infinite_friends")) { - this.client.sendResponse(new FriendRequestErrorComposer(FriendRequestErrorComposer.FRIEND_LIST_TARGET_FULL)); + this.client.sendResponse(new MessengerErrorComposer(MessengerErrorComposer.FRIEND_LIST_TARGET_FULL)); continue; } diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/FriendRequestEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/FriendRequestEvent.java index 95b363d7..bb512867 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/friends/FriendRequestEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/friends/FriendRequestEvent.java @@ -1,12 +1,11 @@ package com.eu.habbo.messages.incoming.friends; import com.eu.habbo.Emulator; -import com.eu.habbo.habbohotel.messenger.FriendRequest; import com.eu.habbo.habbohotel.messenger.Messenger; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.friends.FriendRequestComposer; -import com.eu.habbo.messages.outgoing.friends.FriendRequestErrorComposer; +import com.eu.habbo.messages.outgoing.friends.NewFriendRequestComposer; +import com.eu.habbo.messages.outgoing.friends.MessengerErrorComposer; import com.eu.habbo.plugin.events.users.friends.UserRequestFriendshipEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,7 +46,7 @@ public class FriendRequestEvent extends MessageHandler { } if (targetHabbo == null) { - this.client.sendResponse(new FriendRequestErrorComposer(FriendRequestErrorComposer.TARGET_NOT_FOUND)); + this.client.sendResponse(new MessengerErrorComposer(MessengerErrorComposer.TARGET_NOT_FOUND)); return; } @@ -61,30 +60,30 @@ public class FriendRequestEvent extends MessageHandler { // Target Habbo exists // Check if Habbo is accepting friend requests if (targetBlocksFriendRequests) { - this.client.sendResponse(new FriendRequestErrorComposer(FriendRequestErrorComposer.TARGET_NOT_ACCEPTING_REQUESTS)); + this.client.sendResponse(new MessengerErrorComposer(MessengerErrorComposer.TARGET_NOT_ACCEPTING_REQUESTS)); return; } // You can only have x friends if (this.client.getHabbo().getMessenger().getFriends().values().size() >= this.client.getHabbo().getHabboStats().maxFriends && !this.client.getHabbo().hasPermission("acc_infinite_friends")) { - this.client.sendResponse(new FriendRequestErrorComposer(FriendRequestErrorComposer.FRIEND_LIST_OWN_FULL)); + this.client.sendResponse(new MessengerErrorComposer(MessengerErrorComposer.FRIEND_LIST_OWN_FULL)); return; } // Check if targets friendlist is full if (targetHabbo.getMessenger().getFriends().values().size() >= targetHabbo.getHabboStats().maxFriends && !targetHabbo.hasPermission("acc_infinite_friends")) { - this.client.sendResponse(new FriendRequestErrorComposer(FriendRequestErrorComposer.FRIEND_LIST_TARGET_FULL)); + this.client.sendResponse(new MessengerErrorComposer(MessengerErrorComposer.FRIEND_LIST_TARGET_FULL)); return; } // Allow plugins to cancel the request if (Emulator.getPluginManager().fireEvent(new UserRequestFriendshipEvent(this.client.getHabbo(), username, targetHabbo)).isCancelled()) { - this.client.sendResponse(new FriendRequestErrorComposer(2)); + this.client.sendResponse(new MessengerErrorComposer(2)); return; } if(targetHabbo.isOnline()) { - targetHabbo.getClient().sendResponse(new FriendRequestComposer(this.client.getHabbo())); + targetHabbo.getClient().sendResponse(new NewFriendRequestComposer(this.client.getHabbo())); } Messenger.makeFriendRequest(this.client.getHabbo().getHabboInfo().getId(), targetId); diff --git a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterJoinGameEvent.java b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterJoinGameEvent.java index db00af33..b41ec8b6 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterJoinGameEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterJoinGameEvent.java @@ -2,9 +2,9 @@ package com.eu.habbo.messages.incoming.gamecenter; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.gamecenter.GameCenterAchievementsConfigurationComposer; -import com.eu.habbo.messages.outgoing.gamecenter.basejump.BaseJumpJoinQueueComposer; -import com.eu.habbo.messages.outgoing.gamecenter.basejump.BaseJumpLoadGameComposer; -import com.eu.habbo.messages.outgoing.gamecenter.basejump.BaseJumpLoadGameURLComposer; +import com.eu.habbo.messages.outgoing.gamecenter.basejump.JoinedQueueMessageComposer; +import com.eu.habbo.messages.outgoing.gamecenter.basejump.LoadGameMessageComposer; +import com.eu.habbo.messages.outgoing.gamecenter.basejump.LoadGameUrlMessageComposer; public class GameCenterJoinGameEvent extends MessageHandler { @Override @@ -14,11 +14,11 @@ public class GameCenterJoinGameEvent extends MessageHandler { if (gameId == 3) //BaseJump { this.client.sendResponse(new GameCenterAchievementsConfigurationComposer()); - this.client.sendResponse(new BaseJumpLoadGameURLComposer()); - this.client.sendResponse(new BaseJumpLoadGameComposer(this.client, 3)); + this.client.sendResponse(new LoadGameUrlMessageComposer()); + this.client.sendResponse(new LoadGameMessageComposer(this.client, 3)); } else if (gameId == 4) { - this.client.sendResponse(new BaseJumpJoinQueueComposer(4)); - this.client.sendResponse(new BaseJumpLoadGameURLComposer()); + this.client.sendResponse(new JoinedQueueMessageComposer(4)); + this.client.sendResponse(new LoadGameUrlMessageComposer()); } } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/incoming/handshake/PingEvent.java b/src/main/java/com/eu/habbo/messages/incoming/handshake/PingEvent.java index b4ff08fd..edf946a6 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/handshake/PingEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/handshake/PingEvent.java @@ -1,11 +1,11 @@ package com.eu.habbo.messages.incoming.handshake; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.handshake.PongComposer; +import com.eu.habbo.messages.outgoing.handshake.LatencyPingResponseMessageComposer; public class PingEvent extends MessageHandler { @Override public void handle() throws Exception { - this.client.sendResponse(new PongComposer(this.packet.readInt())); + this.client.sendResponse(new LatencyPingResponseMessageComposer(this.packet.readInt())); } } 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 a8920dfe..ab3aa8b8 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 @@ -22,8 +22,8 @@ import com.eu.habbo.messages.outgoing.events.calendar.CampaignCalendarDataMessag import com.eu.habbo.messages.outgoing.gamecenter.Game2AccountGameStatusMessageComposer; import com.eu.habbo.messages.outgoing.gamecenter.GameListMessageComposer; import com.eu.habbo.messages.outgoing.generic.alerts.HabboBroadcastMessageComposer; -import com.eu.habbo.messages.outgoing.generic.alerts.MessagesForYouComposer; -import com.eu.habbo.messages.outgoing.habboway.nux.NewUserIdentityComposer; +import com.eu.habbo.messages.outgoing.generic.alerts.MOTDNotificationComposer; +import com.eu.habbo.messages.outgoing.habboway.nux.NoobnessLevelMessageComposer; import com.eu.habbo.messages.outgoing.habboway.nux.InClientLinkMessageComposer; import com.eu.habbo.messages.outgoing.handshake.EnableNotificationsComposer; import com.eu.habbo.messages.outgoing.handshake.AuthenticationOKMessageComposer; @@ -32,11 +32,11 @@ 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.CfhTopicsInitComposer; -import com.eu.habbo.messages.outgoing.modtool.ModToolComposer; +import com.eu.habbo.messages.outgoing.modtool.ModeratorInitMessageComposer; import com.eu.habbo.messages.outgoing.modtool.ModToolSanctionInfoComposer; import com.eu.habbo.messages.outgoing.navigator.*; import com.eu.habbo.messages.outgoing.unknown.BuildersClubSubscriptionStatusMessageComposer; -import com.eu.habbo.messages.outgoing.mysterybox.MysteryBoxKeysComposer; +import com.eu.habbo.messages.outgoing.mysterybox.MysteryBoxKeysMessageComposer; import com.eu.habbo.messages.outgoing.users.*; import com.eu.habbo.plugin.events.emulator.SSOAuthenticationEvent; import com.eu.habbo.plugin.events.users.UserLoginEvent; @@ -200,17 +200,17 @@ public class SecureLoginEvent extends MessageHandler { } } - messages.add(new UserHomeRoomComposer(this.client.getHabbo().getHabboInfo().getHomeRoom(), roomIdToEnter).compose()); + messages.add(new NavigatorSettingsComposer(this.client.getHabbo().getHabboInfo().getHomeRoom(), roomIdToEnter).compose()); messages.add(new AvatarEffectsMessageComposer(habbo, this.client.getHabbo().getInventory().getEffectsComponent().effects.values()).compose()); messages.add(new FigureSetIdsComposer(this.client.getHabbo()).compose()); - messages.add(new NewUserIdentityComposer(habbo).compose()); + messages.add(new NoobnessLevelMessageComposer(habbo).compose()); messages.add(new UserPermissionsComposer(this.client.getHabbo()).compose()); messages.add(new AvailabilityStatusMessageComposer(true, false, true).compose()); messages.add(new PingComposer().compose()); messages.add(new EnableNotificationsComposer(Emulator.getConfig().getBoolean("bubblealerts.enabled", true)).compose()); messages.add(new AchievementsScoreComposer(this.client.getHabbo()).compose()); messages.add(new IsFirstLoginOfDayComposer(true).compose()); - messages.add(new MysteryBoxKeysComposer().compose()); + messages.add(new MysteryBoxKeysMessageComposer().compose()); messages.add(new BuildersClubSubscriptionStatusMessageComposer().compose()); messages.add(new CfhTopicsInitComposer().compose()); messages.add(new FavouriteChangedComposer(this.client.getHabbo()).compose()); @@ -221,7 +221,7 @@ public class SecureLoginEvent extends MessageHandler { messages.add(new UserClubComposer(this.client.getHabbo(), SubscriptionHabboClub.HABBO_CLUB, UserClubComposer.RESPONSE_TYPE_LOGIN).compose()); if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) { - messages.add(new ModToolComposer(this.client.getHabbo()).compose()); + messages.add(new ModeratorInitMessageComposer(this.client.getHabbo()).compose()); } @@ -289,7 +289,7 @@ public class SecureLoginEvent extends MessageHandler { final Habbo finalHabbo = habbo; Emulator.getThreading().run(() -> { if (Emulator.getConfig().getBoolean("hotel.welcome.alert.oldstyle")) { - SecureLoginEvent.this.client.sendResponse(new MessagesForYouComposer(HabboManager.WELCOME_MESSAGE.replace("%username%", finalHabbo.getHabboInfo().getUsername()).replace("%user%", finalHabbo.getHabboInfo().getUsername()).split("
"))); + SecureLoginEvent.this.client.sendResponse(new MOTDNotificationComposer(HabboManager.WELCOME_MESSAGE.replace("%username%", finalHabbo.getHabboInfo().getUsername()).replace("%user%", finalHabbo.getHabboInfo().getUsername()).split("
"))); } else { SecureLoginEvent.this.client.sendResponse(new HabboBroadcastMessageComposer(HabboManager.WELCOME_MESSAGE.replace("%username%", finalHabbo.getHabboInfo().getUsername()).replace("%user%", finalHabbo.getHabboInfo().getUsername()))); } @@ -312,7 +312,7 @@ public class SecureLoginEvent extends MessageHandler { habbo.getHabboInfo().addSavedSearch(new NavigatorSavedSearch("my", "")); habbo.getHabboInfo().addSavedSearch(new NavigatorSavedSearch("favorites", "")); - this.client.sendResponse(new NewNavigatorSavedSearchesComposer(this.client.getHabbo().getHabboInfo().getSavedSearches())); + this.client.sendResponse(new NavigatorSavedSearchesComposer(this.client.getHabbo().getHabboInfo().getSavedSearches())); } } else { Emulator.getGameServer().getGameClientManager().disposeClient(this.client); diff --git a/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewRequestLTDAvailabilityEvent.java b/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewRequestLTDAvailabilityEvent.java index 99dc88cc..d7f24e04 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewRequestLTDAvailabilityEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewRequestLTDAvailabilityEvent.java @@ -2,7 +2,7 @@ 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.HotelViewNextLTDAvailableComposer; +import com.eu.habbo.messages.outgoing.hotelview.LimitedOfferAppearingNextMessageComposer; public class HotelViewRequestLTDAvailabilityEvent extends MessageHandler { public static boolean ENABLED = false; @@ -15,7 +15,7 @@ public class HotelViewRequestLTDAvailabilityEvent extends MessageHandler { public void handle() throws Exception { if (ENABLED) { int timeremaining = Math.max(TIMESTAMP - Emulator.getIntUnixTimestamp(), -1); - this.client.sendResponse(new HotelViewNextLTDAvailableComposer( + this.client.sendResponse(new LimitedOfferAppearingNextMessageComposer( timeremaining, timeremaining > 0 ? -1 : ITEM_ID, timeremaining > 0 ? -1 : PAGE_ID, diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolPickTicketEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolPickTicketEvent.java index 172ad656..b5cd72b2 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolPickTicketEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolPickTicketEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.modtool.ModToolTicketState; import com.eu.habbo.habbohotel.modtool.ScripterManager; import com.eu.habbo.habbohotel.permissions.Permission; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.modtool.ModToolIssueInfoComposer; +import com.eu.habbo.messages.outgoing.modtool.IssueInfoMessageComposer; public class ModToolPickTicketEvent extends MessageHandler { public static boolean send = false; @@ -19,7 +19,7 @@ public class ModToolPickTicketEvent extends MessageHandler { if (issue != null) { if (issue.state == ModToolTicketState.PICKED) { - this.client.sendResponse(new ModToolIssueInfoComposer(issue)); + this.client.sendResponse(new IssueInfoMessageComposer(issue)); this.client.getHabbo().alert(Emulator.getTexts().getValue("support.ticket.picked.failed")); return; diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomInfoEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomInfoEvent.java index 5f140550..eff8d91a 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomInfoEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomInfoEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.modtool.ScripterManager; 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.ModToolRoomInfoComposer; +import com.eu.habbo.messages.outgoing.modtool.ModeratorRoomInfoComposer; public class ModToolRequestRoomInfoEvent extends MessageHandler { @Override @@ -16,7 +16,7 @@ public class ModToolRequestRoomInfoEvent extends MessageHandler { Room room = Emulator.getGameEnvironment().getRoomManager().getRoom(roomId); if (room != null) { - this.client.sendResponse(new ModToolRoomInfoComposer(room)); + this.client.sendResponse(new ModeratorRoomInfoComposer(room)); } } else { ScripterManager.scripterDetected(this.client, Emulator.getTexts().getValue("scripter.warning.modtools.roominfo").replace("%username%", this.client.getHabbo().getHabboInfo().getUsername())); diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionAlertEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionAlertEvent.java index c0f8bae8..42ba731d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionAlertEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionAlertEvent.java @@ -1,18 +1,15 @@ package com.eu.habbo.messages.incoming.modtool; import com.eu.habbo.Emulator; -import com.eu.habbo.habbohotel.modtool.ModToolBanType; import com.eu.habbo.habbohotel.modtool.ModToolSanctionItem; import com.eu.habbo.habbohotel.modtool.ModToolSanctions; import com.eu.habbo.habbohotel.permissions.Permission; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.modtool.ModToolIssueHandledComposer; +import com.eu.habbo.messages.outgoing.modtool.IssueCloseNotificationMessageComposer; import gnu.trove.map.hash.THashMap; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; public class ModToolSanctionAlertEvent extends MessageHandler { @Override @@ -46,7 +43,7 @@ public class ModToolSanctionAlertEvent extends MessageHandler { habbo.alert(message); } } else { - this.client.sendResponse(new ModToolIssueHandledComposer(Emulator.getTexts().getValue("generic.user.not_found").replace("%user%", Emulator.getConfig().getValue("hotel.player.name")))); + this.client.sendResponse(new IssueCloseNotificationMessageComposer(Emulator.getTexts().getValue("generic.user.not_found").replace("%user%", Emulator.getConfig().getValue("hotel.player.name")))); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionMuteEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionMuteEvent.java index c99eee68..098c134c 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionMuteEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionMuteEvent.java @@ -1,19 +1,16 @@ package com.eu.habbo.messages.incoming.modtool; import com.eu.habbo.Emulator; -import com.eu.habbo.habbohotel.modtool.ModToolBanType; import com.eu.habbo.habbohotel.modtool.ModToolSanctionItem; import com.eu.habbo.habbohotel.modtool.ModToolSanctionLevelItem; import com.eu.habbo.habbohotel.modtool.ModToolSanctions; import com.eu.habbo.habbohotel.permissions.Permission; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.modtool.ModToolIssueHandledComposer; +import com.eu.habbo.messages.outgoing.modtool.IssueCloseNotificationMessageComposer; import gnu.trove.map.hash.THashMap; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; import java.util.Date; public class ModToolSanctionMuteEvent extends MessageHandler { @@ -58,7 +55,7 @@ public class ModToolSanctionMuteEvent extends MessageHandler { this.client.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_mute.muted").replace("%user%", habbo.getHabboInfo().getUsername())); } } else { - this.client.sendResponse(new ModToolIssueHandledComposer(Emulator.getTexts().getValue("generic.user.not_found").replace("%user%", Emulator.getConfig().getValue("hotel.player.name")))); + this.client.sendResponse(new IssueCloseNotificationMessageComposer(Emulator.getTexts().getValue("generic.user.not_found").replace("%user%", Emulator.getConfig().getValue("hotel.player.name")))); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionTradeLockEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionTradeLockEvent.java index 48e14a38..8a29be29 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionTradeLockEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionTradeLockEvent.java @@ -6,12 +6,10 @@ import com.eu.habbo.habbohotel.modtool.ModToolSanctions; import com.eu.habbo.habbohotel.permissions.Permission; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.modtool.ModToolIssueHandledComposer; +import com.eu.habbo.messages.outgoing.modtool.IssueCloseNotificationMessageComposer; import gnu.trove.map.hash.THashMap; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; public class ModToolSanctionTradeLockEvent extends MessageHandler { @Override @@ -47,7 +45,7 @@ public class ModToolSanctionTradeLockEvent extends MessageHandler { habbo.alert(message); } } else { - this.client.sendResponse(new ModToolIssueHandledComposer(Emulator.getTexts().getValue("generic.user.not_found").replace("%user%", Emulator.getConfig().getValue("hotel.player.name")))); + this.client.sendResponse(new IssueCloseNotificationMessageComposer(Emulator.getTexts().getValue("generic.user.not_found").replace("%user%", Emulator.getConfig().getValue("hotel.player.name")))); } } } 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 4d4f8913..9e0eac7c 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 @@ -78,7 +78,7 @@ public class ReportEvent extends MessageHandler { } } - ReportEvent.this.client.sendResponse(new ModToolIssueHandledComposer(cfhTopic.reply).compose()); + ReportEvent.this.client.sendResponse(new IssueCloseNotificationMessageComposer(cfhTopic.reply).compose()); Emulator.getGameEnvironment().getModToolManager().closeTicketAsHandled(issue, null); } }, 30 * 1000); @@ -108,7 +108,7 @@ public class ReportEvent extends MessageHandler { } } - ReportEvent.this.client.sendResponse(new ModToolIssueHandledComposer(cfhTopic.reply).compose()); + ReportEvent.this.client.sendResponse(new IssueCloseNotificationMessageComposer(cfhTopic.reply).compose()); Emulator.getGameEnvironment().getModToolManager().closeTicketAsHandled(issue, null); } }, 30 * 1000); diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/AddSavedSearchEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/AddSavedSearchEvent.java index 78be5765..4f48fb54 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/AddSavedSearchEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/AddSavedSearchEvent.java @@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.navigator; import com.eu.habbo.habbohotel.navigation.NavigatorSavedSearch; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.navigator.NewNavigatorSavedSearchesComposer; +import com.eu.habbo.messages.outgoing.navigator.NavigatorSavedSearchesComposer; public class AddSavedSearchEvent extends MessageHandler { @Override @@ -15,6 +15,6 @@ public class AddSavedSearchEvent extends MessageHandler { this.client.getHabbo().getHabboInfo().addSavedSearch(new NavigatorSavedSearch(searchCode, filter)); - this.client.sendResponse(new NewNavigatorSavedSearchesComposer(this.client.getHabbo().getHabboInfo().getSavedSearches())); + this.client.sendResponse(new NavigatorSavedSearchesComposer(this.client.getHabbo().getHabboInfo().getSavedSearches())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/DeleteSavedSearchEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/DeleteSavedSearchEvent.java index 8429ffe3..cd686f76 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/DeleteSavedSearchEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/DeleteSavedSearchEvent.java @@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.navigator; import com.eu.habbo.habbohotel.navigation.NavigatorSavedSearch; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.navigator.NewNavigatorSavedSearchesComposer; +import com.eu.habbo.messages.outgoing.navigator.NavigatorSavedSearchesComposer; public class DeleteSavedSearchEvent extends MessageHandler { @Override @@ -21,6 +21,6 @@ public class DeleteSavedSearchEvent extends MessageHandler { this.client.getHabbo().getHabboInfo().deleteSavedSearch(search); - this.client.sendResponse(new NewNavigatorSavedSearchesComposer(this.client.getHabbo().getHabboInfo().getSavedSearches())); + this.client.sendResponse(new NavigatorSavedSearchesComposer(this.client.getHabbo().getHabboInfo().getSavedSearches())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/NewNavigatorActionEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/NewNavigatorActionEvent.java index 4febfc1e..286dc0b5 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/NewNavigatorActionEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/NewNavigatorActionEvent.java @@ -4,7 +4,7 @@ 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.rooms.ForwardToRoomComposer; -import com.eu.habbo.messages.outgoing.users.UserHomeRoomComposer; +import com.eu.habbo.messages.outgoing.users.NavigatorSettingsComposer; import java.util.ArrayList; import java.util.Collections; @@ -23,7 +23,7 @@ public class NewNavigatorActionEvent extends MessageHandler { } else if (data.equalsIgnoreCase("predefined_noob_lobby")) { this.client.sendResponse(new ForwardToRoomComposer(Emulator.getConfig().getInt("hotel.room.nooblobby"))); } else { - this.client.sendResponse(new UserHomeRoomComposer(this.client.getHabbo().getHabboInfo().getHomeRoom(), this.client.getHabbo().getHabboInfo().getHomeRoom())); + this.client.sendResponse(new NavigatorSettingsComposer(this.client.getHabbo().getHabboInfo().getHomeRoom(), this.client.getHabbo().getHabboInfo().getHomeRoom())); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNavigatorSettingsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNavigatorSettingsEvent.java index 0369a07d..dec99ca9 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNavigatorSettingsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNavigatorSettingsEvent.java @@ -1,14 +1,14 @@ package com.eu.habbo.messages.incoming.navigator; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.navigator.NewNavigatorSettingsComposer; +import com.eu.habbo.messages.outgoing.navigator.NewNavigatorPreferencesComposer; public class RequestNavigatorSettingsEvent extends MessageHandler { @Override public void handle() throws Exception { - this.client.sendResponse(new NewNavigatorSettingsComposer(this.client.getHabbo().getHabboStats().navigatorWindowSettings)); + this.client.sendResponse(new NewNavigatorPreferencesComposer(this.client.getHabbo().getHabboStats().navigatorWindowSettings)); } } 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 6350d328..e852be7f 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 @@ -6,11 +6,11 @@ import com.eu.habbo.messages.outgoing.navigator.*; public class RequestNewNavigatorDataEvent extends MessageHandler { @Override public void handle() throws Exception { - this.client.sendResponse(new NewNavigatorSettingsComposer(this.client.getHabbo().getHabboStats().navigatorWindowSettings)); - this.client.sendResponse(new NewNavigatorMetaDataComposer()); - this.client.sendResponse(new NewNavigatorLiftedRoomsComposer()); + this.client.sendResponse(new NewNavigatorPreferencesComposer(this.client.getHabbo().getHabboStats().navigatorWindowSettings)); + this.client.sendResponse(new NavigatorMetaDataComposer()); + this.client.sendResponse(new NavigatorLiftedRoomsComposer()); this.client.sendResponse(new CollapsedCategoriesComposer()); - this.client.sendResponse(new NewNavigatorSavedSearchesComposer(this.client.getHabbo().getHabboInfo().getSavedSearches())); + this.client.sendResponse(new NavigatorSavedSearchesComposer(this.client.getHabbo().getHabboInfo().getSavedSearches())); this.client.sendResponse(new NewNavigatorEventCategoriesComposer()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNewNavigatorRoomsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNewNavigatorRoomsEvent.java index 28a18a2b..797f6d07 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNewNavigatorRoomsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNewNavigatorRoomsEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.permissions.Permission; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomCategory; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.navigator.NewNavigatorSearchResultsComposer; +import com.eu.habbo.messages.outgoing.navigator.NavigatorSearchResultBlocksComposer; import gnu.trove.map.hash.THashMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,7 +33,7 @@ public class RequestNewNavigatorRoomsEvent extends MessageHandler { if (rooms != null) { List resultLists = new ArrayList<>(); resultLists.add(new SearchResultList(0, view, query, SearchAction.NONE, this.client.getHabbo().getHabboStats().navigatorWindowSettings.getListModeForCategory(view, ListMode.LIST), this.client.getHabbo().getHabboStats().navigatorWindowSettings.getDisplayModeForCategory(view, DisplayMode.VISIBLE), rooms, true, true, DisplayOrder.ACTIVITY, -1)); - this.client.sendResponse(new NewNavigatorSearchResultsComposer(view, query, resultLists)); + this.client.sendResponse(new NavigatorSearchResultBlocksComposer(view, query, resultLists)); return; } } @@ -72,7 +72,7 @@ public class RequestNewNavigatorRoomsEvent extends MessageHandler { resultLists = toQueryResults(resultLists); } - this.client.sendResponse(new NewNavigatorSearchResultsComposer(view, query, resultLists)); + this.client.sendResponse(new NavigatorSearchResultBlocksComposer(view, query, resultLists)); return; } @@ -91,7 +91,7 @@ public class RequestNewNavigatorRoomsEvent extends MessageHandler { List resultLists = new ArrayList<>(filter.getResult(this.client.getHabbo(), field, part, category != null ? category.getId() : -1)); filter.filter(field.field, part, resultLists); resultLists = toQueryResults(resultLists); - this.client.sendResponse(new NewNavigatorSearchResultsComposer(view, query, resultLists)); + this.client.sendResponse(new NavigatorSearchResultBlocksComposer(view, query, resultLists)); } catch (Exception e) { LOGGER.error("Caught exception", e); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomMuteEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomMuteEvent.java index a71e2543..2260cdbd 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomMuteEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomMuteEvent.java @@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.rooms; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.RoomMutedComposer; +import com.eu.habbo.messages.outgoing.rooms.MuteAllInRoomComposer; public class RoomMuteEvent extends MessageHandler { @Override @@ -12,7 +12,7 @@ public class RoomMuteEvent extends MessageHandler { if (room != null) { if (room.isOwner(this.client.getHabbo())) { room.setMuted(!room.isMuted()); - this.client.sendResponse(new RoomMutedComposer(room)); + this.client.sendResponse(new MuteAllInRoomComposer(room)); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomRemoveAllRightsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomRemoveAllRightsEvent.java index 5bf9dc04..ec781e7f 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomRemoveAllRightsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomRemoveAllRightsEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.rooms.RoomUnitStatus; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.rooms.RoomRightsComposer; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserRemoveRightsComposer; +import com.eu.habbo.messages.outgoing.rooms.users.NoSuchFlatComposer; import gnu.trove.procedure.TIntProcedure; public class RoomRemoveAllRightsEvent extends MessageHandler { @@ -25,7 +25,7 @@ public class RoomRemoveAllRightsEvent extends MessageHandler { Habbo habbo = room.getHabbo(value); if (habbo != null) { - room.sendComposer(new RoomUserRemoveRightsComposer(room, value).compose()); + room.sendComposer(new NoSuchFlatComposer(room, value).compose()); habbo.getRoomUnit().removeStatus(RoomUnitStatus.FLAT_CONTROL); habbo.getClient().sendResponse(new RoomRightsComposer(RoomRightLevels.NONE)); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/SetHomeRoomEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/SetHomeRoomEvent.java index 7a39e005..03363403 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/SetHomeRoomEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/SetHomeRoomEvent.java @@ -1,7 +1,7 @@ package com.eu.habbo.messages.incoming.rooms; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.users.UserHomeRoomComposer; +import com.eu.habbo.messages.outgoing.users.NavigatorSettingsComposer; public class SetHomeRoomEvent extends MessageHandler { @Override @@ -10,7 +10,7 @@ public class SetHomeRoomEvent extends MessageHandler { if (roomId != this.client.getHabbo().getHabboInfo().getHomeRoom()) { this.client.getHabbo().getHabboInfo().setHomeRoom(roomId); - this.client.sendResponse(new UserHomeRoomComposer(this.client.getHabbo().getHabboInfo().getHomeRoom(), 0)); + this.client.sendResponse(new NavigatorSettingsComposer(this.client.getHabbo().getHabboInfo().getHomeRoom(), 0)); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PostItDeleteEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PostItDeleteEvent.java index 821f92c8..1a9fb954 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PostItDeleteEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PostItDeleteEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.permissions.Permission; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.items.RemoveWallItemComposer; +import com.eu.habbo.messages.outgoing.rooms.items.ItemRemoveMessageComposer; import com.eu.habbo.threading.runnables.QueryDeleteHabboItem; public class PostItDeleteEvent extends MessageHandler { @@ -26,7 +26,7 @@ public class PostItDeleteEvent extends MessageHandler { if (item.getUserId() == this.client.getHabbo().getHabboInfo().getId() || this.client.getHabbo().hasPermission(Permission.ACC_ANYROOMOWNER)) { item.setRoomId(0); room.removeHabboItem(item); - room.sendComposer(new RemoveWallItemComposer(item).compose()); + room.sendComposer(new ItemRemoveMessageComposer(item).compose()); Emulator.getThreading().run(new QueryDeleteHabboItem(item.getId())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PostItPlaceEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PostItPlaceEvent.java index ea8fdc89..169868ba 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PostItPlaceEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PostItPlaceEvent.java @@ -11,7 +11,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys; import com.eu.habbo.messages.outgoing.inventory.FurniListRemoveComposer; -import com.eu.habbo.messages.outgoing.rooms.items.AddWallItemComposer; +import com.eu.habbo.messages.outgoing.rooms.items.ItemAddMessageComposer; public class PostItPlaceEvent extends MessageHandler { @Override @@ -33,7 +33,7 @@ public class PostItPlaceEvent extends MessageHandler { item.setWallPosition(location); item.setUserId(this.client.getHabbo().getHabboInfo().getId()); item.needsUpdate(true); - room.sendComposer(new AddWallItemComposer(item, this.client.getHabbo().getHabboInfo().getUsername()).compose()); + room.sendComposer(new ItemAddMessageComposer(item, this.client.getHabbo().getHabboInfo().getUsername()).compose()); this.client.getHabbo().getInventory().getItemsComponent().removeHabboItem(item); this.client.sendResponse(new FurniListRemoveComposer(item.getGiftAdjustedId())); item.setFromGift(false); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PostItRequestDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PostItRequestDataEvent.java index 7a1d3d2b..704065be 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PostItRequestDataEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PostItRequestDataEvent.java @@ -4,7 +4,7 @@ import com.eu.habbo.habbohotel.items.interactions.InteractionPostIt; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.items.PostItDataComposer; +import com.eu.habbo.messages.outgoing.rooms.items.ItemDataUpdateMessageComposer; public class PostItRequestDataEvent extends MessageHandler { @Override @@ -17,7 +17,7 @@ public class PostItRequestDataEvent extends MessageHandler { HabboItem item = room.getHabboItem(itemId); if (item instanceof InteractionPostIt) { - this.client.sendResponse(new PostItDataComposer((InteractionPostIt) item)); + this.client.sendResponse(new ItemDataUpdateMessageComposer((InteractionPostIt) item)); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxEventOne.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxEventOne.java index ad2929f7..fdffa95c 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxEventOne.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxEventOne.java @@ -3,13 +3,13 @@ package com.eu.habbo.messages.incoming.rooms.items.jukebox; import com.eu.habbo.habbohotel.rooms.TraxManager; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxMySongsComposer; -import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxPlayListComposer; +import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeboxSongDisksMessageComposer; public class JukeBoxEventOne extends MessageHandler { @Override public void handle() throws Exception { TraxManager traxManager = this.client.getHabbo().getHabboInfo().getCurrentRoom().getTraxManager(); - this.client.sendResponse(new JukeBoxPlayListComposer(traxManager.getSongs(), traxManager.totalLength())); + this.client.sendResponse(new JukeboxSongDisksMessageComposer(traxManager.getSongs(), traxManager.totalLength())); this.client.sendResponse(new JukeBoxMySongsComposer(traxManager.myList(this.client.getHabbo()))); this.client.getHabbo().getHabboInfo().getCurrentRoom().getTraxManager().updateCurrentPlayingSong(this.client.getHabbo()); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxEventTwo.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxEventTwo.java index 15c53b0e..aee02e84 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxEventTwo.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxEventTwo.java @@ -3,13 +3,13 @@ package com.eu.habbo.messages.incoming.rooms.items.jukebox; import com.eu.habbo.habbohotel.rooms.TraxManager; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxMySongsComposer; -import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxPlayListComposer; +import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeboxSongDisksMessageComposer; public class JukeBoxEventTwo extends MessageHandler { @Override public void handle() throws Exception { TraxManager traxManager = this.client.getHabbo().getHabboInfo().getCurrentRoom().getTraxManager(); - this.client.sendResponse(new JukeBoxPlayListComposer(traxManager.getSongs(), traxManager.totalLength())); + this.client.sendResponse(new JukeboxSongDisksMessageComposer(traxManager.getSongs(), traxManager.totalLength())); this.client.sendResponse(new JukeBoxMySongsComposer(traxManager.myList(this.client.getHabbo()))); this.client.getHabbo().getHabboInfo().getCurrentRoom().getTraxManager().updateCurrentPlayingSong(this.client.getHabbo()); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxRequestPlayListEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxRequestPlayListEvent.java index a5468d59..c6fae1f2 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxRequestPlayListEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxRequestPlayListEvent.java @@ -3,13 +3,13 @@ package com.eu.habbo.messages.incoming.rooms.items.jukebox; import com.eu.habbo.habbohotel.rooms.TraxManager; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxMySongsComposer; -import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxPlayListComposer; +import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeboxSongDisksMessageComposer; public class JukeBoxRequestPlayListEvent extends MessageHandler { @Override public void handle() throws Exception { TraxManager traxManager = this.client.getHabbo().getHabboInfo().getCurrentRoom().getTraxManager(); - this.client.sendResponse(new JukeBoxPlayListComposer(traxManager.getSongs(), traxManager.totalLength())); + this.client.sendResponse(new JukeboxSongDisksMessageComposer(traxManager.getSongs(), traxManager.totalLength())); this.client.sendResponse(new JukeBoxMySongsComposer(traxManager.myList(this.client.getHabbo()))); this.client.getHabbo().getHabboInfo().getCurrentRoom().getTraxManager().updateCurrentPlayingSong(this.client.getHabbo()); } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertLimitedSoldOutComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/LimitedEditionSoldOutComposer.java similarity index 84% rename from src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertLimitedSoldOutComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/catalog/LimitedEditionSoldOutComposer.java index 5b350dc7..f56f08ab 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertLimitedSoldOutComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/LimitedEditionSoldOutComposer.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 AlertLimitedSoldOutComposer extends MessageComposer { +public class LimitedEditionSoldOutComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.LimitedEditionSoldOutComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOwnItemsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketPlaceOwnOffersComposer.java similarity index 94% rename from src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOwnItemsComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketPlaceOwnOffersComposer.java index fcd512c5..e6d06f76 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOwnItemsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketPlaceOwnOffersComposer.java @@ -10,12 +10,12 @@ import com.eu.habbo.messages.outgoing.Outgoing; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class MarketplaceOwnItemsComposer extends MessageComposer { - private static final Logger LOGGER = LoggerFactory.getLogger(MarketplaceOwnItemsComposer.class); +public class MarketPlaceOwnOffersComposer extends MessageComposer { + private static final Logger LOGGER = LoggerFactory.getLogger(MarketPlaceOwnOffersComposer.class); private final Habbo habbo; - public MarketplaceOwnItemsComposer(Habbo habbo) { + public MarketPlaceOwnOffersComposer(Habbo habbo) { this.habbo = habbo; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceBuyErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceBuyOfferResultComposer.java similarity index 86% rename from src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceBuyErrorComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceBuyOfferResultComposer.java index 7a8f1c5e..ba2ac71a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceBuyErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceBuyOfferResultComposer.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 MarketplaceBuyErrorComposer extends MessageComposer { +public class MarketplaceBuyOfferResultComposer extends MessageComposer { public static final int REFRESH = 1; public static final int SOLD_OUT = 2; public static final int UPDATES = 3; @@ -15,7 +15,7 @@ public class MarketplaceBuyErrorComposer extends MessageComposer { private final int offerId; private final int price; - public MarketplaceBuyErrorComposer(int errorCode, int unknown, int offerId, int price) { + public MarketplaceBuyOfferResultComposer(int errorCode, int unknown, int offerId, int price) { this.errorCode = errorCode; this.unknown = unknown; this.offerId = offerId; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceSellItemComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCanMakeOfferResult.java similarity index 84% rename from src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceSellItemComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCanMakeOfferResult.java index 8a702260..adca3123 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceSellItemComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCanMakeOfferResult.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 MarketplaceSellItemComposer extends MessageComposer { +public class MarketplaceCanMakeOfferResult extends MessageComposer { public static final int NOT_ALLOWED = 2; public static final int NO_TRADE_PASS = 3; public static final int NO_ADS_LEFT = 4; @@ -13,7 +13,7 @@ public class MarketplaceSellItemComposer extends MessageComposer { private final int valueA; private final int valueB; - public MarketplaceSellItemComposer(int errorCode, int valueA, int valueB) { + public MarketplaceCanMakeOfferResult(int errorCode, int valueA, int valueB) { this.errorCode = errorCode; this.valueA = valueA; this.valueB = valueB; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCancelSaleComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCancelOfferResultComposer.java similarity index 80% rename from src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCancelSaleComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCancelOfferResultComposer.java index 1a166ba1..b1f744c3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCancelSaleComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCancelOfferResultComposer.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 MarketplaceCancelSaleComposer extends MessageComposer { +public class MarketplaceCancelOfferResultComposer extends MessageComposer { private final MarketPlaceOffer offer; private final boolean success; - public MarketplaceCancelSaleComposer(MarketPlaceOffer offer, Boolean success) { + public MarketplaceCancelOfferResultComposer(MarketPlaceOffer offer, Boolean success) { this.offer = offer; this.success = success; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceConfigComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceConfigurationComposer.java similarity index 91% rename from src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceConfigComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceConfigurationComposer.java index f618acea..f81aa0b5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceConfigComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceConfigurationComposer.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 MarketplaceConfigComposer extends MessageComposer { +public class MarketplaceConfigurationComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.MarketplaceConfigurationComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemStatsComposer.java similarity index 82% rename from src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemInfoComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemStatsComposer.java index 4c020b0e..bb3a5ab5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemStatsComposer.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 MarketplaceItemInfoComposer extends MessageComposer { +public class MarketplaceItemStatsComposer extends MessageComposer { private final int itemId; - public MarketplaceItemInfoComposer(int itemId) { + public MarketplaceItemStatsComposer(int itemId) { this.itemId = itemId; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemPostedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceMakeOfferResult.java similarity index 85% rename from src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemPostedComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceMakeOfferResult.java index fea0f398..76b0e2c3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemPostedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceMakeOfferResult.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 MarketplaceItemPostedComposer extends MessageComposer { +public class MarketplaceMakeOfferResult extends MessageComposer { public static final int POST_SUCCESS = 1; public static final int FAILED_TECHNICAL_ERROR = 2; public static final int MARKETPLACE_DISABLED = 3; @@ -12,7 +12,7 @@ public class MarketplaceItemPostedComposer extends MessageComposer { private final int code; - public MarketplaceItemPostedComposer(int code) { + public MarketplaceMakeOfferResult(int code) { this.code = code; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxCloseComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysteryBoxClosingComposer.java similarity index 85% rename from src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxCloseComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysteryBoxClosingComposer.java index 9fae2095..d89f1a4c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxCloseComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysteryBoxClosingComposer.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 MysticBoxCloseComposer extends MessageComposer { +public class MysteryBoxClosingComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.MysteryBoxClosingComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxStartOpenComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysteryBoxStartComposer.java similarity index 84% rename from src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxStartOpenComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysteryBoxStartComposer.java index 242bc987..218aeb5f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxStartOpenComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysteryBoxStartComposer.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 MysticBoxStartOpenComposer extends MessageComposer { +public class MysteryBoxStartComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.MysteryBoxStartComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/MessengerErrorComposer.java similarity index 86% rename from src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestErrorComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/friends/MessengerErrorComposer.java index 7ae8ab70..1cd234b7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/MessengerErrorComposer.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 FriendRequestErrorComposer extends MessageComposer { +public class MessengerErrorComposer extends MessageComposer { public static final int FRIEND_LIST_OWN_FULL = 1; public static final int FRIEND_LIST_TARGET_FULL = 2; public static final int TARGET_NOT_ACCEPTING_REQUESTS = 3; @@ -12,7 +12,7 @@ public class FriendRequestErrorComposer extends MessageComposer { private final int errorCode; - public FriendRequestErrorComposer(int errorCode) { + public MessengerErrorComposer(int errorCode) { this.errorCode = errorCode; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendChatMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/NewConsoleMessageComposer.java similarity index 90% rename from src/main/java/com/eu/habbo/messages/outgoing/friends/FriendChatMessageComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/friends/NewConsoleMessageComposer.java index fd437bf8..0c88b6fa 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendChatMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/NewConsoleMessageComposer.java @@ -7,18 +7,18 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class FriendChatMessageComposer extends MessageComposer { +public class NewConsoleMessageComposer extends MessageComposer { private final Message message; private final int toId; private final int fromId; - public FriendChatMessageComposer(Message message) { + public NewConsoleMessageComposer(Message message) { this.message = message; this.toId = message.getFromId(); this.fromId = message.getFromId(); } - public FriendChatMessageComposer(Message message, int toId, int fromId) { + public NewConsoleMessageComposer(Message message, int toId, int fromId) { this.message = message; this.toId = toId; this.fromId = fromId; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/NewFriendRequestComposer.java similarity index 85% rename from src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/friends/NewFriendRequestComposer.java index e611c2d5..4d21ef2d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/NewFriendRequestComposer.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 FriendRequestComposer extends MessageComposer { +public class NewFriendRequestComposer extends MessageComposer { private final Habbo habbo; - public FriendRequestComposer(Habbo habbo) { + public NewFriendRequestComposer(Habbo habbo) { this.habbo = habbo; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpJoinQueueComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/JoinedQueueMessageComposer.java similarity index 80% rename from src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpJoinQueueComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/JoinedQueueMessageComposer.java index 46d1987f..4eb691cd 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpJoinQueueComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/JoinedQueueMessageComposer.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 BaseJumpJoinQueueComposer extends MessageComposer { +public class JoinedQueueMessageComposer extends MessageComposer { private final int gameId; - public BaseJumpJoinQueueComposer(int gameId) { + public JoinedQueueMessageComposer(int gameId) { this.gameId = gameId; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLeaveQueueComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/LeftQueueMessageComposer.java similarity index 86% rename from src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLeaveQueueComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/LeftQueueMessageComposer.java index bc38eb84..ac7a9b92 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLeaveQueueComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/LeftQueueMessageComposer.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 BaseJumpLeaveQueueComposer extends MessageComposer { +public class LeftQueueMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.LeftQueueMessageComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLoadGameComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/LoadGameMessageComposer.java similarity index 94% rename from src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLoadGameComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/LoadGameMessageComposer.java index 5a76ccab..38245dc5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLoadGameComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/LoadGameMessageComposer.java @@ -6,13 +6,13 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class BaseJumpLoadGameComposer extends MessageComposer { +public class LoadGameMessageComposer extends MessageComposer { public static String FASTFOOD_KEY = ""; private final GameClient client; private final int game; - public BaseJumpLoadGameComposer(GameClient client, int game) { + public LoadGameMessageComposer(GameClient client, int game) { this.client = client; this.game = game; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLoadGameURLComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/LoadGameUrlMessageComposer.java similarity index 90% rename from src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLoadGameURLComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/LoadGameUrlMessageComposer.java index 8759e73a..6f9cd00c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLoadGameURLComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/LoadGameUrlMessageComposer.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 BaseJumpLoadGameURLComposer extends MessageComposer { +public class LoadGameUrlMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.LoadGameUrlMessageComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/MinimailCountComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/MiniMailUnreadCountComposer.java similarity index 85% rename from src/main/java/com/eu/habbo/messages/outgoing/generic/MinimailCountComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/generic/MiniMailUnreadCountComposer.java index 9c7d67a0..1ad7a494 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/MinimailCountComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/MiniMailUnreadCountComposer.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 MinimailCountComposer extends MessageComposer { +public class MiniMailUnreadCountComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.MiniMailUnreadCountComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/MessagesForYouComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/MOTDNotificationComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/MessagesForYouComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/MOTDNotificationComposer.java index d4602952..beea5729 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/MessagesForYouComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/MOTDNotificationComposer.java @@ -7,16 +7,16 @@ import com.eu.habbo.messages.outgoing.Outgoing; import java.util.ArrayList; import java.util.List; -public class MessagesForYouComposer extends MessageComposer { +public class MOTDNotificationComposer extends MessageComposer { private final String[] messages; private final List newMessages; - public MessagesForYouComposer(String[] messages) { + public MOTDNotificationComposer(String[] messages) { this.messages = messages; this.newMessages = new ArrayList<>(); } - public MessagesForYouComposer(List newMessages) { + public MOTDNotificationComposer(List newMessages) { this.newMessages = newMessages; this.messages = new String[]{}; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelWillCloseInMinutesAndBackInComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/MaintenanceStatusMessageComposer.java similarity index 80% rename from src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelWillCloseInMinutesAndBackInComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/MaintenanceStatusMessageComposer.java index 1aef7f53..471afea2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelWillCloseInMinutesAndBackInComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/MaintenanceStatusMessageComposer.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 HotelWillCloseInMinutesAndBackInComposer extends MessageComposer { +public class MaintenanceStatusMessageComposer extends MessageComposer { private final int closeInMinutes; private final int reopenInMinutes; - public HotelWillCloseInMinutesAndBackInComposer(int closeInMinutes, int reopenInMinutes) { + public MaintenanceStatusMessageComposer(int closeInMinutes, int reopenInMinutes) { this.closeInMinutes = closeInMinutes; this.reopenInMinutes = reopenInMinutes; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertWIthLinkAndOpenHabboWayComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/ModeratorCautionComposer.java similarity index 78% rename from src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertWIthLinkAndOpenHabboWayComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/ModeratorCautionComposer.java index 160b93c6..385b29a9 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertWIthLinkAndOpenHabboWayComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/ModeratorCautionComposer.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 StaffAlertWIthLinkAndOpenHabboWayComposer extends MessageComposer { +public class ModeratorCautionComposer extends MessageComposer { private final String message; private final String link; - public StaffAlertWIthLinkAndOpenHabboWayComposer(String message, String link) { + public ModeratorCautionComposer(String message, String link) { this.message = message; this.link = link; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertWithLinkComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/ModeratorMessageComposer.java similarity index 81% rename from src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertWithLinkComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/ModeratorMessageComposer.java index 2814c8d4..4da87a39 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertWithLinkComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/ModeratorMessageComposer.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 StaffAlertWithLinkComposer extends MessageComposer { +public class ModeratorMessageComposer extends MessageComposer { private final String message; private final String link; - public StaffAlertWithLinkComposer(String message, String link) { + public ModeratorMessageComposer(String message, String link) { this.message = message; this.link = link; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserGiftComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserExperienceGiftOfferComposer.java similarity index 85% rename from src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserGiftComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserExperienceGiftOfferComposer.java index d2731ec0..8fddbff8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserGiftComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserExperienceGiftOfferComposer.java @@ -7,10 +7,10 @@ import com.eu.habbo.messages.outgoing.Outgoing; import java.util.List; -public class NewUserGiftComposer extends MessageComposer { +public class NewUserExperienceGiftOfferComposer extends MessageComposer { private final List> options; - public NewUserGiftComposer(List> options) { + public NewUserExperienceGiftOfferComposer(List> options) { this.options = options; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserIdentityComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NoobnessLevelMessageComposer.java similarity index 81% rename from src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserIdentityComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NoobnessLevelMessageComposer.java index 6c722542..7285e1de 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserIdentityComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NoobnessLevelMessageComposer.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 NewUserIdentityComposer extends MessageComposer { +public class NoobnessLevelMessageComposer extends MessageComposer { private final Habbo habbo; - public NewUserIdentityComposer(Habbo habbo) { + public NoobnessLevelMessageComposer(Habbo habbo) { this.habbo = habbo; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/handshake/PongComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/handshake/LatencyPingResponseMessageComposer.java similarity index 78% rename from src/main/java/com/eu/habbo/messages/outgoing/handshake/PongComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/handshake/LatencyPingResponseMessageComposer.java index 4c75370e..04d42bd0 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/handshake/PongComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/handshake/LatencyPingResponseMessageComposer.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 PongComposer extends MessageComposer { +public class LatencyPingResponseMessageComposer extends MessageComposer { private final int id; - public PongComposer(int id) { + public LatencyPingResponseMessageComposer(int id) { this.id = id; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewNextLTDAvailableComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/LimitedOfferAppearingNextMessageComposer.java similarity index 81% rename from src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewNextLTDAvailableComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/hotelview/LimitedOfferAppearingNextMessageComposer.java index 6ea30882..6b5d1c98 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewNextLTDAvailableComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/LimitedOfferAppearingNextMessageComposer.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 HotelViewNextLTDAvailableComposer extends MessageComposer { +public class LimitedOfferAppearingNextMessageComposer extends MessageComposer { private final int time; private final int pageId; private final int itemId; private final String itemName; - public HotelViewNextLTDAvailableComposer(int time, int pageId, int itemId, String itemName) { + public LimitedOfferAppearingNextMessageComposer(int time, int pageId, int itemId, String itemName) { this.time = time; this.pageId = pageId; this.itemId = itemId; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueHandledComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/IssueCloseNotificationMessageComposer.java similarity index 79% rename from src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueHandledComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/modtool/IssueCloseNotificationMessageComposer.java index fe4c5706..49e1c276 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueHandledComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/IssueCloseNotificationMessageComposer.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 ModToolIssueHandledComposer extends MessageComposer { +public class IssueCloseNotificationMessageComposer extends MessageComposer { public static final int HANDLED = 0; public static final int USELESS = 1; public static final int ABUSIVE = 2; @@ -12,12 +12,12 @@ public class ModToolIssueHandledComposer extends MessageComposer { private final int code; private final String message; - public ModToolIssueHandledComposer(int code) { + public IssueCloseNotificationMessageComposer(int code) { this.code = code; this.message = ""; } - public ModToolIssueHandledComposer(String message) { + public IssueCloseNotificationMessageComposer(String message) { this.code = 0; this.message = message; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/IssueInfoMessageComposer.java similarity index 81% rename from src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueInfoComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/modtool/IssueInfoMessageComposer.java index 7a5a65a3..a16bed18 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/IssueInfoMessageComposer.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 ModToolIssueInfoComposer extends MessageComposer { +public class IssueInfoMessageComposer extends MessageComposer { private final ModToolIssue issue; - public ModToolIssueInfoComposer(ModToolIssue issue) { + public IssueInfoMessageComposer(ModToolIssue issue) { this.issue = issue; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueUpdateComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/IssuePickFailedMessageComposer.java similarity index 80% rename from src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueUpdateComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/modtool/IssuePickFailedMessageComposer.java index 433c2d47..4c9940af 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueUpdateComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/IssuePickFailedMessageComposer.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 ModToolIssueUpdateComposer extends MessageComposer { +public class IssuePickFailedMessageComposer extends MessageComposer { private final ModToolIssue issue; - public ModToolIssueUpdateComposer(ModToolIssue issue) { + public IssuePickFailedMessageComposer(ModToolIssue issue) { this.issue = issue; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorInitMessageComposer.java similarity index 95% rename from src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorInitMessageComposer.java index b21cb4c7..25790f32 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorInitMessageComposer.java @@ -15,10 +15,10 @@ import gnu.trove.set.hash.THashSet; import java.util.Iterator; -public class ModToolComposer extends MessageComposer implements TObjectProcedure { +public class ModeratorInitMessageComposer extends MessageComposer implements TObjectProcedure { private final Habbo habbo; - public ModToolComposer(Habbo habbo) { + public ModeratorInitMessageComposer(Habbo habbo) { this.habbo = habbo; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolRoomInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorRoomInfoComposer.java similarity index 91% rename from src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolRoomInfoComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorRoomInfoComposer.java index ba8e8fd2..c8f04111 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolRoomInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorRoomInfoComposer.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 ModToolRoomInfoComposer extends MessageComposer { +public class ModeratorRoomInfoComposer extends MessageComposer { private final Room room; - public ModToolRoomInfoComposer(Room room) { + public ModeratorRoomInfoComposer(Room room) { this.room = room; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueHandlerDimensionsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorToolPreferencesComposer.java similarity index 82% rename from src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueHandlerDimensionsComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorToolPreferencesComposer.java index fcd60dff..d5d7ef5f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueHandlerDimensionsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorToolPreferencesComposer.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 ModToolIssueHandlerDimensionsComposer extends MessageComposer { +public class ModeratorToolPreferencesComposer extends MessageComposer { private final int x; private final int y; private final int width; private final int height; - public ModToolIssueHandlerDimensionsComposer(int x, int y, int width, int height) { + public ModeratorToolPreferencesComposer(int x, int y, int width, int height) { this.x = x; this.y = y; this.width = width; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorUserInfoComposer.java similarity index 96% rename from src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorUserInfoComposer.java index 6ff208d3..37d1dcb8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorUserInfoComposer.java @@ -14,12 +14,12 @@ import org.slf4j.LoggerFactory; import java.sql.*; import java.util.ArrayList; -public class ModToolUserInfoComposer extends MessageComposer { - private static final Logger LOGGER = LoggerFactory.getLogger(ModToolUserInfoComposer.class); +public class ModeratorUserInfoComposer extends MessageComposer { + private static final Logger LOGGER = LoggerFactory.getLogger(ModeratorUserInfoComposer.class); private final ResultSet set; - public ModToolUserInfoComposer(ResultSet set) { + public ModeratorUserInfoComposer(ResultSet set) { this.set = set; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/mysterybox/MysteryBoxKeysComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/mysterybox/MysteryBoxKeysMessageComposer.java similarity index 87% rename from src/main/java/com/eu/habbo/messages/outgoing/mysterybox/MysteryBoxKeysComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/mysterybox/MysteryBoxKeysMessageComposer.java index 7c6ee629..a4660301 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/mysterybox/MysteryBoxKeysComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/mysterybox/MysteryBoxKeysMessageComposer.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 MysteryBoxKeysComposer extends MessageComposer { +public class MysteryBoxKeysMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.MysteryBoxKeysMessageComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorLiftedRoomsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorLiftedRoomsComposer.java similarity index 84% rename from src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorLiftedRoomsComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorLiftedRoomsComposer.java index 5b645f1a..6cd554a7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorLiftedRoomsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorLiftedRoomsComposer.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 NewNavigatorLiftedRoomsComposer extends MessageComposer { +public class NavigatorLiftedRoomsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.NavigatorLiftedRoomsComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorMetaDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorMetaDataComposer.java similarity index 91% rename from src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorMetaDataComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorMetaDataComposer.java index 498abbad..5bb0c8c7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorMetaDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorMetaDataComposer.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 NewNavigatorMetaDataComposer extends MessageComposer { +public class NavigatorMetaDataComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.NavigatorMetaDataComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSavedSearchesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorSavedSearchesComposer.java similarity index 85% rename from src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSavedSearchesComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorSavedSearchesComposer.java index 2cd6a70d..0abaa0f6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSavedSearchesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorSavedSearchesComposer.java @@ -7,10 +7,10 @@ import com.eu.habbo.messages.outgoing.Outgoing; import java.util.List; -public class NewNavigatorSavedSearchesComposer extends MessageComposer { +public class NavigatorSavedSearchesComposer extends MessageComposer { private final List searches; - public NewNavigatorSavedSearchesComposer(List searches) { + public NavigatorSavedSearchesComposer(List searches) { this.searches = searches; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSearchResultsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorSearchResultBlocksComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSearchResultsComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorSearchResultBlocksComposer.java index c476ceec..19d509aa 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSearchResultsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorSearchResultBlocksComposer.java @@ -7,12 +7,12 @@ import com.eu.habbo.messages.outgoing.Outgoing; import java.util.List; -public class NewNavigatorSearchResultsComposer extends MessageComposer { +public class NavigatorSearchResultBlocksComposer extends MessageComposer { private final String searchCode; private final String searchQuery; private final List resultList; - public NewNavigatorSearchResultsComposer(String searchCode, String searchQuery, List resultList) { + public NavigatorSearchResultBlocksComposer(String searchCode, String searchQuery, List resultList) { this.searchCode = searchCode; this.searchQuery = searchQuery; this.resultList = resultList; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSettingsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorPreferencesComposer.java similarity index 84% rename from src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSettingsComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorPreferencesComposer.java index 021c6f32..7df2ac01 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSettingsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorPreferencesComposer.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 NewNavigatorSettingsComposer extends MessageComposer { +public class NewNavigatorPreferencesComposer extends MessageComposer { private final HabboNavigatorWindowSettings windowSettings; - public NewNavigatorSettingsComposer(HabboNavigatorWindowSettings windowSettings) { + public NewNavigatorPreferencesComposer(HabboNavigatorWindowSettings windowSettings) { this.windowSettings = windowSettings; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/OpenRoomCreationWindowComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NoOwnedRoomsAlertMessageComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/navigator/OpenRoomCreationWindowComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/navigator/NoOwnedRoomsAlertMessageComposer.java index c76a615d..9d48f6ad 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/OpenRoomCreationWindowComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NoOwnedRoomsAlertMessageComposer.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 OpenRoomCreationWindowComposer extends MessageComposer { +public class NoOwnedRoomsAlertMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.NoOwnedRoomsAlertMessageComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomMutedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/MuteAllInRoomComposer.java similarity index 82% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomMutedComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/MuteAllInRoomComposer.java index 8f0a5813..b1bcbabf 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomMutedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/MuteAllInRoomComposer.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 RoomMutedComposer extends MessageComposer { +public class MuteAllInRoomComposer extends MessageComposer { private final Room room; - public RoomMutedComposer(Room room) { + public MuteAllInRoomComposer(Room room) { this.room = room; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/AddWallItemComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemAddMessageComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/items/AddWallItemComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemAddMessageComposer.java index 73a155a3..559de05a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/AddWallItemComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemAddMessageComposer.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 AddWallItemComposer extends MessageComposer { +public class ItemAddMessageComposer extends MessageComposer { private final HabboItem item; private final String itemOwnerName; - public AddWallItemComposer(HabboItem item, String itemOwnerName) { + public ItemAddMessageComposer(HabboItem item, String itemOwnerName) { this.item = item; this.itemOwnerName = itemOwnerName; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemDataUpdateMessageComposer.java similarity index 85% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItDataComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemDataUpdateMessageComposer.java index 807064af..b7444f2a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemDataUpdateMessageComposer.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 PostItDataComposer extends MessageComposer { +public class ItemDataUpdateMessageComposer extends MessageComposer { private final InteractionPostIt postIt; - public PostItDataComposer(InteractionPostIt postIt) { + public ItemDataUpdateMessageComposer(InteractionPostIt postIt) { this.postIt = postIt; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RemoveWallItemComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemRemoveMessageComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RemoveWallItemComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemRemoveMessageComposer.java index eae46c56..d48dce53 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RemoveWallItemComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemRemoveMessageComposer.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 RemoveWallItemComposer extends MessageComposer { +public class ItemRemoveMessageComposer extends MessageComposer { private final HabboItem item; - public RemoveWallItemComposer(HabboItem item) { + public ItemRemoveMessageComposer(HabboItem item) { this.item = item; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/WallItemUpdateComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemUpdateMessageComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/items/WallItemUpdateComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemUpdateMessageComposer.java index 6774d014..7c43c7f1 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/WallItemUpdateComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemUpdateMessageComposer.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 WallItemUpdateComposer extends MessageComposer { +public class ItemUpdateMessageComposer extends MessageComposer { private final HabboItem item; - public WallItemUpdateComposer(HabboItem item) { + public ItemUpdateMessageComposer(HabboItem item) { this.item = item; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RoomWallItemsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemsComposer.java similarity index 93% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RoomWallItemsComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemsComposer.java index cf5e2886..f4463abc 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RoomWallItemsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemsComposer.java @@ -13,10 +13,10 @@ import gnu.trove.set.hash.THashSet; import java.util.Map; import java.util.NoSuchElementException; -public class RoomWallItemsComposer extends MessageComposer { +public class ItemsComposer extends MessageComposer { private final Room room; - public RoomWallItemsComposer(Room room) { + public ItemsComposer(Room room) { this.room = room; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlaylistFullComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlaylistFullMessageComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlaylistFullComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlaylistFullMessageComposer.java index 67d9ba02..0f34244a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlaylistFullComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlaylistFullMessageComposer.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 JukeBoxPlaylistFullComposer extends MessageComposer { +public class JukeBoxPlaylistFullMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.JukeBoxPlaylistFullMessageComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeboxSongDisksMessageComposer.java similarity index 85% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeboxSongDisksMessageComposer.java index 200f9097..938f4a25 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeboxSongDisksMessageComposer.java @@ -7,11 +7,11 @@ import com.eu.habbo.messages.outgoing.Outgoing; import java.util.List; -public class JukeBoxPlayListComposer extends MessageComposer { +public class JukeboxSongDisksMessageComposer extends MessageComposer { private final List songs; private final int totalLength; - public JukeBoxPlayListComposer(List songs, int totalLength) { + public JukeboxSongDisksMessageComposer(List songs, int totalLength) { this.songs = songs; this.totalLength = totalLength; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingCompleted.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/NestBreedingSuccessComposer.java similarity index 81% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingCompleted.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/NestBreedingSuccessComposer.java index 05f635e9..b5c30822 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingCompleted.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/NestBreedingSuccessComposer.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 PetBreedingCompleted extends MessageComposer { +public class NestBreedingSuccessComposer extends MessageComposer { private final int type; private final int race; - public PetBreedingCompleted(int type, int race) { + public NestBreedingSuccessComposer(int type, int race) { this.type = type; this.race = race; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRemoveRightsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/NoSuchFlatComposer.java similarity index 82% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRemoveRightsComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/users/NoSuchFlatComposer.java index c9285ef8..473dc212 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRemoveRightsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/NoSuchFlatComposer.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 RoomUserRemoveRightsComposer extends MessageComposer { +public class NoSuchFlatComposer extends MessageComposer { private final Room room; private final int habboId; - public RoomUserRemoveRightsComposer(Room room, int habboId) { + public NoSuchFlatComposer(Room room, int habboId) { this.room = room; this.habboId = habboId; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ModToolComposerOne.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/IssueDeletedMessageComposer.java similarity index 84% rename from src/main/java/com/eu/habbo/messages/outgoing/unknown/ModToolComposerOne.java rename to src/main/java/com/eu/habbo/messages/outgoing/unknown/IssueDeletedMessageComposer.java index 388d0085..fdb1a345 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ModToolComposerOne.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/IssueDeletedMessageComposer.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 ModToolComposerOne extends MessageComposer { +public class IssueDeletedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.IssueDeletedMessageComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/MinimailNewMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/MiniMailNewMessageComposer.java similarity index 85% rename from src/main/java/com/eu/habbo/messages/outgoing/unknown/MinimailNewMessageComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/unknown/MiniMailNewMessageComposer.java index 7d75edba..8a8be06b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/MinimailNewMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/MiniMailNewMessageComposer.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 MinimailNewMessageComposer extends MessageComposer { +public class MiniMailNewMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.MiniMailNewMessageComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserHomeRoomComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/NavigatorSettingsComposer.java similarity index 81% rename from src/main/java/com/eu/habbo/messages/outgoing/users/UserHomeRoomComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/users/NavigatorSettingsComposer.java index 3e1d8dfb..1f6adea7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserHomeRoomComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/NavigatorSettingsComposer.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 UserHomeRoomComposer extends MessageComposer { +public class NavigatorSettingsComposer extends MessageComposer { private final int homeRoom; private final int roomToEnter; - public UserHomeRoomComposer(int homeRoom, int roomToEnter) { + public NavigatorSettingsComposer(int homeRoom, int roomToEnter) { this.homeRoom = homeRoom; this.roomToEnter = roomToEnter; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobileNumberComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/verification/NewUserExperienceNotCompleteComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobileNumberComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/users/verification/NewUserExperienceNotCompleteComposer.java index 5df6b68c..d15056e5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobileNumberComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/verification/NewUserExperienceNotCompleteComposer.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 VerifyMobileNumberComposer extends MessageComposer { +public class NewUserExperienceNotCompleteComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.NewUserExperienceNotCompleteComposer); diff --git a/src/main/java/com/eu/habbo/messages/rcon/FriendRequest.java b/src/main/java/com/eu/habbo/messages/rcon/FriendRequest.java index f61546b6..6f649565 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/FriendRequest.java +++ b/src/main/java/com/eu/habbo/messages/rcon/FriendRequest.java @@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.users.HabboManager; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -import com.eu.habbo.messages.outgoing.friends.FriendRequestComposer; +import com.eu.habbo.messages.outgoing.friends.NewFriendRequestComposer; import com.google.gson.Gson; public class FriendRequest extends RCONMessage { @@ -26,7 +26,7 @@ public class FriendRequest extends RCONMessage { Habbo from = Emulator.getGameEnvironment().getHabboManager().getHabbo(json.user_id); if (from != null) { - target.getClient().sendResponse(new FriendRequestComposer(from)); + target.getClient().sendResponse(new NewFriendRequestComposer(from)); } else { final HabboInfo info = HabboManager.getOfflineHabboInfo(json.user_id); diff --git a/src/main/java/com/eu/habbo/messages/rcon/HotelAlert.java b/src/main/java/com/eu/habbo/messages/rcon/HotelAlert.java index 527858a9..7f3afbeb 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/HotelAlert.java +++ b/src/main/java/com/eu/habbo/messages/rcon/HotelAlert.java @@ -4,7 +4,7 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.generic.alerts.HabboBroadcastMessageComposer; -import com.eu.habbo.messages.outgoing.generic.alerts.StaffAlertWithLinkComposer; +import com.eu.habbo.messages.outgoing.generic.alerts.ModeratorMessageComposer; import com.google.gson.Gson; import java.util.Map; @@ -21,7 +21,7 @@ public class HotelAlert extends RCONMessage { if (object.url.isEmpty()) { serverMessage = new HabboBroadcastMessageComposer(object.message).compose(); } else { - serverMessage = new StaffAlertWithLinkComposer(object.message, object.url).compose(); + serverMessage = new ModeratorMessageComposer(object.message, object.url).compose(); } if (serverMessage != null) { 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 a481675f..442ec6af 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/UpdateCatalog.java +++ b/src/main/java/com/eu/habbo/messages/rcon/UpdateCatalog.java @@ -2,7 +2,7 @@ package com.eu.habbo.messages.rcon; import com.eu.habbo.Emulator; import com.eu.habbo.messages.outgoing.catalog.*; -import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceConfigComposer; +import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceConfigurationComposer; import com.google.gson.Gson; public class UpdateCatalog extends RCONMessage { @@ -17,7 +17,7 @@ public class UpdateCatalog extends RCONMessage 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()); + Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new MarketplaceConfigurationComposer()); Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new GiftWrappingConfigurationComposer()); Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new RecyclerLogicComposer()); Emulator.getGameEnvironment().getCraftingManager().reload(); diff --git a/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraAuthenticationTicketEvent.java b/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraAuthenticationTicketEvent.java index 08f10147..7855a004 100644 --- a/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraAuthenticationTicketEvent.java +++ b/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraAuthenticationTicketEvent.java @@ -1,6 +1,6 @@ package com.eu.habbo.networking.camera.messages.incoming; -import com.eu.habbo.messages.outgoing.gamecenter.basejump.BaseJumpLoadGameComposer; +import com.eu.habbo.messages.outgoing.gamecenter.basejump.LoadGameMessageComposer; import com.eu.habbo.networking.camera.CameraIncomingMessage; import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; @@ -15,7 +15,7 @@ public class CameraAuthenticationTicketEvent extends CameraIncomingMessage { String ticket = this.readString(); if (ticket.startsWith("FASTFOOD")) { - BaseJumpLoadGameComposer.FASTFOOD_KEY = ticket; + LoadGameMessageComposer.FASTFOOD_KEY = ticket; } } }