Refactored all outgoing composer names beginning with B

src/main/java/com/eu/habbo/habbohotel/bots/BotManager.java

@@ -1,7 +1,6 @@
 package com.eu.habbo.habbohotel.bots;
 
 import com.eu.habbo.Emulator;
-import com.eu.habbo.habbohotel.items.Item;
 import com.eu.habbo.habbohotel.permissions.Permission;
 import com.eu.habbo.habbohotel.rooms.*;
 import com.eu.habbo.habbohotel.users.Habbo;
@@ -10,8 +9,8 @@ import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.outgoing.generic.alerts.BotErrorComposer;
 import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer;
 import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys;
-import com.eu.habbo.messages.outgoing.inventory.AddBotComposer;
+import com.eu.habbo.messages.outgoing.inventory.BotAddedToInventoryComposer;
-import com.eu.habbo.messages.outgoing.inventory.RemoveBotComposer;
+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.RoomUsersComposer;
 import com.eu.habbo.plugin.events.bots.BotPickUpEvent;
@@ -142,7 +141,7 @@ public class BotManager {
                 room.sendComposer(new RoomUsersComposer(bot).compose());
                 room.sendComposer(new RoomUserStatusComposer(bot.getRoomUnit()).compose());
                 habbo.getInventory().getBotsComponent().removeBot(bot);
-                habbo.getClient().sendResponse(new RemoveBotComposer(bot));
+                habbo.getClient().sendResponse(new BotRemovedFromInventoryComposer(bot));
                 bot.onPlace(habbo, room);
 
                 HabboItem topItem = room.getTopItemAt(location.x, location.y);
@@ -195,7 +194,7 @@ public class BotManager {
                 Habbo receiver = habbo == null ? Emulator.getGameEnvironment().getHabboManager().getHabbo(receiverInfo.getId()) : habbo;
                 if (receiver != null) {
                     receiver.getInventory().getBotsComponent().addBot(bot);
-                    receiver.getClient().sendResponse(new AddBotComposer(bot));
+                    receiver.getClient().sendResponse(new BotAddedToInventoryComposer(bot));
                 }
             }
         }

src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java

@@ -20,7 +20,7 @@ import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.messages.outgoing.catalog.*;
 import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer;
 import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys;
-import com.eu.habbo.messages.outgoing.inventory.AddBotComposer;
+import com.eu.habbo.messages.outgoing.inventory.BotAddedToInventoryComposer;
 import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer;
 import com.eu.habbo.messages.outgoing.inventory.AddPetComposer;
 import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer;
