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

Yet another refactoring commit.

Browse Source
This commit is contained in:
Harmonic 2022-04-16 16:02:01 -07:00 committed by Harmonic
parent afd46b2bdd
commit 8c28bfd85a
118 changed files with 271 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/eu/habbo/Emulator.java
View File

@ -114,7 +114,7 @@ public final class Emulator {
// Checks if this is a BETA build before allowing them to continue.
if (PREVIEW.toLowerCase().contains("beta")) {
System.out.println("");
System.out.println();
promptEnterKey();
}
LOGGER.info("eek. Has it really been a year?");
@ -294,9 +294,6 @@ public final class Emulator {
}
Emulator.stopped = true;
// if (osName.startsWith("Windows") && (!classPath.contains("idea_rt.jar"))) {
// AnsiConsole.systemUninstall();
// }
try {
if (Emulator.threading != null)

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

@ -24,7 +24,7 @@ import com.eu.habbo.messages.outgoing.inventory.BotAddedToInventoryComposer;
import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer;
import com.eu.habbo.messages.outgoing.inventory.AddPetComposer;
import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
import com.eu.habbo.messages.outgoing.modtool.ModToolIssueHandledComposer;
import com.eu.habbo.messages.outgoing.modtool.IssueCloseNotificationMessageComposer;
import com.eu.habbo.messages.outgoing.users.BadgeReceivedComposer;
import com.eu.habbo.messages.outgoing.users.CreditBalanceComposer;
import com.eu.habbo.messages.outgoing.users.HabboActivityPointNotificationMessageComposer;
@ -539,7 +539,7 @@ public class CatalogManager {
}
if (voucher.hasUserExhausted(habbo.getHabboInfo().getId())) {
client.sendResponse(new ModToolIssueHandledComposer("You have exceeded the limit for redeeming this voucher."));
client.sendResponse(new IssueCloseNotificationMessageComposer("You have exceeded the limit for redeeming this voucher."));
return;
}
@ -833,7 +833,7 @@ public class CatalogManager {
if (item.isLimited()) {
amount = 1;
if (this.getLimitedConfig(item).available() == 0) {
habbo.getClient().sendResponse(new AlertLimitedSoldOutComposer());
habbo.getClient().sendResponse(new LimitedEditionSoldOutComposer());
return;
}

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

@ -6,8 +6,8 @@ import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.incoming.catalog.marketplace.RequestOffersEvent;
import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceBuyErrorComposer;
import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceCancelSaleComposer;
import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceBuyOfferResultComposer;
import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceCancelOfferResultComposer;
import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer;
import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
import com.eu.habbo.messages.outgoing.inventory.FurniListRemoveComposer;
@ -93,7 +93,7 @@ public class MarketPlace {
while (set.next()) {
HabboItem item = Emulator.getGameEnvironment().getItemManager().loadHabboItem(set);
habbo.getInventory().getItemsComponent().addItem(item);
habbo.getClient().sendResponse(new MarketplaceCancelSaleComposer(offer, true));
habbo.getClient().sendResponse(new MarketplaceCancelOfferResultComposer(offer, true));
habbo.getClient().sendResponse(new AddHabboItemComposer(item));
habbo.getClient().sendResponse(new FurniListInvalidateComposer());
}
@ -106,7 +106,7 @@ public class MarketPlace {
}
} catch (SQLException e) {
LOGGER.error("Caught SQL exception", e);
habbo.getClient().sendResponse(new MarketplaceCancelSaleComposer(offer, false));
habbo.getClient().sendResponse(new MarketplaceCancelOfferResultComposer(offer, false));
}
}
}
@ -256,7 +256,7 @@ public class MarketPlace {
if (set.getInt("state") != 1) {
sendErrorMessage(client, set.getInt("item_id"), offerId);
} else if ((MARKETPLACE_CURRENCY == 0 && price > client.getHabbo().getHabboInfo().getCredits()) || (MARKETPLACE_CURRENCY > 0 && price > client.getHabbo().getHabboInfo().getCurrencyAmount(MARKETPLACE_CURRENCY))) {
client.sendResponse(new MarketplaceBuyErrorComposer(MarketplaceBuyErrorComposer.NOT_ENOUGH_CREDITS, 0, offerId, price));
client.sendResponse(new MarketplaceBuyOfferResultComposer(MarketplaceBuyOfferResultComposer.NOT_ENOUGH_CREDITS, 0, offerId, price));
} else {
try (PreparedStatement updateOffer = connection.prepareStatement("UPDATE marketplace_items SET state = 2, sold_timestamp = ? WHERE id = ?")) {
updateOffer.setInt(1, Emulator.getIntUnixTimestamp());
@ -287,7 +287,7 @@ public class MarketPlace {
client.sendResponse(new CreditBalanceComposer(client.getHabbo()));
client.sendResponse(new AddHabboItemComposer(item));
client.sendResponse(new FurniListInvalidateComposer());
client.sendResponse(new MarketplaceBuyErrorComposer(MarketplaceBuyErrorComposer.REFRESH, 0, offerId, price));
client.sendResponse(new MarketplaceBuyOfferResultComposer(MarketplaceBuyOfferResultComposer.REFRESH, 0, offerId, price));
if (habbo != null) {
habbo.getInventory().getOffer(offerId).setState(MarketPlaceState.SOLD);
@ -320,10 +320,10 @@ public class MarketPlace {
try (ResultSet countSet = statement.executeQuery()) {
countSet.last();
if (countSet.getRow() == 0)
client.sendResponse(new MarketplaceBuyErrorComposer(MarketplaceBuyErrorComposer.SOLD_OUT, 0, offerId, 0));
client.sendResponse(new MarketplaceBuyOfferResultComposer(MarketplaceBuyOfferResultComposer.SOLD_OUT, 0, offerId, 0));
else {
countSet.first();
client.sendResponse(new MarketplaceBuyErrorComposer(MarketplaceBuyErrorComposer.UPDATES, countSet.getInt("count"), countSet.getInt("id"), MarketPlace.calculateCommision(countSet.getInt("price"))));
client.sendResponse(new MarketplaceBuyOfferResultComposer(MarketplaceBuyOfferResultComposer.UPDATES, countSet.getInt("count"), countSet.getInt("id"), MarketPlace.calculateCommision(countSet.getInt("price"))));
}
}
} catch (SQLException e) {

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

@ -3,8 +3,7 @@ package com.eu.habbo.habbohotel.commands;
import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.catalog.CatalogManager;
import com.eu.habbo.habbohotel.gameclients.GameClient;
import com.eu.habbo.habbohotel.users.HabboManager;
import com.eu.habbo.messages.outgoing.generic.alerts.MessagesForYouComposer;
import com.eu.habbo.messages.outgoing.generic.alerts.MOTDNotificationComposer;
import java.util.Collections;
import java.util.concurrent.TimeUnit;
@ -49,7 +48,7 @@ public class AboutCommand extends Command {
"<b>Thanks for using Arcturus. Report issues on the forums. http://arcturus.wf \r\r" +
" - The General";
gameClient.getHabbo().alert(message);
gameClient.sendResponse(new MessagesForYouComposer(Collections.singletonList(credits)));
gameClient.sendResponse(new MOTDNotificationComposer(Collections.singletonList(credits)));
return true;
}
}

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

@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.gameclients.GameClient;
import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles;
import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.generic.alerts.StaffAlertWithLinkComposer;
import com.eu.habbo.messages.outgoing.generic.alerts.ModeratorMessageComposer;
import java.util.Map;
@ -23,7 +23,7 @@ public class HotelAlertCommand extends Command {
message.append(params[i]).append(" ");
}
ServerMessage msg = new StaffAlertWithLinkComposer(message + "\r\n-" + gameClient.getHabbo().getHabboInfo().getUsername(), "").compose();
ServerMessage msg = new ModeratorMessageComposer(message + "\r\n-" + gameClient.getHabbo().getHabboInfo().getUsername(), "").compose();
for (Map.Entry<Integer, Habbo> set : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().entrySet()) {
Habbo habbo = set.getValue();

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

@ -2,7 +2,7 @@ package com.eu.habbo.habbohotel.commands;
import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.gameclients.GameClient;
import com.eu.habbo.messages.outgoing.generic.alerts.StaffAlertWithLinkComposer;
import com.eu.habbo.messages.outgoing.generic.alerts.ModeratorMessageComposer;
public class HotelAlertLinkCommand extends Command {
public HotelAlertLinkCommand() {
@ -24,7 +24,7 @@ public class HotelAlertLinkCommand extends Command {
message.append("\r\r-<b>").append(gameClient.getHabbo().getHabboInfo().getUsername()).append("</b>");
Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new StaffAlertWithLinkComposer(message.toString(), url).compose());
Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new ModeratorMessageComposer(message.toString(), url).compose());
return true;
}
}

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

@ -2,7 +2,7 @@ package com.eu.habbo.habbohotel.commands;
import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.gameclients.GameClient;
import com.eu.habbo.messages.outgoing.generic.alerts.MessagesForYouComposer;
import com.eu.habbo.messages.outgoing.generic.alerts.MOTDNotificationComposer;
import com.eu.habbo.plugin.HabboPlugin;
import java.util.Collections;
@ -22,7 +22,7 @@ public class PluginsCommand extends Command {
if (Emulator.getConfig().getBoolean("commands.plugins.oldstyle")) {
gameClient.sendResponse(new MessagesForYouComposer(Collections.singletonList(message.toString())));
gameClient.sendResponse(new MOTDNotificationComposer(Collections.singletonList(message.toString())));
} else {
gameClient.getHabbo().alert(message.toString());
}

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

@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.catalog.TargetOffer;
import com.eu.habbo.habbohotel.gameclients.GameClient;
import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.messages.outgoing.catalog.TargetedOfferComposer;
import com.eu.habbo.messages.outgoing.generic.alerts.MessagesForYouComposer;
import com.eu.habbo.messages.outgoing.generic.alerts.MOTDNotificationComposer;
import gnu.trove.map.hash.THashMap;
import java.util.ArrayList;
@ -43,7 +43,7 @@ public class PromoteTargetOfferCommand extends Command {
}
}
gameClient.sendResponse(new MessagesForYouComposer(message));
gameClient.sendResponse(new MOTDNotificationComposer(message));
} else {
int offerId = 0;
try {

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

@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.gameclients.GameClient;
import com.eu.habbo.habbohotel.rooms.Room;
import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles;
import com.eu.habbo.messages.outgoing.modtool.ModToolIssueHandledComposer;
import com.eu.habbo.messages.outgoing.modtool.IssueCloseNotificationMessageComposer;
public class RoomAlertCommand extends Command {
public RoomAlertCommand() {
@ -28,7 +28,7 @@ public class RoomAlertCommand extends Command {
Room room = gameClient.getHabbo().getHabboInfo().getCurrentRoom();
if (room != null) {
room.sendComposer(new ModToolIssueHandledComposer(message.toString()).compose());
room.sendComposer(new IssueCloseNotificationMessageComposer(message.toString()).compose());
return true;
}
}

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

@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.gameclients.GameClient;
import com.eu.habbo.habbohotel.messenger.Message;
import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles;
import com.eu.habbo.messages.outgoing.friends.FriendChatMessageComposer;
import com.eu.habbo.messages.outgoing.friends.NewConsoleMessageComposer;
public class StaffAlertCommand extends Command {
public StaffAlertCommand() {
@ -20,7 +20,7 @@ public class StaffAlertCommand extends Command {
}
Emulator.getGameEnvironment().getHabboManager().staffAlert(message + "\r\n-" + gameClient.getHabbo().getHabboInfo().getUsername());
Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new FriendChatMessageComposer(new Message(gameClient.getHabbo().getHabboInfo().getId(), -1, message.toString())).compose(), "acc_staff_chat", gameClient);
Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new NewConsoleMessageComposer(new Message(gameClient.getHabbo().getHabboInfo().getId(), -1, message.toString())).compose(), "acc_staff_chat", gameClient);
} else {
gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_staffalert.forgot_message"), RoomChatMessageBubbles.ALERT);
}

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

@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.gameclients.GameClient;
import com.eu.habbo.habbohotel.pets.PetData;
import com.eu.habbo.habbohotel.rooms.RoomUnit;
import com.eu.habbo.habbohotel.rooms.RoomUnitType;
import com.eu.habbo.messages.outgoing.generic.alerts.MessagesForYouComposer;
import com.eu.habbo.messages.outgoing.generic.alerts.MOTDNotificationComposer;
import com.eu.habbo.messages.outgoing.rooms.users.RoomUserRemoveComposer;
import java.util.ArrayList;
@ -30,7 +30,7 @@ public class TransformCommand extends Command {
petNames.append(line.replace("%id%", p.getType() + "").replace("%name%", p.getName())).append("\r");
}
gameClient.sendResponse(new MessagesForYouComposer(new String[]{petNames.toString()}));
gameClient.sendResponse(new MOTDNotificationComposer(new String[]{petNames.toString()}));
return true;
} else {
String petName = params[1];

2
src/main/java/com/eu/habbo/habbohotel/commands/UpdateCalendarCommand.java
View File

@ -3,8 +3,6 @@ package com.eu.habbo.habbohotel.commands;
import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.gameclients.GameClient;
import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles;
import com.eu.habbo.messages.outgoing.catalog.*;
import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceConfigComposer;
public class UpdateCalendarCommand extends Command {

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

@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.gameclients.GameClient;
import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles;
import com.eu.habbo.messages.outgoing.catalog.*;
import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceConfigComposer;
import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceConfigurationComposer;
public class UpdateCatalogCommand extends Command {
@ -18,7 +18,7 @@ public class UpdateCatalogCommand extends Command {
Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new CatalogPublishedMessageComposer());
Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new BuildersClubFurniCountMessageComposer(0));
Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new BundleDiscountRulesetMessageComposer());
Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new MarketplaceConfigComposer());
Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new MarketplaceConfigurationComposer());
Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new GiftWrappingConfigurationComposer());
Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new RecyclerLogicComposer());
Emulator.getGameEnvironment().getCraftingManager().reload();

4
src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionColorWheel.java
View File

@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.rooms.Room;
import com.eu.habbo.habbohotel.rooms.RoomUnit;
import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.rooms.items.WallItemUpdateComposer;
import com.eu.habbo.messages.outgoing.rooms.items.ItemUpdateMessageComposer;
import com.eu.habbo.threading.runnables.RandomDiceNumber;
import java.sql.ResultSet;
@ -51,7 +51,7 @@ public class InteractionColorWheel extends HabboItem {
if (this.rollTaks == null && !this.getExtradata().equalsIgnoreCase("-1")) {
this.setExtradata("-1");
room.sendComposer(new WallItemUpdateComposer(this).compose());
room.sendComposer(new ItemUpdateMessageComposer(this).compose());
Emulator.getThreading().run(this);
Emulator.getThreading().run(new RandomDiceNumber(this, room, this.getBaseItem().getStateCount()), 3000);
}

4
src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionRoomOMatic.java
View File

@ -3,7 +3,7 @@ package com.eu.habbo.habbohotel.items.interactions;
import com.eu.habbo.habbohotel.gameclients.GameClient;
import com.eu.habbo.habbohotel.items.Item;
import com.eu.habbo.habbohotel.rooms.Room;
import com.eu.habbo.messages.outgoing.navigator.OpenRoomCreationWindowComposer;
import com.eu.habbo.messages.outgoing.navigator.NoOwnedRoomsAlertMessageComposer;
import java.sql.ResultSet;
import java.sql.SQLException;
@ -20,7 +20,7 @@ public class InteractionRoomOMatic extends InteractionDefault {
@Override
public void onClick(GameClient client, Room room, Object[] objects) throws Exception {
if (client != null) {
client.sendResponse(new OpenRoomCreationWindowComposer());
client.sendResponse(new NoOwnedRoomsAlertMessageComposer());
}
}
}

4
src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetBreedingNest.java
View File

@ -12,7 +12,7 @@ import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.rooms.pets.PetPackageNameValidationComposer;
import com.eu.habbo.messages.outgoing.rooms.pets.breeding.PetBreedingCompleted;
import com.eu.habbo.messages.outgoing.rooms.pets.breeding.NestBreedingSuccessComposer;
import com.eu.habbo.messages.outgoing.rooms.pets.breeding.ConfirmBreedingRequestComposer;
import com.eu.habbo.threading.runnables.QueryDeleteHabboItem;
@ -159,7 +159,7 @@ public class InteractionPetBreedingNest extends HabboItem {
offspring.run();
InteractionPetBreedingNest.this.freePets();
habbo.getHabboInfo().getCurrentRoom().removeHabboItem(box);
habbo.getClient().sendResponse(new PetBreedingCompleted(offspring.getId(), Emulator.getGameEnvironment().getPetManager().getRarityForOffspring(offspring)));
habbo.getClient().sendResponse(new NestBreedingSuccessComposer(offspring.getId(), Emulator.getGameEnvironment().getPetManager().getRarityForOffspring(offspring)));
if (box.getBaseItem().getName().startsWith("pet_breeding_")) {
String boxType = box.getBaseItem().getName().replace("pet_breeding_", "");

4
src/main/java/com/eu/habbo/habbohotel/messenger/MessengerBuddy.java
View File

@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.habbohotel.users.HabboGender;
import com.eu.habbo.messages.ISerialize;
import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.friends.FriendChatMessageComposer;
import com.eu.habbo.messages.outgoing.friends.NewConsoleMessageComposer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -174,7 +174,7 @@ public class MessengerBuddy implements Runnable, ISerialize {
chatMessage.setMessage(Emulator.getGameEnvironment().getWordFilter().filter(chatMessage.getMessage(), from));
}
habbo.getClient().sendResponse(new FriendChatMessageComposer(chatMessage));
habbo.getClient().sendResponse(new NewConsoleMessageComposer(chatMessage));
}
@Override

18
src/main/java/com/eu/habbo/habbohotel/modtool/ModToolManager.java
View File

@ -9,9 +9,9 @@ import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.habbohotel.users.HabboInfo;
import com.eu.habbo.habbohotel.users.HabboManager;
import com.eu.habbo.messages.ClientMessage;
import com.eu.habbo.messages.outgoing.modtool.ModToolIssueHandledComposer;
import com.eu.habbo.messages.outgoing.modtool.ModToolIssueInfoComposer;
import com.eu.habbo.messages.outgoing.modtool.ModToolUserInfoComposer;
import com.eu.habbo.messages.outgoing.modtool.IssueCloseNotificationMessageComposer;
import com.eu.habbo.messages.outgoing.modtool.IssueInfoMessageComposer;
import com.eu.habbo.messages.outgoing.modtool.ModeratorUserInfoComposer;
import com.eu.habbo.plugin.events.support.*;
import com.eu.habbo.threading.runnables.InsertModToolIssue;
import gnu.trove.TCollections;
@ -58,7 +58,7 @@ public class ModToolManager {
statement.setInt(1, userId);
try (ResultSet set = statement.executeQuery()) {
while (set.next()) {
client.sendResponse(new ModToolUserInfoComposer(set));
client.sendResponse(new ModeratorUserInfoComposer(set));
}
}
} catch (SQLException e) {
@ -402,7 +402,7 @@ public class ModToolManager {
return;
if (target != null)
alertedEvent.target.getClient().sendResponse(new ModToolIssueHandledComposer(alertedEvent.message));
alertedEvent.target.getClient().sendResponse(new IssueCloseNotificationMessageComposer(alertedEvent.message));
}
public void kick(Habbo moderator, Habbo target, String message) {
@ -592,7 +592,7 @@ public class ModToolManager {
SupportTicketStatusChangedEvent event = new SupportTicketStatusChangedEvent(null, issue);
if (!Emulator.getPluginManager().fireEvent(event).isCancelled()) {
Emulator.getGameEnvironment().getHabboManager().sendPacketToHabbosWithPermission(new ModToolIssueInfoComposer(issue).compose(), Permission.ACC_SUPPORTTOOL);
Emulator.getGameEnvironment().getHabboManager().sendPacketToHabbosWithPermission(new IssueInfoMessageComposer(issue).compose(), Permission.ACC_SUPPORTTOOL);
}
}
@ -624,7 +624,7 @@ public class ModToolManager {
issue.updateInDatabase();
if (sender != null) {
sender.getClient().sendResponse(new ModToolIssueHandledComposer(ModToolIssueHandledComposer.USELESS));
sender.getClient().sendResponse(new IssueCloseNotificationMessageComposer(IssueCloseNotificationMessageComposer.USELESS));
}
this.updateTicketToMods(issue);
@ -636,7 +636,7 @@ public class ModToolManager {
issue.state = ModToolTicketState.CLOSED;
issue.updateInDatabase();
if (sender != null) {
sender.getClient().sendResponse(new ModToolIssueHandledComposer(ModToolIssueHandledComposer.ABUSIVE));
sender.getClient().sendResponse(new IssueCloseNotificationMessageComposer(IssueCloseNotificationMessageComposer.ABUSIVE));
}
this.updateTicketToMods(issue);
@ -649,7 +649,7 @@ public class ModToolManager {
issue.updateInDatabase();
if (sender != null) {
sender.getClient().sendResponse(new ModToolIssueHandledComposer(ModToolIssueHandledComposer.HANDLED));
sender.getClient().sendResponse(new IssueCloseNotificationMessageComposer(IssueCloseNotificationMessageComposer.HANDLED));
}
this.updateTicketToMods(issue);

4
src/main/java/com/eu/habbo/habbohotel/modtool/WordFilter.java
View File

@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.messenger.Message;
import com.eu.habbo.habbohotel.rooms.RoomChatMessage;
import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.messages.outgoing.friends.FriendChatMessageComposer;
import com.eu.habbo.messages.outgoing.friends.NewConsoleMessageComposer;
import com.eu.habbo.plugin.events.users.UserTriggerWordFilterEvent;
import gnu.trove.iterator.hash.TObjectHashIterator;
import gnu.trove.set.hash.THashSet;
@ -99,7 +99,7 @@ public class WordFilter {
Emulator.getGameEnvironment().getModToolManager().quickTicket(roomChatMessage.getHabbo(), "Automatic WordFilter", roomChatMessage.getMessage());
if (Emulator.getConfig().getBoolean("notify.staff.chat.auto.report")) {
Emulator.getGameEnvironment().getHabboManager().sendPacketToHabbosWithPermission(new FriendChatMessageComposer(new Message(roomChatMessage.getHabbo().getHabboInfo().getId(), 0, Emulator.getTexts().getValue("warning.auto.report").replace("%user%", roomChatMessage.getHabbo().getHabboInfo().getUsername()).replace("%word%", word.key))).compose(), "acc_staff_chat");
Emulator.getGameEnvironment().getHabboManager().sendPacketToHabbosWithPermission(new NewConsoleMessageComposer(new Message(roomChatMessage.getHabbo().getHabboInfo().getId(), 0, Emulator.getTexts().getValue("warning.auto.report").replace("%user%", roomChatMessage.getHabbo().getHabboInfo().getUsername()).replace("%word%", word.key))).compose(), "acc_staff_chat");
}
return true;
}

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

@ -700,7 +700,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
this.updateBotsAt(tile.x, tile.y);
}
} else if (item.getBaseItem().getType() == FurnitureType.WALL) {
this.sendComposer(new RemoveWallItemComposer(item).compose());
this.sendComposer(new ItemRemoveMessageComposer(item).compose());
}
Habbo habbo = (picker != null && picker.getHabboInfo().getId() == item.getId() ? picker : Emulator.getGameServer().getGameClientManager().getHabbo(item.getUserId()));
@ -4160,7 +4160,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
this.sendComposer(new FloorItemUpdateComposer(item).compose());
this.updateTiles(this.getLayout().getTilesAt(this.layout.getTile(item.getX(), item.getY()), item.getBaseItem().getWidth(), item.getBaseItem().getLength(), item.getRotation()));
} else if (item.getBaseItem().getType() == FurnitureType.WALL) {
this.sendComposer(new WallItemUpdateComposer(item).compose());
this.sendComposer(new ItemUpdateMessageComposer(item).compose());
}
}
}
@ -4630,7 +4630,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
if (!this.furniOwnerNames.containsKey(item.getUserId()) && owner != null) {
this.furniOwnerNames.put(item.getUserId(), owner.getHabboInfo().getUsername());
}
this.sendComposer(new AddWallItemComposer(item, this.getFurniOwnerName(item.getUserId())).compose());
this.sendComposer(new ItemAddMessageComposer(item, this.getFurniOwnerName(item.getUserId())).compose());
item.needsUpdate(true);
this.addHabboItem(item);
item.setRoomId(this.id);

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

@ -36,7 +36,7 @@ import com.eu.habbo.messages.outgoing.polls.infobus.SimplePollAnswersComposer;
import com.eu.habbo.messages.outgoing.polls.infobus.SimplePollStartComposer;
import com.eu.habbo.messages.outgoing.rooms.*;
import com.eu.habbo.messages.outgoing.rooms.items.RoomFloorItemsComposer;
import com.eu.habbo.messages.outgoing.rooms.items.RoomWallItemsComposer;
import com.eu.habbo.messages.outgoing.rooms.items.ItemsComposer;
import com.eu.habbo.messages.outgoing.rooms.pets.RoomPetComposer;
import com.eu.habbo.messages.outgoing.rooms.promotions.RoomPromotionMessageComposer;
import com.eu.habbo.messages.outgoing.rooms.users.*;
@ -785,7 +785,7 @@ public class RoomManager {
habbo.getClient().sendResponse(new GetGuestRoomResultComposer(room, habbo.getClient().getHabbo(), false, true));
habbo.getClient().sendResponse(new RoomWallItemsComposer(room));
habbo.getClient().sendResponse(new ItemsComposer(room));
{
final THashSet<HabboItem> floorItems = new THashSet<>();

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

@ -16,7 +16,7 @@ import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
import com.eu.habbo.messages.outgoing.inventory.FurniListRemoveComposer;
import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxMySongsComposer;
import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxNowPlayingMessageComposer;
import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxPlayListComposer;
import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeboxSongDisksMessageComposer;
import gnu.trove.map.hash.THashMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -268,7 +268,7 @@ public class TraxManager implements Disposable {
return;
}
this.room.sendComposer(new JukeBoxPlayListComposer(this.songs, this.totalLength).compose());
this.room.sendComposer(new JukeboxSongDisksMessageComposer(this.songs, this.totalLength).compose());
musicDisc.setRoomId(-1);
musicDisc.needsUpdate(true);
@ -296,7 +296,7 @@ public class TraxManager implements Disposable {
this.play(this.playingIndex);
}
this.room.sendComposer(new JukeBoxPlayListComposer(this.songs, this.totalLength).compose());
this.room.sendComposer(new JukeboxSongDisksMessageComposer(this.songs, this.totalLength).compose());
musicDisc.setRoomId(0);
musicDisc.needsUpdate(true);

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

@ -307,7 +307,7 @@ public class Habbo implements Runnable {
public void alert(String message) {
if (Emulator.getConfig().getBoolean("hotel.alert.oldstyle")) {
this.client.sendResponse(new MessagesForYouComposer(new String[]{message}));
this.client.sendResponse(new MOTDNotificationComposer(new String[]{message}));
} else {
this.client.sendResponse(new HabboBroadcastMessageComposer(message));
}
@ -315,12 +315,12 @@ public class Habbo implements Runnable {
public void alert(String[] messages) {
this.client.sendResponse(new MessagesForYouComposer(messages));
this.client.sendResponse(new MOTDNotificationComposer(messages));
}
public void alertWithUrl(String message, String url) {
this.client.sendResponse(new StaffAlertWithLinkComposer(message, url));
this.client.sendResponse(new ModeratorMessageComposer(message, url));
}

8
src/main/java/com/eu/habbo/habbohotel/users/HabboManager.java
View File

@ -6,9 +6,9 @@ import com.eu.habbo.habbohotel.permissions.Permission;
import com.eu.habbo.habbohotel.permissions.Rank;
import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.catalog.*;
import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceConfigComposer;
import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceConfigurationComposer;
import com.eu.habbo.messages.outgoing.generic.alerts.HabboBroadcastMessageComposer;
import com.eu.habbo.messages.outgoing.modtool.ModToolComposer;
import com.eu.habbo.messages.outgoing.modtool.ModeratorInitMessageComposer;
import com.eu.habbo.messages.outgoing.users.UserPerksComposer;
import com.eu.habbo.messages.outgoing.users.UserPermissionsComposer;
import com.eu.habbo.plugin.events.users.UserRankChangedEvent;
@ -270,14 +270,14 @@ public class HabboManager {
habbo.getClient().sendResponse(new UserPerksComposer(habbo));
if (habbo.hasPermission(Permission.ACC_SUPPORTTOOL)) {
habbo.getClient().sendResponse(new ModToolComposer(habbo));
habbo.getClient().sendResponse(new ModeratorInitMessageComposer(habbo));
}
habbo.getHabboInfo().run();
habbo.getClient().sendResponse(new CatalogPublishedMessageComposer());
habbo.getClient().sendResponse(new BuildersClubFurniCountMessageComposer(0));
habbo.getClient().sendResponse(new BundleDiscountRulesetMessageComposer());
habbo.getClient().sendResponse(new MarketplaceConfigComposer());
habbo.getClient().sendResponse(new MarketplaceConfigurationComposer());
habbo.getClient().sendResponse(new GiftWrappingConfigurationComposer());
habbo.getClient().sendResponse(new RecyclerLogicComposer());
habbo.alert(Emulator.getTexts().getValue("commands.generic.cmd_give_rank.new_rank").replace("id", newRank.getName()));

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

@ -162,7 +162,7 @@ public class CatalogBuyItemAsGiftEvent extends MessageHandler {
if (item.isLimited()) {
if (item.getLimitedStack() == item.getLimitedSells()) {
this.client.sendResponse(new AlertLimitedSoldOutComposer());
this.client.sendResponse(new LimitedEditionSoldOutComposer());
return;
}
item.sellRare();
@ -182,7 +182,7 @@ public class CatalogBuyItemAsGiftEvent extends MessageHandler {
if (item.isLimited()) {
count = 1;
if (Emulator.getGameEnvironment().getCatalogManager().getLimitedConfig(item).available() == 0 && habbo != null) {
habbo.getClient().sendResponse(new AlertLimitedSoldOutComposer());
habbo.getClient().sendResponse(new LimitedEditionSoldOutComposer());
return;
}

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

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

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

@ -1,7 +1,7 @@
package com.eu.habbo.messages.incoming.catalog.marketplace;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceItemInfoComposer;
import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceItemStatsComposer;
public class RequestItemInfoEvent extends MessageHandler {
@Override
@ -9,6 +9,6 @@ public class RequestItemInfoEvent extends MessageHandler {
this.packet.readInt();
int id = this.packet.readInt();
this.client.sendResponse(new MarketplaceItemInfoComposer(id));
this.client.sendResponse(new MarketplaceItemStatsComposer(id));
}
}

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

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

6
src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RequestSellItemEvent.java
View File

@ -2,14 +2,14 @@ package com.eu.habbo.messages.incoming.catalog.marketplace;
import com.eu.habbo.habbohotel.catalog.marketplace.MarketPlace;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceSellItemComposer;
import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceCanMakeOfferResult;
public class RequestSellItemEvent extends MessageHandler {
@Override
public void handle() throws Exception {
if (MarketPlace.MARKETPLACE_ENABLED)
this.client.sendResponse(new MarketplaceSellItemComposer(1, 0, 0));
this.client.sendResponse(new MarketplaceCanMakeOfferResult(1, 0, 0));
else
this.client.sendResponse(new MarketplaceSellItemComposer(3, 0, 0));
this.client.sendResponse(new MarketplaceCanMakeOfferResult(3, 0, 0));
}
}

8
src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/SellItemEvent.java
View File

@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.modtool.ScripterManager;
import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.catalog.AlertPurchaseFailedComposer;
import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceItemPostedComposer;
import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceMakeOfferResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -16,7 +16,7 @@ public class SellItemEvent extends MessageHandler {
@Override
public void handle() throws Exception {
if (!MarketPlace.MARKETPLACE_ENABLED) {
this.client.sendResponse(new MarketplaceItemPostedComposer(MarketplaceItemPostedComposer.MARKETPLACE_DISABLED));
this.client.sendResponse(new MarketplaceMakeOfferResult(MarketplaceMakeOfferResult.MARKETPLACE_DISABLED));
return;
}
@ -44,9 +44,9 @@ public class SellItemEvent extends MessageHandler {
}
if (MarketPlace.sellItem(this.client, item, credits)) {
this.client.sendResponse(new MarketplaceItemPostedComposer(MarketplaceItemPostedComposer.POST_SUCCESS));
this.client.sendResponse(new MarketplaceMakeOfferResult(MarketplaceMakeOfferResult.POST_SUCCESS));
} else {
this.client.sendResponse(new MarketplaceItemPostedComposer(MarketplaceItemPostedComposer.FAILED_TECHNICAL_ERROR));
this.client.sendResponse(new MarketplaceMakeOfferResult(MarketplaceMakeOfferResult.FAILED_TECHNICAL_ERROR));
}
}
}

4
src/main/java/com/eu/habbo/messages/incoming/crafting/CraftingAddRecipeEvent.java
View File

@ -3,7 +3,7 @@ package com.eu.habbo.messages.incoming.crafting;
import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.crafting.CraftingRecipe;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.catalog.AlertLimitedSoldOutComposer;
import com.eu.habbo.messages.outgoing.catalog.LimitedEditionSoldOutComposer;
import com.eu.habbo.messages.outgoing.crafting.CraftingRecipeComposer;
public class CraftingAddRecipeEvent extends MessageHandler {
@ -14,7 +14,7 @@ public class CraftingAddRecipeEvent extends MessageHandler {
if (recipe != null) {
if (!recipe.canBeCrafted()) {
this.client.sendResponse(new AlertLimitedSoldOutComposer());
this.client.sendResponse(new LimitedEditionSoldOutComposer());
return;
}

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

@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.crafting.CraftingRecipe;
import com.eu.habbo.habbohotel.items.Item;
import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.catalog.AlertLimitedSoldOutComposer;
import com.eu.habbo.messages.outgoing.catalog.LimitedEditionSoldOutComposer;
import com.eu.habbo.messages.outgoing.crafting.CraftingResultComposer;
import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer;
import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
@ -27,7 +27,7 @@ public class CraftingCraftItemEvent extends MessageHandler {
if (recipe != null) {
if (!recipe.canBeCrafted()) {
this.client.sendResponse(new AlertLimitedSoldOutComposer());
this.client.sendResponse(new LimitedEditionSoldOutComposer());
return;
}

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

@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.crafting.CraftingRecipe;
import com.eu.habbo.habbohotel.items.Item;
import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.catalog.AlertLimitedSoldOutComposer;
import com.eu.habbo.messages.outgoing.catalog.LimitedEditionSoldOutComposer;
import com.eu.habbo.messages.outgoing.crafting.CraftingResultComposer;
import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer;
import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer;
@ -55,7 +55,7 @@ public class CraftingCraftSecretEvent extends MessageHandler {
if (recipe != null) {
if (!recipe.canBeCrafted()) {
this.client.sendResponse(new AlertLimitedSoldOutComposer());
this.client.sendResponse(new LimitedEditionSoldOutComposer());
return;
}

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

@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.messenger.Messenger;
import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.habbohotel.users.HabboInfo;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.friends.FriendRequestErrorComposer;
import com.eu.habbo.messages.outgoing.friends.MessengerErrorComposer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -41,7 +41,7 @@ public class AcceptFriendRequestEvent extends MessageHandler {
HabboInfo habboInfo = getOfflineHabboInfo(userId);
if(habboInfo == null) {
this.client.sendResponse(new FriendRequestErrorComposer(FriendRequestErrorComposer.TARGET_NOT_FOUND));
this.client.sendResponse(new MessengerErrorComposer(MessengerErrorComposer.TARGET_NOT_FOUND));
this.client.getHabbo().getMessenger().deleteFriendRequests(userId, this.client.getHabbo().getHabboInfo().getId());
continue;
}
@ -60,18 +60,18 @@ public class AcceptFriendRequestEvent extends MessageHandler {
}
if(target == null) {
this.client.sendResponse(new FriendRequestErrorComposer(FriendRequestErrorComposer.TARGET_NOT_FOUND));
this.client.sendResponse(new MessengerErrorComposer(MessengerErrorComposer.TARGET_NOT_FOUND));
this.client.getHabbo().getMessenger().deleteFriendRequests(userId, this.client.getHabbo().getHabboInfo().getId());
continue;
}
if(this.client.getHabbo().getMessenger().getFriends().size() >= this.client.getHabbo().getHabboStats().maxFriends && !this.client.getHabbo().hasPermission("acc_infinite_friends")) {
this.client.sendResponse(new FriendRequestErrorComposer(FriendRequestErrorComposer.FRIEND_LIST_OWN_FULL));
this.client.sendResponse(new MessengerErrorComposer(MessengerErrorComposer.FRIEND_LIST_OWN_FULL));
break;
}
if(target.getMessenger().getFriends().size() >= target.getHabboStats().maxFriends && !target.hasPermission("acc_infinite_friends")) {
this.client.sendResponse(new FriendRequestErrorComposer(FriendRequestErrorComposer.FRIEND_LIST_TARGET_FULL));
this.client.sendResponse(new MessengerErrorComposer(MessengerErrorComposer.FRIEND_LIST_TARGET_FULL));
continue;
}

17
src/main/java/com/eu/habbo/messages/incoming/friends/FriendRequestEvent.java
View File

@ -1,12 +1,11 @@
package com.eu.habbo.messages.incoming.friends;
import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.messenger.FriendRequest;
import com.eu.habbo.habbohotel.messenger.Messenger;
import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.friends.FriendRequestComposer;
import com.eu.habbo.messages.outgoing.friends.FriendRequestErrorComposer;
import com.eu.habbo.messages.outgoing.friends.NewFriendRequestComposer;
import com.eu.habbo.messages.outgoing.friends.MessengerErrorComposer;
import com.eu.habbo.plugin.events.users.friends.UserRequestFriendshipEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -47,7 +46,7 @@ public class FriendRequestEvent extends MessageHandler {
}
if (targetHabbo == null) {
this.client.sendResponse(new FriendRequestErrorComposer(FriendRequestErrorComposer.TARGET_NOT_FOUND));
this.client.sendResponse(new MessengerErrorComposer(MessengerErrorComposer.TARGET_NOT_FOUND));
return;
}
@ -61,30 +60,30 @@ public class FriendRequestEvent extends MessageHandler {
// Target Habbo exists
// Check if Habbo is accepting friend requests
if (targetBlocksFriendRequests) {
this.client.sendResponse(new FriendRequestErrorComposer(FriendRequestErrorComposer.TARGET_NOT_ACCEPTING_REQUESTS));
this.client.sendResponse(new MessengerErrorComposer(MessengerErrorComposer.TARGET_NOT_ACCEPTING_REQUESTS));
return;
}
// You can only have x friends
if (this.client.getHabbo().getMessenger().getFriends().values().size() >= this.client.getHabbo().getHabboStats().maxFriends && !this.client.getHabbo().hasPermission("acc_infinite_friends")) {
this.client.sendResponse(new FriendRequestErrorComposer(FriendRequestErrorComposer.FRIEND_LIST_OWN_FULL));
this.client.sendResponse(new MessengerErrorComposer(MessengerErrorComposer.FRIEND_LIST_OWN_FULL));
return;
}
// Check if targets friendlist is full
if (targetHabbo.getMessenger().getFriends().values().size() >= targetHabbo.getHabboStats().maxFriends && !targetHabbo.hasPermission("acc_infinite_friends")) {
this.client.sendResponse(new FriendRequestErrorComposer(FriendRequestErrorComposer.FRIEND_LIST_TARGET_FULL));
this.client.sendResponse(new MessengerErrorComposer(MessengerErrorComposer.FRIEND_LIST_TARGET_FULL));
return;
}
// Allow plugins to cancel the request
if (Emulator.getPluginManager().fireEvent(new UserRequestFriendshipEvent(this.client.getHabbo(), username, targetHabbo)).isCancelled()) {
this.client.sendResponse(new FriendRequestErrorComposer(2));
this.client.sendResponse(new MessengerErrorComposer(2));
return;
}
if(targetHabbo.isOnline()) {
targetHabbo.getClient().sendResponse(new FriendRequestComposer(this.client.getHabbo()));
targetHabbo.getClient().sendResponse(new NewFriendRequestComposer(this.client.getHabbo()));
}
Messenger.makeFriendRequest(this.client.getHabbo().getHabboInfo().getId(), targetId);

14
src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameCenterJoinGameEvent.java
View File

@ -2,9 +2,9 @@ package com.eu.habbo.messages.incoming.gamecenter;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.gamecenter.GameCenterAchievementsConfigurationComposer;
import com.eu.habbo.messages.outgoing.gamecenter.basejump.BaseJumpJoinQueueComposer;
import com.eu.habbo.messages.outgoing.gamecenter.basejump.BaseJumpLoadGameComposer;
import com.eu.habbo.messages.outgoing.gamecenter.basejump.BaseJumpLoadGameURLComposer;
import com.eu.habbo.messages.outgoing.gamecenter.basejump.JoinedQueueMessageComposer;
import com.eu.habbo.messages.outgoing.gamecenter.basejump.LoadGameMessageComposer;
import com.eu.habbo.messages.outgoing.gamecenter.basejump.LoadGameUrlMessageComposer;
public class GameCenterJoinGameEvent extends MessageHandler {
@Override
@ -14,11 +14,11 @@ public class GameCenterJoinGameEvent extends MessageHandler {
if (gameId == 3) //BaseJump
{
this.client.sendResponse(new GameCenterAchievementsConfigurationComposer());
this.client.sendResponse(new BaseJumpLoadGameURLComposer());
this.client.sendResponse(new BaseJumpLoadGameComposer(this.client, 3));
this.client.sendResponse(new LoadGameUrlMessageComposer());
this.client.sendResponse(new LoadGameMessageComposer(this.client, 3));
} else if (gameId == 4) {
this.client.sendResponse(new BaseJumpJoinQueueComposer(4));
this.client.sendResponse(new BaseJumpLoadGameURLComposer());
this.client.sendResponse(new JoinedQueueMessageComposer(4));
this.client.sendResponse(new LoadGameUrlMessageComposer());
}
}
}

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

@ -1,11 +1,11 @@
package com.eu.habbo.messages.incoming.handshake;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.handshake.PongComposer;
import com.eu.habbo.messages.outgoing.handshake.LatencyPingResponseMessageComposer;
public class PingEvent extends MessageHandler {
@Override
public void handle() throws Exception {
this.client.sendResponse(new PongComposer(this.packet.readInt()));
this.client.sendResponse(new LatencyPingResponseMessageComposer(this.packet.readInt()));
}
}

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

@ -22,8 +22,8 @@ import com.eu.habbo.messages.outgoing.events.calendar.CampaignCalendarDataMessag
import com.eu.habbo.messages.outgoing.gamecenter.Game2AccountGameStatusMessageComposer;
import com.eu.habbo.messages.outgoing.gamecenter.GameListMessageComposer;
import com.eu.habbo.messages.outgoing.generic.alerts.HabboBroadcastMessageComposer;
import com.eu.habbo.messages.outgoing.generic.alerts.MessagesForYouComposer;
import com.eu.habbo.messages.outgoing.habboway.nux.NewUserIdentityComposer;
import com.eu.habbo.messages.outgoing.generic.alerts.MOTDNotificationComposer;
import com.eu.habbo.messages.outgoing.habboway.nux.NoobnessLevelMessageComposer;
import com.eu.habbo.messages.outgoing.habboway.nux.InClientLinkMessageComposer;
import com.eu.habbo.messages.outgoing.handshake.EnableNotificationsComposer;
import com.eu.habbo.messages.outgoing.handshake.AuthenticationOKMessageComposer;
@ -32,11 +32,11 @@ import com.eu.habbo.messages.outgoing.handshake.PingComposer;
import com.eu.habbo.messages.outgoing.inventory.BadgePointLimitsComposer;
import com.eu.habbo.messages.outgoing.inventory.AvatarEffectsMessageComposer;
import com.eu.habbo.messages.outgoing.modtool.CfhTopicsInitComposer;
import com.eu.habbo.messages.outgoing.modtool.ModToolComposer;
import com.eu.habbo.messages.outgoing.modtool.ModeratorInitMessageComposer;
import com.eu.habbo.messages.outgoing.modtool.ModToolSanctionInfoComposer;
import com.eu.habbo.messages.outgoing.navigator.*;
import com.eu.habbo.messages.outgoing.unknown.BuildersClubSubscriptionStatusMessageComposer;
import com.eu.habbo.messages.outgoing.mysterybox.MysteryBoxKeysComposer;
import com.eu.habbo.messages.outgoing.mysterybox.MysteryBoxKeysMessageComposer;
import com.eu.habbo.messages.outgoing.users.*;
import com.eu.habbo.plugin.events.emulator.SSOAuthenticationEvent;
import com.eu.habbo.plugin.events.users.UserLoginEvent;
@ -200,17 +200,17 @@ public class SecureLoginEvent extends MessageHandler {
}
}
messages.add(new UserHomeRoomComposer(this.client.getHabbo().getHabboInfo().getHomeRoom(), roomIdToEnter).compose());
messages.add(new NavigatorSettingsComposer(this.client.getHabbo().getHabboInfo().getHomeRoom(), roomIdToEnter).compose());
messages.add(new AvatarEffectsMessageComposer(habbo, this.client.getHabbo().getInventory().getEffectsComponent().effects.values()).compose());
messages.add(new FigureSetIdsComposer(this.client.getHabbo()).compose());
messages.add(new NewUserIdentityComposer(habbo).compose());
messages.add(new NoobnessLevelMessageComposer(habbo).compose());
messages.add(new UserPermissionsComposer(this.client.getHabbo()).compose());
messages.add(new AvailabilityStatusMessageComposer(true, false, true).compose());
messages.add(new PingComposer().compose());
messages.add(new EnableNotificationsComposer(Emulator.getConfig().getBoolean("bubblealerts.enabled", true)).compose());
messages.add(new AchievementsScoreComposer(this.client.getHabbo()).compose());
messages.add(new IsFirstLoginOfDayComposer(true).compose());
messages.add(new MysteryBoxKeysComposer().compose());
messages.add(new MysteryBoxKeysMessageComposer().compose());
messages.add(new BuildersClubSubscriptionStatusMessageComposer().compose());
messages.add(new CfhTopicsInitComposer().compose());
messages.add(new FavouriteChangedComposer(this.client.getHabbo()).compose());
@ -221,7 +221,7 @@ public class SecureLoginEvent extends MessageHandler {
messages.add(new UserClubComposer(this.client.getHabbo(), SubscriptionHabboClub.HABBO_CLUB, UserClubComposer.RESPONSE_TYPE_LOGIN).compose());
if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) {
messages.add(new ModToolComposer(this.client.getHabbo()).compose());
messages.add(new ModeratorInitMessageComposer(this.client.getHabbo()).compose());
}
@ -289,7 +289,7 @@ public class SecureLoginEvent extends MessageHandler {
final Habbo finalHabbo = habbo;
Emulator.getThreading().run(() -> {
if (Emulator.getConfig().getBoolean("hotel.welcome.alert.oldstyle")) {
SecureLoginEvent.this.client.sendResponse(new MessagesForYouComposer(HabboManager.WELCOME_MESSAGE.replace("%username%", finalHabbo.getHabboInfo().getUsername()).replace("%user%", finalHabbo.getHabboInfo().getUsername()).split("<br/>")));
SecureLoginEvent.this.client.sendResponse(new MOTDNotificationComposer(HabboManager.WELCOME_MESSAGE.replace("%username%", finalHabbo.getHabboInfo().getUsername()).replace("%user%", finalHabbo.getHabboInfo().getUsername()).split("<br/>")));
} else {
SecureLoginEvent.this.client.sendResponse(new HabboBroadcastMessageComposer(HabboManager.WELCOME_MESSAGE.replace("%username%", finalHabbo.getHabboInfo().getUsername()).replace("%user%", finalHabbo.getHabboInfo().getUsername())));
}
@ -312,7 +312,7 @@ public class SecureLoginEvent extends MessageHandler {
habbo.getHabboInfo().addSavedSearch(new NavigatorSavedSearch("my", ""));
habbo.getHabboInfo().addSavedSearch(new NavigatorSavedSearch("favorites", ""));
this.client.sendResponse(new NewNavigatorSavedSearchesComposer(this.client.getHabbo().getHabboInfo().getSavedSearches()));
this.client.sendResponse(new NavigatorSavedSearchesComposer(this.client.getHabbo().getHabboInfo().getSavedSearches()));
}
} else {
Emulator.getGameServer().getGameClientManager().disposeClient(this.client);

4
src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewRequestLTDAvailabilityEvent.java
View File

@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.hotelview;
import com.eu.habbo.Emulator;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.hotelview.HotelViewNextLTDAvailableComposer;
import com.eu.habbo.messages.outgoing.hotelview.LimitedOfferAppearingNextMessageComposer;
public class HotelViewRequestLTDAvailabilityEvent extends MessageHandler {
public static boolean ENABLED = false;
@ -15,7 +15,7 @@ public class HotelViewRequestLTDAvailabilityEvent extends MessageHandler {
public void handle() throws Exception {
if (ENABLED) {
int timeremaining = Math.max(TIMESTAMP - Emulator.getIntUnixTimestamp(), -1);
this.client.sendResponse(new HotelViewNextLTDAvailableComposer(
this.client.sendResponse(new LimitedOfferAppearingNextMessageComposer(
timeremaining,
timeremaining > 0 ? -1 : ITEM_ID,
timeremaining > 0 ? -1 : PAGE_ID,

4
src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolPickTicketEvent.java
View File

@ -6,7 +6,7 @@ import com.eu.habbo.habbohotel.modtool.ModToolTicketState;
import com.eu.habbo.habbohotel.modtool.ScripterManager;
import com.eu.habbo.habbohotel.permissions.Permission;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.modtool.ModToolIssueInfoComposer;
import com.eu.habbo.messages.outgoing.modtool.IssueInfoMessageComposer;
public class ModToolPickTicketEvent extends MessageHandler {
public static boolean send = false;
@ -19,7 +19,7 @@ public class ModToolPickTicketEvent extends MessageHandler {
if (issue != null) {
if (issue.state == ModToolTicketState.PICKED) {
this.client.sendResponse(new ModToolIssueInfoComposer(issue));
this.client.sendResponse(new IssueInfoMessageComposer(issue));
this.client.getHabbo().alert(Emulator.getTexts().getValue("support.ticket.picked.failed"));
return;

4
src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomInfoEvent.java
View File

@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.modtool.ScripterManager;
import com.eu.habbo.habbohotel.permissions.Permission;
import com.eu.habbo.habbohotel.rooms.Room;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.modtool.ModToolRoomInfoComposer;
import com.eu.habbo.messages.outgoing.modtool.ModeratorRoomInfoComposer;
public class ModToolRequestRoomInfoEvent extends MessageHandler {
@Override
@ -16,7 +16,7 @@ public class ModToolRequestRoomInfoEvent extends MessageHandler {
Room room = Emulator.getGameEnvironment().getRoomManager().getRoom(roomId);
if (room != null) {
this.client.sendResponse(new ModToolRoomInfoComposer(room));
this.client.sendResponse(new ModeratorRoomInfoComposer(room));
}
} else {
ScripterManager.scripterDetected(this.client, Emulator.getTexts().getValue("scripter.warning.modtools.roominfo").replace("%username%", this.client.getHabbo().getHabboInfo().getUsername()));

7
src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionAlertEvent.java
View File

@ -1,18 +1,15 @@
package com.eu.habbo.messages.incoming.modtool;
import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.modtool.ModToolBanType;
import com.eu.habbo.habbohotel.modtool.ModToolSanctionItem;
import com.eu.habbo.habbohotel.modtool.ModToolSanctions;
import com.eu.habbo.habbohotel.permissions.Permission;
import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.modtool.ModToolIssueHandledComposer;
import com.eu.habbo.messages.outgoing.modtool.IssueCloseNotificationMessageComposer;
import gnu.trove.map.hash.THashMap;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
public class ModToolSanctionAlertEvent extends MessageHandler {
@Override
@ -46,7 +43,7 @@ public class ModToolSanctionAlertEvent extends MessageHandler {
habbo.alert(message);
}
} else {
this.client.sendResponse(new ModToolIssueHandledComposer(Emulator.getTexts().getValue("generic.user.not_found").replace("%user%", Emulator.getConfig().getValue("hotel.player.name"))));
this.client.sendResponse(new IssueCloseNotificationMessageComposer(Emulator.getTexts().getValue("generic.user.not_found").replace("%user%", Emulator.getConfig().getValue("hotel.player.name"))));
}
}
}

7
src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionMuteEvent.java
View File

@ -1,19 +1,16 @@
package com.eu.habbo.messages.incoming.modtool;
import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.modtool.ModToolBanType;
import com.eu.habbo.habbohotel.modtool.ModToolSanctionItem;
import com.eu.habbo.habbohotel.modtool.ModToolSanctionLevelItem;
import com.eu.habbo.habbohotel.modtool.ModToolSanctions;
import com.eu.habbo.habbohotel.permissions.Permission;
import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.modtool.ModToolIssueHandledComposer;
import com.eu.habbo.messages.outgoing.modtool.IssueCloseNotificationMessageComposer;
import gnu.trove.map.hash.THashMap;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Date;
public class ModToolSanctionMuteEvent extends MessageHandler {
@ -58,7 +55,7 @@ public class ModToolSanctionMuteEvent extends MessageHandler {
this.client.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_mute.muted").replace("%user%", habbo.getHabboInfo().getUsername()));
}
} else {
this.client.sendResponse(new ModToolIssueHandledComposer(Emulator.getTexts().getValue("generic.user.not_found").replace("%user%", Emulator.getConfig().getValue("hotel.player.name"))));
this.client.sendResponse(new IssueCloseNotificationMessageComposer(Emulator.getTexts().getValue("generic.user.not_found").replace("%user%", Emulator.getConfig().getValue("hotel.player.name"))));
}
}
}

6
src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionTradeLockEvent.java
View File

@ -6,12 +6,10 @@ import com.eu.habbo.habbohotel.modtool.ModToolSanctions;
import com.eu.habbo.habbohotel.permissions.Permission;
import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.modtool.ModToolIssueHandledComposer;
import com.eu.habbo.messages.outgoing.modtool.IssueCloseNotificationMessageComposer;
import gnu.trove.map.hash.THashMap;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
public class ModToolSanctionTradeLockEvent extends MessageHandler {
@Override
@ -47,7 +45,7 @@ public class ModToolSanctionTradeLockEvent extends MessageHandler {
habbo.alert(message);
}
} else {
this.client.sendResponse(new ModToolIssueHandledComposer(Emulator.getTexts().getValue("generic.user.not_found").replace("%user%", Emulator.getConfig().getValue("hotel.player.name"))));
this.client.sendResponse(new IssueCloseNotificationMessageComposer(Emulator.getTexts().getValue("generic.user.not_found").replace("%user%", Emulator.getConfig().getValue("hotel.player.name"))));
}
}
}

4
src/main/java/com/eu/habbo/messages/incoming/modtool/ReportEvent.java
View File

@ -78,7 +78,7 @@ public class ReportEvent extends MessageHandler {
}
}
ReportEvent.this.client.sendResponse(new ModToolIssueHandledComposer(cfhTopic.reply).compose());
ReportEvent.this.client.sendResponse(new IssueCloseNotificationMessageComposer(cfhTopic.reply).compose());
Emulator.getGameEnvironment().getModToolManager().closeTicketAsHandled(issue, null);
}
}, 30 * 1000);
@ -108,7 +108,7 @@ public class ReportEvent extends MessageHandler {
}
}
ReportEvent.this.client.sendResponse(new ModToolIssueHandledComposer(cfhTopic.reply).compose());
ReportEvent.this.client.sendResponse(new IssueCloseNotificationMessageComposer(cfhTopic.reply).compose());
Emulator.getGameEnvironment().getModToolManager().closeTicketAsHandled(issue, null);
}
}, 30 * 1000);

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

@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.navigator;
import com.eu.habbo.habbohotel.navigation.NavigatorSavedSearch;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.navigator.NewNavigatorSavedSearchesComposer;
import com.eu.habbo.messages.outgoing.navigator.NavigatorSavedSearchesComposer;
public class AddSavedSearchEvent extends MessageHandler {
@Override
@ -15,6 +15,6 @@ public class AddSavedSearchEvent extends MessageHandler {
this.client.getHabbo().getHabboInfo().addSavedSearch(new NavigatorSavedSearch(searchCode, filter));
this.client.sendResponse(new NewNavigatorSavedSearchesComposer(this.client.getHabbo().getHabboInfo().getSavedSearches()));
this.client.sendResponse(new NavigatorSavedSearchesComposer(this.client.getHabbo().getHabboInfo().getSavedSearches()));
}
}

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

@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.navigator;
import com.eu.habbo.habbohotel.navigation.NavigatorSavedSearch;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.navigator.NewNavigatorSavedSearchesComposer;
import com.eu.habbo.messages.outgoing.navigator.NavigatorSavedSearchesComposer;
public class DeleteSavedSearchEvent extends MessageHandler {
@Override
@ -21,6 +21,6 @@ public class DeleteSavedSearchEvent extends MessageHandler {
this.client.getHabbo().getHabboInfo().deleteSavedSearch(search);
this.client.sendResponse(new NewNavigatorSavedSearchesComposer(this.client.getHabbo().getHabboInfo().getSavedSearches()));
this.client.sendResponse(new NavigatorSavedSearchesComposer(this.client.getHabbo().getHabboInfo().getSavedSearches()));
}
}

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

@ -4,7 +4,7 @@ import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.rooms.Room;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.rooms.ForwardToRoomComposer;
import com.eu.habbo.messages.outgoing.users.UserHomeRoomComposer;
import com.eu.habbo.messages.outgoing.users.NavigatorSettingsComposer;
import java.util.ArrayList;
import java.util.Collections;
@ -23,7 +23,7 @@ public class NewNavigatorActionEvent extends MessageHandler {
} else if (data.equalsIgnoreCase("predefined_noob_lobby")) {
this.client.sendResponse(new ForwardToRoomComposer(Emulator.getConfig().getInt("hotel.room.nooblobby")));
} else {
this.client.sendResponse(new UserHomeRoomComposer(this.client.getHabbo().getHabboInfo().getHomeRoom(), this.client.getHabbo().getHabboInfo().getHomeRoom()));
this.client.sendResponse(new NavigatorSettingsComposer(this.client.getHabbo().getHabboInfo().getHomeRoom(), this.client.getHabbo().getHabboInfo().getHomeRoom()));
}
}
}

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

@ -1,14 +1,14 @@
package com.eu.habbo.messages.incoming.navigator;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.navigator.NewNavigatorSettingsComposer;
import com.eu.habbo.messages.outgoing.navigator.NewNavigatorPreferencesComposer;
public class RequestNavigatorSettingsEvent extends MessageHandler {
@Override
public void handle() throws Exception {
this.client.sendResponse(new NewNavigatorSettingsComposer(this.client.getHabbo().getHabboStats().navigatorWindowSettings));
this.client.sendResponse(new NewNavigatorPreferencesComposer(this.client.getHabbo().getHabboStats().navigatorWindowSettings));
}
}

8
src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNewNavigatorDataEvent.java
View File

@ -6,11 +6,11 @@ import com.eu.habbo.messages.outgoing.navigator.*;
public class RequestNewNavigatorDataEvent extends MessageHandler {
@Override
public void handle() throws Exception {
this.client.sendResponse(new NewNavigatorSettingsComposer(this.client.getHabbo().getHabboStats().navigatorWindowSettings));
this.client.sendResponse(new NewNavigatorMetaDataComposer());
this.client.sendResponse(new NewNavigatorLiftedRoomsComposer());
this.client.sendResponse(new NewNavigatorPreferencesComposer(this.client.getHabbo().getHabboStats().navigatorWindowSettings));
this.client.sendResponse(new NavigatorMetaDataComposer());
this.client.sendResponse(new NavigatorLiftedRoomsComposer());
this.client.sendResponse(new CollapsedCategoriesComposer());
this.client.sendResponse(new NewNavigatorSavedSearchesComposer(this.client.getHabbo().getHabboInfo().getSavedSearches()));
this.client.sendResponse(new NavigatorSavedSearchesComposer(this.client.getHabbo().getHabboInfo().getSavedSearches()));
this.client.sendResponse(new NewNavigatorEventCategoriesComposer());
}
}

8
src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNewNavigatorRoomsEvent.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.RoomCategory;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.navigator.NewNavigatorSearchResultsComposer;
import com.eu.habbo.messages.outgoing.navigator.NavigatorSearchResultBlocksComposer;
import gnu.trove.map.hash.THashMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -33,7 +33,7 @@ public class RequestNewNavigatorRoomsEvent extends MessageHandler {
if (rooms != null) {
List<SearchResultList> resultLists = new ArrayList<>();
resultLists.add(new SearchResultList(0, view, query, SearchAction.NONE, this.client.getHabbo().getHabboStats().navigatorWindowSettings.getListModeForCategory(view, ListMode.LIST), this.client.getHabbo().getHabboStats().navigatorWindowSettings.getDisplayModeForCategory(view, DisplayMode.VISIBLE), rooms, true, true, DisplayOrder.ACTIVITY, -1));
this.client.sendResponse(new NewNavigatorSearchResultsComposer(view, query, resultLists));
this.client.sendResponse(new NavigatorSearchResultBlocksComposer(view, query, resultLists));
return;
}
}
@ -72,7 +72,7 @@ public class RequestNewNavigatorRoomsEvent extends MessageHandler {
resultLists = toQueryResults(resultLists);
}
this.client.sendResponse(new NewNavigatorSearchResultsComposer(view, query, resultLists));
this.client.sendResponse(new NavigatorSearchResultBlocksComposer(view, query, resultLists));
return;
}
@ -91,7 +91,7 @@ public class RequestNewNavigatorRoomsEvent extends MessageHandler {
List<SearchResultList> resultLists = new ArrayList<>(filter.getResult(this.client.getHabbo(), field, part, category != null ? category.getId() : -1));
filter.filter(field.field, part, resultLists);
resultLists = toQueryResults(resultLists);
this.client.sendResponse(new NewNavigatorSearchResultsComposer(view, query, resultLists));
this.client.sendResponse(new NavigatorSearchResultBlocksComposer(view, query, resultLists));
} catch (Exception e) {
LOGGER.error("Caught exception", e);
}

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

@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.rooms;
import com.eu.habbo.habbohotel.rooms.Room;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.rooms.RoomMutedComposer;
import com.eu.habbo.messages.outgoing.rooms.MuteAllInRoomComposer;
public class RoomMuteEvent extends MessageHandler {
@Override
@ -12,7 +12,7 @@ public class RoomMuteEvent extends MessageHandler {
if (room != null) {
if (room.isOwner(this.client.getHabbo())) {
room.setMuted(!room.isMuted());
this.client.sendResponse(new RoomMutedComposer(room));
this.client.sendResponse(new MuteAllInRoomComposer(room));
}
}
}

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

@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.rooms.RoomUnitStatus;
import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.rooms.RoomRightsComposer;
import com.eu.habbo.messages.outgoing.rooms.users.RoomUserRemoveRightsComposer;
import com.eu.habbo.messages.outgoing.rooms.users.NoSuchFlatComposer;
import gnu.trove.procedure.TIntProcedure;
public class RoomRemoveAllRightsEvent extends MessageHandler {
@ -25,7 +25,7 @@ public class RoomRemoveAllRightsEvent extends MessageHandler {
Habbo habbo = room.getHabbo(value);
if (habbo != null) {
room.sendComposer(new RoomUserRemoveRightsComposer(room, value).compose());
room.sendComposer(new NoSuchFlatComposer(room, value).compose());
habbo.getRoomUnit().removeStatus(RoomUnitStatus.FLAT_CONTROL);
habbo.getClient().sendResponse(new RoomRightsComposer(RoomRightLevels.NONE));
}

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

@ -1,7 +1,7 @@
package com.eu.habbo.messages.incoming.rooms;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.users.UserHomeRoomComposer;
import com.eu.habbo.messages.outgoing.users.NavigatorSettingsComposer;
public class SetHomeRoomEvent extends MessageHandler {
@Override
@ -10,7 +10,7 @@ public class SetHomeRoomEvent extends MessageHandler {
if (roomId != this.client.getHabbo().getHabboInfo().getHomeRoom()) {
this.client.getHabbo().getHabboInfo().setHomeRoom(roomId);
this.client.sendResponse(new UserHomeRoomComposer(this.client.getHabbo().getHabboInfo().getHomeRoom(), 0));
this.client.sendResponse(new NavigatorSettingsComposer(this.client.getHabbo().getHabboInfo().getHomeRoom(), 0));
}
}
}

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

@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.permissions.Permission;
import com.eu.habbo.habbohotel.rooms.Room;
import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.rooms.items.RemoveWallItemComposer;
import com.eu.habbo.messages.outgoing.rooms.items.ItemRemoveMessageComposer;
import com.eu.habbo.threading.runnables.QueryDeleteHabboItem;
public class PostItDeleteEvent extends MessageHandler {
@ -26,7 +26,7 @@ public class PostItDeleteEvent extends MessageHandler {
if (item.getUserId() == this.client.getHabbo().getHabboInfo().getId() || this.client.getHabbo().hasPermission(Permission.ACC_ANYROOMOWNER)) {
item.setRoomId(0);
room.removeHabboItem(item);
room.sendComposer(new RemoveWallItemComposer(item).compose());
room.sendComposer(new ItemRemoveMessageComposer(item).compose());
Emulator.getThreading().run(new QueryDeleteHabboItem(item.getId()));
}
}

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

@ -11,7 +11,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer;
import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys;
import com.eu.habbo.messages.outgoing.inventory.FurniListRemoveComposer;
import com.eu.habbo.messages.outgoing.rooms.items.AddWallItemComposer;
import com.eu.habbo.messages.outgoing.rooms.items.ItemAddMessageComposer;
public class PostItPlaceEvent extends MessageHandler {
@Override
@ -33,7 +33,7 @@ public class PostItPlaceEvent extends MessageHandler {
item.setWallPosition(location);
item.setUserId(this.client.getHabbo().getHabboInfo().getId());
item.needsUpdate(true);
room.sendComposer(new AddWallItemComposer(item, this.client.getHabbo().getHabboInfo().getUsername()).compose());
room.sendComposer(new ItemAddMessageComposer(item, this.client.getHabbo().getHabboInfo().getUsername()).compose());
this.client.getHabbo().getInventory().getItemsComponent().removeHabboItem(item);
this.client.sendResponse(new FurniListRemoveComposer(item.getGiftAdjustedId()));
item.setFromGift(false);

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

@ -4,7 +4,7 @@ import com.eu.habbo.habbohotel.items.interactions.InteractionPostIt;
import com.eu.habbo.habbohotel.rooms.Room;
import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.rooms.items.PostItDataComposer;
import com.eu.habbo.messages.outgoing.rooms.items.ItemDataUpdateMessageComposer;
public class PostItRequestDataEvent extends MessageHandler {
@Override
@ -17,7 +17,7 @@ public class PostItRequestDataEvent extends MessageHandler {
HabboItem item = room.getHabboItem(itemId);
if (item instanceof InteractionPostIt) {
this.client.sendResponse(new PostItDataComposer((InteractionPostIt) item));
this.client.sendResponse(new ItemDataUpdateMessageComposer((InteractionPostIt) item));
}
}
}

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

@ -3,13 +3,13 @@ package com.eu.habbo.messages.incoming.rooms.items.jukebox;
import com.eu.habbo.habbohotel.rooms.TraxManager;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxMySongsComposer;
import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxPlayListComposer;
import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeboxSongDisksMessageComposer;
public class JukeBoxEventOne extends MessageHandler {
@Override
public void handle() throws Exception {
TraxManager traxManager = this.client.getHabbo().getHabboInfo().getCurrentRoom().getTraxManager();
this.client.sendResponse(new JukeBoxPlayListComposer(traxManager.getSongs(), traxManager.totalLength()));
this.client.sendResponse(new JukeboxSongDisksMessageComposer(traxManager.getSongs(), traxManager.totalLength()));
this.client.sendResponse(new JukeBoxMySongsComposer(traxManager.myList(this.client.getHabbo())));
this.client.getHabbo().getHabboInfo().getCurrentRoom().getTraxManager().updateCurrentPlayingSong(this.client.getHabbo());
}

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

@ -3,13 +3,13 @@ package com.eu.habbo.messages.incoming.rooms.items.jukebox;
import com.eu.habbo.habbohotel.rooms.TraxManager;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxMySongsComposer;
import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxPlayListComposer;
import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeboxSongDisksMessageComposer;
public class JukeBoxEventTwo extends MessageHandler {
@Override
public void handle() throws Exception {
TraxManager traxManager = this.client.getHabbo().getHabboInfo().getCurrentRoom().getTraxManager();
this.client.sendResponse(new JukeBoxPlayListComposer(traxManager.getSongs(), traxManager.totalLength()));
this.client.sendResponse(new JukeboxSongDisksMessageComposer(traxManager.getSongs(), traxManager.totalLength()));
this.client.sendResponse(new JukeBoxMySongsComposer(traxManager.myList(this.client.getHabbo())));
this.client.getHabbo().getHabboInfo().getCurrentRoom().getTraxManager().updateCurrentPlayingSong(this.client.getHabbo());
}

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

@ -3,13 +3,13 @@ package com.eu.habbo.messages.incoming.rooms.items.jukebox;
import com.eu.habbo.habbohotel.rooms.TraxManager;
import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxMySongsComposer;
import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxPlayListComposer;
import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeboxSongDisksMessageComposer;
public class JukeBoxRequestPlayListEvent extends MessageHandler {
@Override
public void handle() throws Exception {
TraxManager traxManager = this.client.getHabbo().getHabboInfo().getCurrentRoom().getTraxManager();
this.client.sendResponse(new JukeBoxPlayListComposer(traxManager.getSongs(), traxManager.totalLength()));
this.client.sendResponse(new JukeboxSongDisksMessageComposer(traxManager.getSongs(), traxManager.totalLength()));
this.client.sendResponse(new JukeBoxMySongsComposer(traxManager.myList(this.client.getHabbo())));
this.client.getHabbo().getHabboInfo().getCurrentRoom().getTraxManager().updateCurrentPlayingSong(this.client.getHabbo());
}

2
src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertLimitedSoldOutComposer.java → src/main/java/com/eu/habbo/messages/outgoing/catalog/LimitedEditionSoldOutComposer.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.Outgoing;
public class AlertLimitedSoldOutComposer extends MessageComposer {
public class LimitedEditionSoldOutComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.LimitedEditionSoldOutComposer);

6
src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOwnItemsComposer.java → src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketPlaceOwnOffersComposer.java
View File

@ -10,12 +10,12 @@ import com.eu.habbo.messages.outgoing.Outgoing;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class MarketplaceOwnItemsComposer extends MessageComposer {
private static final Logger LOGGER = LoggerFactory.getLogger(MarketplaceOwnItemsComposer.class);
public class MarketPlaceOwnOffersComposer extends MessageComposer {
private static final Logger LOGGER = LoggerFactory.getLogger(MarketPlaceOwnOffersComposer.class);
private final Habbo habbo;
public MarketplaceOwnItemsComposer(Habbo habbo) {
public MarketPlaceOwnOffersComposer(Habbo habbo) {
this.habbo = habbo;
}

4
src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceBuyErrorComposer.java → src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceBuyOfferResultComposer.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.Outgoing;
public class MarketplaceBuyErrorComposer extends MessageComposer {
public class MarketplaceBuyOfferResultComposer extends MessageComposer {
public static final int REFRESH = 1;
public static final int SOLD_OUT = 2;
public static final int UPDATES = 3;
@ -15,7 +15,7 @@ public class MarketplaceBuyErrorComposer extends MessageComposer {
private final int offerId;
private final int price;
public MarketplaceBuyErrorComposer(int errorCode, int unknown, int offerId, int price) {
public MarketplaceBuyOfferResultComposer(int errorCode, int unknown, int offerId, int price) {
this.errorCode = errorCode;
this.unknown = unknown;
this.offerId = offerId;

4
src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceSellItemComposer.java → src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCanMakeOfferResult.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.Outgoing;
public class MarketplaceSellItemComposer extends MessageComposer {
public class MarketplaceCanMakeOfferResult extends MessageComposer {
public static final int NOT_ALLOWED = 2;
public static final int NO_TRADE_PASS = 3;
public static final int NO_ADS_LEFT = 4;
@ -13,7 +13,7 @@ public class MarketplaceSellItemComposer extends MessageComposer {
private final int valueA;
private final int valueB;
public MarketplaceSellItemComposer(int errorCode, int valueA, int valueB) {
public MarketplaceCanMakeOfferResult(int errorCode, int valueA, int valueB) {
this.errorCode = errorCode;
this.valueA = valueA;
this.valueB = valueB;

4
src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCancelSaleComposer.java → src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCancelOfferResultComposer.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.Outgoing;
public class MarketplaceCancelSaleComposer extends MessageComposer {
public class MarketplaceCancelOfferResultComposer extends MessageComposer {
private final MarketPlaceOffer offer;
private final boolean success;
public MarketplaceCancelSaleComposer(MarketPlaceOffer offer, Boolean success) {
public MarketplaceCancelOfferResultComposer(MarketPlaceOffer offer, Boolean success) {
this.offer = offer;
this.success = success;
}

2
src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceConfigComposer.java → src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceConfigurationComposer.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.Outgoing;
public class MarketplaceConfigComposer extends MessageComposer {
public class MarketplaceConfigurationComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.MarketplaceConfigurationComposer);

4
src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemInfoComposer.java → src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemStatsComposer.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.Outgoing;
public class MarketplaceItemInfoComposer extends MessageComposer {
public class MarketplaceItemStatsComposer extends MessageComposer {
private final int itemId;
public MarketplaceItemInfoComposer(int itemId) {
public MarketplaceItemStatsComposer(int itemId) {
this.itemId = itemId;
}

4
src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemPostedComposer.java → src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceMakeOfferResult.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.Outgoing;
public class MarketplaceItemPostedComposer extends MessageComposer {
public class MarketplaceMakeOfferResult extends MessageComposer {
public static final int POST_SUCCESS = 1;
public static final int FAILED_TECHNICAL_ERROR = 2;
public static final int MARKETPLACE_DISABLED = 3;
@ -12,7 +12,7 @@ public class MarketplaceItemPostedComposer extends MessageComposer {
private final int code;
public MarketplaceItemPostedComposer(int code) {
public MarketplaceMakeOfferResult(int code) {
this.code = code;
}

2
src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxCloseComposer.java → src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysteryBoxClosingComposer.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.Outgoing;
public class MysticBoxCloseComposer extends MessageComposer {
public class MysteryBoxClosingComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.MysteryBoxClosingComposer);

2
src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxStartOpenComposer.java → src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysteryBoxStartComposer.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.Outgoing;
public class MysticBoxStartOpenComposer extends MessageComposer {
public class MysteryBoxStartComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.MysteryBoxStartComposer);

4
src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestErrorComposer.java → src/main/java/com/eu/habbo/messages/outgoing/friends/MessengerErrorComposer.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.Outgoing;
public class FriendRequestErrorComposer extends MessageComposer {
public class MessengerErrorComposer extends MessageComposer {
public static final int FRIEND_LIST_OWN_FULL = 1;
public static final int FRIEND_LIST_TARGET_FULL = 2;
public static final int TARGET_NOT_ACCEPTING_REQUESTS = 3;
@ -12,7 +12,7 @@ public class FriendRequestErrorComposer extends MessageComposer {
private final int errorCode;
public FriendRequestErrorComposer(int errorCode) {
public MessengerErrorComposer(int errorCode) {
this.errorCode = errorCode;
}

6
src/main/java/com/eu/habbo/messages/outgoing/friends/FriendChatMessageComposer.java → src/main/java/com/eu/habbo/messages/outgoing/friends/NewConsoleMessageComposer.java
View File

@ -7,18 +7,18 @@ import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.MessageComposer;
import com.eu.habbo.messages.outgoing.Outgoing;
public class FriendChatMessageComposer extends MessageComposer {
public class NewConsoleMessageComposer extends MessageComposer {
private final Message message;
private final int toId;
private final int fromId;
public FriendChatMessageComposer(Message message) {
public NewConsoleMessageComposer(Message message) {
this.message = message;
this.toId = message.getFromId();
this.fromId = message.getFromId();
}
public FriendChatMessageComposer(Message message, int toId, int fromId) {
public NewConsoleMessageComposer(Message message, int toId, int fromId) {
this.message = message;
this.toId = toId;
this.fromId = fromId;

4
src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestComposer.java → src/main/java/com/eu/habbo/messages/outgoing/friends/NewFriendRequestComposer.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.Outgoing;
public class FriendRequestComposer extends MessageComposer {
public class NewFriendRequestComposer extends MessageComposer {
private final Habbo habbo;
public FriendRequestComposer(Habbo habbo) {
public NewFriendRequestComposer(Habbo habbo) {
this.habbo = habbo;
}

4
src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpJoinQueueComposer.java → src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/JoinedQueueMessageComposer.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.Outgoing;
public class BaseJumpJoinQueueComposer extends MessageComposer {
public class JoinedQueueMessageComposer extends MessageComposer {
private final int gameId;
public BaseJumpJoinQueueComposer(int gameId) {
public JoinedQueueMessageComposer(int gameId) {
this.gameId = gameId;
}

2
src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLeaveQueueComposer.java → src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/LeftQueueMessageComposer.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.Outgoing;
public class BaseJumpLeaveQueueComposer extends MessageComposer {
public class LeftQueueMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.LeftQueueMessageComposer);

4
src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLoadGameComposer.java → src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/LoadGameMessageComposer.java
View File

@ -6,13 +6,13 @@ import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.MessageComposer;
import com.eu.habbo.messages.outgoing.Outgoing;
public class BaseJumpLoadGameComposer extends MessageComposer {
public class LoadGameMessageComposer extends MessageComposer {
public static String FASTFOOD_KEY = "";
private final GameClient client;
private final int game;
public BaseJumpLoadGameComposer(GameClient client, int game) {
public LoadGameMessageComposer(GameClient client, int game) {
this.client = client;
this.game = game;
}

2
src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLoadGameURLComposer.java → src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/LoadGameUrlMessageComposer.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.Outgoing;
public class BaseJumpLoadGameURLComposer extends MessageComposer {
public class LoadGameUrlMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.LoadGameUrlMessageComposer);

2
src/main/java/com/eu/habbo/messages/outgoing/generic/MinimailCountComposer.java → src/main/java/com/eu/habbo/messages/outgoing/generic/MiniMailUnreadCountComposer.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.Outgoing;
public class MinimailCountComposer extends MessageComposer {
public class MiniMailUnreadCountComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.MiniMailUnreadCountComposer);

6
src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/MessagesForYouComposer.java → src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/MOTDNotificationComposer.java
View File

@ -7,16 +7,16 @@ import com.eu.habbo.messages.outgoing.Outgoing;
import java.util.ArrayList;
import java.util.List;
public class MessagesForYouComposer extends MessageComposer {
public class MOTDNotificationComposer extends MessageComposer {
private final String[] messages;
private final List<String> newMessages;
public MessagesForYouComposer(String[] messages) {
public MOTDNotificationComposer(String[] messages) {
this.messages = messages;
this.newMessages = new ArrayList<>();
}
public MessagesForYouComposer(List<String> newMessages) {
public MOTDNotificationComposer(List<String> newMessages) {
this.newMessages = newMessages;
this.messages = new String[]{};
}

4
src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelWillCloseInMinutesAndBackInComposer.java → src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/MaintenanceStatusMessageComposer.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.Outgoing;
public class HotelWillCloseInMinutesAndBackInComposer extends MessageComposer {
public class MaintenanceStatusMessageComposer extends MessageComposer {
private final int closeInMinutes;
private final int reopenInMinutes;
public HotelWillCloseInMinutesAndBackInComposer(int closeInMinutes, int reopenInMinutes) {
public MaintenanceStatusMessageComposer(int closeInMinutes, int reopenInMinutes) {
this.closeInMinutes = closeInMinutes;
this.reopenInMinutes = reopenInMinutes;
}

4
src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertWIthLinkAndOpenHabboWayComposer.java → src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/ModeratorCautionComposer.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.Outgoing;
public class StaffAlertWIthLinkAndOpenHabboWayComposer extends MessageComposer {
public class ModeratorCautionComposer extends MessageComposer {
private final String message;
private final String link;
public StaffAlertWIthLinkAndOpenHabboWayComposer(String message, String link) {
public ModeratorCautionComposer(String message, String link) {
this.message = message;
this.link = link;
}

4
src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertWithLinkComposer.java → src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/ModeratorMessageComposer.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.Outgoing;
public class StaffAlertWithLinkComposer extends MessageComposer {
public class ModeratorMessageComposer extends MessageComposer {
private final String message;
private final String link;
public StaffAlertWithLinkComposer(String message, String link) {
public ModeratorMessageComposer(String message, String link) {
this.message = message;
this.link = link;
}

4
src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserGiftComposer.java → src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserExperienceGiftOfferComposer.java
View File

@ -7,10 +7,10 @@ import com.eu.habbo.messages.outgoing.Outgoing;
import java.util.List;
public class NewUserGiftComposer extends MessageComposer {
public class NewUserExperienceGiftOfferComposer extends MessageComposer {
private final List<List<NewUserGift>> options;
public NewUserGiftComposer(List<List<NewUserGift>> options) {
public NewUserExperienceGiftOfferComposer(List<List<NewUserGift>> options) {
this.options = options;
}

4
src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserIdentityComposer.java → src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NoobnessLevelMessageComposer.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.Outgoing;
public class NewUserIdentityComposer extends MessageComposer {
public class NoobnessLevelMessageComposer extends MessageComposer {
private final Habbo habbo;
public NewUserIdentityComposer(Habbo habbo) {
public NoobnessLevelMessageComposer(Habbo habbo) {
this.habbo = habbo;
}

4
src/main/java/com/eu/habbo/messages/outgoing/handshake/PongComposer.java → src/main/java/com/eu/habbo/messages/outgoing/handshake/LatencyPingResponseMessageComposer.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.Outgoing;
public class PongComposer extends MessageComposer {
public class LatencyPingResponseMessageComposer extends MessageComposer {
private final int id;
public PongComposer(int id) {
public LatencyPingResponseMessageComposer(int id) {
this.id = id;
}

4
src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewNextLTDAvailableComposer.java → src/main/java/com/eu/habbo/messages/outgoing/hotelview/LimitedOfferAppearingNextMessageComposer.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.Outgoing;
public class HotelViewNextLTDAvailableComposer extends MessageComposer {
public class LimitedOfferAppearingNextMessageComposer extends MessageComposer {
private final int time;
private final int pageId;
private final int itemId;
private final String itemName;
public HotelViewNextLTDAvailableComposer(int time, int pageId, int itemId, String itemName) {
public LimitedOfferAppearingNextMessageComposer(int time, int pageId, int itemId, String itemName) {
this.time = time;
this.pageId = pageId;
this.itemId = itemId;

6
src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueHandledComposer.java → src/main/java/com/eu/habbo/messages/outgoing/modtool/IssueCloseNotificationMessageComposer.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.Outgoing;
public class ModToolIssueHandledComposer extends MessageComposer {
public class IssueCloseNotificationMessageComposer extends MessageComposer {
public static final int HANDLED = 0;
public static final int USELESS = 1;
public static final int ABUSIVE = 2;
@ -12,12 +12,12 @@ public class ModToolIssueHandledComposer extends MessageComposer {
private final int code;
private final String message;
public ModToolIssueHandledComposer(int code) {
public IssueCloseNotificationMessageComposer(int code) {
this.code = code;
this.message = "";
}
public ModToolIssueHandledComposer(String message) {
public IssueCloseNotificationMessageComposer(String message) {
this.code = 0;
this.message = message;
}

4
src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueInfoComposer.java → src/main/java/com/eu/habbo/messages/outgoing/modtool/IssueInfoMessageComposer.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.Outgoing;
public class ModToolIssueInfoComposer extends MessageComposer {
public class IssueInfoMessageComposer extends MessageComposer {
private final ModToolIssue issue;
public ModToolIssueInfoComposer(ModToolIssue issue) {
public IssueInfoMessageComposer(ModToolIssue issue) {
this.issue = issue;
}

4
src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueUpdateComposer.java → src/main/java/com/eu/habbo/messages/outgoing/modtool/IssuePickFailedMessageComposer.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.Outgoing;
public class ModToolIssueUpdateComposer extends MessageComposer {
public class IssuePickFailedMessageComposer extends MessageComposer {
private final ModToolIssue issue;
public ModToolIssueUpdateComposer(ModToolIssue issue) {
public IssuePickFailedMessageComposer(ModToolIssue issue) {
this.issue = issue;
}

4
src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolComposer.java → src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorInitMessageComposer.java
View File

@ -15,10 +15,10 @@ import gnu.trove.set.hash.THashSet;
import java.util.Iterator;
public class ModToolComposer extends MessageComposer implements TObjectProcedure<ModToolCategory> {
public class ModeratorInitMessageComposer extends MessageComposer implements TObjectProcedure<ModToolCategory> {
private final Habbo habbo;
public ModToolComposer(Habbo habbo) {
public ModeratorInitMessageComposer(Habbo habbo) {
this.habbo = habbo;
}

4
src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolRoomInfoComposer.java → src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorRoomInfoComposer.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.Outgoing;
public class ModToolRoomInfoComposer extends MessageComposer {
public class ModeratorRoomInfoComposer extends MessageComposer {
private final Room room;
public ModToolRoomInfoComposer(Room room) {
public ModeratorRoomInfoComposer(Room room) {
this.room = room;
}

4
src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueHandlerDimensionsComposer.java → src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorToolPreferencesComposer.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.Outgoing;
public class ModToolIssueHandlerDimensionsComposer extends MessageComposer {
public class ModeratorToolPreferencesComposer extends MessageComposer {
private final int x;
private final int y;
private final int width;
private final int height;
public ModToolIssueHandlerDimensionsComposer(int x, int y, int width, int height) {
public ModeratorToolPreferencesComposer(int x, int y, int width, int height) {
this.x = x;
this.y = y;
this.width = width;

6
src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java → src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorUserInfoComposer.java
View File

@ -14,12 +14,12 @@ import org.slf4j.LoggerFactory;
import java.sql.*;
import java.util.ArrayList;
public class ModToolUserInfoComposer extends MessageComposer {
private static final Logger LOGGER = LoggerFactory.getLogger(ModToolUserInfoComposer.class);
public class ModeratorUserInfoComposer extends MessageComposer {
private static final Logger LOGGER = LoggerFactory.getLogger(ModeratorUserInfoComposer.class);
private final ResultSet set;
public ModToolUserInfoComposer(ResultSet set) {
public ModeratorUserInfoComposer(ResultSet set) {
this.set = set;
}

2
src/main/java/com/eu/habbo/messages/outgoing/mysterybox/MysteryBoxKeysComposer.java → src/main/java/com/eu/habbo/messages/outgoing/mysterybox/MysteryBoxKeysMessageComposer.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.Outgoing;
public class MysteryBoxKeysComposer extends MessageComposer {
public class MysteryBoxKeysMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.MysteryBoxKeysMessageComposer);

2
src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorLiftedRoomsComposer.java → src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorLiftedRoomsComposer.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.Outgoing;
public class NewNavigatorLiftedRoomsComposer extends MessageComposer {
public class NavigatorLiftedRoomsComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.NavigatorLiftedRoomsComposer);

2
src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorMetaDataComposer.java → src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorMetaDataComposer.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.Outgoing;
public class NewNavigatorMetaDataComposer extends MessageComposer {
public class NavigatorMetaDataComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.NavigatorMetaDataComposer);

4
src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSavedSearchesComposer.java → src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorSavedSearchesComposer.java
View File

@ -7,10 +7,10 @@ import com.eu.habbo.messages.outgoing.Outgoing;
import java.util.List;
public class NewNavigatorSavedSearchesComposer extends MessageComposer {
public class NavigatorSavedSearchesComposer extends MessageComposer {
private final List<NavigatorSavedSearch> searches;
public NewNavigatorSavedSearchesComposer(List<NavigatorSavedSearch> searches) {
public NavigatorSavedSearchesComposer(List<NavigatorSavedSearch> searches) {
this.searches = searches;
}

4
src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSearchResultsComposer.java → src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorSearchResultBlocksComposer.java
View File

@ -7,12 +7,12 @@ import com.eu.habbo.messages.outgoing.Outgoing;
import java.util.List;
public class NewNavigatorSearchResultsComposer extends MessageComposer {
public class NavigatorSearchResultBlocksComposer extends MessageComposer {
private final String searchCode;
private final String searchQuery;
private final List<SearchResultList> resultList;
public NewNavigatorSearchResultsComposer(String searchCode, String searchQuery, List<SearchResultList> resultList) {
public NavigatorSearchResultBlocksComposer(String searchCode, String searchQuery, List<SearchResultList> resultList) {
this.searchCode = searchCode;
this.searchQuery = searchQuery;
this.resultList = resultList;

4
src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSettingsComposer.java → src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorPreferencesComposer.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.Outgoing;
public class NewNavigatorSettingsComposer extends MessageComposer {
public class NewNavigatorPreferencesComposer extends MessageComposer {
private final HabboNavigatorWindowSettings windowSettings;
public NewNavigatorSettingsComposer(HabboNavigatorWindowSettings windowSettings) {
public NewNavigatorPreferencesComposer(HabboNavigatorWindowSettings windowSettings) {
this.windowSettings = windowSettings;
}

2
src/main/java/com/eu/habbo/messages/outgoing/navigator/OpenRoomCreationWindowComposer.java → src/main/java/com/eu/habbo/messages/outgoing/navigator/NoOwnedRoomsAlertMessageComposer.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.Outgoing;
public class OpenRoomCreationWindowComposer extends MessageComposer {
public class NoOwnedRoomsAlertMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.NoOwnedRoomsAlertMessageComposer);

Some files were not shown because too many files have changed in this diff Show More