nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-10-23 11:23:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactored all outgoing composer names beginning with F

Browse Source
This commit is contained in:
Harmonic 2022-04-16 12:14:56 -07:00 committed by Harmonic
parent da1226b083
commit 6902a6ff95
92 changed files with 234 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/eu/habbo/habbohotel/achievements/AchievementManager.java
View File

@ -9,7 +9,7 @@ import com.eu.habbo.messages.outgoing.achievements.AchievementComposer;
import com.eu.habbo.messages.outgoing.achievements.AchievementUnlockedComposer; import com.eu.habbo.messages.outgoing.achievements.AchievementUnlockedComposer;
import com.eu.habbo.messages.outgoing.achievements.talenttrack.TalentLevelUpdateComposer; import com.eu.habbo.messages.outgoing.achievements.talenttrack.TalentLevelUpdateComposer;
import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer;
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; 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.RoomUserDataComposer;
import com.eu.habbo.messages.outgoing.users.BadgeReceivedComposer; import com.eu.habbo.messages.outgoing.users.BadgeReceivedComposer;
import com.eu.habbo.messages.outgoing.users.UserBadgesComposer; import com.eu.habbo.messages.outgoing.users.UserBadgesComposer;
@ -357,7 +357,7 @@ public class AchievementManager {
HabboItem rewardItem = Emulator.getGameEnvironment().getItemManager().createItem(habbo.getHabboInfo().getId(), item, 0, 0, ""); HabboItem rewardItem = Emulator.getGameEnvironment().getItemManager().createItem(habbo.getHabboInfo().getId(), item, 0, 0, "");
habbo.getInventory().getItemsComponent().addItem(rewardItem); habbo.getInventory().getItemsComponent().addItem(rewardItem);
habbo.getClient().sendResponse(new AddHabboItemComposer(rewardItem)); habbo.getClient().sendResponse(new AddHabboItemComposer(rewardItem));
habbo.getClient().sendResponse(new InventoryRefreshComposer()); habbo.getClient().sendResponse(new FurniListInvalidateComposer());
} }
} }

6
src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarRewardObject.java
View File

@ -2,13 +2,11 @@ package com.eu.habbo.habbohotel.campaign.calendar;
import com.eu.habbo.Emulator; import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.items.Item; import com.eu.habbo.habbohotel.items.Item;
import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles;
import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.habbohotel.users.subscriptions.Subscription;
import com.eu.habbo.habbohotel.users.subscriptions.SubscriptionHabboClub; import com.eu.habbo.habbohotel.users.subscriptions.SubscriptionHabboClub;
import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer;
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -81,7 +79,7 @@ public class CalendarRewardObject {
""); "");
habbo.getInventory().getItemsComponent().addItem(habboItem); habbo.getInventory().getItemsComponent().addItem(habboItem);
habbo.getClient().sendResponse(new AddHabboItemComposer(habboItem)); habbo.getClient().sendResponse(new AddHabboItemComposer(habboItem));
habbo.getClient().sendResponse(new InventoryRefreshComposer()); habbo.getClient().sendResponse(new FurniListInvalidateComposer());
} }
} }
} }

4
src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java
View File

