diff --git a/src/main/java/com/eu/habbo/core/CleanerThread.java b/src/main/java/com/eu/habbo/core/CleanerThread.java index e9e2f122..e907d0ab 100644 --- a/src/main/java/com/eu/habbo/core/CleanerThread.java +++ b/src/main/java/com/eu/habbo/core/CleanerThread.java @@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.guilds.forums.ForumThread; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.friends.SearchUserEvent; import com.eu.habbo.messages.incoming.navigator.SearchRoomsEvent; -import com.eu.habbo.messages.outgoing.users.UserDataComposer; +import com.eu.habbo.messages.outgoing.users.UserObjectComposer; import com.eu.habbo.threading.runnables.AchievementUpdater; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -147,7 +147,7 @@ public class CleanerThread implements Runnable { for (Habbo habbo : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().values()) { habbo.getHabboStats().respectPointsToGive = Emulator.getConfig().getInt("hotel.daily.respect"); habbo.getHabboStats().petRespectPointsToGive = Emulator.getConfig().getInt("hotel.daily.respect.pets"); - habbo.getClient().sendResponse(new UserDataComposer(habbo)); + habbo.getClient().sendResponse(new UserObjectComposer(habbo)); } } } diff --git a/src/main/java/com/eu/habbo/core/Easter.java b/src/main/java/com/eu/habbo/core/Easter.java index f358dbc8..cc5431d7 100644 --- a/src/main/java/com/eu/habbo/core/Easter.java +++ b/src/main/java/com/eu/habbo/core/Easter.java @@ -4,8 +4,8 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomChatMessage; import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserRemoveComposer; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserWhisperComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserRemoveMessageComposer; +import com.eu.habbo.messages.outgoing.rooms.users.WhisperMessageComposer; import com.eu.habbo.plugin.EventHandler; import com.eu.habbo.plugin.events.users.UserSavedMottoEvent; @@ -13,11 +13,11 @@ public class Easter { @EventHandler public static void onUserChangeMotto(UserSavedMottoEvent event) { if (Emulator.getConfig().getBoolean("easter_eggs.enabled") && event.newMotto.equalsIgnoreCase("crickey!")) { - event.habbo.getClient().sendResponse(new RoomUserWhisperComposer(new RoomChatMessage(event.newMotto, event.habbo, event.habbo, RoomChatMessageBubbles.ALERT))); + event.habbo.getClient().sendResponse(new WhisperMessageComposer(new RoomChatMessage(event.newMotto, event.habbo, event.habbo, RoomChatMessageBubbles.ALERT))); Room room = event.habbo.getHabboInfo().getCurrentRoom(); - room.sendComposer(new RoomUserRemoveComposer(event.habbo.getRoomUnit()).compose()); + room.sendComposer(new UserRemoveMessageComposer(event.habbo.getRoomUnit()).compose()); room.sendComposer(new RoomUserPetComposer(2, 1, "FFFFFF", event.habbo).compose()); } diff --git a/src/main/java/com/eu/habbo/habbohotel/achievements/AchievementManager.java b/src/main/java/com/eu/habbo/habbohotel/achievements/AchievementManager.java index c5ca94f5..693c7bd0 100644 --- a/src/main/java/com/eu/habbo/habbohotel/achievements/AchievementManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/achievements/AchievementManager.java @@ -7,10 +7,10 @@ import com.eu.habbo.habbohotel.users.HabboBadge; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.outgoing.achievements.AchievementComposer; import com.eu.habbo.messages.outgoing.achievements.AchievementUnlockedComposer; -import com.eu.habbo.messages.outgoing.achievements.talenttrack.TalentLevelUpdateComposer; -import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; +import com.eu.habbo.messages.outgoing.achievements.talenttrack.TalentLevelUpComposer; +import com.eu.habbo.messages.outgoing.inventory.UnseenItemsComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserDataComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserChangeMessageComposer; import com.eu.habbo.messages.outgoing.users.BadgeReceivedComposer; import com.eu.habbo.messages.outgoing.users.UserBadgesComposer; import com.eu.habbo.plugin.Event; @@ -171,7 +171,7 @@ public class AchievementManager { } } - habbo.getClient().sendResponse(new AddHabboItemComposer(badge.getId(), AddHabboItemComposer.AddHabboItemCategory.BADGE)); + habbo.getClient().sendResponse(new UnseenItemsComposer(badge.getId(), UnseenItemsComposer.AddHabboItemCategory.BADGE)); habbo.getHabboStats().addAchievementScore(newLevel.points); @@ -180,7 +180,7 @@ public class AchievementManager { } if (habbo.getHabboInfo().getCurrentRoom() != null) { - habbo.getHabboInfo().getCurrentRoom().sendComposer(new RoomUserDataComposer(habbo).compose()); + habbo.getHabboInfo().getCurrentRoom().sendComposer(new UserChangeMessageComposer(habbo).compose()); } } } @@ -356,7 +356,7 @@ public class AchievementManager { for (Item item : level.items) { HabboItem rewardItem = Emulator.getGameEnvironment().getItemManager().createItem(habbo.getHabboInfo().getId(), item, 0, 0, ""); habbo.getInventory().getItemsComponent().addItem(rewardItem); - habbo.getClient().sendResponse(new AddHabboItemComposer(rewardItem)); + habbo.getClient().sendResponse(new UnseenItemsComposer(rewardItem)); habbo.getClient().sendResponse(new FurniListInvalidateComposer()); } } @@ -379,7 +379,7 @@ public class AchievementManager { } } } - habbo.getClient().sendResponse(new TalentLevelUpdateComposer(type, level)); + habbo.getClient().sendResponse(new TalentLevelUpComposer(type, level)); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/bots/Bot.java b/src/main/java/com/eu/habbo/habbohotel/bots/Bot.java index c75f6ff1..903f28eb 100644 --- a/src/main/java/com/eu/habbo/habbohotel/bots/Bot.java +++ b/src/main/java/com/eu/habbo/habbohotel/bots/Bot.java @@ -232,7 +232,7 @@ public class Bot implements Runnable { return; this.chatTimestamp = Emulator.getIntUnixTimestamp(); - this.room.botChat(new RoomUserShoutComposer(new RoomChatMessage(event.message, this.roomUnit, RoomChatMessageBubbles.getBubble(this.getBubbleId()))).compose()); + this.room.botChat(new ShoutMessageComposer(new RoomChatMessage(event.message, this.roomUnit, RoomChatMessageBubbles.getBubble(this.getBubbleId()))).compose()); if (message.equals("o/") || message.equals("_o/")) { this.room.sendComposer(new ExpressionMessageComposer(this.roomUnit, RoomUserAction.WAVE).compose()); @@ -247,7 +247,7 @@ public class Bot implements Runnable { return; this.chatTimestamp = Emulator.getIntUnixTimestamp(); - event.target.getClient().sendResponse(new RoomUserWhisperComposer(new RoomChatMessage(event.message, this.roomUnit, RoomChatMessageBubbles.getBubble(this.getBubbleId())))); + event.target.getClient().sendResponse(new WhisperMessageComposer(new RoomChatMessage(event.message, this.roomUnit, RoomChatMessageBubbles.getBubble(this.getBubbleId())))); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/bots/BotManager.java b/src/main/java/com/eu/habbo/habbohotel/bots/BotManager.java index 38e63a70..869dc872 100644 --- a/src/main/java/com/eu/habbo/habbohotel/bots/BotManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/bots/BotManager.java @@ -11,7 +11,7 @@ import com.eu.habbo.messages.outgoing.generic.alerts.NotificationDialogMessageCo import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys; import com.eu.habbo.messages.outgoing.inventory.BotAddedToInventoryComposer; import com.eu.habbo.messages.outgoing.inventory.BotRemovedFromInventoryComposer; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserUpdateComposer; import com.eu.habbo.messages.outgoing.rooms.users.RoomUsersComposer; import com.eu.habbo.plugin.events.bots.BotPickUpEvent; import com.eu.habbo.plugin.events.bots.BotPlacedEvent; @@ -139,7 +139,7 @@ public class BotManager { room.addBot(bot); Emulator.getThreading().run(bot); room.sendComposer(new RoomUsersComposer(bot).compose()); - room.sendComposer(new RoomUserStatusComposer(bot.getRoomUnit()).compose()); + room.sendComposer(new UserUpdateComposer(bot.getRoomUnit()).compose()); habbo.getInventory().getBotsComponent().removeBot(bot); habbo.getClient().sendResponse(new BotRemovedFromInventoryComposer(bot)); bot.onPlace(habbo, room); diff --git a/src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarRewardObject.java b/src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarRewardObject.java index c2455810..49693f4c 100644 --- a/src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarRewardObject.java +++ b/src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarRewardObject.java @@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.items.Item; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.users.subscriptions.SubscriptionHabboClub; -import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; +import com.eu.habbo.messages.outgoing.inventory.UnseenItemsComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -78,7 +78,7 @@ public class CalendarRewardObject { 0, ""); habbo.getInventory().getItemsComponent().addItem(habboItem); - habbo.getClient().sendResponse(new AddHabboItemComposer(habboItem)); + habbo.getClient().sendResponse(new UnseenItemsComposer(habboItem)); habbo.getClient().sendResponse(new FurniListInvalidateComposer()); } } 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 e40bf410..32b85ed2 100644 --- a/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java @@ -21,7 +21,7 @@ import com.eu.habbo.messages.outgoing.catalog.*; import com.eu.habbo.messages.outgoing.generic.alerts.NotificationDialogMessageComposer; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys; import com.eu.habbo.messages.outgoing.inventory.BotAddedToInventoryComposer; -import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; +import com.eu.habbo.messages.outgoing.inventory.UnseenItemsComposer; import com.eu.habbo.messages.outgoing.inventory.PetAddedToInventoryComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer; import com.eu.habbo.messages.outgoing.modtool.IssueCloseNotificationMessageComposer; @@ -529,12 +529,12 @@ public class CatalogManager { Voucher voucher = Emulator.getGameEnvironment().getCatalogManager().getVoucher(voucherCode); if (voucher == null) { - client.sendResponse(new RedeemVoucherErrorComposer(RedeemVoucherErrorComposer.INVALID_CODE)); + client.sendResponse(new VoucherRedeemErrorMessageComposer(VoucherRedeemErrorMessageComposer.INVALID_CODE)); return; } if (voucher.isExhausted()) { - client.sendResponse(new RedeemVoucherErrorComposer(Emulator.getGameEnvironment().getCatalogManager().deleteVoucher(voucher) ? RedeemVoucherErrorComposer.INVALID_CODE : RedeemVoucherErrorComposer.TECHNICAL_ERROR)); + client.sendResponse(new VoucherRedeemErrorMessageComposer(Emulator.getGameEnvironment().getCatalogManager().deleteVoucher(voucher) ? VoucherRedeemErrorMessageComposer.INVALID_CODE : VoucherRedeemErrorMessageComposer.TECHNICAL_ERROR)); return; } @@ -562,7 +562,7 @@ public class CatalogManager { } } - client.sendResponse(new RedeemVoucherOKComposer()); + client.sendResponse(new VoucherRedeemOkMessageComposer()); } public boolean deleteVoucher(Voucher voucher) { @@ -894,7 +894,7 @@ public class CatalogManager { return; List badges = new ArrayList<>(); - Map> unseenItems = new HashMap<>(); + Map> unseenItems = new HashMap<>(); boolean badgeFound = false; for (int i = 0; i < amount; i++) { @@ -925,11 +925,11 @@ public class CatalogManager { habbo.getClient().getHabbo().getInventory().getBotsComponent().addBot(bot); habbo.getClient().sendResponse(new BotAddedToInventoryComposer(bot)); - if (!unseenItems.containsKey(AddHabboItemComposer.AddHabboItemCategory.BOT)) { - unseenItems.put(AddHabboItemComposer.AddHabboItemCategory.BOT, new ArrayList<>()); + if (!unseenItems.containsKey(UnseenItemsComposer.AddHabboItemCategory.BOT)) { + unseenItems.put(UnseenItemsComposer.AddHabboItemCategory.BOT, new ArrayList<>()); } - unseenItems.get(AddHabboItemComposer.AddHabboItemCategory.BOT).add(bot.getId()); + unseenItems.get(UnseenItemsComposer.AddHabboItemCategory.BOT).add(bot.getId()); } else { throw new Exception("Failed to create bot of type: " + type); } @@ -970,11 +970,11 @@ public class CatalogManager { AchievementManager.progressAchievement(habbo.getClient().getHabbo(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("PetLover")); - if (!unseenItems.containsKey(AddHabboItemComposer.AddHabboItemCategory.PET)) { - unseenItems.put(AddHabboItemComposer.AddHabboItemCategory.PET, new ArrayList<>()); + if (!unseenItems.containsKey(UnseenItemsComposer.AddHabboItemCategory.PET)) { + unseenItems.put(UnseenItemsComposer.AddHabboItemCategory.PET, new ArrayList<>()); } - unseenItems.get(AddHabboItemComposer.AddHabboItemCategory.PET).add(pet.getId()); + unseenItems.get(UnseenItemsComposer.AddHabboItemCategory.PET).add(pet.getId()); } else if (baseItem.getType() == FurnitureType.BADGE) { if (!habbo.getInventory().getBadgesComponent().hasBadge(baseItem.getName())) { if (!badges.contains(baseItem.getName())) { @@ -1084,7 +1084,7 @@ public class CatalogManager { if (purchasedEvent.itemsList != null && !purchasedEvent.itemsList.isEmpty()) { habbo.getClient().getHabbo().getInventory().getItemsComponent().addItems(purchasedEvent.itemsList); - unseenItems.put(AddHabboItemComposer.AddHabboItemCategory.OWNED_FURNI, purchasedEvent.itemsList.stream().map(HabboItem::getId).collect(Collectors.toList())); + unseenItems.put(UnseenItemsComposer.AddHabboItemCategory.OWNED_FURNI, purchasedEvent.itemsList.stream().map(HabboItem::getId).collect(Collectors.toList())); Emulator.getPluginManager().fireEvent(new UserCatalogFurnitureBoughtEvent(habbo, item, purchasedEvent.itemsList)); @@ -1095,8 +1095,8 @@ public class CatalogManager { } } - if (!purchasedEvent.badges.isEmpty() && !unseenItems.containsKey(AddHabboItemComposer.AddHabboItemCategory.BADGE)) { - unseenItems.put(AddHabboItemComposer.AddHabboItemCategory.BADGE, new ArrayList<>()); + if (!purchasedEvent.badges.isEmpty() && !unseenItems.containsKey(UnseenItemsComposer.AddHabboItemCategory.BADGE)) { + unseenItems.put(UnseenItemsComposer.AddHabboItemCategory.BADGE, new ArrayList<>()); } for (String b : purchasedEvent.badges) { @@ -1109,11 +1109,11 @@ public class CatalogManager { keys.put("image", "${image.library.url}album1584/" + badge.getCode() + ".gif"); keys.put("message", Emulator.getTexts().getValue("commands.generic.cmd_badge.received")); habbo.getClient().sendResponse(new NotificationDialogMessageComposer(BubbleAlertKeys.RECEIVED_BADGE.key, keys)); - unseenItems.get(AddHabboItemComposer.AddHabboItemCategory.BADGE).add(badge.getId()); + unseenItems.get(UnseenItemsComposer.AddHabboItemCategory.BADGE).add(badge.getId()); } habbo.getClient().getHabbo().getHabboStats().addPurchase(purchasedEvent.catalogItem); - habbo.getClient().sendResponse(new AddHabboItemComposer(unseenItems)); + habbo.getClient().sendResponse(new UnseenItemsComposer(unseenItems)); habbo.getClient().sendResponse(new PurchaseOKMessageComposer(purchasedEvent.catalogItem)); habbo.getClient().sendResponse(new FurniListInvalidateComposer()); diff --git a/src/main/java/com/eu/habbo/habbohotel/catalog/marketplace/MarketPlace.java b/src/main/java/com/eu/habbo/habbohotel/catalog/marketplace/MarketPlace.java index 78e10882..55544a4c 100644 --- a/src/main/java/com/eu/habbo/habbohotel/catalog/marketplace/MarketPlace.java +++ b/src/main/java/com/eu/habbo/habbohotel/catalog/marketplace/MarketPlace.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.incoming.catalog.marketplace.RequestOffersEvent; import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceBuyOfferResultComposer; import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceCancelOfferResultComposer; -import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; +import com.eu.habbo.messages.outgoing.inventory.UnseenItemsComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListRemoveComposer; import com.eu.habbo.messages.outgoing.users.CreditBalanceComposer; @@ -94,7 +94,7 @@ public class MarketPlace { HabboItem item = Emulator.getGameEnvironment().getItemManager().loadHabboItem(set); habbo.getInventory().getItemsComponent().addItem(item); habbo.getClient().sendResponse(new MarketplaceCancelOfferResultComposer(offer, true)); - habbo.getClient().sendResponse(new AddHabboItemComposer(item)); + habbo.getClient().sendResponse(new UnseenItemsComposer(item)); habbo.getClient().sendResponse(new FurniListInvalidateComposer()); } } @@ -285,7 +285,7 @@ public class MarketPlace { } client.sendResponse(new CreditBalanceComposer(client.getHabbo())); - client.sendResponse(new AddHabboItemComposer(item)); + client.sendResponse(new UnseenItemsComposer(item)); client.sendResponse(new FurniListInvalidateComposer()); client.sendResponse(new MarketplaceBuyOfferResultComposer(MarketplaceBuyOfferResultComposer.REFRESH, 0, offerId, price)); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/ChangeNameCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/ChangeNameCommand.java index 0fa9bbc9..213842bc 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/ChangeNameCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/ChangeNameCommand.java @@ -2,7 +2,7 @@ package com.eu.habbo.habbohotel.commands; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.gameclients.GameClient; -import com.eu.habbo.messages.outgoing.users.UserDataComposer; +import com.eu.habbo.messages.outgoing.users.UserObjectComposer; public class ChangeNameCommand extends Command { public ChangeNameCommand() { @@ -12,7 +12,7 @@ public class ChangeNameCommand extends Command { @Override public boolean handle(GameClient gameClient, String[] params) throws Exception { gameClient.getHabbo().getHabboStats().allowNameChange = !gameClient.getHabbo().getHabboStats().allowNameChange; - gameClient.sendResponse(new UserDataComposer(gameClient.getHabbo())); + gameClient.sendResponse(new UserObjectComposer(gameClient.getHabbo())); return true; } } diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/CommandHandler.java b/src/main/java/com/eu/habbo/habbohotel/commands/CommandHandler.java index 64dd09d8..9a0e54a4 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/CommandHandler.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/CommandHandler.java @@ -11,7 +11,7 @@ import com.eu.habbo.habbohotel.pets.PetVocalsType; import com.eu.habbo.habbohotel.pets.RideablePet; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomRightLevels; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserTypingComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserTypingMessageComposer; import com.eu.habbo.plugin.events.users.UserCommandEvent; import com.eu.habbo.plugin.events.users.UserExecuteCommandEvent; import gnu.trove.iterator.TIntObjectIterator; @@ -83,7 +83,7 @@ public class CommandHandler { } if (gameClient.getHabbo().getHabboInfo().getCurrentRoom() != null) - gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RoomUserTypingComposer(gameClient.getHabbo().getRoomUnit(), false).compose()); + gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new UserTypingMessageComposer(gameClient.getHabbo().getRoomUnit(), false).compose()); UserCommandEvent event = new UserCommandEvent(gameClient.getHabbo(), parts, command.handle(gameClient, parts)); Emulator.getPluginManager().fireEvent(event); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/FacelessCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/FacelessCommand.java index 395c9649..ac211cd4 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/FacelessCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/FacelessCommand.java @@ -2,7 +2,7 @@ package com.eu.habbo.habbohotel.commands; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.gameclients.GameClient; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserDataComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserChangeMessageComposer; import com.eu.habbo.messages.outgoing.users.FigureUpdateComposer; @@ -31,7 +31,7 @@ public class FacelessCommand extends Command { gameClient.getHabbo().getHabboInfo().setLook(gameClient.getHabbo().getHabboInfo().getLook().replace(part, newHead)); gameClient.sendResponse(new FigureUpdateComposer(gameClient.getHabbo())); - gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RoomUserDataComposer(gameClient.getHabbo()).compose()); + gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new UserChangeMessageComposer(gameClient.getHabbo()).compose()); return true; } } diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/InvisibleCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/InvisibleCommand.java index e4337358..27e1eb16 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/InvisibleCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/InvisibleCommand.java @@ -6,8 +6,8 @@ import com.eu.habbo.habbohotel.rooms.RoomLayout; import com.eu.habbo.habbohotel.rooms.RoomUnit; import com.eu.habbo.habbohotel.wired.WiredHandler; import com.eu.habbo.habbohotel.wired.WiredTriggerType; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserRemoveComposer; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserRemoveMessageComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserUpdateComposer; import com.eu.habbo.messages.outgoing.rooms.users.RoomUsersComposer; import com.eu.habbo.threading.runnables.RoomUnitTeleport; @@ -29,7 +29,7 @@ public class InvisibleCommand extends Command { roomUnit.setInRoom(true); roomUnit.getRoom().sendComposer(new RoomUsersComposer(gameClient.getHabbo()).compose()); - roomUnit.getRoom().sendComposer(new RoomUserStatusComposer(roomUnit).compose()); + roomUnit.getRoom().sendComposer(new UserUpdateComposer(roomUnit).compose()); WiredHandler.handle(WiredTriggerType.ENTER_ROOM, roomUnit, roomUnit.getRoom(), null); roomUnit.getRoom().habboEntered(gameClient.getHabbo()); @@ -41,7 +41,7 @@ public class InvisibleCommand extends Command { roomUnit.setInvisible(true); gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_invisible.updated")); - gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RoomUserRemoveComposer(roomUnit).compose()); + gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new UserRemoveMessageComposer(roomUnit).compose()); return true; } diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/LayCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/LayCommand.java index abc534bb..539cc0ea 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/LayCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/LayCommand.java @@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.rooms.RoomTile; import com.eu.habbo.habbohotel.rooms.RoomUnitStatus; import com.eu.habbo.habbohotel.rooms.RoomUserRotation; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserUpdateComposer; public class LayCommand extends Command { public LayCommand() { @@ -35,7 +35,7 @@ public class LayCommand extends Command { } gameClient.getHabbo().getRoomUnit().setStatus(RoomUnitStatus.LAY, 0.5 + ""); - gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RoomUserStatusComposer(gameClient.getHabbo().getRoomUnit()).compose()); + gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new UserUpdateComposer(gameClient.getHabbo().getRoomUnit()).compose()); return true; } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/MimicCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/MimicCommand.java index 13d72c30..6d6c9b0a 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/MimicCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/MimicCommand.java @@ -7,8 +7,8 @@ import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboGender; import com.eu.habbo.habbohotel.users.clothingvalidation.ClothingValidationManager; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserDataComposer; -import com.eu.habbo.messages.outgoing.users.UserDataComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserChangeMessageComposer; +import com.eu.habbo.messages.outgoing.users.UserObjectComposer; import com.eu.habbo.util.figure.FigureUtil; public class MimicCommand extends Command { @@ -38,8 +38,8 @@ public class MimicCommand extends Command { } else { gameClient.getHabbo().getHabboInfo().setLook(ClothingValidationManager.VALIDATE_ON_MIMIC ? ClothingValidationManager.validateLook(gameClient.getHabbo(), habbo.getHabboInfo().getLook(), habbo.getHabboInfo().getGender().name()) : habbo.getHabboInfo().getLook()); gameClient.getHabbo().getHabboInfo().setGender(habbo.getHabboInfo().getGender()); - gameClient.sendResponse(new UserDataComposer(gameClient.getHabbo())); - gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RoomUserDataComposer(gameClient.getHabbo()).compose()); + gameClient.sendResponse(new UserObjectComposer(gameClient.getHabbo())); + gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new UserChangeMessageComposer(gameClient.getHabbo()).compose()); gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_mimic.copied").replace("%user%", params[1]).replace("%gender_name%", (habbo.getHabboInfo().getGender().equals(HabboGender.M) ? Emulator.getTexts().getValue("gender.him") : Emulator.getTexts().getValue("gender.her"))), RoomChatMessageBubbles.ALERT); return true; } diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/MultiCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/MultiCommand.java index 04009bf6..8e9e2bfe 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/MultiCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/MultiCommand.java @@ -2,7 +2,7 @@ package com.eu.habbo.habbohotel.commands; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.gameclients.GameClient; -import com.eu.habbo.messages.outgoing.rooms.items.PostItStickyPoleOpenComposer; +import com.eu.habbo.messages.outgoing.rooms.items.RequestSpamWallPostItMessageComposer; public class MultiCommand extends Command { public MultiCommand() { @@ -11,7 +11,7 @@ public class MultiCommand extends Command { @Override public boolean handle(GameClient gameClient, String[] params) throws Exception { - gameClient.sendResponse(new PostItStickyPoleOpenComposer(null)); + gameClient.sendResponse(new RequestSpamWallPostItMessageComposer(null)); return true; } } diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/ReloadRoomCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/ReloadRoomCommand.java index 1ccd20d0..c32be1f8 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/ReloadRoomCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/ReloadRoomCommand.java @@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.ServerMessage; -import com.eu.habbo.messages.outgoing.rooms.ForwardToRoomComposer; +import com.eu.habbo.messages.outgoing.rooms.RoomForwardMessageComposer; import java.util.ArrayList; import java.util.Collection; @@ -23,7 +23,7 @@ public class ReloadRoomCommand extends Command { Collection habbos = new ArrayList<>(room.getHabbos()); Emulator.getGameEnvironment().getRoomManager().unloadRoom(room); room = Emulator.getGameEnvironment().getRoomManager().loadRoom(room.getId()); - ServerMessage message = new ForwardToRoomComposer(room.getId()).compose(); + ServerMessage message = new RoomForwardMessageComposer(room.getId()).compose(); for (Habbo habbo : habbos) { habbo.getClient().sendResponse(message); } diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/RoomGiftCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/RoomGiftCommand.java index dec5dbba..7b821959 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/RoomGiftCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/RoomGiftCommand.java @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer; -import com.eu.habbo.messages.outgoing.wired.WiredRewardAlertComposer; +import com.eu.habbo.messages.outgoing.wired.WiredRewardResultMessageComposer; public class RoomGiftCommand extends Command { public RoomGiftCommand() { @@ -60,7 +60,7 @@ public class RoomGiftCommand extends Command { habbo.getClient().sendResponse(new FurniListInvalidateComposer()); - habbo.getClient().sendResponse(new WiredRewardAlertComposer(WiredRewardAlertComposer.REWARD_RECEIVED_ITEM)); + habbo.getClient().sendResponse(new WiredRewardResultMessageComposer(WiredRewardResultMessageComposer.REWARD_RECEIVED_ITEM)); } return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/ShoutCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/ShoutCommand.java index bb121583..310ba8d8 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/ShoutCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/ShoutCommand.java @@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.rooms.RoomChatMessage; import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles; import com.eu.habbo.habbohotel.users.Habbo; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserShoutComposer; +import com.eu.habbo.messages.outgoing.rooms.users.ShoutMessageComposer; public class ShoutCommand extends Command { private static String idea = "Kudo's To Droppy for this idea!"; @@ -40,7 +40,7 @@ public class ShoutCommand extends Command { } } - target.getHabboInfo().getCurrentRoom().sendComposer(new RoomUserShoutComposer(new RoomChatMessage(message.toString(), target, RoomChatMessageBubbles.NORMAL)).compose()); + target.getHabboInfo().getCurrentRoom().sendComposer(new ShoutMessageComposer(new RoomChatMessage(message.toString(), target, RoomChatMessageBubbles.NORMAL)).compose()); gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_shout").replace("%user%", params[1]).replace("%message%", message.toString()), RoomChatMessageBubbles.ALERT); return true; } diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/SummonCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/SummonCommand.java index b362f5a4..366907ce 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/SummonCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/SummonCommand.java @@ -5,7 +5,7 @@ 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.habbohotel.users.Habbo; -import com.eu.habbo.messages.outgoing.rooms.ForwardToRoomComposer; +import com.eu.habbo.messages.outgoing.rooms.RoomForwardMessageComposer; public class SummonCommand extends Command { public SummonCommand() { @@ -46,7 +46,7 @@ public class SummonCommand extends Command { Emulator.getGameEnvironment().getRoomManager().enterRoom(habbo, gameClient.getHabbo().getHabboInfo().getCurrentRoom().getId(), "", true); - habbo.getClient().sendResponse(new ForwardToRoomComposer(gameClient.getHabbo().getHabboInfo().getCurrentRoom().getId())); + habbo.getClient().sendResponse(new RoomForwardMessageComposer(gameClient.getHabbo().getHabboInfo().getCurrentRoom().getId())); gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_summon.summoned").replace("%user%", params[1]), RoomChatMessageBubbles.ALERT); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/SummonRankCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/SummonRankCommand.java index 16312bd5..c5d93cc0 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/SummonRankCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/SummonRankCommand.java @@ -5,7 +5,7 @@ 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.habbohotel.users.Habbo; -import com.eu.habbo.messages.outgoing.rooms.ForwardToRoomComposer; +import com.eu.habbo.messages.outgoing.rooms.RoomForwardMessageComposer; import java.util.Map; @@ -45,7 +45,7 @@ public class SummonRankCommand extends Command { Emulator.getGameEnvironment().getRoomManager().enterRoom(set.getValue(), gameClient.getHabbo().getHabboInfo().getCurrentRoom().getId(), "", true); - set.getValue().getClient().sendResponse(new ForwardToRoomComposer(gameClient.getHabbo().getHabboInfo().getCurrentRoom().getId())); + set.getValue().getClient().sendResponse(new RoomForwardMessageComposer(gameClient.getHabbo().getHabboInfo().getCurrentRoom().getId())); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/TransformCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/TransformCommand.java index 793f6475..b50d4bc7 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/TransformCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/TransformCommand.java @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.pets.PetData; import com.eu.habbo.habbohotel.rooms.RoomUnit; import com.eu.habbo.habbohotel.rooms.RoomUnitType; import com.eu.habbo.messages.outgoing.generic.alerts.MOTDNotificationComposer; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserRemoveComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserRemoveMessageComposer; import java.util.ArrayList; import java.util.Collections; @@ -57,7 +57,7 @@ public class TransformCommand extends Command { gameClient.getHabbo().getHabboStats().cache.put("pet_type", petData); gameClient.getHabbo().getHabboStats().cache.put("pet_race", race); gameClient.getHabbo().getHabboStats().cache.put("pet_color", color); - gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RoomUserRemoveComposer(gameClient.getHabbo().getRoomUnit()).compose()); + gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new UserRemoveMessageComposer(gameClient.getHabbo().getRoomUnit()).compose()); gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RoomUserPetComposer(petData.getType(), race, color, gameClient.getHabbo()).compose()); } else { //Pet Not Found diff --git a/src/main/java/com/eu/habbo/habbohotel/games/Game.java b/src/main/java/com/eu/habbo/habbohotel/games/Game.java index 24a8051d..a7219978 100644 --- a/src/main/java/com/eu/habbo/habbohotel/games/Game.java +++ b/src/main/java/com/eu/habbo/habbohotel/games/Game.java @@ -12,7 +12,7 @@ import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.wired.WiredHandler; -import com.eu.habbo.messages.outgoing.guides.GuideSessionPartnerIsPlayingComposer; +import com.eu.habbo.messages.outgoing.guides.YouArePlayingGameMessageComposer; import com.eu.habbo.plugin.Event; import com.eu.habbo.plugin.events.games.GameHabboJoinEvent; import com.eu.habbo.plugin.events.games.GameHabboLeaveEvent; @@ -71,7 +71,7 @@ public abstract class Game implements Runnable { habbo.getHabboInfo().setCurrentGame(this.getClass()); habbo.getHabboInfo().setGamePlayer(player); } - habbo.getClient().sendResponse(new GuideSessionPartnerIsPlayingComposer(true)); + habbo.getClient().sendResponse(new YouArePlayingGameMessageComposer(true)); return true; } } catch (Exception e) { @@ -102,7 +102,7 @@ public abstract class Game implements Runnable { habbo.getHabboInfo().setCurrentGame(null); habbo.getHabboInfo().setGamePlayer(null); - habbo.getClient().sendResponse(new GuideSessionPartnerIsPlayingComposer(false)); + habbo.getClient().sendResponse(new YouArePlayingGameMessageComposer(false)); if (this.countsAchievements && this.endTime > this.startTime) { AchievementManager.progressAchievement(habbo, Emulator.getGameEnvironment().getAchievementManager().getAchievement("GamePlayed")); } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/ItemManager.java b/src/main/java/com/eu/habbo/habbohotel/items/ItemManager.java index 16ec285d..dc1041f4 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/ItemManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/ItemManager.java @@ -51,7 +51,7 @@ import com.eu.habbo.habbohotel.wired.highscores.WiredHighscoreManager; import com.eu.habbo.habbohotel.items.interactions.wired.triggers.*; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; -import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; +import com.eu.habbo.messages.outgoing.inventory.UnseenItemsComposer; import com.eu.habbo.plugin.events.emulator.EmulatorLoadItemsManagerEvent; import com.eu.habbo.threading.runnables.QueryDeleteHabboItem; import gnu.trove.TCollections; @@ -730,7 +730,7 @@ public class ItemManager { Habbo habbo = Emulator.getGameEnvironment().getHabboManager().getHabbo(userId); if (habbo != null) { habbo.getInventory().getItemsComponent().addItem(gift); - habbo.getClient().sendResponse(new AddHabboItemComposer(gift)); + habbo.getClient().sendResponse(new UnseenItemsComposer(gift)); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionCrackable.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionCrackable.java index 1cc34bfc..c40d27c4 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionCrackable.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionCrackable.java @@ -12,8 +12,6 @@ import com.eu.habbo.habbohotel.users.HabboGender; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.users.subscriptions.SubscriptionHabboClub; import com.eu.habbo.messages.ServerMessage; -import com.eu.habbo.messages.outgoing.users.UserClubComposer; -import com.eu.habbo.messages.outgoing.users.UserPermissionsComposer; import com.eu.habbo.threading.runnables.CrackableExplode; import com.eu.habbo.util.pathfinding.Rotation; diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMannequin.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMannequin.java index f9c304a4..fcb41753 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMannequin.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMannequin.java @@ -8,8 +8,8 @@ import com.eu.habbo.habbohotel.rooms.RoomUnit; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.users.clothingvalidation.ClothingValidationManager; import com.eu.habbo.messages.ServerMessage; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserDataComposer; -import com.eu.habbo.messages.outgoing.users.UserDataComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserChangeMessageComposer; +import com.eu.habbo.messages.outgoing.users.UserObjectComposer; import java.sql.ResultSet; import java.sql.SQLException; @@ -99,8 +99,8 @@ public class InteractionMannequin extends HabboItem { return; client.getHabbo().getHabboInfo().setLook(ClothingValidationManager.VALIDATE_ON_MANNEQUIN ? ClothingValidationManager.validateLook(client.getHabbo(), newLook, client.getHabbo().getHabboInfo().getGender().name()) : newLook); - room.sendComposer(new RoomUserDataComposer(client.getHabbo()).compose()); - client.sendResponse(new UserDataComposer(client.getHabbo())); + room.sendComposer(new UserChangeMessageComposer(client.getHabbo()).compose()); + client.sendResponse(new UserObjectComposer(client.getHabbo())); } @Override diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMultiHeight.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMultiHeight.java index 47cba012..e2c9e571 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMultiHeight.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMultiHeight.java @@ -1,6 +1,5 @@ package com.eu.habbo.habbohotel.items.interactions; -import com.eu.habbo.habbohotel.bots.Bot; import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.items.Item; import com.eu.habbo.habbohotel.rooms.*; @@ -9,16 +8,11 @@ import com.eu.habbo.habbohotel.users.HabboGender; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.wired.WiredEffectType; import com.eu.habbo.messages.ServerMessage; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; import gnu.trove.set.hash.THashSet; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.ArrayList; import java.util.Collection; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; public class InteractionMultiHeight extends HabboItem { public InteractionMultiHeight(int id, int userId, Item item, String extradata, int limitedStack, int limitedSells) { diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionRentableSpace.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionRentableSpace.java index 48a4d35a..87e9e1af 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionRentableSpace.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionRentableSpace.java @@ -9,7 +9,7 @@ import com.eu.habbo.habbohotel.rooms.RoomUnit; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.ServerMessage; -import com.eu.habbo.messages.outgoing.rooms.items.rentablespaces.RentableSpaceInfoComposer; +import com.eu.habbo.messages.outgoing.rooms.items.rentablespaces.RentableSpaceStatusMessageComposer; import com.eu.habbo.threading.runnables.ClearRentedSpace; import gnu.trove.set.hash.THashSet; import org.slf4j.Logger; @@ -244,25 +244,25 @@ public class InteractionRentableSpace extends HabboItem { public int getRentErrorCode(Habbo habbo) { if (this.isRented() && this.renterId != habbo.getHabboInfo().getId()) { - return RentableSpaceInfoComposer.SPACE_ALREADY_RENTED; + return RentableSpaceStatusMessageComposer.SPACE_ALREADY_RENTED; } if (habbo.getHabboStats().isRentingSpace() && habbo.getHabboStats().getRentedItemId() != this.getId()) { - return RentableSpaceInfoComposer.CAN_RENT_ONLY_ONE_SPACE; + return RentableSpaceStatusMessageComposer.CAN_RENT_ONLY_ONE_SPACE; } if (habbo.getHabboStats().getClubExpireTimestamp() < Emulator.getIntUnixTimestamp()) { - return RentableSpaceInfoComposer.CANT_RENT_NO_HABBO_CLUB; + return RentableSpaceStatusMessageComposer.CANT_RENT_NO_HABBO_CLUB; } if (this.rentCost() > habbo.getHabboInfo().getCredits()) { - return RentableSpaceInfoComposer.NOT_ENOUGH_CREDITS; + return RentableSpaceStatusMessageComposer.NOT_ENOUGH_CREDITS; } return 0; } public void sendRentWidget(Habbo habbo) { - habbo.getClient().sendResponse(new RentableSpaceInfoComposer(habbo, this, this.getRentErrorCode(habbo))); + habbo.getClient().sendResponse(new RentableSpaceStatusMessageComposer(habbo, this, this.getRentErrorCode(habbo))); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionYoutubeTV.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionYoutubeTV.java index 47bbbb10..de3d5b1a 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionYoutubeTV.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionYoutubeTV.java @@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomUnit; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.ServerMessage; -import com.eu.habbo.messages.outgoing.rooms.items.youtube.YoutubeVideoComposer; +import com.eu.habbo.messages.outgoing.rooms.items.youtube.YoutubeDisplayVideoMessageComposer; import java.sql.ResultSet; import java.sql.SQLException; @@ -90,7 +90,7 @@ public class InteractionYoutubeTV extends HabboItem { if (this.currentVideo != null) { int startTime = this.offset; if (this.playing) startTime += Emulator.getIntUnixTimestamp() - this.startedWatchingAt; - client.sendResponse(new YoutubeVideoComposer(this.getId(), this.currentVideo, this.playing, startTime)); + client.sendResponse(new YoutubeDisplayVideoMessageComposer(this.getId(), this.currentVideo, this.playing, startTime)); } } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/football/InteractionFootballGate.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/football/InteractionFootballGate.java index 4988dbce..0c9dd2f5 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/football/InteractionFootballGate.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/football/InteractionFootballGate.java @@ -9,7 +9,7 @@ import com.eu.habbo.habbohotel.users.HabboGender; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.users.clothingvalidation.ClothingValidationManager; import com.eu.habbo.messages.ServerMessage; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserDataComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserChangeMessageComposer; import com.eu.habbo.messages.outgoing.users.FigureUpdateComposer; import com.eu.habbo.plugin.EventHandler; import com.eu.habbo.plugin.events.users.UserDisconnectEvent; @@ -68,7 +68,7 @@ public class InteractionFootballGate extends HabboItem { habbo.getHabboStats().cache.remove(CACHE_KEY); habbo.getClient().sendResponse(new FigureUpdateComposer(habbo)); if (habbo.getHabboInfo().getCurrentRoom() != null) { - habbo.getHabboInfo().getCurrentRoom().sendComposer(new RoomUserDataComposer(habbo).compose()); + habbo.getHabboInfo().getCurrentRoom().sendComposer(new UserChangeMessageComposer(habbo).compose()); } } } @@ -124,7 +124,7 @@ public class InteractionFootballGate extends HabboItem { habbo.getHabboInfo().setLook(ClothingValidationManager.VALIDATE_ON_FBALLGATE ? ClothingValidationManager.validateLook(habbo, lookEvent.newLook, lookEvent.gender.name()) : lookEvent.newLook); Emulator.getThreading().run(habbo.getHabboInfo()); habbo.getClient().sendResponse(new FigureUpdateComposer(habbo)); - room.sendComposer(new RoomUserDataComposer(habbo).compose()); + room.sendComposer(new UserChangeMessageComposer(habbo).compose()); } habbo.getHabboStats().cache.remove(CACHE_KEY); @@ -138,7 +138,7 @@ public class InteractionFootballGate extends HabboItem { habbo.getHabboInfo().setLook(ClothingValidationManager.VALIDATE_ON_FBALLGATE ? ClothingValidationManager.validateLook(habbo, lookEvent.newLook, lookEvent.gender.name()) : lookEvent.newLook); Emulator.getThreading().run(habbo.getHabboInfo()); habbo.getClient().sendResponse(new FigureUpdateComposer(habbo)); - room.sendComposer(new RoomUserDataComposer(habbo).compose()); + room.sendComposer(new UserChangeMessageComposer(habbo).compose()); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionNest.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionNest.java index d7293389..3f3448b8 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionNest.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionNest.java @@ -10,7 +10,7 @@ import com.eu.habbo.habbohotel.rooms.RoomUnit; import com.eu.habbo.habbohotel.rooms.RoomUnitStatus; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.ServerMessage; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserUpdateComposer; import java.sql.ResultSet; import java.sql.SQLException; @@ -75,7 +75,7 @@ public class InteractionNest extends HabboItem { pet.getRoomUnit().clearStatus(); pet.getRoomUnit().removeStatus(RoomUnitStatus.MOVE); pet.getRoomUnit().setStatus(RoomUnitStatus.LAY, room.getStackHeight(this.getX(), this.getY(), false) + ""); - room.sendComposer(new RoomUserStatusComposer(roomUnit).compose()); + room.sendComposer(new UserUpdateComposer(roomUnit).compose()); } @Override diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetDrink.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetDrink.java index a18ada6b..917e09f5 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetDrink.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetDrink.java @@ -10,7 +10,7 @@ import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomUnit; import com.eu.habbo.habbohotel.rooms.RoomUnitStatus; import com.eu.habbo.habbohotel.rooms.RoomUserRotation; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserUpdateComposer; import com.eu.habbo.threading.runnables.PetClearPosture; import java.sql.ResultSet; @@ -41,7 +41,7 @@ public class InteractionPetDrink extends InteractionDefault { pet.getRoomUnit().removeStatus(RoomUnitStatus.MOVE); pet.getRoomUnit().setStatus(RoomUnitStatus.EAT, "0"); pet.addThirst(-75); - room.sendComposer(new RoomUserStatusComposer(roomUnit).compose()); + room.sendComposer(new UserUpdateComposer(roomUnit).compose()); Emulator.getThreading().run(new PetClearPosture(pet, RoomUnitStatus.EAT, null, true), 500); AchievementManager.progressAchievement(Emulator.getGameEnvironment().getHabboManager().getHabbo(pet.getUserId()), Emulator.getGameEnvironment().getAchievementManager().getAchievement("PetFeeding"), 75); diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetFood.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetFood.java index 8f2dd02c..92bf9bc3 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetFood.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetFood.java @@ -9,7 +9,7 @@ import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomUnit; import com.eu.habbo.habbohotel.rooms.RoomUnitStatus; import com.eu.habbo.habbohotel.rooms.RoomUserRotation; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserUpdateComposer; import com.eu.habbo.threading.runnables.PetEatAction; import java.sql.ResultSet; @@ -42,7 +42,7 @@ public class InteractionPetFood extends InteractionDefault { pet.getRoomUnit().clearStatus(); pet.getRoomUnit().removeStatus(RoomUnitStatus.MOVE); pet.getRoomUnit().setStatus(RoomUnitStatus.EAT, "0"); - room.sendComposer(new RoomUserStatusComposer(roomUnit).compose()); + room.sendComposer(new UserUpdateComposer(roomUnit).compose()); Emulator.getThreading().run(new PetEatAction(pet, this)); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectGiveReward.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectGiveReward.java index 3c8fb88b..607aa57e 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectGiveReward.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectGiveReward.java @@ -14,10 +14,9 @@ import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.wired.WiredEffectType; import com.eu.habbo.habbohotel.wired.WiredGiveRewardItem; import com.eu.habbo.habbohotel.wired.WiredHandler; -import com.eu.habbo.messages.ClientMessage; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.incoming.wired.WiredSaveException; -import com.eu.habbo.messages.outgoing.generic.alerts.UpdateFailedComposer; +import com.eu.habbo.messages.outgoing.generic.alerts.WiredValidationErrorComposer; import gnu.trove.procedure.TObjectProcedure; import gnu.trove.set.hash.THashSet; @@ -202,7 +201,7 @@ public class WiredEffectGiveReward extends InteractionWiredEffect { } } - gameClient.sendResponse(new UpdateFailedComposer(Emulator.getTexts().getValue("alert.superwired.invalid"))); + gameClient.sendResponse(new WiredValidationErrorComposer(Emulator.getTexts().getValue("alert.superwired.invalid"))); return false; } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectKickHabbo.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectKickHabbo.java index a75f2e3e..fa8f574f 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectKickHabbo.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectKickHabbo.java @@ -14,10 +14,9 @@ import com.eu.habbo.habbohotel.rooms.RoomUnit; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.wired.WiredEffectType; import com.eu.habbo.habbohotel.wired.WiredHandler; -import com.eu.habbo.messages.ClientMessage; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.incoming.wired.WiredSaveException; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserWhisperComposer; +import com.eu.habbo.messages.outgoing.rooms.users.WhisperMessageComposer; import com.eu.habbo.threading.runnables.RoomUnitKick; import gnu.trove.procedure.TObjectProcedure; @@ -60,7 +59,7 @@ public class WiredEffectKickHabbo extends InteractionWiredEffect { room.giveEffect(habbo, 4, 2); if (!this.message.isEmpty()) - habbo.getClient().sendResponse(new RoomUserWhisperComposer(new RoomChatMessage(this.message, habbo, habbo, RoomChatMessageBubbles.ALERT))); + habbo.getClient().sendResponse(new WhisperMessageComposer(new RoomChatMessage(this.message, habbo, habbo, RoomChatMessageBubbles.ALERT))); Emulator.getThreading().run(new RoomUnitKick(habbo, room, true), 2000); diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMuteHabbo.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMuteHabbo.java index ed3639a8..9497cf78 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMuteHabbo.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMuteHabbo.java @@ -12,10 +12,9 @@ import com.eu.habbo.habbohotel.rooms.RoomUnit; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.wired.WiredEffectType; import com.eu.habbo.habbohotel.wired.WiredHandler; -import com.eu.habbo.messages.ClientMessage; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.incoming.wired.WiredSaveException; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserWhisperComposer; +import com.eu.habbo.messages.outgoing.rooms.users.WhisperMessageComposer; import java.sql.ResultSet; import java.sql.SQLException; @@ -75,7 +74,7 @@ public class WiredEffectMuteHabbo extends InteractionWiredEffect { room.muteHabbo(habbo, 60); - habbo.getClient().sendResponse(new RoomUserWhisperComposer(new RoomChatMessage(this.message.replace("%user%", habbo.getHabboInfo().getUsername()).replace("%online_count%", Emulator.getGameEnvironment().getHabboManager().getOnlineCount() + "").replace("%room_count%", Emulator.getGameEnvironment().getRoomManager().getActiveRooms().size() + ""), habbo, habbo, RoomChatMessageBubbles.WIRED))); + habbo.getClient().sendResponse(new WhisperMessageComposer(new RoomChatMessage(this.message.replace("%user%", habbo.getHabboInfo().getUsername()).replace("%online_count%", Emulator.getGameEnvironment().getHabboManager().getOnlineCount() + "").replace("%room_count%", Emulator.getGameEnvironment().getRoomManager().getActiveRooms().size() + ""), habbo, habbo, RoomChatMessageBubbles.WIRED))); } return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectWhisper.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectWhisper.java index 79a7ba53..42438dbf 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectWhisper.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectWhisper.java @@ -14,7 +14,7 @@ import com.eu.habbo.habbohotel.wired.WiredHandler; import com.eu.habbo.habbohotel.wired.WiredTriggerType; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.incoming.wired.WiredSaveException; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserWhisperComposer; +import com.eu.habbo.messages.outgoing.rooms.users.WhisperMessageComposer; import gnu.trove.procedure.TObjectProcedure; import java.sql.ResultSet; @@ -95,7 +95,7 @@ public class WiredEffectWhisper extends InteractionWiredEffect { if (habbo != null) { String msg = this.message.replace("%user%", habbo.getHabboInfo().getUsername()).replace("%online_count%", Emulator.getGameEnvironment().getHabboManager().getOnlineCount() + "").replace("%room_count%", Emulator.getGameEnvironment().getRoomManager().getActiveRooms().size() + ""); - habbo.getClient().sendResponse(new RoomUserWhisperComposer(new RoomChatMessage(msg, habbo, habbo, RoomChatMessageBubbles.WIRED))); + habbo.getClient().sendResponse(new WhisperMessageComposer(new RoomChatMessage(msg, habbo, habbo, RoomChatMessageBubbles.WIRED))); Emulator.getThreading().run(() -> WiredHandler.handle(WiredTriggerType.SAY_SOMETHING, roomUnit, room, new Object[]{ msg })); if (habbo.getRoomUnit().isIdle()) { @@ -105,7 +105,7 @@ public class WiredEffectWhisper extends InteractionWiredEffect { } } else { for (Habbo h : room.getHabbos()) { - h.getClient().sendResponse(new RoomUserWhisperComposer(new RoomChatMessage(this.message.replace("%user%", h.getHabboInfo().getUsername()).replace("%online_count%", Emulator.getGameEnvironment().getHabboManager().getOnlineCount() + "").replace("%room_count%", Emulator.getGameEnvironment().getRoomManager().getActiveRooms().size() + ""), h, h, RoomChatMessageBubbles.WIRED))); + h.getClient().sendResponse(new WhisperMessageComposer(new RoomChatMessage(this.message.replace("%user%", h.getHabboInfo().getUsername()).replace("%online_count%", Emulator.getGameEnvironment().getHabboManager().getOnlineCount() + "").replace("%room_count%", Emulator.getGameEnvironment().getRoomManager().getActiveRooms().size() + ""), h, h, RoomChatMessageBubbles.WIRED))); } return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/pets/MonsterplantPet.java b/src/main/java/com/eu/habbo/habbohotel/pets/MonsterplantPet.java index 72199332..97b25c00 100644 --- a/src/main/java/com/eu/habbo/habbohotel/pets/MonsterplantPet.java +++ b/src/main/java/com/eu/habbo/habbohotel/pets/MonsterplantPet.java @@ -7,11 +7,11 @@ import com.eu.habbo.habbohotel.rooms.RoomUnitStatus; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.ServerMessage; -import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; +import com.eu.habbo.messages.outgoing.inventory.UnseenItemsComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer; import com.eu.habbo.messages.outgoing.rooms.pets.PetStatusUpdateComposer; import com.eu.habbo.messages.outgoing.rooms.pets.PetRespectNotificationComposer; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserUpdateComposer; import org.apache.commons.math3.util.Pair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -311,8 +311,8 @@ public class MonsterplantPet extends Pet implements IPetLook { this.getRoomUnit().setStatus(RoomUnitStatus.GESTURE, "reb"); pet.getRoomUnit().setStatus(RoomUnitStatus.GESTURE, "reb"); - this.room.sendComposer(new RoomUserStatusComposer(this.getRoomUnit()).compose()); - this.room.sendComposer(new RoomUserStatusComposer(pet.getRoomUnit()).compose()); + this.room.sendComposer(new UserUpdateComposer(this.getRoomUnit()).compose()); + this.room.sendComposer(new UserUpdateComposer(pet.getRoomUnit()).compose()); this.getRoomUnit().removeStatus(RoomUnitStatus.GESTURE); pet.getRoomUnit().removeStatus(RoomUnitStatus.GESTURE); @@ -338,7 +338,7 @@ public class MonsterplantPet extends Pet implements IPetLook { AchievementManager.progressAchievement(ownerOne, Emulator.getGameEnvironment().getAchievementManager().getAchievement("MonsterPlantBreeder"), 5); seed = Emulator.getGameEnvironment().getItemManager().createItem(ownerOne.getHabboInfo().getId(), seedBase, 0, 0, ""); ownerOne.getInventory().getItemsComponent().addItem(seed); - ownerOne.getClient().sendResponse(new AddHabboItemComposer(seed)); + ownerOne.getClient().sendResponse(new UnseenItemsComposer(seed)); ownerOne.getClient().sendResponse(new FurniListInvalidateComposer()); } @@ -346,7 +346,7 @@ public class MonsterplantPet extends Pet implements IPetLook { AchievementManager.progressAchievement(ownerTwo, Emulator.getGameEnvironment().getAchievementManager().getAchievement("MonsterPlantBreeder"), 5); seed = Emulator.getGameEnvironment().getItemManager().createItem(ownerTwo.getHabboInfo().getId(), seedBase, 0, 0, ""); ownerTwo.getInventory().getItemsComponent().addItem(seed); - ownerTwo.getClient().sendResponse(new AddHabboItemComposer(seed)); + ownerTwo.getClient().sendResponse(new UnseenItemsComposer(seed)); ownerTwo.getClient().sendResponse(new FurniListInvalidateComposer()); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/pets/Pet.java b/src/main/java/com/eu/habbo/habbohotel/pets/Pet.java index 681c1f04..4d5b23a6 100644 --- a/src/main/java/com/eu/habbo/habbohotel/pets/Pet.java +++ b/src/main/java/com/eu/habbo/habbohotel/pets/Pet.java @@ -10,7 +10,7 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.rooms.pets.PetLevelUpdatedComposer; import com.eu.habbo.messages.outgoing.rooms.pets.PetExperienceComposer; import com.eu.habbo.messages.outgoing.rooms.pets.PetRespectNotificationComposer; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserRemoveComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserRemoveMessageComposer; import com.eu.habbo.messages.outgoing.rooms.users.ChatMessageComposer; import com.eu.habbo.plugin.events.pets.PetTalkEvent; import gnu.trove.map.hash.THashMap; @@ -738,7 +738,7 @@ public class Pet implements ISerialize, Runnable { } if (!dontSendPackets) { - room.sendComposer(new RoomUserRemoveComposer(this.roomUnit).compose()); + room.sendComposer(new UserRemoveMessageComposer(this.roomUnit).compose()); room.removePet(this.id); } 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 7419065a..5c1517be 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java @@ -40,7 +40,7 @@ import com.eu.habbo.messages.outgoing.generic.alerts.HabboBroadcastMessageCompos 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; +import com.eu.habbo.messages.outgoing.inventory.UnseenItemsComposer; import com.eu.habbo.messages.outgoing.inventory.PetAddedToInventoryComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer; import com.eu.habbo.messages.outgoing.polls.infobus.QuestionAnsweredComposer; @@ -49,7 +49,7 @@ import com.eu.habbo.messages.outgoing.rooms.*; import com.eu.habbo.messages.outgoing.rooms.items.*; import com.eu.habbo.messages.outgoing.rooms.pets.RoomPetComposer; import com.eu.habbo.messages.outgoing.rooms.users.*; -import com.eu.habbo.messages.outgoing.users.MutedWhisperComposer; +import com.eu.habbo.messages.outgoing.users.RemainingMutePeriodComposer; import com.eu.habbo.plugin.Event; import com.eu.habbo.plugin.events.furniture.*; import com.eu.habbo.plugin.events.rooms.RoomLoadedEvent; @@ -706,7 +706,7 @@ public class Room implements Comparable, ISerialize, Runnable { Habbo habbo = (picker != null && picker.getHabboInfo().getId() == item.getId() ? picker : Emulator.getGameServer().getGameClientManager().getHabbo(item.getUserId())); if (habbo != null) { habbo.getInventory().getItemsComponent().addItem(item); - habbo.getClient().sendResponse(new AddHabboItemComposer(item)); + habbo.getClient().sendResponse(new UnseenItemsComposer(item)); habbo.getClient().sendResponse(new FurniListInvalidateComposer()); } Emulator.getThreading().run(item); @@ -750,7 +750,7 @@ public class Room implements Comparable, ISerialize, Runnable { } } - this.sendComposer(new RoomUserStatusComposer(roomUnit).compose()); + this.sendComposer(new UserUpdateComposer(roomUnit).compose()); } public void updateHabbosAt(short x, short y) { @@ -825,7 +825,7 @@ public class Room implements Comparable, ISerialize, Runnable { } if (!roomUnits.isEmpty()) { - this.sendComposer(new RoomUserStatusComposer(roomUnits, true).compose()); + this.sendComposer(new UserUpdateComposer(roomUnits, true).compose()); } } @@ -1212,7 +1212,7 @@ public class Room implements Comparable, ISerialize, Runnable { if (habbo.getRoomUnit().isIdle()) { boolean danceIsNone = (habbo.getRoomUnit().getDanceType() == DanceType.NONE); if (danceIsNone) - this.sendComposer(new RoomUnitIdleComposer(habbo.getRoomUnit()).compose()); + this.sendComposer(new SleepMessageComposer(habbo.getRoomUnit()).compose()); if (danceIsNone && !Emulator.getConfig().getBoolean("hotel.roomuser.idle.not_dancing.ignore.wired_idle")) WiredHandler.handle(WiredTriggerType.IDLES, habbo.getRoomUnit(), this, new Object[]{habbo}); } @@ -1580,7 +1580,7 @@ public class Room implements Comparable, ISerialize, Runnable { } if (!updatedUnit.isEmpty()) { - this.sendComposer(new RoomUserStatusComposer(updatedUnit, true).compose()); + this.sendComposer(new UserUpdateComposer(updatedUnit, true).compose()); } this.traxManager.cycle(); @@ -1625,7 +1625,7 @@ public class Room implements Comparable, ISerialize, Runnable { private boolean cycleRoomUnit(RoomUnit unit, RoomUnitType type) { boolean update = unit.needsStatusUpdate(); if (unit.hasStatus(RoomUnitStatus.SIGN)) { - this.sendComposer(new RoomUserStatusComposer(unit).compose()); + this.sendComposer(new UserUpdateComposer(unit).compose()); unit.removeStatus(RoomUnitStatus.SIGN); } @@ -2678,7 +2678,7 @@ public class Room implements Comparable, ISerialize, Runnable { } if (sendRemovePacket && habbo.getRoomUnit() != null && !habbo.getRoomUnit().isTeleporting) { - this.sendComposer(new RoomUserRemoveComposer(habbo.getRoomUnit()).compose()); + this.sendComposer(new UserRemoveMessageComposer(habbo.getRoomUnit()).compose()); } if (habbo.getRoomUnit().getCurrentLocation() != null) { @@ -2851,7 +2851,7 @@ public class Room implements Comparable, ISerialize, Runnable { this.currentBots.remove(bot.getId()); bot.getRoomUnit().setInRoom(false); bot.setRoom(null); - this.sendComposer(new RoomUserRemoveComposer(bot.getRoomUnit()).compose()); + this.sendComposer(new UserRemoveMessageComposer(bot.getRoomUnit()).compose()); bot.setRoomUnit(null); return true; } @@ -3135,7 +3135,7 @@ public class Room implements Comparable, ISerialize, Runnable { } } - this.sendComposer(new RoomUserTypingComposer(habbo.getRoomUnit(), false).compose()); + this.sendComposer(new UserTypingMessageComposer(habbo.getRoomUnit(), false).compose()); if (roomChatMessage == null || roomChatMessage.getMessage() == null || roomChatMessage.getMessage().equals("")) return; @@ -3162,7 +3162,7 @@ public class Room implements Comparable, ISerialize, Runnable { } if (this.isMuted(habbo)) { - habbo.getClient().sendResponse(new MutedWhisperComposer(this.mutedHabbos.get(habbo.getHabboInfo().getId()) - Emulator.getIntUnixTimestamp())); + habbo.getClient().sendResponse(new RemainingMutePeriodComposer(this.mutedHabbos.get(habbo.getHabboInfo().getId()) - Emulator.getIntUnixTimestamp())); return; } } @@ -3176,7 +3176,7 @@ public class Room implements Comparable, ISerialize, Runnable { if (!ignoreWired) { if (WiredHandler.handle(WiredTriggerType.SAY_SOMETHING, habbo.getRoomUnit(), habbo.getHabboInfo().getCurrentRoom(), new Object[]{roomChatMessage.getMessage()})) { - habbo.getClient().sendResponse(new RoomUserWhisperComposer(new RoomChatMessage(roomChatMessage.getMessage(), habbo, habbo, roomChatMessage.getBubble()))); + habbo.getClient().sendResponse(new WhisperMessageComposer(new RoomChatMessage(roomChatMessage.getMessage(), habbo, habbo, roomChatMessage.getBubble()))); return; } } @@ -3214,9 +3214,9 @@ public class Room implements Comparable, ISerialize, Runnable { } if (prefixMessage == null) { - prefixMessage = roomChatMessage.getHabbo().getHabboInfo().getRank().hasPrefix() ? new RoomUserNameChangedComposer(habbo, true).compose() : null; + prefixMessage = roomChatMessage.getHabbo().getHabboInfo().getRank().hasPrefix() ? new UserNameChangedMessageComposer(habbo, true).compose() : null; } - ServerMessage clearPrefixMessage = prefixMessage != null ? new RoomUserNameChangedComposer(habbo).compose() : null; + ServerMessage clearPrefixMessage = prefixMessage != null ? new UserNameChangedMessageComposer(habbo).compose() : null; Rectangle tentRectangle = this.roomSpecialTypes.tentAt(habbo.getRoomUnit().getCurrentLocation()); @@ -3234,8 +3234,8 @@ public class Room implements Comparable, ISerialize, Runnable { RoomChatMessage staffChatMessage = new RoomChatMessage(roomChatMessage); staffChatMessage.setMessage("To " + staffChatMessage.getTargetHabbo().getHabboInfo().getUsername() + ": " + staffChatMessage.getMessage()); - final ServerMessage message = new RoomUserWhisperComposer(roomChatMessage).compose(); - final ServerMessage staffMessage = new RoomUserWhisperComposer(staffChatMessage).compose(); + final ServerMessage message = new WhisperMessageComposer(roomChatMessage).compose(); + final ServerMessage staffMessage = new WhisperMessageComposer(staffChatMessage).compose(); for (Habbo h : this.getHabbos()) { if (h == roomChatMessage.getTargetHabbo() || h == habbo) { @@ -3280,7 +3280,7 @@ public class Room implements Comparable, ISerialize, Runnable { showTentChatMessageOutsideTentIfPermitted(h, roomChatMessage, tentRectangle); } } else if (chatType == RoomChatType.SHOUT) { - ServerMessage message = new RoomUserShoutComposer(roomChatMessage).compose(); + ServerMessage message = new ShoutMessageComposer(roomChatMessage).compose(); for (Habbo h : this.getHabbos()) { // Show the message @@ -3364,7 +3364,7 @@ public class Room implements Comparable, ISerialize, Runnable { if (receivingHabbo != null && receivingHabbo.hasPermission(Permission.ACC_SEE_TENTCHAT) && tentRectangle != null && !RoomLayout.tileInSquare(tentRectangle, receivingHabbo.getRoomUnit().getCurrentLocation())) { RoomChatMessage staffChatMessage = new RoomChatMessage(roomChatMessage); staffChatMessage.setMessage("[" + Emulator.getTexts().getValue("hotel.room.tent.prefix") + "] " + staffChatMessage.getMessage()); - final ServerMessage staffMessage = new RoomUserWhisperComposer(staffChatMessage).compose(); + final ServerMessage staffMessage = new WhisperMessageComposer(staffChatMessage).compose(); receivingHabbo.getClient().sendResponse(staffMessage); } } @@ -4020,10 +4020,10 @@ public class Room implements Comparable, ISerialize, Runnable { } if (habbo.hasPermission(Permission.ACC_ANYROOMOWNER)) { - habbo.getClient().sendResponse(new RoomOwnerComposer()); + habbo.getClient().sendResponse(new YouAreOwnerMessageComposer()); flatCtrl = RoomRightLevels.MODERATOR; } else if (this.isOwner(habbo)) { - habbo.getClient().sendResponse(new RoomOwnerComposer()); + habbo.getClient().sendResponse(new YouAreOwnerMessageComposer()); flatCtrl = RoomRightLevels.MODERATOR; } else if (this.hasRights(habbo) && !this.hasGuild()) { flatCtrl = RoomRightLevels.RIGHTS; @@ -4031,7 +4031,7 @@ public class Room implements Comparable, ISerialize, Runnable { flatCtrl = this.getGuildRightLevel(habbo); } - habbo.getClient().sendResponse(new RoomRightsComposer(flatCtrl)); + habbo.getClient().sendResponse(new YouAreControllerMessageComposer(flatCtrl)); habbo.getRoomUnit().setStatus(RoomUnitStatus.FLAT_CONTROL, flatCtrl.level + ""); habbo.getRoomUnit().setRightsLevel(flatCtrl); habbo.getRoomUnit().statusUpdate(true); @@ -4067,7 +4067,7 @@ public class Room implements Comparable, ISerialize, Runnable { ban.delete(); } - this.sendComposer(new RoomUserUnbannedComposer(this, userId).compose()); + this.sendComposer(new UserUnbannedFromRoomComposer(this, userId).compose()); } public boolean isBanned(Habbo habbo) { @@ -4101,7 +4101,7 @@ public class Room implements Comparable, ISerialize, Runnable { habbo.getRoomUnit().cmdSit = true; habbo.getRoomUnit().setBodyRotation(RoomUserRotation.values()[habbo.getRoomUnit().getBodyRotation().getValue() - habbo.getRoomUnit().getBodyRotation().getValue() % 2]); habbo.getRoomUnit().setStatus(RoomUnitStatus.SIT, 0.5 + ""); - this.sendComposer(new RoomUserStatusComposer(habbo.getRoomUnit()).compose()); + this.sendComposer(new UserUpdateComposer(habbo.getRoomUnit()).compose()); } public void makeStand(Habbo habbo) { @@ -4112,7 +4112,7 @@ public class Room implements Comparable, ISerialize, Runnable { habbo.getRoomUnit().cmdStand = true; habbo.getRoomUnit().setBodyRotation(RoomUserRotation.values()[habbo.getRoomUnit().getBodyRotation().getValue() - habbo.getRoomUnit().getBodyRotation().getValue() % 2]); habbo.getRoomUnit().removeStatus(RoomUnitStatus.SIT); - this.sendComposer(new RoomUserStatusComposer(habbo.getRoomUnit()).compose()); + this.sendComposer(new UserUpdateComposer(habbo.getRoomUnit()).compose()); } } @@ -4221,7 +4221,7 @@ public class Room implements Comparable, ISerialize, Runnable { if (habbo != null) { habbo.getInventory().getItemsComponent().addItems(items); - habbo.getClient().sendResponse(new AddHabboItemComposer(items)); + habbo.getClient().sendResponse(new UnseenItemsComposer(items)); } for (HabboItem i : items) { @@ -4271,7 +4271,7 @@ public class Room implements Comparable, ISerialize, Runnable { if (user != null) { user.getInventory().getItemsComponent().addItems(entrySet.getValue()); - user.getClient().sendResponse(new AddHabboItemComposer(entrySet.getValue())); + user.getClient().sendResponse(new UnseenItemsComposer(entrySet.getValue())); } } } @@ -4331,14 +4331,14 @@ public class Room implements Comparable, ISerialize, Runnable { this.dance(habbo, DanceType.NONE); } - this.sendComposer(new RoomUnitIdleComposer(habbo.getRoomUnit()).compose()); + this.sendComposer(new SleepMessageComposer(habbo.getRoomUnit()).compose()); WiredHandler.handle(WiredTriggerType.IDLES, habbo.getRoomUnit(), this, new Object[]{habbo}); } public void unIdle(Habbo habbo) { if (habbo == null || habbo.getRoomUnit() == null) return; habbo.getRoomUnit().resetIdleTimer(); - this.sendComposer(new RoomUnitIdleComposer(habbo.getRoomUnit()).compose()); + this.sendComposer(new SleepMessageComposer(habbo.getRoomUnit()).compose()); WiredHandler.handle(WiredTriggerType.UNIDLES, habbo.getRoomUnit(), this, new Object[]{habbo}); } 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 895f8901..01b192c4 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java @@ -38,9 +38,9 @@ import com.eu.habbo.messages.outgoing.rooms.*; import com.eu.habbo.messages.outgoing.rooms.items.ObjectsMessageComposer; import com.eu.habbo.messages.outgoing.rooms.items.ItemsComposer; import com.eu.habbo.messages.outgoing.rooms.pets.RoomPetComposer; -import com.eu.habbo.messages.outgoing.rooms.promotions.RoomPromotionMessageComposer; +import com.eu.habbo.messages.outgoing.rooms.promotions.RoomEventComposer; import com.eu.habbo.messages.outgoing.rooms.users.*; -import com.eu.habbo.messages.outgoing.users.MutedWhisperComposer; +import com.eu.habbo.messages.outgoing.users.RemainingMutePeriodComposer; import com.eu.habbo.plugin.events.navigator.NavigatorRoomCreatedEvent; import com.eu.habbo.plugin.events.rooms.RoomFloorItemsLoadEvent; import com.eu.habbo.plugin.events.rooms.RoomUncachedEvent; @@ -447,7 +447,7 @@ public class RoomManager { room.setNeedsUpdate(true); habbo.getHabboStats().votedRooms.push(room.getId()); for (Habbo h : room.getHabbos()) { - h.getClient().sendResponse(new RoomScoreComposer(room.getScore(), !this.hasVotedForRoom(h, room))); + h.getClient().sendResponse(new RoomRatingComposer(room.getScore(), !this.hasVotedForRoom(h, room))); } try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("INSERT INTO room_votes VALUES (?, ?)")) { @@ -594,7 +594,7 @@ public class RoomManager { if (existingRoom.getRoom() != null) { if (existingRoom.getCurrentLocation() != null) existingRoom.getCurrentLocation().removeUnit(existingRoom); - existingRoom.getRoom().sendComposer(new RoomUserRemoveComposer(existingRoom).compose()); + existingRoom.getRoom().sendComposer(new UserRemoveMessageComposer(existingRoom).compose()); } habbo.getRoomUnit().setRoom(null); } @@ -651,26 +651,26 @@ public class RoomManager { habbo.getHabboInfo().setLoadingRoom(room.getId()); - habbo.getClient().sendResponse(new RoomModelComposer(room)); + habbo.getClient().sendResponse(new RoomReadyMessageComposer(room)); if (!room.getWallPaint().equals("0.0")) - habbo.getClient().sendResponse(new RoomPaintComposer("wallpaper", room.getWallPaint())); + habbo.getClient().sendResponse(new RoomPropertyMessageComposer("wallpaper", room.getWallPaint())); if (!room.getFloorPaint().equals("0.0")) - habbo.getClient().sendResponse(new RoomPaintComposer("floor", room.getFloorPaint())); + habbo.getClient().sendResponse(new RoomPropertyMessageComposer("floor", room.getFloorPaint())); - habbo.getClient().sendResponse(new RoomPaintComposer("landscape", room.getBackgroundPaint())); + habbo.getClient().sendResponse(new RoomPropertyMessageComposer("landscape", room.getBackgroundPaint())); room.refreshRightsForHabbo(habbo); - habbo.getClient().sendResponse(new RoomScoreComposer(room.getScore(), !this.hasVotedForRoom(habbo, room))); + habbo.getClient().sendResponse(new RoomRatingComposer(room.getScore(), !this.hasVotedForRoom(habbo, room))); habbo.getRoomUnit().setFastWalk(habbo.getRoomUnit().isFastWalk() && habbo.hasPermission("cmd_fastwalk", room.hasRights(habbo))); if (room.isPromoted()) { - habbo.getClient().sendResponse(new RoomPromotionMessageComposer(room, room.getPromotion())); + habbo.getClient().sendResponse(new RoomEventComposer(room, room.getPromotion())); } else { - habbo.getClient().sendResponse(new RoomPromotionMessageComposer(null, null)); + habbo.getClient().sendResponse(new RoomEventComposer(null, null)); } if (room.getOwnerId() != habbo.getHabboInfo().getId() && !habbo.getHabboStats().visitedRoom(room.getId())) { @@ -733,7 +733,7 @@ public class RoomManager { GameClient client = habboToSendEnter.getClient(); if (client != null) { client.sendResponse(new RoomUsersComposer(habbo).compose()); - client.sendResponse(new RoomUserStatusComposer(habbo.getRoomUnit()).compose()); + client.sendResponse(new UserUpdateComposer(habbo.getRoomUnit()).compose()); } } @@ -745,7 +745,7 @@ public class RoomManager { synchronized (room.roomUnitLock) { habbo.getClient().sendResponse(new RoomUsersComposer(habbos)); - habbo.getClient().sendResponse(new RoomUserStatusComposer(habbos)); + habbo.getClient().sendResponse(new UserUpdateComposer(habbos)); } if (habbo.getHabboStats().guild != 0) { @@ -775,13 +775,13 @@ public class RoomManager { habbo.getClient().sendResponse(new DanceMessageComposer(bot.getRoomUnit())); } - habbo.getClient().sendResponse(new RoomUserStatusComposer(bot.getRoomUnit(), bot.getRoomUnit().getZ())); + habbo.getClient().sendResponse(new UserUpdateComposer(bot.getRoomUnit(), bot.getRoomUnit().getZ())); } } - habbo.getClient().sendResponse(new RoomPaneComposer(room, room.isOwner(habbo))); + habbo.getClient().sendResponse(new RoomEntryInfoMessageComposer(room, room.isOwner(habbo))); - habbo.getClient().sendResponse(new RoomThicknessComposer(room)); + habbo.getClient().sendResponse(new RoomVisualizationSettingsComposer(room)); habbo.getClient().sendResponse(new GetGuestRoomResultComposer(room, habbo.getClient().getHabbo(), false, true)); @@ -821,7 +821,7 @@ public class RoomManager { if (!room.getCurrentPets().isEmpty()) { habbo.getClient().sendResponse(new RoomPetComposer(room.getCurrentPets())); for (Pet pet : room.getCurrentPets().valueCollection()) { - habbo.getClient().sendResponse(new RoomUserStatusComposer(pet.getRoomUnit())); + habbo.getClient().sendResponse(new UserUpdateComposer(pet.getRoomUnit())); } } @@ -829,7 +829,7 @@ public class RoomManager { habbo.getHabboStats().mutedBubbleTracker = true; int remainingMuteTime = habbo.getHabboStats().remainingMuteTime(); habbo.getClient().sendResponse(new FloodControlMessageComposer(remainingMuteTime)); - habbo.getClient().sendResponse(new MutedWhisperComposer(remainingMuteTime)); + habbo.getClient().sendResponse(new RemainingMutePeriodComposer(remainingMuteTime)); room.sendComposer(new IgnoreResultMessageComposer(habbo, IgnoreResultMessageComposer.MUTED).compose()); } else if (habbo.getHabboStats().mutedBubbleTracker) { habbo.getHabboStats().mutedBubbleTracker = false; @@ -851,7 +851,7 @@ public class RoomManager { } if (roomHabbo.getRoomUnit().isIdle()) { - habbo.getClient().sendResponse(new RoomUnitIdleComposer(roomHabbo.getRoomUnit())); + habbo.getClient().sendResponse(new SleepMessageComposer(roomHabbo.getRoomUnit())); } if (roomHabbo.getHabboStats().userIgnored(habbo.getHabboInfo().getId())) { @@ -874,7 +874,7 @@ public class RoomManager { if (roomHabbo.getRoomUnit().getRoomUnitType().equals(RoomUnitType.PET)) { try { - habbo.getClient().sendResponse(new RoomUserRemoveComposer(roomHabbo.getRoomUnit())); + habbo.getClient().sendResponse(new UserRemoveMessageComposer(roomHabbo.getRoomUnit())); habbo.getClient().sendResponse(new RoomUserPetComposer(((PetData) roomHabbo.getHabboStats().cache.get("pet_type")).getType(), (Integer) roomHabbo.getHabboStats().cache.get("pet_race"), (String) roomHabbo.getHabboStats().cache.get("pet_color"), roomHabbo)); } catch (Exception e) { diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTrade.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTrade.java index 2e4ce72d..769db3ad 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTrade.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTrade.java @@ -4,9 +4,9 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.outgoing.MessageComposer; -import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; +import com.eu.habbo.messages.outgoing.inventory.UnseenItemsComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserUpdateComposer; import com.eu.habbo.messages.outgoing.trading.*; import com.eu.habbo.plugin.events.trading.TradeConfirmEvent; import com.eu.habbo.threading.runnables.QueryDeleteHabboItem; @@ -47,13 +47,13 @@ public class RoomTrade { if (!roomTradeUser.getHabbo().getRoomUnit().hasStatus(RoomUnitStatus.TRADING)) { roomTradeUser.getHabbo().getRoomUnit().setStatus(RoomUnitStatus.TRADING, ""); if (!roomTradeUser.getHabbo().getRoomUnit().isWalking()) - this.room.sendComposer(new RoomUserStatusComposer(roomTradeUser.getHabbo().getRoomUnit()).compose()); + this.room.sendComposer(new UserUpdateComposer(roomTradeUser.getHabbo().getRoomUnit()).compose()); } } } protected void openTrade() { - this.sendMessageToUsers(new TradeStartComposer(this)); + this.sendMessageToUsers(new TradingOpenComposer(this)); } public void offerItem(Habbo habbo, HabboItem item) { @@ -101,14 +101,14 @@ public class RoomTrade { user.setAccepted(value); - this.sendMessageToUsers(new TradeAcceptedComposer(user)); + this.sendMessageToUsers(new TradingAcceptComposer(user)); boolean accepted = true; for (RoomTradeUser roomTradeUser : this.users) { if (!roomTradeUser.getAccepted()) accepted = false; } if (accepted) { - this.sendMessageToUsers(new TradingWaitingConfirmComposer()); + this.sendMessageToUsers(new TradingConfirmationComposer()); } } @@ -117,7 +117,7 @@ public class RoomTrade { user.confirm(); - this.sendMessageToUsers(new TradeAcceptedComposer(user)); + this.sendMessageToUsers(new TradingAcceptComposer(user)); boolean accepted = true; for (RoomTradeUser roomTradeUser : this.users) { if (!roomTradeUser.getConfirmed()) @@ -126,7 +126,7 @@ public class RoomTrade { if (accepted) { if (this.tradeItems()) { this.closeWindow(); - this.sendMessageToUsers(new TradeCompleteComposer()); + this.sendMessageToUsers(new TradingNotOpenComposer()); } this.room.stopTrade(this); @@ -137,7 +137,7 @@ public class RoomTrade { for (RoomTradeUser roomTradeUser : this.users) { for (HabboItem item : roomTradeUser.getItems()) { if (roomTradeUser.getHabbo().getInventory().getItemsComponent().getHabboItem(item.getId()) != null) { - this.sendMessageToUsers(new TradeClosedComposer(roomTradeUser.getHabbo().getRoomUnit().getId(), TradeClosedComposer.ITEMS_NOT_FOUND)); + this.sendMessageToUsers(new TradingCloseComposer(roomTradeUser.getHabbo().getRoomUnit().getId(), TradingCloseComposer.ITEMS_NOT_FOUND)); return false; } } @@ -255,8 +255,8 @@ public class RoomTrade { userOne.getHabbo().getInventory().getItemsComponent().addItems(itemsUserTwo); userTwo.getHabbo().getInventory().getItemsComponent().addItems(itemsUserOne); - userOne.getHabbo().getClient().sendResponse(new AddHabboItemComposer(itemsUserTwo)); - userTwo.getHabbo().getClient().sendResponse(new AddHabboItemComposer(itemsUserOne)); + userOne.getHabbo().getClient().sendResponse(new UnseenItemsComposer(itemsUserTwo)); + userTwo.getHabbo().getClient().sendResponse(new UnseenItemsComposer(itemsUserOne)); userOne.getHabbo().getClient().sendResponse(new FurniListInvalidateComposer()); userTwo.getHabbo().getClient().sendResponse(new FurniListInvalidateComposer()); @@ -270,7 +270,7 @@ public class RoomTrade { } protected void updateWindow() { - this.sendMessageToUsers(new TradeUpdateComposer(this)); + this.sendMessageToUsers(new TradingItemListComposer(this)); } private void returnItems() { @@ -292,7 +292,7 @@ public class RoomTrade { user.clearItems(); } this.updateWindow(); - this.sendMessageToUsers(new TradeClosedComposer(habbo.getHabboInfo().getId(), TradeClosedComposer.USER_CANCEL_TRADE)); + this.sendMessageToUsers(new TradingCloseComposer(habbo.getHabboInfo().getId(), TradingCloseComposer.USER_CANCEL_TRADE)); this.room.stopTrade(this); } @@ -304,7 +304,7 @@ public class RoomTrade { continue; habbo.getRoomUnit().removeStatus(RoomUnitStatus.TRADING); - this.room.sendComposer(new RoomUserStatusComposer(habbo.getRoomUnit()).compose()); + this.room.sendComposer(new UserUpdateComposer(habbo.getRoomUnit()).compose()); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java index 16292a80..3f3beeb9 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java @@ -11,7 +11,7 @@ import com.eu.habbo.habbohotel.pets.RideablePet; import com.eu.habbo.habbohotel.users.DanceType; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserUpdateComposer; import com.eu.habbo.plugin.Event; import com.eu.habbo.plugin.events.roomunit.RoomUnitLookAtPointEvent; import com.eu.habbo.plugin.events.roomunit.RoomUnitSetGoalEvent; @@ -311,7 +311,7 @@ public class RoomUnit { this.tilesWalked--; this.setGoalLocation(this.currentLocation); this.status.remove(RoomUnitStatus.MOVE); - room.sendComposer(new RoomUserStatusComposer(this).compose()); + room.sendComposer(new UserUpdateComposer(this).compose()); if (habbo != null) { ((ConditionalGate) item).onRejected(this, this.getRoom(), new Object[]{}); @@ -346,7 +346,7 @@ public class RoomUnit { ridingUnit.setPreviousLocation(this.getCurrentLocation()); ridingUnit.setGoalLocation(this.getGoal()); ridingUnit.setStatus(RoomUnitStatus.MOVE, next.x + "," + next.y + "," + (zHeight - 1.0)); - room.sendComposer(new RoomUserStatusComposer(ridingUnit).compose()); + room.sendComposer(new UserUpdateComposer(ridingUnit).compose()); //ridingUnit.setZ(zHeight - 1.0); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/TraxManager.java b/src/main/java/com/eu/habbo/habbohotel/rooms/TraxManager.java index 1ec59500..26fa69ba 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/TraxManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/TraxManager.java @@ -11,10 +11,10 @@ import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.generic.alerts.NotificationDialogMessageComposer; -import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; +import com.eu.habbo.messages.outgoing.inventory.UnseenItemsComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListRemoveComposer; -import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxMySongsComposer; +import com.eu.habbo.messages.outgoing.rooms.items.jukebox.UserSongDisksInventoryMessageComposer; import com.eu.habbo.messages.outgoing.rooms.items.jukebox.NowPlayingMessageComposer; import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeboxSongDisksMessageComposer; import gnu.trove.map.hash.THashMap; @@ -309,7 +309,7 @@ public class TraxManager implements Disposable { GameClient client = owner.getClient(); if (client != null) { - client.sendResponse(new AddHabboItemComposer(musicDisc)); + client.sendResponse(new UnseenItemsComposer(musicDisc)); client.sendResponse(new FurniListInvalidateComposer()); } } @@ -340,7 +340,7 @@ public class TraxManager implements Disposable { GameClient client = owner.getClient(); if (client != null) { - client.sendResponse(new AddHabboItemComposer(musicDisc)); + client.sendResponse(new UnseenItemsComposer(musicDisc)); client.sendResponse(new FurniListInvalidateComposer()); } } @@ -404,7 +404,7 @@ public class TraxManager implements Disposable { GameClient client = h.getClient(); if (client != null) { - client.sendResponse(new JukeBoxMySongsComposer(this.myList(h))); + client.sendResponse(new UserSongDisksInventoryMessageComposer(this.myList(h))); } }); } 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 a9f4e7a1..d91661b6 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java @@ -11,7 +11,7 @@ import com.eu.habbo.habbohotel.users.inventory.BadgesComponent; import com.eu.habbo.messages.outgoing.generic.alerts.*; import com.eu.habbo.messages.outgoing.inventory.*; import com.eu.habbo.messages.outgoing.rooms.FloodControlMessageComposer; -import com.eu.habbo.messages.outgoing.rooms.ForwardToRoomComposer; +import com.eu.habbo.messages.outgoing.rooms.RoomForwardMessageComposer; import com.eu.habbo.messages.outgoing.rooms.users.*; import com.eu.habbo.messages.outgoing.users.*; import com.eu.habbo.plugin.events.users.UserCreditsEvent; @@ -276,7 +276,7 @@ public class Habbo implements Runnable { public void whisper(String message, RoomChatMessageBubbles bubble) { if (this.getRoomUnit().isInRoom()) { - this.client.sendResponse(new RoomUserWhisperComposer(new RoomChatMessage(message, this.client.getHabbo().getRoomUnit(), bubble))); + this.client.sendResponse(new WhisperMessageComposer(new RoomChatMessage(message, this.client.getHabbo().getRoomUnit(), bubble))); } } @@ -300,7 +300,7 @@ public class Habbo implements Runnable { public void shout(String message, RoomChatMessageBubbles bubble) { if (this.getRoomUnit().isInRoom()) { - this.getHabboInfo().getCurrentRoom().sendComposer(new RoomUserShoutComposer(new RoomChatMessage(message, this.client.getHabbo().getRoomUnit(), bubble)).compose()); + this.getHabboInfo().getCurrentRoom().sendComposer(new ShoutMessageComposer(new RoomChatMessage(message, this.client.getHabbo().getRoomUnit(), bubble)).compose()); } } @@ -325,20 +325,20 @@ public class Habbo implements Runnable { public void goToRoom(int id) { - this.client.sendResponse(new ForwardToRoomComposer(id)); + this.client.sendResponse(new RoomForwardMessageComposer(id)); } public void addFurniture(HabboItem item) { this.habboInventory.getItemsComponent().addItem(item); - this.client.sendResponse(new AddHabboItemComposer(item)); + this.client.sendResponse(new UnseenItemsComposer(item)); this.client.sendResponse(new FurniListInvalidateComposer()); } public void addFurniture(THashSet items) { this.habboInventory.getItemsComponent().addItems(items); - this.client.sendResponse(new AddHabboItemComposer(items)); + this.client.sendResponse(new UnseenItemsComposer(items)); this.client.sendResponse(new FurniListInvalidateComposer()); } @@ -385,7 +385,7 @@ public class Habbo implements Runnable { HabboBadge badge = BadgesComponent.createBadge(code, this); this.habboInventory.getBadgesComponent().addBadge(badge); this.client.sendResponse(new BadgeReceivedComposer(badge)); - this.client.sendResponse(new AddHabboItemComposer(badge.getId(), AddHabboItemComposer.AddHabboItemCategory.BADGE)); + this.client.sendResponse(new UnseenItemsComposer(badge.getId(), UnseenItemsComposer.AddHabboItemCategory.BADGE)); THashMap keys = new THashMap<>(); keys.put("display", "BUBBLE"); @@ -417,7 +417,7 @@ public class Habbo implements Runnable { if (!this.hasPermission("acc_no_mute")) { int remaining = this.habboStats.addMuteTime(seconds); this.client.sendResponse(new FloodControlMessageComposer(remaining)); - this.client.sendResponse(new MutedWhisperComposer(remaining)); + this.client.sendResponse(new RemainingMutePeriodComposer(remaining)); Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); if (room != null && !isFlood) { diff --git a/src/main/java/com/eu/habbo/habbohotel/users/HabboInfo.java b/src/main/java/com/eu/habbo/habbohotel/users/HabboInfo.java index 8c166631..89e4cd95 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/HabboInfo.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/HabboInfo.java @@ -12,7 +12,7 @@ import com.eu.habbo.habbohotel.pets.RideablePet; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomTile; import com.eu.habbo.habbohotel.rooms.RoomUnit; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserUpdateComposer; import gnu.trove.map.hash.TIntIntHashMap; import gnu.trove.procedure.TIntIntProcedure; import org.slf4j.Logger; @@ -451,7 +451,7 @@ public class HabboInfo implements Runnable { roomUnit.setZ(riding.getRoomUnit().getZ()); roomUnit.setPreviousLocationZ(riding.getRoomUnit().getZ()); roomUnit.stopWalking(); - room.sendComposer(new RoomUserStatusComposer(roomUnit).compose()); + room.sendComposer(new UserUpdateComposer(roomUnit).compose()); List availableTiles = isRemoving ? new ArrayList<>() : this.getCurrentRoom().getLayout().getWalkableTilesAround(roomUnit.getCurrentLocation()); RoomTile tile = availableTiles.isEmpty() ? roomUnit.getCurrentLocation() : availableTiles.get(0); diff --git a/src/main/java/com/eu/habbo/habbohotel/users/HabboItem.java b/src/main/java/com/eu/habbo/habbohotel/users/HabboItem.java index 7c128336..380e4f9c 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/HabboItem.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/HabboItem.java @@ -16,7 +16,7 @@ import com.eu.habbo.habbohotel.wired.WiredHandler; import com.eu.habbo.habbohotel.wired.WiredTriggerType; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.rooms.users.DanceMessageComposer; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserDataComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserChangeMessageComposer; import com.eu.habbo.messages.outgoing.users.FigureUpdateComposer; import gnu.trove.set.hash.THashSet; import org.apache.commons.lang3.ArrayUtils; @@ -322,7 +322,7 @@ public abstract class HabboItem implements Runnable, IEventTriggers { habbo.getClient().sendResponse(new FigureUpdateComposer(habbo)); if (habbo.getHabboInfo().getCurrentRoom() != null) { - habbo.getHabboInfo().getCurrentRoom().sendComposer(new RoomUserDataComposer(habbo).compose()); + habbo.getHabboInfo().getCurrentRoom().sendComposer(new UserChangeMessageComposer(habbo).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 aa6ee96b..2403d762 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/HabboManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/HabboManager.java @@ -10,7 +10,7 @@ import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceConfigurati import com.eu.habbo.messages.outgoing.generic.alerts.HabboBroadcastMessageComposer; import com.eu.habbo.messages.outgoing.modtool.ModeratorInitMessageComposer; import com.eu.habbo.messages.outgoing.users.UserPerksComposer; -import com.eu.habbo.messages.outgoing.users.UserPermissionsComposer; +import com.eu.habbo.messages.outgoing.users.UserRightsMessageComposer; import com.eu.habbo.plugin.events.users.UserRankChangedEvent; import com.eu.habbo.plugin.events.users.UserRegisteredEvent; import org.slf4j.Logger; @@ -266,7 +266,7 @@ public class HabboManager { habbo.getInventory().getEffectsComponent().createRankEffect(habbo.getHabboInfo().getRank().getRoomEffect()); } - habbo.getClient().sendResponse(new UserPermissionsComposer(habbo)); + habbo.getClient().sendResponse(new UserRightsMessageComposer(habbo)); habbo.getClient().sendResponse(new UserPerksComposer(habbo)); if (habbo.hasPermission(Permission.ACC_SUPPORTTOOL)) { 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 efc3ba81..9ca8f14f 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 @@ -10,9 +10,9 @@ import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboInfo; import com.eu.habbo.habbohotel.users.HabboStats; import com.eu.habbo.habbohotel.users.clothingvalidation.ClothingValidationManager; -import com.eu.habbo.messages.outgoing.catalog.ClubCenterDataComposer; +import com.eu.habbo.messages.outgoing.catalog.ScrSendKickbackInfoMessageComposer; import com.eu.habbo.messages.outgoing.generic.ClubGiftNotificationComposer; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserDataComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserChangeMessageComposer; import com.eu.habbo.messages.outgoing.users.*; import gnu.trove.map.hash.THashMap; import org.slf4j.Logger; @@ -89,12 +89,12 @@ public class SubscriptionHabboClub extends Subscription { if ((Emulator.getIntUnixTimestamp() - habbo.getHabboStats().hcMessageLastModified) < 60) { Emulator.getThreading().run(() -> { - habbo.getClient().sendResponse(new UserClubComposer(habbo)); - habbo.getClient().sendResponse(new UserPermissionsComposer(habbo)); + habbo.getClient().sendResponse(new ScrSendUserInfoComposer(habbo)); + habbo.getClient().sendResponse(new UserRightsMessageComposer(habbo)); }, (Emulator.getIntUnixTimestamp() - habbo.getHabboStats().hcMessageLastModified)); } else { - habbo.getClient().sendResponse(new UserClubComposer(habbo, SubscriptionHabboClub.HABBO_CLUB, UserClubComposer.RESPONSE_TYPE_NORMAL)); - habbo.getClient().sendResponse(new UserPermissionsComposer(habbo)); + habbo.getClient().sendResponse(new ScrSendUserInfoComposer(habbo, SubscriptionHabboClub.HABBO_CLUB, ScrSendUserInfoComposer.RESPONSE_TYPE_NORMAL)); + habbo.getClient().sendResponse(new UserRightsMessageComposer(habbo)); } } } @@ -112,8 +112,8 @@ public class SubscriptionHabboClub extends Subscription { if (amount < 0) { Habbo habbo = Emulator.getGameEnvironment().getHabboManager().getHabbo(this.getUserId()); if (habbo != null && habbo.getClient() != null) { - habbo.getClient().sendResponse(new UserClubComposer(habbo, SubscriptionHabboClub.HABBO_CLUB, UserClubComposer.RESPONSE_TYPE_NORMAL)); - habbo.getClient().sendResponse(new UserPermissionsComposer(habbo)); + habbo.getClient().sendResponse(new ScrSendUserInfoComposer(habbo, SubscriptionHabboClub.HABBO_CLUB, ScrSendUserInfoComposer.RESPONSE_TYPE_NORMAL)); + habbo.getClient().sendResponse(new UserRightsMessageComposer(habbo)); } } } @@ -131,8 +131,8 @@ public class SubscriptionHabboClub extends Subscription { Habbo habbo = Emulator.getGameEnvironment().getHabboManager().getHabbo(this.getUserId()); if (habbo != null && habbo.getClient() != null) { - habbo.getClient().sendResponse(new UserClubComposer(habbo, SubscriptionHabboClub.HABBO_CLUB, UserClubComposer.RESPONSE_TYPE_NORMAL)); - habbo.getClient().sendResponse(new UserPermissionsComposer(habbo)); + habbo.getClient().sendResponse(new ScrSendUserInfoComposer(habbo, SubscriptionHabboClub.HABBO_CLUB, ScrSendUserInfoComposer.RESPONSE_TYPE_NORMAL)); + habbo.getClient().sendResponse(new UserRightsMessageComposer(habbo)); } } @@ -165,13 +165,13 @@ public class SubscriptionHabboClub extends Subscription { } if (habbo.getHabboInfo().getCurrentRoom() != null) { - habbo.getHabboInfo().getCurrentRoom().sendComposer(new RoomUserDataComposer(habbo).compose()); + habbo.getHabboInfo().getCurrentRoom().sendComposer(new UserChangeMessageComposer(habbo).compose()); } } if (habbo != null && habbo.getClient() != null) { - habbo.getClient().sendResponse(new UserClubComposer(habbo, SubscriptionHabboClub.HABBO_CLUB, UserClubComposer.RESPONSE_TYPE_NORMAL)); - habbo.getClient().sendResponse(new UserPermissionsComposer(habbo)); + habbo.getClient().sendResponse(new ScrSendUserInfoComposer(habbo, SubscriptionHabboClub.HABBO_CLUB, ScrSendUserInfoComposer.RESPONSE_TYPE_NORMAL)); + habbo.getClient().sendResponse(new UserRightsMessageComposer(habbo)); } } @@ -181,7 +181,7 @@ public class SubscriptionHabboClub extends Subscription { * @param habbo User to calculate for * @return ClubCenterDataComposer */ - public static ClubCenterDataComposer calculatePayday(HabboInfo habbo) { + public static ScrSendKickbackInfoMessageComposer calculatePayday(HabboInfo habbo) { Subscription activeSub = null; Subscription firstEverSub = null; int currentHcStreak = 0; @@ -238,7 +238,7 @@ public class SubscriptionHabboClub extends Subscription { timeUntilPayday = (HC_PAYDAY_NEXT_DATE - Emulator.getIntUnixTimestamp()) / 60; } - return new ClubCenterDataComposer( + return new ScrSendKickbackInfoMessageComposer( currentHcStreak, (firstEverSub != null ? new SimpleDateFormat("dd-MM-yyyy").format(new Date(firstEverSub.getTimestampStart() * 1000L)) : ""), HC_PAYDAY_KICKBACK_PERCENTAGE, @@ -269,7 +269,7 @@ public class SubscriptionHabboClub extends Subscription { int userId = set.getInt("user_id"); HabboInfo habboInfo = Emulator.getGameEnvironment().getHabboManager().getHabboInfo(userId); HabboStats stats = habboInfo.getHabboStats(); - ClubCenterDataComposer calculated = calculatePayday(habboInfo); + ScrSendKickbackInfoMessageComposer calculated = calculatePayday(habboInfo); int totalReward = (calculated.creditRewardForMonthlySpent + calculated.creditRewardForStreakBonus); if (totalReward > 0) { boolean claimed = claimPayDay(Emulator.getGameEnvironment().getHabboManager().getHabbo(userId), totalReward, HC_PAYDAY_CURRENCY); diff --git a/src/main/java/com/eu/habbo/habbohotel/wired/WiredHandler.java b/src/main/java/com/eu/habbo/habbohotel/wired/WiredHandler.java index d9690f87..c2e3bb86 100644 --- a/src/main/java/com/eu/habbo/habbohotel/wired/WiredHandler.java +++ b/src/main/java/com/eu/habbo/habbohotel/wired/WiredHandler.java @@ -19,10 +19,10 @@ import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboBadge; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.outgoing.catalog.PurchaseOKMessageComposer; -import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; +import com.eu.habbo.messages.outgoing.inventory.UnseenItemsComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer; import com.eu.habbo.messages.outgoing.users.BadgeReceivedComposer; -import com.eu.habbo.messages.outgoing.wired.WiredRewardAlertComposer; +import com.eu.habbo.messages.outgoing.wired.WiredRewardResultMessageComposer; import com.eu.habbo.plugin.events.furniture.wired.WiredConditionFailedEvent; import com.eu.habbo.plugin.events.furniture.wired.WiredStackExecutedEvent; import com.eu.habbo.plugin.events.furniture.wired.WiredStackTriggeredEvent; @@ -314,7 +314,7 @@ public class WiredHandler { Emulator.getThreading().run(badge); habbo.getInventory().getBadgesComponent().addBadge(badge); habbo.getClient().sendResponse(new BadgeReceivedComposer(badge)); - habbo.getClient().sendResponse(new WiredRewardAlertComposer(WiredRewardAlertComposer.REWARD_RECEIVED_BADGE)); + habbo.getClient().sendResponse(new WiredRewardResultMessageComposer(WiredRewardResultMessageComposer.REWARD_RECEIVED_BADGE)); } else { String[] data = reward.data.split("#"); @@ -348,11 +348,11 @@ public class WiredHandler { HabboItem item = Emulator.getGameEnvironment().getItemManager().createItem(habbo.getHabboInfo().getId(), baseItem, 0, 0, ""); if (item != null) { - habbo.getClient().sendResponse(new AddHabboItemComposer(item)); + habbo.getClient().sendResponse(new UnseenItemsComposer(item)); habbo.getClient().getHabbo().getInventory().getItemsComponent().addItem(item); habbo.getClient().sendResponse(new PurchaseOKMessageComposer(null)); habbo.getClient().sendResponse(new FurniListInvalidateComposer()); - habbo.getClient().sendResponse(new WiredRewardAlertComposer(WiredRewardAlertComposer.REWARD_RECEIVED_ITEM)); + habbo.getClient().sendResponse(new WiredRewardResultMessageComposer(WiredRewardResultMessageComposer.REWARD_RECEIVED_ITEM)); } } } else if (rewardReceived.type.equalsIgnoreCase("respect")) { @@ -363,7 +363,7 @@ public class WiredHandler { if (item != null) { Emulator.getGameEnvironment().getCatalogManager().purchaseItem(null, item, habbo, 1, "", true); } - habbo.getClient().sendResponse(new WiredRewardAlertComposer(WiredRewardAlertComposer.REWARD_RECEIVED_ITEM)); + habbo.getClient().sendResponse(new WiredRewardResultMessageComposer(WiredRewardResultMessageComposer.REWARD_RECEIVED_ITEM)); } } } @@ -372,7 +372,7 @@ public class WiredHandler { public static boolean getReward(Habbo habbo, WiredEffectGiveReward wiredBox) { if (wiredBox.limit > 0) { if (wiredBox.limit - wiredBox.given == 0) { - habbo.getClient().sendResponse(new WiredRewardAlertComposer(WiredRewardAlertComposer.LIMITED_NO_MORE_AVAILABLE)); + habbo.getClient().sendResponse(new WiredRewardResultMessageComposer(WiredRewardResultMessageComposer.LIMITED_NO_MORE_AVAILABLE)); return false; } } @@ -386,7 +386,7 @@ public class WiredHandler { if (set.first()) { if (set.getInt("row_count") >= 1) { if (wiredBox.rewardTime == WiredEffectGiveReward.LIMIT_ONCE) { - habbo.getClient().sendResponse(new WiredRewardAlertComposer(WiredRewardAlertComposer.REWARD_ALREADY_RECEIVED)); + habbo.getClient().sendResponse(new WiredRewardResultMessageComposer(WiredRewardResultMessageComposer.REWARD_ALREADY_RECEIVED)); return false; } } @@ -395,28 +395,28 @@ public class WiredHandler { if (set.next()) { if (wiredBox.rewardTime == WiredEffectGiveReward.LIMIT_N_MINUTES) { if (Emulator.getIntUnixTimestamp() - set.getInt("timestamp") <= 60) { - habbo.getClient().sendResponse(new WiredRewardAlertComposer(WiredRewardAlertComposer.REWARD_ALREADY_RECEIVED_THIS_MINUTE)); + habbo.getClient().sendResponse(new WiredRewardResultMessageComposer(WiredRewardResultMessageComposer.REWARD_ALREADY_RECEIVED_THIS_MINUTE)); return false; } } if (wiredBox.uniqueRewards) { if (set.getInt("row_count") == wiredBox.rewardItems.size()) { - habbo.getClient().sendResponse(new WiredRewardAlertComposer(WiredRewardAlertComposer.REWARD_ALL_COLLECTED)); + habbo.getClient().sendResponse(new WiredRewardResultMessageComposer(WiredRewardResultMessageComposer.REWARD_ALL_COLLECTED)); return false; } } if (wiredBox.rewardTime == WiredEffectGiveReward.LIMIT_N_HOURS) { if (!(Emulator.getIntUnixTimestamp() - set.getInt("timestamp") >= (3600 * wiredBox.limitationInterval))) { - habbo.getClient().sendResponse(new WiredRewardAlertComposer(WiredRewardAlertComposer.REWARD_ALREADY_RECEIVED_THIS_HOUR)); + habbo.getClient().sendResponse(new WiredRewardResultMessageComposer(WiredRewardResultMessageComposer.REWARD_ALREADY_RECEIVED_THIS_HOUR)); return false; } } if (wiredBox.rewardTime == WiredEffectGiveReward.LIMIT_N_DAY) { if (!(Emulator.getIntUnixTimestamp() - set.getInt("timestamp") >= (86400 * wiredBox.limitationInterval))) { - habbo.getClient().sendResponse(new WiredRewardAlertComposer(WiredRewardAlertComposer.REWARD_ALREADY_RECEIVED_THIS_TODAY)); + habbo.getClient().sendResponse(new WiredRewardResultMessageComposer(WiredRewardResultMessageComposer.REWARD_ALREADY_RECEIVED_THIS_TODAY)); return false; } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/ambassadors/AmbassadorVisitCommandEvent.java b/src/main/java/com/eu/habbo/messages/incoming/ambassadors/AmbassadorVisitCommandEvent.java index 867ff0d8..f127a720 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/ambassadors/AmbassadorVisitCommandEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/ambassadors/AmbassadorVisitCommandEvent.java @@ -4,7 +4,7 @@ import com.eu.habbo.Emulator; 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.rooms.ForwardToRoomComposer; +import com.eu.habbo.messages.outgoing.rooms.RoomForwardMessageComposer; public class AmbassadorVisitCommandEvent extends MessageHandler { @Override @@ -16,7 +16,7 @@ public class AmbassadorVisitCommandEvent extends MessageHandler { if (habbo != null) { if (habbo.getHabboInfo().getCurrentRoom() != null) { - this.client.sendResponse(new ForwardToRoomComposer(habbo.getHabboInfo().getCurrentRoom().getId())); + this.client.sendResponse(new RoomForwardMessageComposer(habbo.getHabboInfo().getCurrentRoom().getId())); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/camera/CameraPurchaseEvent.java b/src/main/java/com/eu/habbo/messages/incoming/camera/CameraPurchaseEvent.java index 6bedf65c..eab2e111 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/camera/CameraPurchaseEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/camera/CameraPurchaseEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.camera.CameraPurchaseOKMessageComposer; import com.eu.habbo.messages.outgoing.catalog.NotEnoughBalanceMessageComposer; -import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; +import com.eu.habbo.messages.outgoing.inventory.UnseenItemsComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer; import com.eu.habbo.plugin.events.users.UserPurchasePictureEvent; @@ -45,7 +45,7 @@ public class CameraPurchaseEvent extends MessageHandler { this.client.getHabbo().getInventory().getItemsComponent().addItem(photoItem); this.client.sendResponse(new CameraPurchaseOKMessageComposer()); - this.client.sendResponse(new AddHabboItemComposer(photoItem)); + this.client.sendResponse(new UnseenItemsComposer(photoItem)); this.client.sendResponse(new FurniListInvalidateComposer()); this.client.getHabbo().giveCredits(-CameraPurchaseEvent.CAMERA_PURCHASE_CREDITS); diff --git a/src/main/java/com/eu/habbo/messages/incoming/camera/CameraRoomThumbnailEvent.java b/src/main/java/com/eu/habbo/messages/incoming/camera/CameraRoomThumbnailEvent.java index c9c1bc12..1f1f244d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/camera/CameraRoomThumbnailEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/camera/CameraRoomThumbnailEvent.java @@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.camera; import com.eu.habbo.Emulator; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.camera.CameraRoomThumbnailSavedComposer; +import com.eu.habbo.messages.outgoing.camera.ThumbnailStatusMessageComposer; import com.eu.habbo.networking.camera.CameraClient; import com.eu.habbo.networking.camera.messages.outgoing.CameraRenderImageComposer; import com.eu.habbo.util.crypto.ZIP; @@ -30,7 +30,7 @@ public class CameraRoomThumbnailEvent extends MessageHandler { Emulator.getCameraClient().sendMessage(composer); } else { - this.client.sendResponse(new CameraRoomThumbnailSavedComposer()); + this.client.sendResponse(new ThumbnailStatusMessageComposer()); this.client.getHabbo().alert(Emulator.getTexts().getValue("camera.disabled")); } } 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 6bd11af3..4f39c9e6 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 @@ -20,7 +20,7 @@ import com.eu.habbo.messages.outgoing.generic.alerts.NotificationDialogMessageCo import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys; 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.UnseenItemsComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer; import com.eu.habbo.messages.outgoing.users.HabboActivityPointNotificationMessageComposer; import com.eu.habbo.threading.runnables.ShutdownEmulator; @@ -334,7 +334,7 @@ public class CatalogBuyItemAsGiftEvent extends MessageHandler { } if (habbo != null) { - habbo.getClient().sendResponse(new AddHabboItemComposer(gift)); + habbo.getClient().sendResponse(new UnseenItemsComposer(gift)); habbo.getClient().getHabbo().getInventory().getItemsComponent().addItem(gift); habbo.getClient().sendResponse(new FurniListInvalidateComposer()); THashMap keys = new THashMap<>(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/JukeBoxRequestTrackDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/JukeBoxRequestTrackDataEvent.java index de8c2c6f..c9c5cf59 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/JukeBoxRequestTrackDataEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/JukeBoxRequestTrackDataEvent.java @@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.catalog; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.items.SoundTrack; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxTrackDataComposer; +import com.eu.habbo.messages.outgoing.rooms.items.jukebox.TraxSongInfoMessageComposer; import java.util.ArrayList; import java.util.List; @@ -22,6 +22,6 @@ public class JukeBoxRequestTrackDataEvent extends MessageHandler { tracks.add(track); } - this.client.sendResponse(new JukeBoxTrackDataComposer(tracks)); + this.client.sendResponse(new TraxSongInfoMessageComposer(tracks)); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/RedeemVoucherEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/RedeemVoucherEvent.java index 5923398b..732289f7 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/RedeemVoucherEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/RedeemVoucherEvent.java @@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.catalog; import com.eu.habbo.Emulator; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.catalog.RedeemVoucherErrorComposer; +import com.eu.habbo.messages.outgoing.catalog.VoucherRedeemErrorMessageComposer; import com.eu.habbo.messages.outgoing.generic.alerts.HotelWillCloseInMinutesComposer; import com.eu.habbo.threading.runnables.ShutdownEmulator; @@ -17,7 +17,7 @@ public class RedeemVoucherEvent extends MessageHandler { String voucherCode = this.packet.readString(); if (voucherCode.contains(" ")) { - this.client.sendResponse(new RedeemVoucherErrorComposer(RedeemVoucherErrorComposer.TECHNICAL_ERROR)); + this.client.sendResponse(new VoucherRedeemErrorMessageComposer(VoucherRedeemErrorMessageComposer.TECHNICAL_ERROR)); return; } diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestPetBreedsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestPetBreedsEvent.java index 5d005da0..31efb5ab 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestPetBreedsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/RequestPetBreedsEvent.java @@ -2,12 +2,12 @@ package com.eu.habbo.messages.incoming.catalog; import com.eu.habbo.Emulator; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.catalog.PetBreedsComposer; +import com.eu.habbo.messages.outgoing.catalog.SellablePetPalettesMessageComposer; public class RequestPetBreedsEvent extends MessageHandler { @Override public void handle() throws Exception { String petName = this.packet.readString(); - this.client.sendResponse(new PetBreedsComposer(petName, Emulator.getGameEnvironment().getPetManager().getBreeds(petName))); + this.client.sendResponse(new SellablePetPalettesMessageComposer(petName, Emulator.getGameEnvironment().getPetManager().getBreeds(petName))); } } 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 45ce7b2f..2f16403c 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 @@ -6,12 +6,12 @@ import com.eu.habbo.habbohotel.permissions.Permission; import com.eu.habbo.habbohotel.rooms.*; 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.UnseenItemsComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer; import com.eu.habbo.messages.outgoing.rooms.HeightMapUpdateMessageComposer; import com.eu.habbo.messages.outgoing.rooms.items.PresentOpenedMessageComposer; import com.eu.habbo.messages.outgoing.rooms.items.RemoveFloorItemComposer; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserWhisperComposer; +import com.eu.habbo.messages.outgoing.rooms.users.WhisperMessageComposer; import com.eu.habbo.threading.runnables.OpenGift; public class OpenRecycleBoxEvent extends MessageHandler { @@ -37,13 +37,13 @@ public class OpenRecycleBoxEvent extends MessageHandler { Emulator.getThreading().run(new OpenGift(item, this.client.getHabbo(), room), item.getBaseItem().getName().contains("present_wrap") ? 1000 : 0); } else { if (item.getExtradata().length() == 0) { - this.client.sendResponse(new RoomUserWhisperComposer(new RoomChatMessage(Emulator.getTexts().getValue("error.recycler.box.empty"), this.client.getHabbo(), this.client.getHabbo(), RoomChatMessageBubbles.BOT))); + this.client.sendResponse(new WhisperMessageComposer(new RoomChatMessage(Emulator.getTexts().getValue("error.recycler.box.empty"), this.client.getHabbo(), this.client.getHabbo(), RoomChatMessageBubbles.BOT))); } else { HabboItem reward = Emulator.getGameEnvironment().getItemManager().handleOpenRecycleBox(this.client.getHabbo(), item); if (reward != null) { this.client.getHabbo().getInventory().getItemsComponent().addItem(reward); - this.client.sendResponse(new AddHabboItemComposer(reward)); + this.client.sendResponse(new UnseenItemsComposer(reward)); this.client.sendResponse(new FurniListInvalidateComposer()); this.client.sendResponse(new PresentOpenedMessageComposer(reward, item.getExtradata(), true)); diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/RecycleEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/RecycleEvent.java index 1c6ec73b..daa3317c 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/RecycleEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/RecycleEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.catalog.PurchaseErrorMessageComposer; import com.eu.habbo.messages.outgoing.catalog.RecyclerFinishedComposer; import com.eu.habbo.messages.outgoing.generic.alerts.HotelWillCloseInMinutesComposer; -import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; +import com.eu.habbo.messages.outgoing.inventory.UnseenItemsComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListRemoveComposer; import com.eu.habbo.threading.runnables.QueryDeleteHabboItem; @@ -57,7 +57,7 @@ public class RecycleEvent extends MessageHandler { return; } - this.client.sendResponse(new AddHabboItemComposer(reward)); + this.client.sendResponse(new UnseenItemsComposer(reward)); this.client.getHabbo().getInventory().getItemsComponent().addItem(reward); this.client.sendResponse(new RecyclerFinishedComposer(RecyclerFinishedComposer.RECYCLING_COMPLETE)); this.client.sendResponse(new FurniListInvalidateComposer()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/ReloadRecyclerEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/ReloadRecyclerEvent.java index 34fddc6a..981461fe 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/ReloadRecyclerEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/ReloadRecyclerEvent.java @@ -1,11 +1,11 @@ package com.eu.habbo.messages.incoming.catalog.recycler; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.catalog.ReloadRecyclerComposer; +import com.eu.habbo.messages.outgoing.catalog.RecyclerStatusComposer; public class ReloadRecyclerEvent extends MessageHandler { @Override public void handle() throws Exception { - this.client.sendResponse(new ReloadRecyclerComposer()); + this.client.sendResponse(new RecyclerStatusComposer()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingCraftItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingCraftItemEvent.java index 2c896964..55c08612 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingCraftItemEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingCraftItemEvent.java @@ -9,7 +9,7 @@ import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.catalog.LimitedEditionSoldOutComposer; import com.eu.habbo.messages.outgoing.crafting.CraftingResultComposer; -import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; +import com.eu.habbo.messages.outgoing.inventory.UnseenItemsComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListRemoveComposer; import com.eu.habbo.threading.runnables.QueryDeleteHabboItems; @@ -58,7 +58,7 @@ public class CraftingCraftItemEvent extends MessageHandler { this.client.sendResponse(new CraftingResultComposer(recipe)); this.client.getHabbo().getInventory().getItemsComponent().addItem(rewardItem); - this.client.sendResponse(new AddHabboItemComposer(rewardItem)); + this.client.sendResponse(new UnseenItemsComposer(rewardItem)); AchievementManager.progressAchievement(this.client.getHabbo(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("Atcg")); toRemove.forEachValue(object -> { CraftingCraftItemEvent.this.client.sendResponse(new FurniListRemoveComposer(object.getGiftAdjustedId())); diff --git a/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingCraftSecretEvent.java b/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingCraftSecretEvent.java index f78a900f..e0b36d01 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingCraftSecretEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingCraftSecretEvent.java @@ -9,7 +9,7 @@ import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.catalog.LimitedEditionSoldOutComposer; import com.eu.habbo.messages.outgoing.crafting.CraftingResultComposer; -import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; +import com.eu.habbo.messages.outgoing.inventory.UnseenItemsComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListRemoveComposer; import com.eu.habbo.threading.runnables.QueryDeleteHabboItem; @@ -76,7 +76,7 @@ public class CraftingCraftSecretEvent extends MessageHandler { AchievementManager.progressAchievement(this.client.getHabbo(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("AtcgSecret")); } this.client.getHabbo().getInventory().getItemsComponent().addItem(rewardItem); - this.client.sendResponse(new AddHabboItemComposer(rewardItem)); + this.client.sendResponse(new UnseenItemsComposer(rewardItem)); for (HabboItem item : habboItems) { this.client.getHabbo().getInventory().getItemsComponent().removeHabboItem(item); this.client.sendResponse(new FurniListRemoveComposer(item.getGiftAdjustedId())); diff --git a/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorRequestBlockedTilesEvent.java b/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorRequestBlockedTilesEvent.java index 9599edf4..52bf67fd 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorRequestBlockedTilesEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorRequestBlockedTilesEvent.java @@ -1,7 +1,7 @@ package com.eu.habbo.messages.incoming.floorplaneditor; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.floorplaneditor.FloorPlanEditorBlockedTilesComposer; +import com.eu.habbo.messages.outgoing.floorplaneditor.RoomOccupiedTilesMessageComposer; public class FloorPlanEditorRequestBlockedTilesEvent extends MessageHandler { @Override @@ -9,6 +9,6 @@ public class FloorPlanEditorRequestBlockedTilesEvent extends MessageHandler { if (this.client.getHabbo().getHabboInfo().getCurrentRoom() == null) return; - this.client.sendResponse(new FloorPlanEditorBlockedTilesComposer(this.client.getHabbo().getHabboInfo().getCurrentRoom())); + this.client.sendResponse(new RoomOccupiedTilesMessageComposer(this.client.getHabbo().getHabboInfo().getCurrentRoom())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorRequestDoorSettingsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorRequestDoorSettingsEvent.java index a2de8842..a521df4a 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorRequestDoorSettingsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorRequestDoorSettingsEvent.java @@ -1,7 +1,7 @@ package com.eu.habbo.messages.incoming.floorplaneditor; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.floorplaneditor.FloorPlanEditorDoorSettingsComposer; +import com.eu.habbo.messages.outgoing.floorplaneditor.RoomEntryTileMessageComposer; import com.eu.habbo.messages.outgoing.rooms.RoomFloorThicknessUpdatedComposer; public class FloorPlanEditorRequestDoorSettingsEvent extends MessageHandler { @@ -10,7 +10,7 @@ public class FloorPlanEditorRequestDoorSettingsEvent extends MessageHandler { if (this.client.getHabbo().getHabboInfo().getCurrentRoom() == null) return; - this.client.sendResponse(new FloorPlanEditorDoorSettingsComposer(this.client.getHabbo().getHabboInfo().getCurrentRoom())); + this.client.sendResponse(new RoomEntryTileMessageComposer(this.client.getHabbo().getHabboInfo().getCurrentRoom())); this.client.sendResponse(new RoomFloorThicknessUpdatedComposer(this.client.getHabbo().getHabboInfo().getCurrentRoom())); } } 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 7d628236..d20b8fde 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 @@ -9,7 +9,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.generic.alerts.NotificationDialogMessageComposer; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys; import com.eu.habbo.messages.outgoing.generic.alerts.HabboBroadcastMessageComposer; -import com.eu.habbo.messages.outgoing.rooms.ForwardToRoomComposer; +import com.eu.habbo.messages.outgoing.rooms.RoomForwardMessageComposer; import gnu.trove.set.hash.THashSet; import java.util.*; @@ -173,7 +173,7 @@ public class FloorPlanEditorSaveEvent extends MessageHandler { habbos.addAll(room.getHabbos()); Emulator.getGameEnvironment().getRoomManager().unloadRoom(room); room = Emulator.getGameEnvironment().getRoomManager().loadRoom(room.getId()); - ServerMessage message = new ForwardToRoomComposer(room.getId()).compose(); + ServerMessage message = new RoomForwardMessageComposer(room.getId()).compose(); for (Habbo habbo : habbos) { habbo.getClient().sendResponse(message); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/FindNewFriendsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/FindNewFriendsEvent.java index 75b33919..adbad1d5 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/friends/FindNewFriendsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/friends/FindNewFriendsEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomCategory; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.friends.FindFriendsProcessResultComposer; -import com.eu.habbo.messages.outgoing.rooms.ForwardToRoomComposer; +import com.eu.habbo.messages.outgoing.rooms.RoomForwardMessageComposer; import java.util.Collections; import java.util.List; @@ -23,7 +23,7 @@ public class FindNewFriendsEvent extends MessageHandler { Room room = rooms.get(0); if (room.getUserCount() > 0) { - this.client.sendResponse(new ForwardToRoomComposer(room.getId())); + this.client.sendResponse(new RoomForwardMessageComposer(room.getId())); return; } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/StalkFriendEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/StalkFriendEvent.java index c18fc1a0..1c647597 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/friends/StalkFriendEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/friends/StalkFriendEvent.java @@ -7,8 +7,8 @@ import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.friends.FollowFriendFailedComposer; -import com.eu.habbo.messages.outgoing.rooms.ForwardToRoomComposer; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserWhisperComposer; +import com.eu.habbo.messages.outgoing.rooms.RoomForwardMessageComposer; +import com.eu.habbo.messages.outgoing.rooms.users.WhisperMessageComposer; public class StalkFriendEvent extends MessageHandler { @Override @@ -40,9 +40,9 @@ public class StalkFriendEvent extends MessageHandler { } if (habbo.getHabboInfo().getCurrentRoom() != this.client.getHabbo().getHabboInfo().getCurrentRoom()) { - this.client.sendResponse(new ForwardToRoomComposer(habbo.getHabboInfo().getCurrentRoom().getId())); + this.client.sendResponse(new RoomForwardMessageComposer(habbo.getHabboInfo().getCurrentRoom().getId())); } else { - this.client.sendResponse(new RoomUserWhisperComposer(new RoomChatMessage(Emulator.getTexts().getValue("stalk.failed.same.room").replace("%user%", habbo.getHabboInfo().getUsername()), this.client.getHabbo(), this.client.getHabbo(), RoomChatMessageBubbles.ALERT))); + this.client.sendResponse(new WhisperMessageComposer(new RoomChatMessage(Emulator.getTexts().getValue("stalk.failed.same.room").replace("%user%", habbo.getHabboInfo().getUsername()), this.client.getHabbo(), this.client.getHabbo(), RoomChatMessageBubbles.ALERT))); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterLeaveGameEvent.java b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterLeaveGameEvent.java index 6236f2fd..68e29746 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterLeaveGameEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterLeaveGameEvent.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.basejump.BaseJumpUnloadGameComposer; +import com.eu.habbo.messages.outgoing.gamecenter.basejump.UnloadGameMessageComposer; public class GameCenterLeaveGameEvent extends MessageHandler { @Override public void handle() throws Exception { - this.client.sendResponse(new BaseJumpUnloadGameComposer()); + this.client.sendResponse(new UnloadGameMessageComposer()); } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumModerateMessageEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumModerateMessageEvent.java index 891345ce..636900c9 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumModerateMessageEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumModerateMessageEvent.java @@ -11,7 +11,7 @@ import com.eu.habbo.habbohotel.permissions.Permission; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.generic.alerts.NotificationDialogMessageComposer; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys; -import com.eu.habbo.messages.outgoing.guilds.forums.PostUpdateMessageComposer; +import com.eu.habbo.messages.outgoing.guilds.forums.UpdateMessageMessageComposer; import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer; @@ -59,7 +59,7 @@ public class GuildForumModerateMessageEvent extends MessageHandler { comment.setState(ForumThreadState.fromValue(state)); comment.setAdminId(this.client.getHabbo().getHabboInfo().getId()); - this.client.sendResponse(new PostUpdateMessageComposer(guild.getId(), thread.getThreadId(), comment)); + this.client.sendResponse(new UpdateMessageMessageComposer(guild.getId(), thread.getThreadId(), comment)); Emulator.getThreading().run(comment); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumThreadUpdateEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumThreadUpdateEvent.java index 4ee329c3..b07e76c6 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumThreadUpdateEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumThreadUpdateEvent.java @@ -11,7 +11,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.generic.alerts.NotificationDialogMessageComposer; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys; import com.eu.habbo.messages.outgoing.guilds.forums.GuildForumThreadsComposer; -import com.eu.habbo.messages.outgoing.guilds.forums.ThreadUpdatedMessageComposer; +import com.eu.habbo.messages.outgoing.guilds.forums.UpdateThreadMessageComposer; import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer; public class GuildForumThreadUpdateEvent extends MessageHandler { @@ -60,7 +60,7 @@ public class GuildForumThreadUpdateEvent extends MessageHandler { thread.run(); - this.client.sendResponse(new ThreadUpdatedMessageComposer(guild, thread, this.client.getHabbo(), isPinned, isLocked)); + this.client.sendResponse(new UpdateThreadMessageComposer(guild, thread, this.client.getHabbo(), isPinned, isLocked)); if (pinChanged) { this.client.sendResponse(new GuildForumThreadsComposer(guild, 0)); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumThreadsMessagesEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumThreadsMessagesEvent.java index d8528960..3da3ff79 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumThreadsMessagesEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumThreadsMessagesEvent.java @@ -9,8 +9,8 @@ import com.eu.habbo.habbohotel.guilds.forums.ForumThread; import com.eu.habbo.habbohotel.guilds.forums.ForumThreadState; import com.eu.habbo.habbohotel.permissions.Permission; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer; -import com.eu.habbo.messages.outgoing.guilds.forums.GuildForumCommentsComposer; +import com.eu.habbo.messages.outgoing.guilds.forums.ThreadMessagesMessageComposer; +import com.eu.habbo.messages.outgoing.generic.alerts.NotificationDialogMessageComposer; import com.eu.habbo.messages.outgoing.guilds.forums.ForumDataMessageComposer; import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer; @@ -35,11 +35,12 @@ public class GuildForumThreadsMessagesEvent extends MessageHandler { GuildMember member = Emulator.getGameEnvironment().getGuildManager().getGuildMember(guildId, this.client.getHabbo().getHabboInfo().getId()); boolean isGuildAdministrator = (guild.getOwnerId() == this.client.getHabbo().getHabboInfo().getId() || member.getRank().equals(GuildRank.ADMIN)); + if (thread.getState() != ForumThreadState.HIDDEN_BY_GUILD_ADMIN || hasStaffPermissions || isGuildAdministrator) { this.client.sendResponse(new GuildForumCommentsComposer(guildId, threadId, index, thread.getComments(limit, index))); - this.client.sendResponse(new GuildForumDataComposer(guild, this.client.getHabbo())); - } - else { + this.client.sendResponse(new ThreadMessagesMessageComposer(guild, this.client.getHabbo())); + + } else { this.client.sendResponse(new NotificationDialogMessageComposer(BubbleAlertKeys.FORUMS_ACCESS_DENIED.key).compose()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/handshake/MachineIDEvent.java b/src/main/java/com/eu/habbo/messages/incoming/handshake/MachineIDEvent.java index 9949ffa5..88b431d7 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/handshake/MachineIDEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/handshake/MachineIDEvent.java @@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.handshake; import com.eu.habbo.messages.NoAuthMessage; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.handshake.MachineIDComposer; +import com.eu.habbo.messages.outgoing.handshake.UniqueMachineIDComposer; import com.eu.habbo.util.HexUtils; @NoAuthMessage @@ -19,7 +19,7 @@ public class MachineIDEvent extends MessageHandler { // Update stored machine id if it doesn't match our requirements. if (storedMachineId.startsWith("~") || storedMachineId.length() != HASH_LENGTH) { storedMachineId = HexUtils.getRandom(HASH_LENGTH); - this.client.sendResponse(new MachineIDComposer(storedMachineId)); + this.client.sendResponse(new UniqueMachineIDComposer(storedMachineId)); } this.client.setMachineId(storedMachineId); 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 e25fce81..f8ef1f65 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 @@ -33,7 +33,7 @@ import com.eu.habbo.messages.outgoing.inventory.BadgePointLimitsComposer; import com.eu.habbo.messages.outgoing.inventory.AvatarEffectsMessageComposer; import com.eu.habbo.messages.outgoing.modtool.CfhTopicsInitComposer; import com.eu.habbo.messages.outgoing.modtool.ModeratorInitMessageComposer; -import com.eu.habbo.messages.outgoing.modtool.ModToolSanctionInfoComposer; +import com.eu.habbo.messages.outgoing.modtool.SanctionStatusComposer; import com.eu.habbo.messages.outgoing.navigator.*; import com.eu.habbo.messages.outgoing.unknown.BuildersClubSubscriptionStatusMessageComposer; import com.eu.habbo.messages.outgoing.mysterybox.MysteryBoxKeysMessageComposer; @@ -204,7 +204,7 @@ public class SecureLoginEvent extends MessageHandler { messages.add(new AvatarEffectsMessageComposer(habbo, this.client.getHabbo().getInventory().getEffectsComponent().effects.values()).compose()); messages.add(new FigureSetIdsComposer(this.client.getHabbo()).compose()); messages.add(new NoobnessLevelMessageComposer(habbo).compose()); - messages.add(new UserPermissionsComposer(this.client.getHabbo()).compose()); + messages.add(new UserRightsMessageComposer(this.client.getHabbo()).compose()); messages.add(new AvailabilityStatusMessageComposer(true, false, true).compose()); messages.add(new PingMessageComposer().compose()); messages.add(new EnableNotificationsComposer(Emulator.getConfig().getBoolean("bubblealerts.enabled", true)).compose()); @@ -218,7 +218,7 @@ public class SecureLoginEvent extends MessageHandler { 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()); + messages.add(new ScrSendUserInfoComposer(this.client.getHabbo(), SubscriptionHabboClub.HABBO_CLUB, ScrSendUserInfoComposer.RESPONSE_TYPE_LOGIN).compose()); if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) { messages.add(new ModeratorInitMessageComposer(this.client.getHabbo()).compose()); @@ -260,7 +260,7 @@ public class SecureLoginEvent extends MessageHandler { ModToolSanctionItem item = modToolSanctionItems.get(modToolSanctionItems.size() - 1); if (item.sanctionLevel > 0 && item.probationTimestamp != 0 && item.probationTimestamp > Emulator.getIntUnixTimestamp()) { - this.client.sendResponse(new ModToolSanctionInfoComposer(this.client.getHabbo())); + this.client.sendResponse(new SanctionStatusComposer(this.client.getHabbo())); } else if (item.sanctionLevel > 0 && item.probationTimestamp != 0 && item.probationTimestamp <= Emulator.getIntUnixTimestamp()) { modToolSanctions.updateSanction(item.id, 0); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/helper/MySanctionStatusEvent.java b/src/main/java/com/eu/habbo/messages/incoming/helper/MySanctionStatusEvent.java index 8608708f..6dbb4e02 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/helper/MySanctionStatusEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/helper/MySanctionStatusEvent.java @@ -1,12 +1,12 @@ package com.eu.habbo.messages.incoming.helper; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.modtool.ModToolSanctionInfoComposer; +import com.eu.habbo.messages.outgoing.modtool.SanctionStatusComposer; public class MySanctionStatusEvent extends MessageHandler { @Override public void handle() throws Exception { - this.client.sendResponse(new ModToolSanctionInfoComposer(this.client.getHabbo())); + this.client.sendResponse(new SanctionStatusComposer(this.client.getHabbo())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/helper/RequestTalentTrackEvent.java b/src/main/java/com/eu/habbo/messages/incoming/helper/RequestTalentTrackEvent.java index 6c851948..f4665875 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/helper/RequestTalentTrackEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/helper/RequestTalentTrackEvent.java @@ -3,13 +3,13 @@ package com.eu.habbo.messages.incoming.helper; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.achievements.TalentTrackType; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.achievements.talenttrack.TalentTrackComposer; +import com.eu.habbo.messages.outgoing.achievements.talenttrack.TalentTrackMessageComposer; public class RequestTalentTrackEvent extends MessageHandler { @Override public void handle() throws Exception { if (Emulator.getConfig().getBoolean("hotel.talenttrack.enabled")) { - this.client.sendResponse(new TalentTrackComposer(this.client.getHabbo(), TalentTrackType.valueOf(this.packet.readString().toUpperCase()))); + this.client.sendResponse(new TalentTrackMessageComposer(this.client.getHabbo(), TalentTrackType.valueOf(this.packet.readString().toUpperCase()))); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewRequestSecondsUntilEvent.java b/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewRequestSecondsUntilEvent.java index c7a6be24..ba073557 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewRequestSecondsUntilEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewRequestSecondsUntilEvent.java @@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.hotelview; import com.eu.habbo.Emulator; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.hotelview.HotelViewSecondsUntilComposer; +import com.eu.habbo.messages.outgoing.hotelview.SecondsUntilMessageComposer; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -15,6 +15,6 @@ public class HotelViewRequestSecondsUntilEvent extends MessageHandler { String date = this.packet.readString(); int secondsUntil = Math.max(0, (int) (dateFormat.parse(date).getTime() / 1000) - Emulator.getIntUnixTimestamp()); - this.client.sendResponse(new HotelViewSecondsUntilComposer(date, secondsUntil)); + this.client.sendResponse(new SecondsUntilMessageComposer(date, secondsUntil)); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomChatlogEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomChatlogEvent.java index 5f58f50e..6f25a32b 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomChatlogEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomChatlogEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.modtool.ScripterManager; import com.eu.habbo.habbohotel.permissions.Permission; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.modtool.ModToolRoomChatlogComposer; +import com.eu.habbo.messages.outgoing.modtool.RoomChatlogComposer; public class ModToolRequestRoomChatlogEvent extends MessageHandler { @Override @@ -15,7 +15,7 @@ public class ModToolRequestRoomChatlogEvent extends MessageHandler { Room room = Emulator.getGameEnvironment().getRoomManager().getRoom(this.packet.readInt()); if (room != null) - this.client.sendResponse(new ModToolRoomChatlogComposer(room, Emulator.getGameEnvironment().getModToolManager().getRoomChatlog(room.getId()))); + this.client.sendResponse(new RoomChatlogComposer(room, Emulator.getGameEnvironment().getModToolManager().getRoomChatlog(room.getId()))); } else { ScripterManager.scripterDetected(this.client, Emulator.getTexts().getValue("scripter.warning.modtools.chatlog").replace("%username%", this.client.getHabbo().getHabboInfo().getUsername())); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomUserChatlogEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomUserChatlogEvent.java index 6fec0a90..796becd5 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomUserChatlogEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomUserChatlogEvent.java @@ -6,7 +6,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.modtool.ModToolRoomChatlogComposer; +import com.eu.habbo.messages.outgoing.modtool.RoomChatlogComposer; public class ModToolRequestRoomUserChatlogEvent extends MessageHandler { @Override @@ -20,7 +20,7 @@ public class ModToolRequestRoomUserChatlogEvent extends MessageHandler { Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); if (room != null) { - this.client.sendResponse(new ModToolRoomChatlogComposer(room, Emulator.getGameEnvironment().getModToolManager().getRoomChatlog(room.getId()))); + this.client.sendResponse(new RoomChatlogComposer(room, Emulator.getGameEnvironment().getModToolManager().getRoomChatlog(room.getId()))); } } } else { diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomVisitsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomVisitsEvent.java index 348cb10a..2751fde8 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomVisitsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomVisitsEvent.java @@ -2,10 +2,9 @@ package com.eu.habbo.messages.incoming.modtool; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.permissions.Permission; -import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboInfo; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.modtool.ModToolUserRoomVisitsComposer; +import com.eu.habbo.messages.outgoing.modtool.RoomVisitsComposer; public class ModToolRequestRoomVisitsEvent extends MessageHandler { @Override @@ -16,7 +15,7 @@ public class ModToolRequestRoomVisitsEvent extends MessageHandler { HabboInfo habboInfo = Emulator.getGameEnvironment().getHabboManager().getHabboInfo(userId); if (habboInfo != null) { - this.client.sendResponse(new ModToolUserRoomVisitsComposer(habboInfo, Emulator.getGameEnvironment().getModToolManager().getUserRoomVisits(userId))); + this.client.sendResponse(new RoomVisitsComposer(habboInfo, Emulator.getGameEnvironment().getModToolManager().getUserRoomVisits(userId))); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestUserChatlogEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestUserChatlogEvent.java index ad55465e..28d2a649 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestUserChatlogEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestUserChatlogEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.modtool.ScripterManager; import com.eu.habbo.habbohotel.permissions.Permission; import com.eu.habbo.habbohotel.users.HabboManager; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.modtool.ModToolUserChatlogComposer; +import com.eu.habbo.messages.outgoing.modtool.UserChatlogComposer; public class ModToolRequestUserChatlogEvent extends MessageHandler { @Override @@ -14,7 +14,7 @@ public class ModToolRequestUserChatlogEvent extends MessageHandler { int userId = this.packet.readInt(); String username = HabboManager.getOfflineHabboInfo(userId).getUsername(); - this.client.sendResponse(new ModToolUserChatlogComposer(Emulator.getGameEnvironment().getModToolManager().getUserRoomVisitsAndChatlogs(userId), userId, username)); + this.client.sendResponse(new UserChatlogComposer(Emulator.getGameEnvironment().getModToolManager().getUserRoomVisitsAndChatlogs(userId), userId, username)); } else { ScripterManager.scripterDetected(this.client, Emulator.getTexts().getValue("scripter.warning.chatlog").replace("%username%", this.client.getHabbo().getHabboInfo().getUsername())); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/NewNavigatorActionEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/NewNavigatorActionEvent.java index 286dc0b5..f7b375d6 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/NewNavigatorActionEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/NewNavigatorActionEvent.java @@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.navigator; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.ForwardToRoomComposer; +import com.eu.habbo.messages.outgoing.rooms.RoomForwardMessageComposer; import com.eu.habbo.messages.outgoing.users.NavigatorSettingsComposer; import java.util.ArrayList; @@ -18,10 +18,10 @@ public class NewNavigatorActionEvent extends MessageHandler { ArrayList rooms = Emulator.getGameEnvironment().getRoomManager().getActiveRooms(); if (!rooms.isEmpty()) { Collections.shuffle(rooms); - this.client.sendResponse(new ForwardToRoomComposer(rooms.get(0).getId())); + this.client.sendResponse(new RoomForwardMessageComposer(rooms.get(0).getId())); } } else if (data.equalsIgnoreCase("predefined_noob_lobby")) { - this.client.sendResponse(new ForwardToRoomComposer(Emulator.getConfig().getInt("hotel.room.nooblobby"))); + this.client.sendResponse(new RoomForwardMessageComposer(Emulator.getConfig().getInt("hotel.room.nooblobby"))); } else { this.client.sendResponse(new NavigatorSettingsComposer(this.client.getHabbo().getHabboInfo().getHomeRoom(), this.client.getHabbo().getHabboInfo().getHomeRoom())); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNewNavigatorDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNewNavigatorDataEvent.java index e852be7f..f53d0baf 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNewNavigatorDataEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNewNavigatorDataEvent.java @@ -11,6 +11,6 @@ public class RequestNewNavigatorDataEvent extends MessageHandler { this.client.sendResponse(new NavigatorLiftedRoomsComposer()); this.client.sendResponse(new CollapsedCategoriesComposer()); this.client.sendResponse(new NavigatorSavedSearchesComposer(this.client.getHabbo().getHabboInfo().getSavedSearches())); - this.client.sendResponse(new NewNavigatorEventCategoriesComposer()); + this.client.sendResponse(new UserEventCatsComposer()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestRoomCategoriesEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestRoomCategoriesEvent.java index 94b644f1..839f9aec 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestRoomCategoriesEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestRoomCategoriesEvent.java @@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.navigator; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.rooms.RoomCategory; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.navigator.RoomCategoriesComposer; +import com.eu.habbo.messages.outgoing.navigator.UserFlatCatsComposer; import java.util.List; @@ -11,7 +11,7 @@ public class RequestRoomCategoriesEvent extends MessageHandler { @Override public void handle() throws Exception { List roomCategoryList = Emulator.getGameEnvironment().getRoomManager().roomCategoriesForHabbo(this.client.getHabbo()); - this.client.sendResponse(new RoomCategoriesComposer(roomCategoryList)); + this.client.sendResponse(new UserFlatCatsComposer(roomCategoryList)); //this.client.sendResponse(new NewNavigatorEventCategoriesComposer()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/polls/AnswerPollEvent.java b/src/main/java/com/eu/habbo/messages/incoming/polls/AnswerPollEvent.java index db89d091..945288fd 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/polls/AnswerPollEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/polls/AnswerPollEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.polls.Poll; import com.eu.habbo.habbohotel.users.HabboBadge; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.users.BadgeReceivedComposer; -import com.eu.habbo.messages.outgoing.wired.WiredRewardAlertComposer; +import com.eu.habbo.messages.outgoing.wired.WiredRewardResultMessageComposer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,9 +57,9 @@ public class AnswerPollEvent extends MessageHandler { Emulator.getThreading().run(badge); this.client.getHabbo().getInventory().getBadgesComponent().addBadge(badge); this.client.sendResponse(new BadgeReceivedComposer(badge)); - this.client.sendResponse(new WiredRewardAlertComposer(WiredRewardAlertComposer.REWARD_RECEIVED_BADGE)); + this.client.sendResponse(new WiredRewardResultMessageComposer(WiredRewardResultMessageComposer.REWARD_RECEIVED_BADGE)); } else { - this.client.sendResponse(new WiredRewardAlertComposer(WiredRewardAlertComposer.REWARD_ALREADY_RECEIVED)); + this.client.sendResponse(new WiredRewardResultMessageComposer(WiredRewardResultMessageComposer.REWARD_ALREADY_RECEIVED)); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomSettingsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomSettingsEvent.java index e025d33f..78aef72b 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomSettingsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomSettingsEvent.java @@ -1,10 +1,9 @@ package com.eu.habbo.messages.incoming.rooms; import com.eu.habbo.Emulator; -import com.eu.habbo.habbohotel.achievements.AchievementManager; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.RoomSettingsComposer; +import com.eu.habbo.messages.outgoing.rooms.RoomSettingsDataComposer; public class RequestRoomSettingsEvent extends MessageHandler { @Override @@ -14,6 +13,6 @@ public class RequestRoomSettingsEvent extends MessageHandler { Room room = Emulator.getGameEnvironment().getRoomManager().getRoom(roomId); if (room != null) - this.client.sendResponse(new RoomSettingsComposer(room)); + this.client.sendResponse(new RoomSettingsDataComposer(room)); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomWordFilterEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomWordFilterEvent.java index 3d54bfe6..196e429d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomWordFilterEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomWordFilterEvent.java @@ -4,7 +4,7 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.achievements.AchievementManager; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.RoomFilterWordsComposer; +import com.eu.habbo.messages.outgoing.rooms.RoomFilterSettingsMessageComposer; public class RequestRoomWordFilterEvent extends MessageHandler { @Override @@ -12,7 +12,7 @@ public class RequestRoomWordFilterEvent extends MessageHandler { Room room = Emulator.getGameEnvironment().getRoomManager().getRoom(this.packet.readInt()); if (room != null && room.hasRights(this.client.getHabbo())) { - this.client.sendResponse(new RoomFilterWordsComposer(room)); + this.client.sendResponse(new RoomFilterSettingsMessageComposer(room)); AchievementManager.progressAchievement(this.client.getHabbo(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("SelfModRoomFilterSeen")); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomPlacePaintEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomPlacePaintEvent.java index 5704f635..ca134197 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomPlacePaintEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomPlacePaintEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.inventory.FurniListRemoveComposer; -import com.eu.habbo.messages.outgoing.rooms.RoomPaintComposer; +import com.eu.habbo.messages.outgoing.rooms.RoomPropertyMessageComposer; public class RoomPlacePaintEvent extends MessageHandler { @Override @@ -43,7 +43,7 @@ public class RoomPlacePaintEvent extends MessageHandler { this.client.getHabbo().getInventory().getItemsComponent().removeHabboItem(item); room.setNeedsUpdate(true); - room.sendComposer(new RoomPaintComposer(item.getBaseItem().getName(), item.getExtradata()).compose()); + room.sendComposer(new RoomPropertyMessageComposer(item.getBaseItem().getName(), item.getExtradata()).compose()); item.needsDelete(true); Emulator.getThreading().run(item); this.client.sendResponse(new FurniListRemoveComposer(itemId)); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomRemoveAllRightsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomRemoveAllRightsEvent.java index ec781e7f..4d8d3237 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomRemoveAllRightsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomRemoveAllRightsEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.rooms.RoomRightLevels; import com.eu.habbo.habbohotel.rooms.RoomUnitStatus; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.RoomRightsComposer; +import com.eu.habbo.messages.outgoing.rooms.YouAreControllerMessageComposer; import com.eu.habbo.messages.outgoing.rooms.users.NoSuchFlatComposer; import gnu.trove.procedure.TIntProcedure; @@ -27,7 +27,7 @@ public class RoomRemoveAllRightsEvent extends MessageHandler { if (habbo != null) { room.sendComposer(new NoSuchFlatComposer(room, value).compose()); habbo.getRoomUnit().removeStatus(RoomUnitStatus.FLAT_CONTROL); - habbo.getClient().sendResponse(new RoomRightsComposer(RoomRightLevels.NONE)); + habbo.getClient().sendResponse(new YouAreControllerMessageComposer(RoomRightLevels.NONE)); } return true; diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomSettingsSaveEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomSettingsSaveEvent.java index a45eeb89..014ad95c 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomSettingsSaveEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomSettingsSaveEvent.java @@ -24,12 +24,12 @@ public class RoomSettingsSaveEvent extends MessageHandler { String name = this.packet.readString(); if (name.trim().isEmpty() || name.length() > 60) { - this.client.sendResponse(new RoomEditSettingsErrorComposer(room.getId(), RoomEditSettingsErrorComposer.ROOM_NAME_MISSING, "")); + this.client.sendResponse(new RoomSettingsSaveErrorComposer(room.getId(), RoomSettingsSaveErrorComposer.ROOM_NAME_MISSING, "")); return; } if (!Emulator.getGameEnvironment().getWordFilter().filter(name, this.client.getHabbo()).equals(name)) { - this.client.sendResponse(new RoomEditSettingsErrorComposer(room.getId(), RoomEditSettingsErrorComposer.ROOM_NAME_BADWORDS, "")); + this.client.sendResponse(new RoomSettingsSaveErrorComposer(room.getId(), RoomSettingsSaveErrorComposer.ROOM_NAME_BADWORDS, "")); return; } @@ -40,7 +40,7 @@ public class RoomSettingsSaveEvent extends MessageHandler { } if (!Emulator.getGameEnvironment().getWordFilter().filter(description, this.client.getHabbo()).equals(description)) { - this.client.sendResponse(new RoomEditSettingsErrorComposer(room.getId(), RoomEditSettingsErrorComposer.ROOM_DESCRIPTION_BADWORDS, "")); + this.client.sendResponse(new RoomSettingsSaveErrorComposer(room.getId(), RoomSettingsSaveErrorComposer.ROOM_DESCRIPTION_BADWORDS, "")); return; } @@ -48,7 +48,7 @@ public class RoomSettingsSaveEvent extends MessageHandler { String password = this.packet.readString(); if (state == RoomState.PASSWORD && password.isEmpty() && (room.getPassword() == null || room.getPassword().isEmpty())) { - this.client.sendResponse(new RoomEditSettingsErrorComposer(room.getId(), RoomEditSettingsErrorComposer.PASSWORD_REQUIRED, "")); + this.client.sendResponse(new RoomSettingsSaveErrorComposer(room.getId(), RoomSettingsSaveErrorComposer.PASSWORD_REQUIRED, "")); return; } @@ -60,14 +60,14 @@ public class RoomSettingsSaveEvent extends MessageHandler { String tag = this.packet.readString(); if (tag.length() > 15) { - this.client.sendResponse(new RoomEditSettingsErrorComposer(room.getId(), RoomEditSettingsErrorComposer.TAGS_TOO_LONG, "")); + this.client.sendResponse(new RoomSettingsSaveErrorComposer(room.getId(), RoomSettingsSaveErrorComposer.TAGS_TOO_LONG, "")); return; } tags.append(tag).append(";"); } if (!Emulator.getGameEnvironment().getWordFilter().filter(tags.toString(), this.client.getHabbo()).equals(tags.toString())) { - this.client.sendResponse(new RoomEditSettingsErrorComposer(room.getId(), RoomEditSettingsErrorComposer.ROOM_TAGS_BADWWORDS, "")); + this.client.sendResponse(new RoomSettingsSaveErrorComposer(room.getId(), RoomSettingsSaveErrorComposer.ROOM_TAGS_BADWWORDS, "")); return; } @@ -75,7 +75,7 @@ public class RoomSettingsSaveEvent extends MessageHandler { if (tags.length() > 0) { for (String s : Emulator.getConfig().getValue("hotel.room.tags.staff").split(";")) { if (tags.toString().contains(s)) { - this.client.sendResponse(new RoomEditSettingsErrorComposer(room.getId(), RoomEditSettingsErrorComposer.RESTRICTED_TAGS, "1")); + this.client.sendResponse(new RoomSettingsSaveErrorComposer(room.getId(), RoomSettingsSaveErrorComposer.RESTRICTED_TAGS, "1")); return; } } @@ -124,9 +124,9 @@ public class RoomSettingsSaveEvent extends MessageHandler { room.setChatProtection(this.packet.readInt()); room.setNeedsUpdate(true); - room.sendComposer(new RoomThicknessComposer(room).compose()); - room.sendComposer(new RoomChatSettingsComposer(room).compose()); - room.sendComposer(new RoomSettingsUpdatedComposer(room).compose()); + room.sendComposer(new RoomVisualizationSettingsComposer(room).compose()); + room.sendComposer(new RoomChatSettingsMessageComposer(room).compose()); + room.sendComposer(new RoomInfoUpdatedComposer(room).compose()); this.client.sendResponse(new RoomSettingsSavedComposer(room)); //TODO Find packet for update room name. } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/BotSaveSettingsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/BotSaveSettingsEvent.java index f73571c3..42a64b29 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/BotSaveSettingsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/BotSaveSettingsEvent.java @@ -9,7 +9,7 @@ import com.eu.habbo.habbohotel.users.DanceType; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.generic.alerts.BotErrorComposer; import com.eu.habbo.messages.outgoing.rooms.users.DanceMessageComposer; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserNameChangedComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserNameChangedMessageComposer; import com.eu.habbo.messages.outgoing.rooms.users.RoomUsersComposer; import com.eu.habbo.plugin.events.bots.BotSavedChatEvent; import com.eu.habbo.plugin.events.bots.BotSavedLookEvent; @@ -143,7 +143,7 @@ public class BotSaveSettingsEvent extends MessageHandler { bot.setName(nameEvent.name); bot.needsUpdate(true); - room.sendComposer(new RoomUserNameChangedComposer(bot.getRoomUnit().getId(), bot.getRoomUnit().getId(), nameEvent.name).compose()); + room.sendComposer(new UserNameChangedMessageComposer(bot.getRoomUnit().getId(), bot.getRoomUnit().getId(), nameEvent.name).compose()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoodLightSaveSettingsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoodLightSaveSettingsEvent.java index 894e83c9..111846e9 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoodLightSaveSettingsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoodLightSaveSettingsEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.rooms.RoomMoodlightData; import com.eu.habbo.habbohotel.rooms.RoomRightLevels; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.items.MoodLightDataComposer; +import com.eu.habbo.messages.outgoing.rooms.items.RoomDimmerPresetsComposer; import java.util.Arrays; import java.util.List; @@ -59,6 +59,6 @@ public class MoodLightSaveSettingsEvent extends MessageHandler { } room.setNeedsUpdate(true); - this.client.sendResponse(new MoodLightDataComposer(room.getMoodlightData())); + this.client.sendResponse(new RoomDimmerPresetsComposer(room.getMoodlightData())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoodLightSettingsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoodLightSettingsEvent.java index bd1cc107..9f2ee7b8 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoodLightSettingsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoodLightSettingsEvent.java @@ -1,12 +1,12 @@ package com.eu.habbo.messages.incoming.rooms.items; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.items.MoodLightDataComposer; +import com.eu.habbo.messages.outgoing.rooms.items.RoomDimmerPresetsComposer; public class MoodLightSettingsEvent extends MessageHandler { @Override public void handle() throws Exception { if (this.client.getHabbo().getHabboInfo().getCurrentRoom() != null) - this.client.sendResponse(new MoodLightDataComposer(this.client.getHabbo().getHabboInfo().getCurrentRoom().getMoodlightData())); + this.client.sendResponse(new RoomDimmerPresetsComposer(this.client.getHabbo().getHabboInfo().getCurrentRoom().getMoodlightData())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/ToggleFloorItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/ToggleFloorItemEvent.java index 5f7dc6d4..439c4a2d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/ToggleFloorItemEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/ToggleFloorItemEvent.java @@ -10,7 +10,7 @@ import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.rooms.items.RemoveFloorItemComposer; import com.eu.habbo.messages.outgoing.rooms.pets.OpenPetPackageRequestedMessageComposer; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserUpdateComposer; import com.eu.habbo.plugin.Event; import com.eu.habbo.plugin.events.furniture.FurnitureToggleEvent; import com.eu.habbo.threading.runnables.QueryDeleteHabboItem; @@ -111,7 +111,7 @@ public class ToggleFloorItemEvent extends MessageHandler { room.updateTile(room.getLayout().getTile(item.getX(), item.getY())); room.placePet(pet, item.getX(), item.getY(), item.getZ(), item.getRotation()); pet.cycle(); - room.sendComposer(new RoomUserStatusComposer(pet.getRoomUnit()).compose()); + room.sendComposer(new UserUpdateComposer(pet.getRoomUnit()).compose()); return; } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxEventOne.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxEventOne.java index fdffa95c..59d48048 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxEventOne.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxEventOne.java @@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.rooms.items.jukebox; import com.eu.habbo.habbohotel.rooms.TraxManager; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxMySongsComposer; +import com.eu.habbo.messages.outgoing.rooms.items.jukebox.UserSongDisksInventoryMessageComposer; import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeboxSongDisksMessageComposer; public class JukeBoxEventOne extends MessageHandler { @@ -10,7 +10,7 @@ public class JukeBoxEventOne extends MessageHandler { public void handle() throws Exception { TraxManager traxManager = this.client.getHabbo().getHabboInfo().getCurrentRoom().getTraxManager(); this.client.sendResponse(new JukeboxSongDisksMessageComposer(traxManager.getSongs(), traxManager.totalLength())); - this.client.sendResponse(new JukeBoxMySongsComposer(traxManager.myList(this.client.getHabbo()))); + this.client.sendResponse(new UserSongDisksInventoryMessageComposer(traxManager.myList(this.client.getHabbo()))); this.client.getHabbo().getHabboInfo().getCurrentRoom().getTraxManager().updateCurrentPlayingSong(this.client.getHabbo()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxEventTwo.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxEventTwo.java index aee02e84..081c0cca 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxEventTwo.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxEventTwo.java @@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.rooms.items.jukebox; import com.eu.habbo.habbohotel.rooms.TraxManager; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxMySongsComposer; +import com.eu.habbo.messages.outgoing.rooms.items.jukebox.UserSongDisksInventoryMessageComposer; import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeboxSongDisksMessageComposer; public class JukeBoxEventTwo extends MessageHandler { @@ -10,7 +10,7 @@ public class JukeBoxEventTwo extends MessageHandler { public void handle() throws Exception { TraxManager traxManager = this.client.getHabbo().getHabboInfo().getCurrentRoom().getTraxManager(); this.client.sendResponse(new JukeboxSongDisksMessageComposer(traxManager.getSongs(), traxManager.totalLength())); - this.client.sendResponse(new JukeBoxMySongsComposer(traxManager.myList(this.client.getHabbo()))); + this.client.sendResponse(new UserSongDisksInventoryMessageComposer(traxManager.myList(this.client.getHabbo()))); this.client.getHabbo().getHabboInfo().getCurrentRoom().getTraxManager().updateCurrentPlayingSong(this.client.getHabbo()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxRequestPlayListEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxRequestPlayListEvent.java index c6fae1f2..20b272f7 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxRequestPlayListEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxRequestPlayListEvent.java @@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.rooms.items.jukebox; import com.eu.habbo.habbohotel.rooms.TraxManager; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxMySongsComposer; +import com.eu.habbo.messages.outgoing.rooms.items.jukebox.UserSongDisksInventoryMessageComposer; import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeboxSongDisksMessageComposer; public class JukeBoxRequestPlayListEvent extends MessageHandler { @@ -10,7 +10,7 @@ public class JukeBoxRequestPlayListEvent extends MessageHandler { public void handle() throws Exception { TraxManager traxManager = this.client.getHabbo().getHabboInfo().getCurrentRoom().getTraxManager(); this.client.sendResponse(new JukeboxSongDisksMessageComposer(traxManager.getSongs(), traxManager.totalLength())); - this.client.sendResponse(new JukeBoxMySongsComposer(traxManager.myList(this.client.getHabbo()))); + this.client.sendResponse(new UserSongDisksInventoryMessageComposer(traxManager.myList(this.client.getHabbo()))); this.client.getHabbo().getHabboInfo().getCurrentRoom().getTraxManager().updateCurrentPlayingSong(this.client.getHabbo()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestPlaylistChange.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestPlaylistChange.java index 3a367dfe..184a1f1f 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestPlaylistChange.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestPlaylistChange.java @@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.items.youtube.YoutubeVideoComposer; +import com.eu.habbo.messages.outgoing.rooms.items.youtube.YoutubeDisplayVideoMessageComposer; import com.eu.habbo.threading.runnables.YoutubeAdvanceVideo; import java.util.Optional; @@ -46,7 +46,7 @@ public class YoutubeRequestPlaylistChange extends MessageHandler { ((InteractionYoutubeTV) item).cancelAdvancement(); room.updateItem(item); - room.sendComposer(new YoutubeVideoComposer(itemId, video, true, 0).compose()); + room.sendComposer(new YoutubeDisplayVideoMessageComposer(itemId, video, true, 0).compose()); ((InteractionYoutubeTV) item).autoAdvance = Emulator.getThreading().run(new YoutubeAdvanceVideo((InteractionYoutubeTV) item), video.getDuration() * 1000); item.needsUpdate(true); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestPlaylists.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestPlaylists.java index 72620926..1632a601 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestPlaylists.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestPlaylists.java @@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.items.interactions.InteractionYoutubeTV; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer; -import com.eu.habbo.messages.outgoing.rooms.items.youtube.YoutubeDisplayListComposer; +import com.eu.habbo.messages.outgoing.rooms.items.youtube.YoutubeDisplayPlaylistsComposer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,7 +33,7 @@ public class YoutubeRequestPlaylists extends MessageHandler { return; } - this.client.sendResponse(new YoutubeDisplayListComposer(itemId, playlists, tv.currentPlaylist)); + this.client.sendResponse(new YoutubeDisplayPlaylistsComposer(itemId, playlists, tv.currentPlaylist)); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestStateChange.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestStateChange.java index b9010e5a..117e85c6 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestStateChange.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestStateChange.java @@ -7,8 +7,8 @@ import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.items.youtube.YoutubeStateChangeComposer; -import com.eu.habbo.messages.outgoing.rooms.items.youtube.YoutubeVideoComposer; +import com.eu.habbo.messages.outgoing.rooms.items.youtube.YoutubeControlVideoMessageComposer; +import com.eu.habbo.messages.outgoing.rooms.items.youtube.YoutubeDisplayVideoMessageComposer; import com.eu.habbo.threading.runnables.YoutubeAdvanceVideo; public class YoutubeRequestStateChange extends MessageHandler { @@ -75,13 +75,13 @@ public class YoutubeRequestStateChange extends MessageHandler { tv.playing = false; tv.offset += Emulator.getIntUnixTimestamp() - tv.startedWatchingAt; if (tv.autoAdvance != null) tv.autoAdvance.cancel(true); - room.sendComposer(new YoutubeStateChangeComposer(tv.getId(), 2).compose()); + room.sendComposer(new YoutubeControlVideoMessageComposer(tv.getId(), 2).compose()); break; case RESUME: tv.playing = true; tv.startedWatchingAt = Emulator.getIntUnixTimestamp(); tv.autoAdvance = Emulator.getThreading().run(new YoutubeAdvanceVideo(tv), (tv.currentVideo.getDuration() - tv.offset) * 1000); - room.sendComposer(new YoutubeStateChangeComposer(tv.getId(), 1).compose()); + room.sendComposer(new YoutubeControlVideoMessageComposer(tv.getId(), 1).compose()); break; case PREVIOUS: int previousIndex = tv.currentPlaylist.getVideos().indexOf(tv.currentVideo) - 1; @@ -96,7 +96,7 @@ public class YoutubeRequestStateChange extends MessageHandler { } if (state == YoutubeState.PREVIOUS || state == YoutubeState.NEXT) { - room.sendComposer(new YoutubeVideoComposer(tv.getId(), tv.currentVideo, true, 0).compose()); + room.sendComposer(new YoutubeDisplayVideoMessageComposer(tv.getId(), tv.currentVideo, true, 0).compose()); tv.cancelAdvancement(); tv.autoAdvance = Emulator.getThreading().run(new YoutubeAdvanceVideo(tv), tv.currentVideo.getDuration() * 1000); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/HorseRemoveSaddleEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/HorseRemoveSaddleEvent.java index c10e898b..9be569fb 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/HorseRemoveSaddleEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/HorseRemoveSaddleEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.pets.Pet; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; +import com.eu.habbo.messages.outgoing.inventory.UnseenItemsComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer; import com.eu.habbo.messages.outgoing.rooms.pets.PetFigureUpdateComposer; import org.slf4j.Logger; @@ -62,7 +62,7 @@ public class HorseRemoveSaddleEvent extends MessageHandler { this.client.getHabbo().getInventory().getItemsComponent().addItem(saddle); - this.client.sendResponse(new AddHabboItemComposer(saddle)); + this.client.sendResponse(new UnseenItemsComposer(saddle)); this.client.sendResponse(new FurniListInvalidateComposer()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/MovePetEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/MovePetEvent.java index 2038450d..9c6fcb81 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/MovePetEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/MovePetEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomTile; import com.eu.habbo.habbohotel.rooms.RoomUserRotation; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserUpdateComposer; public class MovePetEvent extends MessageHandler { @Override @@ -27,7 +27,7 @@ public class MovePetEvent extends MessageHandler { pet.getRoomUnit().setZ(tile.z); pet.getRoomUnit().setRotation(RoomUserRotation.fromValue(this.packet.readInt())); pet.getRoomUnit().setPreviousLocationZ(pet.getRoomUnit().getZ()); - room.sendComposer(new RoomUserStatusComposer(pet.getRoomUnit()).compose()); + room.sendComposer(new UserUpdateComposer(pet.getRoomUnit()).compose()); pet.needsUpdate = true; } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetUseItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetUseItemEvent.java index 93848078..7a7fe1d1 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetUseItemEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PetUseItemEvent.java @@ -12,7 +12,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.rooms.items.RemoveFloorItemComposer; import com.eu.habbo.messages.outgoing.rooms.pets.PetStatusUpdateComposer; import com.eu.habbo.messages.outgoing.rooms.pets.PetFigureUpdateComposer; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserUpdateComposer; import com.eu.habbo.threading.runnables.QueryDeleteHabboItem; public class PetUseItemEvent extends MessageHandler { @@ -98,7 +98,7 @@ public class PetUseItemEvent extends MessageHandler { this.client.getHabbo().getHabboInfo().getCurrentRoom().removeHabboItem(item); this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RemoveFloorItemComposer(item).compose()); - this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RoomUserStatusComposer(pet.getRoomUnit()).compose()); + this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new UserUpdateComposer(pet.getRoomUnit()).compose()); this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new PetStatusUpdateComposer(pet).compose()); this.client.getHabbo().getHabboInfo().getCurrentRoom().updateTiles(room.getLayout().getTilesAt(room.getLayout().getTile(item.getX(), item.getY()), item.getBaseItem().getWidth(), item.getBaseItem().getLength(), item.getRotation())); AchievementManager.progressAchievement(this.client.getHabbo(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("MonsterPlantHealer")); @@ -114,7 +114,7 @@ public class PetUseItemEvent extends MessageHandler { pet.getRoomUnit().setStatus(RoomUnitStatus.fromString("grw" + ((MonsterplantPet) pet).getGrowthStage()), ""); this.client.getHabbo().getHabboInfo().getCurrentRoom().removeHabboItem(item); this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RemoveFloorItemComposer(item).compose()); - this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RoomUserStatusComposer(pet.getRoomUnit()).compose()); + this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new UserUpdateComposer(pet.getRoomUnit()).compose()); this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new PetStatusUpdateComposer(pet).compose()); this.client.getHabbo().getHabboInfo().getCurrentRoom().updateTiles(room.getLayout().getTilesAt(room.getLayout().getTile(item.getX(), item.getY()), item.getBaseItem().getWidth(), item.getBaseItem().getLength(), item.getRotation())); pet.getRoomUnit().removeStatus(RoomUnitStatus.GESTURE); @@ -136,7 +136,7 @@ public class PetUseItemEvent extends MessageHandler { this.client.getHabbo().getHabboInfo().getCurrentRoom().removeHabboItem(item); this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RemoveFloorItemComposer(item).compose()); - this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RoomUserStatusComposer(pet.getRoomUnit()).compose()); + this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new UserUpdateComposer(pet.getRoomUnit()).compose()); this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new PetStatusUpdateComposer(pet).compose()); this.client.getHabbo().getHabboInfo().getCurrentRoom().updateTiles(room.getLayout().getTilesAt(room.getLayout().getTile(item.getX(), item.getY()), item.getBaseItem().getWidth(), item.getBaseItem().getLength(), item.getRotation())); pet.getRoomUnit().removeStatus(RoomUnitStatus.GESTURE); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/BuyRoomPromotionEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/BuyRoomPromotionEvent.java index 920f7b9b..ec4425b5 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/BuyRoomPromotionEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/BuyRoomPromotionEvent.java @@ -9,8 +9,8 @@ import com.eu.habbo.habbohotel.rooms.RoomRightLevels; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.catalog.PurchaseErrorMessageComposer; import com.eu.habbo.messages.outgoing.catalog.PurchaseOKMessageComposer; -import com.eu.habbo.messages.outgoing.navigator.NewNavigatorEventCategoriesComposer; -import com.eu.habbo.messages.outgoing.rooms.promotions.RoomPromotionMessageComposer; +import com.eu.habbo.messages.outgoing.navigator.UserEventCatsComposer; +import com.eu.habbo.messages.outgoing.rooms.promotions.RoomEventComposer; public class BuyRoomPromotionEvent extends MessageHandler { public static String ROOM_PROMOTION_BADGE = "RADZZ"; @@ -25,7 +25,7 @@ public class BuyRoomPromotionEvent extends MessageHandler { String description = this.packet.readString(); int categoryId = this.packet.readInt(); - if (NewNavigatorEventCategoriesComposer.CATEGORIES.stream().noneMatch(c -> c.getId() == categoryId)) + if (UserEventCatsComposer.CATEGORIES.stream().noneMatch(c -> c.getId() == categoryId)) return; CatalogPage page = Emulator.getGameEnvironment().getCatalogManager().getCatalogPage(pageId); @@ -58,7 +58,7 @@ public class BuyRoomPromotionEvent extends MessageHandler { } this.client.sendResponse(new PurchaseOKMessageComposer()); - room.sendComposer(new RoomPromotionMessageComposer(room, room.getPromotion()).compose()); + room.sendComposer(new RoomEventComposer(room, room.getPromotion()).compose()); if (!this.client.getHabbo().getInventory().getBadgesComponent().hasBadge(BuyRoomPromotionEvent.ROOM_PROMOTION_BADGE)) { this.client.getHabbo().addBadge(BuyRoomPromotionEvent.ROOM_PROMOTION_BADGE); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/RequestPromotionRoomsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/RequestPromotionRoomsEvent.java index 3ece7382..2146ff92 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/RequestPromotionRoomsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/RequestPromotionRoomsEvent.java @@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.rooms.promotions; 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.promotions.PromoteOwnRoomsListComposer; +import com.eu.habbo.messages.outgoing.rooms.promotions.RoomAdPurchaseInfoComposer; import java.util.List; @@ -13,6 +13,6 @@ public class RequestPromotionRoomsEvent extends MessageHandler { List roomsToShow = Emulator.getGameEnvironment().getRoomManager().getRoomsForHabbo(this.client.getHabbo()); roomsToShow.addAll(Emulator.getGameEnvironment().getRoomManager().getRoomsWithRights(this.client.getHabbo())); roomsToShow.addAll(Emulator.getGameEnvironment().getRoomManager().getRoomsWithAdminRights(this.client.getHabbo())); - this.client.sendResponse(new PromoteOwnRoomsListComposer(roomsToShow)); + this.client.sendResponse(new RoomAdPurchaseInfoComposer(roomsToShow)); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/UpdateRoomPromotionEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/UpdateRoomPromotionEvent.java index 22d8900e..d72e42b1 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/UpdateRoomPromotionEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/UpdateRoomPromotionEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.permissions.Permission; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomPromotion; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.promotions.RoomPromotionMessageComposer; +import com.eu.habbo.messages.outgoing.rooms.promotions.RoomEventComposer; public class UpdateRoomPromotionEvent extends MessageHandler { @@ -33,7 +33,7 @@ public class UpdateRoomPromotionEvent extends MessageHandler { roomPromotion.needsUpdate = true; roomPromotion.save(); - room.sendComposer(new RoomPromotionMessageComposer(room, roomPromotion).compose()); + room.sendComposer(new RoomEventComposer(room, roomPromotion).compose()); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RequestRoomUserTagsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RequestRoomUserTagsEvent.java index 1cd6777c..c844188d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RequestRoomUserTagsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RequestRoomUserTagsEvent.java @@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.rooms.users; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserTagsComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserTagsMessageComposer; public class RequestRoomUserTagsEvent extends MessageHandler { @Override @@ -13,7 +13,7 @@ public class RequestRoomUserTagsEvent extends MessageHandler { Habbo habbo = this.client.getHabbo().getHabboInfo().getCurrentRoom().getHabboByRoomUnitId(roomUnitId); if (habbo != null) { - this.client.sendResponse(new RoomUserTagsComposer(habbo)); + this.client.sendResponse(new UserTagsMessageComposer(habbo)); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserKickEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserKickEvent.java index 814b0599..1537e753 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserKickEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserKickEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.rooms.RoomChatMessage; import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserWhisperComposer; +import com.eu.habbo.messages.outgoing.rooms.users.WhisperMessageComposer; import com.eu.habbo.plugin.events.users.UserKickEvent; public class RoomUserKickEvent extends MessageHandler { @@ -27,7 +27,7 @@ public class RoomUserKickEvent extends MessageHandler { return; if (target.hasPermission(Permission.ACC_UNKICKABLE)) { - this.client.sendResponse(new RoomUserWhisperComposer(new RoomChatMessage(Emulator.getTexts().getValue("commands.error.cmd_kick.unkickable").replace("%username%", target.getHabboInfo().getUsername()), this.client.getHabbo(), this.client.getHabbo(), RoomChatMessageBubbles.ALERT))); + this.client.sendResponse(new WhisperMessageComposer(new RoomChatMessage(Emulator.getTexts().getValue("commands.error.cmd_kick.unkickable").replace("%username%", target.getHabboInfo().getUsername()), this.client.getHabbo(), this.client.getHabbo(), RoomChatMessageBubbles.ALERT))); return; } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserLookAtPoint.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserLookAtPoint.java index f4f7c005..473b362c 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserLookAtPoint.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserLookAtPoint.java @@ -6,7 +6,6 @@ import com.eu.habbo.habbohotel.rooms.RoomUnit; import com.eu.habbo.habbohotel.rooms.RoomUnitStatus; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; public class RoomUserLookAtPoint extends MessageHandler { @Override diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserMuteEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserMuteEvent.java index 8acca3b2..1e89a35b 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserMuteEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserMuteEvent.java @@ -6,7 +6,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.users.MutedWhisperComposer; +import com.eu.habbo.messages.outgoing.users.RemainingMutePeriodComposer; public class RoomUserMuteEvent extends MessageHandler { @Override @@ -23,7 +23,7 @@ public class RoomUserMuteEvent extends MessageHandler { if (habbo != null) { room.muteHabbo(habbo, minutes); - habbo.getClient().sendResponse(new MutedWhisperComposer(minutes * 60)); + habbo.getClient().sendResponse(new RemainingMutePeriodComposer(minutes * 60)); AchievementManager.progressAchievement(this.client.getHabbo(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("SelfModMuteSeen")); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserStartTypingEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserStartTypingEvent.java index 94f471a2..a350b7c8 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserStartTypingEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserStartTypingEvent.java @@ -1,7 +1,7 @@ package com.eu.habbo.messages.incoming.rooms.users; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserTypingComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserTypingMessageComposer; public class RoomUserStartTypingEvent extends MessageHandler { @Override @@ -14,6 +14,6 @@ public class RoomUserStartTypingEvent extends MessageHandler { return; } - this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RoomUserTypingComposer(this.client.getHabbo().getRoomUnit(), true).compose()); + this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new UserTypingMessageComposer(this.client.getHabbo().getRoomUnit(), true).compose()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserStopTypingEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserStopTypingEvent.java index 0b9e02d9..6b950d00 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserStopTypingEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserStopTypingEvent.java @@ -1,7 +1,7 @@ package com.eu.habbo.messages.incoming.rooms.users; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserTypingComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserTypingMessageComposer; public class RoomUserStopTypingEvent extends MessageHandler { @Override @@ -14,6 +14,6 @@ public class RoomUserStopTypingEvent extends MessageHandler { return; } - this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RoomUserTypingComposer(this.client.getHabbo().getRoomUnit(), false).compose()); + this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new UserTypingMessageComposer(this.client.getHabbo().getRoomUnit(), false).compose()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/trading/TradeStartEvent.java b/src/main/java/com/eu/habbo/messages/incoming/trading/TradeStartEvent.java index a776adcd..21649234 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/trading/TradeStartEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/trading/TradeStartEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.rooms.RoomTrade; import com.eu.habbo.habbohotel.rooms.RoomUnitStatus; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.trading.TradeStartFailComposer; +import com.eu.habbo.messages.outgoing.trading.TradingOpenFailedComposer; public class TradeStartEvent extends MessageHandler { @Override @@ -24,12 +24,12 @@ public class TradeStartEvent extends MessageHandler { boolean tradeAnywhere = this.client.getHabbo().hasPermission(Permission.ACC_TRADE_ANYWHERE); if (!RoomTrade.TRADING_ENABLED && !tradeAnywhere) { - this.client.sendResponse(new TradeStartFailComposer(TradeStartFailComposer.HOTEL_TRADING_NOT_ALLOWED)); + this.client.sendResponse(new TradingOpenFailedComposer(TradingOpenFailedComposer.HOTEL_TRADING_NOT_ALLOWED)); return; } if ((room.getTradeMode() == 0 || (room.getTradeMode() == 1 && this.client.getHabbo().getHabboInfo().getId() != room.getOwnerId())) && !tradeAnywhere) { - this.client.sendResponse(new TradeStartFailComposer(TradeStartFailComposer.ROOM_TRADING_NOT_ALLOWED)); + this.client.sendResponse(new TradingOpenFailedComposer(TradingOpenFailedComposer.ROOM_TRADING_NOT_ALLOWED)); return; } @@ -38,22 +38,22 @@ public class TradeStartEvent extends MessageHandler { if (targetUser.getHabboStats().userIgnored(this.client.getHabbo().getHabboInfo().getId())) return; if (this.client.getHabbo().getRoomUnit().hasStatus(RoomUnitStatus.TRADING)) { - this.client.sendResponse(new TradeStartFailComposer(TradeStartFailComposer.YOU_ALREADY_TRADING)); + this.client.sendResponse(new TradingOpenFailedComposer(TradingOpenFailedComposer.YOU_ALREADY_TRADING)); return; } if (!this.client.getHabbo().getHabboStats().allowTrade()) { - this.client.sendResponse(new TradeStartFailComposer(TradeStartFailComposer.YOU_TRADING_OFF)); + this.client.sendResponse(new TradingOpenFailedComposer(TradingOpenFailedComposer.YOU_TRADING_OFF)); return; } if (targetUser.getRoomUnit().hasStatus(RoomUnitStatus.TRADING)) { - this.client.sendResponse(new TradeStartFailComposer(TradeStartFailComposer.TARGET_ALREADY_TRADING, targetUser.getHabboInfo().getUsername())); + this.client.sendResponse(new TradingOpenFailedComposer(TradingOpenFailedComposer.TARGET_ALREADY_TRADING, targetUser.getHabboInfo().getUsername())); return; } if (!targetUser.getHabboStats().allowTrade()) { - this.client.sendResponse(new TradeStartFailComposer(TradeStartFailComposer.TARGET_TRADING_NOT_ALLOWED, targetUser.getHabboInfo().getUsername())); + this.client.sendResponse(new TradingOpenFailedComposer(TradingOpenFailedComposer.TARGET_TRADING_NOT_ALLOWED, targetUser.getHabboInfo().getUsername())); return; } diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/ConfirmChangeNameEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/ConfirmChangeNameEvent.java index 1c6b68f4..6f8b77cf 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/ConfirmChangeNameEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/ConfirmChangeNameEvent.java @@ -6,9 +6,9 @@ import com.eu.habbo.habbohotel.users.HabboInfo; import com.eu.habbo.habbohotel.users.HabboManager; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.rooms.users.ChangeUserNameResultMessageEvent; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserNameChangedComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserNameChangedMessageComposer; import com.eu.habbo.messages.outgoing.users.CheckUserNameResultMessageComposer; -import com.eu.habbo.messages.outgoing.users.UserDataComposer; +import com.eu.habbo.messages.outgoing.users.UserObjectComposer; import com.eu.habbo.plugin.events.users.UserNameChangedEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,8 +34,8 @@ public class ConfirmChangeNameEvent extends MessageHandler { if (name.equalsIgnoreCase(this.client.getHabbo().getHabboInfo().getUsername())) { this.client.getHabbo().getHabboStats().allowNameChange = false; this.client.sendResponse(new ChangeUserNameResultMessageEvent(this.client.getHabbo())); - this.client.sendResponse(new RoomUserNameChangedComposer(this.client.getHabbo()).compose()); - this.client.sendResponse(new UserDataComposer(this.client.getHabbo())); + this.client.sendResponse(new UserNameChangedMessageComposer(this.client.getHabbo()).compose()); + this.client.sendResponse(new UserObjectComposer(this.client.getHabbo())); return; } @@ -69,13 +69,13 @@ public class ConfirmChangeNameEvent extends MessageHandler { this.client.sendResponse(new ChangeUserNameResultMessageEvent(this.client.getHabbo())); if (this.client.getHabbo().getHabboInfo().getCurrentRoom() != null) { - this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RoomUserNameChangedComposer(this.client.getHabbo()).compose()); + this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new UserNameChangedMessageComposer(this.client.getHabbo()).compose()); } else { - this.client.sendResponse(new RoomUserNameChangedComposer(this.client.getHabbo()).compose()); + this.client.sendResponse(new UserNameChangedMessageComposer(this.client.getHabbo()).compose()); } this.client.getHabbo().getMessenger().connectionChanged(this.client.getHabbo(), true, this.client.getHabbo().getHabboInfo().getCurrentRoom() != null); - this.client.getHabbo().getClient().sendResponse(new UserDataComposer(this.client.getHabbo())); + this.client.getHabbo().getClient().sendResponse(new UserObjectComposer(this.client.getHabbo())); try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("INSERT INTO namechange_log (user_id, old_name, new_name, timestamp) VALUES (?, ?, ?, ?) ")) { statement.setInt(1, this.client.getHabbo().getHabboInfo().getId()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/RequestClubCenterEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/RequestClubCenterEvent.java index 80dede05..9ff36388 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/RequestClubCenterEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/RequestClubCenterEvent.java @@ -2,7 +2,6 @@ package com.eu.habbo.messages.incoming.users; import com.eu.habbo.habbohotel.users.subscriptions.SubscriptionHabboClub; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.users.UserClubComposer; public class RequestClubCenterEvent extends MessageHandler { @Override diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/RequestProfileFriendsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/RequestProfileFriendsEvent.java index cc6a0198..cbe18c8a 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/RequestProfileFriendsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/RequestProfileFriendsEvent.java @@ -4,7 +4,7 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.messenger.Messenger; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.users.ProfileFriendsComposer; +import com.eu.habbo.messages.outgoing.users.RelationshipStatusInfoComposer; public class RequestProfileFriendsEvent extends MessageHandler { @Override @@ -13,8 +13,8 @@ public class RequestProfileFriendsEvent extends MessageHandler { Habbo habbo = Emulator.getGameEnvironment().getHabboManager().getHabbo(userId); if (habbo != null) - this.client.sendResponse(new ProfileFriendsComposer(habbo)); + this.client.sendResponse(new RelationshipStatusInfoComposer(habbo)); else - this.client.sendResponse(new ProfileFriendsComposer(Messenger.getFriends(userId), userId)); + this.client.sendResponse(new RelationshipStatusInfoComposer(Messenger.getFriends(userId), userId)); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserCitizinShipEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserCitizinShipEvent.java index 81844d60..4f3155d5 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserCitizinShipEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserCitizinShipEvent.java @@ -1,11 +1,11 @@ package com.eu.habbo.messages.incoming.users; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.users.UserCitizinShipComposer; +import com.eu.habbo.messages.outgoing.users.TalentTrackLevelMessageEvent; public class RequestUserCitizinShipEvent extends MessageHandler { @Override public void handle() throws Exception { - this.client.sendResponse(new UserCitizinShipComposer(this.packet.readString())); + this.client.sendResponse(new TalentTrackLevelMessageEvent(this.packet.readString())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserClubEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserClubEvent.java index 34fb4905..3c97e0e8 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserClubEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserClubEvent.java @@ -1,12 +1,12 @@ package com.eu.habbo.messages.incoming.users; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.users.UserClubComposer; +import com.eu.habbo.messages.outgoing.users.ScrSendUserInfoComposer; public class RequestUserClubEvent extends MessageHandler { @Override public void handle() throws Exception { String subscriptionType = this.packet.readString(); - this.client.sendResponse(new UserClubComposer(this.client.getHabbo(), subscriptionType)); + this.client.sendResponse(new ScrSendUserInfoComposer(this.client.getHabbo(), subscriptionType)); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserDataEvent.java index 69b9d924..968e45bb 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserDataEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserDataEvent.java @@ -4,7 +4,7 @@ import com.eu.habbo.Emulator; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.users.AccountPreferencesComposer; -import com.eu.habbo.messages.outgoing.users.UserDataComposer; +import com.eu.habbo.messages.outgoing.users.UserObjectComposer; import com.eu.habbo.messages.outgoing.users.UserPerksComposer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +38,7 @@ public class RequestUserDataEvent extends MessageHandler { ArrayList messages = new ArrayList<>(); - messages.add(new UserDataComposer(this.client.getHabbo()).compose()); + messages.add(new UserObjectComposer(this.client.getHabbo()).compose()); messages.add(new UserPerksComposer(this.client.getHabbo()).compose()); messages.add(new AccountPreferencesComposer(this.client.getHabbo()).compose()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserWardrobeEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserWardrobeEvent.java index 0e133e0b..478314bc 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserWardrobeEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserWardrobeEvent.java @@ -1,11 +1,11 @@ package com.eu.habbo.messages.incoming.users; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.users.UserWardrobeComposer; +import com.eu.habbo.messages.outgoing.users.WardrobeMessageComposer; public class RequestUserWardrobeEvent extends MessageHandler { @Override public void handle() throws Exception { - this.client.sendResponse(new UserWardrobeComposer(this.client.getHabbo().getInventory().getWardrobeComponent())); + this.client.sendResponse(new WardrobeMessageComposer(this.client.getHabbo().getInventory().getWardrobeComponent())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/SaveMottoEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/SaveMottoEvent.java index 50d0f9a1..dc51defd 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/SaveMottoEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/SaveMottoEvent.java @@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.users; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.achievements.AchievementManager; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserDataComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserChangeMessageComposer; import com.eu.habbo.plugin.events.users.UserSavedMottoEvent; public class SaveMottoEvent extends MessageHandler { @@ -20,9 +20,9 @@ public class SaveMottoEvent extends MessageHandler { } if (this.client.getHabbo().getHabboInfo().getCurrentRoom() != null) { - this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RoomUserDataComposer(this.client.getHabbo()).compose()); + this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new UserChangeMessageComposer(this.client.getHabbo()).compose()); } else { - this.client.sendResponse(new RoomUserDataComposer(this.client.getHabbo())); + this.client.sendResponse(new UserChangeMessageComposer(this.client.getHabbo())); } AchievementManager.progressAchievement(this.client.getHabbo(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("Motto")); diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/UserSaveLookEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/UserSaveLookEvent.java index a870e018..5dbbc736 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/UserSaveLookEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/UserSaveLookEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.modtool.ScripterManager; import com.eu.habbo.habbohotel.users.HabboGender; import com.eu.habbo.habbohotel.users.clothingvalidation.ClothingValidationManager; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserDataComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserChangeMessageComposer; import com.eu.habbo.messages.outgoing.users.FigureUpdateComposer; import com.eu.habbo.plugin.events.users.UserSavedLookEvent; import org.slf4j.Logger; @@ -41,7 +41,7 @@ public class UserSaveLookEvent extends MessageHandler { Emulator.getThreading().run(this.client.getHabbo().getHabboInfo()); this.client.sendResponse(new FigureUpdateComposer(this.client.getHabbo())); if (this.client.getHabbo().getHabboInfo().getCurrentRoom() != null) { - this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RoomUserDataComposer(this.client.getHabbo()).compose()); + this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new UserChangeMessageComposer(this.client.getHabbo()).compose()); } AchievementManager.progressAchievement(this.client.getHabbo(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("AvatarLooks")); diff --git a/src/main/java/com/eu/habbo/messages/incoming/wired/WiredConditionSaveDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/wired/WiredConditionSaveDataEvent.java index a7443e82..59a8879b 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/wired/WiredConditionSaveDataEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/wired/WiredConditionSaveDataEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.items.interactions.wired.WiredSettings; 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.generic.alerts.UpdateFailedComposer; +import com.eu.habbo.messages.outgoing.generic.alerts.WiredValidationErrorComposer; import com.eu.habbo.messages.outgoing.wired.WiredSavedComposer; public class WiredConditionSaveDataEvent extends MessageHandler { @@ -31,7 +31,7 @@ public class WiredConditionSaveDataEvent extends MessageHandler { Emulator.getThreading().run(condition); } else { - this.client.sendResponse(new UpdateFailedComposer("There was an error while saving that condition")); + this.client.sendResponse(new WiredValidationErrorComposer("There was an error while saving that condition")); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/wired/WiredEffectSaveDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/wired/WiredEffectSaveDataEvent.java index 41de3dd9..59681136 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/wired/WiredEffectSaveDataEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/wired/WiredEffectSaveDataEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.items.interactions.wired.WiredSettings; 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.generic.alerts.UpdateFailedComposer; +import com.eu.habbo.messages.outgoing.generic.alerts.WiredValidationErrorComposer; import com.eu.habbo.messages.outgoing.wired.WiredSavedComposer; public class WiredEffectSaveDataEvent extends MessageHandler { @@ -33,7 +33,7 @@ public class WiredEffectSaveDataEvent extends MessageHandler { } } catch (WiredSaveException e) { - this.client.sendResponse(new UpdateFailedComposer(e.getMessage())); + this.client.sendResponse(new WiredValidationErrorComposer(e.getMessage())); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/wired/WiredTriggerSaveDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/wired/WiredTriggerSaveDataEvent.java index 5b3b25e5..ac067433 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/wired/WiredTriggerSaveDataEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/wired/WiredTriggerSaveDataEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.items.interactions.wired.WiredSettings; 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.generic.alerts.UpdateFailedComposer; +import com.eu.habbo.messages.outgoing.generic.alerts.WiredValidationErrorComposer; import com.eu.habbo.messages.outgoing.wired.WiredSavedComposer; public class WiredTriggerSaveDataEvent extends MessageHandler { @@ -31,7 +31,7 @@ public class WiredTriggerSaveDataEvent extends MessageHandler { Emulator.getThreading().run(trigger); } else { - this.client.sendResponse(new UpdateFailedComposer("There was an error while saving that trigger")); + this.client.sendResponse(new WiredValidationErrorComposer("There was an error while saving that trigger")); } } } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/Outgoing.java b/src/main/java/com/eu/habbo/messages/outgoing/Outgoing.java index a91b4749..ddbe2db3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/Outgoing.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/Outgoing.java @@ -396,7 +396,7 @@ public class Outgoing { public final static int ShoutMessageComposer = 1036; public final static int ShowEnforceRoomCategoryDialogComposer = 3896; public final static int SleepMessageComposer = 1797; - public final static int SlideObjectBundleMessageComposer = 3207; + public final static int SlideObjectBundleMessageComposer = 3207; // todo: rollers public final static int _Str_16258_Composer = 1660; //todo? public final static int _Str_16667_Composer = 3099; //todo? public final static int _Str_17054_Composer = 416; //todo? diff --git a/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentLevelUpdateComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentLevelUpComposer.java similarity index 89% rename from src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentLevelUpdateComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentLevelUpComposer.java index c76cabc5..fbfcd3e2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentLevelUpdateComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentLevelUpComposer.java @@ -7,11 +7,11 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class TalentLevelUpdateComposer extends MessageComposer { +public class TalentLevelUpComposer extends MessageComposer { private final TalentTrackType talentTrackType; private final TalentTrackLevel talentTrackLevel; - public TalentLevelUpdateComposer(TalentTrackType talentTrackType, TalentTrackLevel talentTrackLevel) { + public TalentLevelUpComposer(TalentTrackType talentTrackType, TalentTrackLevel talentTrackLevel) { this.talentTrackType = talentTrackType; this.talentTrackLevel = talentTrackLevel; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentTrackComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentTrackMessageComposer.java similarity index 97% rename from src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentTrackComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentTrackMessageComposer.java index 7c821a70..14fae294 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentTrackComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentTrackMessageComposer.java @@ -14,10 +14,10 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.NoSuchElementException; -public class TalentTrackComposer extends MessageComposer { +public class TalentTrackMessageComposer extends MessageComposer { public final Habbo habbo; public final TalentTrackType type; - public TalentTrackComposer(Habbo habbo, TalentTrackType type) { + public TalentTrackMessageComposer(Habbo habbo, TalentTrackType type) { this.habbo = habbo; this.type = type; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraRoomThumbnailSavedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/camera/ThumbnailStatusMessageComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/camera/CameraRoomThumbnailSavedComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/camera/ThumbnailStatusMessageComposer.java index 7225d4b0..1c2b3bfa 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraRoomThumbnailSavedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/camera/ThumbnailStatusMessageComposer.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 CameraRoomThumbnailSavedComposer extends MessageComposer { +public class ThumbnailStatusMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.ThumbnailStatusMessageComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ReloadRecyclerComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerStatusComposer.java similarity index 87% rename from src/main/java/com/eu/habbo/messages/outgoing/catalog/ReloadRecyclerComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerStatusComposer.java index 9e4bec78..6d636deb 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ReloadRecyclerComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerStatusComposer.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 ReloadRecyclerComposer extends MessageComposer { +public class RecyclerStatusComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.RecyclerStatusComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubCenterDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ScrSendKickbackInfoMessageComposer.java similarity index 84% rename from src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubCenterDataComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/catalog/ScrSendKickbackInfoMessageComposer.java index 2446637b..298f3919 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubCenterDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ScrSendKickbackInfoMessageComposer.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 ClubCenterDataComposer extends MessageComposer { +public class ScrSendKickbackInfoMessageComposer extends MessageComposer { public final int currentHcStreak; public final String firstSubDate; public final double kickbackPercentage; @@ -15,7 +15,7 @@ public class ClubCenterDataComposer extends MessageComposer { public final int creditRewardForMonthlySpent; public final int timeUntilPayday; - public ClubCenterDataComposer(int currentHcStreak, String firstSubDate, double kickbackPercentage, int totalCreditsMissed, int totalCreditsRewarded, int totalCreditsSpent, int creditRewardForStreakBonus, int creditRewardForMonthlySpent, int timeUntilPayday) { + public ScrSendKickbackInfoMessageComposer(int currentHcStreak, String firstSubDate, double kickbackPercentage, int totalCreditsMissed, int totalCreditsRewarded, int totalCreditsSpent, int creditRewardForStreakBonus, int creditRewardForMonthlySpent, int timeUntilPayday) { this.currentHcStreak = currentHcStreak; this.firstSubDate = firstSubDate; this.kickbackPercentage = kickbackPercentage; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetBreedsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/SellablePetPalettesMessageComposer.java similarity index 86% rename from src/main/java/com/eu/habbo/messages/outgoing/catalog/PetBreedsComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/catalog/SellablePetPalettesMessageComposer.java index 51d29a3d..c2648312 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetBreedsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/SellablePetPalettesMessageComposer.java @@ -6,11 +6,11 @@ import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; import gnu.trove.set.hash.THashSet; -public class PetBreedsComposer extends MessageComposer { +public class SellablePetPalettesMessageComposer extends MessageComposer { private final String petName; private final THashSet petRaces; - public PetBreedsComposer(String petName, THashSet petRaces) { + public SellablePetPalettesMessageComposer(String petName, THashSet petRaces) { this.petName = petName; this.petRaces = petRaces; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/RedeemVoucherErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/VoucherRedeemErrorMessageComposer.java similarity index 81% rename from src/main/java/com/eu/habbo/messages/outgoing/catalog/RedeemVoucherErrorComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/catalog/VoucherRedeemErrorMessageComposer.java index 40e26ce5..8ad2382e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/RedeemVoucherErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/VoucherRedeemErrorMessageComposer.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 RedeemVoucherErrorComposer extends MessageComposer { +public class VoucherRedeemErrorMessageComposer extends MessageComposer { public static final int INVALID_CODE = 0; public static final int TECHNICAL_ERROR = 1; private final int code; - public RedeemVoucherErrorComposer(int code) { + public VoucherRedeemErrorMessageComposer(int code) { this.code = code; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/RedeemVoucherOKComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/VoucherRedeemOkMessageComposer.java similarity index 86% rename from src/main/java/com/eu/habbo/messages/outgoing/catalog/RedeemVoucherOKComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/catalog/VoucherRedeemOkMessageComposer.java index 2bbd7a45..941f2d38 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/RedeemVoucherOKComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/VoucherRedeemOkMessageComposer.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 RedeemVoucherOKComposer extends MessageComposer { +public class VoucherRedeemOkMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.VoucherRedeemOkMessageComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/FloorPlanEditorDoorSettingsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/RoomEntryTileMessageComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/FloorPlanEditorDoorSettingsComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/RoomEntryTileMessageComposer.java index 3cdac21e..a2b8a793 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/FloorPlanEditorDoorSettingsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/RoomEntryTileMessageComposer.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 FloorPlanEditorDoorSettingsComposer extends MessageComposer { +public class RoomEntryTileMessageComposer extends MessageComposer { private final Room room; - public FloorPlanEditorDoorSettingsComposer(Room room) { + public RoomEntryTileMessageComposer(Room room) { this.room = room; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/FloorPlanEditorBlockedTilesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/RoomOccupiedTilesMessageComposer.java similarity index 86% rename from src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/FloorPlanEditorBlockedTilesComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/RoomOccupiedTilesMessageComposer.java index 138e4c34..ad280e67 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/FloorPlanEditorBlockedTilesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/RoomOccupiedTilesMessageComposer.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 FloorPlanEditorBlockedTilesComposer extends MessageComposer { +public class RoomOccupiedTilesMessageComposer extends MessageComposer { private final Room room; - public FloorPlanEditorBlockedTilesComposer(Room room) { + public RoomOccupiedTilesMessageComposer(Room room) { this.room = room; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpUnloadGameComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/UnloadGameMessageComposer.java similarity index 87% rename from src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpUnloadGameComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/UnloadGameMessageComposer.java index a1122253..8edd62d9 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpUnloadGameComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/UnloadGameMessageComposer.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 BaseJumpUnloadGameComposer extends MessageComposer { +public class UnloadGameMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.UnloadGameMessageComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertAndOpenHabboWayComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/UserBannedMessageComposer.java similarity index 78% rename from src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertAndOpenHabboWayComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/UserBannedMessageComposer.java index 1e5d5050..a30ddebc 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertAndOpenHabboWayComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/UserBannedMessageComposer.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 StaffAlertAndOpenHabboWayComposer extends MessageComposer { +public class UserBannedMessageComposer extends MessageComposer { private final String message; - public StaffAlertAndOpenHabboWayComposer(String message) { + public UserBannedMessageComposer(String message) { this.message = message; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/UpdateFailedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/WiredValidationErrorComposer.java similarity index 79% rename from src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/UpdateFailedComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/WiredValidationErrorComposer.java index 0a4abfb9..6bbbabd1 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/UpdateFailedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/WiredValidationErrorComposer.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 UpdateFailedComposer extends MessageComposer { +public class WiredValidationErrorComposer extends MessageComposer { private final String message; - public UpdateFailedComposer(String message) { + public WiredValidationErrorComposer(String message) { this.message = message; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionPartnerIsPlayingComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/YouArePlayingGameMessageComposer.java similarity index 77% rename from src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionPartnerIsPlayingComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guides/YouArePlayingGameMessageComposer.java index a6f1f262..92bcfb0c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionPartnerIsPlayingComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/YouArePlayingGameMessageComposer.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 GuideSessionPartnerIsPlayingComposer extends MessageComposer { +public class YouArePlayingGameMessageComposer extends MessageComposer { public final boolean isPlaying; - public GuideSessionPartnerIsPlayingComposer(boolean isPlaying) { + public YouArePlayingGameMessageComposer(boolean isPlaying) { this.isPlaying = isPlaying; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumCommentsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/ThreadMessagesMessageComposer.java similarity index 85% rename from src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumCommentsComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/ThreadMessagesMessageComposer.java index ea1118fd..3bc9358e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumCommentsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/ThreadMessagesMessageComposer.java @@ -7,13 +7,13 @@ import com.eu.habbo.messages.outgoing.Outgoing; import java.util.Collection; -public class GuildForumCommentsComposer extends MessageComposer { +public class ThreadMessagesMessageComposer extends MessageComposer { private final int guildId; private final int threadId; private final int index; private final Collection guildForumCommentList; - public GuildForumCommentsComposer(int guildId, int threadId, int index, Collection guildForumCommentList) { + public ThreadMessagesMessageComposer(int guildId, int threadId, int index, Collection guildForumCommentList) { this.guildId = guildId; this.threadId = threadId; this.index = index; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumsUnreadMessagesCountComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/UnreadForumsCountMessageComposer.java similarity index 77% rename from src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumsUnreadMessagesCountComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/UnreadForumsCountMessageComposer.java index 0060556e..1a585bd3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumsUnreadMessagesCountComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/UnreadForumsCountMessageComposer.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 GuildForumsUnreadMessagesCountComposer extends MessageComposer { +public class UnreadForumsCountMessageComposer extends MessageComposer { public final int count; - public GuildForumsUnreadMessagesCountComposer(int count) { + public UnreadForumsCountMessageComposer(int count) { this.count = count; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/PostUpdateMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/UpdateMessageMessageComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/PostUpdateMessageComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/UpdateMessageMessageComposer.java index a3e31b39..77e03c23 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/PostUpdateMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/UpdateMessageMessageComposer.java @@ -5,12 +5,12 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class PostUpdateMessageComposer extends MessageComposer { +public class UpdateMessageMessageComposer extends MessageComposer { public final int guildId; public final int threadId; public final ForumThreadComment comment; - public PostUpdateMessageComposer(int guildId, int threadId, ForumThreadComment comment) { + public UpdateMessageMessageComposer(int guildId, int threadId, ForumThreadComment comment) { this.guildId = guildId; this.threadId = threadId; this.comment = comment; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/ThreadUpdatedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/UpdateThreadMessageComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/ThreadUpdatedMessageComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/UpdateThreadMessageComposer.java index 554d559c..9c2688e4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/ThreadUpdatedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/UpdateThreadMessageComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class ThreadUpdatedMessageComposer extends MessageComposer { +public class UpdateThreadMessageComposer extends MessageComposer { public final Guild guild; @@ -19,7 +19,7 @@ public class ThreadUpdatedMessageComposer extends MessageComposer { private final boolean isLocked; - public ThreadUpdatedMessageComposer(Guild guild, ForumThread thread, Habbo habbo, boolean isPinned, boolean isLocked) { + public UpdateThreadMessageComposer(Guild guild, ForumThread thread, Habbo habbo, boolean isPinned, boolean isLocked) { this.guild = guild; this.habbo = habbo; this.thread = thread; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/handshake/MachineIDComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/handshake/UniqueMachineIDComposer.java similarity index 80% rename from src/main/java/com/eu/habbo/messages/outgoing/handshake/MachineIDComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/handshake/UniqueMachineIDComposer.java index d8e4ec9c..c0667b15 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/handshake/MachineIDComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/handshake/UniqueMachineIDComposer.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 MachineIDComposer extends MessageComposer { +public class UniqueMachineIDComposer extends MessageComposer { private final String machineId; - public MachineIDComposer(String machineId) { + public UniqueMachineIDComposer(String machineId) { this.machineId = machineId; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewSecondsUntilComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/SecondsUntilMessageComposer.java similarity index 80% rename from src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewSecondsUntilComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/hotelview/SecondsUntilMessageComposer.java index 485fec01..9491cb3e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewSecondsUntilComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/SecondsUntilMessageComposer.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 HotelViewSecondsUntilComposer extends MessageComposer { +public class SecondsUntilMessageComposer extends MessageComposer { private final String dateString; private final int seconds; - public HotelViewSecondsUntilComposer(String dateString, int seconds) { + public SecondsUntilMessageComposer(String dateString, int seconds) { this.dateString = dateString; this.seconds = seconds; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/AddHabboItemComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/UnseenItemsComposer.java similarity index 86% rename from src/main/java/com/eu/habbo/messages/outgoing/inventory/AddHabboItemComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/inventory/UnseenItemsComposer.java index 29a3700c..2fc0ae88 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/AddHabboItemComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/UnseenItemsComposer.java @@ -9,34 +9,34 @@ import gnu.trove.set.hash.THashSet; import java.util.List; import java.util.Map; -public class AddHabboItemComposer extends MessageComposer { +public class UnseenItemsComposer extends MessageComposer { private THashSet itemsList; private HabboItem item; private int[] ids; private AddHabboItemCategory category; private Map> entries; - public AddHabboItemComposer(THashSet itemsList) { + public UnseenItemsComposer(THashSet itemsList) { this.itemsList = itemsList; this.category = AddHabboItemCategory.OWNED_FURNI; } - public AddHabboItemComposer(HabboItem item) { + public UnseenItemsComposer(HabboItem item) { this.item = item; this.category = AddHabboItemCategory.OWNED_FURNI; } - public AddHabboItemComposer(int[] ids, AddHabboItemCategory category) { + public UnseenItemsComposer(int[] ids, AddHabboItemCategory category) { this.ids = ids; this.category = category; } - public AddHabboItemComposer(int id, AddHabboItemCategory category) { + public UnseenItemsComposer(int id, AddHabboItemCategory category) { this.ids = new int[]{id}; this.category = category; } - public AddHabboItemComposer(Map> entries) { + public UnseenItemsComposer(Map> entries) { this.entries = entries; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolRoomChatlogComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/RoomChatlogComposer.java similarity index 90% rename from src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolRoomChatlogComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/modtool/RoomChatlogComposer.java index 9ac9503d..f1ba1950 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolRoomChatlogComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/RoomChatlogComposer.java @@ -10,11 +10,11 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; -public class ModToolRoomChatlogComposer extends MessageComposer { +public class RoomChatlogComposer extends MessageComposer { private final Room room; private final ArrayList chatlog; - public ModToolRoomChatlogComposer(Room room, ArrayList chatlog) { + public RoomChatlogComposer(Room room, ArrayList chatlog) { this.room = room; this.chatlog = chatlog; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserRoomVisitsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/RoomVisitsComposer.java similarity index 88% rename from src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserRoomVisitsComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/modtool/RoomVisitsComposer.java index b20feab8..9dc4f7af 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserRoomVisitsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/RoomVisitsComposer.java @@ -10,11 +10,11 @@ import gnu.trove.set.hash.THashSet; import java.util.Calendar; import java.util.TimeZone; -public class ModToolUserRoomVisitsComposer extends MessageComposer { +public class RoomVisitsComposer extends MessageComposer { private final HabboInfo habboInfo; private final THashSet roomVisits; - public ModToolUserRoomVisitsComposer(HabboInfo habboInfo, THashSet roomVisits) { + public RoomVisitsComposer(HabboInfo habboInfo, THashSet roomVisits) { this.habboInfo = habboInfo; this.roomVisits = roomVisits; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolSanctionInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/SanctionStatusComposer.java similarity index 97% rename from src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolSanctionInfoComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/modtool/SanctionStatusComposer.java index 259020a5..8a041b05 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolSanctionInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/SanctionStatusComposer.java @@ -14,11 +14,11 @@ import org.joda.time.DateTime; import java.util.ArrayList; import java.util.Date; -public class ModToolSanctionInfoComposer extends MessageComposer { +public class SanctionStatusComposer extends MessageComposer { private final Habbo habbo; - public ModToolSanctionInfoComposer(Habbo habbo) { + public SanctionStatusComposer(Habbo habbo) { this.habbo = habbo; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserChatlogComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/UserChatlogComposer.java similarity index 91% rename from src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserChatlogComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/modtool/UserChatlogComposer.java index 98eeae6a..ba93cb0f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserChatlogComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/UserChatlogComposer.java @@ -9,13 +9,13 @@ import com.eu.habbo.messages.outgoing.Outgoing; import java.text.SimpleDateFormat; import java.util.ArrayList; -public class ModToolUserChatlogComposer extends MessageComposer { +public class UserChatlogComposer extends MessageComposer { public static SimpleDateFormat format = new SimpleDateFormat("HH:mm"); private final ArrayList set; private final int userId; private final String username; - public ModToolUserChatlogComposer(ArrayList set, int userId, String username) { + public UserChatlogComposer(ArrayList set, int userId, String username) { this.set = set; this.userId = userId; this.username = username; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorEventCategoriesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/UserEventCatsComposer.java similarity index 70% rename from src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorEventCategoriesComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/navigator/UserEventCatsComposer.java index 7e382038..f0c8a0cd 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorEventCategoriesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/UserEventCatsComposer.java @@ -8,16 +8,16 @@ import com.eu.habbo.messages.outgoing.Outgoing; import java.util.ArrayList; import java.util.List; -public class NewNavigatorEventCategoriesComposer extends MessageComposer { +public class UserEventCatsComposer extends MessageComposer { public static List CATEGORIES = new ArrayList<>(); @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.UserEventCatsComposer); - this.response.appendInt(NewNavigatorEventCategoriesComposer.CATEGORIES.size()); + this.response.appendInt(UserEventCatsComposer.CATEGORIES.size()); - for (EventCategory category : NewNavigatorEventCategoriesComposer.CATEGORIES) { + for (EventCategory category : UserEventCatsComposer.CATEGORIES) { category.serialize(this.response); } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/RoomCategoriesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/UserFlatCatsComposer.java similarity index 90% rename from src/main/java/com/eu/habbo/messages/outgoing/navigator/RoomCategoriesComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/navigator/UserFlatCatsComposer.java index fe2b027b..a850da27 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/RoomCategoriesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/UserFlatCatsComposer.java @@ -7,10 +7,10 @@ import com.eu.habbo.messages.outgoing.Outgoing; import java.util.List; -public class RoomCategoriesComposer extends MessageComposer { +public class UserFlatCatsComposer extends MessageComposer { private final List categories; - public RoomCategoriesComposer(List categories) { + public UserFlatCatsComposer(List categories) { this.categories = categories; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomChatSettingsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomChatSettingsMessageComposer.java similarity index 85% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomChatSettingsComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomChatSettingsMessageComposer.java index c900687d..b9117942 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomChatSettingsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomChatSettingsMessageComposer.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 RoomChatSettingsComposer extends MessageComposer { +public class RoomChatSettingsMessageComposer extends MessageComposer { private final Room room; - public RoomChatSettingsComposer(Room room) { + public RoomChatSettingsMessageComposer(Room room) { this.room = room; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPaneComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEntryInfoMessageComposer.java similarity index 82% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPaneComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEntryInfoMessageComposer.java index e2439d15..bd602b6a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPaneComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEntryInfoMessageComposer.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 RoomPaneComposer extends MessageComposer { +public class RoomEntryInfoMessageComposer extends MessageComposer { private final Room room; private final boolean roomOwner; - public RoomPaneComposer(Room room, boolean roomOwner) { + public RoomEntryInfoMessageComposer(Room room, boolean roomOwner) { this.room = room; this.roomOwner = roomOwner; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFilterWordsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFilterSettingsMessageComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFilterWordsComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFilterSettingsMessageComposer.java index d7e54f6d..e825d0cf 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFilterWordsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFilterSettingsMessageComposer.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 RoomFilterWordsComposer extends MessageComposer { +public class RoomFilterSettingsMessageComposer extends MessageComposer { private final Room room; - public RoomFilterWordsComposer(Room room) { + public RoomFilterSettingsMessageComposer(Room room) { this.room = room; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/ForwardToRoomComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomForwardMessageComposer.java similarity index 80% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/ForwardToRoomComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomForwardMessageComposer.java index 4110c9cf..a8b33b35 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/ForwardToRoomComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomForwardMessageComposer.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 ForwardToRoomComposer extends MessageComposer { +public class RoomForwardMessageComposer extends MessageComposer { private final int roomId; - public ForwardToRoomComposer(int roomId) { + public RoomForwardMessageComposer(int roomId) { this.roomId = roomId; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsUpdatedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomInfoUpdatedComposer.java similarity index 81% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsUpdatedComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomInfoUpdatedComposer.java index 14f070b8..cbcb2890 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsUpdatedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomInfoUpdatedComposer.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 RoomSettingsUpdatedComposer extends MessageComposer { +public class RoomInfoUpdatedComposer extends MessageComposer { private final Room room; - public RoomSettingsUpdatedComposer(Room room) { + public RoomInfoUpdatedComposer(Room room) { this.room = room; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPaintComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPropertyMessageComposer.java similarity index 81% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPaintComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPropertyMessageComposer.java index 353417cd..41d1716c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPaintComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPropertyMessageComposer.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 RoomPaintComposer extends MessageComposer { +public class RoomPropertyMessageComposer extends MessageComposer { private final String type; private final String value; - public RoomPaintComposer(String type, String value) { + public RoomPropertyMessageComposer(String type, String value) { this.type = type; this.value = value; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomQueueStatusMessage.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomQueueStatusMessageComposer.java similarity index 90% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomQueueStatusMessage.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomQueueStatusMessageComposer.java index 641d83d7..2a198aac 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomQueueStatusMessage.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomQueueStatusMessageComposer.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 RoomQueueStatusMessage extends MessageComposer { +public class RoomQueueStatusMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomQueueStatusMessageComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomScoreComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRatingComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomScoreComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRatingComposer.java index e5f93dd0..8f6fe2cf 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomScoreComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRatingComposer.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 RoomScoreComposer extends MessageComposer { +public class RoomRatingComposer extends MessageComposer { private final int score; private final boolean canVote; - public RoomScoreComposer(int score, boolean canVote) { + public RoomRatingComposer(int score, boolean canVote) { this.score = score; this.canVote = canVote; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomModelComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomReadyMessageComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomModelComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomReadyMessageComposer.java index 768d30bd..004abd94 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomModelComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomReadyMessageComposer.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 RoomModelComposer extends MessageComposer { +public class RoomReadyMessageComposer extends MessageComposer { private final Room room; - public RoomModelComposer(Room room) { + public RoomReadyMessageComposer(Room room) { this.room = room; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsDataComposer.java similarity index 95% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsDataComposer.java index fd7fe564..ea1040ce 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsDataComposer.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 RoomSettingsComposer extends MessageComposer { +public class RoomSettingsDataComposer extends MessageComposer { private final Room room; - public RoomSettingsComposer(Room room) { + public RoomSettingsDataComposer(Room room) { this.room = room; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEditSettingsErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsSaveErrorComposer.java similarity index 89% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEditSettingsErrorComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsSaveErrorComposer.java index 6ff593af..f1fa322b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEditSettingsErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsSaveErrorComposer.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 RoomEditSettingsErrorComposer extends MessageComposer { +public class RoomSettingsSaveErrorComposer extends MessageComposer { public final static int PASSWORD_REQUIRED = 5; public final static int ROOM_NAME_MISSING = 7; public final static int ROOM_NAME_BADWORDS = 8; @@ -17,7 +17,7 @@ public class RoomEditSettingsErrorComposer extends MessageComposer { private final int errorCode; private final String info; - public RoomEditSettingsErrorComposer(int roomId, int errorCode, String info) { + public RoomSettingsSaveErrorComposer(int roomId, int errorCode, String info) { this.roomId = roomId; this.errorCode = errorCode; this.info = info; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomThicknessComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomVisualizationSettingsComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomThicknessComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomVisualizationSettingsComposer.java index 4710f9f7..f5c3fb2a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomThicknessComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomVisualizationSettingsComposer.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 RoomThicknessComposer extends MessageComposer { +public class RoomVisualizationSettingsComposer extends MessageComposer { private final Room room; - public RoomThicknessComposer(Room room) { + public RoomVisualizationSettingsComposer(Room room) { this.room = room; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRightsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/YouAreControllerMessageComposer.java similarity index 79% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRightsComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/YouAreControllerMessageComposer.java index 5163a4df..89f8a3ef 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRightsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/YouAreControllerMessageComposer.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 RoomRightsComposer extends MessageComposer { +public class YouAreControllerMessageComposer extends MessageComposer { private final RoomRightLevels type; - public RoomRightsComposer(RoomRightLevels type) { + public YouAreControllerMessageComposer(RoomRightLevels type) { this.type = type; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomNoRightsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/YouAreNotControllerMessageComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomNoRightsComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/YouAreNotControllerMessageComposer.java index 1246f063..295f8aad 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomNoRightsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/YouAreNotControllerMessageComposer.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 RoomNoRightsComposer extends MessageComposer { +public class YouAreNotControllerMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.YouAreNotControllerMessageComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomOwnerComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/YouAreOwnerMessageComposer.java similarity index 84% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomOwnerComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/YouAreOwnerMessageComposer.java index 980900f2..ccea4b76 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomOwnerComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/YouAreOwnerMessageComposer.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 RoomOwnerComposer extends MessageComposer { +public class YouAreOwnerMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.YouAreOwnerMessageComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/FloorItemOnRollerComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/FloorItemOnRollerComposer.java index 3c8cf06a..4e39a5b0 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/FloorItemOnRollerComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/FloorItemOnRollerComposer.java @@ -9,6 +9,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; import gnu.trove.set.hash.THashSet; public class FloorItemOnRollerComposer extends MessageComposer { + // THIS IS WRONG SlideObjectBundleMessageComposer private final HabboItem item; private final HabboItem roller; private final RoomTile oldLocation; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItStickyPoleOpenComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RequestSpamWallPostItMessageComposer.java similarity index 81% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItStickyPoleOpenComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RequestSpamWallPostItMessageComposer.java index 840f2e45..d351523f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItStickyPoleOpenComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RequestSpamWallPostItMessageComposer.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 PostItStickyPoleOpenComposer extends MessageComposer { +public class RequestSpamWallPostItMessageComposer extends MessageComposer { private final HabboItem item; - public PostItStickyPoleOpenComposer(HabboItem item) { + public RequestSpamWallPostItMessageComposer(HabboItem item) { this.item = item; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/MoodLightDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RoomDimmerPresetsComposer.java similarity index 91% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/items/MoodLightDataComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RoomDimmerPresetsComposer.java index 51c52f0e..bb6c142a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/MoodLightDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RoomDimmerPresetsComposer.java @@ -6,10 +6,10 @@ import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; import gnu.trove.map.TIntObjectMap; -public class MoodLightDataComposer extends MessageComposer { +public class RoomDimmerPresetsComposer extends MessageComposer { private final TIntObjectMap moodLightData; - public MoodLightDataComposer(TIntObjectMap moodLightData) { + public RoomDimmerPresetsComposer(TIntObjectMap moodLightData) { this.moodLightData = moodLightData; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxTrackDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/TraxSongInfoMessageComposer.java similarity index 88% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxTrackDataComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/TraxSongInfoMessageComposer.java index 92015e96..b0f0e233 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxTrackDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/TraxSongInfoMessageComposer.java @@ -7,10 +7,10 @@ import com.eu.habbo.messages.outgoing.Outgoing; import java.util.List; -public class JukeBoxTrackDataComposer extends MessageComposer { +public class TraxSongInfoMessageComposer extends MessageComposer { private final List tracks; - public JukeBoxTrackDataComposer(List tracks) { + public TraxSongInfoMessageComposer(List tracks) { this.tracks = tracks; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxMySongsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/UserSongDisksInventoryMessageComposer.java similarity index 84% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxMySongsComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/UserSongDisksInventoryMessageComposer.java index 8de12be8..2f19a090 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxMySongsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/UserSongDisksInventoryMessageComposer.java @@ -8,10 +8,10 @@ import com.eu.habbo.messages.outgoing.Outgoing; import java.util.List; -public class JukeBoxMySongsComposer extends MessageComposer { +public class UserSongDisksInventoryMessageComposer extends MessageComposer { private final List items; - public JukeBoxMySongsComposer(List items) { + public UserSongDisksInventoryMessageComposer(List items) { this.items = items; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceUnknown2Composer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceRentFailedMessageComposer.java similarity index 78% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceUnknown2Composer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceRentFailedMessageComposer.java index 2adfcb15..05dcec32 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceUnknown2Composer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceRentFailedMessageComposer.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 RentableSpaceUnknown2Composer extends MessageComposer { +public class RentableSpaceRentFailedMessageComposer extends MessageComposer { private final int itemId; - public RentableSpaceUnknown2Composer(int itemId) { + public RentableSpaceRentFailedMessageComposer(int itemId) { this.itemId = itemId; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceUnknownComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceRentOkMessageComposer.java similarity index 78% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceUnknownComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceRentOkMessageComposer.java index 247cf10e..d65c9343 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceUnknownComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceRentOkMessageComposer.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 RentableSpaceUnknownComposer extends MessageComposer { +public class RentableSpaceRentOkMessageComposer extends MessageComposer { private final int itemId; - public RentableSpaceUnknownComposer(int itemId) { + public RentableSpaceRentOkMessageComposer(int itemId) { this.itemId = itemId; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceStatusMessageComposer.java similarity index 89% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceInfoComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceStatusMessageComposer.java index 037290ec..2bef58fb 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceStatusMessageComposer.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class RentableSpaceInfoComposer extends MessageComposer { +public class RentableSpaceStatusMessageComposer extends MessageComposer { public static final int SPACE_ALREADY_RENTED = 100; public static final int SPACE_EXTEND_NOT_RENTED = 101; public static final int SPACE_EXTEND_NOT_RENTED_BY_YOU = 102; @@ -25,13 +25,13 @@ public class RentableSpaceInfoComposer extends MessageComposer { private final HabboItem item; private final int errorCode; - public RentableSpaceInfoComposer(Habbo habbo, HabboItem item) { + public RentableSpaceStatusMessageComposer(Habbo habbo, HabboItem item) { this.habbo = habbo; this.item = item; this.errorCode = 0; } - public RentableSpaceInfoComposer(Habbo habbo, HabboItem item, int errorCode) { + public RentableSpaceStatusMessageComposer(Habbo habbo, HabboItem item, int errorCode) { this.habbo = habbo; this.item = item; this.errorCode = errorCode; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeStateChangeComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeControlVideoMessageComposer.java similarity index 80% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeStateChangeComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeControlVideoMessageComposer.java index 73a1c446..90a4b3d5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeStateChangeComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeControlVideoMessageComposer.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 YoutubeStateChangeComposer extends MessageComposer { +public class YoutubeControlVideoMessageComposer extends MessageComposer { private final int furniId; private final int state; - public YoutubeStateChangeComposer(int furniId, int state) { + public YoutubeControlVideoMessageComposer(int furniId, int state) { this.furniId = furniId; this.state = state; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeDisplayListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeDisplayPlaylistsComposer.java similarity index 84% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeDisplayListComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeDisplayPlaylistsComposer.java index 250ef868..5641f216 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeDisplayListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeDisplayPlaylistsComposer.java @@ -7,12 +7,12 @@ import com.eu.habbo.messages.outgoing.Outgoing; import java.util.ArrayList; -public class YoutubeDisplayListComposer extends MessageComposer { +public class YoutubeDisplayPlaylistsComposer extends MessageComposer { private final int itemId; private final ArrayList playlists; private final YoutubeManager.YoutubePlaylist currentPlaylist; - public YoutubeDisplayListComposer(int itemId, ArrayList playlists, YoutubeManager.YoutubePlaylist currentPlaylist) { + public YoutubeDisplayPlaylistsComposer(int itemId, ArrayList playlists, YoutubeManager.YoutubePlaylist currentPlaylist) { this.itemId = itemId; this.playlists = playlists; this.currentPlaylist = currentPlaylist; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeVideoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeDisplayVideoMessageComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeVideoComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeDisplayVideoMessageComposer.java index c3ead291..2654b661 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeVideoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeDisplayVideoMessageComposer.java @@ -5,13 +5,13 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class YoutubeVideoComposer extends MessageComposer { +public class YoutubeDisplayVideoMessageComposer extends MessageComposer { private final int itemId; private final YoutubeManager.YoutubeVideo video; private final boolean playing; private final int startTime; - public YoutubeVideoComposer(int itemId, YoutubeManager.YoutubeVideo video, boolean playing, int startTime) { + public YoutubeDisplayVideoMessageComposer(int itemId, YoutubeManager.YoutubeVideo video, boolean playing, int startTime) { this.itemId = itemId; this.video = video; this.playing = playing; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/PromoteOwnRoomsListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/RoomAdPurchaseInfoComposer.java similarity index 88% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/PromoteOwnRoomsListComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/RoomAdPurchaseInfoComposer.java index 8ea4fe5c..7cdc4a31 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/PromoteOwnRoomsListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/RoomAdPurchaseInfoComposer.java @@ -8,10 +8,10 @@ import com.eu.habbo.messages.outgoing.Outgoing; import java.util.ArrayList; import java.util.List; -public class PromoteOwnRoomsListComposer extends MessageComposer { +public class RoomAdPurchaseInfoComposer extends MessageComposer { private final List rooms = new ArrayList<>(); - public PromoteOwnRoomsListComposer(List rooms) { + public RoomAdPurchaseInfoComposer(List rooms) { for (Room room : rooms) { if (!room.isPromoted()) this.rooms.add(room); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/RoomPromotionMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/RoomEventComposer.java similarity index 92% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/RoomPromotionMessageComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/RoomEventComposer.java index d326dc21..f5e61f55 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/RoomPromotionMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/RoomEventComposer.java @@ -7,11 +7,11 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class RoomPromotionMessageComposer extends MessageComposer { +public class RoomEventComposer extends MessageComposer { private final Room room; private final RoomPromotion roomPromotion; - public RoomPromotionMessageComposer(Room room, RoomPromotion roomPromotion) { + public RoomEventComposer(Room room, RoomPromotion roomPromotion) { this.room = room; this.roomPromotion = roomPromotion; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUnitOnRollerComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUnitOnRollerComposer.java index 63079e54..bdfa6dc3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUnitOnRollerComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUnitOnRollerComposer.java @@ -13,6 +13,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class RoomUnitOnRollerComposer extends MessageComposer { + // THIS IS WRONG SlideObjectBundleMessageComposer private static final Logger LOGGER = LoggerFactory.getLogger(RoomUnitOnRollerComposer.class); private final RoomUnit roomUnit; private final HabboItem roller; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserShoutComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ShoutMessageComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserShoutComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ShoutMessageComposer.java index bc6fee94..d51915d3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserShoutComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ShoutMessageComposer.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 RoomUserShoutComposer extends MessageComposer { +public class ShoutMessageComposer extends MessageComposer { private RoomChatMessage roomChatMessage; - public RoomUserShoutComposer(RoomChatMessage roomChatMessage) { + public ShoutMessageComposer(RoomChatMessage roomChatMessage) { this.roomChatMessage = roomChatMessage; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUnitIdleComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/SleepMessageComposer.java similarity index 84% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUnitIdleComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/users/SleepMessageComposer.java index 5e018674..fb4002f4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUnitIdleComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/SleepMessageComposer.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 RoomUnitIdleComposer extends MessageComposer { +public class SleepMessageComposer extends MessageComposer { private final RoomUnit roomUnit; - public RoomUnitIdleComposer(RoomUnit roomUnit) { + public SleepMessageComposer(RoomUnit roomUnit) { this.roomUnit = roomUnit; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserChangeMessageComposer.java similarity index 88% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserDataComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserChangeMessageComposer.java index 3ced4383..9dba6f42 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserChangeMessageComposer.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 RoomUserDataComposer extends MessageComposer { +public class UserChangeMessageComposer extends MessageComposer { private final Habbo habbo; - public RoomUserDataComposer(Habbo habbo) { + public UserChangeMessageComposer(Habbo habbo) { this.habbo = habbo; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserNameChangedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserNameChangedMessageComposer.java similarity index 80% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserNameChangedComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserNameChangedMessageComposer.java index f7440598..68881709 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserNameChangedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserNameChangedMessageComposer.java @@ -6,23 +6,23 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class RoomUserNameChangedComposer extends MessageComposer { +public class UserNameChangedMessageComposer extends MessageComposer { private final int userId; private final int roomId; private final String name; - public RoomUserNameChangedComposer(Habbo habbo) { + public UserNameChangedMessageComposer(Habbo habbo) { this(habbo, false); } - public RoomUserNameChangedComposer(Habbo habbo, boolean includePrefix) { + public UserNameChangedMessageComposer(Habbo habbo, boolean includePrefix) { this.userId = habbo.getHabboInfo().getId(); this.roomId = habbo.getRoomUnit().getId(); this.name = (includePrefix ? Room.PREFIX_FORMAT.replace("%color%", habbo.getHabboInfo().getRank().getPrefixColor()).replace("%prefix%", habbo.getHabboInfo().getRank().getPrefix()) : "") + habbo.getHabboInfo().getUsername(); } - public RoomUserNameChangedComposer(int userId, int roomId, String name) { + public UserNameChangedMessageComposer(int userId, int roomId, String name) { this.userId = userId; this.roomId = roomId; this.name = name; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRemoveComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserRemoveMessageComposer.java similarity index 81% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRemoveComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserRemoveMessageComposer.java index 461e65d9..787a0b99 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRemoveComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserRemoveMessageComposer.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 RoomUserRemoveComposer extends MessageComposer { +public class UserRemoveMessageComposer extends MessageComposer { private final RoomUnit roomUnit; - public RoomUserRemoveComposer(RoomUnit roomUnit) { + public UserRemoveMessageComposer(RoomUnit roomUnit) { this.roomUnit = roomUnit; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTagsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserTagsMessageComposer.java similarity index 86% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTagsComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserTagsMessageComposer.java index 6e1802c5..033d8f6b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTagsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserTagsMessageComposer.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 RoomUserTagsComposer extends MessageComposer { +public class UserTagsMessageComposer extends MessageComposer { private final Habbo habbo; - public RoomUserTagsComposer(Habbo habbo) { + public UserTagsMessageComposer(Habbo habbo) { this.habbo = habbo; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTypingComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserTypingMessageComposer.java similarity index 82% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTypingComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserTypingMessageComposer.java index cace8fbb..12a437b4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTypingComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserTypingMessageComposer.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 RoomUserTypingComposer extends MessageComposer { +public class UserTypingMessageComposer extends MessageComposer { private final RoomUnit roomUnit; private final boolean typing; - public RoomUserTypingComposer(RoomUnit roomUnit, boolean typing) { + public UserTypingMessageComposer(RoomUnit roomUnit, boolean typing) { this.roomUnit = roomUnit; this.typing = typing; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserUnbannedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserUnbannedFromRoomComposer.java similarity index 82% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserUnbannedComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserUnbannedFromRoomComposer.java index 9069b77f..ff4def17 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserUnbannedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserUnbannedFromRoomComposer.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 RoomUserUnbannedComposer extends MessageComposer { +public class UserUnbannedFromRoomComposer extends MessageComposer { private final Room room; private final int userId; - public RoomUserUnbannedComposer(Room room, int userId) { + public UserUnbannedFromRoomComposer(Room room, int userId) { this.room = room; this.userId = userId; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserStatusComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserUpdateComposer.java similarity index 90% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserStatusComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserUpdateComposer.java index 2774c1cd..8494a3b6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserStatusComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserUpdateComposer.java @@ -11,26 +11,26 @@ import gnu.trove.set.hash.THashSet; import java.util.Collection; import java.util.Map; -public class RoomUserStatusComposer extends MessageComposer { +public class UserUpdateComposer extends MessageComposer { private Collection habbos; private THashSet roomUnits; private double overrideZ = -1; - public RoomUserStatusComposer(RoomUnit roomUnit) { + public UserUpdateComposer(RoomUnit roomUnit) { this.roomUnits = new THashSet<>(); this.roomUnits.add(roomUnit); } - public RoomUserStatusComposer(RoomUnit roomUnit, double overrideZ) { + public UserUpdateComposer(RoomUnit roomUnit, double overrideZ) { this(roomUnit); this.overrideZ = overrideZ; } - public RoomUserStatusComposer(THashSet roomUnits, boolean value) { + public UserUpdateComposer(THashSet roomUnits, boolean value) { this.roomUnits = roomUnits; } - public RoomUserStatusComposer(Collection habbos) { + public UserUpdateComposer(Collection habbos) { this.habbos = habbos; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserWhisperComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/WhisperMessageComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserWhisperComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/users/WhisperMessageComposer.java index a368d450..213e92ab 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserWhisperComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/WhisperMessageComposer.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 RoomUserWhisperComposer extends MessageComposer { +public class WhisperMessageComposer extends MessageComposer { private final RoomChatMessage roomChatMessage; - public RoomUserWhisperComposer(RoomChatMessage roomChatMessage) { + public WhisperMessageComposer(RoomChatMessage roomChatMessage) { this.roomChatMessage = roomChatMessage; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeAcceptedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingAcceptComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/trading/TradeAcceptedComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/trading/TradingAcceptComposer.java index a905af27..fc8ffccd 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeAcceptedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingAcceptComposer.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 TradeAcceptedComposer extends MessageComposer { +public class TradingAcceptComposer extends MessageComposer { private final RoomTradeUser tradeUser; - public TradeAcceptedComposer(RoomTradeUser tradeUser) { + public TradingAcceptComposer(RoomTradeUser tradeUser) { this.tradeUser = tradeUser; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeClosedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingCloseComposer.java similarity index 85% rename from src/main/java/com/eu/habbo/messages/outgoing/trading/TradeClosedComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/trading/TradingCloseComposer.java index a00376a6..ea5f0e2c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeClosedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingCloseComposer.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 TradeClosedComposer extends MessageComposer { +public class TradingCloseComposer extends MessageComposer { public static final int USER_CANCEL_TRADE = 0; public static final int ITEMS_NOT_FOUND = 1; private final int userId; private final int errorCode; - public TradeClosedComposer(int userId, int errorCode) { + public TradingCloseComposer(int userId, int errorCode) { this.userId = userId; this.errorCode = errorCode; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingWaitingConfirmComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingConfirmationComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/trading/TradingWaitingConfirmComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/trading/TradingConfirmationComposer.java index bf84d3bd..f61ce7c8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingWaitingConfirmComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingConfirmationComposer.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 TradingWaitingConfirmComposer extends MessageComposer { +public class TradingConfirmationComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.TradingConfirmationComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeUpdateComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingItemListComposer.java similarity index 93% rename from src/main/java/com/eu/habbo/messages/outgoing/trading/TradeUpdateComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/trading/TradingItemListComposer.java index b4f2e28e..8c290573 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeUpdateComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingItemListComposer.java @@ -8,10 +8,10 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class TradeUpdateComposer extends MessageComposer { +public class TradingItemListComposer extends MessageComposer { private final RoomTrade roomTrade; - public TradeUpdateComposer(RoomTrade roomTrade) { + public TradingItemListComposer(RoomTrade roomTrade) { this.roomTrade = roomTrade; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeCompleteComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingNotOpenComposer.java similarity index 85% rename from src/main/java/com/eu/habbo/messages/outgoing/trading/TradeCompleteComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/trading/TradingNotOpenComposer.java index 1393cac7..58ae7c28 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeCompleteComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingNotOpenComposer.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 TradeCompleteComposer extends MessageComposer { +public class TradingNotOpenComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.TradingNotOpenComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeStartComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingOpenComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/trading/TradeStartComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/trading/TradingOpenComposer.java index 1de68390..6287ac2e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeStartComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingOpenComposer.java @@ -6,16 +6,16 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class TradeStartComposer extends MessageComposer { +public class TradingOpenComposer extends MessageComposer { private final RoomTrade roomTrade; private final int state; - public TradeStartComposer(RoomTrade roomTrade) { + public TradingOpenComposer(RoomTrade roomTrade) { this.roomTrade = roomTrade; this.state = 1; } - public TradeStartComposer(RoomTrade roomTrade, int state) { + public TradingOpenComposer(RoomTrade roomTrade, int state) { this.roomTrade = roomTrade; this.state = state; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeStartFailComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingOpenFailedComposer.java similarity index 84% rename from src/main/java/com/eu/habbo/messages/outgoing/trading/TradeStartFailComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/trading/TradingOpenFailedComposer.java index 816e0c3f..f8dd724f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeStartFailComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingOpenFailedComposer.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 TradeStartFailComposer extends MessageComposer { +public class TradingOpenFailedComposer extends MessageComposer { public static final int HOTEL_TRADING_NOT_ALLOWED = 1; public static final int YOU_TRADING_OFF = 2; public static final int TARGET_TRADING_NOT_ALLOWED = 4; @@ -15,12 +15,12 @@ public class TradeStartFailComposer extends MessageComposer { private final String username; private final int code; - public TradeStartFailComposer(int code) { + public TradingOpenFailedComposer(int code) { this.code = code; this.username = ""; } - public TradeStartFailComposer(int code, String username) { + public TradingOpenFailedComposer(int code, String username) { this.code = code; this.username = username; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/trading/OtherTradingDisabledComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingOtherNotAllowedComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/trading/OtherTradingDisabledComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/trading/TradingOtherNotAllowedComposer.java index bb997e3c..b3289589 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/trading/OtherTradingDisabledComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingOtherNotAllowedComposer.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 OtherTradingDisabledComposer extends MessageComposer { +public class TradingOtherNotAllowedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.TradingOtherNotAllowedComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/trading/YouTradingDisabledComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingYouAreNotAllowedComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/trading/YouTradingDisabledComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/trading/TradingYouAreNotAllowedComposer.java index 0dca2501..52b8743e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/trading/YouTradingDisabledComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingYouAreNotAllowedComposer.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 YouTradingDisabledComposer extends MessageComposer { +public class TradingYouAreNotAllowedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.TradingYouAreNotAllowedComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/CloseWebPageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RestoreClientMessageComposer.java similarity index 84% rename from src/main/java/com/eu/habbo/messages/outgoing/unknown/CloseWebPageComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/unknown/RestoreClientMessageComposer.java index d8cd0f18..9e144230 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/CloseWebPageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RestoreClientMessageComposer.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 CloseWebPageComposer extends MessageComposer { +public class RestoreClientMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.RestoreClientMessageComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RemoveRoomEventComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomEventCancelComposer.java similarity index 85% rename from src/main/java/com/eu/habbo/messages/outgoing/unknown/RemoveRoomEventComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomEventCancelComposer.java index fbd8985a..61e5deec 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RemoveRoomEventComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomEventCancelComposer.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 RemoveRoomEventComposer extends MessageComposer { +public class RoomEventCancelComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomEventCancelComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomMessagesPostedCountComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomMessageNotificationMessageComposer.java similarity index 81% rename from src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomMessagesPostedCountComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomMessageNotificationMessageComposer.java index b4b04feb..5a0e2e16 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomMessagesPostedCountComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomMessageNotificationMessageComposer.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 RoomMessagesPostedCountComposer extends MessageComposer { +public class RoomMessageNotificationMessageComposer extends MessageComposer { private final Room room; private final int count; - public RoomMessagesPostedCountComposer(Room room, int count) { + public RoomMessageNotificationMessageComposer(Room room, int count) { this.room = room; this.count = count; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownCatalogPageOfferComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SeasonalCalendarDailyOfferMessageComposer.java similarity index 79% rename from src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownCatalogPageOfferComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/unknown/SeasonalCalendarDailyOfferMessageComposer.java index 8606aa72..335b5cdb 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownCatalogPageOfferComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SeasonalCalendarDailyOfferMessageComposer.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 UnknownCatalogPageOfferComposer extends MessageComposer { +public class SeasonalCalendarDailyOfferMessageComposer extends MessageComposer { private final int pageId; private final CatalogItem catalogItem; - public UnknownCatalogPageOfferComposer(int pageId, CatalogItem catalogItem) { + public SeasonalCalendarDailyOfferMessageComposer(int pageId, CatalogItem catalogItem) { this.pageId = pageId; this.catalogItem = catalogItem; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomCategoryUpdateMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ShowEnforceRoomCategoryDialogComposer.java similarity index 77% rename from src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomCategoryUpdateMessageComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/unknown/ShowEnforceRoomCategoryDialogComposer.java index 4a53c073..a65efc9f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomCategoryUpdateMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ShowEnforceRoomCategoryDialogComposer.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 RoomCategoryUpdateMessageComposer extends MessageComposer { +public class ShowEnforceRoomCategoryDialogComposer extends MessageComposer { private final int unknownInt1; - public RoomCategoryUpdateMessageComposer(int unknownInt1) { + public ShowEnforceRoomCategoryDialogComposer(int unknownInt1) { this.unknownInt1 = unknownInt1; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/HabboMallComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/TargetedOfferNotFoundComposer.java similarity index 84% rename from src/main/java/com/eu/habbo/messages/outgoing/unknown/HabboMallComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/unknown/TargetedOfferNotFoundComposer.java index dc23ee27..46cd138d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/HabboMallComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/TargetedOfferNotFoundComposer.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 HabboMallComposer extends MessageComposer { +public class TargetedOfferNotFoundComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.TargetedOfferNotFoundComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownTradeComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownTradeComposer.java deleted file mode 100644 index 6817e7ec..00000000 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownTradeComposer.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.eu.habbo.messages.outgoing.unknown; - -import com.eu.habbo.messages.ServerMessage; -import com.eu.habbo.messages.outgoing.MessageComposer; -import com.eu.habbo.messages.outgoing.Outgoing; - -public class UnknownTradeComposer extends MessageComposer { - @Override - protected ServerMessage composeInternal() { - this.response.init(Outgoing.TradingNotOpenComposer); - //Empty Body - return this.response; - } -} \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UserClassificationComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UserClassificationMessageComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/unknown/UserClassificationComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/unknown/UserClassificationMessageComposer.java index 6cab2380..3d7e5b22 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UserClassificationComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UserClassificationMessageComposer.java @@ -7,10 +7,10 @@ import org.apache.commons.math3.util.Pair; import java.util.List; -public class UserClassificationComposer extends MessageComposer { +public class UserClassificationMessageComposer extends MessageComposer { private final List>> info; - public UserClassificationComposer(List>> info) { + public UserClassificationMessageComposer(List>> info) { this.info = info; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftChangeEmailResultComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftErrorComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftChangeEmailResultComposer.java index 6a9899d9..f84d4a47 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftChangeEmailResultComposer.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 WelcomeGiftErrorComposer extends MessageComposer { +public class WelcomeGiftChangeEmailResultComposer extends MessageComposer { public final static int EMAIL_INVALID = 0; public final static int EMAIL_LENGTH_EXCEEDED = 1; public final static int EMAIL_IN_USE = 3; @@ -12,7 +12,7 @@ public class WelcomeGiftErrorComposer extends MessageComposer { private final int error; - public WelcomeGiftErrorComposer(int error) { + public WelcomeGiftChangeEmailResultComposer(int error) { this.error = error; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftStatusComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftStatusComposer.java index 329b82fc..be700a6b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftStatusComposer.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 WelcomeGiftComposer extends MessageComposer { +public class WelcomeGiftStatusComposer extends MessageComposer { private final String email; private final boolean unknownB1; private final boolean unknownB2; private final int furniId; private final boolean unknownB3; - public WelcomeGiftComposer(String email, boolean unknownB1, boolean unknownB2, int furniId, boolean unknownB3) { + public WelcomeGiftStatusComposer(String email, boolean unknownB1, boolean unknownB2, int furniId, boolean unknownB3) { this.email = email; this.unknownB1 = unknownB1; this.unknownB2 = unknownB2; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomUnknown3Composer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/YouAreSpectatorMessageEvent.java similarity index 85% rename from src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomUnknown3Composer.java rename to src/main/java/com/eu/habbo/messages/outgoing/unknown/YouAreSpectatorMessageEvent.java index ef1616e1..6f0eb63a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomUnknown3Composer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/YouAreSpectatorMessageEvent.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 RoomUnknown3Composer extends MessageComposer { +public class YouAreSpectatorMessageEvent extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.YouAreSpectatorMessageEvent); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/ProfileFriendsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/RelationshipStatusInfoComposer.java similarity index 93% rename from src/main/java/com/eu/habbo/messages/outgoing/users/ProfileFriendsComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/users/RelationshipStatusInfoComposer.java index 9fb099fb..202b3fd7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/ProfileFriendsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/RelationshipStatusInfoComposer.java @@ -15,15 +15,15 @@ import java.util.List; import java.util.Map; import java.util.Random; -public class ProfileFriendsComposer extends MessageComposer { - private static final Logger LOGGER = LoggerFactory.getLogger(ProfileFriendsComposer.class); +public class RelationshipStatusInfoComposer extends MessageComposer { + private static final Logger LOGGER = LoggerFactory.getLogger(RelationshipStatusInfoComposer.class); private final List lovers = new ArrayList<>(); private final List friends = new ArrayList<>(); private final List haters = new ArrayList<>(); private final int userId; - public ProfileFriendsComposer(THashMap> map, int userId) { + public RelationshipStatusInfoComposer(THashMap> map, int userId) { this.lovers.addAll(map.get(1)); this.friends.addAll(map.get(2)); this.haters.addAll(map.get(3)); @@ -31,7 +31,7 @@ public class ProfileFriendsComposer extends MessageComposer { this.userId = userId; } - public ProfileFriendsComposer(Habbo habbo) { + public RelationshipStatusInfoComposer(Habbo habbo) { try { for (Map.Entry map : habbo.getMessenger().getFriends().entrySet()) { if (map.getValue().getRelation() == 0) diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/MutedWhisperComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/RemainingMutePeriodComposer.java similarity index 79% rename from src/main/java/com/eu/habbo/messages/outgoing/users/MutedWhisperComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/users/RemainingMutePeriodComposer.java index 910962f1..1323ac94 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/MutedWhisperComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/RemainingMutePeriodComposer.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 MutedWhisperComposer extends MessageComposer { +public class RemainingMutePeriodComposer extends MessageComposer { private final int seconds; - public MutedWhisperComposer(int seconds) { + public RemainingMutePeriodComposer(int seconds) { this.seconds = seconds; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserClubComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/ScrSendUserInfoComposer.java similarity index 95% rename from src/main/java/com/eu/habbo/messages/outgoing/users/UserClubComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/users/ScrSendUserInfoComposer.java index 53611957..55651f0c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserClubComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/ScrSendUserInfoComposer.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class UserClubComposer extends MessageComposer { +public class ScrSendUserInfoComposer extends MessageComposer { private final Habbo habbo; private final String subscriptionType; private final int responseType; @@ -19,19 +19,19 @@ public class UserClubComposer extends MessageComposer { public static int RESPONSE_TYPE_DISCOUNT_AVAILABLE = 3; public static int RESPONSE_TYPE_CITIZENSHIP_DISCOUNT = 4; - public UserClubComposer(Habbo habbo) { + public ScrSendUserInfoComposer(Habbo habbo) { this.habbo = habbo; this.subscriptionType = SubscriptionHabboClub.HABBO_CLUB.toLowerCase(); this.responseType = 0; } - public UserClubComposer(Habbo habbo, String subscriptionType) { + public ScrSendUserInfoComposer(Habbo habbo, String subscriptionType) { this.habbo = habbo; this.subscriptionType = subscriptionType; this.responseType = 0; } - public UserClubComposer(Habbo habbo, String subscriptionType, int responseType) { + public ScrSendUserInfoComposer(Habbo habbo, String subscriptionType, int responseType) { this.habbo = habbo; this.subscriptionType = subscriptionType; this.responseType = responseType; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserCitizinShipComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/TalentTrackLevelMessageEvent.java similarity index 81% rename from src/main/java/com/eu/habbo/messages/outgoing/users/UserCitizinShipComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/users/TalentTrackLevelMessageEvent.java index 84518bf1..3e2da784 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserCitizinShipComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/TalentTrackLevelMessageEvent.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 UserCitizinShipComposer extends MessageComposer { +public class TalentTrackLevelMessageEvent extends MessageComposer { private final String name; - public UserCitizinShipComposer(String name) { + public TalentTrackLevelMessageEvent(String name) { this.name = name; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserObjectComposer.java similarity index 93% rename from src/main/java/com/eu/habbo/messages/outgoing/users/UserDataComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/users/UserObjectComposer.java index f4fc0af2..dc8c1f13 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserObjectComposer.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 UserDataComposer extends MessageComposer { +public class UserObjectComposer extends MessageComposer { private final Habbo habbo; - public UserDataComposer(Habbo habbo) { + public UserObjectComposer(Habbo habbo) { this.habbo = habbo; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserPermissionsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserRightsMessageComposer.java similarity index 87% rename from src/main/java/com/eu/habbo/messages/outgoing/users/UserPermissionsComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/users/UserRightsMessageComposer.java index 9091c803..775c5c67 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserPermissionsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserRightsMessageComposer.java @@ -6,12 +6,12 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class UserPermissionsComposer extends MessageComposer { +public class UserRightsMessageComposer extends MessageComposer { private final int clubLevel; private final Habbo habbo; - public UserPermissionsComposer(Habbo habbo) { + public UserRightsMessageComposer(Habbo habbo) { this.clubLevel = habbo.getHabboStats().hasActiveClub() ? 2 : 0; this.habbo = habbo; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserWardrobeComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/WardrobeMessageComposer.java similarity index 87% rename from src/main/java/com/eu/habbo/messages/outgoing/users/UserWardrobeComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/users/WardrobeMessageComposer.java index f017f356..e023a0f8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserWardrobeComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/WardrobeMessageComposer.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 UserWardrobeComposer extends MessageComposer { +public class WardrobeMessageComposer extends MessageComposer { private final WardrobeComponent wardrobeComponent; - public UserWardrobeComposer(WardrobeComponent wardrobeComponent) { + public WardrobeMessageComposer(WardrobeComponent wardrobeComponent) { this.wardrobeComponent = wardrobeComponent; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneCodeWindowComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/verification/TryPhoneNumberResultMessageComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneCodeWindowComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/users/verification/TryPhoneNumberResultMessageComposer.java index 520a8609..2dff2ae3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneCodeWindowComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/verification/TryPhoneNumberResultMessageComposer.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 VerifyMobilePhoneCodeWindowComposer extends MessageComposer { +public class TryPhoneNumberResultMessageComposer extends MessageComposer { private final int unknownInt1; private final int unknownInt2; - public VerifyMobilePhoneCodeWindowComposer(int unknownInt1, int unknownInt2) { + public TryPhoneNumberResultMessageComposer(int unknownInt1, int unknownInt2) { this.unknownInt1 = unknownInt1; this.unknownInt2 = unknownInt2; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneDoneComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/verification/TryVerificationCodeResultMessageComposer.java similarity index 79% rename from src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneDoneComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/users/verification/TryVerificationCodeResultMessageComposer.java index 897ed92d..1ce8f425 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneDoneComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/verification/TryVerificationCodeResultMessageComposer.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 VerifyMobilePhoneDoneComposer extends MessageComposer { +public class TryVerificationCodeResultMessageComposer extends MessageComposer { private final int unknownInt1; private final int unknownInt2; - public VerifyMobilePhoneDoneComposer(int unknownInt1, int unknownInt2) { + public TryVerificationCodeResultMessageComposer(int unknownInt1, int unknownInt2) { this.unknownInt1 = unknownInt1; this.unknownInt2 = unknownInt2; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredRewardAlertComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredRewardResultMessageComposer.java similarity index 88% rename from src/main/java/com/eu/habbo/messages/outgoing/wired/WiredRewardAlertComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/wired/WiredRewardResultMessageComposer.java index 9e916d9d..64f1a9e4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredRewardAlertComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredRewardResultMessageComposer.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 WiredRewardAlertComposer extends MessageComposer { +public class WiredRewardResultMessageComposer extends MessageComposer { public static final int LIMITED_NO_MORE_AVAILABLE = 0; public static final int REWARD_ALREADY_RECEIVED = 1; public static final int REWARD_ALREADY_RECEIVED_THIS_TODAY = 2; @@ -17,7 +17,7 @@ public class WiredRewardAlertComposer extends MessageComposer { private final int code; - public WiredRewardAlertComposer(int code) { + public WiredRewardResultMessageComposer(int code) { this.code = code; } diff --git a/src/main/java/com/eu/habbo/messages/rcon/ForwardUser.java b/src/main/java/com/eu/habbo/messages/rcon/ForwardUser.java index b6f18b6a..62629656 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/ForwardUser.java +++ b/src/main/java/com/eu/habbo/messages/rcon/ForwardUser.java @@ -3,7 +3,7 @@ package com.eu.habbo.messages.rcon; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.Habbo; -import com.eu.habbo.messages.outgoing.rooms.ForwardToRoomComposer; +import com.eu.habbo.messages.outgoing.rooms.RoomForwardMessageComposer; import com.google.gson.Gson; public class ForwardUser extends RCONMessage { @@ -24,7 +24,7 @@ public class ForwardUser extends RCONMessage { Emulator.getGameEnvironment().getRoomManager().leaveRoom(habbo, habbo.getHabboInfo().getCurrentRoom()); } - habbo.getClient().sendResponse(new ForwardToRoomComposer(object.room_id)); + habbo.getClient().sendResponse(new RoomForwardMessageComposer(object.room_id)); Emulator.getGameEnvironment().getRoomManager().enterRoom(habbo, object.room_id, "", true); } else { this.status = RCONMessage.ROOM_NOT_FOUND; diff --git a/src/main/java/com/eu/habbo/messages/rcon/GiveRespect.java b/src/main/java/com/eu/habbo/messages/rcon/GiveRespect.java index 3ffa2621..93fe2449 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/GiveRespect.java +++ b/src/main/java/com/eu/habbo/messages/rcon/GiveRespect.java @@ -2,7 +2,7 @@ package com.eu.habbo.messages.rcon; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.Habbo; -import com.eu.habbo.messages.outgoing.users.UserDataComposer; +import com.eu.habbo.messages.outgoing.users.UserObjectComposer; import com.google.gson.Gson; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,7 +27,7 @@ public class GiveRespect extends RCONMessage { habbo.getHabboStats().respectPointsReceived += object.respect_received; habbo.getHabboStats().respectPointsGiven += object.respect_given; habbo.getHabboStats().respectPointsToGive += object.daily_respects; - habbo.getClient().sendResponse(new UserDataComposer(habbo)); + habbo.getClient().sendResponse(new UserObjectComposer(habbo)); } else { try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("UPDATE users_settings SET respects_given = respects_give + ?, respects_received = respects_received + ?, daily_respect_points = daily_respect_points + ? WHERE user_id = ? LIMIT 1")) { statement.setInt(1, object.respect_received); diff --git a/src/main/java/com/eu/habbo/messages/rcon/SetMotto.java b/src/main/java/com/eu/habbo/messages/rcon/SetMotto.java index 88ce9c20..340e656c 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/SetMotto.java +++ b/src/main/java/com/eu/habbo/messages/rcon/SetMotto.java @@ -2,7 +2,7 @@ package com.eu.habbo.messages.rcon; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.Habbo; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserDataComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserChangeMessageComposer; import com.google.gson.Gson; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,7 +24,7 @@ public class SetMotto extends RCONMessage { if (habbo != null) { habbo.getHabboInfo().setMotto(json.motto); - habbo.getHabboInfo().getCurrentRoom().sendComposer(new RoomUserDataComposer(habbo).compose()); + habbo.getHabboInfo().getCurrentRoom().sendComposer(new UserChangeMessageComposer(habbo).compose()); } else { try (Connection connection = Emulator.getDatabase().getDataSource().getConnection()) { try (PreparedStatement statement = connection.prepareStatement("UPDATE users SET motto = ? WHERE id = ? LIMIT 1")) { diff --git a/src/main/java/com/eu/habbo/messages/rcon/StalkUser.java b/src/main/java/com/eu/habbo/messages/rcon/StalkUser.java index f72e5036..3e2a61fb 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/StalkUser.java +++ b/src/main/java/com/eu/habbo/messages/rcon/StalkUser.java @@ -2,7 +2,7 @@ package com.eu.habbo.messages.rcon; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.Habbo; -import com.eu.habbo.messages.outgoing.rooms.ForwardToRoomComposer; +import com.eu.habbo.messages.outgoing.rooms.RoomForwardMessageComposer; import com.google.gson.Gson; public class StalkUser extends RCONMessage { @@ -42,7 +42,7 @@ public class StalkUser extends RCONMessage { } if (this.status == 0) { - habbo.getClient().sendResponse(new ForwardToRoomComposer(target.getHabboInfo().getCurrentRoom().getId())); + habbo.getClient().sendResponse(new RoomForwardMessageComposer(target.getHabboInfo().getCurrentRoom().getId())); } } } diff --git a/src/main/java/com/eu/habbo/messages/rcon/UpdateUser.java b/src/main/java/com/eu/habbo/messages/rcon/UpdateUser.java index 2a332504..143f2fd7 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/UpdateUser.java +++ b/src/main/java/com/eu/habbo/messages/rcon/UpdateUser.java @@ -2,7 +2,7 @@ package com.eu.habbo.messages.rcon; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.Habbo; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserDataComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserChangeMessageComposer; import com.eu.habbo.messages.outgoing.users.AccountPreferencesComposer; import com.eu.habbo.messages.outgoing.users.FigureUpdateComposer; import com.google.gson.Gson; @@ -55,7 +55,7 @@ public class UpdateUser extends RCONMessage { } if (habbo.getHabboInfo().getCurrentRoom() != null) { - habbo.getHabboInfo().getCurrentRoom().sendComposer(new RoomUserDataComposer(habbo).compose()); + habbo.getHabboInfo().getCurrentRoom().sendComposer(new UserChangeMessageComposer(habbo).compose()); } } diff --git a/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraRoomThumbnailGeneratedEvent.java b/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraRoomThumbnailGeneratedEvent.java index 96783a2d..2a0c5aef 100644 --- a/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraRoomThumbnailGeneratedEvent.java +++ b/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraRoomThumbnailGeneratedEvent.java @@ -2,7 +2,7 @@ package com.eu.habbo.networking.camera.messages.incoming; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.Habbo; -import com.eu.habbo.messages.outgoing.camera.CameraRoomThumbnailSavedComposer; +import com.eu.habbo.messages.outgoing.camera.ThumbnailStatusMessageComposer; import com.eu.habbo.networking.camera.CameraIncomingMessage; import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; @@ -19,7 +19,7 @@ public class CameraRoomThumbnailGeneratedEvent extends CameraIncomingMessage { Habbo habbo = Emulator.getGameEnvironment().getHabboManager().getHabbo(userId); if (habbo != null) { - habbo.getClient().sendResponse(new CameraRoomThumbnailSavedComposer()); + habbo.getClient().sendResponse(new ThumbnailStatusMessageComposer()); } } } \ 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 fcab80ea..8557b1b8 100644 --- a/src/main/java/com/eu/habbo/plugin/PluginManager.java +++ b/src/main/java/com/eu/habbo/plugin/PluginManager.java @@ -37,7 +37,7 @@ 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.GiftWrappingConfigurationComposer; -import com.eu.habbo.messages.outgoing.navigator.NewNavigatorEventCategoriesComposer; +import com.eu.habbo.messages.outgoing.navigator.UserEventCatsComposer; import com.eu.habbo.plugin.events.emulator.EmulatorConfigUpdatedEvent; import com.eu.habbo.plugin.events.emulator.EmulatorLoadedEvent; import com.eu.habbo.plugin.events.roomunit.RoomUnitLookAtPointEvent; @@ -212,10 +212,10 @@ public class PluginManager { } - NewNavigatorEventCategoriesComposer.CATEGORIES.clear(); + UserEventCatsComposer.CATEGORIES.clear(); for (String category : Emulator.getConfig().getValue("navigator.eventcategories", "").split(";")) { try { - NewNavigatorEventCategoriesComposer.CATEGORIES.add(new EventCategory(category)); + UserEventCatsComposer.CATEGORIES.add(new EventCategory(category)); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/com/eu/habbo/threading/runnables/ClearRentedSpace.java b/src/main/java/com/eu/habbo/threading/runnables/ClearRentedSpace.java index 0349a434..08a61aae 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/ClearRentedSpace.java +++ b/src/main/java/com/eu/habbo/threading/runnables/ClearRentedSpace.java @@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomTile; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; -import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; +import com.eu.habbo.messages.outgoing.inventory.UnseenItemsComposer; import gnu.trove.set.hash.THashSet; public class ClearRentedSpace implements Runnable { @@ -35,7 +35,7 @@ public class ClearRentedSpace implements Runnable { Habbo owner = Emulator.getGameEnvironment().getHabboManager().getHabbo(this.item.getRenterId()); if (owner != null) { - owner.getClient().sendResponse(new AddHabboItemComposer(items)); + owner.getClient().sendResponse(new UnseenItemsComposer(items)); owner.getHabboStats().rentedItemId = 0; owner.getHabboStats().rentedTimeEnd = 0; } else { diff --git a/src/main/java/com/eu/habbo/threading/runnables/CrackableExplode.java b/src/main/java/com/eu/habbo/threading/runnables/CrackableExplode.java index 216982e0..827b2ad9 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/CrackableExplode.java +++ b/src/main/java/com/eu/habbo/threading/runnables/CrackableExplode.java @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.items.interactions.InteractionCrackable; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; -import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; +import com.eu.habbo.messages.outgoing.inventory.UnseenItemsComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer; import com.eu.habbo.messages.outgoing.rooms.items.ObjectAddMessageComposer; import com.eu.habbo.messages.outgoing.rooms.items.RemoveFloorItemComposer; @@ -54,7 +54,7 @@ public class CrackableExplode implements Runnable { //Add to inventory in case if isn't possible place the item or in case is wall item if (this.toInventory || newItem.getBaseItem().getType() == FurnitureType.WALL) { this.habbo.getInventory().getItemsComponent().addItem(newItem); - this.habbo.getClient().sendResponse(new AddHabboItemComposer(newItem)); + this.habbo.getClient().sendResponse(new UnseenItemsComposer(newItem)); this.habbo.getClient().sendResponse(new FurniListInvalidateComposer()); } else { newItem.setX(this.x); diff --git a/src/main/java/com/eu/habbo/threading/runnables/OneWayGateActionOne.java b/src/main/java/com/eu/habbo/threading/runnables/OneWayGateActionOne.java index 0cb6ae50..317622c7 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/OneWayGateActionOne.java +++ b/src/main/java/com/eu/habbo/threading/runnables/OneWayGateActionOne.java @@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.gameclients.GameClient; 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.users.RoomUserStatusComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserUpdateComposer; public class OneWayGateActionOne implements Runnable { private HabboItem oneWayGate; @@ -20,7 +20,7 @@ public class OneWayGateActionOne implements Runnable { @Override public void run() { - this.room.sendComposer(new RoomUserStatusComposer(this.client.getHabbo().getRoomUnit()).compose()); + this.room.sendComposer(new UserUpdateComposer(this.client.getHabbo().getRoomUnit()).compose()); RoomTile t = this.room.getLayout().getTileInFront(this.room.getLayout().getTile(this.oneWayGate.getX(), this.oneWayGate.getY()), (this.oneWayGate.getRotation() + 4) % 8); diff --git a/src/main/java/com/eu/habbo/threading/runnables/OpenGift.java b/src/main/java/com/eu/habbo/threading/runnables/OpenGift.java index 66c5df07..bc09a18b 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/OpenGift.java +++ b/src/main/java/com/eu/habbo/threading/runnables/OpenGift.java @@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomTile; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; -import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; +import com.eu.habbo.messages.outgoing.inventory.UnseenItemsComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListAddOrUpdateComposer; import com.eu.habbo.messages.outgoing.rooms.items.PresentOpenedMessageComposer; @@ -61,43 +61,43 @@ public class OpenGift implements Runnable { this.habbo.getClient().sendResponse(new FurniListInvalidateComposer()); - Map> unseenItems = new HashMap<>(); + Map> unseenItems = new HashMap<>(); for (HabboItem item : items) { switch (item.getBaseItem().getType()) { case WALL: case FLOOR: - if (!unseenItems.containsKey(AddHabboItemComposer.AddHabboItemCategory.OWNED_FURNI)) - unseenItems.put(AddHabboItemComposer.AddHabboItemCategory.OWNED_FURNI, new ArrayList<>()); + if (!unseenItems.containsKey(UnseenItemsComposer.AddHabboItemCategory.OWNED_FURNI)) + unseenItems.put(UnseenItemsComposer.AddHabboItemCategory.OWNED_FURNI, new ArrayList<>()); - unseenItems.get(AddHabboItemComposer.AddHabboItemCategory.OWNED_FURNI).add(item.getGiftAdjustedId()); + unseenItems.get(UnseenItemsComposer.AddHabboItemCategory.OWNED_FURNI).add(item.getGiftAdjustedId()); break; case BADGE: - if (!unseenItems.containsKey(AddHabboItemComposer.AddHabboItemCategory.BADGE)) - unseenItems.put(AddHabboItemComposer.AddHabboItemCategory.BADGE, new ArrayList<>()); + if (!unseenItems.containsKey(UnseenItemsComposer.AddHabboItemCategory.BADGE)) + unseenItems.put(UnseenItemsComposer.AddHabboItemCategory.BADGE, new ArrayList<>()); - unseenItems.get(AddHabboItemComposer.AddHabboItemCategory.BADGE).add(item.getId()); // badges cannot be placed so no need for gift adjusted ID + unseenItems.get(UnseenItemsComposer.AddHabboItemCategory.BADGE).add(item.getId()); // badges cannot be placed so no need for gift adjusted ID break; case PET: - if (!unseenItems.containsKey(AddHabboItemComposer.AddHabboItemCategory.PET)) - unseenItems.put(AddHabboItemComposer.AddHabboItemCategory.PET, new ArrayList<>()); + if (!unseenItems.containsKey(UnseenItemsComposer.AddHabboItemCategory.PET)) + unseenItems.put(UnseenItemsComposer.AddHabboItemCategory.PET, new ArrayList<>()); - unseenItems.get(AddHabboItemComposer.AddHabboItemCategory.PET).add(item.getGiftAdjustedId()); + unseenItems.get(UnseenItemsComposer.AddHabboItemCategory.PET).add(item.getGiftAdjustedId()); break; case ROBOT: - if (!unseenItems.containsKey(AddHabboItemComposer.AddHabboItemCategory.BOT)) - unseenItems.put(AddHabboItemComposer.AddHabboItemCategory.BOT, new ArrayList<>()); + if (!unseenItems.containsKey(UnseenItemsComposer.AddHabboItemCategory.BOT)) + unseenItems.put(UnseenItemsComposer.AddHabboItemCategory.BOT, new ArrayList<>()); - unseenItems.get(AddHabboItemComposer.AddHabboItemCategory.BOT).add(item.getGiftAdjustedId()); + unseenItems.get(UnseenItemsComposer.AddHabboItemCategory.BOT).add(item.getGiftAdjustedId()); break; } } - this.habbo.getClient().sendResponse(new AddHabboItemComposer(unseenItems)); + this.habbo.getClient().sendResponse(new UnseenItemsComposer(unseenItems)); if (inside != null) { this.habbo.getClient().sendResponse(new FurniListAddOrUpdateComposer(inside)); diff --git a/src/main/java/com/eu/habbo/threading/runnables/PetEatAction.java b/src/main/java/com/eu/habbo/threading/runnables/PetEatAction.java index 331e5949..afcd662c 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/PetEatAction.java +++ b/src/main/java/com/eu/habbo/threading/runnables/PetEatAction.java @@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.pets.Pet; import com.eu.habbo.habbohotel.pets.PetTasks; import com.eu.habbo.habbohotel.rooms.RoomUnitStatus; import com.eu.habbo.messages.outgoing.rooms.items.RemoveFloorItemComposer; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserUpdateComposer; public class PetEatAction implements Runnable { private final Pet pet; @@ -53,7 +53,7 @@ public class PetEatAction implements Runnable { this.pet.setTask(PetTasks.FREE); this.pet.getRoomUnit().removeStatus(RoomUnitStatus.EAT); this.pet.getRoomUnit().setCanWalk(true); - this.pet.getRoom().sendComposer(new RoomUserStatusComposer(this.pet.getRoomUnit()).compose()); + this.pet.getRoom().sendComposer(new UserUpdateComposer(this.pet.getRoomUnit()).compose()); } } } diff --git a/src/main/java/com/eu/habbo/threading/runnables/RoomUnitRidePet.java b/src/main/java/com/eu/habbo/threading/runnables/RoomUnitRidePet.java index 2dfce42a..898d44e7 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/RoomUnitRidePet.java +++ b/src/main/java/com/eu/habbo/threading/runnables/RoomUnitRidePet.java @@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.pets.RideablePet; import com.eu.habbo.habbohotel.rooms.RoomTile; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.outgoing.rooms.users.AvatarEffectMessageComposer; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserUpdateComposer; public class RoomUnitRidePet implements Runnable { private RideablePet pet; @@ -35,7 +35,7 @@ public class RoomUnitRidePet implements Runnable { habbo.getRoomUnit().setRotation(this.pet.getRoomUnit().getBodyRotation()); habbo.getRoomUnit().statusUpdate(true); pet.setRider(habbo); - habbo.getHabboInfo().getCurrentRoom().sendComposer(new RoomUserStatusComposer(habbo.getRoomUnit()).compose()); + habbo.getHabboInfo().getCurrentRoom().sendComposer(new UserUpdateComposer(habbo.getRoomUnit()).compose()); habbo.getHabboInfo().getCurrentRoom().sendComposer(new AvatarEffectMessageComposer(habbo.getRoomUnit()).compose()); pet.setTask(PetTasks.RIDE); } else { diff --git a/src/main/java/com/eu/habbo/threading/runnables/TeleportInteraction.java b/src/main/java/com/eu/habbo/threading/runnables/TeleportInteraction.java index daa19e2f..c9745ee6 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/TeleportInteraction.java +++ b/src/main/java/com/eu/habbo/threading/runnables/TeleportInteraction.java @@ -8,8 +8,8 @@ import com.eu.habbo.habbohotel.rooms.RoomUnitStatus; import com.eu.habbo.habbohotel.rooms.RoomUserRotation; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.outgoing.rooms.users.AvatarEffectMessageComposer; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserRemoveComposer; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserRemoveMessageComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserUpdateComposer; import com.eu.habbo.messages.outgoing.rooms.users.RoomUsersComposer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -79,10 +79,10 @@ class TeleportInteraction extends Thread { this.client.getHabbo().getRoomUnit().setLocation(this.room.getLayout().getTile(this.teleportTwo.getX(), this.teleportTwo.getY())); this.client.getHabbo().getRoomUnit().setZ(this.teleportTwo.getZ()); - this.room.sendComposer(new RoomUserRemoveComposer(this.client.getHabbo().getRoomUnit()).compose()); - this.targetRoom.sendComposer(new RoomUserRemoveComposer(this.client.getHabbo().getRoomUnit()).compose()); + this.room.sendComposer(new UserRemoveMessageComposer(this.client.getHabbo().getRoomUnit()).compose()); + this.targetRoom.sendComposer(new UserRemoveMessageComposer(this.client.getHabbo().getRoomUnit()).compose()); this.targetRoom.sendComposer(new RoomUsersComposer(this.client.getHabbo()).compose()); - this.targetRoom.sendComposer(new RoomUserStatusComposer(this.client.getHabbo().getRoomUnit()).compose()); + this.targetRoom.sendComposer(new UserUpdateComposer(this.client.getHabbo().getRoomUnit()).compose()); this.targetRoom.sendComposer(new AvatarEffectMessageComposer(this.client.getHabbo().getRoomUnit()).compose()); this.room.updateItem(this.teleportOne); this.targetRoom.updateItem(this.teleportTwo); diff --git a/src/main/java/com/eu/habbo/threading/runnables/YoutubeAdvanceVideo.java b/src/main/java/com/eu/habbo/threading/runnables/YoutubeAdvanceVideo.java index 0a140643..c1eb576d 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/YoutubeAdvanceVideo.java +++ b/src/main/java/com/eu/habbo/threading/runnables/YoutubeAdvanceVideo.java @@ -3,7 +3,7 @@ package com.eu.habbo.threading.runnables; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.items.interactions.InteractionYoutubeTV; import com.eu.habbo.habbohotel.rooms.Room; -import com.eu.habbo.messages.outgoing.rooms.items.youtube.YoutubeVideoComposer; +import com.eu.habbo.messages.outgoing.rooms.items.youtube.YoutubeDisplayVideoMessageComposer; public class YoutubeAdvanceVideo implements Runnable { private final InteractionYoutubeTV tv; @@ -26,7 +26,7 @@ public class YoutubeAdvanceVideo implements Runnable { tv.startedWatchingAt = Emulator.getIntUnixTimestamp(); tv.offset = 0; room.updateItem(this.tv); - room.sendComposer(new YoutubeVideoComposer(tv.getId(), tv.currentVideo, true, 0).compose()); + room.sendComposer(new YoutubeDisplayVideoMessageComposer(tv.getId(), tv.currentVideo, true, 0).compose()); tv.autoAdvance = Emulator.getThreading().run(new YoutubeAdvanceVideo(this.tv), tv.currentVideo.getDuration() * 1000); } diff --git a/src/main/java/com/eu/habbo/threading/runnables/hopper/HopperActionOne.java b/src/main/java/com/eu/habbo/threading/runnables/hopper/HopperActionOne.java index 25319d21..f05c5545 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/hopper/HopperActionOne.java +++ b/src/main/java/com/eu/habbo/threading/runnables/hopper/HopperActionOne.java @@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomUnitStatus; import com.eu.habbo.habbohotel.rooms.RoomUserRotation; import com.eu.habbo.habbohotel.users.HabboItem; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserUpdateComposer; public class HopperActionOne implements Runnable { private final HabboItem teleportOne; @@ -24,14 +24,14 @@ public class HopperActionOne implements Runnable { //this.client.getHabbo().getRoomUnit().setGoalLocation(this.teleportOne.getX(), this.teleportOne.getY()); this.client.getHabbo().getRoomUnit().setRotation(RoomUserRotation.values()[(this.teleportOne.getRotation() + 4) % 8]); this.client.getHabbo().getRoomUnit().setStatus(RoomUnitStatus.MOVE, this.teleportOne.getX() + "," + this.teleportOne.getY() + "," + this.teleportOne.getZ()); - this.room.scheduledComposers.add(new RoomUserStatusComposer(this.client.getHabbo().getRoomUnit()).compose()); + this.room.scheduledComposers.add(new UserUpdateComposer(this.client.getHabbo().getRoomUnit()).compose()); this.client.getHabbo().getRoomUnit().setLocation(this.room.getLayout().getTile(this.teleportOne.getX(), this.teleportOne.getY())); this.client.getHabbo().getRoomUnit().setZ(this.teleportOne.getZ()); this.client.getHabbo().getRoomUnit().setPreviousLocationZ(this.teleportOne.getZ()); Emulator.getThreading().run(() -> { HopperActionOne.this.client.getHabbo().getRoomUnit().removeStatus(RoomUnitStatus.MOVE); - HopperActionOne.this.room.sendComposer(new RoomUserStatusComposer(HopperActionOne.this.client.getHabbo().getRoomUnit()).compose()); + HopperActionOne.this.room.sendComposer(new UserUpdateComposer(HopperActionOne.this.client.getHabbo().getRoomUnit()).compose()); }, 750); Emulator.getThreading().run(new HopperActionTwo(this.teleportOne, this.room, this.client), 1250); diff --git a/src/main/java/com/eu/habbo/threading/runnables/hopper/HopperActionThree.java b/src/main/java/com/eu/habbo/threading/runnables/hopper/HopperActionThree.java index 724a426c..ebb6d41c 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/hopper/HopperActionThree.java +++ b/src/main/java/com/eu/habbo/threading/runnables/hopper/HopperActionThree.java @@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomUnitStatus; import com.eu.habbo.habbohotel.rooms.RoomUserRotation; import com.eu.habbo.habbohotel.users.HabboItem; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserUpdateComposer; import com.eu.habbo.threading.runnables.HabboItemNewState; class HopperActionThree implements Runnable { @@ -52,7 +52,7 @@ class HopperActionThree implements Runnable { this.client.getHabbo().getRoomUnit().setZ(targetTeleport.getZ()); this.client.getHabbo().getRoomUnit().setRotation(RoomUserRotation.values()[targetTeleport.getRotation() % 8]); this.client.getHabbo().getRoomUnit().removeStatus(RoomUnitStatus.MOVE); - targetRoom.sendComposer(new RoomUserStatusComposer(this.client.getHabbo().getRoomUnit()).compose()); + targetRoom.sendComposer(new UserUpdateComposer(this.client.getHabbo().getRoomUnit()).compose()); Emulator.getThreading().run(new HabboItemNewState(this.teleportOne, this.room, "0"), 500); Emulator.getThreading().run(new HopperActionFour(targetTeleport, targetRoom, this.client), 500); diff --git a/src/main/java/com/eu/habbo/threading/runnables/teleport/TeleportActionFive.java b/src/main/java/com/eu/habbo/threading/runnables/teleport/TeleportActionFive.java index 9072a33d..67268db8 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/teleport/TeleportActionFive.java +++ b/src/main/java/com/eu/habbo/threading/runnables/teleport/TeleportActionFive.java @@ -4,9 +4,7 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.items.interactions.InteractionTeleportTile; import com.eu.habbo.habbohotel.rooms.*; -import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; import com.eu.habbo.threading.runnables.HabboItemNewState; import com.eu.habbo.threading.runnables.RoomUnitWalkToLocation; diff --git a/src/main/java/com/eu/habbo/threading/runnables/teleport/TeleportActionOne.java b/src/main/java/com/eu/habbo/threading/runnables/teleport/TeleportActionOne.java index 760c2d75..730b7c69 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/teleport/TeleportActionOne.java +++ b/src/main/java/com/eu/habbo/threading/runnables/teleport/TeleportActionOne.java @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomUnitStatus; import com.eu.habbo.habbohotel.rooms.RoomUserRotation; import com.eu.habbo.habbohotel.users.HabboItem; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserUpdateComposer; public class TeleportActionOne implements Runnable { private final HabboItem currentTeleport; @@ -35,7 +35,7 @@ public class TeleportActionOne implements Runnable { this.client.getHabbo().getRoomUnit().setLocation(this.room.getLayout().getTile(this.currentTeleport.getX(), this.currentTeleport.getY())); this.client.getHabbo().getRoomUnit().setRotation(RoomUserRotation.values()[(this.currentTeleport.getRotation() + 4) % 8]); this.client.getHabbo().getRoomUnit().setStatus(RoomUnitStatus.MOVE, this.currentTeleport.getX() + "," + this.currentTeleport.getY() + "," + this.currentTeleport.getZ()); - this.room.scheduledComposers.add(new RoomUserStatusComposer(this.client.getHabbo().getRoomUnit()).compose()); + this.room.scheduledComposers.add(new UserUpdateComposer(this.client.getHabbo().getRoomUnit()).compose()); this.client.getHabbo().getRoomUnit().setLocation(this.room.getLayout().getTile(this.currentTeleport.getX(), this.currentTeleport.getY())); } diff --git a/src/main/java/com/eu/habbo/threading/runnables/teleport/TeleportActionTwo.java b/src/main/java/com/eu/habbo/threading/runnables/teleport/TeleportActionTwo.java index feedd769..c448f2ef 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/teleport/TeleportActionTwo.java +++ b/src/main/java/com/eu/habbo/threading/runnables/teleport/TeleportActionTwo.java @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.items.interactions.InteractionTeleportTile; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomUnitStatus; import com.eu.habbo.habbohotel.users.HabboItem; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; +import com.eu.habbo.messages.outgoing.rooms.users.UserUpdateComposer; import com.eu.habbo.threading.runnables.HabboItemNewState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,7 +42,7 @@ class TeleportActionTwo implements Runnable { return; this.client.getHabbo().getRoomUnit().removeStatus(RoomUnitStatus.MOVE); - this.room.sendComposer(new RoomUserStatusComposer(this.client.getHabbo().getRoomUnit()).compose()); + this.room.sendComposer(new UserUpdateComposer(this.client.getHabbo().getRoomUnit()).compose()); if (((InteractionTeleport) this.currentTeleport).getTargetRoomId() > 0 && ((InteractionTeleport) this.currentTeleport).getTargetId() > 0) { HabboItem item = this.room.getHabboItem(((InteractionTeleport) this.currentTeleport).getTargetId());