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 b4336c5d..6f20553c 100644 --- a/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java @@ -27,7 +27,7 @@ import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer; import com.eu.habbo.messages.outgoing.modtool.ModToolIssueHandledComposer; import com.eu.habbo.messages.outgoing.users.BadgeReceivedComposer; import com.eu.habbo.messages.outgoing.users.CreditBalanceComposer; -import com.eu.habbo.messages.outgoing.users.UserPointsComposer; +import com.eu.habbo.messages.outgoing.users.HabboActivityPointNotificationMessageComposer; import com.eu.habbo.plugin.events.emulator.EmulatorLoadCatalogManagerEvent; import com.eu.habbo.plugin.events.users.catalog.UserCatalogFurnitureBoughtEvent; import com.eu.habbo.plugin.events.users.catalog.UserCatalogItemPurchasedEvent; @@ -547,7 +547,7 @@ public class CatalogManager { if (voucher.points > 0) { client.getHabbo().getHabboInfo().addCurrencyAmount(voucher.pointsType, voucher.points); - client.sendResponse(new UserPointsComposer(client.getHabbo().getHabboInfo().getCurrencyAmount(voucher.pointsType), voucher.points, voucher.pointsType)); + client.sendResponse(new HabboActivityPointNotificationMessageComposer(client.getHabbo().getHabboInfo().getCurrencyAmount(voucher.pointsType), voucher.points, voucher.pointsType)); } if (voucher.credits > 0) { @@ -1078,7 +1078,7 @@ public class CatalogManager { if (!free && !habbo.getClient().getHabbo().hasPermission(Permission.ACC_INFINITE_POINTS)) { if (purchasedEvent.totalPoints > 0) { habbo.getClient().getHabbo().getHabboInfo().addCurrencyAmount(item.getPointsType(), -purchasedEvent.totalPoints); - habbo.getClient().sendResponse(new UserPointsComposer(habbo.getClient().getHabbo().getHabboInfo().getCurrencyAmount(item.getPointsType()), -purchasedEvent.totalPoints, item.getPointsType())); + habbo.getClient().sendResponse(new HabboActivityPointNotificationMessageComposer(habbo.getClient().getHabbo().getHabboInfo().getCurrencyAmount(item.getPointsType()), -purchasedEvent.totalPoints, item.getPointsType())); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/CalendarCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/CalendarCommand.java index 92e3467c..0732c15b 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/CalendarCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/CalendarCommand.java @@ -4,7 +4,7 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.campaign.calendar.CalendarCampaign; import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.messages.outgoing.events.calendar.CampaignCalendarDataMessageComposer; -import com.eu.habbo.messages.outgoing.habboway.nux.NuxAlertComposer; +import com.eu.habbo.messages.outgoing.habboway.nux.InClientLinkMessageComposer; import java.sql.Timestamp; import java.util.Date; @@ -33,7 +33,7 @@ public class CalendarCommand extends Command { if (daysBetween >= 0) { gameClient.sendResponse(new CampaignCalendarDataMessageComposer(campaign.getName(), campaign.getImage(), campaign.getTotalDays(), daysBetween, gameClient.getHabbo().getHabboStats().calendarRewardsClaimed, campaign.getLockExpired())); - gameClient.sendResponse(new NuxAlertComposer("openView/calendar")); + gameClient.sendResponse(new InClientLinkMessageComposer("openView/calendar")); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/HappyHourCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/HappyHourCommand.java index 845195d6..fc735970 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/HappyHourCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/HappyHourCommand.java @@ -4,7 +4,7 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.achievements.AchievementManager; import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.users.Habbo; -import com.eu.habbo.messages.outgoing.generic.alerts.GenericAlertComposer; +import com.eu.habbo.messages.outgoing.generic.alerts.HabboBroadcastMessageComposer; import java.util.Map; @@ -15,7 +15,7 @@ public class HappyHourCommand extends Command { @Override public boolean handle(GameClient gameClient, String[] params) throws Exception { - Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new GenericAlertComposer("Happy Hour!")); + Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new HabboBroadcastMessageComposer("Happy Hour!")); for (Map.Entry set : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().entrySet()) { AchievementManager.progressAchievement(set.getValue(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("HappyHour")); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/MuteCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/MuteCommand.java index 24425e2c..0d41a472 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/MuteCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/MuteCommand.java @@ -4,7 +4,7 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles; import com.eu.habbo.habbohotel.users.Habbo; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserIgnoredComposer; +import com.eu.habbo.messages.outgoing.rooms.users.IgnoreResultMessageComposer; public class MuteCommand extends Command { public MuteCommand() { @@ -46,7 +46,7 @@ public class MuteCommand extends Command { habbo.mute(duration, false); if (habbo.getHabboInfo().getCurrentRoom() != null) { - habbo.getHabboInfo().getCurrentRoom().sendComposer(new RoomUserIgnoredComposer(habbo, RoomUserIgnoredComposer.MUTED).compose()); //: RoomUserIgnoredComposer.UNIGNORED + habbo.getHabboInfo().getCurrentRoom().sendComposer(new IgnoreResultMessageComposer(habbo, IgnoreResultMessageComposer.MUTED).compose()); //: RoomUserIgnoredComposer.UNIGNORED } gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_mute.muted").replace("%user%", params[1]), RoomChatMessageBubbles.ALERT); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/RoomKickCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/RoomKickCommand.java index 3610e06a..a3fd6985 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/RoomKickCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/RoomKickCommand.java @@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.permissions.Permission; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.Habbo; -import com.eu.habbo.messages.outgoing.generic.alerts.GenericAlertComposer; +import com.eu.habbo.messages.outgoing.generic.alerts.HabboBroadcastMessageComposer; public class RoomKickCommand extends Command { public RoomKickCommand() { @@ -21,7 +21,7 @@ public class RoomKickCommand extends Command { for (int i = 1; i < params.length; i++) { message.append(params[i]).append(" "); } - room.sendComposer(new GenericAlertComposer(message + "\r\n-" + gameClient.getHabbo().getHabboInfo().getUsername()).compose()); + room.sendComposer(new HabboBroadcastMessageComposer(message + "\r\n-" + gameClient.getHabbo().getHabboInfo().getUsername()).compose()); } for (Habbo habbo : room.getHabbos()) { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/ShutdownCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/ShutdownCommand.java index 7abeea65..25194479 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/ShutdownCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/ShutdownCommand.java @@ -4,7 +4,7 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.rooms.RoomTrade; import com.eu.habbo.messages.ServerMessage; -import com.eu.habbo.messages.outgoing.generic.alerts.GenericAlertComposer; +import com.eu.habbo.messages.outgoing.generic.alerts.HabboBroadcastMessageComposer; import com.eu.habbo.messages.outgoing.generic.alerts.HotelWillCloseInMinutesComposer; import com.eu.habbo.threading.runnables.ShutdownEmulator; @@ -34,7 +34,7 @@ public class ShutdownCommand extends Command { ServerMessage message; if (!reason.toString().equals("-")) { - message = new GenericAlertComposer("" + Emulator.getTexts().getValue("generic.warning") + " \r\n" + + message = new HabboBroadcastMessageComposer("" + Emulator.getTexts().getValue("generic.warning") + " \r\n" + Emulator.getTexts().getValue("generic.shutdown").replace("%minutes%", minutes + "") + "\r\n" + Emulator.getTexts().getValue("generic.reason.specified") + ": " + reason + "\r" + "\r" + diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/StalkCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/StalkCommand.java index de6bde54..b4dad5c4 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/StalkCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/StalkCommand.java @@ -4,7 +4,7 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles; import com.eu.habbo.habbohotel.users.Habbo; -import com.eu.habbo.messages.outgoing.rooms.RoomDataComposer; +import com.eu.habbo.messages.outgoing.rooms.GetGuestRoomResultComposer; public class StalkCommand extends Command { public StalkCommand() { @@ -39,7 +39,7 @@ public class StalkCommand extends Command { return true; } - gameClient.sendResponse(new RoomDataComposer(habbo.getHabboInfo().getCurrentRoom(), gameClient.getHabbo(), true, false)); + gameClient.sendResponse(new GetGuestRoomResultComposer(habbo.getHabboInfo().getCurrentRoom(), gameClient.getHabbo(), true, false)); //gameClient.sendResponse(new ForwardToRoomComposer(habbo.getHabboInfo().getCurrentRoom().getId())); return true; } else { 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 fd6ffcfd..67e00a04 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateCatalogCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateCatalogCommand.java @@ -19,7 +19,7 @@ public class UpdateCatalogCommand extends Command { Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new BuildersClubFurniCountMessageComposer(0)); Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new BundleDiscountRulesetMessageComposer()); Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new MarketplaceConfigComposer()); - Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new GiftConfigurationComposer()); + Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new GiftWrappingConfigurationComposer()); Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new RecyclerLogicComposer()); Emulator.getGameEnvironment().getCraftingManager().reload(); gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_update_catalog"), RoomChatMessageBubbles.ALERT); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateItemsCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateItemsCommand.java index 073b2517..e5570e20 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateItemsCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateItemsCommand.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.rooms.RoomRelativeMapComposer; +import com.eu.habbo.messages.outgoing.rooms.HeightMapComposer; public class UpdateItemsCommand extends Command { public UpdateItemsCommand() { @@ -20,7 +20,7 @@ public class UpdateItemsCommand extends Command { synchronized (Emulator.getGameEnvironment().getRoomManager().getActiveRooms()) { for (Room room : Emulator.getGameEnvironment().getRoomManager().getActiveRooms()) { if (room.isLoaded() && room.getUserCount() > 0 && room.getLayout() != null) { - room.sendComposer(new RoomRelativeMapComposer(room).compose()); + room.sendComposer(new HeightMapComposer(room).compose()); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateYoutubePlaylistsCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateYoutubePlaylistsCommand.java index 94dcf7b3..8811c016 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateYoutubePlaylistsCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateYoutubePlaylistsCommand.java @@ -2,9 +2,7 @@ package com.eu.habbo.habbohotel.commands; 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.rooms.RoomRelativeMapComposer; public class UpdateYoutubePlaylistsCommand extends Command { public UpdateYoutubePlaylistsCommand() { diff --git a/src/main/java/com/eu/habbo/habbohotel/games/freeze/FreezeGamePlayer.java b/src/main/java/com/eu/habbo/habbohotel/games/freeze/FreezeGamePlayer.java index d425a612..a701a023 100644 --- a/src/main/java/com/eu/habbo/habbohotel/games/freeze/FreezeGamePlayer.java +++ b/src/main/java/com/eu/habbo/habbohotel/games/freeze/FreezeGamePlayer.java @@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.achievements.AchievementManager; import com.eu.habbo.habbohotel.games.GamePlayer; import com.eu.habbo.habbohotel.games.GameTeamColors; import com.eu.habbo.habbohotel.users.Habbo; -import com.eu.habbo.messages.outgoing.rooms.FreezeLivesComposer; +import com.eu.habbo.messages.outgoing.rooms.GamePlayerValueMessageComposer; public class FreezeGamePlayer extends GamePlayer { public boolean nextDiagonal; @@ -50,7 +50,7 @@ public class FreezeGamePlayer extends GamePlayer { public void addLife() { if (this.lives < FreezeGame.MAX_LIVES) { this.lives++; - super.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new FreezeLivesComposer(this).compose()); + super.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new GamePlayerValueMessageComposer(this).compose()); } } @@ -65,7 +65,7 @@ public class FreezeGamePlayer extends GamePlayer { game.playerDies(this); } } else { - super.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new FreezeLivesComposer(this).compose()); + super.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new GamePlayerValueMessageComposer(this).compose()); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/guides/GuardianTicket.java b/src/main/java/com/eu/habbo/habbohotel/guides/GuardianTicket.java index 571afc85..a0cbd115 100644 --- a/src/main/java/com/eu/habbo/habbohotel/guides/GuardianTicket.java +++ b/src/main/java/com/eu/habbo/habbohotel/guides/GuardianTicket.java @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.modtool.ModToolIssue; import com.eu.habbo.habbohotel.modtool.ModToolTicketType; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.outgoing.guardians.*; -import com.eu.habbo.messages.outgoing.guides.BullyReportClosedComposer; +import com.eu.habbo.messages.outgoing.guides.GuideTicketResolutionMessageComposer; import com.eu.habbo.threading.runnables.GuardianNotAccepted; import com.eu.habbo.threading.runnables.GuardianVotingFinish; import gnu.trove.map.hash.THashMap; @@ -120,7 +120,7 @@ public class GuardianTicket { Emulator.getGameEnvironment().getModToolManager().addTicket(issue); Emulator.getGameEnvironment().getModToolManager().updateTicketToMods(issue); - this.reporter.getClient().sendResponse(new BullyReportClosedComposer(BullyReportClosedComposer.CLOSED)); + this.reporter.getClient().sendResponse(new GuideTicketResolutionMessageComposer(GuideTicketResolutionMessageComposer.CLOSED)); } else { this.timeLeft = 30; Emulator.getThreading().run(new GuardianVotingFinish(this), 10000); @@ -142,9 +142,9 @@ public class GuardianTicket { Emulator.getGameEnvironment().getGuideManager().closeTicket(this); if (this.verdict == GuardianVoteType.ACCEPTABLY) - this.reporter.getClient().sendResponse(new BullyReportClosedComposer(BullyReportClosedComposer.MISUSE)); + this.reporter.getClient().sendResponse(new GuideTicketResolutionMessageComposer(GuideTicketResolutionMessageComposer.MISUSE)); else - this.reporter.getClient().sendResponse(new BullyReportClosedComposer(BullyReportClosedComposer.CLOSED)); + this.reporter.getClient().sendResponse(new GuideTicketResolutionMessageComposer(GuideTicketResolutionMessageComposer.CLOSED)); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/guides/GuideManager.java b/src/main/java/com/eu/habbo/habbohotel/guides/GuideManager.java index 4407f81b..eb0189cb 100644 --- a/src/main/java/com/eu/habbo/habbohotel/guides/GuideManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/guides/GuideManager.java @@ -69,8 +69,8 @@ public class GuideManager { if (!tour.hasDeclined(set.getKey().getHabboInfo().getId())) { tour.checkSum++; tour.setHelper(set.getKey()); - set.getKey().getClient().sendResponse(new GuideSessionAttachedComposer(tour, true)); - tour.getNoob().getClient().sendResponse(new GuideSessionAttachedComposer(tour, false)); + set.getKey().getClient().sendResponse(new GuideSessionAttachedMessageComposer(tour, true)); + tour.getNoob().getClient().sendResponse(new GuideSessionAttachedMessageComposer(tour, false)); Emulator.getThreading().run(new GuideFindNewHelper(tour, set.getKey()), 60000); this.activeTours.add(tour); return true; @@ -79,7 +79,7 @@ public class GuideManager { } } this.endSession(tour); - tour.getNoob().getClient().sendResponse(new GuideSessionErrorComposer(GuideSessionErrorComposer.NO_HELPERS_AVAILABLE)); + tour.getNoob().getClient().sendResponse(new GuideSessionErrorMessageComposer(GuideSessionErrorMessageComposer.NO_HELPERS_AVAILABLE)); return false; } @@ -89,11 +89,11 @@ public class GuideManager { Habbo helper = tour.getHelper(); tour.addDeclinedHelper(tour.getHelper().getHabboInfo().getId()); tour.setHelper(null); - helper.getClient().sendResponse(new GuideSessionEndedComposer(GuideSessionEndedComposer.HELP_CASE_CLOSED)); - helper.getClient().sendResponse(new GuideSessionDetachedComposer()); + helper.getClient().sendResponse(new GuideSessionEndedMessageComposer(GuideSessionEndedMessageComposer.HELP_CASE_CLOSED)); + helper.getClient().sendResponse(new GuideSessionDetachedMessageComposer()); if (!this.findHelper(tour)) { this.endSession(tour); - tour.getNoob().getClient().sendResponse(new GuideSessionErrorComposer(GuideSessionErrorComposer.NO_HELPERS_AVAILABLE)); + tour.getNoob().getClient().sendResponse(new GuideSessionErrorMessageComposer(GuideSessionErrorMessageComposer.NO_HELPERS_AVAILABLE)); } } @@ -116,14 +116,14 @@ public class GuideManager { public void endSession(GuideTour tour) { synchronized (this.activeTours) { synchronized (this.activeHelpers) { - tour.getNoob().getClient().sendResponse(new GuideSessionEndedComposer(GuideSessionEndedComposer.HELP_CASE_CLOSED)); + tour.getNoob().getClient().sendResponse(new GuideSessionEndedMessageComposer(GuideSessionEndedMessageComposer.HELP_CASE_CLOSED)); tour.end(); if (tour.getHelper() != null) { this.activeHelpers.put(tour.getHelper(), false); - tour.getHelper().getClient().sendResponse(new GuideSessionEndedComposer(GuideSessionEndedComposer.HELP_CASE_CLOSED)); - tour.getHelper().getClient().sendResponse(new GuideSessionDetachedComposer()); - tour.getHelper().getClient().sendResponse(new GuideToolsComposer(true)); + tour.getHelper().getClient().sendResponse(new GuideSessionEndedMessageComposer(GuideSessionEndedMessageComposer.HELP_CASE_CLOSED)); + tour.getHelper().getClient().sendResponse(new GuideSessionDetachedMessageComposer()); + tour.getHelper().getClient().sendResponse(new GuideOnDutyStatusMessageComposer(true)); } } } @@ -133,7 +133,7 @@ public class GuideManager { public void recommend(GuideTour tour, boolean recommend) { synchronized (this.activeTours) { tour.setWouldRecommend(recommend ? GuideRecommendStatus.YES : GuideRecommendStatus.NO); - tour.getNoob().getClient().sendResponse(new GuideSessionDetachedComposer()); + tour.getNoob().getClient().sendResponse(new GuideSessionDetachedMessageComposer()); AchievementManager.progressAchievement(tour.getNoob(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("GuideFeedbackGiver")); this.activeTours.remove(tour); diff --git a/src/main/java/com/eu/habbo/habbohotel/guilds/GuildManager.java b/src/main/java/com/eu/habbo/habbohotel/guilds/GuildManager.java index 2f84660d..eebd19a8 100644 --- a/src/main/java/com/eu/habbo/habbohotel/guilds/GuildManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/guilds/GuildManager.java @@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.guilds.forums.ForumView; import com.eu.habbo.habbohotel.items.interactions.InteractionGuildFurni; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.Habbo; -import com.eu.habbo.messages.outgoing.guilds.GuildJoinErrorComposer; +import com.eu.habbo.messages.outgoing.guilds.HabboGroupJoinFailedMessageComposer; import gnu.trove.TCollections; import gnu.trove.iterator.TIntObjectIterator; import gnu.trove.map.TIntObjectMap; @@ -199,9 +199,9 @@ public class GuildManager { if (set.getInt(1) >= 100) { //TODO Add non acceptRequest errors. See Outgoing.GroupEditFailComposer if (userId == 0) - client.sendResponse(new GuildJoinErrorComposer(GuildJoinErrorComposer.GROUP_LIMIT_EXCEED)); + client.sendResponse(new HabboGroupJoinFailedMessageComposer(HabboGroupJoinFailedMessageComposer.GROUP_LIMIT_EXCEED)); else - client.sendResponse(new GuildJoinErrorComposer(GuildJoinErrorComposer.MEMBER_FAIL_JOIN_LIMIT_EXCEED_NON_HC)); + client.sendResponse(new HabboGroupJoinFailedMessageComposer(HabboGroupJoinFailedMessageComposer.MEMBER_FAIL_JOIN_LIMIT_EXCEED_NON_HC)); error = true; } @@ -215,7 +215,7 @@ public class GuildManager { try (ResultSet set = statement.executeQuery()) { if (set.next()) { if (set.getInt(1) >= 50000) { - client.sendResponse(new GuildJoinErrorComposer(GuildJoinErrorComposer.GROUP_FULL)); + client.sendResponse(new HabboGroupJoinFailedMessageComposer(HabboGroupJoinFailedMessageComposer.GROUP_FULL)); error = true; } } @@ -229,7 +229,7 @@ public class GuildManager { try (ResultSet set = statement.executeQuery()) { if (set.next()) { if (set.getInt(1) >= 100) { - client.sendResponse(new GuildJoinErrorComposer(GuildJoinErrorComposer.GROUP_NOT_ACCEPT_REQUESTS)); + client.sendResponse(new HabboGroupJoinFailedMessageComposer(HabboGroupJoinFailedMessageComposer.GROUP_NOT_ACCEPT_REQUESTS)); error = true; } } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionInformationTerminal.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionInformationTerminal.java index e4b3a793..205f817d 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionInformationTerminal.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionInformationTerminal.java @@ -4,7 +4,7 @@ import com.eu.habbo.habbohotel.items.Item; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomUnit; import com.eu.habbo.habbohotel.users.Habbo; -import com.eu.habbo.messages.outgoing.habboway.nux.NuxAlertComposer; +import com.eu.habbo.messages.outgoing.habboway.nux.InClientLinkMessageComposer; import gnu.trove.map.hash.THashMap; import java.sql.ResultSet; @@ -31,7 +31,7 @@ public class InteractionInformationTerminal extends InteractionCustomValues { Habbo habbo = room.getHabbo(roomUnit); if (habbo != null && this.values.containsKey("internalLink")) { - habbo.getClient().sendResponse(new NuxAlertComposer(this.values.get("internalLink"))); + habbo.getClient().sendResponse(new InClientLinkMessageComposer(this.values.get("internalLink"))); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/pets/actions/ActionBreed.java b/src/main/java/com/eu/habbo/habbohotel/pets/actions/ActionBreed.java index 83ec6207..a6f014dd 100644 --- a/src/main/java/com/eu/habbo/habbohotel/pets/actions/ActionBreed.java +++ b/src/main/java/com/eu/habbo/habbohotel/pets/actions/ActionBreed.java @@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.pets.PetAction; import com.eu.habbo.habbohotel.pets.PetTasks; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; -import com.eu.habbo.messages.outgoing.rooms.pets.breeding.PetBreedingStartFailedComposer; +import com.eu.habbo.messages.outgoing.rooms.pets.breeding.GoToBreedingNestFailureComposer; import org.apache.commons.lang3.StringUtils; public class ActionBreed extends PetAction { @@ -31,7 +31,7 @@ public class ActionBreed extends PetAction { return true; } else { - habbo.getClient().sendResponse(new PetBreedingStartFailedComposer(PetBreedingStartFailedComposer.NO_NESTS)); + habbo.getClient().sendResponse(new GoToBreedingNestFailureComposer(GoToBreedingNestFailureComposer.NO_NESTS)); } return false; 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 5076b21c..a426512e 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java @@ -36,8 +36,8 @@ import com.eu.habbo.habbohotel.wired.WiredTriggerType; import com.eu.habbo.messages.ISerialize; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; -import com.eu.habbo.messages.outgoing.generic.alerts.GenericAlertComposer; -import com.eu.habbo.messages.outgoing.generic.alerts.GenericErrorMessagesComposer; +import com.eu.habbo.messages.outgoing.generic.alerts.HabboBroadcastMessageComposer; +import com.eu.habbo.messages.outgoing.generic.alerts.GenericErrorComposer; import com.eu.habbo.messages.outgoing.guilds.GuildInfoComposer; import com.eu.habbo.messages.outgoing.hotelview.CloseConnectionMessageComposer; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; @@ -561,7 +561,7 @@ public class Room implements Comparable, ISerialize, Runnable { tile.setState(this.calculateTileState(tile)); } - this.sendComposer(new UpdateStackHeightComposer(this, tiles).compose()); + this.sendComposer(new HeightMapUpdateMessageComposer(this, tiles).compose()); } private RoomTileState calculateTileState(RoomTile tile) { @@ -693,7 +693,7 @@ public class Room implements Comparable, ISerialize, Runnable { } } } - this.sendComposer(new UpdateStackHeightComposer(this, updatedTiles).compose()); + this.sendComposer(new HeightMapUpdateMessageComposer(this, updatedTiles).compose()); this.updateTiles(updatedTiles); for (RoomTile tile : updatedTiles) { this.updateHabbosAt(tile.x, tile.y); @@ -1245,7 +1245,7 @@ public class Room implements Comparable, ISerialize, Runnable { if (habbo.getHabboStats().mutedBubbleTracker && habbo.getHabboStats().allowTalk()) { habbo.getHabboStats().mutedBubbleTracker = false; - this.sendComposer(new RoomUserIgnoredComposer(habbo, RoomUserIgnoredComposer.UNIGNORED).compose()); + this.sendComposer(new IgnoreResultMessageComposer(habbo, IgnoreResultMessageComposer.UNIGNORED).compose()); } // Substract 1 from the chatCounter every odd cycle, which is every (500ms * 2). @@ -2652,7 +2652,7 @@ public class Room implements Comparable, ISerialize, Runnable { public void kickHabbo(Habbo habbo, boolean alert) { if (alert) { - habbo.getClient().sendResponse(new GenericErrorMessagesComposer(GenericErrorMessagesComposer.KICKED_OUT_OF_THE_ROOM)); + habbo.getClient().sendResponse(new GenericErrorComposer(GenericErrorComposer.KICKED_OUT_OF_THE_ROOM)); } habbo.getRoomUnit().isKicked = true; @@ -4430,7 +4430,7 @@ public class Room implements Comparable, ISerialize, Runnable { } public void alert(String message) { - this.sendComposer(new GenericAlertComposer(message).compose()); + this.sendComposer(new HabboBroadcastMessageComposer(message).compose()); } public int itemCount() { 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 c7a4f4e0..1ecc40fa 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java @@ -29,7 +29,7 @@ import com.eu.habbo.habbohotel.users.*; import com.eu.habbo.habbohotel.wired.WiredHandler; import com.eu.habbo.habbohotel.wired.WiredTriggerType; import com.eu.habbo.messages.incoming.users.UserNuxEvent; -import com.eu.habbo.messages.outgoing.generic.alerts.GenericErrorMessagesComposer; +import com.eu.habbo.messages.outgoing.generic.alerts.GenericErrorComposer; import com.eu.habbo.messages.outgoing.hotelview.CloseConnectionMessageComposer; import com.eu.habbo.messages.outgoing.polls.PollStartComposer; import com.eu.habbo.messages.outgoing.polls.infobus.SimplePollAnswersComposer; @@ -560,7 +560,7 @@ public class RoomManager { if (room.getPassword().equalsIgnoreCase(password)) this.openRoom(habbo, room, doorLocation); else { - habbo.getClient().sendResponse(new GenericErrorMessagesComposer(GenericErrorMessagesComposer.WRONG_PASSWORD_USED)); + habbo.getClient().sendResponse(new GenericErrorComposer(GenericErrorComposer.WRONG_PASSWORD_USED)); habbo.getClient().sendResponse(new CloseConnectionMessageComposer()); habbo.getHabboInfo().setLoadingRoom(0); } @@ -752,7 +752,7 @@ public class RoomManager { Guild guild = Emulator.getGameEnvironment().getGuildManager().getGuild(habbo.getHabboStats().guild); if (guild != null) { - room.sendComposer(new RoomUsersAddGuildBadgeComposer(guild).compose()); + room.sendComposer(new HabboAddGroupBadgesMessageComposer(guild).compose()); } } @@ -783,7 +783,7 @@ public class RoomManager { habbo.getClient().sendResponse(new RoomThicknessComposer(room)); - habbo.getClient().sendResponse(new RoomDataComposer(room, habbo.getClient().getHabbo(), false, true)); + habbo.getClient().sendResponse(new GetGuestRoomResultComposer(room, habbo.getClient().getHabbo(), false, true)); habbo.getClient().sendResponse(new RoomWallItemsComposer(room)); { @@ -830,7 +830,7 @@ public class RoomManager { int remainingMuteTime = habbo.getHabboStats().remainingMuteTime(); habbo.getClient().sendResponse(new FloodControlMessageComposer(remainingMuteTime)); habbo.getClient().sendResponse(new MutedWhisperComposer(remainingMuteTime)); - room.sendComposer(new RoomUserIgnoredComposer(habbo, RoomUserIgnoredComposer.MUTED).compose()); + room.sendComposer(new IgnoreResultMessageComposer(habbo, IgnoreResultMessageComposer.MUTED).compose()); } else if (habbo.getHabboStats().mutedBubbleTracker) { habbo.getHabboStats().mutedBubbleTracker = false; } @@ -855,13 +855,13 @@ public class RoomManager { } if (roomHabbo.getHabboStats().userIgnored(habbo.getHabboInfo().getId())) { - roomHabbo.getClient().sendResponse(new RoomUserIgnoredComposer(habbo, RoomUserIgnoredComposer.IGNORED)); + roomHabbo.getClient().sendResponse(new IgnoreResultMessageComposer(habbo, IgnoreResultMessageComposer.IGNORED)); } if (!roomHabbo.getHabboStats().allowTalk()) { - habbo.getClient().sendResponse(new RoomUserIgnoredComposer(roomHabbo, RoomUserIgnoredComposer.MUTED)); + habbo.getClient().sendResponse(new IgnoreResultMessageComposer(roomHabbo, IgnoreResultMessageComposer.MUTED)); } else if (habbo.getHabboStats().userIgnored(roomHabbo.getHabboInfo().getId())) { - habbo.getClient().sendResponse(new RoomUserIgnoredComposer(roomHabbo, RoomUserIgnoredComposer.IGNORED)); + habbo.getClient().sendResponse(new IgnoreResultMessageComposer(roomHabbo, IgnoreResultMessageComposer.IGNORED)); } if (roomHabbo.getHabboStats().guild != 0 && !guildBadges.containsKey(roomHabbo.getHabboStats().guild)) { @@ -883,7 +883,7 @@ public class RoomManager { } } - habbo.getClient().sendResponse(new RoomUsersGuildBadgesComposer(guildBadges)); + habbo.getClient().sendResponse(new HabboGroupBadgesMessageComposer(guildBadges)); if (room.hasRights(habbo) || (room.hasGuild() && room.getGuildRightLevel(habbo).isEqualOrGreaterThan(RoomRightLevels.GUILD_RIGHTS))) { if (!room.getHabboQueue().isEmpty()) { 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 111194e2..9673d1b8 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java @@ -265,7 +265,7 @@ public class Habbo implements Runnable { this.getHabboInfo().addCurrencyAmount(event.type, event.points); if (this.client != null) - this.client.sendResponse(new UserPointsComposer(this.client.getHabbo().getHabboInfo().getCurrencyAmount(type), event.points, event.type)); + this.client.sendResponse(new HabboActivityPointNotificationMessageComposer(this.client.getHabbo().getHabboInfo().getCurrencyAmount(type), event.points, event.type)); } @@ -309,7 +309,7 @@ public class Habbo implements Runnable { if (Emulator.getConfig().getBoolean("hotel.alert.oldstyle")) { this.client.sendResponse(new MessagesForYouComposer(new String[]{message})); } else { - this.client.sendResponse(new GenericAlertComposer(message)); + this.client.sendResponse(new HabboBroadcastMessageComposer(message)); } } @@ -421,7 +421,7 @@ public class Habbo implements Runnable { Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); if (room != null && !isFlood) { - room.sendComposer(new RoomUserIgnoredComposer(this, RoomUserIgnoredComposer.MUTED).compose()); + room.sendComposer(new IgnoreResultMessageComposer(this, IgnoreResultMessageComposer.MUTED).compose()); } } } @@ -431,7 +431,7 @@ public class Habbo implements Runnable { this.client.sendResponse(new FloodControlMessageComposer(3)); Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); if (room != null) { - room.sendComposer(new RoomUserIgnoredComposer(this, RoomUserIgnoredComposer.UNIGNORED).compose()); + room.sendComposer(new IgnoreResultMessageComposer(this, IgnoreResultMessageComposer.UNIGNORED).compose()); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/users/HabboManager.java b/src/main/java/com/eu/habbo/habbohotel/users/HabboManager.java index aeacaa4b..86e7300e 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/HabboManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/HabboManager.java @@ -7,7 +7,7 @@ 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.generic.alerts.GenericAlertComposer; +import com.eu.habbo.messages.outgoing.generic.alerts.HabboBroadcastMessageComposer; import com.eu.habbo.messages.outgoing.modtool.ModToolComposer; import com.eu.habbo.messages.outgoing.users.UserPerksComposer; import com.eu.habbo.messages.outgoing.users.UserPermissionsComposer; @@ -278,7 +278,7 @@ public class HabboManager { habbo.getClient().sendResponse(new BuildersClubFurniCountMessageComposer(0)); habbo.getClient().sendResponse(new BundleDiscountRulesetMessageComposer()); habbo.getClient().sendResponse(new MarketplaceConfigComposer()); - habbo.getClient().sendResponse(new GiftConfigurationComposer()); + 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())); } else { @@ -311,7 +311,7 @@ public class HabboManager { public void staffAlert(String message) { message = Emulator.getTexts().getValue("commands.generic.cmd_staffalert.title") + "\r\n" + message; - ServerMessage msg = new GenericAlertComposer(message).compose(); + ServerMessage msg = new HabboBroadcastMessageComposer(message).compose(); Emulator.getGameEnvironment().getHabboManager().sendPacketToHabbosWithPermission(msg, "cmd_staffalert"); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/users/subscriptions/SubscriptionHabboClub.java b/src/main/java/com/eu/habbo/habbohotel/users/subscriptions/SubscriptionHabboClub.java index 63163bd0..efc3ba81 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/subscriptions/SubscriptionHabboClub.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/subscriptions/SubscriptionHabboClub.java @@ -383,7 +383,7 @@ public class SubscriptionHabboClub extends Subscription { case "diamond": pointCurrency = 5; habbo.getClient().getHabbo().getHabboInfo().addCurrencyAmount(pointCurrency, amount); - habbo.getClient().sendResponse(new UserPointsComposer(habbo.getClient().getHabbo().getHabboInfo().getCurrencyAmount(pointCurrency), amount, pointCurrency)); + habbo.getClient().sendResponse(new HabboActivityPointNotificationMessageComposer(habbo.getClient().getHabbo().getHabboInfo().getCurrencyAmount(pointCurrency), amount, pointCurrency)); break; case "duckets": @@ -392,7 +392,7 @@ public class SubscriptionHabboClub extends Subscription { case "pixel": pointCurrency = 0; habbo.getClient().getHabbo().getHabboInfo().addCurrencyAmount(pointCurrency, amount); - habbo.getClient().sendResponse(new UserPointsComposer(habbo.getClient().getHabbo().getHabboInfo().getCurrencyAmount(pointCurrency), amount, pointCurrency)); + habbo.getClient().sendResponse(new HabboActivityPointNotificationMessageComposer(habbo.getClient().getHabbo().getHabboInfo().getCurrencyAmount(pointCurrency), amount, pointCurrency)); break; default: @@ -406,7 +406,7 @@ public class SubscriptionHabboClub extends Subscription { if (pointCurrency >= 0) { habbo.getClient().getHabbo().getHabboInfo().addCurrencyAmount(pointCurrency, amount); - habbo.getClient().sendResponse(new UserPointsComposer(habbo.getClient().getHabbo().getHabboInfo().getCurrencyAmount(pointCurrency), amount, pointCurrency)); + habbo.getClient().sendResponse(new HabboActivityPointNotificationMessageComposer(habbo.getClient().getHabbo().getHabboInfo().getCurrencyAmount(pointCurrency), amount, pointCurrency)); } break; } 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 6a58f26e..42564c53 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 @@ -18,11 +18,11 @@ import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.catalog.*; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys; -import com.eu.habbo.messages.outgoing.generic.alerts.GenericAlertComposer; +import com.eu.habbo.messages.outgoing.generic.alerts.HabboBroadcastMessageComposer; import com.eu.habbo.messages.outgoing.generic.alerts.HotelWillCloseInMinutesComposer; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer; -import com.eu.habbo.messages.outgoing.users.UserPointsComposer; +import com.eu.habbo.messages.outgoing.users.HabboActivityPointNotificationMessageComposer; import com.eu.habbo.threading.runnables.ShutdownEmulator; import gnu.trove.map.hash.THashMap; import gnu.trove.set.hash.THashSet; @@ -75,7 +75,7 @@ public class CatalogBuyItemAsGiftEvent extends MessageHandler { return; } - if (!GiftConfigurationComposer.BOX_TYPES.contains(color) || !GiftConfigurationComposer.RIBBON_TYPES.contains(ribbonId)) { + if (!GiftWrappingConfigurationComposer.BOX_TYPES.contains(color) || !GiftWrappingConfigurationComposer.RIBBON_TYPES.contains(ribbonId)) { this.client.sendResponse(new AlertPurchaseFailedComposer(AlertPurchaseFailedComposer.SERVER_ERROR).compose()); return; } @@ -308,7 +308,7 @@ public class CatalogBuyItemAsGiftEvent extends MessageHandler { } } else { this.client.sendResponse(new AlertPurchaseFailedComposer(AlertPurchaseFailedComposer.SERVER_ERROR)); - this.client.sendResponse(new GenericAlertComposer(Emulator.getTexts().getValue("error.catalog.buy.not_yet"))); + this.client.sendResponse(new HabboBroadcastMessageComposer(Emulator.getTexts().getValue("error.catalog.buy.not_yet"))); return; } } @@ -362,7 +362,7 @@ public class CatalogBuyItemAsGiftEvent extends MessageHandler { } else if (!this.client.getHabbo().hasPermission(Permission.ACC_INFINITE_POINTS)) { this.client.getHabbo().getHabboInfo().addCurrencyAmount(item.getPointsType(), -totalPoints); } - this.client.sendResponse(new UserPointsComposer(this.client.getHabbo().getHabboInfo().getCurrencyAmount(item.getPointsType()), -totalPoints, item.getPointsType())); + this.client.sendResponse(new HabboActivityPointNotificationMessageComposer(this.client.getHabbo().getHabboInfo().getCurrencyAmount(item.getPointsType()), -totalPoints, item.getPointsType())); } this.client.sendResponse(new PurchaseOKComposer(item)); diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogRequestClubDiscountEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogRequestClubDiscountEvent.java index d535ae90..bb40e19b 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogRequestClubDiscountEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogRequestClubDiscountEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.catalog.ClubOffer; import com.eu.habbo.habbohotel.users.subscriptions.Subscription; import com.eu.habbo.habbohotel.users.subscriptions.SubscriptionHabboClub; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.unknown.ExtendClubMessageComposer; +import com.eu.habbo.messages.outgoing.unknown.HabboClubExtendOfferMessageComposer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +38,7 @@ public class CatalogRequestClubDiscountEvent extends MessageHandler { if(deal != null) { ClubOffer regular = Emulator.getGameEnvironment().getCatalogManager().getClubOffers().stream().filter(x -> x.getDays() == deal.getDays()).findAny().orElse(null); if(regular != null) { - this.client.sendResponse(new ExtendClubMessageComposer(this.client.getHabbo(), deal, regular.getCredits(), regular.getPoints(), regular.getPointsType(), Math.max(0, days))); + this.client.sendResponse(new HabboClubExtendOfferMessageComposer(this.client.getHabbo(), deal, regular.getCredits(), regular.getPoints(), regular.getPointsType(), Math.max(0, days))); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestClubDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestClubDataEvent.java index 6085e1eb..24dfc02d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestClubDataEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestClubDataEvent.java @@ -1,13 +1,11 @@ package com.eu.habbo.messages.incoming.catalog; -import com.eu.habbo.habbohotel.users.subscriptions.SubscriptionHabboClub; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.catalog.ClubCenterDataComposer; -import com.eu.habbo.messages.outgoing.catalog.ClubDataComposer; +import com.eu.habbo.messages.outgoing.catalog.HabboClubOffersMessageComposer; public class RequestClubDataEvent extends MessageHandler { @Override public void handle() throws Exception { - this.client.sendResponse(new ClubDataComposer(this.client.getHabbo(), this.packet.readInt())); + this.client.sendResponse(new HabboClubOffersMessageComposer(this.client.getHabbo(), this.packet.readInt())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestGiftConfigurationEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestGiftConfigurationEvent.java index 7976ee39..eb8a084b 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestGiftConfigurationEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestGiftConfigurationEvent.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.GiftConfigurationComposer; +import com.eu.habbo.messages.outgoing.catalog.GiftWrappingConfigurationComposer; public class RequestGiftConfigurationEvent extends MessageHandler { @Override public void handle() throws Exception { - this.client.sendResponse(new GiftConfigurationComposer()); + this.client.sendResponse(new GiftWrappingConfigurationComposer()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/OpenRecycleBoxEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/OpenRecycleBoxEvent.java index 54efe6a7..0bc3ee30 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/OpenRecycleBoxEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/OpenRecycleBoxEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer; -import com.eu.habbo.messages.outgoing.rooms.UpdateStackHeightComposer; +import com.eu.habbo.messages.outgoing.rooms.HeightMapUpdateMessageComposer; import com.eu.habbo.messages.outgoing.rooms.items.PresentItemOpenedComposer; import com.eu.habbo.messages.outgoing.rooms.items.RemoveFloorItemComposer; import com.eu.habbo.messages.outgoing.rooms.users.RoomUserWhisperComposer; @@ -64,7 +64,7 @@ public class OpenRecycleBoxEvent extends MessageHandler { z = roomTile.z; } } - room.sendComposer(new UpdateStackHeightComposer(item.getX(), item.getY(), z, room.getStackHeight(item.getX(), item.getY(), true)).compose()); + room.sendComposer(new HeightMapUpdateMessageComposer(item.getX(), item.getY(), z, room.getStackHeight(item.getX(), item.getY(), true)).compose()); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorSaveEvent.java b/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorSaveEvent.java index b4d98206..4cc0359b 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorSaveEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorSaveEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.ServerMessage; 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.generic.alerts.GenericAlertComposer; +import com.eu.habbo.messages.outgoing.generic.alerts.HabboBroadcastMessageComposer; import com.eu.habbo.messages.outgoing.rooms.ForwardToRoomComposer; import gnu.trove.set.hash.THashSet; @@ -21,7 +21,7 @@ public class FloorPlanEditorSaveEvent extends MessageHandler { @Override public void handle() throws Exception { if (!this.client.getHabbo().hasPermission(Permission.ACC_FLOORPLAN_EDITOR)) { - this.client.sendResponse(new GenericAlertComposer(Emulator.getTexts().getValue("floorplan.permission"))); + this.client.sendResponse(new HabboBroadcastMessageComposer(Emulator.getTexts().getValue("floorplan.permission"))); return; } diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/SearchUserEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/SearchUserEvent.java index d4b01757..9158b95a 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/friends/SearchUserEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/friends/SearchUserEvent.java @@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.friends; import com.eu.habbo.habbohotel.messenger.Messenger; import com.eu.habbo.habbohotel.messenger.MessengerBuddy; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.friends.UserSearchResultComposer; +import com.eu.habbo.messages.outgoing.friends.HabboSearchResultComposer; import gnu.trove.set.hash.THashSet; import java.util.concurrent.ConcurrentHashMap; @@ -33,7 +33,7 @@ public class SearchUserEvent extends MessageHandler { cachedResults.put(username, buddies); } - this.client.sendResponse(new UserSearchResultComposer(buddies, this.client.getHabbo().getMessenger().getFriends(username), this.client.getHabbo())); + this.client.sendResponse(new HabboSearchResultComposer(buddies, this.client.getHabbo().getMessenger().getFriends(username), this.client.getHabbo())); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterRequestAccountStatusEvent.java b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterRequestAccountStatusEvent.java index b476dc37..07640019 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterRequestAccountStatusEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterRequestAccountStatusEvent.java @@ -1,11 +1,11 @@ package com.eu.habbo.messages.incoming.gamecenter; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.gamecenter.GameCenterAccountInfoComposer; +import com.eu.habbo.messages.outgoing.gamecenter.Game2AccountGameStatusMessageComposer; public class GameCenterRequestAccountStatusEvent extends MessageHandler { @Override public void handle() throws Exception { - this.client.sendResponse(new GameCenterAccountInfoComposer(this.packet.readInt(), 10)); + this.client.sendResponse(new Game2AccountGameStatusMessageComposer(this.packet.readInt(), 10)); } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideInviteUserEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideInviteUserEvent.java index 9c60efbb..82978e44 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideInviteUserEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideInviteUserEvent.java @@ -4,7 +4,7 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.guides.GuideTour; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.guides.GuideSessionInvitedToGuideRoomComposer; +import com.eu.habbo.messages.outgoing.guides.GuideSessionInvitedToGuideRoomMessageComposer; public class GuideInviteUserEvent extends MessageHandler { @Override @@ -12,7 +12,7 @@ public class GuideInviteUserEvent extends MessageHandler { GuideTour tour = Emulator.getGameEnvironment().getGuideManager().getGuideTourByHelper(this.client.getHabbo()); if (tour != null) { - ServerMessage message = new GuideSessionInvitedToGuideRoomComposer(this.client.getHabbo().getHabboInfo().getCurrentRoom()).compose(); + ServerMessage message = new GuideSessionInvitedToGuideRoomMessageComposer(this.client.getHabbo().getHabboInfo().getCurrentRoom()).compose(); tour.getNoob().getClient().sendResponse(message); tour.getHelper().getClient().sendResponse(message); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideReportHelperEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideReportHelperEvent.java index 36d293f5..b1244613 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideReportHelperEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideReportHelperEvent.java @@ -6,8 +6,8 @@ import com.eu.habbo.habbohotel.modtool.ModToolIssue; import com.eu.habbo.habbohotel.modtool.ModToolTicketType; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.guides.GuideSessionDetachedComposer; -import com.eu.habbo.messages.outgoing.guides.GuideSessionEndedComposer; +import com.eu.habbo.messages.outgoing.guides.GuideSessionDetachedMessageComposer; +import com.eu.habbo.messages.outgoing.guides.GuideSessionEndedMessageComposer; import com.eu.habbo.messages.outgoing.modtool.CallForHelpResultMessageComposer; public class GuideReportHelperEvent extends MessageHandler { @@ -37,11 +37,11 @@ public class GuideReportHelperEvent extends MessageHandler { Emulator.getGameEnvironment().getModToolManager().updateTicketToMods(issue); this.client.sendResponse(new CallForHelpResultMessageComposer(CallForHelpResultMessageComposer.REPORT_RECEIVED, message)); - this.client.sendResponse(new GuideSessionDetachedComposer()); - this.client.sendResponse(new GuideSessionEndedComposer(GuideSessionEndedComposer.HELP_CASE_CLOSED)); + this.client.sendResponse(new GuideSessionDetachedMessageComposer()); + this.client.sendResponse(new GuideSessionEndedMessageComposer(GuideSessionEndedMessageComposer.HELP_CASE_CLOSED)); - reported.getClient().sendResponse(new GuideSessionDetachedComposer()); - reported.getClient().sendResponse(new GuideSessionEndedComposer(GuideSessionEndedComposer.HELP_CASE_CLOSED)); + reported.getClient().sendResponse(new GuideSessionDetachedMessageComposer()); + reported.getClient().sendResponse(new GuideSessionEndedMessageComposer(GuideSessionEndedMessageComposer.HELP_CASE_CLOSED)); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideUserMessageEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideUserMessageEvent.java index fb84a36c..0a9d2a5f 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideUserMessageEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideUserMessageEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.guides.GuideChatMessage; import com.eu.habbo.habbohotel.guides.GuideTour; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.guides.GuideSessionMessageComposer; +import com.eu.habbo.messages.outgoing.guides.GuideSessionMessageMessageComposer; public class GuideUserMessageEvent extends MessageHandler { @Override @@ -15,7 +15,7 @@ public class GuideUserMessageEvent extends MessageHandler { if (tour != null) { GuideChatMessage chatMessage = new GuideChatMessage(this.client.getHabbo().getHabboInfo().getId(), this.packet.readString(), Emulator.getIntUnixTimestamp()); tour.addMessage(chatMessage); - ServerMessage serverMessage = new GuideSessionMessageComposer(chatMessage).compose(); + ServerMessage serverMessage = new GuideSessionMessageMessageComposer(chatMessage).compose(); tour.getHelper().getClient().sendResponse(serverMessage); tour.getNoob().getClient().sendResponse(serverMessage); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideVisitUserEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideVisitUserEvent.java index 70a10420..90ff3834 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideVisitUserEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideVisitUserEvent.java @@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.guides; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.guides.GuideTour; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.guides.GuideSessionRequesterRoomComposer; +import com.eu.habbo.messages.outgoing.guides.GuideSessionRequesterRoomMessageComposer; public class GuideVisitUserEvent extends MessageHandler { @Override @@ -11,7 +11,7 @@ public class GuideVisitUserEvent extends MessageHandler { GuideTour tour = Emulator.getGameEnvironment().getGuideManager().getGuideTourByHelper(this.client.getHabbo()); if (tour != null) { - this.client.sendResponse(new GuideSessionRequesterRoomComposer(tour.getNoob().getHabboInfo().getCurrentRoom())); + this.client.sendResponse(new GuideSessionRequesterRoomMessageComposer(tour.getNoob().getHabboInfo().getCurrentRoom())); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/guides/RequestGuideAssistanceEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guides/RequestGuideAssistanceEvent.java index e51dc166..2b362b02 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guides/RequestGuideAssistanceEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guides/RequestGuideAssistanceEvent.java @@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.guides; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.guides.GuideTour; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.guides.GuideSessionErrorComposer; +import com.eu.habbo.messages.outgoing.guides.GuideSessionErrorMessageComposer; public class RequestGuideAssistanceEvent extends MessageHandler { @Override @@ -14,7 +14,7 @@ public class RequestGuideAssistanceEvent extends MessageHandler { GuideTour activeTour = Emulator.getGameEnvironment().getGuideManager().getGuideTourByHabbo(this.client.getHabbo()); if (activeTour != null) { - this.client.sendResponse(new GuideSessionErrorComposer(GuideSessionErrorComposer.SOMETHING_WRONG_REQUEST)); + this.client.sendResponse(new GuideSessionErrorMessageComposer(GuideSessionErrorMessageComposer.SOMETHING_WRONG_REQUEST)); return; } diff --git a/src/main/java/com/eu/habbo/messages/incoming/guides/RequestGuideToolEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guides/RequestGuideToolEvent.java index 2c954c2a..77920f4a 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guides/RequestGuideToolEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guides/RequestGuideToolEvent.java @@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.guides; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.permissions.Permission; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.guides.GuideToolsComposer; +import com.eu.habbo.messages.outgoing.guides.GuideOnDutyStatusMessageComposer; public class RequestGuideToolEvent extends MessageHandler { @Override @@ -32,11 +32,11 @@ public class RequestGuideToolEvent extends MessageHandler { Emulator.getGameEnvironment().getGuideManager().setOnGuardian(this.client.getHabbo(), onDuty); } - this.client.sendResponse(new GuideToolsComposer(onDuty)); + this.client.sendResponse(new GuideOnDutyStatusMessageComposer(onDuty)); } else { Emulator.getGameEnvironment().getGuideManager().setOnGuide(this.client.getHabbo(), onDuty); Emulator.getGameEnvironment().getGuideManager().setOnGuardian(this.client.getHabbo(), onDuty); - this.client.sendResponse(new GuideToolsComposer(onDuty)); + this.client.sendResponse(new GuideOnDutyStatusMessageComposer(onDuty)); } } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildAcceptMembershipEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildAcceptMembershipEvent.java index 068aba2e..385b2a65 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildAcceptMembershipEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildAcceptMembershipEvent.java @@ -8,9 +8,9 @@ import com.eu.habbo.habbohotel.permissions.Permission; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.guilds.GuildAcceptMemberErrorComposer; +import com.eu.habbo.messages.outgoing.guilds.GuildMemberMgmtFailedMessageComposer; import com.eu.habbo.messages.outgoing.guilds.GuildInfoComposer; -import com.eu.habbo.messages.outgoing.guilds.GuildRefreshMembersListComposer; +import com.eu.habbo.messages.outgoing.guilds.GuildMembershipRejectedMessageComposer; import com.eu.habbo.plugin.events.guilds.GuildAcceptedMembershipEvent; public class GuildAcceptMembershipEvent extends MessageHandler { @@ -25,8 +25,8 @@ public class GuildAcceptMembershipEvent extends MessageHandler { if (guild != null) { GuildMember groupMember = Emulator.getGameEnvironment().getGuildManager().getGuildMember(guild, this.client.getHabbo()); if (userId == this.client.getHabbo().getHabboInfo().getId() || guild.getOwnerId() == this.client.getHabbo().getHabboInfo().getId() || groupMember.getRank().equals(GuildRank.ADMIN) || groupMember.getRank().equals(GuildRank.OWNER) || this.client.getHabbo().hasPermission(Permission.ACC_GUILD_ADMIN)) { - if (habbo != null) { if (habbo.getHabboStats().hasGuild(guild.getId())) { + if (habbo != null) { this.client.sendResponse(new GuildAcceptMemberErrorComposer(guild.getId(), GuildAcceptMemberErrorComposer.ALREADY_ACCEPTED)); return; } else { diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildConfirmRemoveMemberEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildConfirmRemoveMemberEvent.java index ba569387..05e7ba06 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildConfirmRemoveMemberEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildConfirmRemoveMemberEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.guilds.GuildRank; 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.guilds.GuildConfirmRemoveMemberComposer; +import com.eu.habbo.messages.outgoing.guilds.GuildMemberFurniCountInHQMessageComposer; public class GuildConfirmRemoveMemberEvent extends MessageHandler { @Override @@ -25,7 +25,7 @@ public class GuildConfirmRemoveMemberEvent extends MessageHandler { if (room != null) { count = room.getUserFurniCount(userId); } - this.client.sendResponse(new GuildConfirmRemoveMemberComposer(userId, count)); + this.client.sendResponse(new GuildMemberFurniCountInHQMessageComposer(userId, count)); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildDeclineMembershipEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildDeclineMembershipEvent.java index 885e771c..a61bd67c 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildDeclineMembershipEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildDeclineMembershipEvent.java @@ -10,7 +10,7 @@ import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.guilds.GuildInfoComposer; import com.eu.habbo.messages.outgoing.guilds.GuildMembersComposer; -import com.eu.habbo.messages.outgoing.guilds.GuildRefreshMembersListComposer; +import com.eu.habbo.messages.outgoing.guilds.GuildMembershipRejectedMessageComposer; import com.eu.habbo.plugin.events.guilds.GuildDeclinedMembershipEvent; public class GuildDeclineMembershipEvent extends MessageHandler { @@ -27,7 +27,7 @@ public class GuildDeclineMembershipEvent extends MessageHandler { guild.decreaseRequestCount(); Emulator.getGameEnvironment().getGuildManager().removeMember(guild, userId); this.client.sendResponse(new GuildMembersComposer(guild, Emulator.getGameEnvironment().getGuildManager().getGuildMembers(guild, 0, 0, ""), this.client.getHabbo(), 0, 0, "", true, Emulator.getGameEnvironment().getGuildManager().getGuildMembersCount(guild, 0, 0, ""))); - this.client.sendResponse(new GuildRefreshMembersListComposer(guild)); + this.client.sendResponse(new GuildMembershipRejectedMessageComposer(guild)); Habbo habbo = Emulator.getGameEnvironment().getHabboManager().getHabbo(userId); Emulator.getPluginManager().fireEvent(new GuildDeclinedMembershipEvent(guild, userId, habbo, this.client.getHabbo())); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildDeleteEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildDeleteEvent.java index 664d8fb7..f77929bb 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildDeleteEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildDeleteEvent.java @@ -7,8 +7,8 @@ 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.guilds.FavoriteMembershipUpdateMessageComposer; -import com.eu.habbo.messages.outgoing.guilds.RemoveGuildFromRoomComposer; -import com.eu.habbo.messages.outgoing.rooms.RoomDataComposer; +import com.eu.habbo.messages.outgoing.guilds.HabboGroupDeactivatedMessageComposer; +import com.eu.habbo.messages.outgoing.rooms.GetGuestRoomResultComposer; import com.eu.habbo.plugin.events.guilds.GuildDeletedEvent; import gnu.trove.set.hash.THashSet; @@ -33,11 +33,11 @@ public class GuildDeleteEvent extends MessageHandler { Emulator.getGameEnvironment().getGuildManager().deleteGuild(guild); Emulator.getPluginManager().fireEvent(new GuildDeletedEvent(guild, this.client.getHabbo())); - Emulator.getGameEnvironment().getRoomManager().getRoom(guild.getRoomId()).sendComposer(new RemoveGuildFromRoomComposer(guildId).compose()); + Emulator.getGameEnvironment().getRoomManager().getRoom(guild.getRoomId()).sendComposer(new HabboGroupDeactivatedMessageComposer(guildId).compose()); if (this.client.getHabbo().getHabboInfo().getCurrentRoom() != null) { if (guild.getRoomId() == this.client.getHabbo().getHabboInfo().getCurrentRoom().getId()) { - this.client.sendResponse(new RoomDataComposer(this.client.getHabbo().getHabboInfo().getCurrentRoom(), this.client.getHabbo(), false, false)); + this.client.sendResponse(new GetGuestRoomResultComposer(this.client.getHabbo().getHabboInfo().getCurrentRoom(), this.client.getHabbo(), false, false)); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveAdminEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveAdminEvent.java index d017a5af..5231df12 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveAdminEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveAdminEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.guilds.GuildInfoComposer; -import com.eu.habbo.messages.outgoing.guilds.GuildMemberUpdateComposer; +import com.eu.habbo.messages.outgoing.guilds.GuildMembershipUpdatedMessageComposer; import com.eu.habbo.plugin.events.guilds.GuildRemovedAdminEvent; public class GuildRemoveAdminEvent extends MessageHandler { @@ -40,7 +40,7 @@ public class GuildRemoveAdminEvent extends MessageHandler { } GuildMember guildMember = Emulator.getGameEnvironment().getGuildManager().getGuildMember(guildId, userId); - this.client.sendResponse(new GuildMemberUpdateComposer(guild, guildMember)); + this.client.sendResponse(new GuildMembershipUpdatedMessageComposer(guild, guildMember)); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveMemberEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveMemberEvent.java index 9b8a4761..1153ef26 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveMemberEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveMemberEvent.java @@ -10,7 +10,7 @@ import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.guilds.FavoriteMembershipUpdateMessageComposer; import com.eu.habbo.messages.outgoing.guilds.GuildInfoComposer; -import com.eu.habbo.messages.outgoing.guilds.GuildRefreshMembersListComposer; +import com.eu.habbo.messages.outgoing.guilds.GuildMembershipRejectedMessageComposer; import com.eu.habbo.plugin.events.guilds.GuildRemovedMemberEvent; public class GuildRemoveMemberEvent extends MessageHandler { @@ -35,7 +35,7 @@ public class GuildRemoveMemberEvent extends MessageHandler { guild.decreaseMemberCount(); if (userId != this.client.getHabbo().getHabboInfo().getId()) { - this.client.sendResponse(new GuildRefreshMembersListComposer(guild)); + this.client.sendResponse(new GuildMembershipRejectedMessageComposer(guild)); } Room room = Emulator.getGameEnvironment().getRoomManager().loadRoom(guild.getRoomId()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildSetAdminEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildSetAdminEvent.java index 7e60d6cf..025eddbd 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildSetAdminEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildSetAdminEvent.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.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.guilds.GuildMemberUpdateComposer; +import com.eu.habbo.messages.outgoing.guilds.GuildMembershipUpdatedMessageComposer; import com.eu.habbo.plugin.events.guilds.GuildGivenAdminEvent; public class GuildSetAdminEvent extends MessageHandler { @@ -40,7 +40,7 @@ public class GuildSetAdminEvent extends MessageHandler { GuildMember guildMember = Emulator.getGameEnvironment().getGuildManager().getGuildMember(guildId, userId); - this.client.sendResponse(new GuildMemberUpdateComposer(guild, guildMember)); + this.client.sendResponse(new GuildMembershipUpdatedMessageComposer(guild, guildMember)); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildSetFavoriteEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildSetFavoriteEvent.java index 2077267b..547cf4a9 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildSetFavoriteEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildSetFavoriteEvent.java @@ -4,7 +4,7 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.guilds.Guild; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.guilds.FavoriteMembershipUpdateMessageComposer; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUsersAddGuildBadgeComposer; +import com.eu.habbo.messages.outgoing.rooms.users.HabboAddGroupBadgesMessageComposer; import com.eu.habbo.messages.outgoing.users.ExtendedProfileMessageComposer; import com.eu.habbo.plugin.events.guilds.GuildFavoriteSetEvent; @@ -26,7 +26,7 @@ public class GuildSetFavoriteEvent extends MessageHandler { if (this.client.getHabbo().getHabboInfo().getCurrentRoom() != null) { if (guild != null) { - this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RoomUsersAddGuildBadgeComposer(guild).compose()); + this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new HabboAddGroupBadgesMessageComposer(guild).compose()); this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new FavoriteMembershipUpdateMessageComposer(this.client.getHabbo().getRoomUnit(), guild).compose()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyEvent.java index 574987fa..a4ef340b 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyEvent.java @@ -9,8 +9,8 @@ import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.catalog.AlertPurchaseFailedComposer; import com.eu.habbo.messages.outgoing.catalog.PurchaseOKComposer; -import com.eu.habbo.messages.outgoing.guilds.GuildBoughtComposer; -import com.eu.habbo.messages.outgoing.guilds.GuildEditFailComposer; +import com.eu.habbo.messages.outgoing.guilds.GuildCreatedMessageComposer; +import com.eu.habbo.messages.outgoing.guilds.GuildEditFailedMessageComposer; import com.eu.habbo.messages.outgoing.guilds.GuildInfoComposer; import com.eu.habbo.plugin.events.guilds.GuildPurchasedEvent; import org.slf4j.Logger; @@ -28,7 +28,7 @@ public class RequestGuildBuyEvent extends MessageHandler { return; if (Emulator.getConfig().getBoolean("catalog.guild.hc_required", true) && !this.client.getHabbo().getHabboStats().hasActiveClub()) { - this.client.sendResponse(new GuildEditFailComposer(GuildEditFailComposer.HC_REQUIRED)); + this.client.sendResponse(new GuildEditFailedMessageComposer(GuildEditFailedMessageComposer.HC_REQUIRED)); return; } @@ -48,7 +48,7 @@ public class RequestGuildBuyEvent extends MessageHandler { if (r != null) { if (r.hasGuild()) { - this.client.sendResponse(new GuildEditFailComposer(GuildEditFailComposer.ROOM_ALREADY_IN_USE)); + this.client.sendResponse(new GuildEditFailedMessageComposer(GuildEditFailedMessageComposer.ROOM_ALREADY_IN_USE)); return; } @@ -80,7 +80,7 @@ public class RequestGuildBuyEvent extends MessageHandler { } if(name.length() > 29){ - this.client.sendResponse(new GuildEditFailComposer(GuildEditFailComposer.INVALID_GUILD_NAME)); + this.client.sendResponse(new GuildEditFailedMessageComposer(GuildEditFailedMessageComposer.INVALID_GUILD_NAME)); return; } if(description.length() > 254){ @@ -97,7 +97,7 @@ public class RequestGuildBuyEvent extends MessageHandler { } this.client.sendResponse(new PurchaseOKComposer()); - this.client.sendResponse(new GuildBoughtComposer(guild)); + this.client.sendResponse(new GuildCreatedMessageComposer(guild)); for (Habbo habbo : r.getHabbos()) { habbo.getClient().sendResponse(new GuildInfoComposer(guild, habbo.getClient(), false, null)); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyRoomsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyRoomsEvent.java index 6ca7a4ed..2ef52cab 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyRoomsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyRoomsEvent.java @@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.guilds; 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.guilds.GuildBuyRoomsComposer; +import com.eu.habbo.messages.outgoing.guilds.GuildCreationInfoMessageComposer; import gnu.trove.set.hash.THashSet; import java.util.List; @@ -20,6 +20,6 @@ public class RequestGuildBuyRoomsEvent extends MessageHandler { roomList.add(room); } - this.client.sendResponse(new GuildBuyRoomsComposer(roomList)); + this.client.sendResponse(new GuildCreationInfoMessageComposer(roomList)); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildFurniWidgetEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildFurniWidgetEvent.java index 18dc0b94..df5166a1 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildFurniWidgetEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildFurniWidgetEvent.java @@ -4,7 +4,7 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.guilds.Guild; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.guilds.GuildFurniWidgetComposer; +import com.eu.habbo.messages.outgoing.guilds.GuildFurniContextMenuInfoMessageComposer; public class RequestGuildFurniWidgetEvent extends MessageHandler { @Override @@ -17,7 +17,7 @@ public class RequestGuildFurniWidgetEvent extends MessageHandler { Guild guild = Emulator.getGameEnvironment().getGuildManager().getGuild(guildId); if (item != null && guild != null) - this.client.sendResponse(new GuildFurniWidgetComposer(this.client.getHabbo(), guild, item)); + this.client.sendResponse(new GuildFurniContextMenuInfoMessageComposer(this.client.getHabbo(), guild, item)); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildJoinEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildJoinEvent.java index 811dca2c..532be037 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildJoinEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildJoinEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.guilds.GuildState; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.guilds.GuildInfoComposer; -import com.eu.habbo.messages.outgoing.guilds.GuildJoinErrorComposer; +import com.eu.habbo.messages.outgoing.guilds.HabboGroupJoinFailedMessageComposer; public class RequestGuildJoinEvent extends MessageHandler { @Override @@ -22,7 +22,7 @@ public class RequestGuildJoinEvent extends MessageHandler { return; if (guild.getState() == GuildState.CLOSED || guild.getState() == GuildState.LARGE_CLOSED) { - this.client.sendResponse(new GuildJoinErrorComposer(GuildJoinErrorComposer.GROUP_CLOSED)); + this.client.sendResponse(new HabboGroupJoinFailedMessageComposer(HabboGroupJoinFailedMessageComposer.GROUP_CLOSED)); return; } diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildManageEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildManageEvent.java index ccb6ce89..3ff894c3 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildManageEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildManageEvent.java @@ -3,13 +3,13 @@ package com.eu.habbo.messages.incoming.guilds; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.guilds.Guild; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.guilds.GuildManageComposer; +import com.eu.habbo.messages.outgoing.guilds.GuildEditInfoMessageComposer; public class RequestGuildManageEvent extends MessageHandler { @Override public void handle() throws Exception { Guild guild = Emulator.getGameEnvironment().getGuildManager().getGuild(this.packet.readInt()); - this.client.sendResponse(new GuildManageComposer(guild)); + this.client.sendResponse(new GuildEditInfoMessageComposer(guild)); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildPartsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildPartsEvent.java index 39340765..fd68a874 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildPartsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildPartsEvent.java @@ -1,11 +1,11 @@ package com.eu.habbo.messages.incoming.guilds; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.guilds.GuildPartsComposer; +import com.eu.habbo.messages.outgoing.guilds.GuildEditorDataMessageComposer; public class RequestGuildPartsEvent extends MessageHandler { @Override public void handle() throws Exception { - this.client.sendResponse(new GuildPartsComposer()); + this.client.sendResponse(new GuildEditorDataMessageComposer()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestOwnGuildsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestOwnGuildsEvent.java index 1a89d705..19622cfc 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestOwnGuildsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestOwnGuildsEvent.java @@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.guilds; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.guilds.Guild; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.guilds.GuildListComposer; +import com.eu.habbo.messages.outgoing.guilds.GuildMembershipsMessageComposer; import gnu.trove.set.hash.THashSet; public class RequestOwnGuildsEvent extends MessageHandler { @@ -22,6 +22,6 @@ public class RequestOwnGuildsEvent extends MessageHandler { } } - this.client.sendResponse(new GuildListComposer(guilds, this.client.getHabbo())); + this.client.sendResponse(new GuildMembershipsMessageComposer(guilds, this.client.getHabbo())); } } 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 f587fb8b..a8920dfe 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 @@ -19,12 +19,12 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.catalog.TargetedOfferComposer; import com.eu.habbo.messages.outgoing.events.calendar.CampaignCalendarDataMessageComposer; -import com.eu.habbo.messages.outgoing.gamecenter.GameCenterAccountInfoComposer; -import com.eu.habbo.messages.outgoing.gamecenter.GameCenterGameListComposer; -import com.eu.habbo.messages.outgoing.generic.alerts.GenericAlertComposer; +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.habboway.nux.NuxAlertComposer; +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; import com.eu.habbo.messages.outgoing.handshake.AvailabilityStatusMessageComposer; @@ -214,9 +214,9 @@ public class SecureLoginEvent extends MessageHandler { messages.add(new BuildersClubSubscriptionStatusMessageComposer().compose()); messages.add(new CfhTopicsInitComposer().compose()); messages.add(new FavouriteChangedComposer(this.client.getHabbo()).compose()); - messages.add(new GameCenterGameListComposer().compose()); - messages.add(new GameCenterAccountInfoComposer(3, 100).compose()); - messages.add(new GameCenterAccountInfoComposer(0, 100).compose()); + messages.add(new GameListMessageComposer().compose()); + messages.add(new Game2AccountGameStatusMessageComposer(3, 100).compose()); + messages.add(new Game2AccountGameStatusMessageComposer(0, 100).compose()); messages.add(new UserClubComposer(this.client.getHabbo(), SubscriptionHabboClub.HABBO_CLUB, UserClubComposer.RESPONSE_TYPE_LOGIN).compose()); @@ -231,7 +231,7 @@ public class SecureLoginEvent extends MessageHandler { if (daysBetween >= 0) { messages.add(new CampaignCalendarDataMessageComposer(campaign.getName(), campaign.getImage(), campaign.getTotalDays(), (int) daysBetween, this.client.getHabbo().getHabboStats().calendarRewardsClaimed, campaign.getLockExpired()).compose()); if(Emulator.getConfig().getBoolean("hotel.login.show.calendar", false)) { - messages.add(new NuxAlertComposer("openView/calendar").compose()); + messages.add(new InClientLinkMessageComposer("openView/calendar").compose()); } } } @@ -291,7 +291,7 @@ public class SecureLoginEvent extends MessageHandler { 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("
"))); } else { - SecureLoginEvent.this.client.sendResponse(new GenericAlertComposer(HabboManager.WELCOME_MESSAGE.replace("%username%", finalHabbo.getHabboInfo().getUsername()).replace("%user%", finalHabbo.getHabboInfo().getUsername()))); + SecureLoginEvent.this.client.sendResponse(new HabboBroadcastMessageComposer(HabboManager.WELCOME_MESSAGE.replace("%username%", finalHabbo.getHabboInfo().getUsername()).replace("%user%", finalHabbo.getHabboInfo().getUsername()))); } }, Emulator.getConfig().getInt("hotel.welcome.alert.delay", 5000)); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportBullyEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportBullyEvent.java index 51cc6cd1..c9c3a069 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportBullyEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ReportBullyEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.modtool.ModToolChatLog; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.modtool.BullyReportedMessageComposer; +import com.eu.habbo.messages.outgoing.modtool.GuideTicketCreationResultMessageComposer; import com.eu.habbo.messages.outgoing.modtool.CallForHelpDisabledNotifyMessageComposer; import java.util.ArrayList; @@ -35,20 +35,20 @@ public class ReportBullyEvent extends MessageHandler { GuardianTicket ticket = Emulator.getGameEnvironment().getGuideManager().getOpenReportedHabboTicket(habbo); if (ticket != null) { - this.client.sendResponse(new BullyReportedMessageComposer(BullyReportedMessageComposer.ALREADY_REPORTED)); + this.client.sendResponse(new GuideTicketCreationResultMessageComposer(GuideTicketCreationResultMessageComposer.ALREADY_REPORTED)); return; } ArrayList chatLog = Emulator.getGameEnvironment().getModToolManager().getRoomChatlog(roomId); if (chatLog.isEmpty()) { - this.client.sendResponse(new BullyReportedMessageComposer(BullyReportedMessageComposer.NO_CHAT)); + this.client.sendResponse(new GuideTicketCreationResultMessageComposer(GuideTicketCreationResultMessageComposer.NO_CHAT)); return; } Emulator.getGameEnvironment().getGuideManager().addGuardianTicket(new GuardianTicket(this.client.getHabbo(), habbo, chatLog)); - this.client.sendResponse(new BullyReportedMessageComposer(BullyReportedMessageComposer.RECEIVED)); + this.client.sendResponse(new GuideTicketCreationResultMessageComposer(GuideTicketCreationResultMessageComposer.RECEIVED)); } } } 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 2bf3885f..4d4f8913 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 @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.modtool.*; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserIgnoredComposer; +import com.eu.habbo.messages.outgoing.rooms.users.IgnoreResultMessageComposer; import com.eu.habbo.threading.runnables.InsertModToolIssue; import java.util.ArrayList; @@ -45,20 +45,20 @@ public class ReportEvent extends MessageHandler { GuardianTicket ticket = Emulator.getGameEnvironment().getGuideManager().getOpenReportedHabboTicket(reported); if (ticket != null) { - this.client.sendResponse(new BullyReportedMessageComposer(BullyReportedMessageComposer.ALREADY_REPORTED)); + this.client.sendResponse(new GuideTicketCreationResultMessageComposer(GuideTicketCreationResultMessageComposer.ALREADY_REPORTED)); return; } ArrayList chatLog = Emulator.getGameEnvironment().getModToolManager().getRoomChatlog(roomId); if (chatLog.isEmpty()) { - this.client.sendResponse(new BullyReportedMessageComposer(BullyReportedMessageComposer.NO_CHAT)); + this.client.sendResponse(new GuideTicketCreationResultMessageComposer(GuideTicketCreationResultMessageComposer.NO_CHAT)); return; } Emulator.getGameEnvironment().getGuideManager().addGuardianTicket(new GuardianTicket(this.client.getHabbo(), reported, chatLog)); - this.client.sendResponse(new BullyReportedMessageComposer(BullyReportedMessageComposer.RECEIVED)); + this.client.sendResponse(new GuideTicketCreationResultMessageComposer(GuideTicketCreationResultMessageComposer.RECEIVED)); } else { ModToolIssue issue = new ModToolIssue(this.client.getHabbo().getHabboInfo().getId(), this.client.getHabbo().getHabboInfo().getUsername(), reported.getHabboInfo().getId(), reported.getHabboInfo().getUsername(), roomId, message, ModToolTicketType.NORMAL); issue.category = topic; @@ -74,7 +74,7 @@ public class ReportEvent extends MessageHandler { if (issue.state == ModToolTicketState.OPEN) { if (cfhTopic.action == CfhActionType.AUTO_IGNORE) { if (ReportEvent.this.client.getHabbo().getHabboStats().ignoreUser(ReportEvent.this.client, reported.getHabboInfo().getId())) { - ReportEvent.this.client.sendResponse(new RoomUserIgnoredComposer(reported, RoomUserIgnoredComposer.IGNORED)); + ReportEvent.this.client.sendResponse(new IgnoreResultMessageComposer(reported, IgnoreResultMessageComposer.IGNORED)); } } @@ -103,7 +103,7 @@ public class ReportEvent extends MessageHandler { if (ReportEvent.this.client.getHabbo().getHabboStats().ignoreUser(ReportEvent.this.client, issue.reportedId)) { Habbo reported = Emulator.getGameEnvironment().getHabboManager().getHabbo(issue.reportedId); if (reported != null) { - ReportEvent.this.client.sendResponse(new RoomUserIgnoredComposer(reported, RoomUserIgnoredComposer.IGNORED)); + ReportEvent.this.client.sendResponse(new IgnoreResultMessageComposer(reported, IgnoreResultMessageComposer.IGNORED)); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/RequestReportUserBullyingEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/RequestReportUserBullyingEvent.java index e8c88756..a6594a43 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/RequestReportUserBullyingEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/RequestReportUserBullyingEvent.java @@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.modtool; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.guides.GuardianTicket; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.modtool.BullyReportRequestComposer; +import com.eu.habbo.messages.outgoing.modtool.GuideReportingStatusMessageComposer; import java.util.Calendar; @@ -14,16 +14,16 @@ public class RequestReportUserBullyingEvent extends MessageHandler { if (ticket != null) { if (ticket.inProgress()) { - this.client.sendResponse(new BullyReportRequestComposer(BullyReportRequestComposer.ONGOING_HELPER_CASE, 1)); + this.client.sendResponse(new GuideReportingStatusMessageComposer(GuideReportingStatusMessageComposer.ONGOING_HELPER_CASE, 1)); return; } if ((Calendar.getInstance().getTime().getTime() / 1000) - ticket.getDate().getTime() < Emulator.getConfig().getInt("guardians.reporting.cooldown")) { - this.client.sendResponse(new BullyReportRequestComposer(BullyReportRequestComposer.TOO_RECENT, 1)); + this.client.sendResponse(new GuideReportingStatusMessageComposer(GuideReportingStatusMessageComposer.TOO_RECENT, 1)); return; } } - this.client.sendResponse(new BullyReportRequestComposer(BullyReportRequestComposer.START_REPORT, 0)); + this.client.sendResponse(new GuideReportingStatusMessageComposer(GuideReportingStatusMessageComposer.START_REPORT, 0)); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestHighestScoreRoomsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestHighestScoreRoomsEvent.java index d74a8ae3..0598b9be 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestHighestScoreRoomsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestHighestScoreRoomsEvent.java @@ -2,11 +2,11 @@ package com.eu.habbo.messages.incoming.navigator; import com.eu.habbo.Emulator; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.navigator.PrivateRoomsComposer; +import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer; public class RequestHighestScoreRoomsEvent extends MessageHandler { @Override public void handle() throws Exception { - this.client.sendResponse(new PrivateRoomsComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsByScore())); + this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsByScore())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestMyRoomsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestMyRoomsEvent.java index 93476147..2415cad5 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestMyRoomsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestMyRoomsEvent.java @@ -2,11 +2,11 @@ package com.eu.habbo.messages.incoming.navigator; import com.eu.habbo.Emulator; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.navigator.PrivateRoomsComposer; +import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer; public class RequestMyRoomsEvent extends MessageHandler { @Override public void handle() throws Exception { - this.client.sendResponse(new PrivateRoomsComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsForHabbo(this.client.getHabbo()))); + this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsForHabbo(this.client.getHabbo()))); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestPopularRoomsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestPopularRoomsEvent.java index b0e0d10f..839c5393 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestPopularRoomsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestPopularRoomsEvent.java @@ -2,11 +2,11 @@ package com.eu.habbo.messages.incoming.navigator; import com.eu.habbo.Emulator; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.navigator.PrivateRoomsComposer; +import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer; public class RequestPopularRoomsEvent extends MessageHandler { @Override public void handle() throws Exception { - this.client.sendResponse(new PrivateRoomsComposer(Emulator.getGameEnvironment().getRoomManager().getActiveRooms(-1))); + this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getActiveRooms(-1))); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestPromotedRoomsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestPromotedRoomsEvent.java index 5f89e603..abe63eda 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestPromotedRoomsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestPromotedRoomsEvent.java @@ -2,11 +2,11 @@ package com.eu.habbo.messages.incoming.navigator; import com.eu.habbo.Emulator; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.navigator.PrivateRoomsComposer; +import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer; public class RequestPromotedRoomsEvent extends MessageHandler { @Override public void handle() throws Exception { - this.client.sendResponse(new PrivateRoomsComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsPromoted())); + this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsPromoted())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsByTagEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsByTagEvent.java index 0d572edf..f48d6fa5 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsByTagEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsByTagEvent.java @@ -2,13 +2,13 @@ package com.eu.habbo.messages.incoming.navigator; import com.eu.habbo.Emulator; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.navigator.PrivateRoomsComposer; +import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer; public class SearchRoomsByTagEvent extends MessageHandler { @Override public void handle() throws Exception { String tag = this.packet.readString(); - this.client.sendResponse(new PrivateRoomsComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsWithTag(tag))); + this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsWithTag(tag))); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsEvent.java index 7c910c50..ce83b97a 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.permissions.Rank; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.navigator.PrivateRoomsComposer; +import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer; import com.eu.habbo.plugin.events.navigator.NavigatorSearchResultEvent; import gnu.trove.map.hash.THashMap; @@ -46,7 +46,7 @@ public class SearchRoomsEvent extends MessageHandler { rooms = Emulator.getGameEnvironment().getRoomManager().getRoomsWithName(name); } - message = new PrivateRoomsComposer(rooms).compose(); + message = new GuestRoomSearchResultComposer(rooms).compose(); THashMap map = cachedResults.get(this.client.getHabbo().getHabboInfo().getRank()); if (map == null) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsFriendsNowEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsFriendsNowEvent.java index ec7e1cfd..75c32440 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsFriendsNowEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsFriendsNowEvent.java @@ -2,11 +2,11 @@ package com.eu.habbo.messages.incoming.navigator; import com.eu.habbo.Emulator; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.navigator.PrivateRoomsComposer; +import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer; public class SearchRoomsFriendsNowEvent extends MessageHandler { @Override public void handle() throws Exception { - this.client.sendResponse(new PrivateRoomsComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsFriendsNow(this.client.getHabbo()))); + this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsFriendsNow(this.client.getHabbo()))); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsFriendsOwnEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsFriendsOwnEvent.java index 786434b8..561ec64d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsFriendsOwnEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsFriendsOwnEvent.java @@ -2,11 +2,11 @@ package com.eu.habbo.messages.incoming.navigator; import com.eu.habbo.Emulator; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.navigator.PrivateRoomsComposer; +import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer; public class SearchRoomsFriendsOwnEvent extends MessageHandler { @Override public void handle() throws Exception { - this.client.sendResponse(new PrivateRoomsComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsFriendsOwn(this.client.getHabbo()))); + this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsFriendsOwn(this.client.getHabbo()))); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsInGroupEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsInGroupEvent.java index 6e3d1d96..b079a911 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsInGroupEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsInGroupEvent.java @@ -2,11 +2,11 @@ package com.eu.habbo.messages.incoming.navigator; import com.eu.habbo.Emulator; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.navigator.PrivateRoomsComposer; +import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer; public class SearchRoomsInGroupEvent extends MessageHandler { @Override public void handle() throws Exception { - this.client.sendResponse(new PrivateRoomsComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsInGroup(this.client.getHabbo()))); + this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsInGroup(this.client.getHabbo()))); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsMyFavouriteEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsMyFavouriteEvent.java index 452a55fc..90490e2d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsMyFavouriteEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsMyFavouriteEvent.java @@ -2,11 +2,11 @@ package com.eu.habbo.messages.incoming.navigator; import com.eu.habbo.Emulator; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.navigator.PrivateRoomsComposer; +import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer; public class SearchRoomsMyFavouriteEvent extends MessageHandler { @Override public void handle() throws Exception { - this.client.sendResponse(new PrivateRoomsComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsFavourite(this.client.getHabbo()))); + this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsFavourite(this.client.getHabbo()))); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsVisitedEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsVisitedEvent.java index 41cb356c..0f3cc854 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsVisitedEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsVisitedEvent.java @@ -2,11 +2,11 @@ package com.eu.habbo.messages.incoming.navigator; import com.eu.habbo.Emulator; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.navigator.PrivateRoomsComposer; +import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer; public class SearchRoomsVisitedEvent extends MessageHandler { @Override public void handle() throws Exception { - this.client.sendResponse(new PrivateRoomsComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsVisited(this.client.getHabbo(), false, 25))); + this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsVisited(this.client.getHabbo(), false, 25))); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsWithRightsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsWithRightsEvent.java index c123d102..edfd4f09 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsWithRightsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsWithRightsEvent.java @@ -2,11 +2,11 @@ package com.eu.habbo.messages.incoming.navigator; import com.eu.habbo.Emulator; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.navigator.PrivateRoomsComposer; +import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer; public class SearchRoomsWithRightsEvent extends MessageHandler { @Override public void handle() throws Exception { - this.client.sendResponse(new PrivateRoomsComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsWithRights(this.client.getHabbo()))); + this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsWithRights(this.client.getHabbo()))); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomDataEvent.java index a4ba2fdf..e53d3ece 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomDataEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomDataEvent.java @@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.rooms; 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.RoomDataComposer; +import com.eu.habbo.messages.outgoing.rooms.GetGuestRoomResultComposer; public class RequestRoomDataEvent extends MessageHandler { @Override @@ -20,7 +20,7 @@ public class RequestRoomDataEvent extends MessageHandler { } //this.client.getHabbo().getHabboInfo().getCurrentRoom() != room - this.client.sendResponse(new RoomDataComposer(room, this.client.getHabbo(), true, unknown)); + this.client.sendResponse(new GetGuestRoomResultComposer(room, this.client.getHabbo(), true, unknown)); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomHeightmapEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomHeightmapEvent.java index 495320a1..47603694 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomHeightmapEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomHeightmapEvent.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.FloorHeightMapComposer; -import com.eu.habbo.messages.outgoing.rooms.RoomRelativeMapComposer; +import com.eu.habbo.messages.outgoing.rooms.HeightMapComposer; public class RequestRoomHeightmapEvent extends MessageHandler { @Override @@ -13,7 +13,7 @@ public class RequestRoomHeightmapEvent extends MessageHandler { Room room = Emulator.getGameEnvironment().getRoomManager().loadRoom(this.client.getHabbo().getHabboInfo().getLoadingRoom()); if (room != null && room.getLayout() != null) { - this.client.sendResponse(new RoomRelativeMapComposer(room)); + this.client.sendResponse(new HeightMapComposer(room)); this.client.sendResponse(new FloorHeightMapComposer(room)); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomStaffPickEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomStaffPickEvent.java index 0e3e320d..bc0ccc82 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomStaffPickEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomStaffPickEvent.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.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.RoomDataComposer; +import com.eu.habbo.messages.outgoing.rooms.GetGuestRoomResultComposer; public class RoomStaffPickEvent extends MessageHandler { @Override @@ -38,7 +38,7 @@ public class RoomStaffPickEvent extends MessageHandler { } } - this.client.sendResponse(new RoomDataComposer(room, this.client.getHabbo(), true, false)); + this.client.sendResponse(new GetGuestRoomResultComposer(room, this.client.getHabbo(), true, false)); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemClothingEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemClothingEvent.java index 936b31df..44f746d9 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemClothingEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemClothingEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.users.HabboItem; 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.rooms.UpdateStackHeightComposer; +import com.eu.habbo.messages.outgoing.rooms.HeightMapUpdateMessageComposer; import com.eu.habbo.messages.outgoing.rooms.items.RemoveFloorItemComposer; import com.eu.habbo.messages.outgoing.users.FigureSetIdsComposer; import com.eu.habbo.threading.runnables.QueryDeleteHabboItem; @@ -40,7 +40,7 @@ public class RedeemClothingEvent extends MessageHandler { RoomTile tile = this.client.getHabbo().getHabboInfo().getCurrentRoom().getLayout().getTile(item.getX(), item.getY()); this.client.getHabbo().getHabboInfo().getCurrentRoom().removeHabboItem(item); this.client.getHabbo().getHabboInfo().getCurrentRoom().updateTile(tile); - this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new UpdateStackHeightComposer(tile.x, tile.y, tile.z, tile.relativeHeight()).compose()); + this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new HeightMapUpdateMessageComposer(tile.x, tile.y, tile.z, tile.relativeHeight()).compose()); this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RemoveFloorItemComposer(item, true).compose()); Emulator.getThreading().run(new QueryDeleteHabboItem(item.getId())); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemItemEvent.java index 79efa01b..ee38d3ea 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemItemEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemItemEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomTile; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.UpdateStackHeightComposer; +import com.eu.habbo.messages.outgoing.rooms.HeightMapUpdateMessageComposer; import com.eu.habbo.messages.outgoing.rooms.items.RemoveFloorItemComposer; import com.eu.habbo.messages.outgoing.users.CreditBalanceComposer; import com.eu.habbo.messages.outgoing.users.ActivityPointsMessageComposer; @@ -102,7 +102,7 @@ public class RedeemItemEvent extends MessageHandler { RoomTile t = room.getLayout().getTile(item.getX(), item.getY()); t.setStackHeight(room.getStackHeight(item.getX(), item.getY(), false)); room.updateTile(t); - room.sendComposer(new UpdateStackHeightComposer(item.getX(), item.getY(), t.z, t.relativeHeight()).compose()); + room.sendComposer(new HeightMapUpdateMessageComposer(item.getX(), item.getY(), t.z, t.relativeHeight()).compose()); Emulator.getThreading().run(new QueryDeleteHabboItem(item.getId())); switch (furniRedeemEvent.currencyID) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetStackHelperHeightEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetStackHelperHeightEvent.java index dce31447..3475237c 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetStackHelperHeightEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetStackHelperHeightEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomTile; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.UpdateStackHeightComposer; +import com.eu.habbo.messages.outgoing.rooms.HeightMapUpdateMessageComposer; import com.eu.habbo.messages.outgoing.rooms.items.UpdateStackHeightTileHeightComposer; import gnu.trove.set.hash.THashSet; @@ -51,7 +51,7 @@ public class SetStackHelperHeightEvent extends MessageHandler { item.needsUpdate(true); this.client.getHabbo().getHabboInfo().getCurrentRoom().updateItem(item); this.client.getHabbo().getHabboInfo().getCurrentRoom().updateTiles(tiles); - this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new UpdateStackHeightComposer(room, tiles).compose()); + this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new HeightMapUpdateMessageComposer(room, tiles).compose()); this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new UpdateStackHeightTileHeightComposer(item, (int) ((height) * 100)).compose()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetPackageNameEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetPackageNameEvent.java index 9fa2f4cb..998aa53d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetPackageNameEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetPackageNameEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.rooms.RoomTile; 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.rooms.UpdateStackHeightComposer; +import com.eu.habbo.messages.outgoing.rooms.HeightMapUpdateMessageComposer; import com.eu.habbo.messages.outgoing.rooms.items.RemoveFloorItemComposer; import com.eu.habbo.messages.outgoing.rooms.pets.PetPackageNameValidationComposer; import com.eu.habbo.threading.runnables.QueryDeleteHabboItem; @@ -62,7 +62,7 @@ public class PetPackageNameEvent extends MessageHandler { room.sendComposer(new RemoveFloorItemComposer(item).compose()); RoomTile tile = room.getLayout().getTile(item.getX(), item.getY()); room.updateTile(room.getLayout().getTile(item.getX(), item.getY())); - room.sendComposer(new UpdateStackHeightComposer(tile.x, tile.y, tile.z, tile.relativeHeight()).compose()); + room.sendComposer(new HeightMapUpdateMessageComposer(tile.x, tile.y, tile.z, tile.relativeHeight()).compose()); item.setUserId(0); } else { this.client.sendResponse(new AlertPurchaseFailedComposer(AlertPurchaseFailedComposer.SERVER_ERROR)); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/IgnoreRoomUserEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/IgnoreRoomUserEvent.java index 88621035..6042fc9d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/IgnoreRoomUserEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/IgnoreRoomUserEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.achievements.AchievementManager; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserIgnoredComposer; +import com.eu.habbo.messages.outgoing.rooms.users.IgnoreResultMessageComposer; public class IgnoreRoomUserEvent extends MessageHandler { @Override @@ -22,7 +22,7 @@ public class IgnoreRoomUserEvent extends MessageHandler { return; if (this.client.getHabbo().getHabboStats().ignoreUser(this.client, habbo.getHabboInfo().getId())) { - this.client.sendResponse(new RoomUserIgnoredComposer(habbo, RoomUserIgnoredComposer.IGNORED)); + this.client.sendResponse(new IgnoreResultMessageComposer(habbo, IgnoreResultMessageComposer.IGNORED)); AchievementManager.progressAchievement(this.client.getHabbo(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("SelfModIgnoreSeen")); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/UnIgnoreRoomUserEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/UnIgnoreRoomUserEvent.java index 39f131eb..05a8c813 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/UnIgnoreRoomUserEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/UnIgnoreRoomUserEvent.java @@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.rooms.users; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserIgnoredComposer; +import com.eu.habbo.messages.outgoing.rooms.users.IgnoreResultMessageComposer; public class UnIgnoreRoomUserEvent extends MessageHandler { @Override @@ -18,7 +18,7 @@ public class UnIgnoreRoomUserEvent extends MessageHandler { if (habbo != null) { if (habbo.getHabboStats().allowTalk()) { this.client.getHabbo().getHabboStats().unignoreUser(habbo.getHabboInfo().getId()); - this.client.sendResponse(new RoomUserIgnoredComposer(habbo, RoomUserIgnoredComposer.UNIGNORED)); + this.client.sendResponse(new IgnoreResultMessageComposer(habbo, IgnoreResultMessageComposer.UNIGNORED)); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/GetIgnoredUsersEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/GetIgnoredUsersEvent.java index bc3aebfb..b1b5d6f7 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/GetIgnoredUsersEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/GetIgnoredUsersEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboInfo; import com.eu.habbo.habbohotel.users.HabboManager; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.unknown.IgnoredUsersComposer; +import com.eu.habbo.messages.outgoing.unknown.IgnoredUsersMessageComposer; import gnu.trove.list.array.TIntArrayList; import java.util.ArrayList; @@ -28,6 +28,6 @@ public class GetIgnoredUsersEvent extends MessageHandler { if(user != null) ignoredUsernames.add(user.getUsername()); } - this.client.sendResponse(new IgnoredUsersComposer(ignoredUsernames)); + this.client.sendResponse(new IgnoredUsersMessageComposer(ignoredUsernames)); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/UserNuxEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/UserNuxEvent.java index f29fe54f..dd115c60 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/UserNuxEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/UserNuxEvent.java @@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.users; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.habboway.nux.NuxAlertComposer; +import com.eu.habbo.messages.outgoing.habboway.nux.InClientLinkMessageComposer; import java.util.HashMap; import java.util.Map; @@ -30,12 +30,12 @@ public class UserNuxEvent extends MessageHandler { int step = habbo.getHabboStats().nuxStep++; if (keys.containsKey(step)) { - habbo.getClient().sendResponse(new NuxAlertComposer("helpBubble/add/" + keys.get(step) + "/" + Emulator.getTexts().getValue("nux.step." + step))); + habbo.getClient().sendResponse(new InClientLinkMessageComposer("helpBubble/add/" + keys.get(step) + "/" + Emulator.getTexts().getValue("nux.step." + step))); } else if (!habbo.getHabboStats().nuxReward) { } else { - habbo.getClient().sendResponse(new NuxAlertComposer("nux/lobbyoffer/show")); + habbo.getClient().sendResponse(new InClientLinkMessageComposer("nux/lobbyoffer/show")); } } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/GiftConfigurationComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/GiftWrappingConfigurationComposer.java similarity index 95% rename from src/main/java/com/eu/habbo/messages/outgoing/catalog/GiftConfigurationComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/catalog/GiftWrappingConfigurationComposer.java index 3c091c3d..0e619434 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/GiftConfigurationComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/GiftWrappingConfigurationComposer.java @@ -9,7 +9,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -public class GiftConfigurationComposer extends MessageComposer { +public class GiftWrappingConfigurationComposer extends MessageComposer { public static List BOX_TYPES = Arrays.asList(0, 1, 2, 3, 4, 5, 6, 8); public static List RIBBON_TYPES = Arrays.asList(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/HabboClubOffersMessageComposer.java similarity index 88% rename from src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubDataComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/catalog/HabboClubOffersMessageComposer.java index 35a3808f..5b7b283f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/HabboClubOffersMessageComposer.java @@ -9,11 +9,11 @@ import com.eu.habbo.messages.outgoing.Outgoing; import java.util.List; -public class ClubDataComposer extends MessageComposer { +public class HabboClubOffersMessageComposer extends MessageComposer { private final int windowId; private final Habbo habbo; - public ClubDataComposer(Habbo habbo, int windowId) { + public HabboClubOffersMessageComposer(Habbo habbo, int windowId) { this.habbo = habbo; this.windowId = windowId; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxPrizeComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/GotMysteryBoxPrizeMessageComposer.java similarity index 80% rename from src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxPrizeComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/GotMysteryBoxPrizeMessageComposer.java index 9ec347e9..93977abf 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxPrizeComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/GotMysteryBoxPrizeMessageComposer.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 MysticBoxPrizeComposer extends MessageComposer { +public class GotMysteryBoxPrizeMessageComposer extends MessageComposer { private final String type; private final int itemId; - public MysticBoxPrizeComposer(String type, int itemId) { + public GotMysteryBoxPrizeMessageComposer(String type, int itemId) { this.type = type; this.itemId = itemId; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/UserSearchResultComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/HabboSearchResultComposer.java similarity index 90% rename from src/main/java/com/eu/habbo/messages/outgoing/friends/UserSearchResultComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/friends/HabboSearchResultComposer.java index 323bd6f6..fbf67a58 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/UserSearchResultComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/HabboSearchResultComposer.java @@ -11,14 +11,14 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.List; -public class UserSearchResultComposer extends MessageComposer { +public class HabboSearchResultComposer extends MessageComposer { private final THashSet users; private final THashSet friends; private final Habbo habbo; private static Comparator COMPARATOR = Comparator.comparing((MessengerBuddy b) -> b.getUsername().length()).thenComparing((MessengerBuddy b, MessengerBuddy b2) -> b.getUsername().compareToIgnoreCase(b2.getUsername())); - public UserSearchResultComposer(THashSet users, THashSet friends, Habbo habbo) { + public HabboSearchResultComposer(THashSet users, THashSet friends, Habbo habbo) { this.users = users; this.friends = friends; this.habbo = habbo; @@ -37,8 +37,8 @@ public class UserSearchResultComposer extends MessageComposer { List friends = new ArrayList<>(this.friends); - u.sort(UserSearchResultComposer.COMPARATOR); - friends.sort(UserSearchResultComposer.COMPARATOR); + u.sort(HabboSearchResultComposer.COMPARATOR); + friends.sort(HabboSearchResultComposer.COMPARATOR); this.response.appendInt(this.friends.size()); for (MessengerBuddy buddy : this.friends) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterAccountInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/Game2AccountGameStatusMessageComposer.java similarity index 80% rename from src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterAccountInfoComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/gamecenter/Game2AccountGameStatusMessageComposer.java index be72704f..1d6d8031 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterAccountInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/Game2AccountGameStatusMessageComposer.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 GameCenterAccountInfoComposer extends MessageComposer { +public class Game2AccountGameStatusMessageComposer extends MessageComposer { private final int gameId; private final int gamesLeft; - public GameCenterAccountInfoComposer(int gameId, int gamesLeft) { + public Game2AccountGameStatusMessageComposer(int gameId, int gamesLeft) { this.gameId = gameId; this.gamesLeft = gamesLeft; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterGameListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameListMessageComposer.java similarity index 95% rename from src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterGameListComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameListMessageComposer.java index d6574818..aacdc2a5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterGameListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameListMessageComposer.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class GameCenterGameListComposer extends MessageComposer { +public class GameListMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.GameListMessageComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericErrorMessagesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericErrorComposer.java similarity index 87% rename from src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericErrorMessagesComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericErrorComposer.java index 4de6a075..608f3643 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericErrorMessagesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericErrorComposer.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 GenericErrorMessagesComposer extends MessageComposer { +public class GenericErrorComposer extends MessageComposer { public static final int AUTHENTICATION_FAILED = -3; public static final int CONNECTING_TO_THE_SERVER_FAILED = -400; public static final int KICKED_OUT_OF_THE_ROOM = 4008; @@ -15,7 +15,7 @@ public class GenericErrorMessagesComposer extends MessageComposer { private final int errorCode; - public GenericErrorMessagesComposer(int errorCode) { + public GenericErrorComposer(int errorCode) { this.errorCode = errorCode; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericAlertComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HabboBroadcastMessageComposer.java similarity index 76% rename from src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericAlertComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HabboBroadcastMessageComposer.java index 5ca00df2..79d9e741 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericAlertComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HabboBroadcastMessageComposer.java @@ -5,14 +5,14 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class GenericAlertComposer extends MessageComposer { +public class HabboBroadcastMessageComposer extends MessageComposer { private final String message; - public GenericAlertComposer(String message) { + public HabboBroadcastMessageComposer(String message) { this.message = message; } - public GenericAlertComposer(String message, Habbo habbo) { + public HabboBroadcastMessageComposer(String message, Habbo habbo) { this.message = message.replace("%username%", habbo.getHabboInfo().getUsername()); } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideToolsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideOnDutyStatusMessageComposer.java similarity index 85% rename from src/main/java/com/eu/habbo/messages/outgoing/guides/GuideToolsComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guides/GuideOnDutyStatusMessageComposer.java index fc5cddba..4e0c4b7d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideToolsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideOnDutyStatusMessageComposer.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 GuideToolsComposer extends MessageComposer { +public class GuideOnDutyStatusMessageComposer extends MessageComposer { private final boolean onDuty; - public GuideToolsComposer(boolean onDuty) { + public GuideOnDutyStatusMessageComposer(boolean onDuty) { this.onDuty = onDuty; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionAttachedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionAttachedMessageComposer.java similarity index 86% rename from src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionAttachedComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionAttachedMessageComposer.java index f1f09a90..e7b620d7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionAttachedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionAttachedMessageComposer.java @@ -6,11 +6,11 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class GuideSessionAttachedComposer extends MessageComposer { +public class GuideSessionAttachedMessageComposer extends MessageComposer { private final GuideTour tour; private final boolean isHelper; - public GuideSessionAttachedComposer(GuideTour tour, boolean isHelper) { + public GuideSessionAttachedMessageComposer(GuideTour tour, boolean isHelper) { this.tour = tour; this.isHelper = isHelper; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionDetachedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionDetachedMessageComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionDetachedComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionDetachedMessageComposer.java index c98bbd1b..9c5ad5e4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionDetachedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionDetachedMessageComposer.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 GuideSessionDetachedComposer extends MessageComposer { +public class GuideSessionDetachedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.GuideSessionDetachedMessageComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionEndedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionEndedMessageComposer.java similarity index 81% rename from src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionEndedComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionEndedMessageComposer.java index 8701086e..f75d2433 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionEndedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionEndedMessageComposer.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 GuideSessionEndedComposer extends MessageComposer { +public class GuideSessionEndedMessageComposer extends MessageComposer { public static final int SOMETHING_WRONG = 0; public static final int HELP_CASE_CLOSED = 1; private final int errorCode; - public GuideSessionEndedComposer(int errorCode) { + public GuideSessionEndedMessageComposer(int errorCode) { this.errorCode = errorCode; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionErrorMessageComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionErrorComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionErrorMessageComposer.java index 19ebec9a..03788c33 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionErrorMessageComposer.java @@ -4,14 +4,14 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class GuideSessionErrorComposer extends MessageComposer { +public class GuideSessionErrorMessageComposer extends MessageComposer { public static final int SOMETHING_WRONG_REQUEST = 0; public static final int NO_HELPERS_AVAILABLE = 1; public static final int NO_GUARDIANS_AVAILABLE = 2; private final int errorCode; - public GuideSessionErrorComposer(int errorCode) { + public GuideSessionErrorMessageComposer(int errorCode) { this.errorCode = errorCode; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionInvitedToGuideRoomComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionInvitedToGuideRoomMessageComposer.java similarity index 81% rename from src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionInvitedToGuideRoomComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionInvitedToGuideRoomMessageComposer.java index a12a1f7d..a21a84de 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionInvitedToGuideRoomComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionInvitedToGuideRoomMessageComposer.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 GuideSessionInvitedToGuideRoomComposer extends MessageComposer { +public class GuideSessionInvitedToGuideRoomMessageComposer extends MessageComposer { private final Room room; - public GuideSessionInvitedToGuideRoomComposer(Room room) { + public GuideSessionInvitedToGuideRoomMessageComposer(Room room) { this.room = room; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionMessageMessageComposer.java similarity index 81% rename from src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionMessageComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionMessageMessageComposer.java index a7d83088..542888f1 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionMessageMessageComposer.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 GuideSessionMessageComposer extends MessageComposer { +public class GuideSessionMessageMessageComposer extends MessageComposer { private final GuideChatMessage message; - public GuideSessionMessageComposer(GuideChatMessage message) { + public GuideSessionMessageMessageComposer(GuideChatMessage message) { this.message = message; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionRequesterRoomComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionRequesterRoomMessageComposer.java similarity index 79% rename from src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionRequesterRoomComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionRequesterRoomMessageComposer.java index 8993d365..b7489cdc 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionRequesterRoomComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionRequesterRoomMessageComposer.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 GuideSessionRequesterRoomComposer extends MessageComposer { +public class GuideSessionRequesterRoomMessageComposer extends MessageComposer { private final Room room; - public GuideSessionRequesterRoomComposer(Room room) { + public GuideSessionRequesterRoomMessageComposer(Room room) { this.room = room; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/BullyReportClosedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideTicketResolutionMessageComposer.java similarity index 80% rename from src/main/java/com/eu/habbo/messages/outgoing/guides/BullyReportClosedComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guides/GuideTicketResolutionMessageComposer.java index 8b1bd97a..2ee20eeb 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/BullyReportClosedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideTicketResolutionMessageComposer.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 BullyReportClosedComposer extends MessageComposer { +public class GuideTicketResolutionMessageComposer extends MessageComposer { public final static int CLOSED = 1; public final static int MISUSE = 2; public final int code; - public BullyReportClosedComposer(int code) { + public GuideTicketResolutionMessageComposer(int code) { this.code = code; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildBoughtComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildCreatedMessageComposer.java similarity index 82% rename from src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildBoughtComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildCreatedMessageComposer.java index abbcb61d..9671b49a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildBoughtComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildCreatedMessageComposer.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 GuildBoughtComposer extends MessageComposer { +public class GuildCreatedMessageComposer extends MessageComposer { private final Guild guild; - public GuildBoughtComposer(Guild guild) { + public GuildCreatedMessageComposer(Guild guild) { this.guild = guild; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildBuyRoomsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildCreationInfoMessageComposer.java similarity index 91% rename from src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildBuyRoomsComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildCreationInfoMessageComposer.java index efa3a8a5..67d105d4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildBuyRoomsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildCreationInfoMessageComposer.java @@ -7,10 +7,10 @@ import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; import gnu.trove.set.hash.THashSet; -public class GuildBuyRoomsComposer extends MessageComposer { +public class GuildCreationInfoMessageComposer extends MessageComposer { private final THashSet rooms; - public GuildBuyRoomsComposer(THashSet rooms) { + public GuildCreationInfoMessageComposer(THashSet rooms) { this.rooms = rooms; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditFailComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditFailedMessageComposer.java similarity index 84% rename from src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditFailComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditFailedMessageComposer.java index bc5b0004..f2dfb5cc 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditFailComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditFailedMessageComposer.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 GuildEditFailComposer extends MessageComposer { +public class GuildEditFailedMessageComposer extends MessageComposer { public static final int ROOM_ALREADY_IN_USE = 0; public static final int INVALID_GUILD_NAME = 1; public static final int HC_REQUIRED = 2; @@ -12,7 +12,7 @@ public class GuildEditFailComposer extends MessageComposer { private int errorCode; - public GuildEditFailComposer(int errorCode) { + public GuildEditFailedMessageComposer(int errorCode) { this.errorCode = errorCode; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildManageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditInfoMessageComposer.java similarity index 95% rename from src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildManageComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditInfoMessageComposer.java index 95a33445..d48d538d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildManageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditInfoMessageComposer.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 GuildManageComposer extends MessageComposer { +public class GuildEditInfoMessageComposer extends MessageComposer { private final Guild guild; - public GuildManageComposer(Guild guild) { + public GuildEditInfoMessageComposer(Guild guild) { this.guild = guild; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildPartsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditorDataMessageComposer.java similarity index 96% rename from src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildPartsComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditorDataMessageComposer.java index 555880ee..9e310c4e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildPartsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditorDataMessageComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class GuildPartsComposer extends MessageComposer { +public class GuildEditorDataMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.GuildEditorDataMessageComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFurniWidgetComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFurniContextMenuInfoMessageComposer.java similarity index 86% rename from src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFurniWidgetComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFurniContextMenuInfoMessageComposer.java index 8759dad3..c042f6c2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFurniWidgetComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFurniContextMenuInfoMessageComposer.java @@ -8,12 +8,12 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class GuildFurniWidgetComposer extends MessageComposer { +public class GuildFurniContextMenuInfoMessageComposer extends MessageComposer { private final HabboItem item; private final Guild guild; private final Habbo habbo; - public GuildFurniWidgetComposer(Habbo habbo, Guild guild, HabboItem item) { + public GuildFurniContextMenuInfoMessageComposer(Habbo habbo, Guild guild, HabboItem item) { this.habbo = habbo; this.item = item; this.guild = guild; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildConfirmRemoveMemberComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMemberFurniCountInHQMessageComposer.java similarity index 78% rename from src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildConfirmRemoveMemberComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMemberFurniCountInHQMessageComposer.java index a4df4559..181c397f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildConfirmRemoveMemberComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMemberFurniCountInHQMessageComposer.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 GuildConfirmRemoveMemberComposer extends MessageComposer { +public class GuildMemberFurniCountInHQMessageComposer extends MessageComposer { private int userId; private int furniCount; - public GuildConfirmRemoveMemberComposer(int userId, int furniCount) { + public GuildMemberFurniCountInHQMessageComposer(int userId, int furniCount) { this.userId = userId; this.furniCount = furniCount; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildAcceptMemberErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMemberMgmtFailedMessageComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildAcceptMemberErrorComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMemberMgmtFailedMessageComposer.java index 2450694a..76d0914a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildAcceptMemberErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMemberMgmtFailedMessageComposer.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 GuildAcceptMemberErrorComposer extends MessageComposer { +public class GuildMemberMgmtFailedMessageComposer extends MessageComposer { public final static int NO_LONGER_MEMBER = 0; public final static int ALREADY_REJECTED = 1; public final static int ALREADY_ACCEPTED = 2; @@ -12,7 +12,7 @@ public class GuildAcceptMemberErrorComposer extends MessageComposer { private final int guildId; private final int errorCode; - public GuildAcceptMemberErrorComposer(int guildId, int errorCode) { + public GuildMemberMgmtFailedMessageComposer(int guildId, int errorCode) { this.guildId = guildId; this.errorCode = errorCode; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildRefreshMembersListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembershipRejectedMessageComposer.java similarity index 80% rename from src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildRefreshMembersListComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembershipRejectedMessageComposer.java index 2aeaa2df..2e3c6867 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildRefreshMembersListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembershipRejectedMessageComposer.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 GuildRefreshMembersListComposer extends MessageComposer { +public class GuildMembershipRejectedMessageComposer extends MessageComposer { private final Guild guild; - public GuildRefreshMembersListComposer(Guild guild) { + public GuildMembershipRejectedMessageComposer(Guild guild) { this.guild = guild; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMemberUpdateComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembershipUpdatedMessageComposer.java similarity index 86% rename from src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMemberUpdateComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembershipUpdatedMessageComposer.java index 2c7dc9ff..21f9d141 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMemberUpdateComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembershipUpdatedMessageComposer.java @@ -6,11 +6,11 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class GuildMemberUpdateComposer extends MessageComposer { +public class GuildMembershipUpdatedMessageComposer extends MessageComposer { private final Guild guild; private final GuildMember guildMember; - public GuildMemberUpdateComposer(Guild guild, GuildMember guildMember) { + public GuildMembershipUpdatedMessageComposer(Guild guild, GuildMember guildMember) { this.guildMember = guildMember; this.guild = guild; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembershipsMessageComposer.java similarity index 90% rename from src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildListComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembershipsMessageComposer.java index 0cc82f50..48c2eaa5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembershipsMessageComposer.java @@ -8,11 +8,11 @@ import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; import gnu.trove.set.hash.THashSet; -public class GuildListComposer extends MessageComposer { +public class GuildMembershipsMessageComposer extends MessageComposer { private final THashSet guilds; private final Habbo habbo; - public GuildListComposer(THashSet guilds, Habbo habbo) { + public GuildMembershipsMessageComposer(THashSet guilds, Habbo habbo) { this.guilds = guilds; this.habbo = habbo; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/RemoveGuildFromRoomComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/HabboGroupDeactivatedMessageComposer.java similarity index 77% rename from src/main/java/com/eu/habbo/messages/outgoing/guilds/RemoveGuildFromRoomComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guilds/HabboGroupDeactivatedMessageComposer.java index 998d134b..f4e20f9a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/RemoveGuildFromRoomComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/HabboGroupDeactivatedMessageComposer.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 RemoveGuildFromRoomComposer extends MessageComposer { +public class HabboGroupDeactivatedMessageComposer extends MessageComposer { private int guildId; - public RemoveGuildFromRoomComposer(int guildId) { + public HabboGroupDeactivatedMessageComposer(int guildId) { this.guildId = guildId; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildJoinErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/HabboGroupJoinFailedMessageComposer.java similarity index 86% rename from src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildJoinErrorComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guilds/HabboGroupJoinFailedMessageComposer.java index 2918f38e..e0e101cb 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildJoinErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/HabboGroupJoinFailedMessageComposer.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 GuildJoinErrorComposer extends MessageComposer { +public class HabboGroupJoinFailedMessageComposer extends MessageComposer { public static final int GROUP_FULL = 0; public static final int GROUP_LIMIT_EXCEED = 1; public static final int GROUP_CLOSED = 2; @@ -15,7 +15,7 @@ public class GuildJoinErrorComposer extends MessageComposer { private final int code; - public GuildJoinErrorComposer(int code) { + public HabboGroupJoinFailedMessageComposer(int code) { this.code = code; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NuxAlertComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/InClientLinkMessageComposer.java similarity index 79% rename from src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NuxAlertComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/InClientLinkMessageComposer.java index d9625ef5..129b7995 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NuxAlertComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/InClientLinkMessageComposer.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 NuxAlertComposer extends MessageComposer { +public class InClientLinkMessageComposer extends MessageComposer { private final String link; - public NuxAlertComposer(String link) { + public InClientLinkMessageComposer(String link) { this.link = link; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportRequestComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/GuideReportingStatusMessageComposer.java similarity index 90% rename from src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportRequestComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/modtool/GuideReportingStatusMessageComposer.java index 5f0b4dd9..9087da75 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportRequestComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/GuideReportingStatusMessageComposer.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 BullyReportRequestComposer extends MessageComposer { +public class GuideReportingStatusMessageComposer extends MessageComposer { public static final int START_REPORT = 0; public static final int ONGOING_HELPER_CASE = 1; public static final int INVALID_REQUESTS = 2; @@ -13,7 +13,7 @@ public class BullyReportRequestComposer extends MessageComposer { private final int errorCode; private final int errorCodeType; - public BullyReportRequestComposer(int errorCode, int errorCodeType) { + public GuideReportingStatusMessageComposer(int errorCode, int errorCodeType) { this.errorCode = errorCode; this.errorCodeType = errorCodeType; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/GuideTicketCreationResultMessageComposer.java similarity index 82% rename from src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportedMessageComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/modtool/GuideTicketCreationResultMessageComposer.java index 129df101..829a57ad 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/GuideTicketCreationResultMessageComposer.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 BullyReportedMessageComposer extends MessageComposer { +public class GuideTicketCreationResultMessageComposer extends MessageComposer { public static final int RECEIVED = 0; public static final int IGNORED = 1; public static final int NO_CHAT = 2; @@ -13,7 +13,7 @@ public class BullyReportedMessageComposer extends MessageComposer { private final int code; - public BullyReportedMessageComposer(int code) { + public GuideTicketCreationResultMessageComposer(int code) { this.code = code; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/PrivateRoomsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/GuestRoomSearchResultComposer.java similarity index 89% rename from src/main/java/com/eu/habbo/messages/outgoing/navigator/PrivateRoomsComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/navigator/GuestRoomSearchResultComposer.java index 0ceec7db..714f89d4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/PrivateRoomsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/GuestRoomSearchResultComposer.java @@ -9,12 +9,12 @@ import org.slf4j.LoggerFactory; import java.util.List; -public class PrivateRoomsComposer extends MessageComposer { - private static final Logger LOGGER = LoggerFactory.getLogger(PrivateRoomsComposer.class); +public class GuestRoomSearchResultComposer extends MessageComposer { + private static final Logger LOGGER = LoggerFactory.getLogger(GuestRoomSearchResultComposer.class); private final List rooms; - public PrivateRoomsComposer(List rooms) { + public GuestRoomSearchResultComposer(List rooms) { this.rooms = rooms; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/FreezeLivesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/GamePlayerValueMessageComposer.java similarity index 82% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/FreezeLivesComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/GamePlayerValueMessageComposer.java index 3e0b45df..6f6ab8dd 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/FreezeLivesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/GamePlayerValueMessageComposer.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 FreezeLivesComposer extends MessageComposer { +public class GamePlayerValueMessageComposer extends MessageComposer { private final FreezeGamePlayer gamePlayer; - public FreezeLivesComposer(FreezeGamePlayer gamePlayer) { + public GamePlayerValueMessageComposer(FreezeGamePlayer gamePlayer) { this.gamePlayer = gamePlayer; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/GetGuestRoomResultComposer.java similarity index 96% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomDataComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/GetGuestRoomResultComposer.java index 6dd4f750..26d28a57 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/GetGuestRoomResultComposer.java @@ -8,13 +8,13 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class RoomDataComposer extends MessageComposer { +public class GetGuestRoomResultComposer extends MessageComposer { private final Room room; private final Habbo habbo; private final boolean roomForward; private final boolean enterRoom; - public RoomDataComposer(Room room, Habbo habbo, boolean roomForward, boolean enterRoom) { + public GetGuestRoomResultComposer(Room room, Habbo habbo, boolean roomForward, boolean enterRoom) { this.room = room; this.habbo = habbo; this.roomForward = roomForward; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRelativeMapComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/HeightMapComposer.java similarity index 92% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRelativeMapComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/HeightMapComposer.java index e31ed8c2..271fd85c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRelativeMapComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/HeightMapComposer.java @@ -7,10 +7,10 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class RoomRelativeMapComposer extends MessageComposer { +public class HeightMapComposer extends MessageComposer { private final Room room; - public RoomRelativeMapComposer(Room room) { + public HeightMapComposer(Room room) { this.room = room; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/UpdateStackHeightComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/UpdateStackHeightComposer.java deleted file mode 100644 index c16a69f2..00000000 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/UpdateStackHeightComposer.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.eu.habbo.messages.outgoing.rooms; - -import com.eu.habbo.Emulator; -import com.eu.habbo.habbohotel.rooms.Room; -import com.eu.habbo.habbohotel.rooms.RoomTile; -import com.eu.habbo.messages.ServerMessage; -import com.eu.habbo.messages.outgoing.MessageComposer; -import com.eu.habbo.messages.outgoing.Outgoing; -import gnu.trove.set.hash.THashSet; - -public class UpdateStackHeightComposer extends MessageComposer { - private int x; - private int y; - private short z; - private double height; - - private THashSet updateTiles; - private Room room; - - public UpdateStackHeightComposer(int x, int y, short z, double height) { - this.x = x; - this.y = y; - this.z = z; - this.height = height; - } - - public UpdateStackHeightComposer(Room room, THashSet updateTiles) { - this.updateTiles = updateTiles; - this.room = room; - } - - @Override - protected ServerMessage composeInternal() { - //TODO: maybe do this another way? doesn't seem to be very clean but gets the job done - this.response.init(Outgoing.HeightMapUpdateMessageComposer); - if (this.updateTiles != null) { - // prevent overflow. Byte max value is 127 - if(this.updateTiles.size() > 127) { - RoomTile[] tiles = this.updateTiles.toArray(new RoomTile[updateTiles.size()]); - this.response.appendByte(127); - for(int i = 0; i < 127; i++) { - RoomTile t = tiles[i]; - updateTiles.remove(t); // remove it from the set - this.response.appendByte((int) t.x); - this.response.appendByte((int) t.y); - if(Emulator.getConfig().getBoolean("custom.stacking.enabled")) { - this.response.appendShort((short) (t.z * 256.0)); - } - else { - this.response.appendShort(t.relativeHeight()); - } - } - //send the remaining tiles in a new message - this.room.sendComposer(new UpdateStackHeightComposer(this.room, updateTiles).compose()); - return this.response; - } - - this.response.appendByte(this.updateTiles.size()); - for (RoomTile t : this.updateTiles) { - this.response.appendByte((int) t.x); - this.response.appendByte((int) t.y); - if(Emulator.getConfig().getBoolean("custom.stacking.enabled")) { - this.response.appendShort((short) (t.z * 256.0)); - } - else { - this.response.appendShort(t.relativeHeight()); - } - } - } else { - this.response.appendByte(1); - this.response.appendByte(this.x); - this.response.appendByte(this.y); - if(Emulator.getConfig().getBoolean("custom.stacking.enabled")) { - this.response.appendShort((short) (this.z * 256.0)); - } - else { - this.response.appendShort((int) (this.height)); - } - } - return this.response; - } -} diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingStartFailedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/GoToBreedingNestFailureComposer.java similarity index 86% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingStartFailedComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/GoToBreedingNestFailureComposer.java index a6ba48bb..39200719 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingStartFailedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/GoToBreedingNestFailureComposer.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 PetBreedingStartFailedComposer extends MessageComposer { +public class GoToBreedingNestFailureComposer extends MessageComposer { public final static int NO_NESTS = 0; public final static int NO_SUITABLE_NESTS = 1; public final static int NEST_FULL = 2; @@ -15,7 +15,7 @@ public class PetBreedingStartFailedComposer extends MessageComposer { private final int reason; - public PetBreedingStartFailedComposer(int reason) { + public GoToBreedingNestFailureComposer(int reason) { this.reason = reason; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersAddGuildBadgeComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/HabboAddGroupBadgesMessageComposer.java similarity index 82% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersAddGuildBadgeComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/users/HabboAddGroupBadgesMessageComposer.java index 601d9ebc..de3687d8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersAddGuildBadgeComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/HabboAddGroupBadgesMessageComposer.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 RoomUsersAddGuildBadgeComposer extends MessageComposer { +public class HabboAddGroupBadgesMessageComposer extends MessageComposer { private final Guild guild; - public RoomUsersAddGuildBadgeComposer(Guild guild) { + public HabboAddGroupBadgesMessageComposer(Guild guild) { this.guild = guild; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersGuildBadgesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/HabboGroupBadgesMessageComposer.java similarity index 72% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersGuildBadgesComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/users/HabboGroupBadgesMessageComposer.java index 578d49a8..3a85d5f8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersGuildBadgesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/HabboGroupBadgesMessageComposer.java @@ -6,10 +6,10 @@ import com.eu.habbo.messages.outgoing.Outgoing; import gnu.trove.map.hash.THashMap; import gnu.trove.procedure.TObjectObjectProcedure; -public class RoomUsersGuildBadgesComposer extends MessageComposer { +public class HabboGroupBadgesMessageComposer extends MessageComposer { private final THashMap guildBadges; - public RoomUsersGuildBadgesComposer(THashMap guildBadges) { + public HabboGroupBadgesMessageComposer(THashMap guildBadges) { this.guildBadges = guildBadges; } @@ -21,8 +21,8 @@ public class RoomUsersGuildBadgesComposer extends MessageComposer { this.guildBadges.forEachEntry(new TObjectObjectProcedure() { @Override public boolean execute(Integer guildId, String badge) { - RoomUsersGuildBadgesComposer.this.response.appendInt(guildId); - RoomUsersGuildBadgesComposer.this.response.appendString(badge); + HabboGroupBadgesMessageComposer.this.response.appendInt(guildId); + HabboGroupBadgesMessageComposer.this.response.appendString(badge); return true; } }); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserReceivedHandItemComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/HandItemReceivedMessageComposer.java similarity index 81% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserReceivedHandItemComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/users/HandItemReceivedMessageComposer.java index f8fe427f..37b5a54f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserReceivedHandItemComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/HandItemReceivedMessageComposer.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 RoomUserReceivedHandItemComposer extends MessageComposer { +public class HandItemReceivedMessageComposer extends MessageComposer { private RoomUnit from; private int handItem; - public RoomUserReceivedHandItemComposer(RoomUnit from, int handItem) { + public HandItemReceivedMessageComposer(RoomUnit from, int handItem) { this.from = from; this.handItem = handItem; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserIgnoredComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/IgnoreResultMessageComposer.java similarity index 85% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserIgnoredComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/users/IgnoreResultMessageComposer.java index c7b28532..5c833c99 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserIgnoredComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/IgnoreResultMessageComposer.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class RoomUserIgnoredComposer extends MessageComposer { +public class IgnoreResultMessageComposer extends MessageComposer { public final static int IGNORED = 1; public final static int MUTED = 2; public final static int UNIGNORED = 3; @@ -13,7 +13,7 @@ public class RoomUserIgnoredComposer extends MessageComposer { private final Habbo habbo; private final int state; - public RoomUserIgnoredComposer(Habbo habbo, int state) { + public IgnoreResultMessageComposer(Habbo habbo, int state) { this.habbo = habbo; this.state = state; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownGuild2Composer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/GroupDetailsChangedMessageComposer.java similarity index 78% rename from src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownGuild2Composer.java rename to src/main/java/com/eu/habbo/messages/outgoing/unknown/GroupDetailsChangedMessageComposer.java index 29532717..e27c29f1 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownGuild2Composer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/GroupDetailsChangedMessageComposer.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 UnknownGuild2Composer extends MessageComposer { +public class GroupDetailsChangedMessageComposer extends MessageComposer { private final int guildId; - public UnknownGuild2Composer(int guildId) { + public GroupDetailsChangedMessageComposer(int guildId) { this.guildId = guildId; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ExtendClubMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/HabboClubExtendOfferMessageComposer.java similarity index 84% rename from src/main/java/com/eu/habbo/messages/outgoing/unknown/ExtendClubMessageComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/unknown/HabboClubExtendOfferMessageComposer.java index 271f23dc..487a8003 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ExtendClubMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/HabboClubExtendOfferMessageComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class ExtendClubMessageComposer extends MessageComposer { +public class HabboClubExtendOfferMessageComposer extends MessageComposer { private final Habbo habbo; private final ClubOffer offer; private final int normalCreditCost; @@ -14,7 +14,7 @@ public class ExtendClubMessageComposer extends MessageComposer { private final int pointsType; private final int daysRemaining; - public ExtendClubMessageComposer(Habbo habbo, ClubOffer offer, int normalCreditCost, int normalPointsCost, int pointsType, int daysRemaining) { + public HabboClubExtendOfferMessageComposer(Habbo habbo, ClubOffer offer, int normalCreditCost, int normalPointsCost, int pointsType, int daysRemaining) { this.habbo = habbo; this.offer = offer; this.normalCreditCost = normalCreditCost; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownRoomViewerComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/IdentityAccountsComposer.java similarity index 84% rename from src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownRoomViewerComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/unknown/IdentityAccountsComposer.java index 70dc98a4..dc0c549e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownRoomViewerComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/IdentityAccountsComposer.java @@ -6,10 +6,10 @@ import com.eu.habbo.messages.outgoing.Outgoing; import java.util.Map; -public class UnknownRoomViewerComposer extends MessageComposer { +public class IdentityAccountsComposer extends MessageComposer { private final Map unknownMap; - public UnknownRoomViewerComposer(Map unknownMap) { + public IdentityAccountsComposer(Map unknownMap) { this.unknownMap = unknownMap; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/IgnoredUsersComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/IgnoredUsersMessageComposer.java similarity index 78% rename from src/main/java/com/eu/habbo/messages/outgoing/unknown/IgnoredUsersComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/unknown/IgnoredUsersMessageComposer.java index 8383daa7..97668992 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/IgnoredUsersComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/IgnoredUsersMessageComposer.java @@ -6,11 +6,11 @@ import com.eu.habbo.messages.outgoing.Outgoing; import java.util.ArrayList; -public class IgnoredUsersComposer extends MessageComposer { +public class IgnoredUsersMessageComposer extends MessageComposer { ArrayList ignoredUsers; - public IgnoredUsersComposer(ArrayList ignoredUsers) { + public IgnoredUsersMessageComposer(ArrayList ignoredUsers) { this.ignoredUsers = ignoredUsers; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserPointsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/HabboActivityPointNotificationMessageComposer.java similarity index 79% rename from src/main/java/com/eu/habbo/messages/outgoing/users/UserPointsComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/users/HabboActivityPointNotificationMessageComposer.java index 56997c6c..ee99e9f9 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserPointsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/HabboActivityPointNotificationMessageComposer.java @@ -4,12 +4,12 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class UserPointsComposer extends MessageComposer { +public class HabboActivityPointNotificationMessageComposer extends MessageComposer { private final int currentAmount; private final int amountAdded; private final int type; - public UserPointsComposer(int currentAmount, int amountAdded, int type) { + public HabboActivityPointNotificationMessageComposer(int currentAmount, int amountAdded, int type) { this.currentAmount = currentAmount; this.amountAdded = amountAdded; this.type = type; 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 70989239..527858a9 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/HotelAlert.java +++ b/src/main/java/com/eu/habbo/messages/rcon/HotelAlert.java @@ -3,7 +3,7 @@ package com.eu.habbo.messages.rcon; 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.GenericAlertComposer; +import com.eu.habbo.messages.outgoing.generic.alerts.HabboBroadcastMessageComposer; import com.eu.habbo.messages.outgoing.generic.alerts.StaffAlertWithLinkComposer; import com.google.gson.Gson; @@ -19,7 +19,7 @@ public class HotelAlert extends RCONMessage { public void handle(Gson gson, JSONHotelAlert object) { ServerMessage serverMessage; if (object.url.isEmpty()) { - serverMessage = new GenericAlertComposer(object.message).compose(); + serverMessage = new HabboBroadcastMessageComposer(object.message).compose(); } else { serverMessage = new StaffAlertWithLinkComposer(object.message, object.url).compose(); } 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 f1ce6d2b..a481675f 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/UpdateCatalog.java +++ b/src/main/java/com/eu/habbo/messages/rcon/UpdateCatalog.java @@ -18,7 +18,7 @@ public class UpdateCatalog extends RCONMessage Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new BuildersClubFurniCountMessageComposer(0)); Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new BundleDiscountRulesetMessageComposer()); Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new MarketplaceConfigComposer()); - Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new GiftConfigurationComposer()); + 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/CameraUpdateNotification.java b/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraUpdateNotification.java index 358e8e1c..c2d662dc 100644 --- a/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraUpdateNotification.java +++ b/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraUpdateNotification.java @@ -1,7 +1,7 @@ package com.eu.habbo.networking.camera.messages.incoming; import com.eu.habbo.Emulator; -import com.eu.habbo.messages.outgoing.generic.alerts.GenericAlertComposer; +import com.eu.habbo.messages.outgoing.generic.alerts.HabboBroadcastMessageComposer; import com.eu.habbo.networking.camera.CameraIncomingMessage; import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; @@ -31,7 +31,7 @@ public class CameraUpdateNotification extends CameraIncomingMessage { } if (alert) { - Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new GenericAlertComposer(message).compose()); + Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new HabboBroadcastMessageComposer(message).compose()); } } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/plugin/PluginManager.java b/src/main/java/com/eu/habbo/plugin/PluginManager.java index a5072ecc..fcab80ea 100644 --- a/src/main/java/com/eu/habbo/plugin/PluginManager.java +++ b/src/main/java/com/eu/habbo/plugin/PluginManager.java @@ -36,7 +36,7 @@ import com.eu.habbo.messages.incoming.hotelview.HotelViewRequestLTDAvailabilityE import com.eu.habbo.messages.incoming.rooms.promotions.BuyRoomPromotionEvent; import com.eu.habbo.messages.incoming.users.ChangeNameCheckUsernameEvent; import com.eu.habbo.messages.outgoing.catalog.BundleDiscountRulesetMessageComposer; -import com.eu.habbo.messages.outgoing.catalog.GiftConfigurationComposer; +import com.eu.habbo.messages.outgoing.catalog.GiftWrappingConfigurationComposer; import com.eu.habbo.messages.outgoing.navigator.NewNavigatorEventCategoriesComposer; import com.eu.habbo.plugin.events.emulator.EmulatorConfigUpdatedEvent; import com.eu.habbo.plugin.events.emulator.EmulatorLoadedEvent; @@ -222,8 +222,8 @@ public class PluginManager { } if (Emulator.isReady) { - GiftConfigurationComposer.BOX_TYPES = Arrays.stream(Emulator.getConfig().getValue("hotel.gifts.box_types").split(",")).mapToInt(Integer::parseInt).boxed().collect(Collectors.toList()); - GiftConfigurationComposer.RIBBON_TYPES = Arrays.stream(Emulator.getConfig().getValue("hotel.gifts.ribbon_types").split(",")).mapToInt(Integer::parseInt).boxed().collect(Collectors.toList()); + GiftWrappingConfigurationComposer.BOX_TYPES = Arrays.stream(Emulator.getConfig().getValue("hotel.gifts.box_types").split(",")).mapToInt(Integer::parseInt).boxed().collect(Collectors.toList()); + GiftWrappingConfigurationComposer.RIBBON_TYPES = Arrays.stream(Emulator.getConfig().getValue("hotel.gifts.ribbon_types").split(",")).mapToInt(Integer::parseInt).boxed().collect(Collectors.toList()); Emulator.getGameEnvironment().getCreditsScheduler().reloadConfig(); Emulator.getGameEnvironment().getPointsScheduler().reloadConfig(); diff --git a/src/main/java/com/eu/habbo/threading/runnables/GuideFindNewHelper.java b/src/main/java/com/eu/habbo/threading/runnables/GuideFindNewHelper.java index cb873097..a495f977 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/GuideFindNewHelper.java +++ b/src/main/java/com/eu/habbo/threading/runnables/GuideFindNewHelper.java @@ -3,7 +3,7 @@ package com.eu.habbo.threading.runnables; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.guides.GuideTour; import com.eu.habbo.habbohotel.users.Habbo; -import com.eu.habbo.messages.outgoing.guides.GuideSessionDetachedComposer; +import com.eu.habbo.messages.outgoing.guides.GuideSessionDetachedMessageComposer; public class GuideFindNewHelper implements Runnable { private final GuideTour tour; @@ -20,7 +20,7 @@ public class GuideFindNewHelper implements Runnable { public void run() { if (!this.tour.isEnded() && this.tour.checkSum == this.checkSum && this.tour.getHelper() == null) { if (this.helper != null && this.helper.getClient() != null) { - this.helper.getClient().sendResponse(new GuideSessionDetachedComposer()); + this.helper.getClient().sendResponse(new GuideSessionDetachedMessageComposer()); } Emulator.getGameEnvironment().getGuideManager().findHelper(this.tour); diff --git a/src/main/java/com/eu/habbo/threading/runnables/HabboGiveHandItemToHabbo.java b/src/main/java/com/eu/habbo/threading/runnables/HabboGiveHandItemToHabbo.java index 9a6eb5d8..645e3155 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/HabboGiveHandItemToHabbo.java +++ b/src/main/java/com/eu/habbo/threading/runnables/HabboGiveHandItemToHabbo.java @@ -2,7 +2,7 @@ package com.eu.habbo.threading.runnables; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.outgoing.rooms.users.CarryObjectMessageComposer; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserReceivedHandItemComposer; +import com.eu.habbo.messages.outgoing.rooms.users.HandItemReceivedMessageComposer; public class HabboGiveHandItemToHabbo implements Runnable { private final Habbo target; @@ -28,7 +28,7 @@ public class HabboGiveHandItemToHabbo implements Runnable { this.from.getHabboInfo().getCurrentRoom().sendComposer(new CarryObjectMessageComposer(this.from.getRoomUnit()).compose()); this.target.getRoomUnit().lookAtPoint(this.from.getRoomUnit().getCurrentLocation()); this.target.getRoomUnit().statusUpdate(true); - this.target.getClient().sendResponse(new RoomUserReceivedHandItemComposer(this.from.getRoomUnit(), itemId)); + this.target.getClient().sendResponse(new HandItemReceivedMessageComposer(this.from.getRoomUnit(), itemId)); this.target.getRoomUnit().setHandItem(itemId); this.target.getHabboInfo().getCurrentRoom().sendComposer(new CarryObjectMessageComposer(this.target.getRoomUnit()).compose()); } diff --git a/src/main/java/com/eu/habbo/threading/runnables/RemoveFloorItemTask.java b/src/main/java/com/eu/habbo/threading/runnables/RemoveFloorItemTask.java index 3a5b7aa7..4c21fb64 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/RemoveFloorItemTask.java +++ b/src/main/java/com/eu/habbo/threading/runnables/RemoveFloorItemTask.java @@ -3,7 +3,7 @@ package com.eu.habbo.threading.runnables; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomTile; import com.eu.habbo.habbohotel.users.HabboItem; -import com.eu.habbo.messages.outgoing.rooms.UpdateStackHeightComposer; +import com.eu.habbo.messages.outgoing.rooms.HeightMapUpdateMessageComposer; import com.eu.habbo.messages.outgoing.rooms.items.RemoveFloorItemComposer; class RemoveFloorItemTask implements Runnable { @@ -24,6 +24,6 @@ class RemoveFloorItemTask implements Runnable { this.room.removeHabboItem(this.item); this.room.updateTile(tile); this.room.sendComposer(new RemoveFloorItemComposer(this.item, true).compose()); - this.room.sendComposer(new UpdateStackHeightComposer(this.item.getX(), this.item.getY(), tile.z, tile.relativeHeight()).compose()); + this.room.sendComposer(new HeightMapUpdateMessageComposer(this.item.getX(), this.item.getY(), tile.relativeHeight()).compose()); } }