@ -23,7 +23,7 @@ import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys;
import com.eu.habbo.messages.outgoing.inventory.BotAddedToInventoryComposer; import com.eu.habbo.messages.outgoing.inventory.BotAddedToInventoryComposer;
import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer;
import com.eu.habbo.messages.outgoing.inventory.AddPetComposer; import com.eu.habbo.messages.outgoing.inventory.AddPetComposer;
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
import com.eu.habbo.messages.outgoing.modtool.ModToolIssueHandledComposer; import com.eu.habbo.messages.outgoing.modtool.ModToolIssueHandledComposer;
import com.eu.habbo.messages.outgoing.users.BadgeReceivedComposer; import com.eu.habbo.messages.outgoing.users.BadgeReceivedComposer;
import com.eu.habbo.messages.outgoing.users.CreditBalanceComposer; import com.eu.habbo.messages.outgoing.users.CreditBalanceComposer;
@ -1116,7 +1116,7 @@ public class CatalogManager {
habbo.getClient().sendResponse(new AddHabboItemComposer(unseenItems)); habbo.getClient().sendResponse(new AddHabboItemComposer(unseenItems));
habbo.getClient().sendResponse(new PurchaseOKComposer(purchasedEvent.catalogItem)); habbo.getClient().sendResponse(new PurchaseOKComposer(purchasedEvent.catalogItem));
habbo.getClient().sendResponse(new InventoryRefreshComposer()); habbo.getClient().sendResponse(new FurniListInvalidateComposer());
THashSet<String> itemIds = new THashSet<>(); THashSet<String> itemIds = new THashSet<>();

12
src/main/java/com/eu/habbo/habbohotel/catalog/marketplace/MarketPlace.java
View File

@ -9,8 +9,8 @@ import com.eu.habbo.messages.incoming.catalog.marketplace.RequestOffersEvent;
import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceBuyErrorComposer; import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceBuyErrorComposer;
import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceCancelSaleComposer; import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceCancelSaleComposer;
import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer;
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
import com.eu.habbo.messages.outgoing.inventory.RemoveHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListRemoveComposer;
import com.eu.habbo.messages.outgoing.users.CreditBalanceComposer; import com.eu.habbo.messages.outgoing.users.CreditBalanceComposer;
import com.eu.habbo.plugin.events.marketplace.MarketPlaceItemCancelledEvent; import com.eu.habbo.plugin.events.marketplace.MarketPlaceItemCancelledEvent;
import com.eu.habbo.plugin.events.marketplace.MarketPlaceItemOfferedEvent; import com.eu.habbo.plugin.events.marketplace.MarketPlaceItemOfferedEvent;
@ -95,7 +95,7 @@ public class MarketPlace {
habbo.getInventory().getItemsComponent().addItem(item); habbo.getInventory().getItemsComponent().addItem(item);
habbo.getClient().sendResponse(new MarketplaceCancelSaleComposer(offer, true)); habbo.getClient().sendResponse(new MarketplaceCancelSaleComposer(offer, true));
habbo.getClient().sendResponse(new AddHabboItemComposer(item)); habbo.getClient().sendResponse(new AddHabboItemComposer(item));
habbo.getClient().sendResponse(new InventoryRefreshComposer()); habbo.getClient().sendResponse(new FurniListInvalidateComposer());
} }
} }
} }
@ -286,7 +286,7 @@ public class MarketPlace {
client.sendResponse(new CreditBalanceComposer(client.getHabbo())); client.sendResponse(new CreditBalanceComposer(client.getHabbo()));
client.sendResponse(new AddHabboItemComposer(item)); client.sendResponse(new AddHabboItemComposer(item));
client.sendResponse(new InventoryRefreshComposer()); client.sendResponse(new FurniListInvalidateComposer());
client.sendResponse(new MarketplaceBuyErrorComposer(MarketplaceBuyErrorComposer.REFRESH, 0, offerId, price)); client.sendResponse(new MarketplaceBuyErrorComposer(MarketplaceBuyErrorComposer.REFRESH, 0, offerId, price));
if (habbo != null) { if (habbo != null) {
@ -346,8 +346,8 @@ public class MarketPlace {
RequestOffersEvent.cachedResults.clear(); RequestOffersEvent.cachedResults.clear();
client.sendResponse(new RemoveHabboItemComposer(event.item.getGiftAdjustedId())); client.sendResponse(new FurniListRemoveComposer(event.item.getGiftAdjustedId()));
client.sendResponse(new InventoryRefreshComposer()); client.sendResponse(new FurniListInvalidateComposer());
event.item.setFromGift(false); event.item.setFromGift(false);

4
src/main/java/com/eu/habbo/habbohotel/commands/EmptyBotsInventoryCommand.java
View File

@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.permissions.Permission;
import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles; import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles;
import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.messages.outgoing.inventory.BotInventoryComposer; import com.eu.habbo.messages.outgoing.inventory.BotInventoryComposer;
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
import gnu.trove.map.hash.TIntObjectHashMap; import gnu.trove.map.hash.TIntObjectHashMap;
public class EmptyBotsInventoryCommand extends Command { public class EmptyBotsInventoryCommand extends Command {
@ -42,7 +42,7 @@ public class EmptyBotsInventoryCommand extends Command {
return true; return true;
}); });
habbo.getClient().sendResponse(new InventoryRefreshComposer()); habbo.getClient().sendResponse(new FurniListInvalidateComposer());
habbo.getClient().sendResponse(new BotInventoryComposer(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); gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_empty_bots.cleared").replace("%username%", habbo.getHabboInfo().getUsername()), RoomChatMessageBubbles.ALERT);

8
src/main/java/com/eu/habbo/habbohotel/commands/EmptyInventoryCommand.java
View File

@ -6,8 +6,8 @@ import com.eu.habbo.habbohotel.permissions.Permission;
import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles; import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles;
import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.messages.outgoing.inventory.InventoryItemsComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListComposer;
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
import com.eu.habbo.threading.runnables.QueryDeleteHabboItems; import com.eu.habbo.threading.runnables.QueryDeleteHabboItems;
import gnu.trove.map.TIntObjectMap; import gnu.trove.map.TIntObjectMap;
import gnu.trove.map.hash.TIntObjectHashMap; import gnu.trove.map.hash.TIntObjectHashMap;
@ -41,8 +41,8 @@ public class EmptyInventoryCommand extends Command {
habbo.getInventory().getItemsComponent().getItems().clear(); habbo.getInventory().getItemsComponent().getItems().clear();
Emulator.getThreading().run(new QueryDeleteHabboItems(items)); Emulator.getThreading().run(new QueryDeleteHabboItems(items));
habbo.getClient().sendResponse(new InventoryRefreshComposer()); habbo.getClient().sendResponse(new FurniListInvalidateComposer());
habbo.getClient().sendResponse(new InventoryItemsComposer(0, 1, gameClient.getHabbo().getInventory().getItemsComponent().getItems())); habbo.getClient().sendResponse(new FurniListComposer(0, 1, gameClient.getHabbo().getInventory().getItemsComponent().getItems()));
gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_empty.cleared").replace("%username%", habbo.getHabboInfo().getUsername()), RoomChatMessageBubbles.ALERT); gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_empty.cleared").replace("%username%", habbo.getHabboInfo().getUsername()), RoomChatMessageBubbles.ALERT);

5
src/main/java/com/eu/habbo/habbohotel/commands/EmptyPetsInventoryCommand.java
View File

@ -7,9 +7,8 @@ import com.eu.habbo.habbohotel.pets.Pet;
import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles; import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles;
import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.messages.outgoing.inventory.InventoryPetsComposer; import com.eu.habbo.messages.outgoing.inventory.InventoryPetsComposer;
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
import gnu.trove.map.hash.TIntObjectHashMap; import gnu.trove.map.hash.TIntObjectHashMap;
import gnu.trove.procedure.TObjectProcedure;
public class EmptyPetsInventoryCommand extends Command { public class EmptyPetsInventoryCommand extends Command {
public EmptyPetsInventoryCommand() { public EmptyPetsInventoryCommand() {
@ -43,7 +42,7 @@ public class EmptyPetsInventoryCommand extends Command {
return true; return true;
}); });
habbo.getClient().sendResponse(new InventoryRefreshComposer()); habbo.getClient().sendResponse(new FurniListInvalidateComposer());
habbo.getClient().sendResponse(new InventoryPetsComposer(habbo)); habbo.getClient().sendResponse(new InventoryPetsComposer(habbo));
gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_empty_pets.cleared").replace("%username%", habbo.getHabboInfo().getUsername()), RoomChatMessageBubbles.ALERT); gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_empty_pets.cleared").replace("%username%", habbo.getHabboInfo().getUsername()), RoomChatMessageBubbles.ALERT);

4
src/main/java/com/eu/habbo/habbohotel/commands/FacelessCommand.java
View File

@ -3,7 +3,7 @@ package com.eu.habbo.habbohotel.commands;
import com.eu.habbo.Emulator; import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.gameclients.GameClient;
import com.eu.habbo.messages.outgoing.rooms.users.RoomUserDataComposer; import com.eu.habbo.messages.outgoing.rooms.users.RoomUserDataComposer;
import com.eu.habbo.messages.outgoing.users.UpdateUserLookComposer; import com.eu.habbo.messages.outgoing.users.FigureUpdateComposer;
public class FacelessCommand extends Command { public class FacelessCommand extends Command {
@ -30,7 +30,7 @@ public class FacelessCommand extends Command {
String newHead = "hd-" + headParts[1] + "-" + headParts[2]; String newHead = "hd-" + headParts[1] + "-" + headParts[2];
gameClient.getHabbo().getHabboInfo().setLook(gameClient.getHabbo().getHabboInfo().getLook().replace(part, newHead)); gameClient.getHabbo().getHabboInfo().setLook(gameClient.getHabbo().getHabboInfo().getLook().replace(part, newHead));
gameClient.sendResponse(new UpdateUserLookComposer(gameClient.getHabbo())); gameClient.sendResponse(new FigureUpdateComposer(gameClient.getHabbo()));
gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RoomUserDataComposer(gameClient.getHabbo()).compose()); gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RoomUserDataComposer(gameClient.getHabbo()).compose());
return true; return true;
} }

4
src/main/java/com/eu/habbo/habbohotel/commands/GiftCommand.java
View File

@ -10,7 +10,7 @@ import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.habbohotel.users.HabboManager; import com.eu.habbo.habbohotel.users.HabboManager;
import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer;
import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys;
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
import gnu.trove.map.hash.THashMap; import gnu.trove.map.hash.THashMap;
public class GiftCommand extends Command { public class GiftCommand extends Command {
@ -74,7 +74,7 @@ public class GiftCommand extends Command {
Habbo habbo = Emulator.getGameEnvironment().getHabboManager().getHabbo(habboInfo.getId()); Habbo habbo = Emulator.getGameEnvironment().getHabboManager().getHabbo(habboInfo.getId());
if (habbo != null) { if (habbo != null) {
habbo.getClient().sendResponse(new InventoryRefreshComposer()); habbo.getClient().sendResponse(new FurniListInvalidateComposer());
THashMap<String, String> keys = new THashMap<>(); THashMap<String, String> keys = new THashMap<>();
keys.put("display", "BUBBLE"); keys.put("display", "BUBBLE");

4
src/main/java/com/eu/habbo/habbohotel/commands/MassGiftCommand.java
View File

@ -9,7 +9,7 @@ import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer;
import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys;
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
import gnu.trove.map.hash.THashMap; import gnu.trove.map.hash.THashMap;
import java.util.Map; import java.util.Map;
@ -72,7 +72,7 @@ public class MassGiftCommand extends Command {
Emulator.getGameEnvironment().getItemManager().createGift(habbo.getHabboInfo().getUsername(), giftItem, extraData, 0, 0); Emulator.getGameEnvironment().getItemManager().createGift(habbo.getHabboInfo().getUsername(), giftItem, extraData, 0, 0);
habbo.getClient().sendResponse(new InventoryRefreshComposer()); habbo.getClient().sendResponse(new FurniListInvalidateComposer());
habbo.getClient().sendResponse(giftNotificiationMessage); habbo.getClient().sendResponse(giftNotificiationMessage);
} }
}); });

4
src/main/java/com/eu/habbo/habbohotel/commands/RedeemCommand.java
View File

@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.gameclients.GameClient;
import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles; import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles;
import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
import com.eu.habbo.threading.runnables.QueryDeleteHabboItems; import com.eu.habbo.threading.runnables.QueryDeleteHabboItems;
import gnu.trove.map.TIntIntMap; import gnu.trove.map.TIntIntMap;
import gnu.trove.map.hash.TIntIntHashMap; import gnu.trove.map.hash.TIntIntHashMap;
@ -74,7 +74,7 @@ public class RedeemCommand extends Command {
Emulator.getThreading().run(new QueryDeleteHabboItems(deleted)); Emulator.getThreading().run(new QueryDeleteHabboItems(deleted));
gameClient.sendResponse(new InventoryRefreshComposer()); gameClient.sendResponse(new FurniListInvalidateComposer());
gameClient.getHabbo().giveCredits(credits); gameClient.getHabbo().giveCredits(credits);
gameClient.getHabbo().givePixels(pixels); gameClient.getHabbo().givePixels(pixels);

4
src/main/java/com/eu/habbo/habbohotel/commands/RoomGiftCommand.java
View File

@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.items.Item;
import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles; import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles;
import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
import com.eu.habbo.messages.outgoing.wired.WiredRewardAlertComposer; import com.eu.habbo.messages.outgoing.wired.WiredRewardAlertComposer;
public class RoomGiftCommand extends Command { public class RoomGiftCommand extends Command {
@ -58,7 +58,7 @@ public class RoomGiftCommand extends Command {
Emulator.getGameEnvironment().getItemManager().createGift(habbo.getHabboInfo().getUsername(), giftItem, extraData, 0, 0); Emulator.getGameEnvironment().getItemManager().createGift(habbo.getHabboInfo().getUsername(), giftItem, extraData, 0, 0);
habbo.getClient().sendResponse(new InventoryRefreshComposer()); habbo.getClient().sendResponse(new FurniListInvalidateComposer());
habbo.getClient().sendResponse(new WiredRewardAlertComposer(WiredRewardAlertComposer.REWARD_RECEIVED_ITEM)); habbo.getClient().sendResponse(new WiredRewardAlertComposer(WiredRewardAlertComposer.REWARD_RECEIVED_ITEM));
} }

6
src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionLoveLock.java
View File

@ -10,7 +10,7 @@ import com.eu.habbo.habbohotel.rooms.RoomUnit;
import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.rooms.items.lovelock.LoveLockFurniStartComposer; import com.eu.habbo.messages.outgoing.rooms.items.lovelock.FriendFurniStartConfirmationMessageComposer;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
@ -80,14 +80,14 @@ public class InteractionLoveLock extends HabboItem {
if (RoomLayout.tilesAdjecent(client.getHabbo().getRoomUnit().getCurrentLocation(), room.getLayout().getTile(this.getX(), this.getY()))) { if (RoomLayout.tilesAdjecent(client.getHabbo().getRoomUnit().getCurrentLocation(), room.getLayout().getTile(this.getX(), this.getY()))) {
if (this.userOneId == 0) { if (this.userOneId == 0) {
this.userOneId = client.getHabbo().getHabboInfo().getId(); this.userOneId = client.getHabbo().getHabboInfo().getId();
client.sendResponse(new LoveLockFurniStartComposer(this)); client.sendResponse(new FriendFurniStartConfirmationMessageComposer(this));
} else { } else {
if (this.userOneId != client.getHabbo().getHabboInfo().getId()) { if (this.userOneId != client.getHabbo().getHabboInfo().getId()) {
Habbo habbo = room.getHabbo(this.userOneId); Habbo habbo = room.getHabbo(this.userOneId);
if (habbo != null) { if (habbo != null) {
this.userTwoId = client.getHabbo().getHabboInfo().getId(); this.userTwoId = client.getHabbo().getHabboInfo().getId();
client.sendResponse(new LoveLockFurniStartComposer(this)); client.sendResponse(new FriendFurniStartConfirmationMessageComposer(this));
} }
} }
} }

8
src/main/java/com/eu/habbo/habbohotel/items/interactions/games/football/InteractionFootballGate.java
View File

@ -10,7 +10,7 @@ import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.habbohotel.users.clothingvalidation.ClothingValidationManager; import com.eu.habbo.habbohotel.users.clothingvalidation.ClothingValidationManager;
import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.rooms.users.RoomUserDataComposer; import com.eu.habbo.messages.outgoing.rooms.users.RoomUserDataComposer;
import com.eu.habbo.messages.outgoing.users.UpdateUserLookComposer; import com.eu.habbo.messages.outgoing.users.FigureUpdateComposer;
import com.eu.habbo.plugin.EventHandler; import com.eu.habbo.plugin.EventHandler;
import com.eu.habbo.plugin.events.users.UserDisconnectEvent; import com.eu.habbo.plugin.events.users.UserDisconnectEvent;
import com.eu.habbo.plugin.events.users.UserExitRoomEvent; import com.eu.habbo.plugin.events.users.UserExitRoomEvent;
@ -66,7 +66,7 @@ public class InteractionFootballGate extends HabboItem {
if (habbo.getHabboStats().cache.containsKey(CACHE_KEY)) { if (habbo.getHabboStats().cache.containsKey(CACHE_KEY)) {
habbo.getHabboInfo().setLook((String) habbo.getHabboStats().cache.get(CACHE_KEY)); habbo.getHabboInfo().setLook((String) habbo.getHabboStats().cache.get(CACHE_KEY));
habbo.getHabboStats().cache.remove(CACHE_KEY); habbo.getHabboStats().cache.remove(CACHE_KEY);
habbo.getClient().sendResponse(new UpdateUserLookComposer(habbo)); habbo.getClient().sendResponse(new FigureUpdateComposer(habbo));
if (habbo.getHabboInfo().getCurrentRoom() != null) { if (habbo.getHabboInfo().getCurrentRoom() != null) {
habbo.getHabboInfo().getCurrentRoom().sendComposer(new RoomUserDataComposer(habbo).compose()); habbo.getHabboInfo().getCurrentRoom().sendComposer(new RoomUserDataComposer(habbo).compose());
} }
@ -123,7 +123,7 @@ public class InteractionFootballGate extends HabboItem {
if (!lookEvent.isCancelled()) { if (!lookEvent.isCancelled()) {
habbo.getHabboInfo().setLook(ClothingValidationManager.VALIDATE_ON_FBALLGATE ? ClothingValidationManager.validateLook(habbo, lookEvent.newLook, lookEvent.gender.name()) : lookEvent.newLook); habbo.getHabboInfo().setLook(ClothingValidationManager.VALIDATE_ON_FBALLGATE ? ClothingValidationManager.validateLook(habbo, lookEvent.newLook, lookEvent.gender.name()) : lookEvent.newLook);
Emulator.getThreading().run(habbo.getHabboInfo()); Emulator.getThreading().run(habbo.getHabboInfo());
habbo.getClient().sendResponse(new UpdateUserLookComposer(habbo)); habbo.getClient().sendResponse(new FigureUpdateComposer(habbo));
room.sendComposer(new RoomUserDataComposer(habbo).compose()); room.sendComposer(new RoomUserDataComposer(habbo).compose());
} }
@ -137,7 +137,7 @@ public class InteractionFootballGate extends HabboItem {
habbo.getHabboStats().cache.put(CACHE_KEY, habbo.getHabboInfo().getLook()); habbo.getHabboStats().cache.put(CACHE_KEY, habbo.getHabboInfo().getLook());
habbo.getHabboInfo().setLook(ClothingValidationManager.VALIDATE_ON_FBALLGATE ? ClothingValidationManager.validateLook(habbo, lookEvent.newLook, lookEvent.gender.name()) : lookEvent.newLook); habbo.getHabboInfo().setLook(ClothingValidationManager.VALIDATE_ON_FBALLGATE ? ClothingValidationManager.validateLook(habbo, lookEvent.newLook, lookEvent.gender.name()) : lookEvent.newLook);
Emulator.getThreading().run(habbo.getHabboInfo()); Emulator.getThreading().run(habbo.getHabboInfo());
habbo.getClient().sendResponse(new UpdateUserLookComposer(habbo)); habbo.getClient().sendResponse(new FigureUpdateComposer(habbo));
room.sendComposer(new RoomUserDataComposer(habbo).compose()); room.sendComposer(new RoomUserDataComposer(habbo).compose());
} }
} }

6
src/main/java/com/eu/habbo/habbohotel/pets/MonsterplantPet.java
View File

@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer;
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; 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.PetStatusUpdateComposer;
import com.eu.habbo.messages.outgoing.rooms.pets.RoomPetRespectComposer; import com.eu.habbo.messages.outgoing.rooms.pets.RoomPetRespectComposer;
import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer;
@ -339,7 +339,7 @@ public class MonsterplantPet extends Pet implements IPetLook {
seed = Emulator.getGameEnvironment().getItemManager().createItem(ownerOne.getHabboInfo().getId(), seedBase, 0, 0, ""); seed = Emulator.getGameEnvironment().getItemManager().createItem(ownerOne.getHabboInfo().getId(), seedBase, 0, 0, "");
ownerOne.getInventory().getItemsComponent().addItem(seed); ownerOne.getInventory().getItemsComponent().addItem(seed);
ownerOne.getClient().sendResponse(new AddHabboItemComposer(seed)); ownerOne.getClient().sendResponse(new AddHabboItemComposer(seed));
ownerOne.getClient().sendResponse(new InventoryRefreshComposer()); ownerOne.getClient().sendResponse(new FurniListInvalidateComposer());
} }
if (ownerTwo != null) { if (ownerTwo != null) {
@ -347,7 +347,7 @@ public class MonsterplantPet extends Pet implements IPetLook {
seed = Emulator.getGameEnvironment().getItemManager().createItem(ownerTwo.getHabboInfo().getId(), seedBase, 0, 0, ""); seed = Emulator.getGameEnvironment().getItemManager().createItem(ownerTwo.getHabboInfo().getId(), seedBase, 0, 0, "");
ownerTwo.getInventory().getItemsComponent().addItem(seed); ownerTwo.getInventory().getItemsComponent().addItem(seed);
ownerTwo.getClient().sendResponse(new AddHabboItemComposer(seed)); ownerTwo.getClient().sendResponse(new AddHabboItemComposer(seed));
ownerTwo.getClient().sendResponse(new InventoryRefreshComposer()); ownerTwo.getClient().sendResponse(new FurniListInvalidateComposer());
} }
} }
} }

16
src/main/java/com/eu/habbo/habbohotel/rooms/Room.java
View File

@ -42,7 +42,7 @@ import com.eu.habbo.messages.outgoing.guilds.GuildInfoComposer;
import com.eu.habbo.messages.outgoing.hotelview.CloseConnectionMessageComposer; import com.eu.habbo.messages.outgoing.hotelview.CloseConnectionMessageComposer;
import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer;
import com.eu.habbo.messages.outgoing.inventory.AddPetComposer; import com.eu.habbo.messages.outgoing.inventory.AddPetComposer;
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
import com.eu.habbo.messages.outgoing.polls.infobus.SimplePollAnswerComposer; import com.eu.habbo.messages.outgoing.polls.infobus.SimplePollAnswerComposer;
import com.eu.habbo.messages.outgoing.polls.infobus.SimplePollStartComposer; import com.eu.habbo.messages.outgoing.polls.infobus.SimplePollStartComposer;
import com.eu.habbo.messages.outgoing.rooms.*; import com.eu.habbo.messages.outgoing.rooms.*;
@ -707,7 +707,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
if (habbo != null) { if (habbo != null) {
habbo.getInventory().getItemsComponent().addItem(item); habbo.getInventory().getItemsComponent().addItem(item);
habbo.getClient().sendResponse(new AddHabboItemComposer(item)); habbo.getClient().sendResponse(new AddHabboItemComposer(item));
habbo.getClient().sendResponse(new InventoryRefreshComposer()); habbo.getClient().sendResponse(new FurniListInvalidateComposer());
} }
Emulator.getThreading().run(item); Emulator.getThreading().run(item);
} }
@ -1600,7 +1600,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
public boolean execute(int a, Habbo b) { public boolean execute(int a, Habbo b) {
if (b.isOnline()) { if (b.isOnline()) {
if (b.getHabboInfo().getRoomQueueId() == Room.this.getId()) { if (b.getHabboInfo().getRoomQueueId() == Room.this.getId()) {
b.getClient().sendResponse(new RoomAccessDeniedComposer("")); b.getClient().sendResponse(new FlatAccessDeniedMessageComposer(""));
} }
} }
@ -2275,7 +2275,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
public boolean removeFromQueue(Habbo habbo) { public boolean removeFromQueue(Habbo habbo) {
try { try {
this.sendComposer(new HideDoorbellComposer(habbo.getHabboInfo().getUsername()).compose()); this.sendComposer(new FlatAccessibleMessageComposer(habbo.getHabboInfo().getUsername()).compose());
synchronized (this.habboQueue) { synchronized (this.habboQueue) {
return this.habboQueue.remove(habbo.getHabboInfo().getId()) != null; return this.habboQueue.remove(habbo.getHabboInfo().getId()) != null;
@ -3942,7 +3942,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
if (habbo != null) { if (habbo != null) {
this.refreshRightsForHabbo(habbo); this.refreshRightsForHabbo(habbo);
this.sendComposer(new RoomAddRightsListComposer(this, habbo.getHabboInfo().getId(), habbo.getHabboInfo().getUsername()).compose()); this.sendComposer(new FlatControllerAddedComposer(this, habbo.getHabboInfo().getId(), habbo.getHabboInfo().getUsername()).compose());
} else { } else {
Habbo owner = Emulator.getGameEnvironment().getHabboManager().getHabbo(this.ownerId); Habbo owner = Emulator.getGameEnvironment().getHabboManager().getHabbo(this.ownerId);
@ -3950,7 +3950,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
MessengerBuddy buddy = owner.getMessenger().getFriend(userId); MessengerBuddy buddy = owner.getMessenger().getFriend(userId);
if (buddy != null) { if (buddy != null) {
this.sendComposer(new RoomAddRightsListComposer(this, userId, buddy.getUsername()).compose()); this.sendComposer(new FlatControllerAddedComposer(this, userId, buddy.getUsername()).compose());
} }
} }
} }
@ -3962,7 +3962,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
if (Emulator.getPluginManager().fireEvent(new UserRightsTakenEvent(this.getHabbo(this.getOwnerId()), userId, habbo)).isCancelled()) if (Emulator.getPluginManager().fireEvent(new UserRightsTakenEvent(this.getHabbo(this.getOwnerId()), userId, habbo)).isCancelled())
return; return;
this.sendComposer(new RoomRemoveRightsListComposer(this, userId).compose()); this.sendComposer(new FlatControllerRemovedComposer(this, userId).compose());
if (this.rights.remove(userId)) { if (this.rights.remove(userId)) {
try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("DELETE FROM room_rights WHERE room_id = ? AND user_id = ?")) { try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("DELETE FROM room_rights WHERE room_id = ? AND user_id = ?")) {
@ -4037,7 +4037,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
habbo.getRoomUnit().statusUpdate(true); habbo.getRoomUnit().statusUpdate(true);
if (flatCtrl.equals(RoomRightLevels.MODERATOR)) { if (flatCtrl.equals(RoomRightLevels.MODERATOR)) {
habbo.getClient().sendResponse(new RoomRightsListComposer(this)); habbo.getClient().sendResponse(new FlatControllersComposer(this));
} }
} }

6
src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java
View File

@ -547,7 +547,7 @@ public class RoomManager {
} }
if (!rightsFound) { if (!rightsFound) {
habbo.getClient().sendResponse(new RoomAccessDeniedComposer("")); habbo.getClient().sendResponse(new FlatAccessDeniedMessageComposer(""));
habbo.getClient().sendResponse(new CloseConnectionMessageComposer()); habbo.getClient().sendResponse(new CloseConnectionMessageComposer());
habbo.getHabboInfo().setLoadingRoom(0); habbo.getHabboInfo().setLoadingRoom(0);
return; return;
@ -587,7 +587,7 @@ public class RoomManager {
} }
habbo.getHabboInfo().setRoomQueueId(0); habbo.getHabboInfo().setRoomQueueId(0);
habbo.getClient().sendResponse(new HideDoorbellComposer("")); habbo.getClient().sendResponse(new FlatAccessibleMessageComposer(""));
if (habbo.getRoomUnit() != null) { if (habbo.getRoomUnit() != null) {
RoomUnit existingRoom = habbo.getRoomUnit(); RoomUnit existingRoom = habbo.getRoomUnit();
@ -828,7 +828,7 @@ public class RoomManager {
if (!habbo.getHabboStats().allowTalk()) { if (!habbo.getHabboStats().allowTalk()) {
habbo.getHabboStats().mutedBubbleTracker = true; habbo.getHabboStats().mutedBubbleTracker = true;
int remainingMuteTime = habbo.getHabboStats().remainingMuteTime(); int remainingMuteTime = habbo.getHabboStats().remainingMuteTime();
habbo.getClient().sendResponse(new FloodCounterComposer(remainingMuteTime)); habbo.getClient().sendResponse(new FloodControlMessageComposer(remainingMuteTime));
habbo.getClient().sendResponse(new MutedWhisperComposer(remainingMuteTime)); habbo.getClient().sendResponse(new MutedWhisperComposer(remainingMuteTime));
room.sendComposer(new RoomUserIgnoredComposer(habbo, RoomUserIgnoredComposer.MUTED).compose()); room.sendComposer(new RoomUserIgnoredComposer(habbo, RoomUserIgnoredComposer.MUTED).compose());
} else if (habbo.getHabboStats().mutedBubbleTracker) { } else if (habbo.getHabboStats().mutedBubbleTracker) {

7
src/main/java/com/eu/habbo/habbohotel/rooms/RoomTrade.java
View File

@ -5,10 +5,9 @@ import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.MessageComposer;
import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer;
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; 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.RoomUserStatusComposer;
import com.eu.habbo.messages.outgoing.trading.*; import com.eu.habbo.messages.outgoing.trading.*;
import com.eu.habbo.plugin.events.furniture.FurnitureRedeemedEvent;
import com.eu.habbo.plugin.events.trading.TradeConfirmEvent; import com.eu.habbo.plugin.events.trading.TradeConfirmEvent;
import com.eu.habbo.threading.runnables.QueryDeleteHabboItem; import com.eu.habbo.threading.runnables.QueryDeleteHabboItem;
import gnu.trove.set.hash.THashSet; import gnu.trove.set.hash.THashSet;
@ -259,8 +258,8 @@ public class RoomTrade {
userOne.getHabbo().getClient().sendResponse(new AddHabboItemComposer(itemsUserTwo)); userOne.getHabbo().getClient().sendResponse(new AddHabboItemComposer(itemsUserTwo));
userTwo.getHabbo().getClient().sendResponse(new AddHabboItemComposer(itemsUserOne)); userTwo.getHabbo().getClient().sendResponse(new AddHabboItemComposer(itemsUserOne));
userOne.getHabbo().getClient().sendResponse(new InventoryRefreshComposer()); userOne.getHabbo().getClient().sendResponse(new FurniListInvalidateComposer());
userTwo.getHabbo().getClient().sendResponse(new InventoryRefreshComposer()); userTwo.getHabbo().getClient().sendResponse(new FurniListInvalidateComposer());
return true; return true;
} }

10
src/main/java/com/eu/habbo/habbohotel/rooms/TraxManager.java
View File

@ -12,8 +12,8 @@ import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer;
import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer;
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
import com.eu.habbo.messages.outgoing.inventory.RemoveHabboItemComposer; 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.JukeBoxMySongsComposer;
import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxNowPlayingMessageComposer; import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxNowPlayingMessageComposer;
import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxPlayListComposer; import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxPlayListComposer;
@ -275,7 +275,7 @@ public class TraxManager implements Disposable {
Emulator.getThreading().run(musicDisc); Emulator.getThreading().run(musicDisc);
habbo.getInventory().getItemsComponent().removeHabboItem(musicDisc); habbo.getInventory().getItemsComponent().removeHabboItem(musicDisc);
habbo.getClient().sendResponse(new RemoveHabboItemComposer(musicDisc.getGiftAdjustedId())); habbo.getClient().sendResponse(new FurniListRemoveComposer(musicDisc.getGiftAdjustedId()));
} }
this.sendUpdatedSongList(); this.sendUpdatedSongList();
@ -310,7 +310,7 @@ public class TraxManager implements Disposable {
GameClient client = owner.getClient(); GameClient client = owner.getClient();
if (client != null) { if (client != null) {
client.sendResponse(new AddHabboItemComposer(musicDisc)); client.sendResponse(new AddHabboItemComposer(musicDisc));
client.sendResponse(new InventoryRefreshComposer()); client.sendResponse(new FurniListInvalidateComposer());
} }
} }
} }
@ -341,7 +341,7 @@ public class TraxManager implements Disposable {
GameClient client = owner.getClient(); GameClient client = owner.getClient();
if (client != null) { if (client != null) {
client.sendResponse(new AddHabboItemComposer(musicDisc)); client.sendResponse(new AddHabboItemComposer(musicDisc));
client.sendResponse(new InventoryRefreshComposer()); client.sendResponse(new FurniListInvalidateComposer());
} }
} }
} }

12
src/main/java/com/eu/habbo/habbohotel/users/Habbo.java
View File

@ -10,7 +10,7 @@ import com.eu.habbo.habbohotel.rooms.*;
import com.eu.habbo.habbohotel.users.inventory.BadgesComponent; import com.eu.habbo.habbohotel.users.inventory.BadgesComponent;
import com.eu.habbo.messages.outgoing.generic.alerts.*; import com.eu.habbo.messages.outgoing.generic.alerts.*;
import com.eu.habbo.messages.outgoing.inventory.*; import com.eu.habbo.messages.outgoing.inventory.*;
import com.eu.habbo.messages.outgoing.rooms.FloodCounterComposer; import com.eu.habbo.messages.outgoing.rooms.FloodControlMessageComposer;
import com.eu.habbo.messages.outgoing.rooms.ForwardToRoomComposer; import com.eu.habbo.messages.outgoing.rooms.ForwardToRoomComposer;
import com.eu.habbo.messages.outgoing.rooms.users.*; import com.eu.habbo.messages.outgoing.rooms.users.*;
import com.eu.habbo.messages.outgoing.users.*; import com.eu.habbo.messages.outgoing.users.*;
@ -332,20 +332,20 @@ public class Habbo implements Runnable {
public void addFurniture(HabboItem item) { public void addFurniture(HabboItem item) {
this.habboInventory.getItemsComponent().addItem(item); this.habboInventory.getItemsComponent().addItem(item);
this.client.sendResponse(new AddHabboItemComposer(item)); this.client.sendResponse(new AddHabboItemComposer(item));
this.client.sendResponse(new InventoryRefreshComposer()); this.client.sendResponse(new FurniListInvalidateComposer());
} }
public void addFurniture(THashSet<HabboItem> items) { public void addFurniture(THashSet<HabboItem> items) {
this.habboInventory.getItemsComponent().addItems(items); this.habboInventory.getItemsComponent().addItems(items);
this.client.sendResponse(new AddHabboItemComposer(items)); this.client.sendResponse(new AddHabboItemComposer(items));
this.client.sendResponse(new InventoryRefreshComposer()); this.client.sendResponse(new FurniListInvalidateComposer());
} }
public void removeFurniture(HabboItem item) { public void removeFurniture(HabboItem item) {
this.habboInventory.getItemsComponent().removeHabboItem(item); this.habboInventory.getItemsComponent().removeHabboItem(item);
this.client.sendResponse(new RemoveHabboItemComposer(item.getId())); this.client.sendResponse(new FurniListRemoveComposer(item.getId()));
} }
@ -416,7 +416,7 @@ public class Habbo implements Runnable {
if (!this.hasPermission("acc_no_mute")) { if (!this.hasPermission("acc_no_mute")) {
int remaining = this.habboStats.addMuteTime(seconds); int remaining = this.habboStats.addMuteTime(seconds);
this.client.sendResponse(new FloodCounterComposer(remaining)); this.client.sendResponse(new FloodControlMessageComposer(remaining));
this.client.sendResponse(new MutedWhisperComposer(remaining)); this.client.sendResponse(new MutedWhisperComposer(remaining));
Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom();
@ -428,7 +428,7 @@ public class Habbo implements Runnable {
public void unMute() { public void unMute() {
this.habboStats.unMute(); this.habboStats.unMute();
this.client.sendResponse(new FloodCounterComposer(3)); this.client.sendResponse(new FloodControlMessageComposer(3));
Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom();
if (room != null) { if (room != null) {
room.sendComposer(new RoomUserIgnoredComposer(this, RoomUserIgnoredComposer.UNIGNORED).compose()); room.sendComposer(new RoomUserIgnoredComposer(this, RoomUserIgnoredComposer.UNIGNORED).compose());

4
src/main/java/com/eu/habbo/habbohotel/users/HabboItem.java
View File

@ -17,7 +17,7 @@ import com.eu.habbo.habbohotel.wired.WiredTriggerType;
import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.rooms.users.DanceMessageComposer; 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.RoomUserDataComposer;
import com.eu.habbo.messages.outgoing.users.UpdateUserLookComposer; import com.eu.habbo.messages.outgoing.users.FigureUpdateComposer;
import gnu.trove.set.hash.THashSet; import gnu.trove.set.hash.THashSet;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.math3.util.Pair; import org.apache.commons.math3.util.Pair;
@ -320,7 +320,7 @@ public abstract class HabboItem implements Runnable, IEventTriggers {
String[] clothingKeys = Arrays.stream(this.getBaseItem().getClothingOnWalk().split("\\.")).map(k -> k.split("-")[0]).toArray(String[]::new); String[] clothingKeys = Arrays.stream(this.getBaseItem().getClothingOnWalk().split("\\.")).map(k -> k.split("-")[0]).toArray(String[]::new);
habbo.getHabboInfo().setLook(String.join(".", Arrays.stream(habbo.getHabboInfo().getLook().split("\\.")).filter(k -> !ArrayUtils.contains(clothingKeys, k.split("-")[0])).toArray(String[]::new)) + "." + this.getBaseItem().getClothingOnWalk()); habbo.getHabboInfo().setLook(String.join(".", Arrays.stream(habbo.getHabboInfo().getLook().split("\\.")).filter(k -> !ArrayUtils.contains(clothingKeys, k.split("-")[0])).toArray(String[]::new)) + "." + this.getBaseItem().getClothingOnWalk());
habbo.getClient().sendResponse(new UpdateUserLookComposer(habbo)); habbo.getClient().sendResponse(new FigureUpdateComposer(habbo));
if (habbo.getHabboInfo().getCurrentRoom() != null) { if (habbo.getHabboInfo().getCurrentRoom() != null) {
habbo.getHabboInfo().getCurrentRoom().sendComposer(new RoomUserDataComposer(habbo).compose()); habbo.getHabboInfo().getCurrentRoom().sendComposer(new RoomUserDataComposer(habbo).compose());
} }

2
src/main/java/com/eu/habbo/habbohotel/users/subscriptions/SubscriptionHabboClub.java
View File

@ -161,7 +161,7 @@ public class SubscriptionHabboClub extends Subscription {
Emulator.getThreading().run(habbo.getHabboInfo()); Emulator.getThreading().run(habbo.getHabboInfo());
if (habbo.getClient() != null) { if (habbo.getClient() != null) {
habbo.getClient().sendResponse(new UpdateUserLookComposer(habbo)); habbo.getClient().sendResponse(new FigureUpdateComposer(habbo));
} }
if (habbo.getHabboInfo().getCurrentRoom() != null) { if (habbo.getHabboInfo().getCurrentRoom() != null) {

4
src/main/java/com/eu/habbo/habbohotel/wired/WiredHandler.java
View File

@ -20,7 +20,7 @@ import com.eu.habbo.habbohotel.users.HabboBadge;
import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.messages.outgoing.catalog.PurchaseOKComposer; import com.eu.habbo.messages.outgoing.catalog.PurchaseOKComposer;
import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer;
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
import com.eu.habbo.messages.outgoing.users.BadgeReceivedComposer; import com.eu.habbo.messages.outgoing.users.BadgeReceivedComposer;
import com.eu.habbo.messages.outgoing.wired.WiredRewardAlertComposer; import com.eu.habbo.messages.outgoing.wired.WiredRewardAlertComposer;
import com.eu.habbo.plugin.events.furniture.wired.WiredConditionFailedEvent; import com.eu.habbo.plugin.events.furniture.wired.WiredConditionFailedEvent;
@ -351,7 +351,7 @@ public class WiredHandler {
habbo.getClient().sendResponse(new AddHabboItemComposer(item)); habbo.getClient().sendResponse(new AddHabboItemComposer(item));
habbo.getClient().getHabbo().getInventory().getItemsComponent().addItem(item); habbo.getClient().getHabbo().getInventory().getItemsComponent().addItem(item);
habbo.getClient().sendResponse(new PurchaseOKComposer(null)); habbo.getClient().sendResponse(new PurchaseOKComposer(null));
habbo.getClient().sendResponse(new InventoryRefreshComposer()); habbo.getClient().sendResponse(new FurniListInvalidateComposer());
habbo.getClient().sendResponse(new WiredRewardAlertComposer(WiredRewardAlertComposer.REWARD_RECEIVED_ITEM)); habbo.getClient().sendResponse(new WiredRewardAlertComposer(WiredRewardAlertComposer.REWARD_RECEIVED_ITEM));
} }
} }

4
src/main/java/com/eu/habbo/messages/incoming/camera/CameraPurchaseEvent.java
View File

@ -7,7 +7,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.camera.CameraPurchaseOKMessageComposer; import com.eu.habbo.messages.outgoing.camera.CameraPurchaseOKMessageComposer;
import com.eu.habbo.messages.outgoing.catalog.NotEnoughPointsTypeComposer; import com.eu.habbo.messages.outgoing.catalog.NotEnoughPointsTypeComposer;
import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer;
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
import com.eu.habbo.plugin.events.users.UserPurchasePictureEvent; import com.eu.habbo.plugin.events.users.UserPurchasePictureEvent;
public class CameraPurchaseEvent extends MessageHandler { public class CameraPurchaseEvent extends MessageHandler {
@ -46,7 +46,7 @@ public class CameraPurchaseEvent extends MessageHandler {
this.client.sendResponse(new CameraPurchaseOKMessageComposer()); this.client.sendResponse(new CameraPurchaseOKMessageComposer());
this.client.sendResponse(new AddHabboItemComposer(photoItem)); this.client.sendResponse(new AddHabboItemComposer(photoItem));
this.client.sendResponse(new InventoryRefreshComposer()); this.client.sendResponse(new FurniListInvalidateComposer());
this.client.getHabbo().giveCredits(-CameraPurchaseEvent.CAMERA_PURCHASE_CREDITS); this.client.getHabbo().giveCredits(-CameraPurchaseEvent.CAMERA_PURCHASE_CREDITS);
this.client.getHabbo().givePoints(CameraPurchaseEvent.CAMERA_PURCHASE_POINTS_TYPE, -CameraPurchaseEvent.CAMERA_PURCHASE_POINTS); this.client.getHabbo().givePoints(CameraPurchaseEvent.CAMERA_PURCHASE_POINTS_TYPE, -CameraPurchaseEvent.CAMERA_PURCHASE_POINTS);

4
src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyClubDiscountEvent.java
View File

@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.users.subscriptions.SubscriptionHabboClub;
import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.catalog.AlertPurchaseFailedComposer; import com.eu.habbo.messages.outgoing.catalog.AlertPurchaseFailedComposer;
import com.eu.habbo.messages.outgoing.catalog.PurchaseOKComposer; import com.eu.habbo.messages.outgoing.catalog.PurchaseOKComposer;
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
import com.eu.habbo.messages.outgoing.users.CreditBalanceComposer; import com.eu.habbo.messages.outgoing.users.CreditBalanceComposer;
import com.eu.habbo.messages.outgoing.users.ActivityPointsMessageComposer; import com.eu.habbo.messages.outgoing.users.ActivityPointsMessageComposer;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -74,7 +74,7 @@ public class CatalogBuyClubDiscountEvent extends MessageHandler {
this.client.sendResponse(new ActivityPointsMessageComposer(this.client.getHabbo())); this.client.sendResponse(new ActivityPointsMessageComposer(this.client.getHabbo()));
this.client.sendResponse(new PurchaseOKComposer(null)); this.client.sendResponse(new PurchaseOKComposer(null));
this.client.sendResponse(new InventoryRefreshComposer()); this.client.sendResponse(new FurniListInvalidateComposer());
this.client.getHabbo().getHabboStats().run(); this.client.getHabbo().getHabboStats().run();
} }

4
src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemAsGiftEvent.java
View File

@ -21,7 +21,7 @@ import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys;
import com.eu.habbo.messages.outgoing.generic.alerts.GenericAlertComposer; import com.eu.habbo.messages.outgoing.generic.alerts.GenericAlertComposer;
import com.eu.habbo.messages.outgoing.generic.alerts.HotelWillCloseInMinutesComposer; import com.eu.habbo.messages.outgoing.generic.alerts.HotelWillCloseInMinutesComposer;
import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer;
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
import com.eu.habbo.messages.outgoing.users.UserPointsComposer; import com.eu.habbo.messages.outgoing.users.UserPointsComposer;
import com.eu.habbo.threading.runnables.ShutdownEmulator; import com.eu.habbo.threading.runnables.ShutdownEmulator;
import gnu.trove.map.hash.THashMap; import gnu.trove.map.hash.THashMap;
@ -336,7 +336,7 @@ public class CatalogBuyItemAsGiftEvent extends MessageHandler {
if (habbo != null) { if (habbo != null) {
habbo.getClient().sendResponse(new AddHabboItemComposer(gift)); habbo.getClient().sendResponse(new AddHabboItemComposer(gift));
habbo.getClient().getHabbo().getInventory().getItemsComponent().addItem(gift); habbo.getClient().getHabbo().getInventory().getItemsComponent().addItem(gift);
habbo.getClient().sendResponse(new InventoryRefreshComposer()); habbo.getClient().sendResponse(new FurniListInvalidateComposer());
THashMap<String, String> keys = new THashMap<>(); THashMap<String, String> keys = new THashMap<>();
keys.put("display", "BUBBLE"); keys.put("display", "BUBBLE");
keys.put("image", "${image.library.url}notifications/gift.gif"); keys.put("image", "${image.library.url}notifications/gift.gif");

4
src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemEvent.java
View File

@ -18,7 +18,7 @@ import com.eu.habbo.messages.outgoing.catalog.PurchaseOKComposer;
import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer;
import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys;
import com.eu.habbo.messages.outgoing.generic.alerts.HotelWillCloseInMinutesComposer; import com.eu.habbo.messages.outgoing.generic.alerts.HotelWillCloseInMinutesComposer;
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
import com.eu.habbo.messages.outgoing.navigator.CanCreateRoomComposer; import com.eu.habbo.messages.outgoing.navigator.CanCreateRoomComposer;
import com.eu.habbo.messages.outgoing.users.*; import com.eu.habbo.messages.outgoing.users.*;
import com.eu.habbo.threading.runnables.ShutdownEmulator; import com.eu.habbo.threading.runnables.ShutdownEmulator;
@ -202,7 +202,7 @@ public class CatalogBuyItemEvent extends MessageHandler {
this.client.sendResponse(new ActivityPointsMessageComposer(this.client.getHabbo())); this.client.sendResponse(new ActivityPointsMessageComposer(this.client.getHabbo()));
this.client.sendResponse(new PurchaseOKComposer(null)); this.client.sendResponse(new PurchaseOKComposer(null));
this.client.sendResponse(new InventoryRefreshComposer()); this.client.sendResponse(new FurniListInvalidateComposer());
this.client.getHabbo().getHabboStats().run(); this.client.getHabbo().getHabboStats().run();
} }

4
src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/OpenRecycleBoxEvent.java
View File

@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.rooms.*;
import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer;
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
import com.eu.habbo.messages.outgoing.rooms.UpdateStackHeightComposer; import com.eu.habbo.messages.outgoing.rooms.UpdateStackHeightComposer;
import com.eu.habbo.messages.outgoing.rooms.items.PresentItemOpenedComposer; import com.eu.habbo.messages.outgoing.rooms.items.PresentItemOpenedComposer;
import com.eu.habbo.messages.outgoing.rooms.items.RemoveFloorItemComposer; import com.eu.habbo.messages.outgoing.rooms.items.RemoveFloorItemComposer;
@ -44,7 +44,7 @@ public class OpenRecycleBoxEvent extends MessageHandler {
if (reward != null) { if (reward != null) {
this.client.getHabbo().getInventory().getItemsComponent().addItem(reward); this.client.getHabbo().getInventory().getItemsComponent().addItem(reward);
this.client.sendResponse(new AddHabboItemComposer(reward)); this.client.sendResponse(new AddHabboItemComposer(reward));
this.client.sendResponse(new InventoryRefreshComposer()); this.client.sendResponse(new FurniListInvalidateComposer());
this.client.sendResponse(new PresentItemOpenedComposer(reward, item.getExtradata(), true)); this.client.sendResponse(new PresentItemOpenedComposer(reward, item.getExtradata(), true));
} }

8
src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/RecycleEvent.java
View File

@ -9,8 +9,8 @@ import com.eu.habbo.messages.outgoing.catalog.AlertPurchaseFailedComposer;
import com.eu.habbo.messages.outgoing.catalog.RecyclerCompleteComposer; import com.eu.habbo.messages.outgoing.catalog.RecyclerCompleteComposer;
import com.eu.habbo.messages.outgoing.generic.alerts.HotelWillCloseInMinutesComposer; import com.eu.habbo.messages.outgoing.generic.alerts.HotelWillCloseInMinutesComposer;
import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer;
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
import com.eu.habbo.messages.outgoing.inventory.RemoveHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListRemoveComposer;
import com.eu.habbo.threading.runnables.QueryDeleteHabboItem; import com.eu.habbo.threading.runnables.QueryDeleteHabboItem;
import com.eu.habbo.threading.runnables.ShutdownEmulator; import com.eu.habbo.threading.runnables.ShutdownEmulator;
import gnu.trove.set.hash.THashSet; import gnu.trove.set.hash.THashSet;
@ -43,7 +43,7 @@ public class RecycleEvent extends MessageHandler {
if (items.size() == count) { if (items.size() == count) {
for (HabboItem item : items) { for (HabboItem item : items) {
this.client.getHabbo().getInventory().getItemsComponent().removeHabboItem(item); this.client.getHabbo().getInventory().getItemsComponent().removeHabboItem(item);
this.client.sendResponse(new RemoveHabboItemComposer(item.getGiftAdjustedId())); this.client.sendResponse(new FurniListRemoveComposer(item.getGiftAdjustedId()));
Emulator.getThreading().run(new QueryDeleteHabboItem(item.getId())); Emulator.getThreading().run(new QueryDeleteHabboItem(item.getId()));
} }
} else { } else {
@ -60,7 +60,7 @@ public class RecycleEvent extends MessageHandler {
this.client.sendResponse(new AddHabboItemComposer(reward)); this.client.sendResponse(new AddHabboItemComposer(reward));
this.client.getHabbo().getInventory().getItemsComponent().addItem(reward); this.client.getHabbo().getInventory().getItemsComponent().addItem(reward);
this.client.sendResponse(new RecyclerCompleteComposer(RecyclerCompleteComposer.RECYCLING_COMPLETE)); this.client.sendResponse(new RecyclerCompleteComposer(RecyclerCompleteComposer.RECYCLING_COMPLETE));
this.client.sendResponse(new InventoryRefreshComposer()); this.client.sendResponse(new FurniListInvalidateComposer());
AchievementManager.progressAchievement(this.client.getHabbo(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("FurnimaticQuest")); AchievementManager.progressAchievement(this.client.getHabbo(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("FurnimaticQuest"));
} else { } else {

9
src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingCraftItemEvent.java
View File

@ -10,11 +10,10 @@ import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.catalog.AlertLimitedSoldOutComposer; import com.eu.habbo.messages.outgoing.catalog.AlertLimitedSoldOutComposer;
import com.eu.habbo.messages.outgoing.crafting.CraftingResultComposer; import com.eu.habbo.messages.outgoing.crafting.CraftingResultComposer;
import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer;
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
import com.eu.habbo.messages.outgoing.inventory.RemoveHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListRemoveComposer;
import com.eu.habbo.threading.runnables.QueryDeleteHabboItems; import com.eu.habbo.threading.runnables.QueryDeleteHabboItems;
import gnu.trove.map.hash.TIntObjectHashMap; import gnu.trove.map.hash.TIntObjectHashMap;
import gnu.trove.procedure.TObjectProcedure;
import java.util.Map; import java.util.Map;
@ -62,10 +61,10 @@ public class CraftingCraftItemEvent extends MessageHandler {
this.client.sendResponse(new AddHabboItemComposer(rewardItem)); this.client.sendResponse(new AddHabboItemComposer(rewardItem));
AchievementManager.progressAchievement(this.client.getHabbo(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("Atcg")); AchievementManager.progressAchievement(this.client.getHabbo(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("Atcg"));
toRemove.forEachValue(object -> { toRemove.forEachValue(object -> {
CraftingCraftItemEvent.this.client.sendResponse(new RemoveHabboItemComposer(object.getGiftAdjustedId())); CraftingCraftItemEvent.this.client.sendResponse(new FurniListRemoveComposer(object.getGiftAdjustedId()));
return true; return true;
}); });
this.client.sendResponse(new InventoryRefreshComposer()); this.client.sendResponse(new FurniListInvalidateComposer());
Emulator.getThreading().run(new QueryDeleteHabboItems(toRemove)); Emulator.getThreading().run(new QueryDeleteHabboItems(toRemove));
return; return;

8
src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingCraftSecretEvent.java
View File

@ -10,8 +10,8 @@ import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.catalog.AlertLimitedSoldOutComposer; import com.eu.habbo.messages.outgoing.catalog.AlertLimitedSoldOutComposer;
import com.eu.habbo.messages.outgoing.crafting.CraftingResultComposer; import com.eu.habbo.messages.outgoing.crafting.CraftingResultComposer;
import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer;
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
import com.eu.habbo.messages.outgoing.inventory.RemoveHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListRemoveComposer;
import com.eu.habbo.threading.runnables.QueryDeleteHabboItem; import com.eu.habbo.threading.runnables.QueryDeleteHabboItem;
import gnu.trove.map.hash.THashMap; import gnu.trove.map.hash.THashMap;
import gnu.trove.set.hash.THashSet; import gnu.trove.set.hash.THashSet;
@ -79,10 +79,10 @@ public class CraftingCraftSecretEvent extends MessageHandler {
this.client.sendResponse(new AddHabboItemComposer(rewardItem)); this.client.sendResponse(new AddHabboItemComposer(rewardItem));
for (HabboItem item : habboItems) { for (HabboItem item : habboItems) {
this.client.getHabbo().getInventory().getItemsComponent().removeHabboItem(item); this.client.getHabbo().getInventory().getItemsComponent().removeHabboItem(item);
this.client.sendResponse(new RemoveHabboItemComposer(item.getGiftAdjustedId())); this.client.sendResponse(new FurniListRemoveComposer(item.getGiftAdjustedId()));
Emulator.getThreading().run(new QueryDeleteHabboItem(item.getId())); Emulator.getThreading().run(new QueryDeleteHabboItem(item.getId()));
} }
this.client.sendResponse(new InventoryRefreshComposer()); this.client.sendResponse(new FurniListInvalidateComposer());
return; return;
} }

4
src/main/java/com/eu/habbo/messages/incoming/friends/FindNewFriendsEvent.java
View File

@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.Room;
import com.eu.habbo.habbohotel.rooms.RoomCategory; import com.eu.habbo.habbohotel.rooms.RoomCategory;
import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.friends.FriendFindingRoomComposer; import com.eu.habbo.messages.outgoing.friends.FindFriendsProcessResultComposer;
import com.eu.habbo.messages.outgoing.rooms.ForwardToRoomComposer; import com.eu.habbo.messages.outgoing.rooms.ForwardToRoomComposer;
import java.util.Collections; import java.util.Collections;
@ -29,6 +29,6 @@ public class FindNewFriendsEvent extends MessageHandler {
} }
} }
this.client.sendResponse(new FriendFindingRoomComposer(FriendFindingRoomComposer.NO_ROOM_FOUND)); this.client.sendResponse(new FindFriendsProcessResultComposer(FindFriendsProcessResultComposer.NO_ROOM_FOUND));
} }
} }

4
src/main/java/com/eu/habbo/messages/incoming/friends/RequestFriendRequestsEvent.java
View File

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

4
src/main/java/com/eu/habbo/messages/incoming/friends/RequestInitFriendsEvent.java
View File

@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.friends;
import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.friends.FriendsComposer; import com.eu.habbo.messages.outgoing.friends.FriendListFragmentMessageComposer;
import com.eu.habbo.messages.outgoing.friends.MessengerInitComposer; import com.eu.habbo.messages.outgoing.friends.MessengerInitComposer;
import java.util.ArrayList; import java.util.ArrayList;
@ -12,7 +12,7 @@ public class RequestInitFriendsEvent extends MessageHandler {
public void handle() throws Exception { public void handle() throws Exception {
ArrayList<ServerMessage> messages = new ArrayList<>(); ArrayList<ServerMessage> messages = new ArrayList<>();
messages.add(new MessengerInitComposer(this.client.getHabbo()).compose()); messages.add(new MessengerInitComposer(this.client.getHabbo()).compose());
messages.addAll(FriendsComposer.getMessagesForBuddyList(this.client.getHabbo().getMessenger().getFriends().values())); messages.addAll(FriendListFragmentMessageComposer.getMessagesForBuddyList(this.client.getHabbo().getMessenger().getFriends().values()));
this.client.sendResponses(messages); this.client.sendResponses(messages);
} }
} }

10
src/main/java/com/eu/habbo/messages/incoming/friends/StalkFriendEvent.java
View File

@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.rooms.RoomChatMessage;
import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles; import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles;
import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.friends.StalkErrorComposer; import com.eu.habbo.messages.outgoing.friends.FollowFriendFailedComposer;
import com.eu.habbo.messages.outgoing.rooms.ForwardToRoomComposer; import com.eu.habbo.messages.outgoing.rooms.ForwardToRoomComposer;
import com.eu.habbo.messages.outgoing.rooms.users.RoomUserWhisperComposer; import com.eu.habbo.messages.outgoing.rooms.users.RoomUserWhisperComposer;
@ -18,24 +18,24 @@ public class StalkFriendEvent extends MessageHandler {
MessengerBuddy buddy = this.client.getHabbo().getMessenger().getFriend(friendId); MessengerBuddy buddy = this.client.getHabbo().getMessenger().getFriend(friendId);
if (buddy == null) { if (buddy == null) {
this.client.sendResponse(new StalkErrorComposer(StalkErrorComposer.NOT_IN_FRIEND_LIST)); this.client.sendResponse(new FollowFriendFailedComposer(FollowFriendFailedComposer.NOT_IN_FRIEND_LIST));
return; return;
} }
Habbo habbo = Emulator.getGameEnvironment().getHabboManager().getHabbo(friendId); Habbo habbo = Emulator.getGameEnvironment().getHabboManager().getHabbo(friendId);
if (habbo == null || !habbo.isOnline()) { if (habbo == null || !habbo.isOnline()) {
this.client.sendResponse(new StalkErrorComposer(StalkErrorComposer.FRIEND_OFFLINE)); this.client.sendResponse(new FollowFriendFailedComposer(FollowFriendFailedComposer.FRIEND_OFFLINE));
return; return;
} }
if (habbo.getHabboStats().blockFollowing && !this.client.getHabbo().hasPermission("acc_can_stalk")) { if (habbo.getHabboStats().blockFollowing && !this.client.getHabbo().hasPermission("acc_can_stalk")) {
this.client.sendResponse(new StalkErrorComposer(StalkErrorComposer.FRIEND_BLOCKED_STALKING)); this.client.sendResponse(new FollowFriendFailedComposer(FollowFriendFailedComposer.FRIEND_BLOCKED_STALKING));
return; return;
} }
if (habbo.getHabboInfo().getCurrentRoom() == null) { if (habbo.getHabboInfo().getCurrentRoom() == null) {
this.client.sendResponse(new StalkErrorComposer(StalkErrorComposer.FRIEND_NOT_IN_ROOM)); this.client.sendResponse(new FollowFriendFailedComposer(FollowFriendFailedComposer.FRIEND_NOT_IN_ROOM));
return; return;
} }

4
src/main/java/com/eu/habbo/messages/incoming/guilds/GuildDeleteEvent.java
View File

@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.guilds.GuildMember;
import com.eu.habbo.habbohotel.permissions.Permission; import com.eu.habbo.habbohotel.permissions.Permission;
import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.guilds.GuildFavoriteRoomUserUpdateComposer; import com.eu.habbo.messages.outgoing.guilds.FavoriteMembershipUpdateMessageComposer;
import com.eu.habbo.messages.outgoing.guilds.RemoveGuildFromRoomComposer; import com.eu.habbo.messages.outgoing.guilds.RemoveGuildFromRoomComposer;
import com.eu.habbo.messages.outgoing.rooms.RoomDataComposer; import com.eu.habbo.messages.outgoing.rooms.RoomDataComposer;
import com.eu.habbo.plugin.events.guilds.GuildDeletedEvent; import com.eu.habbo.plugin.events.guilds.GuildDeletedEvent;
@ -28,7 +28,7 @@ public class GuildDeleteEvent extends MessageHandler {
Habbo habbo = Emulator.getGameServer().getGameClientManager().getHabbo(member.getUserId()); Habbo habbo = Emulator.getGameServer().getGameClientManager().getHabbo(member.getUserId());
if (habbo != null) if (habbo != null)
if (habbo.getHabboInfo().getCurrentRoom() != null && habbo.getRoomUnit() != null) if (habbo.getHabboInfo().getCurrentRoom() != null && habbo.getRoomUnit() != null)
habbo.getHabboInfo().getCurrentRoom().sendComposer(new GuildFavoriteRoomUserUpdateComposer(habbo.getRoomUnit(), null).compose()); habbo.getHabboInfo().getCurrentRoom().sendComposer(new FavoriteMembershipUpdateMessageComposer(habbo.getRoomUnit(), null).compose());
} }
Emulator.getGameEnvironment().getGuildManager().deleteGuild(guild); Emulator.getGameEnvironment().getGuildManager().deleteGuild(guild);

4
src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveFavoriteEvent.java
View File

@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.guilds;
import com.eu.habbo.Emulator; import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.guilds.Guild; import com.eu.habbo.habbohotel.guilds.Guild;
import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.guilds.GuildFavoriteRoomUserUpdateComposer; import com.eu.habbo.messages.outgoing.guilds.FavoriteMembershipUpdateMessageComposer;
import com.eu.habbo.messages.outgoing.users.ExtendedProfileMessageComposer; import com.eu.habbo.messages.outgoing.users.ExtendedProfileMessageComposer;
import com.eu.habbo.plugin.events.guilds.GuildRemovedFavoriteEvent; import com.eu.habbo.plugin.events.guilds.GuildRemovedFavoriteEvent;
@ -22,7 +22,7 @@ public class GuildRemoveFavoriteEvent extends MessageHandler {
this.client.getHabbo().getHabboStats().guild = 0; this.client.getHabbo().getHabboStats().guild = 0;
if (this.client.getHabbo().getHabboInfo().getCurrentRoom() != null && guild != null) { if (this.client.getHabbo().getHabboInfo().getCurrentRoom() != null && guild != null) {
this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new GuildFavoriteRoomUserUpdateComposer(this.client.getHabbo().getRoomUnit(), null).compose()); this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new FavoriteMembershipUpdateMessageComposer(this.client.getHabbo().getRoomUnit(), null).compose());
} }
this.client.sendResponse(new ExtendedProfileMessageComposer(this.client.getHabbo(), this.client)); this.client.sendResponse(new ExtendedProfileMessageComposer(this.client.getHabbo(), this.client));

4
src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveMemberEvent.java
View File

@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.permissions.Permission;
import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.Room;
import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.guilds.GuildFavoriteRoomUserUpdateComposer; import com.eu.habbo.messages.outgoing.guilds.FavoriteMembershipUpdateMessageComposer;
import com.eu.habbo.messages.outgoing.guilds.GuildInfoComposer; import com.eu.habbo.messages.outgoing.guilds.GuildInfoComposer;
import com.eu.habbo.messages.outgoing.guilds.GuildRefreshMembersListComposer; import com.eu.habbo.messages.outgoing.guilds.GuildRefreshMembersListComposer;
import com.eu.habbo.plugin.events.guilds.GuildRemovedMemberEvent; import com.eu.habbo.plugin.events.guilds.GuildRemovedMemberEvent;
@ -47,7 +47,7 @@ public class GuildRemoveMemberEvent extends MessageHandler {
if (room != null) { if (room != null) {
if (habbo.getHabboInfo().getCurrentRoom() != null && habbo.getRoomUnit() != null) if (habbo.getHabboInfo().getCurrentRoom() != null && habbo.getRoomUnit() != null)
habbo.getHabboInfo().getCurrentRoom().sendComposer(new GuildFavoriteRoomUserUpdateComposer(habbo.getRoomUnit(), null).compose()); habbo.getHabboInfo().getCurrentRoom().sendComposer(new FavoriteMembershipUpdateMessageComposer(habbo.getRoomUnit(), null).compose());
if (habbo.getHabboInfo().getCurrentRoom() == room) if (habbo.getHabboInfo().getCurrentRoom() == room)
room.refreshRightsForHabbo(habbo); room.refreshRightsForHabbo(habbo);
} }

4
src/main/java/com/eu/habbo/messages/incoming/guilds/GuildSetFavoriteEvent.java
View File

@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.guilds;
import com.eu.habbo.Emulator; import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.guilds.Guild; import com.eu.habbo.habbohotel.guilds.Guild;
import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.guilds.GuildFavoriteRoomUserUpdateComposer; import com.eu.habbo.messages.outgoing.guilds.FavoriteMembershipUpdateMessageComposer;
import com.eu.habbo.messages.outgoing.rooms.users.RoomUsersAddGuildBadgeComposer; import com.eu.habbo.messages.outgoing.rooms.users.RoomUsersAddGuildBadgeComposer;
import com.eu.habbo.messages.outgoing.users.ExtendedProfileMessageComposer; import com.eu.habbo.messages.outgoing.users.ExtendedProfileMessageComposer;
import com.eu.habbo.plugin.events.guilds.GuildFavoriteSetEvent; import com.eu.habbo.plugin.events.guilds.GuildFavoriteSetEvent;
@ -27,7 +27,7 @@ public class GuildSetFavoriteEvent extends MessageHandler {
if (this.client.getHabbo().getHabboInfo().getCurrentRoom() != null) { if (this.client.getHabbo().getHabboInfo().getCurrentRoom() != null) {
if (guild != null) { if (guild != null) {
this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RoomUsersAddGuildBadgeComposer(guild).compose()); this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new RoomUsersAddGuildBadgeComposer(guild).compose());
this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new GuildFavoriteRoomUserUpdateComposer(this.client.getHabbo().getRoomUnit(), guild).compose()); this.client.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new FavoriteMembershipUpdateMessageComposer(this.client.getHabbo().getRoomUnit(), guild).compose());
} }
} }

4
src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumDataEvent.java
View File

@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.guilds.forums;
import com.eu.habbo.Emulator; import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.guilds.Guild; import com.eu.habbo.habbohotel.guilds.Guild;
import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.guilds.forums.GuildForumDataComposer; import com.eu.habbo.messages.outgoing.guilds.forums.ForumDataMessageComposer;
public class GuildForumDataEvent extends MessageHandler { public class GuildForumDataEvent extends MessageHandler {
@Override @Override
@ -15,7 +15,7 @@ public class GuildForumDataEvent extends MessageHandler {
if (guild == null) if (guild == null)
return; return;
this.client.sendResponse(new GuildForumDataComposer(guild, this.client.getHabbo())); this.client.sendResponse(new ForumDataMessageComposer(guild, this.client.getHabbo()));
if (!Emulator.getGameEnvironment().getGuildManager().hasViewedForum(this.client.getHabbo().getHabboInfo().getId(), guildId)) { if (!Emulator.getGameEnvironment().getGuildManager().hasViewedForum(this.client.getHabbo().getHabboInfo().getId(), guildId)) {
Emulator.getGameEnvironment().getGuildManager().addView(this.client.getHabbo().getHabboInfo().getId(), guildId); Emulator.getGameEnvironment().getGuildManager().addView(this.client.getHabbo().getHabboInfo().getId(), guildId);

4
src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumListEvent.java
View File

@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.guilds.forums;
import com.eu.habbo.Emulator; import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.guilds.Guild; import com.eu.habbo.habbohotel.guilds.Guild;
import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.guilds.forums.GuildForumListComposer; import com.eu.habbo.messages.outgoing.guilds.forums.ForumsListMessageComposer;
import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer; import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer;
import gnu.trove.set.hash.THashSet; import gnu.trove.set.hash.THashSet;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -40,7 +40,7 @@ public class GuildForumListEvent extends MessageHandler {
} }
if (guilds != null) { if (guilds != null) {
this.client.sendResponse(new GuildForumListComposer(guilds, this.client.getHabbo(), mode, offset)); this.client.sendResponse(new ForumsListMessageComposer(guilds, this.client.getHabbo(), mode, offset));
} }
} }

4
src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumThreadsEvent.java
View File

@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.guilds.forums;
import com.eu.habbo.Emulator; import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.guilds.Guild; import com.eu.habbo.habbohotel.guilds.Guild;
import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.guilds.forums.GuildForumDataComposer; import com.eu.habbo.messages.outgoing.guilds.forums.ForumDataMessageComposer;
import com.eu.habbo.messages.outgoing.guilds.forums.GuildForumThreadsComposer; import com.eu.habbo.messages.outgoing.guilds.forums.GuildForumThreadsComposer;
import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer; import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer;
@ -20,7 +20,7 @@ public class GuildForumThreadsEvent extends MessageHandler {
return; return;
} }
this.client.sendResponse(new GuildForumDataComposer(guild, this.client.getHabbo())); this.client.sendResponse(new ForumDataMessageComposer(guild, this.client.getHabbo()));
this.client.sendResponse(new GuildForumThreadsComposer(guild, index)); this.client.sendResponse(new GuildForumThreadsComposer(guild, index));
} }
} }

4
src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumThreadsMessagesEvent.java
View File

@ -12,7 +12,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer;
import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys;
import com.eu.habbo.messages.outgoing.guilds.forums.GuildForumCommentsComposer; import com.eu.habbo.messages.outgoing.guilds.forums.GuildForumCommentsComposer;
import com.eu.habbo.messages.outgoing.guilds.forums.GuildForumDataComposer; import com.eu.habbo.messages.outgoing.guilds.forums.ForumDataMessageComposer;
import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer; import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer;
@ -41,7 +41,7 @@ public class GuildForumThreadsMessagesEvent extends MessageHandler {
this.client.sendResponse(new GuildForumDataComposer(guild, this.client.getHabbo())); this.client.sendResponse(new GuildForumDataComposer(guild, this.client.getHabbo()));
} }
else { else {
this.client.sendResponse(new BubbleAlertComposer(BubbleAlertKeys.FORUMS_ACCESS_DENIED.key).compose()); this.client.sendResponse(new NotificationDialogMessageComposer(BubbleAlertKeys.FORUMS_ACCESS_DENIED.key).compose());
} }
} }
} }

4
src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumUpdateSettingsEvent.java
View File

@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.guilds.SettingsState;
import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer;
import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys;
import com.eu.habbo.messages.outgoing.guilds.forums.GuildForumDataComposer; import com.eu.habbo.messages.outgoing.guilds.forums.ForumDataMessageComposer;
import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer; import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer;
public class GuildForumUpdateSettingsEvent extends MessageHandler { public class GuildForumUpdateSettingsEvent extends MessageHandler {
@ -41,6 +41,6 @@ public class GuildForumUpdateSettingsEvent extends MessageHandler {
this.client.sendResponse(new BubbleAlertComposer(BubbleAlertKeys.FORUMS_FORUM_SETTINGS_UPDATED.key).compose()); this.client.sendResponse(new BubbleAlertComposer(BubbleAlertKeys.FORUMS_FORUM_SETTINGS_UPDATED.key).compose());
this.client.sendResponse(new GuildForumDataComposer(guild, this.client.getHabbo())); this.client.sendResponse(new ForumDataMessageComposer(guild, this.client.getHabbo()));
} }
} }

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

@ -202,7 +202,7 @@ public class SecureLoginEvent extends MessageHandler {
messages.add(new UserHomeRoomComposer(this.client.getHabbo().getHabboInfo().getHomeRoom(), roomIdToEnter).compose()); messages.add(new UserHomeRoomComposer(this.client.getHabbo().getHabboInfo().getHomeRoom(), roomIdToEnter).compose());
messages.add(new AvatarEffectsMessageComposer(habbo, this.client.getHabbo().getInventory().getEffectsComponent().effects.values()).compose()); messages.add(new AvatarEffectsMessageComposer(habbo, this.client.getHabbo().getInventory().getEffectsComponent().effects.values()).compose());
messages.add(new UserClothesComposer(this.client.getHabbo()).compose()); messages.add(new FigureSetIdsComposer(this.client.getHabbo()).compose());
messages.add(new NewUserIdentityComposer(habbo).compose()); messages.add(new NewUserIdentityComposer(habbo).compose());
messages.add(new UserPermissionsComposer(this.client.getHabbo()).compose()); messages.add(new UserPermissionsComposer(this.client.getHabbo()).compose());
messages.add(new AvailabilityStatusMessageComposer(true, false, true).compose()); messages.add(new AvailabilityStatusMessageComposer(true, false, true).compose());
@ -213,7 +213,7 @@ public class SecureLoginEvent extends MessageHandler {
messages.add(new MysteryBoxKeysComposer().compose()); messages.add(new MysteryBoxKeysComposer().compose());
messages.add(new BuildersClubSubscriptionStatusMessageComposer().compose()); messages.add(new BuildersClubSubscriptionStatusMessageComposer().compose());
messages.add(new CfhTopicsInitComposer().compose()); messages.add(new CfhTopicsInitComposer().compose());
messages.add(new FavoriteRoomsCountComposer(this.client.getHabbo()).compose()); messages.add(new FavouriteChangedComposer(this.client.getHabbo()).compose());
messages.add(new GameCenterGameListComposer().compose()); messages.add(new GameCenterGameListComposer().compose());
messages.add(new GameCenterAccountInfoComposer(3, 100).compose()); messages.add(new GameCenterAccountInfoComposer(3, 100).compose());
messages.add(new GameCenterAccountInfoComposer(0, 100).compose()); messages.add(new GameCenterAccountInfoComposer(0, 100).compose());

6
src/main/java/com/eu/habbo/messages/incoming/inventory/RequestInventoryItemsEvent.java
View File

@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.inventory;
import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.inventory.InventoryItemsComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListComposer;
import gnu.trove.iterator.TIntObjectIterator; import gnu.trove.iterator.TIntObjectIterator;
import gnu.trove.map.TIntObjectMap; import gnu.trove.map.TIntObjectMap;
import gnu.trove.map.hash.TIntObjectHashMap; import gnu.trove.map.hash.TIntObjectHashMap;
@ -53,13 +53,13 @@ public class RequestInventoryItemsEvent extends MessageHandler {
} }
if (count == 1000) { if (count == 1000) {
this.client.sendResponse(new InventoryItemsComposer(fragmentNumber, totalFragments, items)); this.client.sendResponse(new FurniListComposer(fragmentNumber, totalFragments, items));
count = 0; count = 0;
items.clear(); items.clear();
} }
} }
if(count > 0 && items.size() > 0) this.client.sendResponse(new InventoryItemsComposer(fragmentNumber, totalFragments, items)); if(count > 0 && items.size() > 0) this.client.sendResponse(new FurniListComposer(fragmentNumber, totalFragments, items));
} }
} }
} }