@@ -923,7 +923,7 @@ public class CatalogManager {
                                     bot.needsUpdate(true);
                                     Emulator.getThreading().run(bot);
                                     habbo.getClient().getHabbo().getInventory().getBotsComponent().addBot(bot);
-                                    habbo.getClient().sendResponse(new AddBotComposer(bot));
+                                    habbo.getClient().sendResponse(new BotAddedToInventoryComposer(bot));
 
                                     if (!unseenItems.containsKey(AddHabboItemComposer.AddHabboItemCategory.BOT)) {
                                         unseenItems.put(AddHabboItemComposer.AddHabboItemCategory.BOT, new ArrayList<>());
@@ -1166,23 +1166,23 @@ public class CatalogManager {
     private int calculateDiscountedPrice(int originalPrice, int amount, CatalogItem item) {
         if (!CatalogItem.haveOffer(item)) return originalPrice * amount;
 
-        int basicDiscount = amount / DiscountComposer.DISCOUNT_BATCH_SIZE;
+        int basicDiscount = amount / BundleDiscountRulesetMessageComposer.DISCOUNT_BATCH_SIZE;
 
         int bonusDiscount = 0;
-        if (basicDiscount >= DiscountComposer.MINIMUM_DISCOUNTS_FOR_BONUS) {
+        if (basicDiscount >= BundleDiscountRulesetMessageComposer.MINIMUM_DISCOUNTS_FOR_BONUS) {
-            if (amount % DiscountComposer.DISCOUNT_BATCH_SIZE == DiscountComposer.DISCOUNT_BATCH_SIZE - 1) {
+            if (amount % BundleDiscountRulesetMessageComposer.DISCOUNT_BATCH_SIZE == BundleDiscountRulesetMessageComposer.DISCOUNT_BATCH_SIZE - 1) {
                 bonusDiscount = 1;
             }
 
-            bonusDiscount += basicDiscount - DiscountComposer.MINIMUM_DISCOUNTS_FOR_BONUS;
+            bonusDiscount += basicDiscount - BundleDiscountRulesetMessageComposer.MINIMUM_DISCOUNTS_FOR_BONUS;
         }
 
         int additionalDiscounts = 0;
-        for (int threshold : DiscountComposer.ADDITIONAL_DISCOUNT_THRESHOLDS) {
+        for (int threshold : BundleDiscountRulesetMessageComposer.ADDITIONAL_DISCOUNT_THRESHOLDS) {
             if (amount >= threshold) additionalDiscounts++;
         }
 
-        int totalDiscountedItems = (basicDiscount * DiscountComposer.DISCOUNT_AMOUNT_PER_BATCH) + bonusDiscount + additionalDiscounts;
+        int totalDiscountedItems = (basicDiscount * BundleDiscountRulesetMessageComposer.DISCOUNT_AMOUNT_PER_BATCH) + bonusDiscount + additionalDiscounts;
 
         return Math.max(0, originalPrice * (amount - totalDiscountedItems));
     }

src/main/java/com/eu/habbo/habbohotel/commands/EmptyBotsInventoryCommand.java

@@ -6,10 +6,9 @@ import com.eu.habbo.habbohotel.gameclients.GameClient;
 import com.eu.habbo.habbohotel.permissions.Permission;
 import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles;
 import com.eu.habbo.habbohotel.users.Habbo;
-import com.eu.habbo.messages.outgoing.inventory.InventoryBotsComposer;
+import com.eu.habbo.messages.outgoing.inventory.BotInventoryComposer;
 import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer;
 import gnu.trove.map.hash.TIntObjectHashMap;
-import gnu.trove.procedure.TObjectProcedure;
 
 public class EmptyBotsInventoryCommand extends Command {
     public EmptyBotsInventoryCommand() {
@@ -44,7 +43,7 @@ public class EmptyBotsInventoryCommand extends Command {
                 });
 
                 habbo.getClient().sendResponse(new InventoryRefreshComposer());
-                habbo.getClient().sendResponse(new InventoryBotsComposer(habbo));
+                habbo.getClient().sendResponse(new BotInventoryComposer(habbo));
 
                 gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_empty_bots.cleared").replace("%username%", habbo.getHabboInfo().getUsername()), RoomChatMessageBubbles.ALERT);
             } else {

src/main/java/com/eu/habbo/habbohotel/commands/TakeBadgeCommand.java

@@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.users.HabboBadge;
 import com.eu.habbo.habbohotel.users.HabboInfo;
 import com.eu.habbo.habbohotel.users.HabboManager;
 import com.eu.habbo.habbohotel.users.inventory.BadgesComponent;
-import com.eu.habbo.messages.outgoing.inventory.InventoryBadgesComposer;
+import com.eu.habbo.messages.outgoing.inventory.BadgesComposer;
 import com.eu.habbo.messages.outgoing.users.UserBadgesComposer;
 
 public class TakeBadgeCommand extends Command {
@@ -40,7 +40,7 @@ public class TakeBadgeCommand extends Command {
                     return true;
                 }
 
-                habbo.getClient().sendResponse(new InventoryBadgesComposer(habbo));
+                habbo.getClient().sendResponse(new BadgesComposer(habbo));
                 if (habbo.getHabboInfo().getCurrentRoom() != null) {
                     habbo.getHabboInfo().getCurrentRoom().sendComposer(new UserBadgesComposer(habbo.getInventory().getBadgesComponent().getWearingBadges(), habbo.getHabboInfo().getId()).compose());
                 }

src/main/java/com/eu/habbo/habbohotel/commands/UpdateCatalogCommand.java

@@ -16,8 +16,8 @@ public class UpdateCatalogCommand extends Command {
     public boolean handle(GameClient gameClient, String[] params) {
         Emulator.getGameEnvironment().getCatalogManager().initialize();
         Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new CatalogUpdatedComposer());
-        Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new CatalogModeComposer(0));
+        Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new BuildersClubFurniCountMessageComposer(0));
-        Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new DiscountComposer());
+        Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new BundleDiscountRulesetMessageComposer());
         Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new MarketplaceConfigComposer());
         Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new GiftConfigurationComposer());
         Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new RecyclerLogicComposer());

src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectGiveHotelviewBonusRarePoints.java

@@ -11,9 +11,8 @@ 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.outgoing.hotelview.BonusRareComposer;
+import com.eu.habbo.messages.outgoing.hotelview.BonusRareInfoMessageComposer;
 import gnu.trove.procedure.TObjectProcedure;
 
 import java.sql.ResultSet;
@@ -94,7 +93,7 @@ public class WiredEffectGiveHotelviewBonusRarePoints extends InteractionWiredEff
 
         if (this.amount > 0) {
             habbo.getHabboInfo().addCurrencyAmount(Emulator.getConfig().getInt("hotelview.promotional.points.type"), this.amount);
-            habbo.getClient().sendResponse(new BonusRareComposer(habbo));
+            habbo.getClient().sendResponse(new BonusRareInfoMessageComposer(habbo));
         }
 
         return true;

src/main/java/com/eu/habbo/habbohotel/users/Habbo.java

@@ -351,13 +351,13 @@ public class Habbo implements Runnable {
 
     public void addBot(Bot bot) {
         this.habboInventory.getBotsComponent().addBot(bot);
-        this.client.sendResponse(new AddBotComposer(bot));
+        this.client.sendResponse(new BotAddedToInventoryComposer(bot));
     }
 
 
     public void removeBot(Bot bot) {
         this.habboInventory.getBotsComponent().removeBot(bot);
-        this.client.sendResponse(new RemoveBotComposer(bot));
+        this.client.sendResponse(new BotRemovedFromInventoryComposer(bot));
     }
 
 
@@ -404,7 +404,7 @@ public class Habbo implements Runnable {
         if (badge != null) {
             this.habboInventory.getBadgesComponent().removeBadge(badge);
             BadgesComponent.deleteBadge(this.getHabboInfo().getId(), badge.getCode());
-            this.client.sendResponse(new InventoryBadgesComposer(this));
+            this.client.sendResponse(new BadgesComposer(this));
         }
     }
 

src/main/java/com/eu/habbo/habbohotel/users/HabboManager.java

@@ -275,8 +275,8 @@ public class HabboManager {
             habbo.getHabboInfo().run();
 
             habbo.getClient().sendResponse(new CatalogUpdatedComposer());
-            habbo.getClient().sendResponse(new CatalogModeComposer(0));
+            habbo.getClient().sendResponse(new BuildersClubFurniCountMessageComposer(0));
-            habbo.getClient().sendResponse(new DiscountComposer());
+            habbo.getClient().sendResponse(new BundleDiscountRulesetMessageComposer());
             habbo.getClient().sendResponse(new MarketplaceConfigComposer());
             habbo.getClient().sendResponse(new GiftConfigurationComposer());
             habbo.getClient().sendResponse(new RecyclerLogicComposer());

src/main/java/com/eu/habbo/messages/incoming/catalog/RequestCatalogModeEvent.java

@@ -1,7 +1,7 @@
 package com.eu.habbo.messages.incoming.catalog;
 
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.catalog.CatalogModeComposer;
+import com.eu.habbo.messages.outgoing.catalog.BuildersClubFurniCountMessageComposer;
 import com.eu.habbo.messages.outgoing.catalog.CatalogPagesListComposer;
 
 public class RequestCatalogModeEvent extends MessageHandler {
@@ -10,10 +10,10 @@ public class RequestCatalogModeEvent extends MessageHandler {
 
         String MODE = this.packet.readString();
         if (MODE.equalsIgnoreCase("normal")) {
-            this.client.sendResponse(new CatalogModeComposer(0));
+            this.client.sendResponse(new BuildersClubFurniCountMessageComposer(0));
             this.client.sendResponse(new CatalogPagesListComposer(this.client.getHabbo(), MODE));
         } else {
-            this.client.sendResponse(new CatalogModeComposer(1));
+            this.client.sendResponse(new BuildersClubFurniCountMessageComposer(1));
             this.client.sendResponse(new CatalogPagesListComposer(this.client.getHabbo(), MODE));
         }
 

src/main/java/com/eu/habbo/messages/incoming/catalog/RequestDiscountEvent.java

@@ -1,11 +1,11 @@
 package com.eu.habbo.messages.incoming.catalog;
 
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.catalog.DiscountComposer;
+import com.eu.habbo.messages.outgoing.catalog.BundleDiscountRulesetMessageComposer;
 
 public class RequestDiscountEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
-        this.client.sendResponse(new DiscountComposer());
+        this.client.sendResponse(new BundleDiscountRulesetMessageComposer());
     }
 }

src/main/java/com/eu/habbo/messages/incoming/handshake/SecureLoginEvent.java

@@ -35,7 +35,7 @@ import com.eu.habbo.messages.outgoing.modtool.CfhTopicsMessageComposer;
 import com.eu.habbo.messages.outgoing.modtool.ModToolComposer;
 import com.eu.habbo.messages.outgoing.modtool.ModToolSanctionInfoComposer;
 import com.eu.habbo.messages.outgoing.navigator.*;
-import com.eu.habbo.messages.outgoing.unknown.BuildersClubExpiredComposer;
+import com.eu.habbo.messages.outgoing.unknown.BuildersClubSubscriptionStatusMessageComposer;
 import com.eu.habbo.messages.outgoing.mysterybox.MysteryBoxKeysComposer;
 import com.eu.habbo.messages.outgoing.users.*;
 import com.eu.habbo.plugin.events.emulator.SSOAuthenticationEvent;
@@ -211,7 +211,7 @@ public class SecureLoginEvent extends MessageHandler {
                 messages.add(new AchievementsScoreComposer(this.client.getHabbo()).compose());
                 messages.add(new IsFirstLoginOfDayComposer(true).compose());
                 messages.add(new MysteryBoxKeysComposer().compose());
-                messages.add(new BuildersClubExpiredComposer().compose());
+                messages.add(new BuildersClubSubscriptionStatusMessageComposer().compose());
                 messages.add(new CfhTopicsMessageComposer().compose());
                 messages.add(new FavoriteRoomsCountComposer(this.client.getHabbo()).compose());
                 messages.add(new GameCenterGameListComposer().compose());

src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewRequestBonusRareEvent.java

@@ -1,11 +1,11 @@
 package com.eu.habbo.messages.incoming.hotelview;
 
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.hotelview.BonusRareComposer;
+import com.eu.habbo.messages.outgoing.hotelview.BonusRareInfoMessageComposer;
 
 public class HotelViewRequestBonusRareEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
-        this.client.sendResponse(new BonusRareComposer(this.client.getHabbo()));
+        this.client.sendResponse(new BonusRareInfoMessageComposer(this.client.getHabbo()));
     }
 }

src/main/java/com/eu/habbo/messages/incoming/inventory/RequestInventoryBadgesEvent.java

@@ -1,11 +1,11 @@
 package com.eu.habbo.messages.incoming.inventory;
 
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.inventory.InventoryBadgesComposer;
+import com.eu.habbo.messages.outgoing.inventory.BadgesComposer;
 
 public class RequestInventoryBadgesEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
-        this.client.sendResponse(new InventoryBadgesComposer(this.client.getHabbo()));
+        this.client.sendResponse(new BadgesComposer(this.client.getHabbo()));
     }
 }

src/main/java/com/eu/habbo/messages/incoming/inventory/RequestInventoryBotsEvent.java

@@ -1,11 +1,11 @@
 package com.eu.habbo.messages.incoming.inventory;
 
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.inventory.InventoryBotsComposer;
+import com.eu.habbo.messages.outgoing.inventory.BotInventoryComposer;
 
 public class RequestInventoryBotsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
-        this.client.sendResponse(new InventoryBotsComposer(this.client.getHabbo()));
+        this.client.sendResponse(new BotInventoryComposer(this.client.getHabbo()));
     }
 }

