diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/bots/Bot.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/bots/Bot.java index aef23ad..13914fc 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/bots/Bot.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/bots/Bot.java @@ -27,6 +27,8 @@ public class Bot implements Runnable { public static final String NO_CHAT_SET = "${bot.skill.chatter.configuration.text.placeholder}"; public static String[] PLACEMENT_MESSAGES = "Yo!;Hello I'm a real party animal!;Hello!".split(";"); + public static boolean BOT_LIMIT_WALKING_DISTANCE = true; + public static int BOT_WALKING_DISTANCE_RADIUS = 5; private final ArrayList chatLines; private transient int id; @@ -137,30 +139,26 @@ public class Bot implements Runnable { @Override public void run() { if (this.needsUpdate) { - try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("UPDATE bots SET name = ?, motto = ?, figure = ?, gender = ?, user_id = ?, room_id = ?, x = ?, y = ?, z = ?, rot = ?, dance = ?, freeroam = ?, chat_lines = ?, chat_auto = ?, chat_random = ?, chat_delay = ?, effect = ?, bubble_id = ? WHERE id = ?")) { + try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("UPDATE bots SET name = ?, motto = ?, figure = ?, gender = ?, user_id = ?, room_id = ?, dance = ?, freeroam = ?, chat_lines = ?, chat_auto = ?, chat_random = ?, chat_delay = ?, effect = ?, bubble_id = ? WHERE id = ?")) { statement.setString(1, this.name); statement.setString(2, this.motto); statement.setString(3, this.figure); statement.setString(4, this.gender.toString()); statement.setInt(5, this.ownerId); statement.setInt(6, this.room == null ? 0 : this.room.getId()); - statement.setInt(7, this.roomUnit == null ? 0 : this.roomUnit.getX()); - statement.setInt(8, this.roomUnit == null ? 0 : this.roomUnit.getY()); - statement.setDouble(9, this.roomUnit == null ? 0 : this.roomUnit.getZ()); - statement.setInt(10, this.roomUnit == null ? 0 : this.roomUnit.getBodyRotation().getValue()); - statement.setInt(11, this.roomUnit == null ? 0 : this.roomUnit.getDanceType().getType()); - statement.setString(12, this.canWalk ? "1" : "0"); + statement.setInt(7, this.roomUnit == null ? 0 : this.roomUnit.getDanceType().getType()); + statement.setString(8, this.canWalk ? "1" : "0"); StringBuilder text = new StringBuilder(); for (String s : this.chatLines) { text.append(s).append("\r"); } - statement.setString(13, text.toString()); - statement.setString(14, this.chatAuto ? "1" : "0"); - statement.setString(15, this.chatRandom ? "1" : "0"); - statement.setInt(16, this.chatDelay); - statement.setInt(17, this.effect); - statement.setInt(18, this.bubble); - statement.setInt(19, this.id); + statement.setString(9, text.toString()); + statement.setString(10, this.chatAuto ? "1" : "0"); + statement.setString(11, this.chatRandom ? "1" : "0"); + statement.setInt(12, this.chatDelay); + statement.setInt(13, this.effect); + statement.setInt(14, this.bubble); + statement.setInt(15, this.id); statement.execute(); this.needsUpdate = false; } catch (SQLException e) { @@ -174,7 +172,15 @@ public class Bot implements Runnable { if (allowBotsWalk && this.canWalk) { if (!this.roomUnit.isWalking()) { if (this.roomUnit.getWalkTimeOut() < Emulator.getIntUnixTimestamp() && this.followingHabboId == 0) { - this.roomUnit.setGoalLocation(this.room.getRandomWalkableTile()); + this.roomUnit.setGoalLocation( + Bot.BOT_LIMIT_WALKING_DISTANCE + ? this.room.getRandomWalkableTilesAround( + this.getRoomUnit(), + this.room.getLayout().getTile(this.roomUnit.getX(), this.roomUnit.getY()), + Bot.BOT_WALKING_DISTANCE_RADIUS) + : this.room.getRandomWalkableTile() + ); + int timeOut = Emulator.getRandom().nextInt(20) * 2; this.roomUnit.setWalkTimeOut((timeOut < 10 ? 5 : timeOut) + Emulator.getIntUnixTimestamp()); } @@ -207,13 +213,14 @@ public class Bot implements Runnable { } else { this.lastChatIndex++; if (this.lastChatIndex >= this.chatLines.size()) { - this.lastChatIndex = 0; + this.lastChatIndex = 0; // start from scratch :-3 } } this.chatTimeOut = Emulator.getIntUnixTimestamp() + this.chatDelay; } } + } } @@ -266,8 +273,7 @@ public class Bot implements Runnable { if(PLACEMENT_MESSAGES.length > 0) { String message = PLACEMENT_MESSAGES[Emulator.getRandom().nextInt(PLACEMENT_MESSAGES.length)]; if (!WiredHandler.handle(WiredTriggerType.SAY_SOMETHING, this.getRoomUnit(), room, new Object[]{message})) { - if(!habbo.roomBypass) this.talk(message); - else this.talk("Deliver the drink here, " + habbo.getHabboInfo().getUsername() + "!"); + this.talk(message); } } } @@ -432,6 +438,7 @@ public class Bot implements Runnable { this.bubble = bubble; this.needsUpdate = true; } + public void setEffect(int effect, int duration) { this.effect = effect; this.needsUpdate = true; @@ -496,4 +503,36 @@ public class Bot implements Runnable { this.roomUnit.statusUpdate(true); } + public void onPlaceUpdate() { + try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("UPDATE bots SET name = ?, motto = ?, figure = ?, gender = ?, user_id = ?, room_id = ?, x = ?, y = ?, z = ?, rot = ?, dance = ?, freeroam = ?, chat_lines = ?, chat_auto = ?, chat_random = ?, chat_delay = ?, effect = ?, bubble_id = ? WHERE id = ?")) { + statement.setString(1, this.name); + statement.setString(2, this.motto); + statement.setString(3, this.figure); + statement.setString(4, this.gender.toString()); + statement.setInt(5, this.ownerId); + statement.setInt(6, this.room == null ? 0 : this.room.getId()); + statement.setInt(7, this.roomUnit == null ? 0 : this.roomUnit.getX()); + statement.setInt(8, this.roomUnit == null ? 0 : this.roomUnit.getY()); + statement.setDouble(9, this.roomUnit == null ? 0 : this.roomUnit.getZ()); + statement.setInt(10, this.roomUnit == null ? 0 : this.roomUnit.getBodyRotation().getValue()); + statement.setInt(11, this.roomUnit == null ? 0 : this.roomUnit.getDanceType().getType()); + statement.setString(12, this.canWalk ? "1" : "0"); + StringBuilder text = new StringBuilder(); + for (String s : this.chatLines) { + text.append(s).append("\r"); + } + statement.setString(13, text.toString()); + statement.setString(14, this.chatAuto ? "1" : "0"); + statement.setString(15, this.chatRandom ? "1" : "0"); + statement.setInt(16, this.chatDelay); + statement.setInt(17, this.effect); + statement.setInt(18, this.bubble); + statement.setInt(19, this.id); + statement.execute(); + } catch (SQLException e) { + LOGGER.error("Caught SQL exception", e); + } + } + + } diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/bots/BotManager.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/bots/BotManager.java index ed189b2..50ffed1 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/bots/BotManager.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/bots/BotManager.java @@ -109,27 +109,25 @@ public class BotManager { return; if (room != null && bot != null && habbo != null) { - if (room.getOwnerId() == habbo.getHabboInfo().getId() || habbo.hasPermission(Permission.ACC_ANYROOMOWNER) || habbo.hasPermission(Permission.ACC_PLACEFURNI) || habbo.roomBypass) { - if(!habbo.roomBypass){ - if (room.getCurrentBots().size() >= Room.MAXIMUM_BOTS && !habbo.hasPermission(Permission.ACC_UNLIMITED_BOTS)) { - habbo.getClient().sendResponse(new BotErrorComposer(BotErrorComposer.ROOM_ERROR_MAX_BOTS)); - return; - } + if (room.getOwnerId() == habbo.getHabboInfo().getId() || habbo.hasPermission(Permission.ACC_ANYROOMOWNER) || habbo.hasPermission(Permission.ACC_PLACEFURNI)) { + if (room.getCurrentBots().size() >= Room.MAXIMUM_BOTS && !habbo.hasPermission(Permission.ACC_UNLIMITED_BOTS)) { + habbo.getClient().sendResponse(new BotErrorComposer(BotErrorComposer.ROOM_ERROR_MAX_BOTS)); + return; + } - if (room.hasHabbosAt(location.x, location.y) || (!location.isWalkable() && location.state != RoomTileState.SIT && location.state != RoomTileState.LAY)) - return; + if (room.hasHabbosAt(location.x, location.y) || (!location.isWalkable() && location.state != RoomTileState.SIT && location.state != RoomTileState.LAY)) + return; - if (room.hasBotsAt(location.x, location.y)) { - habbo.getClient().sendResponse(new BotErrorComposer(BotErrorComposer.ROOM_ERROR_BOTS_SELECTED_TILE_NOT_FREE)); - return; - } + if (room.hasBotsAt(location.x, location.y)) { + habbo.getClient().sendResponse(new BotErrorComposer(BotErrorComposer.ROOM_ERROR_BOTS_SELECTED_TILE_NOT_FREE)); + return; } RoomUnit roomUnit = new RoomUnit(); roomUnit.setRotation(RoomUserRotation.SOUTH); roomUnit.setLocation(location); - double stackHeight = location.getStackHeight(); + double stackHeight = room.getTopHeightAt(location.x, location.y); roomUnit.setPreviousLocationZ(stackHeight); roomUnit.setZ(stackHeight); @@ -138,7 +136,7 @@ public class BotManager { roomUnit.setCanWalk(room.isAllowBotsWalk()); bot.setRoomUnit(roomUnit); bot.setRoom(room); - bot.needsUpdate(true); + bot.onPlaceUpdate(); room.addBot(bot); Emulator.getThreading().run(bot); room.sendComposer(new RoomUsersComposer(bot).compose()); diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java index d77f05b..886e492 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java @@ -470,15 +470,16 @@ public class CatalogManager { this.giftWrappers.clear(); this.giftFurnis.clear(); - try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); - Statement statement = connection.createStatement(); - ResultSet set = - statement.executeQuery("SELECT * FROM gift_wrappers ORDER BY sprite_id DESC")) { + try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); Statement statement = connection.createStatement(); ResultSet set = statement.executeQuery("SELECT * FROM gift_wrappers ORDER BY sprite_id DESC")) { while (set.next()) { - if ("wrapper".equals(set.getString("type"))) { - this.giftWrappers.put(set.getInt("sprite_id"), set.getInt("item_id")); - } else if ("gift".equals(set.getString("type"))) { - this.giftFurnis.put(set.getInt("sprite_id"), set.getInt("item_id")); + switch (set.getString("type")) { + case "wrapper": + this.giftWrappers.put(set.getInt("sprite_id"), set.getInt("item_id")); + break; + + case "gift": + this.giftFurnis.put(set.getInt("sprite_id"), set.getInt("item_id")); + break; } } } catch (SQLException e) { @@ -488,7 +489,6 @@ public class CatalogManager { } } - private void loadClothing() { synchronized (this.clothing) { this.clothing.clear(); diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/guilds/Guild.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/guilds/Guild.java index 4010588..1636309 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/guilds/Guild.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/guilds/Guild.java @@ -135,7 +135,10 @@ public class Guild implements Runnable { public String getOwnerName() { return this.ownerName; } - public void setOwnerName(String ownerName) { this.ownerName = ownerName; } + + public void setOwnerName(String ownerName) { + this.ownerName = ownerName; + } public String getName() { return this.name; diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/guilds/GuildManager.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/guilds/GuildManager.java index 4aae513..7325301 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/guilds/GuildManager.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/guilds/GuildManager.java @@ -503,6 +503,7 @@ public class GuildManager { return guilds; } + public List getOwnedGuilds(int userId) { List guilds = new ArrayList(); @@ -523,6 +524,7 @@ public class GuildManager { return guilds; } + public List getAllGuilds() { List guilds = new ArrayList(); diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/ItemManager.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/ItemManager.java index 4f00ddb..08548ec 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/ItemManager.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/ItemManager.java @@ -45,7 +45,6 @@ import com.eu.habbo.habbohotel.items.interactions.totems.InteractionTotemPlanet; import com.eu.habbo.habbohotel.items.interactions.wired.conditions.*; import com.eu.habbo.habbohotel.items.interactions.wired.effects.*; import com.eu.habbo.habbohotel.items.interactions.wired.extra.WiredBlob; -import com.eu.habbo.habbohotel.items.interactions.wired.extra.WiredExtraOrEval; import com.eu.habbo.habbohotel.items.interactions.wired.extra.WiredExtraRandom; import com.eu.habbo.habbohotel.items.interactions.wired.extra.WiredExtraUnseen; import com.eu.habbo.habbohotel.wired.highscores.WiredHighscoreManager; @@ -271,7 +270,6 @@ public class ItemManager { this.interactionsList.add(new ItemInteraction("wf_xtra_random", WiredExtraRandom.class)); this.interactionsList.add(new ItemInteraction("wf_xtra_unseen", WiredExtraUnseen.class)); this.interactionsList.add(new ItemInteraction("wf_blob", WiredBlob.class)); - this.interactionsList.add(new ItemInteraction("wf_xtra_or_eval", WiredExtraOrEval.class)); this.interactionsList.add(new ItemInteraction("wf_highscore", InteractionWiredHighscore.class)); @@ -345,7 +343,7 @@ public class ItemManager { this.interactionsList.add(new ItemInteraction("totem_planet", InteractionTotemPlanet.class)); this.interactionsList.add(new ItemInteraction("tile_walkmagic", InteractionTileWalkMagic.class)); - } + } public void addItemInteraction(ItemInteraction itemInteraction) { diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPressurePlate.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPressurePlate.java index b446e6f..90d2552 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPressurePlate.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPressurePlate.java @@ -85,15 +85,16 @@ public class InteractionPressurePlate extends InteractionDefault { if (tiles == null) return; for (RoomTile tile : tiles) { - boolean hasHabbos = room.hasHabbosAt(tile.x, tile.y); - if (!hasHabbos && this.requiresAllTilesOccupied()) { + THashSet tileHasHabboOrBot = room.getHabbosAndBotsAt(tile.x, tile.y); + if (tileHasHabboOrBot.isEmpty() && this.requiresAllTilesOccupied()) { occupied = false; break; } - if (hasHabbos) { + if (!tileHasHabboOrBot.isEmpty()) { occupied = true; } + } this.setExtradata(occupied ? "1" : "0"); diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionSwitchRemoteControl.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionSwitchRemoteControl.java new file mode 100644 index 0000000..e7fd133 --- /dev/null +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionSwitchRemoteControl.java @@ -0,0 +1,53 @@ +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 org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.sql.ResultSet; +import java.sql.SQLException; + +public class InteractionSwitchRemoteControl extends InteractionDefault { + private static final Logger LOGGER = LoggerFactory.getLogger(InteractionSwitchRemoteControl.class); + + public InteractionSwitchRemoteControl(ResultSet set, Item baseItem) throws SQLException { + super(set, baseItem); + } + + public InteractionSwitchRemoteControl(int id, int userId, Item item, String extradata, int limitedStack, int limitedSells) { + super(id, userId, item, extradata, limitedStack, limitedSells); + } + + + @Override + public boolean isUsable() { + return true; + } + + @Override + public void onClick(GameClient client, Room room, Object[] objects) throws Exception { + if (room != null) { + super.onClick(client, room, objects); + + if (this.getExtradata().isEmpty()) + this.setExtradata("0"); + + if (this.getBaseItem().getStateCount() > 0) { + int currentState = 0; + + try { + currentState = Integer.parseInt(this.getExtradata()); + } catch (NumberFormatException e) { + LOGGER.error("Incorrect extradata ({}) for item ID ({}) of type ({})", this.getExtradata(), this.getId(), this.getBaseItem().getName()); + } + + this.setExtradata("" + (currentState + 1) % this.getBaseItem().getStateCount()); + this.needsUpdate(true); + + room.updateItemState(this); + } + } + } +} diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionTileWalkMagic.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionTileWalkMagic.java index be76fc1..beb74e6 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionTileWalkMagic.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionTileWalkMagic.java @@ -45,4 +45,4 @@ public class InteractionTileWalkMagic extends HabboItem { public boolean isUsable() { return true; } -} \ No newline at end of file +} diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/InteractionGameTimer.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/InteractionGameTimer.java index f7d2776..bb868c6 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/InteractionGameTimer.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/InteractionGameTimer.java @@ -234,48 +234,53 @@ public class InteractionGameTimer extends HabboItem implements Runnable { state = InteractionGameTimerAction.getByAction((int) objects[0]); } - if (state == InteractionGameTimer.InteractionGameTimerAction.START_STOP) { - if (this.isRunning) { // a game has been started - this.isPaused = !this.isPaused; - if (this.isPaused) { - this.pause(room); + switch (state) { + case START_STOP: + if (this.isRunning) { // a game has been started + this.isPaused = !this.isPaused; + if (this.isPaused) { + this.pause(room); + } else { + this.unpause(room); + + if (!this.threadActive) { + this.threadActive = true; + Emulator.getThreading().run(new GameTimer(this)); + } + } } else { - this.unpause(room); + this.isPaused = false; + this.isRunning = true; + this.timeNow = this.baseTime; + room.updateItem(this); + + this.createNewGame(room); + WiredHandler.handle(WiredTriggerType.GAME_STARTS, null, room, new Object[]{this}); if (!this.threadActive) { this.threadActive = true; - Emulator.getThreading().run(new GameTimer(this)); + Emulator.getThreading().run(new GameTimer(this), 1000); } } - } else { - this.isPaused = false; - this.isRunning = true; - this.timeNow = this.baseTime; - room.updateItem(this); - this.createNewGame(room); - WiredHandler.handle(WiredTriggerType.GAME_STARTS, null, room, new Object[]{this}); + break; - if (!this.threadActive) { - this.threadActive = true; - Emulator.getThreading().run(new GameTimer(this), 1000); + case INCREASE_TIME: + if (!this.isRunning) { + this.increaseTimer(room); + } else if (this.isPaused) { + this.endGame(room); + this.increaseTimer(room); + WiredHandler.handle(WiredTriggerType.GAME_ENDS, null, room, new Object[]{}); } - } - } else if (state == InteractionGameTimer.InteractionGameTimerAction.INCREASE_TIME) { - if (!this.isRunning) { - this.increaseTimer(room); - } else if (this.isPaused) { - this.endGame(room); - this.increaseTimer(room); - WiredHandler.handle(WiredTriggerType.GAME_ENDS, null, room, new Object[]{}); - } + + break; } } super.onClick(client, room, objects); } - @Override public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMoveFurniTo.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMoveFurniTo.java index b74de48..4118fd0 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMoveFurniTo.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMoveFurniTo.java @@ -109,10 +109,6 @@ public class WiredEffectMoveFurniTo extends InteractionWiredEffect { tile = room.getLayout().getTileInFront(objectTile, this.direction, indexOffset); } - if(tile == null) { - continue; - } - room.sendComposer(new FloorItemOnRollerComposer((HabboItem) object, null, tile, tile.getStackHeight() - ((HabboItem) object).getZ(), room).compose()); refreshTiles.addAll(room.getLayout().getTilesAt(room.getLayout().getTile(((HabboItem) object).getX(), ((HabboItem) object).getY()), ((HabboItem) object).getBaseItem().getWidth(), ((HabboItem) object).getBaseItem().getLength(), ((HabboItem) object).getRotation())); room.updateTiles(refreshTiles); diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectResetTimers.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectResetTimers.java index eef5926..63f7760 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectResetTimers.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectResetTimers.java @@ -83,7 +83,7 @@ public class WiredEffectResetTimers extends InteractionWiredEffect { @Override public String getWiredData() { return WiredHandler.getGsonBuilder().create().toJson(new JsonData( - this.getDelay() + this.getDelay() )); } diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/permissions/Rank.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/permissions/Rank.java index cbbc01d..20929cd 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/permissions/Rank.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/permissions/Rank.java @@ -11,7 +11,7 @@ public class Rank { private final int id; - private int level; + private final int level; private final THashMap permissions; private final THashMap variables; private String name; @@ -55,7 +55,6 @@ public class Rank { this.logCommands = set.getString("log_commands").equals("1"); this.prefix = set.getString("prefix"); this.prefixColor = set.getString("prefix_color"); - this.level = set.getInt("level"); this.diamondsTimerAmount = set.getInt("auto_points_amount"); this.creditsTimerAmount = set.getInt("auto_credits_amount"); this.pixelsTimerAmount = set.getInt("auto_pixels_amount"); diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java index 724bd56..a5d847a 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java @@ -865,32 +865,15 @@ public class Room implements Comparable, ISerialize, Runnable { } } - - public void pickupPetsForHabbo(Habbo habbo) { THashSet pets = new THashSet<>(); - - - - - - synchronized (this.currentPets) { for (Pet pet : this.currentPets.valueCollection()) { if (pet.getUserId() == habbo.getHabboInfo().getId()) { pets.add(pet); - - - } - - } - - - - } for (Pet pet : pets) { @@ -1288,7 +1271,7 @@ public class Room implements Comparable, ISerialize, Runnable { if (Emulator.getConfig().getBoolean("hotel.rooms.deco_hosting")) { //Check if the user isn't the owner id if (this.ownerId != habbo.getHabboInfo().getId()) { - //Check if the time already have 1 minute (120 / 2 = 60s) + //Check if the time already have 1 minute (120 / 2 = 60s) if (habbo.getRoomUnit().getTimeInRoom() >= 120) { AchievementManager.progressAchievement(this.ownerId, Emulator.getGameEnvironment().getAchievementManager().getAchievement("RoomDecoHosting")); habbo.getRoomUnit().resetTimeInRoom(); @@ -3018,8 +3001,6 @@ public class Room implements Comparable, ISerialize, Runnable { return pets; } - - public THashSet getHabbosAt(short x, short y) { return this.getHabbosAt(this.layout.getTile(x, y)); } @@ -3658,7 +3639,7 @@ public class Room implements Comparable, ISerialize, Runnable { HabboItem item = this.getTopItemAt(x, y); if (item != null) - return (item.getZ() + Item.getCurrentHeight(item)); + return (item.getZ() + Item.getCurrentHeight(item) - (item.getBaseItem().allowSit() ? 1 : 0)); else return this.layout.getHeightAtSquare(x, y); } @@ -3872,6 +3853,37 @@ public class Room implements Comparable, ISerialize, Runnable { return null; } + public RoomTile getRandomWalkableTilesAround(RoomUnit roomUnit, RoomTile tile, int radius) { + if (!layout.tileExists(tile.x, tile.y)) { + tile = layout.getTile(roomUnit.getX(), roomUnit.getY()); + this.getBot(roomUnit).needsUpdate(true); + } + + List walkableTiles = new ArrayList<>(); + + int minX = Math.max(0, tile.x - radius); + int minY = Math.max(0, tile.y - radius); + int maxX = Math.min(this.getLayout().getMapSizeX() - 1, tile.x + radius); + int maxY = Math.min(this.getLayout().getMapSizeY() - 1, tile.y + radius); + + for (int x = minX; x <= maxX; x++) { + for (int y = minY; y <= maxY; y++) { + RoomTile candidateTile = this.getLayout().getTile((short) x, (short) y); + + if (candidateTile != null && candidateTile.getState() != RoomTileState.BLOCKED && candidateTile.getState() != RoomTileState.INVALID) { + walkableTiles.add(candidateTile); + } + } + } + + if (walkableTiles.isEmpty()) { + return tile; + } + + Collections.shuffle(walkableTiles); + return walkableTiles.get(0); + } + public Habbo getHabbo(String username) { for (Habbo habbo : this.getHabbos()) { if (habbo.getHabboInfo().getUsername().equalsIgnoreCase(username)) @@ -3930,6 +3942,7 @@ public class Room implements Comparable, ISerialize, Runnable { } for (Habbo habbo : this.getHabbos()) { + if (habbo == null) { continue; } if (!habbo.getHabboStats().ignoreBots) habbo.getClient().sendResponse(message); } @@ -4817,17 +4830,28 @@ public class Room implements Comparable, ISerialize, Runnable { } } - if (height > MAXIMUM_FURNI_HEIGHT) return FurnitureMovementError.CANT_STACK; - if (height < this.getLayout().getHeightAtSquare(tile.x, tile.y)) - return FurnitureMovementError.CANT_STACK; //prevent furni going under the floor + boolean cantStack = false; + boolean pluginHeight = false; + + if(height > MAXIMUM_FURNI_HEIGHT) { + cantStack = true; + } + if(height < this.getLayout().getHeightAtSquare(tile.x, tile.y)) { + cantStack = true; + } if (Emulator.getPluginManager().isRegistered(FurnitureBuildheightEvent.class, true)) { FurnitureBuildheightEvent event = Emulator.getPluginManager().fireEvent(new FurnitureBuildheightEvent(item, actor, 0.00, height)); if (event.hasChangedHeight()) { height = event.getUpdatedHeight(); + pluginHeight = true; } } + if(!pluginHeight && cantStack) { + return FurnitureMovementError.CANT_STACK; + } + item.setX(tile.x); item.setY(tile.y); item.setZ(height); @@ -4887,8 +4911,7 @@ public class Room implements Comparable, ISerialize, Runnable { boolean magicTile = item instanceof InteractionStackHelper || item instanceof InteractionTileWalkMagic; - //Check if can be placed at new position - THashSet occupiedTiles = this.layout.getTilesAt(tile, item.getBaseItem().getWidth(), item.getBaseItem().getLength(), rotation); + Optional stackHelper = this.getItemsAt(tile).stream().filter(i -> i instanceof InteractionStackHelper).findAny();THashSet occupiedTiles = this.layout.getTilesAt(tile, item.getBaseItem().getWidth(), item.getBaseItem().getLength(), rotation); List>> tileFurniList = new ArrayList<>(); for (RoomTile t : occupiedTiles) { @@ -4923,80 +4946,6 @@ public class Room implements Comparable, ISerialize, Runnable { return FurnitureMovementError.NONE; } - public FurnitureMovementError moveFurniTo(HabboItem item, RoomTile tile, int rotation, double z, Habbo actor, boolean sendUpdates, boolean checkForUnits) { - if (tile == null) { - return FurnitureMovementError.INVALID_MOVE; - } - RoomTile oldLocation = this.layout.getTile(item.getX(), item.getY()); - boolean pluginHelper = false; - - if (Emulator.getPluginManager().isRegistered(FurnitureMovedEvent.class, true)) { - FurnitureMovedEvent event = Emulator.getPluginManager().fireEvent(new FurnitureMovedEvent(item, actor, oldLocation, tile)); - if(event.isCancelled()) { - return FurnitureMovementError.CANCEL_PLUGIN_MOVE; - } - pluginHelper = event.hasPluginHelper(); - } - - boolean magicTile = item instanceof InteractionStackHelper; - - THashSet occupiedTiles = this.layout.getTilesAt(tile, item.getBaseItem().getWidth(), item.getBaseItem().getLength(), rotation); - THashSet oldOccupiedTiles = this.layout.getTilesAt(this.layout.getTile(item.getX(), item.getY()), item.getBaseItem().getWidth(), item.getBaseItem().getLength(), item.getRotation()); - - if (item.getRotation() != rotation) { - item.setRotation(rotation); - } - - if(z > MAXIMUM_FURNI_HEIGHT) return FurnitureMovementError.CANT_STACK; - if(z < this.getLayout().getHeightAtSquare(tile.x, tile.y)) return FurnitureMovementError.CANT_STACK; //prevent furni going under the floor - - if (Emulator.getPluginManager().isRegistered(FurnitureBuildheightEvent.class, true)) { - FurnitureBuildheightEvent event = Emulator.getPluginManager().fireEvent(new FurnitureBuildheightEvent(item, actor, 0.00, z)); - if (event.hasChangedHeight()) { - z = event.getUpdatedHeight(); - } - } - - item.setX(tile.x); - item.setY(tile.y); - item.setZ(z); - if (magicTile) { - item.setZ(tile.z); - item.setExtradata("" + item.getZ() * 100); - } - if (item.getZ() > MAXIMUM_FURNI_HEIGHT) { - item.setZ(MAXIMUM_FURNI_HEIGHT); - } - - //Update Furniture - item.onMove(this, oldLocation, tile); - item.needsUpdate(true); - Emulator.getThreading().run(item); - - if(sendUpdates) { - this.sendComposer(new FloorItemUpdateComposer(item).compose()); - } - - //Update old & new tiles - occupiedTiles.removeAll(oldOccupiedTiles); - occupiedTiles.addAll(oldOccupiedTiles); - this.updateTiles(occupiedTiles); - - //Update Habbos at old position - for (RoomTile t : occupiedTiles) { - this.updateHabbosAt( - t.x, - t.y, - this.getHabbosAt(t.x, t.y) - /*.stream() - .filter(h -> !h.getRoomUnit().hasStatus(RoomUnitStatus.MOVE) || h.getRoomUnit().getGoal() == t) - .collect(Collectors.toCollection(THashSet::new))*/ - ); - this.updateBotsAt(t.x, t.y); - } - return FurnitureMovementError.NONE; - } - public THashSet getRoomUnits() { return getRoomUnits(null); } @@ -5029,4 +4978,4 @@ public class Room implements Comparable, ISerialize, Runnable { THashSet roomUnits = getRoomUnits(); return roomUnits.stream().filter(unit -> unit.getCurrentLocation() == tile).collect(Collectors.toSet()); } -} \ No newline at end of file +} diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTile.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTile.java index dab7429..9d42b47 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTile.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTile.java @@ -206,10 +206,10 @@ public class RoomTile { public boolean hasUnits() { synchronized(this.units) { - if (!this.units.isEmpty()) { - this.units.removeIf(unit -> !unit.getCurrentLocation().equals(this)); - } - return !this.units.isEmpty(); + if (!this.units.isEmpty()) { + this.units.removeIf(unit -> !unit.getCurrentLocation().equals(this)); + } + return !this.units.isEmpty(); } } diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java index aeabd6f..11d8845 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java @@ -333,12 +333,10 @@ public class RoomUnit { } Optional stackHelper = this.room.getItemsAt(next).stream().filter(i -> i instanceof InteractionTileWalkMagic).findAny(); - if (stackHelper.isPresent()) { zHeight = stackHelper.get().getZ(); } - this.setPreviousLocation(this.getCurrentLocation()); if(this.getIsGameSnow()){ diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/wired/WiredHandler.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/wired/WiredHandler.java index 4ac4879..955cf26 100644 --- a/Emulator/src/main/java/com/eu/habbo/habbohotel/wired/WiredHandler.java +++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/wired/WiredHandler.java @@ -10,7 +10,6 @@ import com.eu.habbo.habbohotel.items.interactions.InteractionWiredTrigger; import com.eu.habbo.habbohotel.items.interactions.wired.WiredTriggerReset; import com.eu.habbo.habbohotel.items.interactions.wired.effects.WiredEffectGiveReward; import com.eu.habbo.habbohotel.items.interactions.wired.effects.WiredEffectTriggerStacks; -import com.eu.habbo.habbohotel.items.interactions.wired.extra.WiredExtraOrEval; import com.eu.habbo.habbohotel.items.interactions.wired.extra.WiredExtraRandom; import com.eu.habbo.habbohotel.items.interactions.wired.extra.WiredExtraUnseen; import com.eu.habbo.habbohotel.rooms.Room; @@ -167,23 +166,10 @@ public class WiredHandler { THashSet conditions = room.getRoomSpecialTypes().getConditions(trigger.getX(), trigger.getY()); THashSet effects = room.getRoomSpecialTypes().getEffects(trigger.getX(), trigger.getY()); + if (Emulator.getPluginManager().fireEvent(new WiredStackTriggeredEvent(room, roomUnit, trigger, effects, conditions)).isCancelled()) + return false; - boolean hasExtraOrEval = room.getRoomSpecialTypes().hasExtraType(trigger.getX(), trigger.getY(), WiredExtraOrEval.class); - - if (!conditions.isEmpty() && hasExtraOrEval) { - ArrayList matchedConditions = new ArrayList<>(conditions.size()); - for (InteractionWiredCondition searchMatched : conditions) { - if (!matchedConditions.contains(searchMatched.getType()) && searchMatched.execute(roomUnit, room, stuff)) { - matchedConditions.add(searchMatched.getType()); - } - } - - if(matchedConditions.size() == 0) { - return false; - } - } - - if (!conditions.isEmpty() && !hasExtraOrEval) { + if (!conditions.isEmpty()) { ArrayList matchedConditions = new ArrayList<>(conditions.size()); for (InteractionWiredCondition searchMatched : conditions) { if (!matchedConditions.contains(searchMatched.getType()) && searchMatched.operator() == WiredConditionOperator.OR && searchMatched.execute(roomUnit, room, stuff)) { @@ -201,9 +187,6 @@ public class WiredHandler { } } - if (Emulator.getPluginManager().fireEvent(new WiredStackTriggeredEvent(room, roomUnit, trigger, effects, conditions)).isCancelled()) - return false; - trigger.setCooldown(millis); boolean hasExtraRandom = room.getRoomSpecialTypes().hasExtraType(trigger.getX(), trigger.getY(), WiredExtraRandom.class); @@ -323,7 +306,7 @@ public class WiredHandler { if (rewardReceived.value.isEmpty()) return; - + if (habbo.getInventory().getBadgesComponent().hasBadge(rewardReceived.value)) return; @@ -482,7 +465,7 @@ public class WiredHandler { room.getRoomSpecialTypes().getTriggers().forEach(t -> { if (t == null) return; - + if (t.getType() == WiredTriggerType.AT_GIVEN_TIME || t.getType() == WiredTriggerType.PERIODICALLY || t.getType() == WiredTriggerType.PERIODICALLY_LONG) { ((WiredTriggerReset) t).resetTimer(); } @@ -490,4 +473,4 @@ public class WiredHandler { room.setLastTimerReset(Emulator.getIntUnixTimestamp()); } -} \ No newline at end of file +} diff --git a/Emulator/src/main/java/com/eu/habbo/messages/ServerMessage.java b/Emulator/src/main/java/com/eu/habbo/messages/ServerMessage.java index 91f5245..a2f0ca4 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/ServerMessage.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/ServerMessage.java @@ -1,5 +1,6 @@ package com.eu.habbo.messages; +import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.util.PacketUtils; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufOutputStream; @@ -19,6 +20,7 @@ public class ServerMessage { private AtomicInteger refs; private ByteBufOutputStream stream; private ByteBuf channelBuffer; + private MessageComposer composer; public ServerMessage() { @@ -38,6 +40,7 @@ public class ServerMessage { this.refs = new AtomicInteger(0); this.channelBuffer = Unpooled.buffer(); this.stream = new ByteBufOutputStream(this.channelBuffer); + this.composer = null; try { this.stream.writeInt(0); @@ -185,4 +188,12 @@ public class ServerMessage { return this.channelBuffer.copy(); } + public MessageComposer getComposer() { + return composer; + } + + public void setComposer(MessageComposer composer) { + this.composer = composer; + } + } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemAsGiftEvent.java b/Emulator/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemAsGiftEvent.java index 454b517..b67cd0e 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemAsGiftEvent.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemAsGiftEvent.java @@ -61,7 +61,7 @@ public class CatalogBuyItemAsGiftEvent extends MessageHandler { int itemId = this.packet.readInt(); String extraData = this.packet.readString(); String username = this.packet.readString(); - String message = this.packet.readString(); + String message = Emulator.getGameEnvironment().getWordFilter().filter(this.packet.readString(), this.client.getHabbo()); int spriteId = this.packet.readInt(); int color = this.packet.readInt(); int ribbonId = this.packet.readInt(); diff --git a/Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveMemberEvent.java b/Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveMemberEvent.java index 16ee969..e5ee67f 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveMemberEvent.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveMemberEvent.java @@ -73,4 +73,4 @@ public class GuildRemoveMemberEvent extends MessageHandler { } } } -} \ No newline at end of file +} diff --git a/Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyEvent.java b/Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyEvent.java index 574987f..96b73e6 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyEvent.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyEvent.java @@ -21,8 +21,8 @@ public class RequestGuildBuyEvent extends MessageHandler { @Override public void handle() throws Exception { - String name = this.packet.readString(); - String description = this.packet.readString(); + String name = Emulator.getGameEnvironment().getWordFilter().filter(this.packet.readString(), this.client.getHabbo()); + String description = Emulator.getGameEnvironment().getWordFilter().filter(this.packet.readString(), this.client.getHabbo()); if(name.length() > 29 || description.length() > 254) return; diff --git a/Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumPostThreadEvent.java b/Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumPostThreadEvent.java index 5d3db9e..a1730c3 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumPostThreadEvent.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumPostThreadEvent.java @@ -24,8 +24,8 @@ public class GuildForumPostThreadEvent extends MessageHandler { public void handle() throws Exception { int guildId = this.packet.readInt(); int threadId = this.packet.readInt(); - String subject = this.packet.readString(); - String message = this.packet.readString(); + String subject = Emulator.getGameEnvironment().getWordFilter().filter(this.packet.readString(), this.client.getHabbo()); + String message = Emulator.getGameEnvironment().getWordFilter().filter(this.packet.readString(), this.client.getHabbo()); Guild guild = Emulator.getGameEnvironment().getGuildManager().getGuild(guildId); diff --git a/Emulator/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestPlaylists.java b/Emulator/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestPlaylists.java index cd499ec..15f9206 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestPlaylists.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestPlaylists.java @@ -25,7 +25,7 @@ public class YoutubeRequestPlaylists extends MessageHandler { if (item instanceof InteractionYoutubeTV) { InteractionYoutubeTV tv = (InteractionYoutubeTV) item; - ArrayList playlists = Emulator.getGameEnvironment().getItemManager().getYoutubeManager().getPlaylistsForItemId(itemId); + ArrayList playlists = Emulator.getGameEnvironment().getItemManager().getYoutubeManager().getPlaylistsForItemId(item.getBaseItem().getId()); if (playlists == null) { LOGGER.error("No YouTube playlists set for base item #" + item.getBaseItem().getId()); diff --git a/Emulator/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/ScratchPetEvent.java b/Emulator/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/ScratchPetEvent.java index 501b690..973bc02 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/ScratchPetEvent.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/ScratchPetEvent.java @@ -3,7 +3,14 @@ package com.eu.habbo.messages.incoming.rooms.pets; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.pets.MonsterplantPet; import com.eu.habbo.habbohotel.pets.Pet; +import com.eu.habbo.habbohotel.rooms.Room; +import com.eu.habbo.habbohotel.rooms.RoomTile; +import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; +import com.eu.habbo.threading.runnables.RoomUnitWalkToLocation; + +import java.util.ArrayList; +import java.util.List; public class ScratchPetEvent extends MessageHandler { @@ -11,21 +18,34 @@ public class ScratchPetEvent extends MessageHandler { public void handle() throws Exception { final int petId = this.packet.readInt(); - if (this.client.getHabbo().getHabboInfo().getCurrentRoom() == null) { + final Habbo habbo = this.client.getHabbo(); + if (habbo == null) { return; } - final Pet pet = this.client.getHabbo().getHabboInfo().getCurrentRoom().getPet(petId); + final Room room = habbo.getHabboInfo().getCurrentRoom(); + if (room == null) { + return; + } + final Pet pet = room.getPet(petId); if (pet == null) { return; } - if (this.client.getHabbo().getHabboStats().petRespectPointsToGive > 0 || pet instanceof MonsterplantPet) { - pet.scratched(this.client.getHabbo()); + if (habbo.getHabboStats().petRespectPointsToGive > 0 || pet instanceof MonsterplantPet) { - // Update the stats to the database. - Emulator.getThreading().run(pet); + List tasks = new ArrayList<>(); + tasks.add(() -> { + pet.scratched(habbo); + Emulator.getThreading().run(pet); + }); + + RoomTile closestTile = habbo.getRoomUnit().getClosestAdjacentTile(pet.getRoomUnit().getX(), pet.getRoomUnit().getY(), true); + if (closestTile != null) { + habbo.getRoomUnit().setGoalLocation(closestTile); + Emulator.getThreading().run(new RoomUnitWalkToLocation(habbo.getRoomUnit(), closestTile, room, tasks, tasks)); + } } } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/incoming/users/SaveMottoEvent.java b/Emulator/src/main/java/com/eu/habbo/messages/incoming/users/SaveMottoEvent.java index 50d0f9a..d3f4322 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/incoming/users/SaveMottoEvent.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/incoming/users/SaveMottoEvent.java @@ -9,7 +9,7 @@ import com.eu.habbo.plugin.events.users.UserSavedMottoEvent; public class SaveMottoEvent extends MessageHandler { @Override public void handle() throws Exception { - String motto = this.packet.readString(); + String motto = Emulator.getGameEnvironment().getWordFilter().filter(this.packet.readString(), this.client.getHabbo()); UserSavedMottoEvent event = new UserSavedMottoEvent(this.client.getHabbo(), this.client.getHabbo().getHabboInfo().getMotto(), motto); Emulator.getPluginManager().fireEvent(event); motto = event.newMotto; diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/MessageComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/MessageComposer.java index d55e8db..4a9c721 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/MessageComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/MessageComposer.java @@ -17,6 +17,11 @@ public abstract class MessageComposer { public ServerMessage compose() { if (this.composed == null) { this.composed = this.composeInternal(); + if(this.composed != null) { + if(this.composed.getComposer() == null) { + this.composed.setComposer(this); + } + } } return this.composed; diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementListComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementListComposer.java index be1660f..70da8c8 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementListComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementListComposer.java @@ -58,4 +58,8 @@ public class AchievementListComposer extends MessageComposer { return this.response; } + + public Habbo getHabbo() { + return habbo; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementProgressComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementProgressComposer.java index 8cf649b..9727d7d 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementProgressComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementProgressComposer.java @@ -56,4 +56,12 @@ public class AchievementProgressComposer extends MessageComposer { return this.response; } + + public Habbo getHabbo() { + return habbo; + } + + public Achievement getAchievement() { + return achievement; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementUnlockedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementUnlockedComposer.java index ca2449f..a8f8e9d 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementUnlockedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementUnlockedComposer.java @@ -35,4 +35,12 @@ public class AchievementUnlockedComposer extends MessageComposer { this.response.appendBoolean(true); return this.response; } + + public Achievement getAchievement() { + return achievement; + } + + public Habbo getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentLevelUpdateComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentLevelUpdateComposer.java index 3a51535..ec5aa51 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentLevelUpdateComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentLevelUpdateComposer.java @@ -38,4 +38,12 @@ public class TalentLevelUpdateComposer extends MessageComposer { } return this.response; } + + public TalentTrackType getTalentTrackType() { + return talentTrackType; + } + + public TalentTrackLevel getTalentTrackLevel() { + return talentTrackLevel; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentTrackComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentTrackComposer.java index 87515a2..9029c05 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentTrackComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentTrackComposer.java @@ -127,4 +127,12 @@ public class TalentTrackComposer extends MessageComposer { this.id = id; } } + + public Habbo getHabbo() { + return habbo; + } + + public TalentTrackType getType() { + return type; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraCompetitionStatusComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraCompetitionStatusComposer.java index 31d4ef6..0683681 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraCompetitionStatusComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraCompetitionStatusComposer.java @@ -20,4 +20,12 @@ public class CameraCompetitionStatusComposer extends MessageComposer { this.response.appendString(this.unknownString); return this.response; } + + public boolean isUnknownBoolean() { + return unknownBoolean; + } + + public String getUnknownString() { + return unknownString; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPriceComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPriceComposer.java index 133352c..dbf95e0 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPriceComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPriceComposer.java @@ -23,4 +23,16 @@ public class CameraPriceComposer extends MessageComposer { this.response.appendInt(this.pointsType); return this.response; } + + public int getCredits() { + return credits; + } + + public int getPoints() { + return points; + } + + public int getPointsType() { + return pointsType; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPublishWaitMessageComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPublishWaitMessageComposer.java index 9c01241..f58771f 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPublishWaitMessageComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPublishWaitMessageComposer.java @@ -28,4 +28,16 @@ public class CameraPublishWaitMessageComposer extends MessageComposer { return this.response; } + + public boolean isOk() { + return isOk; + } + + public int getCooldownSeconds() { + return cooldownSeconds; + } + + public String getExtraDataId() { + return extraDataId; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraURLComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraURLComposer.java index 414f6f5..0aefead 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraURLComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraURLComposer.java @@ -17,4 +17,8 @@ public class CameraURLComposer extends MessageComposer { this.response.appendString(this.URL); return this.response; } + + public String getURL() { + return URL; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertPurchaseFailedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertPurchaseFailedComposer.java index 4a8a456..c3e8b4e 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertPurchaseFailedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertPurchaseFailedComposer.java @@ -20,4 +20,8 @@ public class AlertPurchaseFailedComposer extends MessageComposer { this.response.appendInt(this.error); return this.response; } + + public int getError() { + return error; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertPurchaseUnavailableComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertPurchaseUnavailableComposer.java index fb4f809..ab84df6 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertPurchaseUnavailableComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertPurchaseUnavailableComposer.java @@ -20,4 +20,8 @@ public class AlertPurchaseUnavailableComposer extends MessageComposer { this.response.appendInt(this.code); return this.response; } + + public int getCode() { + return code; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogModeComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogModeComposer.java index 4c45a1d..e095fe5 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogModeComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogModeComposer.java @@ -17,4 +17,8 @@ public class CatalogModeComposer extends MessageComposer { this.response.appendInt(this.mode); return this.response; } + + public int getMode() { + return mode; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPageComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPageComposer.java index 0f4d8bd..3607aa0 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPageComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPageComposer.java @@ -68,4 +68,20 @@ public class CatalogPageComposer extends MessageComposer { page.serialize(message); } } + + public CatalogPage getPage() { + return page; + } + + public Habbo getHabbo() { + return habbo; + } + + public int getOfferId() { + return offerId; + } + + public String getMode() { + return mode; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPagesListComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPagesListComposer.java index 829c48b..018d441 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPagesListComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPagesListComposer.java @@ -75,4 +75,17 @@ public class CatalogPagesListComposer extends MessageComposer { this.append(page); } } + + + public Habbo getHabbo() { + return habbo; + } + + public String getMode() { + return mode; + } + + public boolean isHasPermission() { + return hasPermission; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogSearchResultComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogSearchResultComposer.java index 640683d..487e2d2 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogSearchResultComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogSearchResultComposer.java @@ -18,4 +18,8 @@ public class CatalogSearchResultComposer extends MessageComposer { this.item.serialize(this.response); return this.response; } + + public CatalogItem getItem() { + return item; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubCenterDataComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubCenterDataComposer.java index 64e4a3f..bbc44a6 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubCenterDataComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubCenterDataComposer.java @@ -50,5 +50,39 @@ public class ClubCenterDataComposer extends MessageComposer { return this.response; } + public int getCurrentHcStreak() { + return currentHcStreak; + } + public String getFirstSubDate() { + return firstSubDate; + } + + public double getKickbackPercentage() { + return kickbackPercentage; + } + + public int getTotalCreditsMissed() { + return totalCreditsMissed; + } + + public int getTotalCreditsRewarded() { + return totalCreditsRewarded; + } + + public int getTotalCreditsSpent() { + return totalCreditsSpent; + } + + public int getCreditRewardForStreakBonus() { + return creditRewardForStreakBonus; + } + + public int getCreditRewardForMonthlySpent() { + return creditRewardForMonthlySpent; + } + + public int getTimeUntilPayday() { + return timeUntilPayday; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubDataComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubDataComposer.java index 96188ad..2ca6c51 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubDataComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubDataComposer.java @@ -34,4 +34,12 @@ public class ClubDataComposer extends MessageComposer { this.response.appendInt(this.windowId); return this.response; } + + public int getWindowId() { + return windowId; + } + + public Habbo getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubGiftsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubGiftsComposer.java index e45b482..4a6af68 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubGiftsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubGiftsComposer.java @@ -65,4 +65,16 @@ public class ClubGiftsComposer extends MessageComposer { return this.response; } + + public int getDaysTillNextGift() { + return daysTillNextGift; + } + + public int getAvailableGifts() { + return availableGifts; + } + + public int getDaysAsHc() { + return daysAsHc; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/NotEnoughPointsTypeComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/NotEnoughPointsTypeComposer.java index ec20a8a..d5e7a25 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/NotEnoughPointsTypeComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/NotEnoughPointsTypeComposer.java @@ -23,4 +23,16 @@ public class NotEnoughPointsTypeComposer extends MessageComposer { this.response.appendInt(this.pointsType); return this.response; } + + public boolean isCredits() { + return isCredits; + } + + public boolean isPixels() { + return isPixels; + } + + public int getPointsType() { + return pointsType; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetBoughtNotificationComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetBoughtNotificationComposer.java index f2ed562..630c176 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetBoughtNotificationComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetBoughtNotificationComposer.java @@ -21,4 +21,12 @@ public class PetBoughtNotificationComposer extends MessageComposer { this.pet.serialize(this.response); return this.response; } + + public Pet getPet() { + return pet; + } + + public boolean isGift() { + return gift; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetBreedsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetBreedsComposer.java index a469dfa..c439eb3 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetBreedsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetBreedsComposer.java @@ -31,4 +31,12 @@ public class PetBreedsComposer extends MessageComposer { } return this.response; } + + public String getPetName() { + return petName; + } + + public THashSet getPetRaces() { + return petRaces; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetNameErrorComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetNameErrorComposer.java index c392c97..71ae036 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetNameErrorComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetNameErrorComposer.java @@ -26,4 +26,12 @@ public class PetNameErrorComposer extends MessageComposer { this.response.appendString(this.value); return this.response; } + + public int getType() { + return type; + } + + public String getValue() { + return value; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/PurchaseOKComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/PurchaseOKComposer.java index 1750480..0286320 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/PurchaseOKComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/PurchaseOKComposer.java @@ -40,4 +40,8 @@ public class PurchaseOKComposer extends MessageComposer { } return this.response; } + + public CatalogItem getCatalogItem() { + return catalogItem; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerCompleteComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerCompleteComposer.java index 54cfc60..32ece5c 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerCompleteComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerCompleteComposer.java @@ -21,4 +21,8 @@ public class RecyclerCompleteComposer extends MessageComposer { this.response.appendInt(0); //prize ID. return this.response; } + + public int getCode() { + return code; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/RedeemVoucherErrorComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/RedeemVoucherErrorComposer.java index 1632021..e5196d4 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/RedeemVoucherErrorComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/RedeemVoucherErrorComposer.java @@ -20,4 +20,8 @@ public class RedeemVoucherErrorComposer extends MessageComposer { this.response.appendString(this.code + ""); return this.response; } + + public int getCode() { + return code; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/TargetedOfferComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/TargetedOfferComposer.java index ee8cbb6..d19a8e4 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/TargetedOfferComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/TargetedOfferComposer.java @@ -23,4 +23,12 @@ public class TargetedOfferComposer extends MessageComposer { this.offer.serialize(this.response, purchase); return this.response; } + + public Habbo getHabbo() { + return habbo; + } + + public TargetOffer getOffer() { + return offer; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceBuyErrorComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceBuyErrorComposer.java index 800bd4c..ceb03c3 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceBuyErrorComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceBuyErrorComposer.java @@ -31,4 +31,20 @@ public class MarketplaceBuyErrorComposer extends MessageComposer { this.response.appendInt(this.price); //requestedOfferId return this.response; } + + public int getErrorCode() { + return errorCode; + } + + public int getUnknown() { + return unknown; + } + + public int getOfferId() { + return offerId; + } + + public int getPrice() { + return price; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCancelSaleComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCancelSaleComposer.java index 97d2462..b959ad0 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCancelSaleComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCancelSaleComposer.java @@ -21,4 +21,12 @@ public class MarketplaceCancelSaleComposer extends MessageComposer { this.response.appendBoolean(this.success); return this.response; } + + public MarketPlaceOffer getOffer() { + return offer; + } + + public boolean isSuccess() { + return success; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemInfoComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemInfoComposer.java index f9f5f6e..eaa089b 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemInfoComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemInfoComposer.java @@ -18,4 +18,8 @@ public class MarketplaceItemInfoComposer extends MessageComposer { MarketPlace.serializeItemInfo(this.itemId, this.response); return this.response; } + + public int getItemId() { + return itemId; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemPostedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemPostedComposer.java index 2489af8..f881394 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemPostedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemPostedComposer.java @@ -22,4 +22,8 @@ public class MarketplaceItemPostedComposer extends MessageComposer { this.response.appendInt(this.code); return this.response; } + + public int getCode() { + return code; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOffersComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOffersComposer.java index e2e28d3..f778993 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOffersComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOffersComposer.java @@ -45,4 +45,8 @@ public class MarketplaceOffersComposer extends MessageComposer { this.response.appendInt(this.offers.size()); return this.response; } + + public List getOffers() { + return offers; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOwnItemsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOwnItemsComposer.java index b02c1c0..ed39ff4 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOwnItemsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOwnItemsComposer.java @@ -64,4 +64,8 @@ public class MarketplaceOwnItemsComposer extends MessageComposer { return this.response; } + + public Habbo getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceSellItemComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceSellItemComposer.java index 0834ed4..ee2a582 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceSellItemComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceSellItemComposer.java @@ -27,4 +27,16 @@ public class MarketplaceSellItemComposer extends MessageComposer { this.response.appendInt(this.valueB); return this.response; } + + public int getErrorCode() { + return errorCode; + } + + public int getValueA() { + return valueA; + } + + public int getValueB() { + return valueB; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftableProductsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftableProductsComposer.java index 0c2254e..efe08dc 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftableProductsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftableProductsComposer.java @@ -35,4 +35,12 @@ public class CraftableProductsComposer extends MessageComposer { return this.response; } + + public List getRecipes() { + return recipes; + } + + public Collection getIngredients() { + return ingredients; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingRecipeComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingRecipeComposer.java index a8db678..1621b5f 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingRecipeComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingRecipeComposer.java @@ -26,4 +26,8 @@ public class CraftingRecipeComposer extends MessageComposer { } return this.response; } + + public CraftingRecipe getRecipe() { + return recipe; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingRecipesAvailableComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingRecipesAvailableComposer.java index 5f0c773..d30cfc5 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingRecipesAvailableComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingRecipesAvailableComposer.java @@ -20,4 +20,12 @@ public class CraftingRecipesAvailableComposer extends MessageComposer { this.response.appendBoolean(this.found); return this.response; } + + public int getCount() { + return count; + } + + public boolean isFound() { + return found; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingResultComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingResultComposer.java index d7967e8..a422c6b 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingResultComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingResultComposer.java @@ -32,4 +32,12 @@ public class CraftingResultComposer extends MessageComposer { return this.response; } + + public CraftingRecipe getRecipe() { + return recipe; + } + + public boolean isSucces() { + return succes; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/AdventCalendarDataComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/AdventCalendarDataComposer.java index abf20a7..d9e5786 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/AdventCalendarDataComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/AdventCalendarDataComposer.java @@ -61,4 +61,28 @@ public class AdventCalendarDataComposer extends MessageComposer { return this.response; } + + public String getEventName() { + return eventName; + } + + public String getCampaignImage() { + return campaignImage; + } + + public int getTotalDays() { + return totalDays; + } + + public int getCurrentDay() { + return currentDay; + } + + public ArrayList getUnlocked() { + return unlocked; + } + + public boolean isLockExpired() { + return lockExpired; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/AdventCalendarProductComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/AdventCalendarProductComposer.java index fb23b31..9522b8d 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/AdventCalendarProductComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/AdventCalendarProductComposer.java @@ -46,4 +46,16 @@ public class AdventCalendarProductComposer extends MessageComposer { return this.response; } + + public boolean isVisible() { + return visible; + } + + public CalendarRewardObject getRewardObject() { + return rewardObject; + } + + public Habbo getHabbo() { + return habbo; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxPrizeComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxPrizeComposer.java index f5e95b3..c887375 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxPrizeComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxPrizeComposer.java @@ -20,4 +20,12 @@ public class MysticBoxPrizeComposer extends MessageComposer { this.response.appendInt(this.itemId); return this.response; } + + public String getType() { + return type; + } + + public int getItemId() { + return itemId; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionCompletedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionCompletedComposer.java index 741b944..d8e59dc 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionCompletedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionCompletedComposer.java @@ -18,4 +18,8 @@ public class NewYearResolutionCompletedComposer extends MessageComposer { this.response.appendString(this.badge); return this.response; } + + public String getBadge() { + return badge; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionProgressComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionProgressComposer.java index c478f2e..dc63146 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionProgressComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionProgressComposer.java @@ -32,4 +32,28 @@ public class NewYearResolutionProgressComposer extends MessageComposer { this.response.appendInt(this.timeLeft); return this.response; } + + public int getStuffId() { + return stuffId; + } + + public int getAchievementId() { + return achievementId; + } + + public String getAchievementName() { + return achievementName; + } + + public int getCurrentProgress() { + return currentProgress; + } + + public int getProgressNeeded() { + return progressNeeded; + } + + public int getTimeLeft() { + return timeLeft; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/FloorPlanEditorBlockedTilesComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/FloorPlanEditorBlockedTilesComposer.java index 3cccbe1..bcd0a2f 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/FloorPlanEditorBlockedTilesComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/FloorPlanEditorBlockedTilesComposer.java @@ -28,4 +28,8 @@ public class FloorPlanEditorBlockedTilesComposer extends MessageComposer { return this.response; } + + public Room getRoom() { + return room; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/FloorPlanEditorDoorSettingsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/FloorPlanEditorDoorSettingsComposer.java index 21874ea..18dccea 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/FloorPlanEditorDoorSettingsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/FloorPlanEditorDoorSettingsComposer.java @@ -20,4 +20,8 @@ public class FloorPlanEditorDoorSettingsComposer extends MessageComposer { this.response.appendInt(this.room.getLayout().getDoorDirection()); return this.response; } + + public Room getRoom() { + return room; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendChatMessageComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendChatMessageComposer.java index 4806b43..8b1131b 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendChatMessageComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendChatMessageComposer.java @@ -50,4 +50,16 @@ public class FriendChatMessageComposer extends MessageComposer { return this.response; } + + public Message getMessage() { + return message; + } + + public int getToId() { + return toId; + } + + public int getFromId() { + return fromId; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendFindingRoomComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendFindingRoomComposer.java index 8c100a6..05a014a 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendFindingRoomComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendFindingRoomComposer.java @@ -20,4 +20,8 @@ public class FriendFindingRoomComposer extends MessageComposer { this.response.appendInt(this.errorCode); return this.response; } + + public int getErrorCode() { + return errorCode; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendNotificationComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendNotificationComposer.java index 9e9ed2f..0471095 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendNotificationComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendNotificationComposer.java @@ -31,4 +31,16 @@ public class FriendNotificationComposer extends MessageComposer { this.response.appendString(this.data); return this.response; } + + public int getUserId() { + return userId; + } + + public int getType() { + return type; + } + + public String getData() { + return data; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestComposer.java index 005ac3d..6d92ca1 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestComposer.java @@ -22,4 +22,8 @@ public class FriendRequestComposer extends MessageComposer { return this.response; } + + public Habbo getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestErrorComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestErrorComposer.java index 84ebe13..4b6392e 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestErrorComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestErrorComposer.java @@ -23,4 +23,8 @@ public class FriendRequestErrorComposer extends MessageComposer { this.response.appendInt(this.errorCode); return this.response; } + + public int getErrorCode() { + return errorCode; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendsComposer.java index 287e87c..b84039a 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendsComposer.java @@ -80,4 +80,16 @@ public class FriendsComposer extends MessageComposer { return messages; } + + public int getTotalPages() { + return totalPages; + } + + public int getPageIndex() { + return pageIndex; + } + + public Collection getFriends() { + return friends; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/LoadFriendRequestsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/LoadFriendRequestsComposer.java index fb3314b..7ccd81c 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/LoadFriendRequestsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/LoadFriendRequestsComposer.java @@ -30,4 +30,8 @@ public class LoadFriendRequestsComposer extends MessageComposer { return this.response; } + + public Habbo getHabbo() { + return habbo; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/MessengerInitComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/MessengerInitComposer.java index de3b920..63aff18 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/MessengerInitComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/MessengerInitComposer.java @@ -44,5 +44,9 @@ public class MessengerInitComposer extends MessageComposer { } return this.response; } + + public Habbo getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/RemoveFriendComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/RemoveFriendComposer.java index 34cbe1b..7e39080 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/RemoveFriendComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/RemoveFriendComposer.java @@ -30,4 +30,8 @@ public class RemoveFriendComposer extends MessageComposer { return this.response; } + + public TIntArrayList getUnfriendIds() { + return unfriendIds; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/RoomInviteComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/RoomInviteComposer.java index 1b761a5..31ea23f 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/RoomInviteComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/RoomInviteComposer.java @@ -20,4 +20,12 @@ public class RoomInviteComposer extends MessageComposer { this.response.appendString(this.message); return this.response; } + + public int getUserId() { + return userId; + } + + public String getMessage() { + return message; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/RoomInviteErrorComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/RoomInviteErrorComposer.java index b2d3c54..7f77811 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/RoomInviteErrorComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/RoomInviteErrorComposer.java @@ -30,4 +30,12 @@ public class RoomInviteErrorComposer extends MessageComposer { }); return this.response; } + + public int getErrorCode() { + return errorCode; + } + + public THashSet getBuddies() { + return buddies; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/StalkErrorComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/StalkErrorComposer.java index 7eac0a9..464abff 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/StalkErrorComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/StalkErrorComposer.java @@ -22,4 +22,8 @@ public class StalkErrorComposer extends MessageComposer { this.response.appendInt(this.errorCode); return this.response; } + + public int getErrorCode() { + return errorCode; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/UpdateFriendComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/UpdateFriendComposer.java index 1be0b1a..96cd509 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/UpdateFriendComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/UpdateFriendComposer.java @@ -51,27 +51,39 @@ public class UpdateFriendComposer extends MessageComposer { for(MessengerBuddy buddy : buddies){ - if (buddy != null) { - this.response.appendInt(this.action); // -1 = removed friendId / 0 = updated friend / 1 = added friend - this.response.appendInt(buddy.getId()); - if (this.action == -1) { - continue; + if (buddy != null) { + this.response.appendInt(this.action); // -1 = removed friendId / 0 = updated friend / 1 = added friend + this.response.appendInt(buddy.getId()); + if (this.action == -1) { + continue; + } + this.response.appendString(buddy.getUsername()); + this.response.appendInt(buddy.getGender().equals(HabboGender.M) ? 0 : 1); + this.response.appendBoolean(buddy.getOnline() == 1); + this.response.appendBoolean(buddy.inRoom()); //In room + this.response.appendString(buddy.getLook()); + this.response.appendInt(buddy.getCategoryId()); + this.response.appendString(buddy.getMotto()); + this.response.appendString(""); //Last seen as DATETIMESTRING + this.response.appendString(""); //Realname or Facebookame as String + this.response.appendBoolean(false); //Offline messaging. + this.response.appendBoolean(false); + this.response.appendBoolean(false); + this.response.appendShort(buddy.getRelation()); } - this.response.appendString(buddy.getUsername()); - this.response.appendInt(buddy.getGender().equals(HabboGender.M) ? 0 : 1); - this.response.appendBoolean(buddy.getOnline() == 1); - this.response.appendBoolean(buddy.inRoom()); //In room - this.response.appendString(buddy.getLook()); - this.response.appendInt(buddy.getCategoryId()); - this.response.appendString(buddy.getMotto()); - this.response.appendString(""); //Last seen as DATETIMESTRING - this.response.appendString(""); //Realname or Facebookame as String - this.response.appendBoolean(false); //Offline messaging. - this.response.appendBoolean(false); - this.response.appendBoolean(false); - this.response.appendShort(buddy.getRelation()); } - } return this.response; } + + public Collection getBuddies() { + return buddies; + } + + public Habbo getHabbo() { + return habbo; + } + + public int getAction() { + return action; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/UserSearchResultComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/UserSearchResultComposer.java index 7c66c3d..72f7215 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/UserSearchResultComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/friends/UserSearchResultComposer.java @@ -77,4 +77,16 @@ public class UserSearchResultComposer extends MessageComposer { return false; } + + public THashSet getUsers() { + return users; + } + + public THashSet getFriends() { + return friends; + } + + public Habbo getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterAccountInfoComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterAccountInfoComposer.java index fd8760f..2ff84ef 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterAccountInfoComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterAccountInfoComposer.java @@ -21,4 +21,12 @@ public class GameCenterAccountInfoComposer extends MessageComposer { this.response.appendInt(1); return this.response; } + + public int getGameId() { + return gameId; + } + + public int getGamesLeft() { + return gamesLeft; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterGameComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterGameComposer.java index 2d28e93..b0ccc6e 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterGameComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterGameComposer.java @@ -23,4 +23,12 @@ public class GameCenterGameComposer extends MessageComposer { this.response.appendInt(this.status); return this.response; } + + public int getGameId() { + return gameId; + } + + public int getStatus() { + return status; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpJoinQueueComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpJoinQueueComposer.java index 6df404f..f4fe451 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpJoinQueueComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpJoinQueueComposer.java @@ -17,4 +17,8 @@ public class BaseJumpJoinQueueComposer extends MessageComposer { this.response.appendInt(this.gameId); return this.response; } + + public int getGameId() { + return gameId; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLoadGameComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLoadGameComposer.java index 99d4c66..8aa0741 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLoadGameComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLoadGameComposer.java @@ -48,4 +48,12 @@ public class BaseJumpLoadGameComposer extends MessageComposer { } return this.response; } + + public GameClient getClient() { + return client; + } + + public int getGame() { + return game; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/PickMonthlyClubGiftNotificationComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/PickMonthlyClubGiftNotificationComposer.java index bae14e7..e95e0be 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/PickMonthlyClubGiftNotificationComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/PickMonthlyClubGiftNotificationComposer.java @@ -17,4 +17,8 @@ public class PickMonthlyClubGiftNotificationComposer extends MessageComposer { this.response.appendInt(this.count); return this.response; } + + public int getCount() { + return count; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/BotErrorComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/BotErrorComposer.java index 8773d9c..040be43 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/BotErrorComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/BotErrorComposer.java @@ -23,4 +23,8 @@ public class BotErrorComposer extends MessageComposer { this.response.appendInt(this.errorCode); return this.response; } + + public int getErrorCode() { + return errorCode; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/BubbleAlertComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/BubbleAlertComposer.java index 391cd6e..f1089bf 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/BubbleAlertComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/BubbleAlertComposer.java @@ -38,4 +38,12 @@ public class BubbleAlertComposer extends MessageComposer { } return this.response; } + + public String getErrorKey() { + return errorKey; + } + + public THashMap getKeys() { + return keys; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/CustomNotificationComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/CustomNotificationComposer.java index 2e1a52d..7b5b93d 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/CustomNotificationComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/CustomNotificationComposer.java @@ -23,4 +23,8 @@ public class CustomNotificationComposer extends MessageComposer { this.response.appendInt(this.type); return this.response; } + + public int getType() { + return type; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericAlertComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericAlertComposer.java index 2b4d597..120dc18 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericAlertComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericAlertComposer.java @@ -24,4 +24,8 @@ public class GenericAlertComposer extends MessageComposer { return this.response; } + + public String getMessage() { + return message; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericErrorMessagesComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericErrorMessagesComposer.java index 7757cdd..102de72 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericErrorMessagesComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericErrorMessagesComposer.java @@ -25,4 +25,8 @@ public class GenericErrorMessagesComposer extends MessageComposer { this.response.appendInt(this.errorCode); return this.response; } + + public int getErrorCode() { + return errorCode; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelClosedAndOpensComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelClosedAndOpensComposer.java index fc7cc92..e791048 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelClosedAndOpensComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelClosedAndOpensComposer.java @@ -20,4 +20,12 @@ public class HotelClosedAndOpensComposer extends MessageComposer { this.response.appendInt(this.minute); return this.response; } + + public int getHour() { + return hour; + } + + public int getMinute() { + return minute; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelClosesAndWillOpenAtComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelClosesAndWillOpenAtComposer.java index d92497f..b01cdef 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelClosesAndWillOpenAtComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelClosesAndWillOpenAtComposer.java @@ -23,4 +23,16 @@ public class HotelClosesAndWillOpenAtComposer extends MessageComposer { this.response.appendBoolean(this.disconnected); return this.response; } + + public int getHour() { + return hour; + } + + public int getMinute() { + return minute; + } + + public boolean isDisconnected() { + return disconnected; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelWillCloseInMinutesAndBackInComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelWillCloseInMinutesAndBackInComposer.java index 3e9d3ad..32a1c9d 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelWillCloseInMinutesAndBackInComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelWillCloseInMinutesAndBackInComposer.java @@ -21,4 +21,12 @@ public class HotelWillCloseInMinutesAndBackInComposer extends MessageComposer { this.response.appendInt(this.reopenInMinutes); return this.response; } + + public int getCloseInMinutes() { + return closeInMinutes; + } + + public int getReopenInMinutes() { + return reopenInMinutes; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelWillCloseInMinutesComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelWillCloseInMinutesComposer.java index 0a4f1a9..88adaff 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelWillCloseInMinutesComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelWillCloseInMinutesComposer.java @@ -17,4 +17,8 @@ public class HotelWillCloseInMinutesComposer extends MessageComposer { this.response.appendInt(this.minutes); return this.response; } + + public int getMinutes() { + return minutes; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/MessagesForYouComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/MessagesForYouComposer.java index 0003c63..5b129a0 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/MessagesForYouComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/MessagesForYouComposer.java @@ -36,4 +36,12 @@ public class MessagesForYouComposer extends MessageComposer { return this.response; } + + public String[] getMessages() { + return messages; + } + + public List getNewMessages() { + return newMessages; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/PetErrorComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/PetErrorComposer.java index 7318ff2..02017ee 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/PetErrorComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/PetErrorComposer.java @@ -24,4 +24,8 @@ public class PetErrorComposer extends MessageComposer { this.response.appendInt(this.errorCode); return this.response; } + + public int getErrorCode() { + return errorCode; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertAndOpenHabboWayComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertAndOpenHabboWayComposer.java index 687b43e..4945408 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertAndOpenHabboWayComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertAndOpenHabboWayComposer.java @@ -17,4 +17,8 @@ public class StaffAlertAndOpenHabboWayComposer extends MessageComposer { this.response.appendString(this.message); return this.response; } + + public String getMessage() { + return message; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertWIthLinkAndOpenHabboWayComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertWIthLinkAndOpenHabboWayComposer.java index 7a7686c..48f06a3 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertWIthLinkAndOpenHabboWayComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertWIthLinkAndOpenHabboWayComposer.java @@ -20,4 +20,12 @@ public class StaffAlertWIthLinkAndOpenHabboWayComposer extends MessageComposer { this.response.appendString(this.link); return this.response; } + + public String getMessage() { + return message; + } + + public String getLink() { + return link; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertWithLinkComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertWithLinkComposer.java index 8244798..1f5f150 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertWithLinkComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertWithLinkComposer.java @@ -20,4 +20,12 @@ public class StaffAlertWithLinkComposer extends MessageComposer { this.response.appendString(this.link); return this.response; } + + public String getMessage() { + return message; + } + + public String getLink() { + return link; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/UpdateFailedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/UpdateFailedComposer.java index 5a0e70a..5970d60 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/UpdateFailedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/UpdateFailedComposer.java @@ -17,4 +17,8 @@ public class UpdateFailedComposer extends MessageComposer { this.response.appendString(this.message); return this.response; } + + public String getMessage() { + return message; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingRequestedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingRequestedComposer.java index e420971..765e174 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingRequestedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingRequestedComposer.java @@ -47,4 +47,8 @@ public class GuardianVotingRequestedComposer extends MessageComposer { //2015 10 17 14 24 30 return this.response; } + + public GuardianTicket getTicket() { + return ticket; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingResultComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingResultComposer.java index a0f50fc..90dc553 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingResultComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingResultComposer.java @@ -34,4 +34,12 @@ public class GuardianVotingResultComposer extends MessageComposer { } return this.response; } + + public GuardianTicket getTicket() { + return ticket; + } + + public GuardianVote getVote() { + return vote; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingVotesComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingVotesComposer.java index 82138a8..e87cf3a 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingVotesComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingVotesComposer.java @@ -32,4 +32,12 @@ public class GuardianVotingVotesComposer extends MessageComposer { return this.response; } + + public GuardianTicket getTicket() { + return ticket; + } + + public Habbo getGuardian() { + return guardian; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/BullyReportClosedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/BullyReportClosedComposer.java index f89afe9..e7a0300 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/BullyReportClosedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/BullyReportClosedComposer.java @@ -20,4 +20,8 @@ public class BullyReportClosedComposer extends MessageComposer { this.response.appendInt(this.code); return this.response; } + + public int getCode() { + return code; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionAttachedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionAttachedComposer.java index 999ccc7..c83d66a 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionAttachedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionAttachedComposer.java @@ -25,4 +25,12 @@ public class GuideSessionAttachedComposer extends MessageComposer { this.response.appendInt(this.isHelper ? 60 : Emulator.getGameEnvironment().getGuideManager().getAverageWaitingTime()); //? Avarage Waiting Time (for noob) | Time left to pickup (For helper) return this.response; } + + public GuideTour getTour() { + return tour; + } + + public boolean isHelper() { + return isHelper; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionEndedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionEndedComposer.java index a08c395..87721ac 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionEndedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionEndedComposer.java @@ -20,4 +20,8 @@ public class GuideSessionEndedComposer extends MessageComposer { this.response.appendInt(this.errorCode); //? return this.response; } + + public int getErrorCode() { + return errorCode; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionErrorComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionErrorComposer.java index 1776a3e..f149ac6 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionErrorComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionErrorComposer.java @@ -21,4 +21,8 @@ public class GuideSessionErrorComposer extends MessageComposer { this.response.appendInt(this.errorCode); return this.response; } + + public int getErrorCode() { + return errorCode; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionInvitedToGuideRoomComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionInvitedToGuideRoomComposer.java index 15a7fd3..0aed8d7 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionInvitedToGuideRoomComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionInvitedToGuideRoomComposer.java @@ -20,4 +20,8 @@ public class GuideSessionInvitedToGuideRoomComposer extends MessageComposer { this.response.appendString(this.room != null ? this.room.getName() : ""); return this.response; } + + public Room getRoom() { + return room; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionMessageComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionMessageComposer.java index fdf74f7..e4643f7 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionMessageComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionMessageComposer.java @@ -19,4 +19,8 @@ public class GuideSessionMessageComposer extends MessageComposer { this.response.appendInt(this.message.userId); //Sender ID return this.response; } + + public GuideChatMessage getMessage() { + return message; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionPartnerIsPlayingComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionPartnerIsPlayingComposer.java index 496368a..2d9934a 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionPartnerIsPlayingComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionPartnerIsPlayingComposer.java @@ -17,4 +17,8 @@ public class GuideSessionPartnerIsPlayingComposer extends MessageComposer { this.response.appendBoolean(this.isPlaying); return this.response; } + + public boolean isPlaying() { + return isPlaying; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionPartnerIsTypingComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionPartnerIsTypingComposer.java index 3781c45..3cd5368 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionPartnerIsTypingComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionPartnerIsTypingComposer.java @@ -17,4 +17,8 @@ public class GuideSessionPartnerIsTypingComposer extends MessageComposer { this.response.appendBoolean(this.typing); return this.response; } + + public boolean isTyping() { + return typing; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionRequesterRoomComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionRequesterRoomComposer.java index cd6e5b8..c3c1f3e 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionRequesterRoomComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionRequesterRoomComposer.java @@ -18,4 +18,8 @@ public class GuideSessionRequesterRoomComposer extends MessageComposer { this.response.appendInt(this.room != null ? this.room.getId() : 0); return this.response; } + + public Room getRoom() { + return room; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionStartedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionStartedComposer.java index dd1ce31..038a1fe 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionStartedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionStartedComposer.java @@ -23,4 +23,8 @@ public class GuideSessionStartedComposer extends MessageComposer { this.response.appendString(this.tour.getHelper().getHabboInfo().getLook()); return this.response; } + + public GuideTour getTour() { + return tour; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideToolsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideToolsComposer.java index dbcc32e..2c85ddc 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideToolsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideToolsComposer.java @@ -21,4 +21,8 @@ public class GuideToolsComposer extends MessageComposer { this.response.appendInt(Emulator.getGameEnvironment().getGuideManager().getGuardiansCount()); //Guardians On Duty return this.response; } + + public boolean isOnDuty() { + return onDuty; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildAcceptMemberErrorComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildAcceptMemberErrorComposer.java index 460e6da..d3e44ef 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildAcceptMemberErrorComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildAcceptMemberErrorComposer.java @@ -24,4 +24,12 @@ public class GuildAcceptMemberErrorComposer extends MessageComposer { this.response.appendInt(this.errorCode); return this.response; } + + public int getGuildId() { + return guildId; + } + + public int getErrorCode() { + return errorCode; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildBoughtComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildBoughtComposer.java index 8c5f1ac..be616ea 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildBoughtComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildBoughtComposer.java @@ -19,4 +19,8 @@ public class GuildBoughtComposer extends MessageComposer { this.response.appendInt(this.guild.getId()); return this.response; } + + public Guild getGuild() { + return guild; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildBuyRoomsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildBuyRoomsComposer.java index e55f913..e00cdc2 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildBuyRoomsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildBuyRoomsComposer.java @@ -49,4 +49,8 @@ public class GuildBuyRoomsComposer extends MessageComposer { this.response.appendInt(0); return this.response; } + + public THashSet getRooms() { + return rooms; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildConfirmRemoveMemberComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildConfirmRemoveMemberComposer.java index 798fcf3..b52971f 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildConfirmRemoveMemberComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildConfirmRemoveMemberComposer.java @@ -20,4 +20,12 @@ public class GuildConfirmRemoveMemberComposer extends MessageComposer { this.response.appendInt(this.furniCount); return this.response; } + + public int getUserId() { + return userId; + } + + public int getFurniCount() { + return furniCount; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditFailComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditFailComposer.java index 17780d8..c122f43 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditFailComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditFailComposer.java @@ -22,4 +22,8 @@ public class GuildEditFailComposer extends MessageComposer { this.response.appendInt(this.errorCode); return this.response; } + + public int getErrorCode() { + return errorCode; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFavoriteRoomUserUpdateComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFavoriteRoomUserUpdateComposer.java index 37df211..3a7a307 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFavoriteRoomUserUpdateComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFavoriteRoomUserUpdateComposer.java @@ -24,4 +24,12 @@ public class GuildFavoriteRoomUserUpdateComposer extends MessageComposer { this.response.appendString(this.guild != null ? this.guild.getName() : ""); return this.response; } + + public RoomUnit getRoomUnit() { + return roomUnit; + } + + public Guild getGuild() { + return guild; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFurniWidgetComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFurniWidgetComposer.java index e437320..3348da7 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFurniWidgetComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFurniWidgetComposer.java @@ -30,4 +30,16 @@ public class GuildFurniWidgetComposer extends MessageComposer { this.response.appendBoolean(this.guild.hasForum()); //Has Forum. return this.response; } + + public HabboItem getItem() { + return item; + } + + public Guild getGuild() { + return guild; + } + + public Habbo getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildInfoComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildInfoComposer.java index dab0c0e..04e31db 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildInfoComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildInfoComposer.java @@ -29,28 +29,44 @@ public class GuildInfoComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - boolean adminPermissions = this.client.getHabbo().getHabboStats().hasGuild(this.guild.getId()) && this.client.getHabbo().hasPermission(Permission.ACC_GUILD_ADMIN) || Emulator.getGameEnvironment().getGuildManager().getOnlyAdmins(guild).get(this.client.getHabbo().getHabboInfo().getId()) != null; - this.response.init(Outgoing.GuildInfoComposer); - this.response.appendInt(this.guild.getId()); - this.response.appendBoolean(true); - this.response.appendInt(this.guild.getState().state); - this.response.appendString(this.guild.getName()); - this.response.appendString(this.guild.getDescription()); - this.response.appendString(this.guild.getBadge()); - this.response.appendInt(this.guild.getRoomId()); - this.response.appendString(this.guild.getRoomName()); - this.response.appendInt((this.member == null ? GuildMembershipStatus.NOT_MEMBER : this.member.getMembershipStatus()).getStatus()); - this.response.appendInt(this.guild.getMemberCount()); - this.response.appendBoolean(this.client.getHabbo().getHabboStats().guild == this.guild.getId()); // favorite group - this.response.appendString(new SimpleDateFormat("dd-MM-yyyy").format(new Date(this.guild.getDateCreated() * 1000L))); - this.response.appendBoolean(adminPermissions || (this.guild.getOwnerId() == this.client.getHabbo().getHabboInfo().getId())); - this.response.appendBoolean(adminPermissions || (this.member != null && (this.member.getRank().equals(GuildRank.ADMIN)))); + boolean adminPermissions = this.client.getHabbo().getHabboStats().hasGuild(this.guild.getId()) && this.client.getHabbo().hasPermission(Permission.ACC_GUILD_ADMIN) || Emulator.getGameEnvironment().getGuildManager().getOnlyAdmins(guild).get(this.client.getHabbo().getHabboInfo().getId()) != null; + this.response.init(Outgoing.GuildInfoComposer); + this.response.appendInt(this.guild.getId()); + this.response.appendBoolean(true); + this.response.appendInt(this.guild.getState().state); + this.response.appendString(this.guild.getName()); + this.response.appendString(this.guild.getDescription()); + this.response.appendString(this.guild.getBadge()); + this.response.appendInt(this.guild.getRoomId()); + this.response.appendString(this.guild.getRoomName()); + this.response.appendInt((this.member == null ? GuildMembershipStatus.NOT_MEMBER : this.member.getMembershipStatus()).getStatus()); + this.response.appendInt(this.guild.getMemberCount()); + this.response.appendBoolean(this.client.getHabbo().getHabboStats().guild == this.guild.getId()); // favorite group + this.response.appendString(new SimpleDateFormat("dd-MM-yyyy").format(new Date(this.guild.getDateCreated() * 1000L))); + this.response.appendBoolean(adminPermissions || (this.guild.getOwnerId() == this.client.getHabbo().getHabboInfo().getId())); + this.response.appendBoolean(adminPermissions || (this.member != null && (this.member.getRank().equals(GuildRank.ADMIN)))); - this.response.appendString(this.guild.getOwnerName()); - this.response.appendBoolean(this.newWindow); - this.response.appendBoolean(this.guild.getRights()); - this.response.appendInt((adminPermissions || this.guild.getOwnerId() == this.client.getHabbo().getHabboInfo().getId()) ? this.guild.getRequestCount() : 0); //Guild invites count. - this.response.appendBoolean(this.guild.hasForum()); - return this.response; - } + this.response.appendString(this.guild.getOwnerName()); + this.response.appendBoolean(this.newWindow); + this.response.appendBoolean(this.guild.getRights()); + this.response.appendInt((adminPermissions || this.guild.getOwnerId() == this.client.getHabbo().getHabboInfo().getId()) ? this.guild.getRequestCount() : 0); //Guild invites count. + this.response.appendBoolean(this.guild.hasForum()); + return this.response; } + + public Guild getGuild() { + return guild; + } + + public GameClient getClient() { + return client; + } + + public boolean isNewWindow() { + return newWindow; + } + + public GuildMember getMember() { + return member; + } +} diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildJoinErrorComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildJoinErrorComposer.java index 00716bf..fe6826d 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildJoinErrorComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildJoinErrorComposer.java @@ -25,4 +25,8 @@ public class GuildJoinErrorComposer extends MessageComposer { this.response.appendInt(this.code); return this.response; } + + public int getCode() { + return code; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildListComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildListComposer.java index 82965f0..6402a36 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildListComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildListComposer.java @@ -33,4 +33,12 @@ public class GuildListComposer extends MessageComposer { } return this.response; } + + public THashSet getGuilds() { + return guilds; + } + + public Habbo getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildManageComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildManageComposer.java index 7983974..3241af4 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildManageComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildManageComposer.java @@ -59,4 +59,8 @@ public class GuildManageComposer extends MessageComposer { this.response.appendInt(this.guild.getMemberCount()); return this.response; } + + public Guild getGuild() { + return guild; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMemberUpdateComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMemberUpdateComposer.java index e5a1290..43ac6ed 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMemberUpdateComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMemberUpdateComposer.java @@ -26,4 +26,12 @@ public class GuildMemberUpdateComposer extends MessageComposer { this.response.appendString(this.guildMember.getRank().type != 0 ? this.guildMember.getJoinDate() + "" : ""); return this.response; } + + public Guild getGuild() { + return guild; + } + + public GuildMember getGuildMember() { + return guildMember; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembersComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembersComposer.java index 8bacc76..8b61e44 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembersComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembersComposer.java @@ -59,4 +59,36 @@ public class GuildMembersComposer extends MessageComposer { this.response.appendString(this.searchValue); return this.response; } + + public ArrayList getMembers() { + return members; + } + + public Guild getGuild() { + return guild; + } + + public Habbo getSession() { + return session; + } + + public int getPageId() { + return pageId; + } + + public int getLevel() { + return level; + } + + public String getSearchValue() { + return searchValue; + } + + public boolean isAdmin() { + return isAdmin; + } + + public int getTotalCount() { + return totalCount; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildRefreshMembersListComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildRefreshMembersListComposer.java index 4a0f124..9876b04 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildRefreshMembersListComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildRefreshMembersListComposer.java @@ -19,4 +19,8 @@ public class GuildRefreshMembersListComposer extends MessageComposer { this.response.appendInt(0); return this.response; } + + public Guild getGuild() { + return guild; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/RemoveGuildFromRoomComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/RemoveGuildFromRoomComposer.java index 47a86da..d401d34 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/RemoveGuildFromRoomComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/RemoveGuildFromRoomComposer.java @@ -17,4 +17,8 @@ public class RemoveGuildFromRoomComposer extends MessageComposer { this.response.appendInt(this.guildId); return this.response; } + + public int getGuildId() { + return guildId; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumAddCommentComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumAddCommentComposer.java index 3570f86..5656f55 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumAddCommentComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumAddCommentComposer.java @@ -20,4 +20,8 @@ public class GuildForumAddCommentComposer extends MessageComposer { this.comment.serialize(this.response); //Comment return this.response; } + + public ForumThreadComment getComment() { + return comment; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumCommentsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumCommentsComposer.java index ecafc48..3b6ff1d 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumCommentsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumCommentsComposer.java @@ -34,4 +34,20 @@ public class GuildForumCommentsComposer extends MessageComposer { } return this.response; } + + public int getGuildId() { + return guildId; + } + + public int getThreadId() { + return threadId; + } + + public int getIndex() { + return index; + } + + public Collection getGuildForumCommentList() { + return guildForumCommentList; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumDataComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumDataComposer.java index 555df4a..d753f9a 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumDataComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumDataComposer.java @@ -166,4 +166,12 @@ public class GuildForumDataComposer extends MessageComposer { return this.response; } + + public Guild getGuild() { + return guild; + } + + public Habbo getHabbo() { + return habbo; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumListComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumListComposer.java index ebe1d96..eda9ae1 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumListComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumListComposer.java @@ -52,4 +52,20 @@ public class GuildForumListComposer extends MessageComposer { return this.response; } + + public Set getGuilds() { + return guilds; + } + + public Habbo getHabbo() { + return habbo; + } + + public int getMode() { + return mode; + } + + public int getIndex() { + return index; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumThreadMessagesComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumThreadMessagesComposer.java index c1d77bb..c300852 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumThreadMessagesComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumThreadMessagesComposer.java @@ -19,4 +19,8 @@ public class GuildForumThreadMessagesComposer extends MessageComposer { this.thread.serialize(this.response); return this.response; } + + public ForumThread getThread() { + return thread; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumThreadsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumThreadsComposer.java index e5750b8..7a4313e 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumThreadsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumThreadsComposer.java @@ -58,4 +58,12 @@ public class GuildForumThreadsComposer extends MessageComposer { return this.response; } + + public Guild getGuild() { + return guild; + } + + public int getIndex() { + return index; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumsUnreadMessagesCountComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumsUnreadMessagesCountComposer.java index e989747..6487d25 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumsUnreadMessagesCountComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumsUnreadMessagesCountComposer.java @@ -17,4 +17,8 @@ public class GuildForumsUnreadMessagesCountComposer extends MessageComposer { this.response.appendInt(this.count); return this.response; } + + public int getCount() { + return count; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/PostUpdateMessageComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/PostUpdateMessageComposer.java index bdf20b7..f66f5fb 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/PostUpdateMessageComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/PostUpdateMessageComposer.java @@ -26,4 +26,16 @@ public class PostUpdateMessageComposer extends MessageComposer { return this.response; } + + public int getGuildId() { + return guildId; + } + + public int getThreadId() { + return threadId; + } + + public ForumThreadComment getComment() { + return comment; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/ThreadUpdatedMessageComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/ThreadUpdatedMessageComposer.java index 96ab2ea..c4c0e15 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/ThreadUpdatedMessageComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/ThreadUpdatedMessageComposer.java @@ -35,4 +35,24 @@ public class ThreadUpdatedMessageComposer extends MessageComposer { return this.response; } + + public Guild getGuild() { + return guild; + } + + public ForumThread getThread() { + return thread; + } + + public Habbo getHabbo() { + return habbo; + } + + public boolean isPinned() { + return isPinned; + } + + public boolean isLocked() { + return isLocked; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/habboway/HabboWayQuizComposer1.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/habboway/HabboWayQuizComposer1.java index d2f73e4..321bed9 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/habboway/HabboWayQuizComposer1.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/habboway/HabboWayQuizComposer1.java @@ -23,4 +23,12 @@ public class HabboWayQuizComposer1 extends MessageComposer { } return this.response; } + + public String getName() { + return name; + } + + public int[] getItems() { + return items; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/habboway/HabboWayQuizComposer2.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/habboway/HabboWayQuizComposer2.java index dd3086e..ce56bd1 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/habboway/HabboWayQuizComposer2.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/habboway/HabboWayQuizComposer2.java @@ -23,4 +23,12 @@ public class HabboWayQuizComposer2 extends MessageComposer { } return this.response; } + + public String getName() { + return name; + } + + public int[] getItems() { + return items; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserGiftComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserGiftComposer.java index ec2a8b4..585010f 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserGiftComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserGiftComposer.java @@ -28,4 +28,8 @@ public class NewUserGiftComposer extends MessageComposer { } return this.response; } + + public List> getOptions() { + return options; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserIdentityComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserIdentityComposer.java index 13c03ac..94de5c9 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserIdentityComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserIdentityComposer.java @@ -18,4 +18,8 @@ public class NewUserIdentityComposer extends MessageComposer { this.response.appendInt(this.habbo.noobStatus()); return this.response; } + + public Habbo getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NuxAlertComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NuxAlertComposer.java index 02188a0..8baa902 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NuxAlertComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NuxAlertComposer.java @@ -17,4 +17,8 @@ public class NuxAlertComposer extends MessageComposer { this.response.appendString(this.link); return this.response; } + + public String getLink() { + return link; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/handshake/AvailabilityStatusMessageComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/handshake/AvailabilityStatusMessageComposer.java index d65cc78..ec81830 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/handshake/AvailabilityStatusMessageComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/handshake/AvailabilityStatusMessageComposer.java @@ -24,4 +24,16 @@ public class AvailabilityStatusMessageComposer extends MessageComposer { this.response.appendBoolean(isAuthenticHabbo);//isAuthenticHabbo return this.response; } + + public boolean isOpen() { + return isOpen; + } + + public boolean isShuttingDown() { + return isShuttingDown; + } + + public boolean isAuthenticHabbo() { + return isAuthenticHabbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/handshake/CompleteDiffieHandshakeComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/handshake/CompleteDiffieHandshakeComposer.java index dc2c5fb..68cb0da 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/handshake/CompleteDiffieHandshakeComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/handshake/CompleteDiffieHandshakeComposer.java @@ -26,4 +26,11 @@ public class CompleteDiffieHandshakeComposer extends MessageComposer { return this.response; } + public String getPublicKey() { + return publicKey; + } + + public boolean isClientEncryption() { + return clientEncryption; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/handshake/ConnectionErrorComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/handshake/ConnectionErrorComposer.java index fb01eff..9b27540 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/handshake/ConnectionErrorComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/handshake/ConnectionErrorComposer.java @@ -30,4 +30,16 @@ public class ConnectionErrorComposer extends MessageComposer { return this.response; } + + public int getMessageId() { + return messageId; + } + + public int getErrorCode() { + return errorCode; + } + + public String getTimestamp() { + return timestamp; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/handshake/EnableNotificationsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/handshake/EnableNotificationsComposer.java index 575cd17..078ee5b 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/handshake/EnableNotificationsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/handshake/EnableNotificationsComposer.java @@ -17,4 +17,8 @@ public class EnableNotificationsComposer extends MessageComposer { this.response.appendBoolean(this.enabled); return this.response; } + + public boolean isEnabled() { + return enabled; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/handshake/InitDiffieHandshakeComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/handshake/InitDiffieHandshakeComposer.java index 72ffdb0..0f06f55 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/handshake/InitDiffieHandshakeComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/handshake/InitDiffieHandshakeComposer.java @@ -22,4 +22,11 @@ public class InitDiffieHandshakeComposer extends MessageComposer { return this.response; } + public String getSignedPrime() { + return signedPrime; + } + + public String getSignedGenerator() { + return signedGenerator; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/handshake/MachineIDComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/handshake/MachineIDComposer.java index f96abff..aa0ef34 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/handshake/MachineIDComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/handshake/MachineIDComposer.java @@ -19,4 +19,7 @@ public class MachineIDComposer extends MessageComposer { return this.response; } + public String getMachineId() { + return machineId; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/handshake/PongComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/handshake/PongComposer.java index c30c6af..72ad710 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/handshake/PongComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/handshake/PongComposer.java @@ -17,4 +17,8 @@ public class PongComposer extends MessageComposer { this.response.appendInt(this.id); return this.response; } + + public int getId() { + return id; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/BonusRareComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/BonusRareComposer.java index 1c38778..92b850a 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/BonusRareComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/BonusRareComposer.java @@ -25,4 +25,8 @@ public class BonusRareComposer extends MessageComposer { return this.response; } + + public Habbo getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HallOfFameComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HallOfFameComposer.java index ef796db..4b87187 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HallOfFameComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HallOfFameComposer.java @@ -37,4 +37,8 @@ public class HallOfFameComposer extends MessageComposer { } return this.response; } + + public HallOfFame getHallOfFame() { + return hallOfFame; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewBadgeButtonConfigComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewBadgeButtonConfigComposer.java index 501103d..a7ba9ad 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewBadgeButtonConfigComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewBadgeButtonConfigComposer.java @@ -20,4 +20,12 @@ public class HotelViewBadgeButtonConfigComposer extends MessageComposer { this.response.appendBoolean(this.enabled); return this.response; } + + public String getBadge() { + return badge; + } + + public boolean isEnabled() { + return enabled; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCatalogPageExpiringComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCatalogPageExpiringComposer.java index bc98a0c..eea71c6 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCatalogPageExpiringComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCatalogPageExpiringComposer.java @@ -23,4 +23,16 @@ public class HotelViewCatalogPageExpiringComposer extends MessageComposer { this.response.appendString(this.image); return this.response; } + + public String getName() { + return name; + } + + public int getTime() { + return time; + } + + public String getImage() { + return image; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCommunityGoalComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCommunityGoalComposer.java index f1614f5..2e1f1f7 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCommunityGoalComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCommunityGoalComposer.java @@ -57,4 +57,44 @@ public class HotelViewCommunityGoalComposer extends MessageComposer { } return this.response; } + + public boolean isAchieved() { + return achieved; + } + + public int getPersonalContributionScore() { + return personalContributionScore; + } + + public int getPersonalRank() { + return personalRank; + } + + public int getTotalAmount() { + return totalAmount; + } + + public int getCommunityHighestAchievedLevel() { + return communityHighestAchievedLevel; + } + + public int getScoreRemainingUntilNextLevel() { + return scoreRemainingUntilNextLevel; + } + + public int getPercentCompletionTowardsNextLevel() { + return percentCompletionTowardsNextLevel; + } + + public String getCompetitionName() { + return competitionName; + } + + public int getTimeLeft() { + return timeLeft; + } + + public int[] getRankData() { + return rankData; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewConcurrentUsersComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewConcurrentUsersComposer.java index 87a90fc..9fc9bbc 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewConcurrentUsersComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewConcurrentUsersComposer.java @@ -27,4 +27,16 @@ public class HotelViewConcurrentUsersComposer extends MessageComposer { this.response.appendInt(this.goal); return this.response; } + + public int getState() { + return state; + } + + public int getUserCount() { + return userCount; + } + + public int getGoal() { + return goal; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCustomTimerComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCustomTimerComposer.java index f31e320..62b7cde 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCustomTimerComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCustomTimerComposer.java @@ -20,4 +20,12 @@ public class HotelViewCustomTimerComposer extends MessageComposer { this.response.appendInt(this.seconds); return this.response; } + + public String getName() { + return name; + } + + public int getSeconds() { + return seconds; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewDataComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewDataComposer.java index 1271d5f..131577f 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewDataComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewDataComposer.java @@ -22,4 +22,12 @@ public class HotelViewDataComposer extends MessageComposer { return this.response; } + + public String getData() { + return data; + } + + public String getKey() { + return key; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewExpiringCatalogPageCommposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewExpiringCatalogPageCommposer.java index bc0b082..b6868b0 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewExpiringCatalogPageCommposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewExpiringCatalogPageCommposer.java @@ -22,4 +22,12 @@ public class HotelViewExpiringCatalogPageCommposer extends MessageComposer { this.response.appendString(this.image); return this.response; } + + public CatalogPage getPage() { + return page; + } + + public String getImage() { + return image; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewHideCommunityVoteButtonComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewHideCommunityVoteButtonComposer.java index 6a32b5d..aec5dd1 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewHideCommunityVoteButtonComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewHideCommunityVoteButtonComposer.java @@ -17,4 +17,8 @@ public class HotelViewHideCommunityVoteButtonComposer extends MessageComposer { this.response.appendBoolean(this.unknownBoolean); return this.response; } + + public boolean isUnknownBoolean() { + return unknownBoolean; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewNextLTDAvailableComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewNextLTDAvailableComposer.java index d922ceb..6cdd3e3 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewNextLTDAvailableComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewNextLTDAvailableComposer.java @@ -26,4 +26,20 @@ public class HotelViewNextLTDAvailableComposer extends MessageComposer { this.response.appendString(this.itemName); return this.response; } + + public int getTime() { + return time; + } + + public int getPageId() { + return pageId; + } + + public int getItemId() { + return itemId; + } + + public String getItemName() { + return itemName; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewSecondsUntilComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewSecondsUntilComposer.java index 91538dc..7c91ec3 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewSecondsUntilComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewSecondsUntilComposer.java @@ -21,4 +21,12 @@ public class HotelViewSecondsUntilComposer extends MessageComposer { return this.response; } + + public String getDateString() { + return dateString; + } + + public int getSeconds() { + return seconds; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/AddBotComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/AddBotComposer.java index fc64df0..37334f4 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/AddBotComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/AddBotComposer.java @@ -23,4 +23,8 @@ public class AddBotComposer extends MessageComposer { this.response.appendBoolean(true); return this.response; } + + public Bot getBot() { + return bot; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/AddHabboItemComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/AddHabboItemComposer.java index 266d413..e49ee27 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/AddHabboItemComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/AddHabboItemComposer.java @@ -94,4 +94,24 @@ public class AddHabboItemComposer extends MessageComposer { this.number = number; } } + + public THashSet getItemsList() { + return itemsList; + } + + public HabboItem getItem() { + return item; + } + + public int[] getIds() { + return ids; + } + + public AddHabboItemCategory getCategory() { + return category; + } + + public Map> getEntries() { + return entries; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/AddPetComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/AddPetComposer.java index 150d678..9f73a97 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/AddPetComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/AddPetComposer.java @@ -19,4 +19,8 @@ public class AddPetComposer extends MessageComposer { this.response.appendBoolean(false); return this.response; } + + public Pet getPet() { + return pet; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListAddComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListAddComposer.java index f518760..ef63635 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListAddComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListAddComposer.java @@ -22,4 +22,8 @@ public class EffectsListAddComposer extends MessageComposer { this.response.appendBoolean(effect.duration <= 0); //Is active return this.response; } + + public EffectsComponent.HabboEffect getEffect() { + return effect; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListEffectEnableComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListEffectEnableComposer.java index 8b107b5..28f21b1 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListEffectEnableComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListEffectEnableComposer.java @@ -20,4 +20,8 @@ public class EffectsListEffectEnableComposer extends MessageComposer { this.response.appendBoolean(this.effect.enabled); //activated return this.response; } + + public EffectsComponent.HabboEffect getEffect() { + return effect; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListRemoveComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListRemoveComposer.java index f9d8020..130deab 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListRemoveComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListRemoveComposer.java @@ -18,4 +18,8 @@ public class EffectsListRemoveComposer extends MessageComposer { this.response.appendInt(this.effect.effect); return this.response; } + + public EffectsComponent.HabboEffect getEffect() { + return effect; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryBadgesComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryBadgesComposer.java index e9dd505..d880d7c 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryBadgesComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryBadgesComposer.java @@ -41,4 +41,8 @@ public class InventoryBadgesComposer extends MessageComposer { return this.response; } + + public Habbo getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryBotsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryBotsComposer.java index fe3b04e..de45b1b 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryBotsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryBotsComposer.java @@ -30,4 +30,8 @@ public class InventoryBotsComposer extends MessageComposer { return this.response; } + + public Habbo getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryItemsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryItemsComposer.java index e8dbd93..0c80ca4 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryItemsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryItemsComposer.java @@ -107,4 +107,15 @@ public class InventoryItemsComposer extends MessageComposer implements TIntObjec this.response.appendString(habboItem.getExtradata()); } + public int getFragmentNumber() { + return fragmentNumber; + } + + public int getTotalFragments() { + return totalFragments; + } + + public TIntObjectMap getItems() { + return items; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryPetsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryPetsComposer.java index a0f9740..4ec234e 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryPetsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryPetsComposer.java @@ -37,4 +37,8 @@ public class InventoryPetsComposer extends MessageComposer { return this.response; } + + public Habbo getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryUpdateItemComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryUpdateItemComposer.java index c558f98..0b84e4b 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryUpdateItemComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryUpdateItemComposer.java @@ -62,4 +62,8 @@ public class InventoryUpdateItemComposer extends MessageComposer { this.response.appendInt(100); return this.response; } + + public HabboItem getHabboItem() { + return habboItem; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemoveBotComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemoveBotComposer.java index cda6dc6..52fa36d 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemoveBotComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemoveBotComposer.java @@ -18,4 +18,8 @@ public class RemoveBotComposer extends MessageComposer { this.response.appendInt(this.bot.getId()); return this.response; } + + public Bot getBot() { + return bot; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemoveHabboItemComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemoveHabboItemComposer.java index c9855e9..f376edd 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemoveHabboItemComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemoveHabboItemComposer.java @@ -17,4 +17,8 @@ public class RemoveHabboItemComposer extends MessageComposer { this.response.appendInt(this.itemId); return this.response; } + + public int getItemId() { + return itemId; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemovePetComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemovePetComposer.java index af495d2..9e17247 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemovePetComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemovePetComposer.java @@ -18,4 +18,8 @@ public class RemovePetComposer extends MessageComposer { this.response.appendInt(this.petId); return this.response; } + + public int getPetId() { + return petId; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/UserEffectsListComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/UserEffectsListComposer.java index 13e42b5..a0f12c6 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/UserEffectsListComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/inventory/UserEffectsListComposer.java @@ -48,4 +48,12 @@ public class UserEffectsListComposer extends MessageComposer { } return this.response; } + + public Habbo getHabbo() { + return habbo; + } + + public Collection getEffects() { + return effects; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportRequestComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportRequestComposer.java index 9d64854..c6eb7e0 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportRequestComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportRequestComposer.java @@ -41,4 +41,12 @@ public class BullyReportRequestComposer extends MessageComposer { //:test 1917 i:1 i:3 i:1 b:0 s:1 s:1 s:1 return this.response; } + + public int getErrorCode() { + return errorCode; + } + + public int getErrorCodeType() { + return errorCodeType; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportedMessageComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportedMessageComposer.java index bca14d5..f12204c 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportedMessageComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportedMessageComposer.java @@ -23,4 +23,8 @@ public class BullyReportedMessageComposer extends MessageComposer { this.response.appendInt(this.code); return this.response; } + + public int getCode() { + return code; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolComposer.java index aacc82a..a9f108b 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolComposer.java @@ -94,4 +94,8 @@ public class ModToolComposer extends MessageComposer implements TObjectProcedure return true; } + + public Habbo getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueChatlogComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueChatlogComposer.java index fbbc23a..ba225fd 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueChatlogComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueChatlogComposer.java @@ -98,4 +98,20 @@ public class ModToolIssueChatlogComposer extends MessageComposer { return this.response; } + + public ModToolIssue getIssue() { + return issue; + } + + public List getChatlog() { + return chatlog; + } + + public String getRoomName() { + return roomName; + } + + public ModToolIssueChatlogType getType() { + return type; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueHandledComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueHandledComposer.java index 0cdc7ee..3be7402 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueHandledComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueHandledComposer.java @@ -29,4 +29,12 @@ public class ModToolIssueHandledComposer extends MessageComposer { this.response.appendString(this.message); return this.response; } + + public int getCode() { + return code; + } + + public String getMessage() { + return message; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueHandlerDimensionsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueHandlerDimensionsComposer.java index 225c212..a4cc12f 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueHandlerDimensionsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueHandlerDimensionsComposer.java @@ -26,4 +26,20 @@ public class ModToolIssueHandlerDimensionsComposer extends MessageComposer { this.response.appendInt(this.height); return this.response; } + + public int getX() { + return x; + } + + public int getY() { + return y; + } + + public int getWidth() { + return width; + } + + public int getHeight() { + return height; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueInfoComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueInfoComposer.java index 6abe7b2..a956eaf 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueInfoComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueInfoComposer.java @@ -18,4 +18,8 @@ public class ModToolIssueInfoComposer extends MessageComposer { this.issue.serialize(this.response); return this.response; } + + public ModToolIssue getIssue() { + return issue; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueResponseAlertComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueResponseAlertComposer.java index 3be7663..3548e46 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueResponseAlertComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueResponseAlertComposer.java @@ -17,4 +17,8 @@ public class ModToolIssueResponseAlertComposer extends MessageComposer { this.response.appendString(this.message); return this.response; } + + public String getMessage() { + return message; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueUpdateComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueUpdateComposer.java index e3756e7..35e120e 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueUpdateComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueUpdateComposer.java @@ -18,4 +18,8 @@ public class ModToolIssueUpdateComposer extends MessageComposer { this.issue.serialize(this.response); return this.response; } + + public ModToolIssue getIssue() { + return issue; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolReportReceivedAlertComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolReportReceivedAlertComposer.java index 6f6315e..719ea4c 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolReportReceivedAlertComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolReportReceivedAlertComposer.java @@ -24,4 +24,12 @@ public class ModToolReportReceivedAlertComposer extends MessageComposer { this.response.appendString(this.message); return this.response; } + + public int getErrorCode() { + return errorCode; + } + + public String getMessage() { + return message; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolRoomChatlogComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolRoomChatlogComposer.java index 50ec979..f37f714 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolRoomChatlogComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolRoomChatlogComposer.java @@ -43,4 +43,12 @@ public class ModToolRoomChatlogComposer extends MessageComposer { } return this.response; } + + public Room getRoom() { + return room; + } + + public ArrayList getChatlog() { + return chatlog; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolRoomInfoComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolRoomInfoComposer.java index c62423f..73f3cb6 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolRoomInfoComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolRoomInfoComposer.java @@ -29,4 +29,8 @@ public class ModToolRoomInfoComposer extends MessageComposer { } return this.response; } + + public Room getRoom() { + return room; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolSanctionInfoComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolSanctionInfoComposer.java index e343f67..22fb587 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolSanctionInfoComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolSanctionInfoComposer.java @@ -102,4 +102,8 @@ public class ModToolSanctionInfoComposer extends MessageComposer { return this.response; } + + public Habbo getHabbo() { + return habbo; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserChatlogComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserChatlogComposer.java index 19ed914..9adb42e 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserChatlogComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserChatlogComposer.java @@ -49,4 +49,16 @@ public class ModToolUserChatlogComposer extends MessageComposer { } return this.response; } + + public ArrayList getSet() { + return set; + } + + public int getUserId() { + return userId; + } + + public String getUsername() { + return username; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java index 41bce32..5eba242 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java @@ -84,4 +84,8 @@ public class ModToolUserInfoComposer extends MessageComposer { } return null; } + + public ResultSet getSet() { + return set; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserRoomVisitsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserRoomVisitsComposer.java index 91e4b47..a7080de 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserRoomVisitsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserRoomVisitsComposer.java @@ -36,4 +36,12 @@ public class ModToolUserRoomVisitsComposer extends MessageComposer { } return this.response; } + + public HabboInfo getHabboInfo() { + return habboInfo; + } + + public THashSet getRoomVisits() { + return roomVisits; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ReportRoomFormComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ReportRoomFormComposer.java index 5498e45..4d58305 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ReportRoomFormComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/modtool/ReportRoomFormComposer.java @@ -26,4 +26,8 @@ public class ReportRoomFormComposer extends MessageComposer { } return this.response; } + + public List getPendingIssues() { + return pendingIssues; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/CanCreateRoomComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/CanCreateRoomComposer.java index 051d651..e189859 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/CanCreateRoomComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/CanCreateRoomComposer.java @@ -22,4 +22,12 @@ public class CanCreateRoomComposer extends MessageComposer { return this.response; } + + public int getCount() { + return count; + } + + public int getMax() { + return max; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorCategoryUserCountComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorCategoryUserCountComposer.java index 119d15f..ff6e9a1 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorCategoryUserCountComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorCategoryUserCountComposer.java @@ -26,4 +26,8 @@ public class NewNavigatorCategoryUserCountComposer extends MessageComposer { } return this.response; } + + public List getRoomCategories() { + return roomCategories; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSavedSearchesComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSavedSearchesComposer.java index 2f613c6..b2d99f3 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSavedSearchesComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSavedSearchesComposer.java @@ -29,4 +29,8 @@ public class NewNavigatorSavedSearchesComposer extends MessageComposer { return this.response; } + + public List getSearches() { + return searches; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSearchResultsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSearchResultsComposer.java index 0db1126..862c29c 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSearchResultsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSearchResultsComposer.java @@ -33,5 +33,15 @@ public class NewNavigatorSearchResultsComposer extends MessageComposer { return this.response; } + public String getSearchCode() { + return searchCode; + } + public String getSearchQuery() { + return searchQuery; + } + + public List getResultList() { + return resultList; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSettingsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSettingsComposer.java index da4025a..eba115a 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSettingsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSettingsComposer.java @@ -23,4 +23,8 @@ public class NewNavigatorSettingsComposer extends MessageComposer { this.response.appendInt(0); return this.response; } + + public HabboNavigatorWindowSettings getWindowSettings() { + return windowSettings; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/PrivateRoomsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/PrivateRoomsComposer.java index 41682c8..ed4766d 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/PrivateRoomsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/PrivateRoomsComposer.java @@ -49,4 +49,8 @@ public class PrivateRoomsComposer extends MessageComposer { } return null; } + + public List getRooms() { + return rooms; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/RoomCategoriesComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/RoomCategoriesComposer.java index 9313791..b2c81ac 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/RoomCategoriesComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/RoomCategoriesComposer.java @@ -37,4 +37,8 @@ public class RoomCategoriesComposer extends MessageComposer { return this.response; } + + public List getCategories() { + return categories; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/RoomCreatedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/RoomCreatedComposer.java index 266b5fc..69bebcb 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/RoomCreatedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/RoomCreatedComposer.java @@ -19,4 +19,8 @@ public class RoomCreatedComposer extends MessageComposer { this.response.appendString(this.room.getName()); return this.response; } + + public Room getRoom() { + return room; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/TagsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/TagsComposer.java index cc96671..60a1428 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/TagsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/navigator/TagsComposer.java @@ -27,4 +27,8 @@ public class TagsComposer extends MessageComposer { return this.response; } + + public Set getTags() { + return tags; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/polls/PollQuestionsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/polls/PollQuestionsComposer.java index 02ff958..8487e08 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/polls/PollQuestionsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/polls/PollQuestionsComposer.java @@ -28,4 +28,8 @@ public class PollQuestionsComposer extends MessageComposer { this.response.appendBoolean(true); return this.response; } + + public Poll getPoll() { + return poll; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/polls/PollStartComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/polls/PollStartComposer.java index 3486d2f..2adb727 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/polls/PollStartComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/polls/PollStartComposer.java @@ -21,4 +21,8 @@ public class PollStartComposer extends MessageComposer { this.response.appendString(this.poll.title); return this.response; } + + public Poll getPoll() { + return poll; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/SimplePollAnswerComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/SimplePollAnswerComposer.java index faee66d..a3f2d74 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/SimplePollAnswerComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/SimplePollAnswerComposer.java @@ -29,4 +29,20 @@ public class SimplePollAnswerComposer extends MessageComposer { this.response.appendInt(this.yes); return this.response; } + + public int getUserId() { + return userId; + } + + public String getChoice() { + return choice; + } + + public int getNo() { + return no; + } + + public int getYes() { + return yes; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/SimplePollAnswersComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/SimplePollAnswersComposer.java index 18ab468..8671be7 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/SimplePollAnswersComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/SimplePollAnswersComposer.java @@ -24,4 +24,12 @@ public class SimplePollAnswersComposer extends MessageComposer { this.response.appendInt(this.yes); return this.response; } + + public int getNo() { + return no; + } + + public int getYes() { + return yes; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/SimplePollStartComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/SimplePollStartComposer.java index efa720b..fd4caeb 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/SimplePollStartComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/SimplePollStartComposer.java @@ -27,4 +27,12 @@ public class SimplePollStartComposer extends MessageComposer { this.response.appendString(this.question); return this.response; } + + public int getDuration() { + return duration; + } + + public String getQuestion() { + return question; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestCompletedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestCompletedComposer.java index dddf6a8..95c6a6d 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestCompletedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestCompletedComposer.java @@ -58,5 +58,36 @@ public class QuestCompletedComposer extends MessageComposer { message.appendBoolean(this.easy); } + public int getActivityPointsType() { + return activityPointsType; + } + + public boolean isAccepted() { + return accepted; + } + + public int getId() { + return id; + } + + public String getType() { + return type; + } + + public int getSortOrder() { + return sortOrder; + } + + public boolean isEasy() { + return easy; + } + } + + public UnknownClass getUnknownClass() { + return unknownClass; + } + + public boolean isUnknowbOolean() { + return unknowbOolean; } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestComposer.java index f95a405..65ee3cb 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestComposer.java @@ -17,4 +17,8 @@ public class QuestComposer extends MessageComposer { this.response.append(this.quest); return this.response; } + + public QuestsComposer.Quest getQuest() { + return quest; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestExpiredComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestExpiredComposer.java index 479e150..d7f54dc 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestExpiredComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestExpiredComposer.java @@ -17,4 +17,8 @@ public class QuestExpiredComposer extends MessageComposer { this.response.appendBoolean(this.expired); return this.response; } + + public boolean isExpired() { + return expired; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestsComposer.java index 60d877e..e8c6054 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestsComposer.java @@ -83,5 +83,77 @@ public class QuestsComposer extends MessageComposer { message.appendString(this.chainCode); message.appendBoolean(this.easy); } + + public String getCampaignCode() { + return campaignCode; + } + + public int getCompletedQuestsInCampaign() { + return completedQuestsInCampaign; + } + + public int getQuestCountInCampaign() { + return questCountInCampaign; + } + + public int getActivityPointType() { + return activityPointType; + } + + public int getId() { + return id; + } + + public boolean isAccepted() { + return accepted; + } + + public String getType() { + return type; + } + + public String getImageVersion() { + return imageVersion; + } + + public int getRewardCurrencyAmount() { + return rewardCurrencyAmount; + } + + public String getLocalizationCode() { + return localizationCode; + } + + public int getCompletedSteps() { + return completedSteps; + } + + public int getTotalSteps() { + return totalSteps; + } + + public int getSortOrder() { + return sortOrder; + } + + public String getCatalogPageName() { + return catalogPageName; + } + + public String getChainCode() { + return chainCode; + } + + public boolean isEasy() { + return easy; + } + } + + public List getQuests() { + return quests; + } + + public boolean isUnknownBoolean() { + return unknownBoolean; } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/BotForceOpenContextMenuComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/BotForceOpenContextMenuComposer.java index 3e7a7bf..bffc1d2 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/BotForceOpenContextMenuComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/BotForceOpenContextMenuComposer.java @@ -17,4 +17,8 @@ public class BotForceOpenContextMenuComposer extends MessageComposer { this.response.appendInt(this.botId); return this.response; } + + public int getBotId() { + return botId; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/BotSettingsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/BotSettingsComposer.java index 655e5a1..43b6fcf 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/BotSettingsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/BotSettingsComposer.java @@ -59,4 +59,12 @@ public class BotSettingsComposer extends MessageComposer { } return this.response; } + + public Bot getBot() { + return bot; + } + + public int getSettingId() { + return settingId; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/DoorbellAddUserComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/DoorbellAddUserComposer.java index 0f67890..2ed772d 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/DoorbellAddUserComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/DoorbellAddUserComposer.java @@ -17,4 +17,8 @@ public class DoorbellAddUserComposer extends MessageComposer { this.response.appendString(this.habbo); return this.response; } + + public String getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/FavoriteRoomChangedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/FavoriteRoomChangedComposer.java index af2ce19..86f9f6f 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/FavoriteRoomChangedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/FavoriteRoomChangedComposer.java @@ -20,4 +20,12 @@ public class FavoriteRoomChangedComposer extends MessageComposer { this.response.appendBoolean(this.favorite); return this.response; } + + public int getRoomId() { + return roomId; + } + + public boolean isFavorite() { + return favorite; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/FloodCounterComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/FloodCounterComposer.java index 90f747b..f4c56cd 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/FloodCounterComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/FloodCounterComposer.java @@ -17,4 +17,8 @@ public class FloodCounterComposer extends MessageComposer { this.response.appendInt(this.time); return this.response; } + + public int getTime() { + return time; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/ForwardToRoomComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/ForwardToRoomComposer.java index 7d758d2..ff67555 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/ForwardToRoomComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/ForwardToRoomComposer.java @@ -17,4 +17,8 @@ public class ForwardToRoomComposer extends MessageComposer { this.response.appendInt(this.roomId); return this.response; } + + public int getRoomId() { + return roomId; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/FreezeLivesComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/FreezeLivesComposer.java index c4bf6d9..3ac6769 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/FreezeLivesComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/FreezeLivesComposer.java @@ -19,4 +19,8 @@ public class FreezeLivesComposer extends MessageComposer { this.response.appendInt(this.gamePlayer.getLives()); return this.response; } + + public FreezeGamePlayer getGamePlayer() { + return gamePlayer; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/HideDoorbellComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/HideDoorbellComposer.java index e9a49ee..393ba32 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/HideDoorbellComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/HideDoorbellComposer.java @@ -17,4 +17,8 @@ public class HideDoorbellComposer extends MessageComposer { this.response.appendString(this.username); return this.response; } + + public String getUsername() { + return username; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomAccessDeniedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomAccessDeniedComposer.java index 728a23b..242b158 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomAccessDeniedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomAccessDeniedComposer.java @@ -17,4 +17,8 @@ public class RoomAccessDeniedComposer extends MessageComposer { this.response.appendString(this.habbo); return this.response; } + + public String getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomAddRightsListComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomAddRightsListComposer.java index 6829f5f..446b00b 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomAddRightsListComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomAddRightsListComposer.java @@ -24,4 +24,16 @@ public class RoomAddRightsListComposer extends MessageComposer { this.response.appendString(this.userName); return this.response; } + + public Room getRoom() { + return room; + } + + public int getUserId() { + return userId; + } + + public String getUserName() { + return userName; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomBannedUsersComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomBannedUsersComposer.java index 763e5a7..42a1d3a 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomBannedUsersComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomBannedUsersComposer.java @@ -51,4 +51,8 @@ public class RoomBannedUsersComposer extends MessageComposer { return this.response; } + + public Room getRoom() { + return room; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomChatSettingsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomChatSettingsComposer.java index 43a971a..b4a63e6 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomChatSettingsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomChatSettingsComposer.java @@ -22,4 +22,8 @@ public class RoomChatSettingsComposer extends MessageComposer { this.response.appendInt(this.room.getChatProtection()); return this.response; } + + public Room getRoom() { + return room; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomDataComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomDataComposer.java index 895cacc..01326ea 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomDataComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomDataComposer.java @@ -112,4 +112,20 @@ public class RoomDataComposer extends MessageComposer { return this.response; } + + public Room getRoom() { + return room; + } + + public Habbo getHabbo() { + return habbo; + } + + public boolean isRoomForward() { + return roomForward; + } + + public boolean isEnterRoom() { + return enterRoom; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEditSettingsErrorComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEditSettingsErrorComposer.java index f53bef2..07a46fe 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEditSettingsErrorComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEditSettingsErrorComposer.java @@ -31,4 +31,16 @@ public class RoomEditSettingsErrorComposer extends MessageComposer { this.response.appendString(this.info); return this.response; } + + public int getRoomId() { + return roomId; + } + + public int getErrorCode() { + return errorCode; + } + + public String getInfo() { + return info; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEnterErrorComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEnterErrorComposer.java index a2ec60e..8945eca 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEnterErrorComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEnterErrorComposer.java @@ -35,4 +35,12 @@ public class RoomEnterErrorComposer extends MessageComposer { this.response.appendString(this.queError); return this.response; } + + public int getErrorCode() { + return errorCode; + } + + public String getQueError() { + return queError; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEntryInfoComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEntryInfoComposer.java index be3d118..8865e4b 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEntryInfoComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEntryInfoComposer.java @@ -19,4 +19,8 @@ public class RoomEntryInfoComposer extends MessageComposer { this.response.appendString(this.room.getOwnerName()); return this.response; } + + public Room getRoom() { + return room; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFilterWordsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFilterWordsComposer.java index 85b379d..c75ab46 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFilterWordsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFilterWordsComposer.java @@ -24,4 +24,8 @@ public class RoomFilterWordsComposer extends MessageComposer { return this.response; } + + public Room getRoom() { + return room; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFloorThicknessUpdatedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFloorThicknessUpdatedComposer.java index 9d8c46c..65a36ac 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFloorThicknessUpdatedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFloorThicknessUpdatedComposer.java @@ -20,4 +20,8 @@ public class RoomFloorThicknessUpdatedComposer extends MessageComposer { this.response.appendInt(this.room.getWallSize()); //Wall Thickness return this.response; } + + public Room getRoom() { + return room; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomHeightMapComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomHeightMapComposer.java index bfe4220..2e78ae0 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomHeightMapComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomHeightMapComposer.java @@ -20,4 +20,8 @@ public class RoomHeightMapComposer extends MessageComposer { this.response.appendString(this.room.getLayout().getRelativeMap()); return this.response; } + + public Room getRoom() { + return room; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomModelComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomModelComposer.java index d845f54..5d733a9 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomModelComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomModelComposer.java @@ -19,4 +19,8 @@ public class RoomModelComposer extends MessageComposer { this.response.appendInt(this.room.getId()); return this.response; } + + public Room getRoom() { + return room; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomMutedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomMutedComposer.java index 7e038cc..8c7226d 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomMutedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomMutedComposer.java @@ -18,4 +18,8 @@ public class RoomMutedComposer extends MessageComposer { this.response.appendBoolean(this.room.isMuted()); return this.response; } + + public Room getRoom() { + return room; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPaintComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPaintComposer.java index 6961fa6..4856fd6 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPaintComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPaintComposer.java @@ -20,4 +20,12 @@ public class RoomPaintComposer extends MessageComposer { this.response.appendString(this.value); return this.response; } + + public String getType() { + return type; + } + + public String getValue() { + return value; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPaneComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPaneComposer.java index db8e392..9e9c3f3 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPaneComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPaneComposer.java @@ -21,4 +21,12 @@ public class RoomPaneComposer extends MessageComposer { this.response.appendBoolean(this.roomOwner); return this.response; } + + public Room getRoom() { + return room; + } + + public boolean isRoomOwner() { + return roomOwner; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRelativeMapComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRelativeMapComposer.java index 8236b45..4359c8b 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRelativeMapComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRelativeMapComposer.java @@ -39,4 +39,8 @@ public class RoomRelativeMapComposer extends MessageComposer { } return this.response; } + + public Room getRoom() { + return room; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRemoveRightsListComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRemoveRightsListComposer.java index cf12bde..005c900 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRemoveRightsListComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRemoveRightsListComposer.java @@ -22,4 +22,12 @@ public class RoomRemoveRightsListComposer extends MessageComposer { this.response.appendInt(this.userId); return this.response; } + + public Room getRoom() { + return room; + } + + public int getUserId() { + return userId; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRightsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRightsComposer.java index 23e5e4c..9bae00b 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRightsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRightsComposer.java @@ -18,4 +18,8 @@ public class RoomRightsComposer extends MessageComposer { this.response.appendInt(this.type.level); return this.response; } + + public RoomRightLevels getType() { + return type; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRightsListComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRightsListComposer.java index 7a08a9d..42e2c57 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRightsListComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRightsListComposer.java @@ -31,4 +31,8 @@ public class RoomRightsListComposer extends MessageComposer { return this.response; } + + public Room getRoom() { + return room; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomScoreComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomScoreComposer.java index e3e7eb7..5668281 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomScoreComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomScoreComposer.java @@ -20,4 +20,12 @@ public class RoomScoreComposer extends MessageComposer { this.response.appendBoolean(this.canVote); return this.response; } + + public int getScore() { + return score; + } + + public boolean isCanVote() { + return canVote; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsComposer.java index f37dce6..4b02d94 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsComposer.java @@ -54,4 +54,8 @@ public class RoomSettingsComposer extends MessageComposer { this.response.appendInt(this.room.getBanOption()); return this.response; } + + public Room getRoom() { + return room; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsSavedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsSavedComposer.java index b6c6ac4..850cf4a 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsSavedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsSavedComposer.java @@ -18,4 +18,8 @@ public class RoomSettingsSavedComposer extends MessageComposer { this.response.appendInt(this.room.getId()); return this.response; } + + public Room getRoom() { + return room; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsUpdatedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsUpdatedComposer.java index 7e1041b..6521f01 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsUpdatedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsUpdatedComposer.java @@ -18,4 +18,8 @@ public class RoomSettingsUpdatedComposer extends MessageComposer { this.response.appendInt(this.room.getId()); return this.response; } + + public Room getRoom() { + return room; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomThicknessComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomThicknessComposer.java index 9a1c9ea..b595c0a 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomThicknessComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomThicknessComposer.java @@ -20,4 +20,8 @@ public class RoomThicknessComposer extends MessageComposer { this.response.appendInt(this.room.getFloorSize()); return this.response; } + + public Room getRoom() { + return room; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/UpdateStackHeightComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/UpdateStackHeightComposer.java index 9da42a6..08c3584 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/UpdateStackHeightComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/UpdateStackHeightComposer.java @@ -8,6 +8,8 @@ import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; import gnu.trove.set.hash.THashSet; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; public class UpdateStackHeightComposer extends MessageComposer { @@ -33,39 +35,40 @@ public class UpdateStackHeightComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - //TODO: maybe do this another way? doesn't seem to be very clean but gets the job done this.response.init(Outgoing.UpdateStackHeightComposer); + if (this.updateTiles != null) { - this.updateTiles.removeIf(Objects::isNull); - // prevent overflow. Byte max value is 127 - if(this.updateTiles.size() > 127) { - RoomTile[] tiles = this.updateTiles.toArray(new RoomTile[updateTiles.size()]); + List tilesCopy = new ArrayList<>(this.updateTiles); + tilesCopy.removeIf(Objects::isNull); + + if (tilesCopy.size() > 127) { this.response.appendByte(127); - for(int i = 0; i < 127; i++) { - RoomTile t = tiles[i]; - updateTiles.remove(t); // remove it from the set + for (int i = 0; i < 127; i++) { + RoomTile t = tilesCopy.get(i); this.response.appendByte((int) t.x); this.response.appendByte((int) t.y); - if(Emulator.getConfig().getBoolean("custom.stacking.enabled")) { + if (Emulator.getConfig().getBoolean("custom.stacking.enabled")) { this.response.appendShort((short) (t.z * 256.0)); - } - else { + } else { this.response.appendShort(t.relativeHeight()); } } - //send the remaining tiles in a new message - this.room.sendComposer(new UpdateStackHeightComposer(this.room, updateTiles).compose()); + + List remainingTiles = tilesCopy.subList(127, tilesCopy.size()); + if (!remainingTiles.isEmpty()) { + this.room.sendComposer(new UpdateStackHeightComposer(this.room, new THashSet<>(remainingTiles)).compose()); + } + return this.response; } - this.response.appendByte(this.updateTiles.size()); - for (RoomTile t : this.updateTiles) { + this.response.appendByte(tilesCopy.size()); + for (RoomTile t : tilesCopy) { this.response.appendByte((int) t.x); this.response.appendByte((int) t.y); - if(Emulator.getConfig().getBoolean("custom.stacking.enabled")) { + if (Emulator.getConfig().getBoolean("custom.stacking.enabled")) { this.response.appendShort((short) (t.z * 256.0)); - } - else { + } else { this.response.appendShort(t.relativeHeight()); } } @@ -73,13 +76,37 @@ public class UpdateStackHeightComposer extends MessageComposer { this.response.appendByte(1); this.response.appendByte(this.x); this.response.appendByte(this.y); - if(Emulator.getConfig().getBoolean("custom.stacking.enabled")) { + if (Emulator.getConfig().getBoolean("custom.stacking.enabled")) { this.response.appendShort((short) (this.z * 256.0)); - } - else { + } else { this.response.appendShort((int) (this.height)); } } + return this.response; } + + public int getX() { + return x; + } + + public int getY() { + return y; + } + + public short getZ() { + return z; + } + + public double getHeight() { + return height; + } + + public THashSet getUpdateTiles() { + return updateTiles; + } + + public Room getRoom() { + return room; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/AddFloorItemComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/AddFloorItemComposer.java index b27e75d..809fede 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/AddFloorItemComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/AddFloorItemComposer.java @@ -1,7 +1,6 @@ package com.eu.habbo.messages.outgoing.rooms.items; -import com.eu.habbo.habbohotel.items.interactions.InteractionGift; -import com.eu.habbo.habbohotel.items.interactions.InteractionMusicDisc; +import com.eu.habbo.habbohotel.items.interactions.*; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; @@ -23,9 +22,17 @@ public class AddFloorItemComposer extends MessageComposer { this.response.appendInt(this.item instanceof InteractionGift ? ((((InteractionGift) this.item).getColorId() * 1000) + ((InteractionGift) this.item).getRibbonId()) : (this.item instanceof InteractionMusicDisc ? ((InteractionMusicDisc) this.item).getSongId() : 1)); this.item.serializeExtradata(this.response); this.response.appendInt(-1); - this.response.appendInt(this.item.isUsable()); + this.response.appendInt(this.item instanceof InteractionTeleport || this.item instanceof InteractionSwitch || this.item instanceof InteractionSwitchRemoteControl || this.item instanceof InteractionVendingMachine || this.item instanceof InteractionInformationTerminal || this.item instanceof InteractionPostIt|| this.item instanceof InteractionPuzzleBox ? 2 : this.item.isUsable() ? 1 : 0); this.response.appendInt(this.item.getUserId()); this.response.appendString(this.itemOwnerName); return this.response; } + + public HabboItem getItem() { + return item; + } + + public String getItemOwnerName() { + return itemOwnerName; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/AddWallItemComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/AddWallItemComposer.java index 300eec1..81a5b64 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/AddWallItemComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/AddWallItemComposer.java @@ -21,4 +21,12 @@ public class AddWallItemComposer extends MessageComposer { this.response.appendString(this.itemOwnerName); return this.response; } + + public HabboItem getItem() { + return item; + } + + public String getItemOwnerName() { + return itemOwnerName; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/FloorItemOnRollerComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/FloorItemOnRollerComposer.java index 878b949..eb350e3 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/FloorItemOnRollerComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/FloorItemOnRollerComposer.java @@ -77,4 +77,36 @@ public class FloorItemOnRollerComposer extends MessageComposer { return this.response; } + + public HabboItem getItem() { + return item; + } + + public HabboItem getRoller() { + return roller; + } + + public RoomTile getOldLocation() { + return oldLocation; + } + + public RoomTile getNewLocation() { + return newLocation; + } + + public double getHeightOffset() { + return heightOffset; + } + + public double getOldZ() { + return oldZ; + } + + public double getNewZ() { + return newZ; + } + + public Room getRoom() { + return room; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/FloorItemUpdateComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/FloorItemUpdateComposer.java index df9cf6f..5ce45b9 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/FloorItemUpdateComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/FloorItemUpdateComposer.java @@ -25,4 +25,8 @@ public class FloorItemUpdateComposer extends MessageComposer { this.response.appendInt(this.item.getUserId()); return this.response; } + + public HabboItem getItem() { + return item; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemExtraDataComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemExtraDataComposer.java index 1fe1ebf..b334a6c 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemExtraDataComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemExtraDataComposer.java @@ -19,4 +19,8 @@ public class ItemExtraDataComposer extends MessageComposer { this.item.serializeExtradata(this.response); return this.response; } + + public HabboItem getItem() { + return item; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemIntStateComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemIntStateComposer.java index af739f2..87812ab 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemIntStateComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemIntStateComposer.java @@ -20,4 +20,12 @@ public class ItemIntStateComposer extends MessageComposer { this.response.appendInt(this.value); return this.response; } + + public int getId() { + return id; + } + + public int getValue() { + return value; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemStateComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemStateComposer.java index 792b96a..8064bbd 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemStateComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemStateComposer.java @@ -25,4 +25,8 @@ public class ItemStateComposer extends MessageComposer { return this.response; } + + public HabboItem getItem() { + return item; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemsDataUpdateComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemsDataUpdateComposer.java index 3e5fb51..26c91d0 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemsDataUpdateComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemsDataUpdateComposer.java @@ -27,4 +27,8 @@ public class ItemsDataUpdateComposer extends MessageComposer { return this.response; } + + public Set getItems() { + return items; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/MoodLightDataComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/MoodLightDataComposer.java index 45c934c..64c3224 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/MoodLightDataComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/MoodLightDataComposer.java @@ -52,4 +52,8 @@ public class MoodLightDataComposer extends MessageComposer { //:test 2780 i:1 i:1 i:1 i:2 s:#FF00FF i:255 return this.response; } + + public TIntObjectMap getMoodLightData() { + return moodLightData; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItDataComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItDataComposer.java index 497317a..a701d65 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItDataComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItDataComposer.java @@ -23,4 +23,8 @@ public class PostItDataComposer extends MessageComposer { this.response.appendString(this.postIt.getExtradata()); return this.response; } + + public InteractionPostIt getPostIt() { + return postIt; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItStickyPoleOpenComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItStickyPoleOpenComposer.java index e415174..6feeff3 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItStickyPoleOpenComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItStickyPoleOpenComposer.java @@ -19,4 +19,8 @@ public class PostItStickyPoleOpenComposer extends MessageComposer { this.response.appendString(""); return this.response; } + + public HabboItem getItem() { + return item; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PresentItemOpenedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PresentItemOpenedComposer.java index fea440e..c0fe036 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PresentItemOpenedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PresentItemOpenedComposer.java @@ -28,4 +28,16 @@ public class PresentItemOpenedComposer extends MessageComposer { this.response.appendString(this.text); return this.response; } + + public HabboItem getItem() { + return item; + } + + public String getText() { + return text; + } + + public boolean isUnknown() { + return unknown; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RemoveFloorItemComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RemoveFloorItemComposer.java index 9050674..ae1816d 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RemoveFloorItemComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RemoveFloorItemComposer.java @@ -30,4 +30,12 @@ public class RemoveFloorItemComposer extends MessageComposer { return this.response; } + + public HabboItem getItem() { + return item; + } + + public boolean isNoUser() { + return noUser; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RemoveWallItemComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RemoveWallItemComposer.java index eb92680..9e175c5 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RemoveWallItemComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RemoveWallItemComposer.java @@ -19,4 +19,8 @@ public class RemoveWallItemComposer extends MessageComposer { this.response.appendInt(this.item.getUserId()); return this.response; } + + public HabboItem getItem() { + return item; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RoomFloorItemsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RoomFloorItemsComposer.java index 35210fa..908d81a 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RoomFloorItemsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RoomFloorItemsComposer.java @@ -1,7 +1,6 @@ package com.eu.habbo.messages.outgoing.rooms.items; -import com.eu.habbo.habbohotel.items.interactions.InteractionGift; -import com.eu.habbo.habbohotel.items.interactions.InteractionMusicDisc; +import com.eu.habbo.habbohotel.items.interactions.*; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; @@ -45,9 +44,17 @@ public class RoomFloorItemsComposer extends MessageComposer { this.response.appendInt(item instanceof InteractionGift ? ((((InteractionGift) item).getColorId() * 1000) + ((InteractionGift) item).getRibbonId()) : (item instanceof InteractionMusicDisc ? ((InteractionMusicDisc) item).getSongId() : 1)); item.serializeExtradata(this.response); this.response.appendInt(-1); - this.response.appendInt(item.isUsable() ? 1 : 0); + this.response.appendInt(item instanceof InteractionTeleport || item instanceof InteractionSwitch || item instanceof InteractionSwitchRemoteControl || item instanceof InteractionVendingMachine || item instanceof InteractionInformationTerminal || item instanceof InteractionPostIt || item instanceof InteractionPuzzleBox ? 2 : item.isUsable() ? 1 : 0); this.response.appendInt(item.getUserId()); } return this.response; } + + public TIntObjectMap getFurniOwnerNames() { + return furniOwnerNames; + } + + public THashSet getItems() { + return items; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RoomWallItemsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RoomWallItemsComposer.java index 0f8a669..7c3cf1c 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RoomWallItemsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RoomWallItemsComposer.java @@ -51,4 +51,8 @@ public class RoomWallItemsComposer extends MessageComposer { } return this.response; } + + public Room getRoom() { + return room; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/UpdateStackHeightTileHeightComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/UpdateStackHeightTileHeightComposer.java index 2b378c9..4de9a85 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/UpdateStackHeightTileHeightComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/UpdateStackHeightTileHeightComposer.java @@ -22,4 +22,12 @@ public class UpdateStackHeightTileHeightComposer extends MessageComposer { this.response.appendInt(this.height); return this.response; } + + public HabboItem getItem() { + return item; + } + + public int getHeight() { + return height; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/WallItemUpdateComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/WallItemUpdateComposer.java index 2a00959..10cbd60 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/WallItemUpdateComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/WallItemUpdateComposer.java @@ -19,4 +19,8 @@ public class WallItemUpdateComposer extends MessageComposer { this.response.appendString(this.item.getUserId() + ""); return this.response; } + + public HabboItem getItem() { + return item; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxMySongsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxMySongsComposer.java index e9a6157..c5d584e 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxMySongsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxMySongsComposer.java @@ -28,4 +28,8 @@ public class JukeBoxMySongsComposer extends MessageComposer { return this.response; } + + public List getItems() { + return items; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxNowPlayingMessageComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxNowPlayingMessageComposer.java index 9e8f0c6..19e56d1 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxNowPlayingMessageComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxNowPlayingMessageComposer.java @@ -35,4 +35,16 @@ public class JukeBoxNowPlayingMessageComposer extends MessageComposer { } return this.response; } + + public SoundTrack getTrack() { + return track; + } + + public int getPlayListId() { + return playListId; + } + + public int getMsPlayed() { + return msPlayed; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListAddSongComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListAddSongComposer.java index ec65f39..1d9f708 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListAddSongComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListAddSongComposer.java @@ -21,4 +21,8 @@ public class JukeBoxPlayListAddSongComposer extends MessageComposer { this.response.appendString(this.track.getAuthor()); return this.response; } + + public SoundTrack getTrack() { + return track; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListComposer.java index 29c82b7..df1e6e5 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListComposer.java @@ -27,4 +27,12 @@ public class JukeBoxPlayListComposer extends MessageComposer { } return this.response; } + + public List getSongs() { + return songs; + } + + public int getTotalLength() { + return totalLength; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListUpdatedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListUpdatedComposer.java index c4a0ceb..6fe1afb 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListUpdatedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListUpdatedComposer.java @@ -35,4 +35,8 @@ public class JukeBoxPlayListUpdatedComposer extends MessageComposer { return this.response; } + + public THashSet getTracks() { + return tracks; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxTrackCodeComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxTrackCodeComposer.java index 3759c33..6b6e787 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxTrackCodeComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxTrackCodeComposer.java @@ -19,4 +19,8 @@ public class JukeBoxTrackCodeComposer extends MessageComposer { this.response.appendInt(this.track.getId()); return this.response; } + + public SoundTrack getTrack() { + return track; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxTrackDataComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxTrackDataComposer.java index 77fbb08..f97dca4 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxTrackDataComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxTrackDataComposer.java @@ -30,4 +30,8 @@ public class JukeBoxTrackDataComposer extends MessageComposer { return this.response; } + + public List getTracks() { + return tracks; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniFinishedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniFinishedComposer.java index ddeb2ff..cec88f9 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniFinishedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniFinishedComposer.java @@ -18,4 +18,8 @@ public class LoveLockFurniFinishedComposer extends MessageComposer { this.response.appendInt(this.loveLock.getId()); return this.response; } + + public InteractionLoveLock getLoveLock() { + return loveLock; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniFriendConfirmedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniFriendConfirmedComposer.java index 660fbe9..27422b8 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniFriendConfirmedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniFriendConfirmedComposer.java @@ -18,4 +18,8 @@ public class LoveLockFurniFriendConfirmedComposer extends MessageComposer { this.response.appendInt(this.loveLock.getId()); return this.response; } + + public InteractionLoveLock getLoveLock() { + return loveLock; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniStartComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniStartComposer.java index 20cb7c9..e0a1fc3 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniStartComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniStartComposer.java @@ -19,4 +19,8 @@ public class LoveLockFurniStartComposer extends MessageComposer { this.response.appendBoolean(true); return this.response; } + + public InteractionLoveLock getLoveLock() { + return loveLock; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceInfoComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceInfoComposer.java index cbefc15..724d126 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceInfoComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceInfoComposer.java @@ -51,4 +51,16 @@ public class RentableSpaceInfoComposer extends MessageComposer { this.response.appendInt(((InteractionRentableSpace) this.item).rentCost()); //Price return this.response; } + + public Habbo getHabbo() { + return habbo; + } + + public HabboItem getItem() { + return item; + } + + public int getErrorCode() { + return errorCode; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceUnknown2Composer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceUnknown2Composer.java index 81ce6b2..6de93c8 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceUnknown2Composer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceUnknown2Composer.java @@ -17,4 +17,8 @@ public class RentableSpaceUnknown2Composer extends MessageComposer { this.response.appendInt(this.itemId); return this.response; } + + public int getItemId() { + return itemId; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceUnknownComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceUnknownComposer.java index af042c1..33128e1 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceUnknownComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceUnknownComposer.java @@ -17,4 +17,8 @@ public class RentableSpaceUnknownComposer extends MessageComposer { this.response.appendInt(this.itemId); return this.response; } + + public int getItemId() { + return itemId; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeDisplayListComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeDisplayListComposer.java index 11c6773..1d9d698 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeDisplayListComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeDisplayListComposer.java @@ -33,4 +33,16 @@ public class YoutubeDisplayListComposer extends MessageComposer { this.response.appendString(this.currentPlaylist == null ? "" : this.currentPlaylist.getId()); // current playlist ID return this.response; } + + public int getItemId() { + return itemId; + } + + public ArrayList getPlaylists() { + return playlists; + } + + public YoutubeManager.YoutubePlaylist getCurrentPlaylist() { + return currentPlaylist; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeStateChangeComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeStateChangeComposer.java index 762a502..91c1407 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeStateChangeComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeStateChangeComposer.java @@ -21,4 +21,12 @@ public class YoutubeStateChangeComposer extends MessageComposer { return this.response; } + + public int getFurniId() { + return furniId; + } + + public int getState() { + return state; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeVideoComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeVideoComposer.java index 225220e..e4176a1 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeVideoComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeVideoComposer.java @@ -28,4 +28,20 @@ public class YoutubeVideoComposer extends MessageComposer { this.response.appendInt(this.playing ? 1 : 2); return this.response; } + + public int getItemId() { + return itemId; + } + + public YoutubeManager.YoutubeVideo getVideo() { + return video; + } + + public boolean isPlaying() { + return playing; + } + + public int getStartTime() { + return startTime; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/CantScratchPetNotOldEnoughComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/CantScratchPetNotOldEnoughComposer.java index b3e33e3..67bb316 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/CantScratchPetNotOldEnoughComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/CantScratchPetNotOldEnoughComposer.java @@ -20,4 +20,12 @@ public class CantScratchPetNotOldEnoughComposer extends MessageComposer { this.response.appendInt(this.requiredAge); return this.response; } + + public int getCurrentAge() { + return currentAge; + } + + public int getRequiredAge() { + return requiredAge; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetInformationComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetInformationComposer.java index 06a05b4..41cec30 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetInformationComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetInformationComposer.java @@ -67,4 +67,16 @@ public class PetInformationComposer extends MessageComposer { return this.response; } + + public Pet getPet() { + return pet; + } + + public Room getRoom() { + return room; + } + + public Habbo getRequestingHabbo() { + return requestingHabbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetLevelUpComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetLevelUpComposer.java index f3bf2bf..d436758 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetLevelUpComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetLevelUpComposer.java @@ -27,4 +27,8 @@ public class PetLevelUpComposer extends MessageComposer { //:test 2329 i:0 s:a i:3 i:1 i:1 s:FF00FF i:0 i:0 return this.response; } + + public Pet getPet() { + return pet; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetLevelUpdatedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetLevelUpdatedComposer.java index 46f76ae..5dd1f26 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetLevelUpdatedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetLevelUpdatedComposer.java @@ -20,4 +20,8 @@ public class PetLevelUpdatedComposer extends MessageComposer { this.response.appendInt(this.pet.getLevel()); return this.response; } + + public Pet getPet() { + return pet; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetPackageComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetPackageComposer.java index 70f8d91..01327c0 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetPackageComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetPackageComposer.java @@ -18,4 +18,8 @@ public class PetPackageComposer extends MessageComposer { this.response.appendInt(this.item.getId()); return this.response; } + + public HabboItem getItem() { + return item; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetPackageNameValidationComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetPackageNameValidationComposer.java index 9d99ade..d0167d7 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetPackageNameValidationComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetPackageNameValidationComposer.java @@ -29,4 +29,16 @@ public class PetPackageNameValidationComposer extends MessageComposer { this.response.appendString(this.errorString); return this.response; } + + public int getItemId() { + return itemId; + } + + public int getErrorCode() { + return errorCode; + } + + public String getErrorString() { + return errorString; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetStatusUpdateComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetStatusUpdateComposer.java index 37549fe..69881b6 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetStatusUpdateComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetStatusUpdateComposer.java @@ -25,4 +25,8 @@ public class PetStatusUpdateComposer extends MessageComposer { this.response.appendBoolean(this.pet instanceof MonsterplantPet && ((MonsterplantPet) this.pet).isPubliclyBreedable()); return this.response; } + + public Pet getPet() { + return pet; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetTrainingPanelComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetTrainingPanelComposer.java index f925426..bdf5681 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetTrainingPanelComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetTrainingPanelComposer.java @@ -46,4 +46,8 @@ public class PetTrainingPanelComposer extends MessageComposer { return this.response; } + + public Pet getPet() { + return pet; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetComposer.java index c515a69..ab776a4 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetComposer.java @@ -59,4 +59,8 @@ public class RoomPetComposer extends MessageComposer implements TIntObjectProced return true; } + + public TIntObjectMap getPets() { + return pets; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetExperienceComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetExperienceComposer.java index 6098302..a577084 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetExperienceComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetExperienceComposer.java @@ -22,4 +22,12 @@ public class RoomPetExperienceComposer extends MessageComposer { this.response.appendInt(this.amount); return this.response; } + + public Pet getPet() { + return pet; + } + + public int getAmount() { + return amount; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetHorseFigureComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetHorseFigureComposer.java index e8f066f..3c7cd57 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetHorseFigureComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetHorseFigureComposer.java @@ -48,4 +48,8 @@ public class RoomPetHorseFigureComposer extends MessageComposer { this.response.appendBoolean(false); // this.pet.anyoneCanRide() return this.response; } + + public HorsePet getPet() { + return pet; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetRespectComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetRespectComposer.java index 59f939e..a306be6 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetRespectComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetRespectComposer.java @@ -30,4 +30,12 @@ public class RoomPetRespectComposer extends MessageComposer { this.pet.serialize(this.response); return this.response; } + + public Pet getPet() { + return pet; + } + + public int getType() { + return type; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingCompleted.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingCompleted.java index 2cd37d0..3777fef 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingCompleted.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingCompleted.java @@ -20,4 +20,12 @@ public class PetBreedingCompleted extends MessageComposer { this.response.appendInt(this.race); return this.response; } + + public int getType() { + return type; + } + + public int getRace() { + return race; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingFailedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingFailedComposer.java index b39a16a..ca19d8c 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingFailedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingFailedComposer.java @@ -20,4 +20,12 @@ public class PetBreedingFailedComposer extends MessageComposer { this.response.appendInt(this.anInt2); return this.response; } + + public int getAnInt1() { + return anInt1; + } + + public int getAnInt2() { + return anInt2; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingResultComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingResultComposer.java index 035e83c..05ff67b 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingResultComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingResultComposer.java @@ -108,5 +108,29 @@ public class PetBreedingResultComposer extends MessageComposer { message.appendString(this.pet.getColor()); message.appendString(this.ownerName); } + + public Pet getPet() { + return pet; + } + + public String getOwnerName() { + return ownerName; + } + } + + public int getBoxId() { + return boxId; + } + + public int getPetType() { + return petType; + } + + public PetBreedingPet getPetOne() { + return petOne; + } + + public PetBreedingPet getPetTwo() { + return petTwo; } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingStartComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingStartComposer.java index 5564711..e7a6753 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingStartComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingStartComposer.java @@ -24,4 +24,16 @@ public class PetBreedingStartComposer extends MessageComposer { this.response.appendInt(this.anInt2); return this.response; } + + public int getState() { + return state; + } + + public int getAnInt1() { + return anInt1; + } + + public int getAnInt2() { + return anInt2; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingStartFailedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingStartFailedComposer.java index 6f1e51c..22b9b25 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingStartFailedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingStartFailedComposer.java @@ -25,4 +25,8 @@ public class PetBreedingStartFailedComposer extends MessageComposer { this.response.appendInt(this.reason); return this.response; } + + public int getReason() { + return reason; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/PromoteOwnRoomsListComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/PromoteOwnRoomsListComposer.java index f791a26..4863510 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/PromoteOwnRoomsListComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/PromoteOwnRoomsListComposer.java @@ -30,4 +30,8 @@ public class PromoteOwnRoomsListComposer extends MessageComposer { } return this.response; } + + public List getRooms() { + return rooms; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/RoomPromotionMessageComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/RoomPromotionMessageComposer.java index 6167e61..92fae0c 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/RoomPromotionMessageComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/RoomPromotionMessageComposer.java @@ -50,4 +50,12 @@ public class RoomPromotionMessageComposer extends MessageComposer { return this.response; } + + public Room getRoom() { + return room; + } + + public RoomPromotion getRoomPromotion() { + return roomPromotion; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ChangeNameUpdatedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ChangeNameUpdatedComposer.java index cb72a29..5c66292 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ChangeNameUpdatedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ChangeNameUpdatedComposer.java @@ -20,4 +20,8 @@ public class ChangeNameUpdatedComposer extends MessageComposer { this.response.appendInt(0); return this.response; } + + public Habbo getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUnitIdleComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUnitIdleComposer.java index 9a01826..222cdbd 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUnitIdleComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUnitIdleComposer.java @@ -19,4 +19,8 @@ public class RoomUnitIdleComposer extends MessageComposer { this.response.appendBoolean(this.roomUnit.isIdle()); return this.response; } + + public RoomUnit getRoomUnit() { + return roomUnit; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUnitOnRollerComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUnitOnRollerComposer.java index 70df0b1..d81e592 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUnitOnRollerComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUnitOnRollerComposer.java @@ -121,4 +121,44 @@ public class RoomUnitOnRollerComposer extends MessageComposer { return this.response; } + + public RoomUnit getRoomUnit() { + return roomUnit; + } + + public HabboItem getRoller() { + return roller; + } + + public RoomTile getOldLocation() { + return oldLocation; + } + + public double getOldZ() { + return oldZ; + } + + public RoomTile getNewLocation() { + return newLocation; + } + + public double getNewZ() { + return newZ; + } + + public Room getRoom() { + return room; + } + + public int getX() { + return x; + } + + public int getY() { + return y; + } + + public HabboItem getOldTopItem() { + return oldTopItem; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserActionComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserActionComposer.java index ec54fda..b1e6d94 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserActionComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserActionComposer.java @@ -22,4 +22,12 @@ public class RoomUserActionComposer extends MessageComposer { this.response.appendInt(this.action.getAction()); return this.response; } + + public RoomUserAction getAction() { + return action; + } + + public RoomUnit getRoomUnit() { + return roomUnit; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserDanceComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserDanceComposer.java index f0900df..fc21db8 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserDanceComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserDanceComposer.java @@ -19,4 +19,8 @@ public class RoomUserDanceComposer extends MessageComposer { this.response.appendInt(this.roomUnit.getDanceType().getType()); return this.response; } + + public RoomUnit getRoomUnit() { + return roomUnit; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserDataComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserDataComposer.java index 322a7ac..3ed858d 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserDataComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserDataComposer.java @@ -22,4 +22,8 @@ public class RoomUserDataComposer extends MessageComposer { this.response.appendInt(this.habbo.getHabboStats().getAchievementScore()); return this.response; } + + public Habbo getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserEffectComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserEffectComposer.java index 8053b35..23af40d 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserEffectComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserEffectComposer.java @@ -27,4 +27,12 @@ public class RoomUserEffectComposer extends MessageComposer { this.response.appendInt(0); return this.response; } + + public RoomUnit getRoomUnit() { + return roomUnit; + } + + public int getEffectId() { + return effectId; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserHandItemComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserHandItemComposer.java index 2c74c8f..58a9885 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserHandItemComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserHandItemComposer.java @@ -19,4 +19,8 @@ public class RoomUserHandItemComposer extends MessageComposer { this.response.appendInt(this.roomUnit.getHandItem()); return this.response; } + + public RoomUnit getRoomUnit() { + return roomUnit; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserIgnoredComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserIgnoredComposer.java index 51f7482..5927d1d 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserIgnoredComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserIgnoredComposer.java @@ -25,4 +25,12 @@ public class RoomUserIgnoredComposer extends MessageComposer { this.response.appendString(this.habbo.getHabboInfo().getUsername()); return this.response; } + + public Habbo getHabbo() { + return habbo; + } + + public int getState() { + return state; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserNameChangedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserNameChangedComposer.java index 3e43c47..aba321e 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserNameChangedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserNameChangedComposer.java @@ -36,4 +36,16 @@ public class RoomUserNameChangedComposer extends MessageComposer { this.response.appendString(this.name); return this.response; } + + public int getUserId() { + return userId; + } + + public int getRoomId() { + return roomId; + } + + public String getName() { + return name; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserReceivedHandItemComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserReceivedHandItemComposer.java index 121ca4e..adf3ea2 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserReceivedHandItemComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserReceivedHandItemComposer.java @@ -21,4 +21,12 @@ public class RoomUserReceivedHandItemComposer extends MessageComposer { this.response.appendInt(this.handItem); return this.response; } + + public RoomUnit getFrom() { + return from; + } + + public int getHandItem() { + return handItem; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRemoveComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRemoveComposer.java index 9981b5b..d6a84a4 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRemoveComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRemoveComposer.java @@ -18,4 +18,8 @@ public class RoomUserRemoveComposer extends MessageComposer { this.response.appendString(this.roomUnit.getId() + ""); return this.response; } + + public RoomUnit getRoomUnit() { + return roomUnit; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRemoveRightsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRemoveRightsComposer.java index ccf5626..0483132 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRemoveRightsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRemoveRightsComposer.java @@ -21,4 +21,12 @@ public class RoomUserRemoveRightsComposer extends MessageComposer { this.response.appendInt(this.habboId); return this.response; } + + public Room getRoom() { + return room; + } + + public int getHabboId() { + return habboId; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRespectComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRespectComposer.java index 4e807ee..d8d10ef 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRespectComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRespectComposer.java @@ -19,4 +19,8 @@ public class RoomUserRespectComposer extends MessageComposer { this.response.appendInt(this.habbo.getHabboStats().respectPointsReceived); return this.response; } + + public Habbo getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserShoutComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserShoutComposer.java index 6c8945b..840229f 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserShoutComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserShoutComposer.java @@ -22,4 +22,8 @@ public class RoomUserShoutComposer extends MessageComposer { return this.response; } + + public RoomChatMessage getRoomChatMessage() { + return roomChatMessage; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserStatusComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserStatusComposer.java index 4aedd6b..1a6d2e9 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserStatusComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserStatusComposer.java @@ -82,4 +82,16 @@ public class RoomUserStatusComposer extends MessageComposer { } return this.response; } + + public Collection getHabbos() { + return habbos; + } + + public THashSet getRoomUnits() { + return roomUnits; + } + + public double getOverrideZ() { + return overrideZ; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTagsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTagsComposer.java index a612e9e..656160d 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTagsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTagsComposer.java @@ -23,4 +23,8 @@ public class RoomUserTagsComposer extends MessageComposer { } return this.response; } + + public Habbo getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTalkComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTalkComposer.java index 6af2fdb..54fc8a8 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTalkComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTalkComposer.java @@ -22,4 +22,8 @@ public class RoomUserTalkComposer extends MessageComposer { this.roomChatMessage.serialize(this.response); return this.response; } + + public RoomChatMessage getRoomChatMessage() { + return roomChatMessage; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTypingComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTypingComposer.java index b412683..bd2ab3a 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTypingComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTypingComposer.java @@ -21,4 +21,12 @@ public class RoomUserTypingComposer extends MessageComposer { this.response.appendInt(this.typing ? 1 : 0); return this.response; } + + public RoomUnit getRoomUnit() { + return roomUnit; + } + + public boolean isTyping() { + return typing; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserUnbannedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserUnbannedComposer.java index 8390e13..8ef7616 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserUnbannedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserUnbannedComposer.java @@ -21,4 +21,12 @@ public class RoomUserUnbannedComposer extends MessageComposer { this.response.appendInt(this.userId); return this.response; } + + public Room getRoom() { + return room; + } + + public int getUserId() { + return userId; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserWhisperComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserWhisperComposer.java index 10f8800..5ad2055 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserWhisperComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserWhisperComposer.java @@ -22,4 +22,8 @@ public class RoomUserWhisperComposer extends MessageComposer { return this.response; } + + public RoomChatMessage getRoomChatMessage() { + return roomChatMessage; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersAddGuildBadgeComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersAddGuildBadgeComposer.java index b834039..d2b3ca4 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersAddGuildBadgeComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersAddGuildBadgeComposer.java @@ -20,4 +20,8 @@ public class RoomUsersAddGuildBadgeComposer extends MessageComposer { this.response.appendString(this.guild.getBadge()); return this.response; } + + public Guild getGuild() { + return guild; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersComposer.java index 4b53f9c..247e1ed 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersComposer.java @@ -150,4 +150,20 @@ public class RoomUsersComposer extends MessageComposer { } return this.response; } + + public Habbo getHabbo() { + return habbo; + } + + public Collection getHabbos() { + return habbos; + } + + public Bot getBot() { + return bot; + } + + public Collection getBots() { + return bots; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersGuildBadgesComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersGuildBadgesComposer.java index babb298..bb8f1c4 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersGuildBadgesComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersGuildBadgesComposer.java @@ -28,4 +28,8 @@ public class RoomUsersGuildBadgesComposer extends MessageComposer { }); return this.response; } + + public THashMap getGuildBadges() { + return guildBadges; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeAcceptedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeAcceptedComposer.java index e6f10f6..21a5ee0 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeAcceptedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeAcceptedComposer.java @@ -19,4 +19,8 @@ public class TradeAcceptedComposer extends MessageComposer { this.response.appendInt(this.tradeUser.getAccepted()); return this.response; } + + public RoomTradeUser getTradeUser() { + return tradeUser; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeClosedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeClosedComposer.java index db24787..7fa0473 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeClosedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeClosedComposer.java @@ -23,4 +23,12 @@ public class TradeClosedComposer extends MessageComposer { this.response.appendInt(this.errorCode); return this.response; } + + public int getUserId() { + return userId; + } + + public int getErrorCode() { + return errorCode; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeStartComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeStartComposer.java index 57d9118..070deb8 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeStartComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeStartComposer.java @@ -29,4 +29,12 @@ public class TradeStartComposer extends MessageComposer { } return this.response; } + + public RoomTrade getRoomTrade() { + return roomTrade; + } + + public int getState() { + return state; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeStartFailComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeStartFailComposer.java index 1012e68..6e85c82 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeStartFailComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeStartFailComposer.java @@ -31,4 +31,12 @@ public class TradeStartFailComposer extends MessageComposer { this.response.appendString(this.username); return this.response; } + + public String getUsername() { + return username; + } + + public int getCode() { + return code; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeUpdateComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeUpdateComposer.java index 14464cf..b74d975 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeUpdateComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeUpdateComposer.java @@ -43,4 +43,8 @@ public class TradeUpdateComposer extends MessageComposer { } return this.response; } + + public RoomTrade getRoomTrade() { + return roomTrade; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/CompetitionEntrySubmitResultComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/CompetitionEntrySubmitResultComposer.java index 36db1a9..8e92478 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/CompetitionEntrySubmitResultComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/CompetitionEntrySubmitResultComposer.java @@ -38,4 +38,24 @@ public class CompetitionEntrySubmitResultComposer extends MessageComposer { } return this.response; } + + public int getUnknownInt1() { + return unknownInt1; + } + + public String getUnknownString1() { + return unknownString1; + } + + public int getResult() { + return result; + } + + public List getUnknownStringList1() { + return unknownStringList1; + } + + public List getUnknownStringList2() { + return unknownStringList2; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/ConvertedForwardToRoomComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/ConvertedForwardToRoomComposer.java index c36eb9f..97eba81 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/ConvertedForwardToRoomComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/ConvertedForwardToRoomComposer.java @@ -20,4 +20,12 @@ public class ConvertedForwardToRoomComposer extends MessageComposer { this.response.appendInt(this.unknownInt1); return this.response; } + + public String getUnknownString1() { + return unknownString1; + } + + public int getUnknownInt1() { + return unknownInt1; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/EpicPopupFrameComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/EpicPopupFrameComposer.java index 0fc2e05..deeefce 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/EpicPopupFrameComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/EpicPopupFrameComposer.java @@ -18,4 +18,8 @@ public class EpicPopupFrameComposer extends MessageComposer { this.response.appendString(this.assetURI); return this.response; } + + public String getAssetURI() { + return assetURI; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/ErrorLoginComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/ErrorLoginComposer.java index 80546dd..0e2d72a 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/ErrorLoginComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/ErrorLoginComposer.java @@ -17,4 +17,8 @@ public class ErrorLoginComposer extends MessageComposer { this.response.appendInt(this.errorCode); return this.response; } + + public int getErrorCode() { + return errorCode; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/ExtendClubMessageComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/ExtendClubMessageComposer.java index 8225c51..dfdf3da 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/ExtendClubMessageComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/ExtendClubMessageComposer.java @@ -34,4 +34,28 @@ public class ExtendClubMessageComposer extends MessageComposer { this.response.appendInt(this.daysRemaining); return this.response; } + + public Habbo getHabbo() { + return habbo; + } + + public ClubOffer getOffer() { + return offer; + } + + public int getNormalCreditCost() { + return normalCreditCost; + } + + public int getNormalPointsCost() { + return normalPointsCost; + } + + public int getPointsType() { + return pointsType; + } + + public int getDaysRemaining() { + return daysRemaining; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/MessengerErrorComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/MessengerErrorComposer.java index c16dee3..476a922 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/MessengerErrorComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/MessengerErrorComposer.java @@ -23,4 +23,8 @@ public class MessengerErrorComposer extends MessageComposer { } return this.response; } + + public Map getErrors() { + return errors; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/ModToolSanctionDataComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/ModToolSanctionDataComposer.java index 4cce883..265c77a 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/ModToolSanctionDataComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/ModToolSanctionDataComposer.java @@ -51,5 +51,41 @@ public class ModToolSanctionDataComposer extends MessageComposer { message.appendString(this.tradelockInfo); message.appendString(this.machineBanInfo); } + + public String getName() { + return name; + } + + public int getLength() { + return length; + } + + public int getUnknownInt1() { + return unknownInt1; + } + + public boolean isAvatarOnly() { + return avatarOnly; + } + + public String getTradelockInfo() { + return tradelockInfo; + } + + public String getMachineBanInfo() { + return machineBanInfo; + } + } + + public int getUnknownInt1() { + return unknownInt1; + } + + public int getAccountId() { + return accountId; + } + + public CFHSanction getSanction() { + return sanction; } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/RentableItemBuyOutPriceComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/RentableItemBuyOutPriceComposer.java index 75b5f6d..eb5a1f1 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/RentableItemBuyOutPriceComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/RentableItemBuyOutPriceComposer.java @@ -32,4 +32,28 @@ public class RentableItemBuyOutPriceComposer extends MessageComposer { this.response.appendInt(this.pointsType); return this.response; } + + public boolean isUnknownBoolean1() { + return unknownBoolean1; + } + + public String getUnknownString1() { + return unknownString1; + } + + public boolean isUnknownBoolean2() { + return unknownBoolean2; + } + + public int getCredits() { + return credits; + } + + public int getPoints() { + return points; + } + + public int getPointsType() { + return pointsType; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomAdErrorComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomAdErrorComposer.java index 0fb0752..1aac530 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomAdErrorComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomAdErrorComposer.java @@ -20,4 +20,12 @@ public class RoomAdErrorComposer extends MessageComposer { this.response.appendString(this.unknownString); return this.response; } + + public int getErrorCode() { + return errorCode; + } + + public String getUnknownString() { + return unknownString; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomCategoryUpdateMessageComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomCategoryUpdateMessageComposer.java index a726d90..1b6c39d 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomCategoryUpdateMessageComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomCategoryUpdateMessageComposer.java @@ -17,4 +17,8 @@ public class RoomCategoryUpdateMessageComposer extends MessageComposer { this.response.appendInt(this.unknownInt1); return this.response; } + + public int getUnknownInt1() { + return unknownInt1; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomMessagesPostedCountComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomMessagesPostedCountComposer.java index 8a269fe..93a872a 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomMessagesPostedCountComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomMessagesPostedCountComposer.java @@ -22,4 +22,12 @@ public class RoomMessagesPostedCountComposer extends MessageComposer { this.response.appendInt(this.count); return this.response; } + + public Room getRoom() { + return room; + } + + public int getCount() { + return count; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomUserQuestionAnsweredComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomUserQuestionAnsweredComposer.java index 3bd9a87..960d800 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomUserQuestionAnsweredComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomUserQuestionAnsweredComposer.java @@ -29,4 +29,16 @@ public class RoomUserQuestionAnsweredComposer extends MessageComposer { } return this.response; } + + public int getUserId() { + return userId; + } + + public String getValue() { + return value; + } + + public Map getUnknownMap() { + return unknownMap; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsLoadingArenaComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsLoadingArenaComposer.java index d6f11a4..9bd2a86 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsLoadingArenaComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsLoadingArenaComposer.java @@ -18,4 +18,8 @@ public class SnowWarsLoadingArenaComposer extends MessageComposer { //this.response.appendInt(1); //ItemID to dispose? return this.response; } + + public int getCount() { + return count; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsUserEnteredArenaComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsUserEnteredArenaComposer.java index 4bd4de9..26be97c 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsUserEnteredArenaComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsUserEnteredArenaComposer.java @@ -29,4 +29,8 @@ public class SnowWarsUserEnteredArenaComposer extends MessageComposer { } return this.response; } + + public int getType() { + return type; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/TalentTrackEmailFailedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/TalentTrackEmailFailedComposer.java index efcabe5..acedb3f 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/TalentTrackEmailFailedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/TalentTrackEmailFailedComposer.java @@ -17,4 +17,8 @@ public class TalentTrackEmailFailedComposer extends MessageComposer { this.response.appendInt(this.result); return this.response; } + + public int getResult() { + return result; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/TalentTrackEmailVerifiedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/TalentTrackEmailVerifiedComposer.java index 119a0b3..c8ea17e 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/TalentTrackEmailVerifiedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/TalentTrackEmailVerifiedComposer.java @@ -23,4 +23,16 @@ public class TalentTrackEmailVerifiedComposer extends MessageComposer { this.response.appendBoolean(this.unknownB2); return this.response; } + + public String getEmail() { + return email; + } + + public boolean isUnknownB1() { + return unknownB1; + } + + public boolean isUnknownB2() { + return unknownB2; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownAdManagerComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownAdManagerComposer.java index d690e8a..58ee45f 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownAdManagerComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownAdManagerComposer.java @@ -17,4 +17,8 @@ public class UnknownAdManagerComposer extends MessageComposer { this.response.appendBoolean(this.unknownBoolean); return this.response; } + + public boolean isUnknownBoolean() { + return unknownBoolean; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownAvatarEditorComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownAvatarEditorComposer.java index 5ff0d0c..68148ce 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownAvatarEditorComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownAvatarEditorComposer.java @@ -17,4 +17,8 @@ public class UnknownAvatarEditorComposer extends MessageComposer { this.response.appendInt(this.type); return this.response; } + + public int getType() { + return type; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownCatalogPageOfferComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownCatalogPageOfferComposer.java index 0ce8fbd..fbfda9c 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownCatalogPageOfferComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownCatalogPageOfferComposer.java @@ -21,4 +21,12 @@ public class UnknownCatalogPageOfferComposer extends MessageComposer { this.catalogItem.serialize(this.response); return this.response; } + + public int getPageId() { + return pageId; + } + + public CatalogItem getCatalogItem() { + return catalogItem; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownCompetitionComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownCompetitionComposer.java index 903e322..fa427d5 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownCompetitionComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownCompetitionComposer.java @@ -26,4 +26,20 @@ public class UnknownCompetitionComposer extends MessageComposer { this.response.appendInt(this.unknownInt3); return this.response; } + + public int getUnknownInt1() { + return unknownInt1; + } + + public String getUnknownString1() { + return unknownString1; + } + + public int getUnknownInt2() { + return unknownInt2; + } + + public int getUnknownInt3() { + return unknownInt3; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownComposer8.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownComposer8.java index 99417c9..72887ad 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownComposer8.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownComposer8.java @@ -23,4 +23,16 @@ public class UnknownComposer8 extends MessageComposer { this.response.appendInt(this.unknownInt2); return this.response; } + + public int getUnknownInt1() { + return unknownInt1; + } + + public int getUserId() { + return userId; + } + + public int getUnknownInt2() { + return unknownInt2; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownFurniModelComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownFurniModelComposer.java index e4c3d62..a21a598 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownFurniModelComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownFurniModelComposer.java @@ -21,4 +21,12 @@ public class UnknownFurniModelComposer extends MessageComposer { this.response.appendInt(this.unknownInt); return this.response; } + + public HabboItem getItem() { + return item; + } + + public int getUnknownInt() { + return unknownInt; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownGuild2Composer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownGuild2Composer.java index dab7e51..0da7e10 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownGuild2Composer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownGuild2Composer.java @@ -17,4 +17,8 @@ public class UnknownGuild2Composer extends MessageComposer { this.response.appendInt(this.guildId); return this.response; } + + public int getGuildId() { + return guildId; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownGuildComposer3.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownGuildComposer3.java index c82577c..ebcaf8a 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownGuildComposer3.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownGuildComposer3.java @@ -17,4 +17,8 @@ public class UnknownGuildComposer3 extends MessageComposer { this.response.appendInt(this.userId); return this.response; } + + public int getUserId() { + return userId; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownHabboWayQuizComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownHabboWayQuizComposer.java index 5c1a6b0..12ed30f 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownHabboWayQuizComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownHabboWayQuizComposer.java @@ -25,4 +25,12 @@ public class UnknownHabboWayQuizComposer extends MessageComposer { } return this.response; } + + public String getUnknownString() { + return unknownString; + } + + public List getUnknownIntegerList() { + return unknownIntegerList; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownHintComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownHintComposer.java index 82ff7d2..da26b5a 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownHintComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownHintComposer.java @@ -17,4 +17,8 @@ public class UnknownHintComposer extends MessageComposer { this.response.appendString(this.key); return this.response; } + + public String getKey() { + return key; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownMessengerErrorComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownMessengerErrorComposer.java index 5f62eec..9ce6705 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownMessengerErrorComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownMessengerErrorComposer.java @@ -23,4 +23,16 @@ public class UnknownMessengerErrorComposer extends MessageComposer { this.response.appendString(this.message); return this.response; } + + public int getErrorCode() { + return errorCode; + } + + public int getUserId() { + return userId; + } + + public String getMessage() { + return message; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownPollQuestionComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownPollQuestionComposer.java index 6170514..c0616c2 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownPollQuestionComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownPollQuestionComposer.java @@ -26,4 +26,12 @@ public class UnknownPollQuestionComposer extends MessageComposer { } return this.response; } + + public int getUnknownInt() { + return unknownInt; + } + + public Map getUnknownMap() { + return unknownMap; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownRoomDesktopComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownRoomDesktopComposer.java index d535af2..87bd373 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownRoomDesktopComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownRoomDesktopComposer.java @@ -26,4 +26,12 @@ public class UnknownRoomDesktopComposer extends MessageComposer { } return this.response; } + + public int getUnknownInt1() { + return unknownInt1; + } + + public Map getUnknownMap() { + return unknownMap; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownRoomViewerComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownRoomViewerComposer.java index 703a08e..54399d9 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownRoomViewerComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownRoomViewerComposer.java @@ -23,4 +23,8 @@ public class UnknownRoomViewerComposer extends MessageComposer { } return this.response; } + + public Map getUnknownMap() { + return unknownMap; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownStatusComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownStatusComposer.java index cfa8c30..19dc50f 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownStatusComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownStatusComposer.java @@ -20,4 +20,8 @@ public class UnknownStatusComposer extends MessageComposer { this.response.appendInt(this.status); return this.response; } + + public int getStatus() { + return status; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnkownPetPackageComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnkownPetPackageComposer.java index 337951a..5c094c7 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnkownPetPackageComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnkownPetPackageComposer.java @@ -23,4 +23,8 @@ public class UnkownPetPackageComposer extends MessageComposer { } return this.response; } + + public Map getUnknownMap() { + return unknownMap; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UserClassificationComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UserClassificationComposer.java index f7c3213..530c808 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UserClassificationComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/UserClassificationComposer.java @@ -25,4 +25,8 @@ public class UserClassificationComposer extends MessageComposer { } return this.response; } + + public List>> getInfo() { + return info; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/WatchAndEarnRewardComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/WatchAndEarnRewardComposer.java index 06dd2b9..1fb1e74 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/WatchAndEarnRewardComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/WatchAndEarnRewardComposer.java @@ -21,4 +21,8 @@ public class WatchAndEarnRewardComposer extends MessageComposer { this.response.appendString(this.item.getFullName()); return this.response; } + + public Item getItem() { + return item; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftComposer.java index 8345ec6..48ef499 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftComposer.java @@ -29,4 +29,24 @@ public class WelcomeGiftComposer extends MessageComposer { this.response.appendBoolean(this.unknownB3); return this.response; } + + public String getEmail() { + return email; + } + + public boolean isUnknownB1() { + return unknownB1; + } + + public boolean isUnknownB2() { + return unknownB2; + } + + public int getFurniId() { + return furniId; + } + + public boolean isUnknownB3() { + return unknownB3; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftErrorComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftErrorComposer.java index afb1fde..3e165c7 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftErrorComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftErrorComposer.java @@ -22,4 +22,8 @@ public class WelcomeGiftErrorComposer extends MessageComposer { this.response.appendInt(this.error); return this.response; } + + public int getError() { + return error; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/AddUserBadgeComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/AddUserBadgeComposer.java index 7074188..d8802b2 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/AddUserBadgeComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/AddUserBadgeComposer.java @@ -19,4 +19,8 @@ public class AddUserBadgeComposer extends MessageComposer { this.response.appendString(this.badge.getCode()); return this.response; } + + public HabboBadge getBadge() { + return badge; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/ChangeNameCheckResultComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/ChangeNameCheckResultComposer.java index e451a88..a16c1d6 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/ChangeNameCheckResultComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/ChangeNameCheckResultComposer.java @@ -35,4 +35,16 @@ public class ChangeNameCheckResultComposer extends MessageComposer { } return this.response; } + + public int getStatus() { + return status; + } + + public String getName() { + return name; + } + + public List getSuggestions() { + return suggestions; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/ClubGiftReceivedComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/ClubGiftReceivedComposer.java index de0755f..481da48 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/ClubGiftReceivedComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/ClubGiftReceivedComposer.java @@ -29,4 +29,12 @@ public class ClubGiftReceivedComposer extends MessageComposer { return this.response; } + + public String getName() { + return name; + } + + public THashSet getItems() { + return items; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/FavoriteRoomsCountComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/FavoriteRoomsCountComposer.java index 36f4c4e..f382e55 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/FavoriteRoomsCountComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/FavoriteRoomsCountComposer.java @@ -28,4 +28,8 @@ public class FavoriteRoomsCountComposer extends MessageComposer { }); return this.response; } + + public Habbo getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/MeMenuSettingsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/MeMenuSettingsComposer.java index 73b2d1d..15734e8 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/MeMenuSettingsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/MeMenuSettingsComposer.java @@ -25,4 +25,8 @@ public class MeMenuSettingsComposer extends MessageComposer { this.response.appendInt(this.habbo.getHabboStats().chatColor.getType()); return this.response; } + + public Habbo getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/MutedWhisperComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/MutedWhisperComposer.java index 1db3310..bae0cc7 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/MutedWhisperComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/MutedWhisperComposer.java @@ -17,4 +17,8 @@ public class MutedWhisperComposer extends MessageComposer { this.response.appendInt(this.seconds); return this.response; } + + public int getSeconds() { + return seconds; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/ProfileFriendsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/ProfileFriendsComposer.java index cc4d757..2115df8 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/ProfileFriendsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/ProfileFriendsComposer.java @@ -108,4 +108,20 @@ public class ProfileFriendsComposer extends MessageComposer { } return this.response; } + + public List getLovers() { + return lovers; + } + + public List getFriends() { + return friends; + } + + public List getHaters() { + return haters; + } + + public int getUserId() { + return userId; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UpdateUserLookComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UpdateUserLookComposer.java index ebe6f21..5e02cce 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UpdateUserLookComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UpdateUserLookComposer.java @@ -19,4 +19,8 @@ public class UpdateUserLookComposer extends MessageComposer { this.response.appendString(this.habbo.getHabboInfo().getGender().name()); return this.response; } + + public Habbo getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserAchievementScoreComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserAchievementScoreComposer.java index 539481a..bfb8a6b 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserAchievementScoreComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserAchievementScoreComposer.java @@ -18,4 +18,8 @@ public class UserAchievementScoreComposer extends MessageComposer { this.response.appendInt(this.habbo.getHabboStats().getAchievementScore()); return this.response; } + + public Habbo getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserBadgesComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserBadgesComposer.java index 7574c3a..287f72c 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserBadgesComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserBadgesComposer.java @@ -29,4 +29,12 @@ public class UserBadgesComposer extends MessageComposer { } return this.response; } + + public ArrayList getBadges() { + return badges; + } + + public int getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserCitizinShipComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserCitizinShipComposer.java index cbaea5b..286a636 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserCitizinShipComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserCitizinShipComposer.java @@ -19,4 +19,8 @@ public class UserCitizinShipComposer extends MessageComposer { this.response.appendInt(4); return this.response; } + + public String getName() { + return name; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserClothesComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserClothesComposer.java index 82c33e9..c0b5dfe 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserClothesComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserClothesComposer.java @@ -42,4 +42,12 @@ public class UserClothesComposer extends MessageComposer { this.nameList.forEach(this.response::appendString); return this.response; } + + public ArrayList getIdList() { + return idList; + } + + public ArrayList getNameList() { + return nameList; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserClubComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserClubComposer.java index 695561d..d1a5641 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserClubComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserClubComposer.java @@ -160,4 +160,16 @@ public class UserClubComposer extends MessageComposer { return this.response; } + + public Habbo getHabbo() { + return habbo; + } + + public String getSubscriptionType() { + return subscriptionType; + } + + public int getResponseType() { + return responseType; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserCreditsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserCreditsComposer.java index 70c89ae..3a4ecc6 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserCreditsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserCreditsComposer.java @@ -18,4 +18,8 @@ public class UserCreditsComposer extends MessageComposer { this.response.appendString(this.habbo.getHabboInfo().getCredits() + ".0"); return this.response; } + + public Habbo getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserCurrencyComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserCurrencyComposer.java index 22b689a..4272d4d 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserCurrencyComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserCurrencyComposer.java @@ -36,4 +36,8 @@ public class UserCurrencyComposer extends MessageComposer { } return this.response; } + + public Habbo getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserDataComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserDataComposer.java index 6b4235d..7e956d5 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserDataComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserDataComposer.java @@ -33,4 +33,8 @@ public class UserDataComposer extends MessageComposer { return this.response; } + + public Habbo getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserHomeRoomComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserHomeRoomComposer.java index 4aeae0b..34b1b16 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserHomeRoomComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserHomeRoomComposer.java @@ -20,4 +20,12 @@ public class UserHomeRoomComposer extends MessageComposer { this.response.appendInt(this.roomToEnter); return this.response; } + + public int getHomeRoom() { + return homeRoom; + } + + public int getRoomToEnter() { + return roomToEnter; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserPerksComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserPerksComposer.java index 7c81d3c..5e3bc30 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserPerksComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserPerksComposer.java @@ -81,4 +81,8 @@ public class UserPerksComposer extends MessageComposer { return this.response; } + + public Habbo getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserPermissionsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserPermissionsComposer.java index d7c5809..f67c2bf 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserPermissionsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserPermissionsComposer.java @@ -24,4 +24,12 @@ public class UserPermissionsComposer extends MessageComposer { this.response.appendBoolean(this.habbo.hasPermission(Permission.ACC_AMBASSADOR)); return this.response; } + + public int getClubLevel() { + return clubLevel; + } + + public Habbo getHabbo() { + return habbo; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserPointsComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserPointsComposer.java index 19ffa00..560b434 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserPointsComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserPointsComposer.java @@ -23,4 +23,16 @@ public class UserPointsComposer extends MessageComposer { this.response.appendInt(this.type); return this.response; } + + public int getCurrentAmount() { + return currentAmount; + } + + public int getAmountAdded() { + return amountAdded; + } + + public int getType() { + return type; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserProfileComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserProfileComposer.java index 7a53565..c58fbe7 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserProfileComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserProfileComposer.java @@ -114,4 +114,16 @@ public class UserProfileComposer extends MessageComposer { return this.response; } + + public HabboInfo getHabboInfo() { + return habboInfo; + } + + public Habbo getHabbo() { + return habbo; + } + + public GameClient getViewer() { + return viewer; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserWardrobeComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserWardrobeComposer.java index 912fab5..fee0831 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserWardrobeComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/UserWardrobeComposer.java @@ -24,4 +24,8 @@ public class UserWardrobeComposer extends MessageComposer { } return this.response; } + + public WardrobeComponent getWardrobeComponent() { + return wardrobeComponent; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneCodeWindowComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneCodeWindowComposer.java index f2923d4..1cae312 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneCodeWindowComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneCodeWindowComposer.java @@ -20,4 +20,12 @@ public class VerifyMobilePhoneCodeWindowComposer extends MessageComposer { this.response.appendInt(this.unknownInt2); return this.response; } + + public int getUnknownInt1() { + return unknownInt1; + } + + public int getUnknownInt2() { + return unknownInt2; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneDoneComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneDoneComposer.java index b91fca9..e2e6222 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneDoneComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneDoneComposer.java @@ -20,4 +20,12 @@ public class VerifyMobilePhoneDoneComposer extends MessageComposer { this.response.appendInt(this.unknownInt2); return this.response; } + + public int getUnknownInt1() { + return unknownInt1; + } + + public int getUnknownInt2() { + return unknownInt2; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneWindowComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneWindowComposer.java index 1476672..5433d7b 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneWindowComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneWindowComposer.java @@ -23,4 +23,16 @@ public class VerifyMobilePhoneWindowComposer extends MessageComposer { this.response.appendInt(this.unknownInt3); return this.response; } + + public int getUnknownInt1() { + return unknownInt1; + } + + public int getUnknownInt2() { + return unknownInt2; + } + + public int getUnknownInt3() { + return unknownInt3; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredConditionDataComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredConditionDataComposer.java index b3dcae0..7da2879 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredConditionDataComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredConditionDataComposer.java @@ -22,4 +22,12 @@ public class WiredConditionDataComposer extends MessageComposer { this.condition.needsUpdate(true); return this.response; } + + public InteractionWiredCondition getCondition() { + return condition; + } + + public Room getRoom() { + return room; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredEffectDataComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredEffectDataComposer.java index 73c84f2..5a17a7b 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredEffectDataComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredEffectDataComposer.java @@ -22,4 +22,12 @@ public class WiredEffectDataComposer extends MessageComposer { this.effect.needsUpdate(true); return this.response; } + + public InteractionWiredEffect getEffect() { + return effect; + } + + public Room getRoom() { + return room; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredOpenComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredOpenComposer.java index d433f63..4a574d7 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredOpenComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredOpenComposer.java @@ -18,4 +18,8 @@ public class WiredOpenComposer extends MessageComposer { this.response.appendInt(this.item.getId()); return this.response; } + + public HabboItem getItem() { + return item; + } } \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredRewardAlertComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredRewardAlertComposer.java index 606a31e..1b5bb52 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredRewardAlertComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredRewardAlertComposer.java @@ -27,4 +27,8 @@ public class WiredRewardAlertComposer extends MessageComposer { this.response.appendInt(this.code); return this.response; } + + public int getCode() { + return code; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredTriggerDataComposer.java b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredTriggerDataComposer.java index 8541e81..0e7b7dc 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredTriggerDataComposer.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredTriggerDataComposer.java @@ -22,4 +22,12 @@ public class WiredTriggerDataComposer extends MessageComposer { this.trigger.needsUpdate(true); return this.response; } + + public InteractionWiredTrigger getTrigger() { + return trigger; + } + + public Room getRoom() { + return room; + } } diff --git a/Emulator/src/main/java/com/eu/habbo/plugin/events/emulator/OutgoingPacketEvent.java b/Emulator/src/main/java/com/eu/habbo/plugin/events/emulator/OutgoingPacketEvent.java new file mode 100644 index 0000000..4e0433b --- /dev/null +++ b/Emulator/src/main/java/com/eu/habbo/plugin/events/emulator/OutgoingPacketEvent.java @@ -0,0 +1,39 @@ +package com.eu.habbo.plugin.events.emulator; + +import com.eu.habbo.habbohotel.users.Habbo; +import com.eu.habbo.messages.ServerMessage; +import com.eu.habbo.messages.outgoing.MessageComposer; +import com.eu.habbo.plugin.events.users.UserEvent; + +public class OutgoingPacketEvent extends UserEvent { + private final MessageComposer composer; + private final ServerMessage originalMessage; + private ServerMessage customMessage; + + public OutgoingPacketEvent(Habbo habbo, MessageComposer composer, ServerMessage originalMessage) { + super(habbo); + this.composer = composer; + this.originalMessage = originalMessage; + this.customMessage = null; + } + + public ServerMessage getOriginalMessage() { + return originalMessage; + } + + public MessageComposer getComposer() { + return composer; + } + + public void setCustomMessage(ServerMessage customMessage) { + this.customMessage = customMessage; + } + + public boolean hasCustomMessage() { + return this.customMessage != null; + } + + public ServerMessage getCustomMessage() { + return this.customMessage; + } +} \ No newline at end of file diff --git a/Emulator/src/main/java/com/eu/habbo/threading/runnables/RoomUnitTeleport.java b/Emulator/src/main/java/com/eu/habbo/threading/runnables/RoomUnitTeleport.java index 9cbe83c..d315d6d 100644 --- a/Emulator/src/main/java/com/eu/habbo/threading/runnables/RoomUnitTeleport.java +++ b/Emulator/src/main/java/com/eu/habbo/threading/runnables/RoomUnitTeleport.java @@ -34,9 +34,14 @@ public class RoomUnitTeleport implements Runnable { @Override public void run() { - if (roomUnit == null || roomUnit.getRoom() == null || room.getLayout() == null || roomUnit.isLeavingTeleporter) + if (roomUnit == null || roomUnit.getRoom() == null || room.getLayout() == null) return; + if (roomUnit.isLeavingTeleporter) { + roomUnit.isWiredTeleporting = false; + return; + } + RoomTile lastLocation = this.roomUnit.getCurrentLocation(); RoomTile newLocation = this.room.getLayout().getTile((short) this.x, (short) this.y); diff --git a/Latest_Compiled_Version/Habbo-3.6.0-jar-with-dependencies.jar b/Latest_Compiled_Version/Habbo-3.6.0-jar-with-dependencies.jar index 0160aac..efce265 100644 Binary files a/Latest_Compiled_Version/Habbo-3.6.0-jar-with-dependencies.jar and b/Latest_Compiled_Version/Habbo-3.6.0-jar-with-dependencies.jar differ