4
src/main/java/com/eu/habbo/messages/incoming/navigator/RequestCreateRoomEvent.java
View File

@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.rooms.RoomCategory;
import com.eu.habbo.habbohotel.rooms.RoomManager; import com.eu.habbo.habbohotel.rooms.RoomManager;
import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.navigator.CanCreateRoomComposer; import com.eu.habbo.messages.outgoing.navigator.CanCreateRoomComposer;
import com.eu.habbo.messages.outgoing.navigator.RoomCreatedComposer; import com.eu.habbo.messages.outgoing.navigator.FlatCreatedComposer;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -58,7 +58,7 @@ public class RequestCreateRoomEvent extends MessageHandler {
final Room room = Emulator.getGameEnvironment().getRoomManager().createRoomForHabbo(this.client.getHabbo(), name, description, modelName, maxUsers, categoryId, tradeType); final Room room = Emulator.getGameEnvironment().getRoomManager().createRoomForHabbo(this.client.getHabbo(), name, description, modelName, maxUsers, categoryId, tradeType);
if (room != null) { if (room != null) {
this.client.sendResponse(new RoomCreatedComposer(room)); this.client.sendResponse(new FlatCreatedComposer(room));
} }
} }
} }

8
src/main/java/com/eu/habbo/messages/incoming/rooms/HandleDoorbellEvent.java
View File