src/main/java/com/eu/habbo/messages/incoming/rooms/RoomRequestBannedUsersEvent.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.RoomBannedUsersComposer;
+import com.eu.habbo.messages.outgoing.rooms.BannedUsersFromRoomComposer;
 
 public class RoomRequestBannedUsersEvent extends MessageHandler {
     @Override
@@ -14,7 +14,7 @@ public class RoomRequestBannedUsersEvent extends MessageHandler {
         Room room = Emulator.getGameEnvironment().getRoomManager().getRoom(roomId);
 
         if (room != null) {
-            this.client.sendResponse(new RoomBannedUsersComposer(room));
+            this.client.sendResponse(new BannedUsersFromRoomComposer(room));
         }
 
         AchievementManager.progressAchievement(this.client.getHabbo(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("SelfModChatFloodFilterSeen"));

src/main/java/com/eu/habbo/messages/incoming/rooms/bots/BotSettingsEvent.java

@@ -4,7 +4,7 @@ import com.eu.habbo.habbohotel.bots.Bot;
 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.rooms.BotSettingsComposer;
+import com.eu.habbo.messages.outgoing.rooms.BotCommandConfigurationComposer;
 
 public class BotSettingsEvent extends MessageHandler {
     @Override
@@ -22,7 +22,7 @@ public class BotSettingsEvent extends MessageHandler {
             if (bot == null)
                 return;
 
-            this.client.sendResponse(new BotSettingsComposer(bot, this.packet.readInt()));
+            this.client.sendResponse(new BotCommandConfigurationComposer(bot, this.packet.readInt()));
         }
     }
 }

src/main/java/com/eu/habbo/messages/outgoing/catalog/BuildersClubFurniCountMessageComposer.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 CatalogModeComposer extends MessageComposer {
+public class BuildersClubFurniCountMessageComposer extends MessageComposer {
     private final int mode;
 
-    public CatalogModeComposer(int mode) {
+    public BuildersClubFurniCountMessageComposer(int mode) {
         this.mode = mode;
     }
 

src/main/java/com/eu/habbo/messages/outgoing/catalog/BundleDiscountRulesetMessageComposer.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 DiscountComposer extends MessageComposer {
+public class BundleDiscountRulesetMessageComposer extends MessageComposer {
     public static int MAXIMUM_ALLOWED_ITEMS = 100;
     public static int DISCOUNT_BATCH_SIZE = 6;
     public static int DISCOUNT_AMOUNT_PER_BATCH = 1;

src/main/java/com/eu/habbo/messages/outgoing/hotelview/BonusRareInfoMessageComposer.java

@@ -6,10 +6,10 @@ import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
 
-public class BonusRareComposer extends MessageComposer {
+public class BonusRareInfoMessageComposer extends MessageComposer {
     private final Habbo habbo;
 
-    public BonusRareComposer(Habbo habbo) {
+    public BonusRareInfoMessageComposer(Habbo habbo) {
         this.habbo = habbo;
     }
 

src/main/java/com/eu/habbo/messages/outgoing/inventory/BadgesComposer.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 InventoryBadgesComposer extends MessageComposer {
+public class BadgesComposer extends MessageComposer {
     private final Habbo habbo;
 
-    public InventoryBadgesComposer(Habbo habbo) {
+    public BadgesComposer(Habbo habbo) {
         this.habbo = habbo;
     }
 

src/main/java/com/eu/habbo/messages/outgoing/inventory/BotAddedToInventoryComposer.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 AddBotComposer extends MessageComposer {
+public class BotAddedToInventoryComposer extends MessageComposer {
     private final Bot bot;
 
-    public AddBotComposer(Bot bot) {
+    public BotAddedToInventoryComposer(Bot bot) {
         this.bot = bot;
     }
 

src/main/java/com/eu/habbo/messages/outgoing/inventory/BotInventoryComposer.java

@@ -7,10 +7,10 @@ import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
 import gnu.trove.map.hash.THashMap;
 
-public class InventoryBotsComposer extends MessageComposer {
+public class BotInventoryComposer extends MessageComposer {
     private final Habbo habbo;
 
-    public InventoryBotsComposer(Habbo habbo) {
+    public BotInventoryComposer(Habbo habbo) {
         this.habbo = habbo;
     }
 

src/main/java/com/eu/habbo/messages/outgoing/inventory/BotRemovedFromInventoryComposer.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 RemoveBotComposer extends MessageComposer {
+public class BotRemovedFromInventoryComposer extends MessageComposer {
     private final Bot bot;
 
-    public RemoveBotComposer(Bot bot) {
+    public BotRemovedFromInventoryComposer(Bot bot) {
         this.bot = bot;
     }
 

src/main/java/com/eu/habbo/messages/outgoing/rooms/BannedUsersFromRoomComposer.java

@@ -11,10 +11,10 @@ import gnu.trove.set.hash.THashSet;
 
 import java.util.NoSuchElementException;
 
-public class RoomBannedUsersComposer extends MessageComposer {
+public class BannedUsersFromRoomComposer extends MessageComposer {
     private final Room room;
 
-    public RoomBannedUsersComposer(Room room) {
+    public BannedUsersFromRoomComposer(Room room) {
         this.room = room;
     }
 

src/main/java/com/eu/habbo/messages/outgoing/rooms/BotCommandConfigurationComposer.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 BotSettingsComposer extends MessageComposer {
+public class BotCommandConfigurationComposer extends MessageComposer {
     private final Bot bot;
     private final int settingId;
 
-    public BotSettingsComposer(Bot bot, int settingId) {
+    public BotCommandConfigurationComposer(Bot bot, int settingId) {
         this.bot = bot;
         this.settingId = settingId;
     }

src/main/java/com/eu/habbo/messages/outgoing/unknown/BotSkillListUpdateComposer.java

@@ -6,11 +6,11 @@ import com.eu.habbo.messages.outgoing.Outgoing;
 
 import java.util.Map;
 
-public class UnknownRoomDesktopComposer extends MessageComposer {
+public class BotSkillListUpdateComposer extends MessageComposer {
     private final int unknownInt1;
     private final Map<Integer, String> unknownMap;
 
-    public UnknownRoomDesktopComposer(int unknownInt1, Map<Integer, String> unknownMap) {
+    public BotSkillListUpdateComposer(int unknownInt1, Map<Integer, String> unknownMap) {
         this.unknownInt1 = unknownInt1;
         this.unknownMap = unknownMap;
     }

src/main/java/com/eu/habbo/messages/outgoing/unknown/BuildersClubSubscriptionStatusMessageComposer.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 BuildersClubExpiredComposer extends MessageComposer {
+public class BuildersClubSubscriptionStatusMessageComposer extends MessageComposer {
     @Override
     protected ServerMessage composeInternal() {
         this.response.init(Outgoing.BuildersClubSubscriptionStatusMessageComposer);

src/main/java/com/eu/habbo/messages/rcon/UpdateCatalog.java

@@ -15,8 +15,8 @@ public class UpdateCatalog extends RCONMessage<UpdateCatalog.JSONUpdateCatalog>
     public void handle(Gson gson, JSONUpdateCatalog json) {
         Emulator.getGameEnvironment().getCatalogManager().initialize();
         Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new CatalogUpdatedComposer());
-        Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new CatalogModeComposer(0));
+        Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new BuildersClubFurniCountMessageComposer(0));
-        Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new DiscountComposer());
+        Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new BundleDiscountRulesetMessageComposer());
         Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new MarketplaceConfigComposer());
         Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new GiftConfigurationComposer());
         Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new RecyclerLogicComposer());

src/main/java/com/eu/habbo/plugin/PluginManager.java

@@ -25,7 +25,6 @@ import com.eu.habbo.habbohotel.users.clothingvalidation.ClothingValidationManage
 import com.eu.habbo.habbohotel.users.HabboInventory;
 import com.eu.habbo.habbohotel.users.HabboManager;
 import com.eu.habbo.habbohotel.users.subscriptions.SubscriptionHabboClub;
-import com.eu.habbo.habbohotel.users.subscriptions.SubscriptionManager;
 import com.eu.habbo.habbohotel.wired.WiredHandler;
 import com.eu.habbo.habbohotel.wired.highscores.WiredHighscoreManager;
 import com.eu.habbo.messages.PacketManager;
@@ -36,7 +35,7 @@ import com.eu.habbo.messages.incoming.floorplaneditor.FloorPlanEditorSaveEvent;
 import com.eu.habbo.messages.incoming.hotelview.HotelViewRequestLTDAvailabilityEvent;
 import com.eu.habbo.messages.incoming.rooms.promotions.BuyRoomPromotionEvent;
 import com.eu.habbo.messages.incoming.users.ChangeNameCheckUsernameEvent;
-import com.eu.habbo.messages.outgoing.catalog.DiscountComposer;
+import com.eu.habbo.messages.outgoing.catalog.BundleDiscountRulesetMessageComposer;
 import com.eu.habbo.messages.outgoing.catalog.GiftConfigurationComposer;
 import com.eu.habbo.messages.outgoing.navigator.NewNavigatorEventCategoriesComposer;
 import com.eu.habbo.plugin.events.emulator.EmulatorConfigUpdatedEvent;
@@ -89,11 +88,11 @@ public class PluginManager {
         RoomTrade.TRADING_ENABLED = Emulator.getConfig().getBoolean("hotel.trading.enabled") && !ShutdownEmulator.instantiated;
         RoomTrade.TRADING_REQUIRES_PERK = Emulator.getConfig().getBoolean("hotel.trading.requires.perk");
         WordFilter.ENABLED_FRIENDCHAT = Emulator.getConfig().getBoolean("hotel.wordfilter.messenger");
-        DiscountComposer.MAXIMUM_ALLOWED_ITEMS = Emulator.getConfig().getInt("discount.max.allowed.items", 100);
+        BundleDiscountRulesetMessageComposer.MAXIMUM_ALLOWED_ITEMS = Emulator.getConfig().getInt("discount.max.allowed.items", 100);
-        DiscountComposer.DISCOUNT_BATCH_SIZE = Emulator.getConfig().getInt("discount.batch.size", 6);
+        BundleDiscountRulesetMessageComposer.DISCOUNT_BATCH_SIZE = Emulator.getConfig().getInt("discount.batch.size", 6);
-        DiscountComposer.DISCOUNT_AMOUNT_PER_BATCH = Emulator.getConfig().getInt("discount.batch.free.items", 1);
+        BundleDiscountRulesetMessageComposer.DISCOUNT_AMOUNT_PER_BATCH = Emulator.getConfig().getInt("discount.batch.free.items", 1);
-        DiscountComposer.MINIMUM_DISCOUNTS_FOR_BONUS = Emulator.getConfig().getInt("discount.bonus.min.discounts", 1);
+        BundleDiscountRulesetMessageComposer.MINIMUM_DISCOUNTS_FOR_BONUS = Emulator.getConfig().getInt("discount.bonus.min.discounts", 1);
-        DiscountComposer.ADDITIONAL_DISCOUNT_THRESHOLDS = Arrays.stream(Emulator.getConfig().getValue("discount.additional.thresholds", "40;99").split(";")).mapToInt(Integer::parseInt).toArray();
+        BundleDiscountRulesetMessageComposer.ADDITIONAL_DISCOUNT_THRESHOLDS = Arrays.stream(Emulator.getConfig().getValue("discount.additional.thresholds", "40;99").split(";")).mapToInt(Integer::parseInt).toArray();
 
         BotManager.MINIMUM_CHAT_SPEED = Emulator.getConfig().getInt("hotel.bot.chat.minimum.interval");
         BotManager.MAXIMUM_CHAT_LENGTH = Emulator.getConfig().getInt("hotel.bot.max.chatlength");