@ -4,8 +4,8 @@ import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.hotelview.CloseConnectionMessageComposer; import com.eu.habbo.messages.outgoing.hotelview.CloseConnectionMessageComposer;
import com.eu.habbo.messages.outgoing.rooms.HideDoorbellComposer; import com.eu.habbo.messages.outgoing.rooms.FlatAccessibleMessageComposer;
import com.eu.habbo.messages.outgoing.rooms.RoomAccessDeniedComposer; import com.eu.habbo.messages.outgoing.rooms.FlatAccessDeniedMessageComposer;
public class HandleDoorbellEvent extends MessageHandler { public class HandleDoorbellEvent extends MessageHandler {
@Override @Override
@ -20,10 +20,10 @@ public class HandleDoorbellEvent extends MessageHandler {
this.client.getHabbo().getHabboInfo().getCurrentRoom().removeFromQueue(habbo); this.client.getHabbo().getHabboInfo().getCurrentRoom().removeFromQueue(habbo);
if (accepted) { if (accepted) {
habbo.getClient().sendResponse(new HideDoorbellComposer("")); habbo.getClient().sendResponse(new FlatAccessibleMessageComposer(""));
Emulator.getGameEnvironment().getRoomManager().enterRoom(habbo, this.client.getHabbo().getHabboInfo().getCurrentRoom().getId(), "", true); Emulator.getGameEnvironment().getRoomManager().enterRoom(habbo, this.client.getHabbo().getHabboInfo().getCurrentRoom().getId(), "", true);
} else { } else {
habbo.getClient().sendResponse(new RoomAccessDeniedComposer("")); habbo.getClient().sendResponse(new FlatAccessDeniedMessageComposer(""));
habbo.getClient().sendResponse(new CloseConnectionMessageComposer()); habbo.getClient().sendResponse(new CloseConnectionMessageComposer());
} }
habbo.getHabboInfo().setRoomQueueId(0); habbo.getHabboInfo().setRoomQueueId(0);

4
src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomHeightmapEvent.java
View File

@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.rooms;
import com.eu.habbo.Emulator; import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.Room;
import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.rooms.RoomHeightMapComposer; import com.eu.habbo.messages.outgoing.rooms.FloorHeightMapComposer;
import com.eu.habbo.messages.outgoing.rooms.RoomRelativeMapComposer; import com.eu.habbo.messages.outgoing.rooms.RoomRelativeMapComposer;
public class RequestRoomHeightmapEvent extends MessageHandler { public class RequestRoomHeightmapEvent extends MessageHandler {
@ -15,7 +15,7 @@ public class RequestRoomHeightmapEvent extends MessageHandler {
if (room != null && room.getLayout() != null) { if (room != null && room.getLayout() != null) {
this.client.sendResponse(new RoomRelativeMapComposer(room)); this.client.sendResponse(new RoomRelativeMapComposer(room));
this.client.sendResponse(new RoomHeightMapComposer(room)); this.client.sendResponse(new FloorHeightMapComposer(room));
Emulator.getGameEnvironment().getRoomManager().enterRoom(this.client.getHabbo(), room); Emulator.getGameEnvironment().getRoomManager().enterRoom(this.client.getHabbo(), room);
} }

4
src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomRightsEvent.java
View File

@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.rooms;
import com.eu.habbo.habbohotel.permissions.Permission; import com.eu.habbo.habbohotel.permissions.Permission;
import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.Room;
import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.rooms.RoomRightsListComposer; import com.eu.habbo.messages.outgoing.rooms.FlatControllersComposer;
public class RequestRoomRightsEvent extends MessageHandler { public class RequestRoomRightsEvent extends MessageHandler {
@Override @Override
@ -14,7 +14,7 @@ public class RequestRoomRightsEvent extends MessageHandler {
return; return;
if (room.getOwnerId() == this.client.getHabbo().getHabboInfo().getId() || this.client.getHabbo().hasPermission(Permission.ACC_ANYROOMOWNER)) { if (room.getOwnerId() == this.client.getHabbo().getHabboInfo().getId() || this.client.getHabbo().hasPermission(Permission.ACC_ANYROOMOWNER)) {
this.client.sendResponse(new RoomRightsListComposer(room)); this.client.sendResponse(new FlatControllersComposer(room));
} }
} }
} }

4
src/main/java/com/eu/habbo/messages/incoming/rooms/RoomFavoriteEvent.java
View File

@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.rooms;
import com.eu.habbo.Emulator; import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.Room;
import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.rooms.FavoriteRoomChangedComposer; import com.eu.habbo.messages.outgoing.rooms.FavouriteChangedComposer;
public class RoomFavoriteEvent extends MessageHandler { public class RoomFavoriteEvent extends MessageHandler {
@Override @Override
@ -23,7 +23,7 @@ public class RoomFavoriteEvent extends MessageHandler {
} }
} }
this.client.sendResponse(new FavoriteRoomChangedComposer(roomId, added)); this.client.sendResponse(new FavouriteChangedComposer(roomId, added));
} }
} }
} }

6
src/main/java/com/eu/habbo/messages/incoming/rooms/RoomPlacePaintEvent.java
View File

@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.permissions.Permission;
import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.Room;
import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.inventory.RemoveHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListRemoveComposer;
import com.eu.habbo.messages.outgoing.rooms.RoomPaintComposer; import com.eu.habbo.messages.outgoing.rooms.RoomPaintComposer;
public class RoomPlacePaintEvent extends MessageHandler { public class RoomPlacePaintEvent extends MessageHandler {
@ -22,7 +22,7 @@ public class RoomPlacePaintEvent extends MessageHandler {
HabboItem item = this.client.getHabbo().getInventory().getItemsComponent().getHabboItem(itemId); HabboItem item = this.client.getHabbo().getInventory().getItemsComponent().getHabboItem(itemId);
if (item == null) { if (item == null) {
this.client.sendResponse(new RemoveHabboItemComposer(itemId)); this.client.sendResponse(new FurniListRemoveComposer(itemId));
return; return;
} }
@ -46,7 +46,7 @@ public class RoomPlacePaintEvent extends MessageHandler {
room.sendComposer(new RoomPaintComposer(item.getBaseItem().getName(), item.getExtradata()).compose()); room.sendComposer(new RoomPaintComposer(item.getBaseItem().getName(), item.getExtradata()).compose());
item.needsDelete(true); item.needsDelete(true);
Emulator.getThreading().run(item); Emulator.getThreading().run(item);
this.client.sendResponse(new RemoveHabboItemComposer(itemId)); this.client.sendResponse(new FurniListRemoveComposer(itemId));
} }
} }
} }

4
src/main/java/com/eu/habbo/messages/incoming/rooms/RoomUnFavoriteEvent.java
View File

@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.rooms;
import com.eu.habbo.Emulator; import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.Room;
import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.rooms.FavoriteRoomChangedComposer; import com.eu.habbo.messages.outgoing.rooms.FavouriteChangedComposer;
public class RoomUnFavoriteEvent extends MessageHandler { public class RoomUnFavoriteEvent extends MessageHandler {
@Override @Override
@ -17,7 +17,7 @@ public class RoomUnFavoriteEvent extends MessageHandler {
this.client.getHabbo().getHabboStats().removeFavoriteRoom(roomId); this.client.getHabbo().getHabboStats().removeFavoriteRoom(roomId);
} }
this.client.sendResponse(new FavoriteRoomChangedComposer(roomId, false)); this.client.sendResponse(new FavouriteChangedComposer(roomId, false));
} }
} }
} }

4
src/main/java/com/eu/habbo/messages/incoming/rooms/items/PostItPlaceEvent.java
View File

@ -10,7 +10,7 @@ import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer;
import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys;
import com.eu.habbo.messages.outgoing.inventory.RemoveHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListRemoveComposer;
import com.eu.habbo.messages.outgoing.rooms.items.AddWallItemComposer; import com.eu.habbo.messages.outgoing.rooms.items.AddWallItemComposer;
public class PostItPlaceEvent extends MessageHandler { public class PostItPlaceEvent extends MessageHandler {
@ -35,7 +35,7 @@ public class PostItPlaceEvent extends MessageHandler {
item.needsUpdate(true); item.needsUpdate(true);
room.sendComposer(new AddWallItemComposer(item, this.client.getHabbo().getHabboInfo().getUsername()).compose()); room.sendComposer(new AddWallItemComposer(item, this.client.getHabbo().getHabboInfo().getUsername()).compose());
this.client.getHabbo().getInventory().getItemsComponent().removeHabboItem(item); this.client.getHabbo().getInventory().getItemsComponent().removeHabboItem(item);
this.client.sendResponse(new RemoveHabboItemComposer(item.getGiftAdjustedId())); this.client.sendResponse(new FurniListRemoveComposer(item.getGiftAdjustedId()));
item.setFromGift(false); item.setFromGift(false);
Emulator.getThreading().run(item); Emulator.getThreading().run(item);

4
src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemClothingEvent.java
View File

@ -10,7 +10,7 @@ import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer;
import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys;
import com.eu.habbo.messages.outgoing.rooms.UpdateStackHeightComposer; import com.eu.habbo.messages.outgoing.rooms.UpdateStackHeightComposer;
import com.eu.habbo.messages.outgoing.rooms.items.RemoveFloorItemComposer; import com.eu.habbo.messages.outgoing.rooms.items.RemoveFloorItemComposer;
import com.eu.habbo.messages.outgoing.users.UserClothesComposer; import com.eu.habbo.messages.outgoing.users.FigureSetIdsComposer;
import com.eu.habbo.threading.runnables.QueryDeleteHabboItem; import com.eu.habbo.threading.runnables.QueryDeleteHabboItem;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -54,7 +54,7 @@ public class RedeemClothingEvent extends MessageHandler {
this.client.getHabbo().getInventory().getWardrobeComponent().getClothing().add(clothing.id); this.client.getHabbo().getInventory().getWardrobeComponent().getClothing().add(clothing.id);
this.client.getHabbo().getInventory().getWardrobeComponent().getClothingSets().addAll(clothing.setId); this.client.getHabbo().getInventory().getWardrobeComponent().getClothingSets().addAll(clothing.setId);
this.client.sendResponse(new UserClothesComposer(this.client.getHabbo())); this.client.sendResponse(new FigureSetIdsComposer(this.client.getHabbo()));
this.client.sendResponse(new BubbleAlertComposer(BubbleAlertKeys.FIGURESET_REDEEMED.key)); this.client.sendResponse(new BubbleAlertComposer(BubbleAlertKeys.FIGURESET_REDEEMED.key));
} else { } else {

4
src/main/java/com/eu/habbo/messages/incoming/rooms/items/RoomPlaceItemEvent.java
View File

@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer;
import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys;
import com.eu.habbo.messages.outgoing.inventory.RemoveHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListRemoveComposer;
public class RoomPlaceItemEvent extends MessageHandler { public class RoomPlaceItemEvent extends MessageHandler {
@Override @Override
@ -111,7 +111,7 @@ public class RoomPlaceItemEvent extends MessageHandler {
} }
} }
this.client.sendResponse(new RemoveHabboItemComposer(item.getGiftAdjustedId())); this.client.sendResponse(new FurniListRemoveComposer(item.getGiftAdjustedId()));
this.client.getHabbo().getInventory().getItemsComponent().removeHabboItem(item.getId()); this.client.getHabbo().getInventory().getItemsComponent().removeHabboItem(item.getId());
item.setFromGift(false); item.setFromGift(false);
} }

10
src/main/java/com/eu/habbo/messages/incoming/rooms/items/lovelock/LoveLockStartConfirmEvent.java
View File

@ -4,8 +4,8 @@ import com.eu.habbo.habbohotel.items.interactions.InteractionLoveLock;
import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.rooms.items.lovelock.LoveLockFurniFinishedComposer; import com.eu.habbo.messages.outgoing.rooms.items.lovelock.FriendFurniCancelLockMessageComposer;
import com.eu.habbo.messages.outgoing.rooms.items.lovelock.LoveLockFurniFriendConfirmedComposer; import com.eu.habbo.messages.outgoing.rooms.items.lovelock.FriendFurniOtherLockConfirmedMessageComposer;
public class LoveLockStartConfirmEvent extends MessageHandler { public class LoveLockStartConfirmEvent extends MessageHandler {
@Override @Override
@ -34,10 +34,10 @@ public class LoveLockStartConfirmEvent extends MessageHandler {
Habbo habbo = this.client.getHabbo().getHabboInfo().getCurrentRoom().getHabbo(userId); Habbo habbo = this.client.getHabbo().getHabboInfo().getCurrentRoom().getHabbo(userId);
if (habbo != null) { if (habbo != null) {
habbo.getClient().sendResponse(new LoveLockFurniFriendConfirmedComposer((InteractionLoveLock) item)); habbo.getClient().sendResponse(new FriendFurniOtherLockConfirmedMessageComposer((InteractionLoveLock) item));
habbo.getClient().sendResponse(new LoveLockFurniFinishedComposer((InteractionLoveLock) item)); habbo.getClient().sendResponse(new FriendFurniCancelLockMessageComposer((InteractionLoveLock) item));
this.client.sendResponse(new LoveLockFurniFinishedComposer((InteractionLoveLock) item)); this.client.sendResponse(new FriendFurniCancelLockMessageComposer((InteractionLoveLock) item));
((InteractionLoveLock) item).lock(habbo, this.client.getHabbo(), this.client.getHabbo().getHabboInfo().getCurrentRoom()); ((InteractionLoveLock) item).lock(habbo, this.client.getHabbo(), this.client.getHabbo().getHabboInfo().getCurrentRoom());
} }

4
src/main/java/com/eu/habbo/messages/incoming/rooms/pets/HorseRemoveSaddleEvent.java
View File

@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer;
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
import com.eu.habbo.messages.outgoing.rooms.pets.RoomPetHorseFigureComposer; import com.eu.habbo.messages.outgoing.rooms.pets.RoomPetHorseFigureComposer;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -63,6 +63,6 @@ public class HorseRemoveSaddleEvent extends MessageHandler {
this.client.getHabbo().getInventory().getItemsComponent().addItem(saddle); this.client.getHabbo().getInventory().getItemsComponent().addItem(saddle);
this.client.sendResponse(new AddHabboItemComposer(saddle)); this.client.sendResponse(new AddHabboItemComposer(saddle));
this.client.sendResponse(new InventoryRefreshComposer()); this.client.sendResponse(new FurniListInvalidateComposer());
} }
} }

4
src/main/java/com/eu/habbo/messages/incoming/users/UserSaveLookEvent.java
View File

@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.users.HabboGender;
import com.eu.habbo.habbohotel.users.clothingvalidation.ClothingValidationManager; import com.eu.habbo.habbohotel.users.clothingvalidation.ClothingValidationManager;
import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.rooms.users.RoomUserDataComposer; import com.eu.habbo.messages.outgoing.rooms.users.RoomUserDataComposer;
import com.eu.habbo.messages.outgoing.users.UpdateUserLookComposer; import com.eu.habbo.messages.outgoing.users.FigureUpdateComposer;
import com.eu.habbo.plugin.events.users.UserSavedLookEvent; import com.eu.habbo.plugin.events.users.UserSavedLookEvent;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -39,7 +39,7 @@ public class UserSaveLookEvent extends MessageHandler {
this.client.getHabbo().getHabboInfo().setLook(ClothingValidationManager.VALIDATE_ON_CHANGE_LOOKS ? ClothingValidationManager.validateLook(this.client.getHabbo(), lookEvent.newLook, lookEvent.gender.name()) : lookEvent.newLook); this.client.getHabbo().getHabboInfo().setLook(ClothingValidationManager.VALIDATE_ON_CHANGE_LOOKS ? ClothingValidationManager.validateLook(this.client.getHabbo(), lookEvent.newLook, lookEvent.gender.name()) : lookEvent.newLook);
this.client.getHabbo().getHabboInfo().setGender(lookEvent.gender); this.client.getHabbo().getHabboInfo().setGender(lookEvent.gender);
Emulator.getThreading().run(this.client.getHabbo().getHabboInfo()); Emulator.getThreading().run(this.client.getHabbo().getHabboInfo());
this.client.sendResponse(new UpdateUserLookComposer(this.client.getHabbo())); this.client.sendResponse(new FigureUpdateComposer(this.client.getHabbo()));
if (this.client.getHabbo().getHabboInfo().getCurrentRoom() != null) { 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 RoomUserDataComposer(this.client.getHabbo()).compose());
} }

4
src/main/java/com/eu/habbo/messages/outgoing/friends/FriendFindingRoomComposer.java → src/main/java/com/eu/habbo/messages/outgoing/friends/FindFriendsProcessResultComposer.java
View File

@ -4,13 +4,13 @@ import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.MessageComposer;
import com.eu.habbo.messages.outgoing.Outgoing; import com.eu.habbo.messages.outgoing.Outgoing;
public class FriendFindingRoomComposer extends MessageComposer { public class FindFriendsProcessResultComposer extends MessageComposer {
public static final int NO_ROOM_FOUND = 0; public static final int NO_ROOM_FOUND = 0;
public static final int ROOM_FOUND = 1; public static final int ROOM_FOUND = 1;
private final int errorCode; private final int errorCode;
public FriendFindingRoomComposer(int errorCode) { public FindFriendsProcessResultComposer(int errorCode) {
this.errorCode = errorCode; this.errorCode = errorCode;
} }

4
src/main/java/com/eu/habbo/messages/outgoing/friends/StalkErrorComposer.java → src/main/java/com/eu/habbo/messages/outgoing/friends/FollowFriendFailedComposer.java
View File

@ -4,7 +4,7 @@ import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.MessageComposer;
import com.eu.habbo.messages.outgoing.Outgoing; import com.eu.habbo.messages.outgoing.Outgoing;
public class StalkErrorComposer extends MessageComposer { public class FollowFriendFailedComposer extends MessageComposer {
public static final int NOT_IN_FRIEND_LIST = 0; public static final int NOT_IN_FRIEND_LIST = 0;
public static final int FRIEND_OFFLINE = 1; public static final int FRIEND_OFFLINE = 1;
public static final int FRIEND_NOT_IN_ROOM = 2; public static final int FRIEND_NOT_IN_ROOM = 2;
@ -12,7 +12,7 @@ public class StalkErrorComposer extends MessageComposer {
private final int errorCode; private final int errorCode;
public StalkErrorComposer(int errorCode) { public FollowFriendFailedComposer(int errorCode) {
this.errorCode = errorCode; this.errorCode = errorCode;
} }

10
src/main/java/com/eu/habbo/messages/outgoing/friends/FriendsComposer.java → src/main/java/com/eu/habbo/messages/outgoing/friends/FriendListFragmentMessageComposer.java
View File

@ -12,14 +12,14 @@ import org.slf4j.LoggerFactory;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
public class FriendsComposer extends MessageComposer { public class FriendListFragmentMessageComposer extends MessageComposer {
private static final Logger LOGGER = LoggerFactory.getLogger(FriendsComposer.class); private static final Logger LOGGER = LoggerFactory.getLogger(FriendListFragmentMessageComposer.class);
private final int totalPages; private final int totalPages;
private final int pageIndex; private final int pageIndex;
private final Collection<MessengerBuddy> friends; private final Collection<MessengerBuddy> friends;
public FriendsComposer(int totalPages, int pageIndex, Collection<MessengerBuddy> friends) { public FriendListFragmentMessageComposer(int totalPages, int pageIndex, Collection<MessengerBuddy> friends) {
this.totalPages = totalPages; this.totalPages = totalPages;
this.pageIndex = pageIndex; this.pageIndex = pageIndex;
this.friends = friends; this.friends = friends;
@ -68,14 +68,14 @@ public class FriendsComposer extends MessageComposer {
friends.add(buddy); friends.add(buddy);
if(friends.size() == 750) { if(friends.size() == 750) {
messages.add(new FriendsComposer(totalPages, page, friends).compose()); messages.add(new FriendListFragmentMessageComposer(totalPages, page, friends).compose());
friends.clear(); friends.clear();
page++; page++;
} }
} }
if(page == 0 || friends.size() > 0) { if(page == 0 || friends.size() > 0) {
messages.add(new FriendsComposer(totalPages, page, friends).compose()); messages.add(new FriendListFragmentMessageComposer(totalPages, page, friends).compose());
} }
return messages; return messages;

4
src/main/java/com/eu/habbo/messages/outgoing/friends/LoadFriendRequestsComposer.java → src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestsComposer.java
View File

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

4
src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFavoriteRoomUserUpdateComposer.java → src/main/java/com/eu/habbo/messages/outgoing/guilds/FavoriteMembershipUpdateMessageComposer.java
View File

@ -6,11 +6,11 @@ import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.MessageComposer;
import com.eu.habbo.messages.outgoing.Outgoing; import com.eu.habbo.messages.outgoing.Outgoing;
public class GuildFavoriteRoomUserUpdateComposer extends MessageComposer { public class FavoriteMembershipUpdateMessageComposer extends MessageComposer {
private RoomUnit roomUnit; private RoomUnit roomUnit;
private Guild guild; private Guild guild;
public GuildFavoriteRoomUserUpdateComposer(RoomUnit roomUnit, Guild guild) { public FavoriteMembershipUpdateMessageComposer(RoomUnit roomUnit, Guild guild) {
this.roomUnit = roomUnit; this.roomUnit = roomUnit;
this.guild = guild; this.guild = guild;
} }

6
src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumDataComposer.java → src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/ForumDataMessageComposer.java
View File

@ -22,13 +22,13 @@ import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
public class GuildForumDataComposer extends MessageComposer { public class ForumDataMessageComposer extends MessageComposer {
private static final Logger LOGGER = LoggerFactory.getLogger(GuildForumDataComposer.class); private static final Logger LOGGER = LoggerFactory.getLogger(ForumDataMessageComposer.class);
public final Guild guild; public final Guild guild;
public Habbo habbo; public Habbo habbo;
public GuildForumDataComposer(Guild guild, Habbo habbo) { public ForumDataMessageComposer(Guild guild, Habbo habbo) {
this.guild = guild; this.guild = guild;
this.habbo = habbo; this.habbo = habbo;
} }

6
src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumListComposer.java → src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/ForumsListMessageComposer.java
View File

@ -9,13 +9,13 @@ import com.eu.habbo.messages.outgoing.Outgoing;
import java.util.Iterator; import java.util.Iterator;
import java.util.Set; import java.util.Set;
public class GuildForumListComposer extends MessageComposer { public class ForumsListMessageComposer extends MessageComposer {
private final Set<Guild> guilds; private final Set<Guild> guilds;
private final Habbo habbo; private final Habbo habbo;
private final int mode; private final int mode;
private final int index; private final int index;
public GuildForumListComposer(Set<Guild> guilds, Habbo habbo, int mode, int index) { public ForumsListMessageComposer(Set<Guild> guilds, Habbo habbo, int mode, int index) {
this.guilds = guilds; this.guilds = guilds;
this.habbo = habbo; this.habbo = habbo;
this.mode = mode; this.mode = mode;
@ -46,7 +46,7 @@ public class GuildForumListComposer extends MessageComposer {
if (!it.hasNext()) if (!it.hasNext())
break; break;
GuildForumDataComposer.serializeForumData(this.response, it.next(), habbo); ForumDataMessageComposer.serializeForumData(this.response, it.next(), habbo);
} }
return this.response; return this.response;

4
src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryUpdateItemComposer.java → src/main/java/com/eu/habbo/messages/outgoing/inventory/FurniListAddOrUpdateComposer.java
View File

@ -6,10 +6,10 @@ import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.MessageComposer;
import com.eu.habbo.messages.outgoing.Outgoing; import com.eu.habbo.messages.outgoing.Outgoing;
public class InventoryUpdateItemComposer extends MessageComposer { public class FurniListAddOrUpdateComposer extends MessageComposer {
private final HabboItem habboItem; private final HabboItem habboItem;
public InventoryUpdateItemComposer(HabboItem item) { public FurniListAddOrUpdateComposer(HabboItem item) {
this.habboItem = item; this.habboItem = item;
} }

6
src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryItemsComposer.java → src/main/java/com/eu/habbo/messages/outgoing/inventory/FurniListComposer.java
View File

@ -11,14 +11,14 @@ import gnu.trove.procedure.TIntObjectProcedure;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class InventoryItemsComposer extends MessageComposer implements TIntObjectProcedure<HabboItem> { public class FurniListComposer extends MessageComposer implements TIntObjectProcedure<HabboItem> {
private static final Logger LOGGER = LoggerFactory.getLogger(InventoryItemsComposer.class); private static final Logger LOGGER = LoggerFactory.getLogger(FurniListComposer.class);
private final int fragmentNumber; private final int fragmentNumber;
private final int totalFragments; private final int totalFragments;
private final TIntObjectMap<HabboItem> items; private final TIntObjectMap<HabboItem> items;
public InventoryItemsComposer(int fragmentNumber, int totalFragments, TIntObjectMap<HabboItem> items) { public FurniListComposer(int fragmentNumber, int totalFragments, TIntObjectMap<HabboItem> items) {
this.fragmentNumber = fragmentNumber; this.fragmentNumber = fragmentNumber;
this.totalFragments = totalFragments; this.totalFragments = totalFragments;
this.items = items; this.items = items;

2
src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryRefreshComposer.java → src/main/java/com/eu/habbo/messages/outgoing/inventory/FurniListInvalidateComposer.java
View File

@ -4,7 +4,7 @@ import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.MessageComposer;
import com.eu.habbo.messages.outgoing.Outgoing; import com.eu.habbo.messages.outgoing.Outgoing;
public class InventoryRefreshComposer extends MessageComposer { public class FurniListInvalidateComposer extends MessageComposer {
@Override @Override
protected ServerMessage composeInternal() { protected ServerMessage composeInternal() {
this.response.init(Outgoing.FurniListInvalidateComposer); this.response.init(Outgoing.FurniListInvalidateComposer);

4
src/main/java/com/eu/habbo/messages/outgoing/inventory/RemoveHabboItemComposer.java → src/main/java/com/eu/habbo/messages/outgoing/inventory/FurniListRemoveComposer.java
View File

@ -4,10 +4,10 @@ import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.MessageComposer;
import com.eu.habbo.messages.outgoing.Outgoing; import com.eu.habbo.messages.outgoing.Outgoing;
public class RemoveHabboItemComposer extends MessageComposer { public class FurniListRemoveComposer extends MessageComposer {
private final int itemId; private final int itemId;
public RemoveHabboItemComposer(final int itemId) { public FurniListRemoveComposer(final int itemId) {
this.itemId = itemId; this.itemId = itemId;
} }

4
src/main/java/com/eu/habbo/messages/outgoing/navigator/RoomCreatedComposer.java → src/main/java/com/eu/habbo/messages/outgoing/navigator/FlatCreatedComposer.java
View File

@ -5,10 +5,10 @@ import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.MessageComposer;
import com.eu.habbo.messages.outgoing.Outgoing; import com.eu.habbo.messages.outgoing.Outgoing;
public class RoomCreatedComposer extends MessageComposer { public class FlatCreatedComposer extends MessageComposer {
private final Room room; private final Room room;
public RoomCreatedComposer(Room room) { public FlatCreatedComposer(Room room) {
this.room = room; this.room = room;
} }

4
src/main/java/com/eu/habbo/messages/outgoing/rooms/FavoriteRoomChangedComposer.java → src/main/java/com/eu/habbo/messages/outgoing/rooms/FavouriteChangedComposer.java
View File

@ -4,11 +4,11 @@ import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.MessageComposer;
import com.eu.habbo.messages.outgoing.Outgoing; import com.eu.habbo.messages.outgoing.Outgoing;
public class FavoriteRoomChangedComposer extends MessageComposer { public class FavouriteChangedComposer extends MessageComposer {
private final int roomId; private final int roomId;
private final boolean favorite; private final boolean favorite;
public FavoriteRoomChangedComposer(int roomId, boolean favorite) { public FavouriteChangedComposer(int roomId, boolean favorite) {
this.roomId = roomId; this.roomId = roomId;
this.favorite = favorite; this.favorite = favorite;
} }

4
src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomAccessDeniedComposer.java → src/main/java/com/eu/habbo/messages/outgoing/rooms/FlatAccessDeniedMessageComposer.java
View File

@ -4,10 +4,10 @@ import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.MessageComposer;
import com.eu.habbo.messages.outgoing.Outgoing; import com.eu.habbo.messages.outgoing.Outgoing;
public class RoomAccessDeniedComposer extends MessageComposer { public class FlatAccessDeniedMessageComposer extends MessageComposer {
private final String habbo; private final String habbo;
public RoomAccessDeniedComposer(String habbo) { public FlatAccessDeniedMessageComposer(String habbo) {
this.habbo = habbo; this.habbo = habbo;
} }

4
src/main/java/com/eu/habbo/messages/outgoing/rooms/HideDoorbellComposer.java → src/main/java/com/eu/habbo/messages/outgoing/rooms/FlatAccessibleMessageComposer.java
View File

@ -4,10 +4,10 @@ import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.MessageComposer;
import com.eu.habbo.messages.outgoing.Outgoing; import com.eu.habbo.messages.outgoing.Outgoing;
public class HideDoorbellComposer extends MessageComposer { public class FlatAccessibleMessageComposer extends MessageComposer {
private final String username; private final String username;
public HideDoorbellComposer(String username) { public FlatAccessibleMessageComposer(String username) {
this.username = username; this.username = username;
} }

4
src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomAddRightsListComposer.java → src/main/java/com/eu/habbo/messages/outgoing/rooms/FlatControllerAddedComposer.java
View File

@ -5,12 +5,12 @@ import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.MessageComposer;
import com.eu.habbo.messages.outgoing.Outgoing; import com.eu.habbo.messages.outgoing.Outgoing;
public class RoomAddRightsListComposer extends MessageComposer { public class FlatControllerAddedComposer extends MessageComposer {
private final Room room; private final Room room;
private final int userId; private final int userId;
private final String userName; private final String userName;
public RoomAddRightsListComposer(Room room, int userId, String username) { public FlatControllerAddedComposer(Room room, int userId, String username) {
this.room = room; this.room = room;
this.userId = userId; this.userId = userId;
this.userName = username; this.userName = username;

4
src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRemoveRightsListComposer.java → src/main/java/com/eu/habbo/messages/outgoing/rooms/FlatControllerRemovedComposer.java
View File

@ -5,11 +5,11 @@ import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.MessageComposer;
import com.eu.habbo.messages.outgoing.Outgoing; import com.eu.habbo.messages.outgoing.Outgoing;
public class RoomRemoveRightsListComposer extends MessageComposer { public class FlatControllerRemovedComposer extends MessageComposer {
private final Room room; private final Room room;
private final int userId; private final int userId;
public RoomRemoveRightsListComposer(Room room, int userId) { public FlatControllerRemovedComposer(Room room, int userId) {
this.room = room; this.room = room;
this.userId = userId; this.userId = userId;
} }

4
src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRightsListComposer.java → src/main/java/com/eu/habbo/messages/outgoing/rooms/FlatControllersComposer.java
View File

@ -8,10 +8,10 @@ import gnu.trove.map.hash.THashMap;
import java.util.Map; import java.util.Map;
public class RoomRightsListComposer extends MessageComposer { public class FlatControllersComposer extends MessageComposer {
private final Room room; private final Room room;
public RoomRightsListComposer(Room room) { public FlatControllersComposer(Room room) {
this.room = room; this.room = room;
} }

4
src/main/java/com/eu/habbo/messages/outgoing/rooms/FloodCounterComposer.java → src/main/java/com/eu/habbo/messages/outgoing/rooms/FloodControlMessageComposer.java
View File

@ -4,10 +4,10 @@ import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.MessageComposer;
import com.eu.habbo.messages.outgoing.Outgoing; import com.eu.habbo.messages.outgoing.Outgoing;
public class FloodCounterComposer extends MessageComposer { public class FloodControlMessageComposer extends MessageComposer {
private final int time; private final int time;
public FloodCounterComposer(int time) { public FloodControlMessageComposer(int time) {
this.time = time; this.time = time;
} }

4
src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomHeightMapComposer.java → src/main/java/com/eu/habbo/messages/outgoing/rooms/FloorHeightMapComposer.java
View File

@ -5,10 +5,10 @@ import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.MessageComposer;
import com.eu.habbo.messages.outgoing.Outgoing; import com.eu.habbo.messages.outgoing.Outgoing;
public class RoomHeightMapComposer extends MessageComposer { public class FloorHeightMapComposer extends MessageComposer {
private final Room room; private final Room room;
public RoomHeightMapComposer(Room room) { public FloorHeightMapComposer(Room room) {
this.room = room; this.room = room;
} }

4
src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniFinishedComposer.java → src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/FriendFurniCancelLockMessageComposer.java
View File

@ -5,10 +5,10 @@ import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.MessageComposer;
import com.eu.habbo.messages.outgoing.Outgoing; import com.eu.habbo.messages.outgoing.Outgoing;
public class LoveLockFurniFinishedComposer extends MessageComposer { public class FriendFurniCancelLockMessageComposer extends MessageComposer {
private final InteractionLoveLock loveLock; private final InteractionLoveLock loveLock;
public LoveLockFurniFinishedComposer(InteractionLoveLock loveLock) { public FriendFurniCancelLockMessageComposer(InteractionLoveLock loveLock) {
this.loveLock = loveLock; this.loveLock = loveLock;
} }

4
src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniFriendConfirmedComposer.java → src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/FriendFurniOtherLockConfirmedMessageComposer.java
View File

@ -5,10 +5,10 @@ import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.MessageComposer;
import com.eu.habbo.messages.outgoing.Outgoing; import com.eu.habbo.messages.outgoing.Outgoing;
public class LoveLockFurniFriendConfirmedComposer extends MessageComposer { public class FriendFurniOtherLockConfirmedMessageComposer extends MessageComposer {
private final InteractionLoveLock loveLock; private final InteractionLoveLock loveLock;
public LoveLockFurniFriendConfirmedComposer(InteractionLoveLock loveLock) { public FriendFurniOtherLockConfirmedMessageComposer(InteractionLoveLock loveLock) {
this.loveLock = loveLock; this.loveLock = loveLock;
} }

4
src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniStartComposer.java → src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/FriendFurniStartConfirmationMessageComposer.java
View File

@ -5,10 +5,10 @@ import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.MessageComposer;
import com.eu.habbo.messages.outgoing.Outgoing; import com.eu.habbo.messages.outgoing.Outgoing;
public class LoveLockFurniStartComposer extends MessageComposer { public class FriendFurniStartConfirmationMessageComposer extends MessageComposer {
private final InteractionLoveLock loveLock; private final InteractionLoveLock loveLock;
public LoveLockFurniStartComposer(InteractionLoveLock loveLock) { public FriendFurniStartConfirmationMessageComposer(InteractionLoveLock loveLock) {
this.loveLock = loveLock; this.loveLock = loveLock;
} }

4
src/main/java/com/eu/habbo/messages/outgoing/unknown/RentableItemBuyOutPriceComposer.java → src/main/java/com/eu/habbo/messages/outgoing/unknown/FurniRentOrBuyoutOfferMessageComposer.java
View File

@ -4,7 +4,7 @@ import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.MessageComposer;
import com.eu.habbo.messages.outgoing.Outgoing; import com.eu.habbo.messages.outgoing.Outgoing;
public class RentableItemBuyOutPriceComposer extends MessageComposer { public class FurniRentOrBuyoutOfferMessageComposer extends MessageComposer {
private final boolean unknownBoolean1; private final boolean unknownBoolean1;
private final String unknownString1; private final String unknownString1;
private final boolean unknownBoolean2; private final boolean unknownBoolean2;
@ -12,7 +12,7 @@ public class RentableItemBuyOutPriceComposer extends MessageComposer {
private final int points; private final int points;
private final int pointsType; private final int pointsType;
public RentableItemBuyOutPriceComposer(boolean unknownBoolean1, String unknownString1, boolean unknownBoolean2, int credits, int points, int pointsType) { public FurniRentOrBuyoutOfferMessageComposer(boolean unknownBoolean1, String unknownString1, boolean unknownBoolean2, int credits, int points, int pointsType) {
this.unknownBoolean1 = unknownBoolean1; this.unknownBoolean1 = unknownBoolean1;
this.unknownString1 = unknownString1; this.unknownString1 = unknownString1;
this.unknownBoolean2 = unknownBoolean2; this.unknownBoolean2 = unknownBoolean2;

4
src/main/java/com/eu/habbo/messages/outgoing/unknown/UnkownPetPackageComposer.java → src/main/java/com/eu/habbo/messages/outgoing/unknown/FurnitureAliasesMessageComposer.java
View File

@ -6,10 +6,10 @@ import com.eu.habbo.messages.outgoing.Outgoing;
import java.util.Map; import java.util.Map;
public class UnkownPetPackageComposer extends MessageComposer { public class FurnitureAliasesMessageComposer extends MessageComposer {
private final Map<String, String> unknownMap; private final Map<String, String> unknownMap;
public UnkownPetPackageComposer(Map<String, String> unknownMap) { public FurnitureAliasesMessageComposer(Map<String, String> unknownMap) {
this.unknownMap = unknownMap; this.unknownMap = unknownMap;
} }

6
src/main/java/com/eu/habbo/messages/outgoing/users/FavoriteRoomsCountComposer.java → src/main/java/com/eu/habbo/messages/outgoing/users/FavouriteChangedComposer.java
View File

@ -7,10 +7,10 @@ import com.eu.habbo.messages.outgoing.MessageComposer;
import com.eu.habbo.messages.outgoing.Outgoing; import com.eu.habbo.messages.outgoing.Outgoing;
import gnu.trove.procedure.TIntProcedure; import gnu.trove.procedure.TIntProcedure;
public class FavoriteRoomsCountComposer extends MessageComposer { public class FavouriteChangedComposer extends MessageComposer {
private final Habbo habbo; private final Habbo habbo;
public FavoriteRoomsCountComposer(Habbo habbo) { public FavouriteChangedComposer(Habbo habbo) {
this.habbo = habbo; this.habbo = habbo;
} }
@ -22,7 +22,7 @@ public class FavoriteRoomsCountComposer extends MessageComposer {
this.habbo.getHabboStats().getFavoriteRooms().forEach(new TIntProcedure() { this.habbo.getHabboStats().getFavoriteRooms().forEach(new TIntProcedure() {
@Override @Override
public boolean execute(int value) { public boolean execute(int value) {
FavoriteRoomsCountComposer.this.response.appendInt(value); FavouriteChangedComposer.this.response.appendInt(value);
return true; return true;
} }
}); });

8
src/main/java/com/eu/habbo/messages/outgoing/users/UserClothesComposer.java → src/main/java/com/eu/habbo/messages/outgoing/users/FigureSetIdsComposer.java
View File

@ -10,11 +10,11 @@ import gnu.trove.procedure.TIntProcedure;
import java.util.ArrayList; import java.util.ArrayList;
public class UserClothesComposer extends MessageComposer { public class FigureSetIdsComposer extends MessageComposer {
private final ArrayList<Integer> idList = new ArrayList<>(); private final ArrayList<Integer> idList = new ArrayList<>();
private final ArrayList<String> nameList = new ArrayList<>(); private final ArrayList<String> nameList = new ArrayList<>();
public UserClothesComposer(Habbo habbo) { public FigureSetIdsComposer(Habbo habbo) {
habbo.getInventory().getWardrobeComponent().getClothing().forEach(new TIntProcedure() { habbo.getInventory().getWardrobeComponent().getClothing().forEach(new TIntProcedure() {
@Override @Override
public boolean execute(int value) { public boolean execute(int value) {
@ -22,10 +22,10 @@ public class UserClothesComposer extends MessageComposer {
if (item != null) { if (item != null) {
for (Integer j : item.setId) { for (Integer j : item.setId) {
UserClothesComposer.this.idList.add(j); FigureSetIdsComposer.this.idList.add(j);
} }
UserClothesComposer.this.nameList.add(item.name); FigureSetIdsComposer.this.nameList.add(item.name);
} }
return true; return true;

4
src/main/java/com/eu/habbo/messages/outgoing/users/UpdateUserLookComposer.java → src/main/java/com/eu/habbo/messages/outgoing/users/FigureUpdateComposer.java
View File

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

4
src/main/java/com/eu/habbo/messages/rcon/GiveUserClothing.java
View File

@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.gameclients.GameClient;
import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer;
import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys;
import com.eu.habbo.messages.outgoing.users.UserClothesComposer; import com.eu.habbo.messages.outgoing.users.FigureSetIdsComposer;
import com.google.gson.Gson; import com.google.gson.Gson;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -38,7 +38,7 @@ public class GiveUserClothing extends RCONMessage<GiveUserClothing.JSONGiveUserC
if (client != null) { if (client != null) {
habbo.getInventory().getWardrobeComponent().getClothing().add(object.clothing_id); habbo.getInventory().getWardrobeComponent().getClothing().add(object.clothing_id);
client.sendResponse(new UserClothesComposer(habbo)); client.sendResponse(new FigureSetIdsComposer(habbo));
client.sendResponse(new BubbleAlertComposer(BubbleAlertKeys.FIGURESET_REDEEMED.key)); client.sendResponse(new BubbleAlertComposer(BubbleAlertKeys.FIGURESET_REDEEMED.key));
} }
} }

4
src/main/java/com/eu/habbo/messages/rcon/SendGift.java
View File

@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.items.Item; import com.eu.habbo.habbohotel.items.Item;
import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
import com.google.gson.Gson; import com.google.gson.Gson;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -82,7 +82,7 @@ public class SendGift extends RCONMessage<SendGift.SendGiftJSON> {
this.message = Emulator.getTexts().getValue("commands.succes.cmd_gift").replace("%username%", username).replace("%itemname%", item.getBaseItem().getName()); this.message = Emulator.getTexts().getValue("commands.succes.cmd_gift").replace("%username%", username).replace("%itemname%", item.getBaseItem().getName());
if (habbo != null) { if (habbo != null) {
habbo.getClient().sendResponse(new InventoryRefreshComposer()); habbo.getClient().sendResponse(new FurniListInvalidateComposer());
} }
} }

4
src/main/java/com/eu/habbo/messages/rcon/UpdateUser.java
View File

@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.messages.outgoing.rooms.users.RoomUserDataComposer; import com.eu.habbo.messages.outgoing.rooms.users.RoomUserDataComposer;
import com.eu.habbo.messages.outgoing.users.AccountPreferencesComposer; import com.eu.habbo.messages.outgoing.users.AccountPreferencesComposer;
import com.eu.habbo.messages.outgoing.users.UpdateUserLookComposer; import com.eu.habbo.messages.outgoing.users.FigureUpdateComposer;
import com.google.gson.Gson; import com.google.gson.Gson;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -51,7 +51,7 @@ public class UpdateUser extends RCONMessage<UpdateUser.JSON> {
if (!json.look.isEmpty()) { if (!json.look.isEmpty()) {
habbo.getHabboInfo().setLook(json.look); habbo.getHabboInfo().setLook(json.look);
if (habbo.getClient() != null) { if (habbo.getClient() != null) {
habbo.getClient().sendResponse(new UpdateUserLookComposer(habbo).compose()); habbo.getClient().sendResponse(new FigureUpdateComposer(habbo).compose());
} }
if (habbo.getHabboInfo().getCurrentRoom() != null) { if (habbo.getHabboInfo().getCurrentRoom() != null) {

4
src/main/java/com/eu/habbo/threading/runnables/CrackableExplode.java
View File

@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer;
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
import com.eu.habbo.messages.outgoing.rooms.items.AddFloorItemComposer; import com.eu.habbo.messages.outgoing.rooms.items.AddFloorItemComposer;
import com.eu.habbo.messages.outgoing.rooms.items.RemoveFloorItemComposer; import com.eu.habbo.messages.outgoing.rooms.items.RemoveFloorItemComposer;
@ -55,7 +55,7 @@ public class CrackableExplode implements Runnable {
if (this.toInventory || newItem.getBaseItem().getType() == FurnitureType.WALL) { if (this.toInventory || newItem.getBaseItem().getType() == FurnitureType.WALL) {
this.habbo.getInventory().getItemsComponent().addItem(newItem); this.habbo.getInventory().getItemsComponent().addItem(newItem);
this.habbo.getClient().sendResponse(new AddHabboItemComposer(newItem)); this.habbo.getClient().sendResponse(new AddHabboItemComposer(newItem));
this.habbo.getClient().sendResponse(new InventoryRefreshComposer()); this.habbo.getClient().sendResponse(new FurniListInvalidateComposer());
} else { } else {
newItem.setX(this.x); newItem.setX(this.x);
newItem.setY(this.y); newItem.setY(this.y);

8
src/main/java/com/eu/habbo/threading/runnables/OpenGift.java
View File

@ -7,8 +7,8 @@ import com.eu.habbo.habbohotel.rooms.RoomTile;
import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer;
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
import com.eu.habbo.messages.outgoing.inventory.InventoryUpdateItemComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListAddOrUpdateComposer;
import com.eu.habbo.messages.outgoing.rooms.items.PresentItemOpenedComposer; import com.eu.habbo.messages.outgoing.rooms.items.PresentItemOpenedComposer;
import gnu.trove.set.hash.THashSet; import gnu.trove.set.hash.THashSet;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -59,7 +59,7 @@ public class OpenGift implements Runnable {
Emulator.getThreading().run(new QueryDeleteHabboItem(this.item.getId())); Emulator.getThreading().run(new QueryDeleteHabboItem(this.item.getId()));
Emulator.getThreading().run(new RemoveFloorItemTask(this.room, this.item), this.item.getBaseItem().getName().contains("present_wrap") ? 5000 : 0); Emulator.getThreading().run(new RemoveFloorItemTask(this.room, this.item), this.item.getBaseItem().getName().contains("present_wrap") ? 5000 : 0);
this.habbo.getClient().sendResponse(new InventoryRefreshComposer()); this.habbo.getClient().sendResponse(new FurniListInvalidateComposer());
Map<AddHabboItemComposer.AddHabboItemCategory, List<Integer>> unseenItems = new HashMap<>(); Map<AddHabboItemComposer.AddHabboItemCategory, List<Integer>> unseenItems = new HashMap<>();
@ -100,7 +100,7 @@ public class OpenGift implements Runnable {
this.habbo.getClient().sendResponse(new AddHabboItemComposer(unseenItems)); this.habbo.getClient().sendResponse(new AddHabboItemComposer(unseenItems));
if (inside != null) { if (inside != null) {
this.habbo.getClient().sendResponse(new InventoryUpdateItemComposer(inside)); this.habbo.getClient().sendResponse(new FurniListAddOrUpdateComposer(inside));
this.habbo.getClient().sendResponse(new PresentItemOpenedComposer(inside, "", false)); this.habbo.getClient().sendResponse(new PresentItemOpenedComposer(inside, "", false));
} }
} catch (Exception e) { } catch (Exception e) {