diff --git a/src/main/java/com/eu/habbo/Emulator.java b/src/main/java/com/eu/habbo/Emulator.java index 0ec8df7b..47e5b507 100644 --- a/src/main/java/com/eu/habbo/Emulator.java +++ b/src/main/java/com/eu/habbo/Emulator.java @@ -31,16 +31,20 @@ import java.util.regex.Pattern; public final class Emulator { + public static final int MAJOR = 4; + public static final int MINOR = 0; + public static final int BUILD = 0; + public static final String PREVIEW = "Developer Preview"; + public static final String version = "Arcturus Morningstar" + " " + MAJOR + "." + MINOR + "." + BUILD + " " + PREVIEW; + public static String build = ""; + public static boolean isReady = false; + public static boolean isShuttingDown = false; + public static boolean stopped = false; + public static boolean debugging = false; + private static final Logger LOGGER = LoggerFactory.getLogger(Emulator.class); private static final String OS_NAME = (System.getProperty("os.name") != null ? System.getProperty("os.name") : "Unknown"); private static final String CLASS_PATH = (System.getProperty("java.class.path") != null ? System.getProperty("java.class.path") : "Unknown"); - - public final static int MAJOR = 4; - public final static int MINOR = 0; - public final static int BUILD = 0; - public final static String PREVIEW = "Developer Preview"; - - public static final String version = "Arcturus Morningstar" + " " + MAJOR + "." + MINOR + "." + BUILD + " " + PREVIEW; private static final String logo = "\n" + "███╗ ███╗ ██████╗ ██████╗ ███╗ ██╗██╗███╗ ██╗ ██████╗ ███████╗████████╗ █████╗ ██████╗ \n" + @@ -52,11 +56,6 @@ public final class Emulator { - public static String build = ""; - public static boolean isReady = false; - public static boolean isShuttingDown = false; - public static boolean stopped = false; - public static boolean debugging = false; private static int timeStarted = 0; private static Runtime runtime; private static ConfigurationManager config; @@ -217,12 +216,11 @@ public final class Emulator { MessageDigest md = MessageDigest.getInstance("MD5");// MD5 FileInputStream fis = new FileInputStream(filepath); byte[] dataBytes = new byte[1024]; - int nread = 0; + int nread; while ((nread = fis.read(dataBytes)) != -1) md.update(dataBytes, 0, nread); byte[] mdbytes = md.digest(); - for (int i = 0; i < mdbytes.length; i++) - sb.append(Integer.toString((mdbytes[i] & 0xff) + 0x100, 16).substring(1)); + for (byte mdbyte : mdbytes) sb.append(Integer.toString((mdbyte & 0xff) + 0x100, 16).substring(1)); } catch (Exception e) { build = "4.0 Developer Preview Branch"; return; @@ -241,50 +239,50 @@ public final class Emulator { try { if (Emulator.getPluginManager() != null) Emulator.getPluginManager().fireEvent(new EmulatorStartShutdownEvent()); - } catch (Exception e) { + } catch (Exception ignored) { } try { if (Emulator.cameraClient != null) Emulator.cameraClient.disconnect(); - } catch (Exception e) { + } catch (Exception ignored) { } try { if (Emulator.rconServer != null) Emulator.rconServer.stop(); - } catch (Exception e) { + } catch (Exception ignored) { } try { if (Emulator.gameEnvironment != null) Emulator.gameEnvironment.dispose(); - } catch (Exception e) { + } catch (Exception ignored) { } try { if (Emulator.getPluginManager() != null) Emulator.getPluginManager().fireEvent(new EmulatorStoppedEvent()); - } catch (Exception e) { + } catch (Exception ignored) { } try { if (Emulator.pluginManager != null) Emulator.pluginManager.dispose(); - } catch (Exception e) { + } catch (Exception ignored) { } try { if (Emulator.config != null) { Emulator.config.saveToDatabase(); } - } catch (Exception e) { + } catch (Exception ignored) { } try { if (Emulator.gameServer != null) Emulator.gameServer.stop(); - } catch (Exception e) { + } catch (Exception ignored) { } LOGGER.info("Stopped Arcturus Morningstar {}", version); @@ -298,7 +296,7 @@ public final class Emulator { if (Emulator.threading != null) Emulator.threading.shutDown(); - } catch (Exception e) { + } catch (Exception ignored) { } } @@ -362,7 +360,7 @@ public final class Emulator { return badgeImager; } - public static CameraClient getCameraClient() { + public static synchronized CameraClient getCameraClient() { return cameraClient; } @@ -386,17 +384,14 @@ public final class Emulator { int totalSeconds = 0; Matcher m = Pattern.compile("(([0-9]*) (second|minute|hour|day|week|month|year))").matcher(timeString); - Map map = new HashMap() { - { - put("second", 1); - put("minute", 60); - put("hour", 3600); - put("day", 86400); - put("week", 604800); - put("month", 2628000); - put("year", 31536000); - } - }; + Map map = new HashMap(); + map.put("second", 1); + map.put("minute", 60); + map.put("hour", 3600); + map.put("day", 86400); + map.put("week", 604800); + map.put("month", 2628000); + map.put("year", 31536000); while (m.find()) { try { @@ -417,17 +412,14 @@ public final class Emulator { c.setTime(date); Matcher m = Pattern.compile("(([0-9]*) (second|minute|hour|day|week|month|year))").matcher(timeString); - Map map = new HashMap() { - { - put("second", Calendar.SECOND); - put("minute", Calendar.MINUTE); - put("hour", Calendar.HOUR); - put("day", Calendar.DAY_OF_MONTH); - put("week", Calendar.WEEK_OF_MONTH); - put("month", Calendar.MONTH); - put("year", Calendar.YEAR); - } - }; + Map map = new HashMap(); + map.put("second", Calendar.SECOND); + map.put("minute", Calendar.MINUTE); + map.put("hour", Calendar.HOUR); + map.put("day", Calendar.DAY_OF_MONTH); + map.put("week", Calendar.WEEK_OF_MONTH); + map.put("month", Calendar.MONTH); + map.put("year", Calendar.YEAR); while (m.find()) { try { @@ -444,6 +436,8 @@ public final class Emulator { private static String dateToUnixTimestamp(Date date) { String res = ""; Date aux = stringToDate("1970-01-01 00:00:00"); + if(aux == null) return null; + Timestamp aux1 = dateToTimeStamp(aux); Timestamp aux2 = dateToTimeStamp(date); long difference = aux2.getTime() - aux1.getTime(); diff --git a/src/main/java/com/eu/habbo/core/RoomUserPetComposer.java b/src/main/java/com/eu/habbo/core/RoomUserPetComposer.java index cdd54557..40eaff54 100644 --- a/src/main/java/com/eu/habbo/core/RoomUserPetComposer.java +++ b/src/main/java/com/eu/habbo/core/RoomUserPetComposer.java @@ -20,7 +20,7 @@ public class RoomUserPetComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UsersComposer); + this.response.init(Outgoing.usersComposer); this.response.appendInt(1); this.response.appendInt(this.habbo.getHabboInfo().getId()); this.response.appendString(this.habbo.getHabboInfo().getUsername()); diff --git a/src/main/java/com/eu/habbo/core/Scheduler.java b/src/main/java/com/eu/habbo/core/Scheduler.java index 17fae179..de7f3dff 100644 --- a/src/main/java/com/eu/habbo/core/Scheduler.java +++ b/src/main/java/com/eu/habbo/core/Scheduler.java @@ -31,6 +31,6 @@ public class Scheduler implements Runnable { if (this.disposed) return; - Emulator.getThreading().run(this, this.interval * 1000); + Emulator.getThreading().run(this, this.interval * 1000L); } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/core/TextsManager.java b/src/main/java/com/eu/habbo/core/TextsManager.java index 4b0bf66e..523740db 100644 --- a/src/main/java/com/eu/habbo/core/TextsManager.java +++ b/src/main/java/com/eu/habbo/core/TextsManager.java @@ -23,7 +23,7 @@ public class TextsManager { LOGGER.info("Texts Manager -> Loaded! (" + (System.currentTimeMillis() - millis) + " MS)"); } catch (Exception e) { - e.printStackTrace(); + LOGGER.error("Caught exception", e); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/GameEnvironment.java b/src/main/java/com/eu/habbo/habbohotel/GameEnvironment.java index 7944ae8c..ba201e53 100644 --- a/src/main/java/com/eu/habbo/habbohotel/GameEnvironment.java +++ b/src/main/java/com/eu/habbo/habbohotel/GameEnvironment.java @@ -4,7 +4,7 @@ import com.eu.habbo.Emulator; import com.eu.habbo.core.*; import com.eu.habbo.habbohotel.achievements.AchievementManager; import com.eu.habbo.habbohotel.bots.BotManager; -import com.eu.habbo.habbohotel.campaign.calendar.CalendarManager; +import com.eu.habbo.habbohotel.campaign.CalendarManager; import com.eu.habbo.habbohotel.catalog.CatalogManager; import com.eu.habbo.habbohotel.commands.CommandHandler; import com.eu.habbo.habbohotel.crafting.CraftingManager; diff --git a/src/main/java/com/eu/habbo/habbohotel/bots/Bot.java b/src/main/java/com/eu/habbo/habbohotel/bots/Bot.java index 903f28eb..5cc1f9ea 100644 --- a/src/main/java/com/eu/habbo/habbohotel/bots/Bot.java +++ b/src/main/java/com/eu/habbo/habbohotel/bots/Bot.java @@ -47,7 +47,7 @@ public class Bot implements Runnable { private int bubble; - private String type; + private final String type; private int effect; diff --git a/src/main/java/com/eu/habbo/habbohotel/bots/VisitorBot.java b/src/main/java/com/eu/habbo/habbohotel/bots/VisitorBot.java index dd6f0849..bf160161 100644 --- a/src/main/java/com/eu/habbo/habbohotel/bots/VisitorBot.java +++ b/src/main/java/com/eu/habbo/habbohotel/bots/VisitorBot.java @@ -12,7 +12,7 @@ import java.text.SimpleDateFormat; import java.util.Date; public class VisitorBot extends Bot { - private static SimpleDateFormat DATE_FORMAT; + public static SimpleDateFormat DATE_FORMAT; private boolean showedLog = false; private THashSet visits = new THashSet<>(3); diff --git a/src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarCampaign.java b/src/main/java/com/eu/habbo/habbohotel/campaign/CalendarCampaign.java similarity index 62% rename from src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarCampaign.java rename to src/main/java/com/eu/habbo/habbohotel/campaign/CalendarCampaign.java index 29733ddb..4fc4a5b9 100644 --- a/src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarCampaign.java +++ b/src/main/java/com/eu/habbo/habbohotel/campaign/CalendarCampaign.java @@ -1,10 +1,9 @@ -package com.eu.habbo.habbohotel.campaign.calendar; +package com.eu.habbo.habbohotel.campaign; import gnu.trove.map.hash.THashMap; import java.sql.ResultSet; import java.sql.SQLException; -import java.sql.Timestamp; import java.util.Map; public class CalendarCampaign { @@ -12,26 +11,26 @@ public class CalendarCampaign { private final String name; private final String image; private Map rewards = new THashMap<>(); - private final Integer start_timestamp; - private final int total_days; - private final boolean lock_expired; + private final Integer startTimestamp; + private final int totalDays; + private final boolean lockExpired; public CalendarCampaign(ResultSet set) throws SQLException { this.id = set.getInt("id"); this.name = set.getString("name"); this.image = set.getString("image"); - this.start_timestamp = set.getInt("start_timestamp"); - this.total_days = set.getInt("total_days"); - this.lock_expired = set.getInt("lock_expired") == 1; + this.startTimestamp = set.getInt("start_timestamp"); + this.totalDays = set.getInt("total_days"); + this.lockExpired = set.getInt("lock_expired") == 1; } - public CalendarCampaign(int id, String name, String image, Integer start_timestamp, int total_days, boolean lock_expired) { + public CalendarCampaign(int id, String name, String image, Integer startTimestamp, int totalDays, boolean lockExpired) { this.id = id; this.name = name; this.image = image; - this.start_timestamp = start_timestamp; - this.total_days = total_days; - this.lock_expired = lock_expired; + this.startTimestamp = startTimestamp; + this.totalDays = totalDays; + this.lockExpired = lockExpired; } public int getId() { @@ -47,12 +46,12 @@ public class CalendarCampaign { } public Integer getStartTimestamp() { - return this.start_timestamp; + return this.startTimestamp; } - public int getTotalDays() { return this.total_days; } + public int getTotalDays() { return this.totalDays; } - public boolean getLockExpired() { return this.lock_expired; } + public boolean getLockExpired() { return this.lockExpired; } public Map getRewards() { return rewards; } diff --git a/src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarManager.java b/src/main/java/com/eu/habbo/habbohotel/campaign/CalendarManager.java similarity index 62% rename from src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarManager.java rename to src/main/java/com/eu/habbo/habbohotel/campaign/CalendarManager.java index 73f435bf..cf0beded 100644 --- a/src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/campaign/CalendarManager.java @@ -1,4 +1,4 @@ -package com.eu.habbo.habbohotel.campaign.calendar; +package com.eu.habbo.habbohotel.campaign; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.Habbo; @@ -9,16 +9,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.sql.*; -import java.util.*; +import java.time.temporal.ChronoUnit; import java.util.Date; - -import static java.time.temporal.ChronoUnit.DAYS; +import java.util.*; public class CalendarManager { - private static final Logger LOGGER = LoggerFactory.getLogger(CalendarCampaign.class); + private static final Logger LOGGER = LoggerFactory.getLogger(CalendarManager.class); - final private static Map calendarCampaigns = new THashMap<>(); + private static final Map calendarCampaigns = new THashMap<>(); public static double HC_MODIFIER; public CalendarManager() { @@ -27,7 +26,7 @@ public class CalendarManager { LOGGER.info("Calendar Manager -> Loaded! ({} MS)", (System.currentTimeMillis() - millis)); } - public void dispose(){ + public void dispose() { calendarCampaigns.clear(); } @@ -48,7 +47,7 @@ public class CalendarManager { try (ResultSet set = statement.executeQuery()) { while (set.next()) { CalendarCampaign campaign = calendarCampaigns.get(set.getInt("campaign_id")); - if(campaign != null){ + if (campaign != null) { campaign.addReward(new CalendarRewardObject(set)); } } @@ -58,7 +57,7 @@ public class CalendarManager { return false; } - HC_MODIFIER = Emulator.getConfig().getDouble("hotel.calendar.pixels.hc_modifier", 2.0); + CalendarManager.HC_MODIFIER = Emulator.getConfig().getDouble("hotel.calendar.pixels.hc_modifier", 2.0); return true; } @@ -107,46 +106,38 @@ public class CalendarManager { public CalendarCampaign getCalendarCampaign(String campaignName) { return calendarCampaigns.values().stream().filter(cc -> Objects.equals(cc.getName(), campaignName)).findFirst().orElse(null); } + public Map getCalendarCampaigns() { return calendarCampaigns; } public void claimCalendarReward(Habbo habbo, String campaignName, int day, boolean force) { CalendarCampaign campaign = calendarCampaigns.values().stream().filter(cc -> Objects.equals(cc.getName(), campaignName)).findFirst().orElse(null); - if(campaign == null) return; - if (habbo.getHabboStats().calendarRewardsClaimed.stream().noneMatch(claimed -> claimed.getCampaignId() == campaign.getId() && claimed.getDay() == day)) { + if (campaign == null || campaign.getRewards().isEmpty() || (habbo.getHabboStats().calendarRewardsClaimed.stream().anyMatch(claimed -> claimed.getCampaignId() == campaign.getId() && claimed.getDay() == day))) + return; - Set keys = campaign.getRewards().keySet(); - Map rewards = new THashMap<>(); - if(keys.isEmpty()) return; - keys.forEach(key -> rewards.put(rewards.size() + 1, key)); - int rand = Emulator.getRandom().nextInt(rewards.size() - 1 + 1) + 1; - int random = rewards.get(rand); - CalendarRewardObject object = campaign.getRewards().get(random); - if (object == null) return; - int daysBetween = (int) DAYS.between(new Timestamp(campaign.getStartTimestamp() * 1000L).toInstant(), new Date().toInstant()); - if(daysBetween >= 0 && daysBetween <= campaign.getTotalDays()) { - int diff = (daysBetween - day); - if ((((diff <= 2 || !campaign.getLockExpired()) && diff >= 0) || (force && habbo.hasPermission("acc_calendar_force")))) { + List rewards = new ArrayList<>(campaign.getRewards().values()); + CalendarRewardObject object = rewards.get(Emulator.getRandom().nextInt(rewards.size() - 1 + 1)); - if (Emulator.getPluginManager().fireEvent(new UserClaimRewardEvent(habbo, campaign, day, object, force)).isCancelled()) { - return; - } + if (object == null) return; + long daysBetween = ChronoUnit.DAYS.between(new Timestamp(campaign.getStartTimestamp() * 1000L).toInstant(), new Date().toInstant()); + if (((daysBetween >= 0 && daysBetween <= campaign.getTotalDays()) && (((daysBetween - day <= 2 || !campaign.getLockExpired()) && daysBetween - day >= 0)) || (force && habbo.hasPermission("acc_calendar_force")))) { + if (Emulator.getPluginManager().fireEvent(new UserClaimRewardEvent(habbo, campaign, day, object, force)).isCancelled()) { + return; + } + habbo.getHabboStats().calendarRewardsClaimed.add(new CalendarRewardClaimed(habbo.getHabboInfo().getId(), campaign.getId(), day, object.getId(), new Timestamp(System.currentTimeMillis()))); + habbo.getClient().sendResponse(new CampaignCalendarDoorOpenedMessageComposer(true, object, habbo)); + object.give(habbo); - habbo.getHabboStats().calendarRewardsClaimed.add(new CalendarRewardClaimed(habbo.getHabboInfo().getId(), campaign.getId(), day, object.getId(), new Timestamp(System.currentTimeMillis()))); - habbo.getClient().sendResponse(new CampaignCalendarDoorOpenedMessageComposer(true, object, habbo)); - object.give(habbo); - try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("INSERT INTO calendar_rewards_claimed (user_id, campaign_id, day, reward_id, timestamp) VALUES (?, ?, ?, ?, ?)")) { - statement.setInt(1, habbo.getHabboInfo().getId()); - statement.setInt(2, campaign.getId()); - statement.setInt(3, day); - statement.setInt(4, object.getId()); - statement.setInt(5, Emulator.getIntUnixTimestamp()); - statement.execute(); - } catch (SQLException e) { - LOGGER.error("Caught SQL exception", e); - } - } + try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("INSERT INTO calendar_rewards_claimed (user_id, campaign_id, day, reward_id, timestamp) VALUES (?, ?, ?, ?, ?)")) { + statement.setInt(1, habbo.getHabboInfo().getId()); + statement.setInt(2, campaign.getId()); + statement.setInt(3, day); + statement.setInt(4, object.getId()); + statement.setInt(5, Emulator.getIntUnixTimestamp()); + statement.execute(); + } catch (SQLException e) { + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarRewardClaimed.java b/src/main/java/com/eu/habbo/habbohotel/campaign/CalendarRewardClaimed.java similarity index 96% rename from src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarRewardClaimed.java rename to src/main/java/com/eu/habbo/habbohotel/campaign/CalendarRewardClaimed.java index 7b6a1837..96f0c0d9 100644 --- a/src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarRewardClaimed.java +++ b/src/main/java/com/eu/habbo/habbohotel/campaign/CalendarRewardClaimed.java @@ -1,4 +1,4 @@ -package com.eu.habbo.habbohotel.campaign.calendar; +package com.eu.habbo.habbohotel.campaign; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarRewardObject.java b/src/main/java/com/eu/habbo/habbohotel/campaign/CalendarRewardObject.java similarity index 98% rename from src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarRewardObject.java rename to src/main/java/com/eu/habbo/habbohotel/campaign/CalendarRewardObject.java index 49693f4c..90f92e6b 100644 --- a/src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarRewardObject.java +++ b/src/main/java/com/eu/habbo/habbohotel/campaign/CalendarRewardObject.java @@ -1,4 +1,4 @@ -package com.eu.habbo.habbohotel.campaign.calendar; +package com.eu.habbo.habbohotel.campaign; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.items.Item; diff --git a/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java b/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java index 32b85ed2..9145887a 100644 --- a/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java @@ -50,139 +50,7 @@ public class CatalogManager { private static final Logger LOGGER = LoggerFactory.getLogger(CatalogManager.class); - public static final THashMap> pageDefinitions = new THashMap>(CatalogPageLayouts.values().length) { - { - for (CatalogPageLayouts layout : CatalogPageLayouts.values()) { - switch (layout) { - case frontpage: - this.put(layout.name().toLowerCase(), FrontpageLayout.class); - break; - case badge_display: - this.put(layout.name().toLowerCase(), BadgeDisplayLayout.class); - break; - case spaces_new: - this.put(layout.name().toLowerCase(), SpacesLayout.class); - break; - case trophies: - this.put(layout.name().toLowerCase(), TrophiesLayout.class); - break; - case bots: - this.put(layout.name().toLowerCase(), BotsLayout.class); - break; - case club_buy: - this.put(layout.name().toLowerCase(), ClubBuyLayout.class); - break; - case club_gift: - this.put(layout.name().toLowerCase(), ClubGiftsLayout.class); - break; - case sold_ltd_items: - this.put(layout.name().toLowerCase(), SoldLTDItemsLayout.class); - break; - case single_bundle: - this.put(layout.name().toLowerCase(), SingleBundle.class); - break; - case roomads: - this.put(layout.name().toLowerCase(), RoomAdsLayout.class); - break; - case recycler: - if (Emulator.getConfig().getBoolean("hotel.ecotron.enabled")) - this.put(layout.name().toLowerCase(), RecyclerLayout.class); - break; - case recycler_info: - if (Emulator.getConfig().getBoolean("hotel.ecotron.enabled")) - this.put(layout.name().toLowerCase(), RecyclerInfoLayout.class); - case recycler_prizes: - if (Emulator.getConfig().getBoolean("hotel.ecotron.enabled")) - this.put(layout.name().toLowerCase(), RecyclerPrizesLayout.class); - break; - case marketplace: - if (Emulator.getConfig().getBoolean("hotel.marketplace.enabled")) - this.put(layout.name().toLowerCase(), MarketplaceLayout.class); - break; - case marketplace_own_items: - if (Emulator.getConfig().getBoolean("hotel.marketplace.enabled")) - this.put(layout.name().toLowerCase(), MarketplaceOwnItems.class); - break; - case info_duckets: - this.put(layout.name().toLowerCase(), InfoDucketsLayout.class); - break; - case info_pets: - this.put(layout.name().toLowerCase(), InfoPetsLayout.class); - break; - case info_rentables: - this.put(layout.name().toLowerCase(), InfoRentablesLayout.class); - break; - case info_loyalty: - this.put(layout.name().toLowerCase(), InfoLoyaltyLayout.class); - break; - case loyalty_vip_buy: - this.put(layout.name().toLowerCase(), LoyaltyVipBuyLayout.class); - break; - case guilds: - this.put(layout.name().toLowerCase(), GuildFrontpageLayout.class); - break; - case guild_furni: - this.put(layout.name().toLowerCase(), GuildFurnitureLayout.class); - break; - case guild_forum: - this.put(layout.name().toLowerCase(), GuildForumLayout.class); - break; - case pets: - this.put(layout.name().toLowerCase(), PetsLayout.class); - break; - case pets2: - this.put(layout.name().toLowerCase(), Pets2Layout.class); - break; - case pets3: - this.put(layout.name().toLowerCase(), Pets3Layout.class); - break; - case soundmachine: - this.put(layout.name().toLowerCase(), TraxLayout.class); - break; - case default_3x3_color_grouping: - this.put(layout.name().toLowerCase(), ColorGroupingLayout.class); - break; - case recent_purchases: - this.put(layout.name().toLowerCase(), RecentPurchasesLayout.class); - break; - case room_bundle: - this.put(layout.name().toLowerCase(), RoomBundleLayout.class); - break; - case petcustomization: - this.put(layout.name().toLowerCase(), PetCustomizationLayout.class); - break; - case vip_buy: - this.put(layout.name().toLowerCase(), VipBuyLayout.class); - break; - case frontpage_featured: - this.put(layout.name().toLowerCase(), FrontPageFeaturedLayout.class); - break; - case builders_club_addons: - this.put(layout.name().toLowerCase(), BuildersClubAddonsLayout.class); - break; - case builders_club_frontpage: - this.put(layout.name().toLowerCase(), BuildersClubFrontPageLayout.class); - break; - case builders_club_loyalty: - this.put(layout.name().toLowerCase(), BuildersClubLoyaltyLayout.class); - break; - case monkey: - this.put(layout.name().toLowerCase(), InfoMonkeyLayout.class); - break; - case niko: - this.put(layout.name().toLowerCase(), InfoNikoLayout.class); - break; - case mad_money: - this.put(layout.name().toLowerCase(), MadMoneyLayout.class); - break; - case default_3x3: - default: - this.put("default_3x3", Default_3x3Layout.class); - break; - } - } - } - }; + public static final THashMap> pageDefinitions = new THashMap<>(); public static int catalogItemAmount; public static int PURCHASE_COOLDOWN = 1; public static boolean SORT_USING_ORDERNUM = false; @@ -214,7 +82,6 @@ public class CatalogManager { this.offerDefs = new TIntIntHashMap(); this.vouchers = new ArrayList<>(); this.limitedNumbers = new THashMap<>(); - this.initialize(); this.ecotronItem = Emulator.getGameEnvironment().getItemManager().getItem("ecotron_box"); @@ -225,7 +92,7 @@ public class CatalogManager { public synchronized void initialize() { Emulator.getPluginManager().fireEvent(new EmulatorLoadCatalogManagerEvent()); - + this.loadPageDefinitions(); this.loadLimitedNumbers(); this.loadCatalogPages(); this.loadCatalogFeaturedPages(); @@ -238,6 +105,139 @@ public class CatalogManager { this.loadGiftWrappers(); } + private synchronized void loadPageDefinitions() { + for (CatalogPageLayouts layout : CatalogPageLayouts.values()) { + switch (layout) { + case frontpage: + pageDefinitions.put(layout.name().toLowerCase(), FrontpageLayout.class); + break; + case badge_display: + pageDefinitions.put(layout.name().toLowerCase(), BadgeDisplayLayout.class); + break; + case spaces_new: + pageDefinitions.put(layout.name().toLowerCase(), SpacesLayout.class); + break; + case trophies: + pageDefinitions.put(layout.name().toLowerCase(), TrophiesLayout.class); + break; + case bots: + pageDefinitions.put(layout.name().toLowerCase(), BotsLayout.class); + break; + case club_buy: + pageDefinitions.put(layout.name().toLowerCase(), ClubBuyLayout.class); + break; + case club_gift: + pageDefinitions.put(layout.name().toLowerCase(), ClubGiftsLayout.class); + break; + case sold_ltd_items: + pageDefinitions.put(layout.name().toLowerCase(), SoldLTDItemsLayout.class); + break; + case single_bundle: + pageDefinitions.put(layout.name().toLowerCase(), SingleBundle.class); + break; + case roomads: + pageDefinitions.put(layout.name().toLowerCase(), RoomAdsLayout.class); + break; + case recycler: + if (Emulator.getConfig().getBoolean("hotel.ecotron.enabled")) + pageDefinitions.put(layout.name().toLowerCase(), RecyclerLayout.class); + break; + case recycler_info: + if (Emulator.getConfig().getBoolean("hotel.ecotron.enabled")) + pageDefinitions.put(layout.name().toLowerCase(), RecyclerInfoLayout.class); + break; + case recycler_prizes: + if (Emulator.getConfig().getBoolean("hotel.ecotron.enabled")) + pageDefinitions.put(layout.name().toLowerCase(), RecyclerPrizesLayout.class); + break; + case marketplace: + if (Emulator.getConfig().getBoolean("hotel.marketplace.enabled")) + pageDefinitions.put(layout.name().toLowerCase(), MarketplaceLayout.class); + break; + case marketplace_own_items: + if (Emulator.getConfig().getBoolean("hotel.marketplace.enabled")) + pageDefinitions.put(layout.name().toLowerCase(), MarketplaceOwnItems.class); + break; + case info_duckets: + pageDefinitions.put(layout.name().toLowerCase(), InfoDucketsLayout.class); + break; + case info_pets: + pageDefinitions.put(layout.name().toLowerCase(), InfoPetsLayout.class); + break; + case info_rentables: + pageDefinitions.put(layout.name().toLowerCase(), InfoRentablesLayout.class); + break; + case info_loyalty: + pageDefinitions.put(layout.name().toLowerCase(), InfoLoyaltyLayout.class); + break; + case loyalty_vip_buy: + pageDefinitions.put(layout.name().toLowerCase(), LoyaltyVipBuyLayout.class); + break; + case guilds: + pageDefinitions.put(layout.name().toLowerCase(), GuildFrontpageLayout.class); + break; + case guild_furni: + pageDefinitions.put(layout.name().toLowerCase(), GuildFurnitureLayout.class); + break; + case guild_forum: + pageDefinitions.put(layout.name().toLowerCase(), GuildForumLayout.class); + break; + case pets: + pageDefinitions.put(layout.name().toLowerCase(), PetsLayout.class); + break; + case pets2: + pageDefinitions.put(layout.name().toLowerCase(), Pets2Layout.class); + break; + case pets3: + pageDefinitions.put(layout.name().toLowerCase(), Pets3Layout.class); + break; + case soundmachine: + pageDefinitions.put(layout.name().toLowerCase(), TraxLayout.class); + break; + case default_3x3_color_grouping: + pageDefinitions.put(layout.name().toLowerCase(), ColorGroupingLayout.class); + break; + case recent_purchases: + pageDefinitions.put(layout.name().toLowerCase(), RecentPurchasesLayout.class); + break; + case room_bundle: + pageDefinitions.put(layout.name().toLowerCase(), RoomBundleLayout.class); + break; + case petcustomization: + pageDefinitions.put(layout.name().toLowerCase(), PetCustomizationLayout.class); + break; + case vip_buy: + pageDefinitions.put(layout.name().toLowerCase(), VipBuyLayout.class); + break; + case frontpage_featured: + pageDefinitions.put(layout.name().toLowerCase(), FrontPageFeaturedLayout.class); + break; + case builders_club_addons: + pageDefinitions.put(layout.name().toLowerCase(), BuildersClubAddonsLayout.class); + break; + case builders_club_frontpage: + pageDefinitions.put(layout.name().toLowerCase(), BuildersClubFrontPageLayout.class); + break; + case builders_club_loyalty: + pageDefinitions.put(layout.name().toLowerCase(), BuildersClubLoyaltyLayout.class); + break; + case monkey: + pageDefinitions.put(layout.name().toLowerCase(), InfoMonkeyLayout.class); + break; + case niko: + pageDefinitions.put(layout.name().toLowerCase(), InfoNikoLayout.class); + break; + case mad_money: + pageDefinitions.put(layout.name().toLowerCase(), MadMoneyLayout.class); + break; + case default_3x3: + default: + pageDefinitions.put("default_3x3", Default_3x3Layout.class); + break; + } + } + } + private synchronized void loadLimitedNumbers() { this.limitedNumbers.clear(); diff --git a/src/main/java/com/eu/habbo/habbohotel/catalog/ClubOffer.java b/src/main/java/com/eu/habbo/habbohotel/catalog/ClubOffer.java index 3be967be..b7654416 100644 --- a/src/main/java/com/eu/habbo/habbohotel/catalog/ClubOffer.java +++ b/src/main/java/com/eu/habbo/habbohotel/catalog/ClubOffer.java @@ -92,7 +92,7 @@ public class ClubOffer implements ISerialize { message.appendInt(this.pointsType); message.appendBoolean(this.vip); - long seconds = this.days * 86400; + long seconds = this.days * 86400L; long secondsTotal = seconds; @@ -103,7 +103,7 @@ public class ClubOffer implements ISerialize { seconds -= totalMonths * (86400 * 31); int totalDays = (int) Math.floor((int) seconds / 86400.0); - seconds -= totalDays * 86400; + seconds -= totalDays * 86400L; message.appendInt((int) secondsTotal / 86400 / 31); message.appendInt((int) seconds); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/CalendarCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/CalendarCommand.java index 0732c15b..d1a06d2a 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/CalendarCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/CalendarCommand.java @@ -1,7 +1,7 @@ package com.eu.habbo.habbohotel.commands; import com.eu.habbo.Emulator; -import com.eu.habbo.habbohotel.campaign.calendar.CalendarCampaign; +import com.eu.habbo.habbohotel.campaign.CalendarCampaign; import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.messages.outgoing.events.calendar.CampaignCalendarDataMessageComposer; import com.eu.habbo.messages.outgoing.habboway.nux.InClientLinkMessageComposer; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/PullCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/PullCommand.java index 497bc4c4..f1f49c67 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/PullCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/PullCommand.java @@ -16,37 +16,35 @@ public class PullCommand extends Command { @Override public boolean handle(GameClient gameClient, String[] params) throws Exception { - if (params.length == 2) { - Habbo habbo = gameClient.getHabbo().getHabboInfo().getCurrentRoom().getHabbo(params[1]); + if (params.length != 2) return true; + Habbo habbo = gameClient.getHabbo().getHabboInfo().getCurrentRoom().getHabbo(params[1]); - if (habbo == null) { - gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_pull.not_found").replace("%user%", params[1]), RoomChatMessageBubbles.ALERT); - return true; - } else if (habbo == gameClient.getHabbo()) { - gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_pull.pull_self"), RoomChatMessageBubbles.ALERT); - return true; - } else { - int distanceX = habbo.getRoomUnit().getX() - gameClient.getHabbo().getRoomUnit().getX(); - int distanceY = habbo.getRoomUnit().getY() - gameClient.getHabbo().getRoomUnit().getY(); - - if (distanceX < -2 || distanceX > 2 || distanceY < -2 || distanceY > 2) { - gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_pull.cant_reach").replace("%user%", params[1]), RoomChatMessageBubbles.ALERT); - return true; - } else { - RoomTile tile = gameClient.getHabbo().getHabboInfo().getCurrentRoom().getLayout().getTileInFront(gameClient.getHabbo().getRoomUnit().getCurrentLocation(), gameClient.getHabbo().getRoomUnit().getBodyRotation().getValue()); - - if (tile != null && tile.isWalkable()) { - if (gameClient.getHabbo().getHabboInfo().getCurrentRoom().getLayout().getDoorTile() == tile) { - gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_pull.invalid").replace("%username%", params[1])); - return true; - } - habbo.getRoomUnit().setGoalLocation(tile); - gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new ChatMessageComposer(new RoomChatMessage(Emulator.getTexts().getValue("commands.succes.cmd_pull.pull").replace("%user%", params[1]).replace("%gender_name%", (gameClient.getHabbo().getHabboInfo().getGender().equals(HabboGender.M) ? Emulator.getTexts().getValue("gender.him") : Emulator.getTexts().getValue("gender.her"))), gameClient.getHabbo(), gameClient.getHabbo(), RoomChatMessageBubbles.NORMAL)).compose()); - } - } - } + if (habbo == null) { + gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_pull.not_found").replace("%user%", params[1]), RoomChatMessageBubbles.ALERT); return true; } + if (habbo == gameClient.getHabbo()) { + gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_pull.pull_self"), RoomChatMessageBubbles.ALERT); + return true; + } + int distanceX = habbo.getRoomUnit().getX() - gameClient.getHabbo().getRoomUnit().getX(); + int distanceY = habbo.getRoomUnit().getY() - gameClient.getHabbo().getRoomUnit().getY(); + + if (distanceX < -2 || distanceX > 2 || distanceY < -2 || distanceY > 2) { + gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_pull.cant_reach").replace("%user%", params[1]), RoomChatMessageBubbles.ALERT); + return true; + } + RoomTile tile = gameClient.getHabbo().getHabboInfo().getCurrentRoom().getLayout().getTileInFront(gameClient.getHabbo().getRoomUnit().getCurrentLocation(), gameClient.getHabbo().getRoomUnit().getBodyRotation().getValue()); + + if (tile != null && tile.isWalkable()) { + if (gameClient.getHabbo().getHabboInfo().getCurrentRoom().getLayout().getDoorTile() == tile) { + gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_pull.invalid").replace("%username%", params[1])); + return true; + } + habbo.getRoomUnit().setGoalLocation(tile); + gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new ChatMessageComposer(new RoomChatMessage(Emulator.getTexts().getValue("commands.succes.cmd_pull.pull").replace("%user%", params[1]).replace("%gender_name%", (gameClient.getHabbo().getHabboInfo().getGender().equals(HabboGender.M) ? Emulator.getTexts().getValue("gender.him") : Emulator.getTexts().getValue("gender.her"))), gameClient.getHabbo(), gameClient.getHabbo(), RoomChatMessageBubbles.NORMAL)).compose()); + } + return true; } diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/PushCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/PushCommand.java index f8fcd57b..5e041f3a 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/PushCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/PushCommand.java @@ -16,39 +16,38 @@ public class PushCommand extends Command { @Override public boolean handle(GameClient gameClient, String[] params) throws Exception { - if (params.length == 2) { - Habbo habbo = gameClient.getHabbo().getHabboInfo().getCurrentRoom().getHabbo(params[1]); + if (params.length != 2) return true; - if (habbo == null) { - gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_push.not_found").replace("%user%", params[1]), RoomChatMessageBubbles.ALERT); - return true; - } else if (habbo == gameClient.getHabbo()) { - gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_push.push_self"), RoomChatMessageBubbles.ALERT); - return true; - } else { - RoomTile tFront = gameClient.getHabbo().getHabboInfo().getCurrentRoom().getLayout().getTileInFront(gameClient.getHabbo().getRoomUnit().getCurrentLocation(), gameClient.getHabbo().getRoomUnit().getBodyRotation().getValue()); + Habbo habbo = gameClient.getHabbo().getHabboInfo().getCurrentRoom().getHabbo(params[1]); - if (tFront != null && tFront.isWalkable()) { - if (tFront.x == habbo.getRoomUnit().getX() && tFront.y == habbo.getRoomUnit().getY()) { - RoomTile tFrontTarget = gameClient.getHabbo().getHabboInfo().getCurrentRoom().getLayout().getTileInFront(habbo.getRoomUnit().getCurrentLocation(), gameClient.getHabbo().getRoomUnit().getBodyRotation().getValue()); - - if (tFrontTarget != null && tFrontTarget.isWalkable()) { - if (gameClient.getHabbo().getHabboInfo().getCurrentRoom().getLayout().getDoorTile() == tFrontTarget) { - gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_push.invalid").replace("%username%", params[1])); - return true; - } - habbo.getRoomUnit().setGoalLocation(tFrontTarget); - gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new ChatMessageComposer(new RoomChatMessage(Emulator.getTexts().getValue("commands.succes.cmd_push.push").replace("%user%", params[1]).replace("%gender_name%", (gameClient.getHabbo().getHabboInfo().getGender().equals(HabboGender.M) ? Emulator.getTexts().getValue("gender.him") : Emulator.getTexts().getValue("gender.her"))), gameClient.getHabbo(), gameClient.getHabbo(), RoomChatMessageBubbles.NORMAL)).compose()); - } - } else { - gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_push.cant_reach").replace("%user%", params[1]), RoomChatMessageBubbles.ALERT); - return true; - } - } - } + if (habbo == null) { + gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_push.not_found").replace("%user%", params[1]), RoomChatMessageBubbles.ALERT); return true; } + if (habbo == gameClient.getHabbo()) { + gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_push.push_self"), RoomChatMessageBubbles.ALERT); + return true; + } + RoomTile tFront = gameClient.getHabbo().getHabboInfo().getCurrentRoom().getLayout().getTileInFront(gameClient.getHabbo().getRoomUnit().getCurrentLocation(), gameClient.getHabbo().getRoomUnit().getBodyRotation().getValue()); + + if (tFront != null && tFront.isWalkable() && tFront.x == habbo.getRoomUnit().getX() && tFront.y == habbo.getRoomUnit().getY()) { + RoomTile tFrontTarget = gameClient.getHabbo().getHabboInfo().getCurrentRoom().getLayout().getTileInFront(habbo.getRoomUnit().getCurrentLocation(), gameClient.getHabbo().getRoomUnit().getBodyRotation().getValue()); + + if (tFrontTarget != null && tFrontTarget.isWalkable()) { + if (gameClient.getHabbo().getHabboInfo().getCurrentRoom().getLayout().getDoorTile() == tFrontTarget) { + gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_push.invalid").replace("%username%", params[1])); + return true; + } + habbo.getRoomUnit().setGoalLocation(tFrontTarget); + gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new ChatMessageComposer(new RoomChatMessage(Emulator.getTexts().getValue("commands.succes.cmd_push.push").replace("%user%", params[1]).replace("%gender_name%", (gameClient.getHabbo().getHabboInfo().getGender().equals(HabboGender.M) ? Emulator.getTexts().getValue("gender.him") : Emulator.getTexts().getValue("gender.her"))), gameClient.getHabbo(), gameClient.getHabbo(), RoomChatMessageBubbles.NORMAL)).compose()); + } + } else { + gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_push.cant_reach").replace("%user%", params[1]), RoomChatMessageBubbles.ALERT); + return true; + } + + return true; } } diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/ShutdownCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/ShutdownCommand.java index 25194479..2aab18d3 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/ShutdownCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/ShutdownCommand.java @@ -25,7 +25,7 @@ public class ShutdownCommand extends Command { } else { if (params.length == 2) { try { - minutes = Integer.valueOf(params[1]); + minutes = Integer.parseInt(params[1]); } catch (Exception e) { reason = new StringBuilder(params[1]); } @@ -44,7 +44,7 @@ public class ShutdownCommand extends Command { } RoomTrade.TRADING_ENABLED = false; ShutdownEmulator.timestamp = Emulator.getIntUnixTimestamp() + (60 * minutes); - Emulator.getThreading().run(new ShutdownEmulator(message), minutes * 60 * 1000); + Emulator.getThreading().run(new ShutdownEmulator(message), (long) minutes * 60 * 1000); return true; } } diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/SoftKickCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/SoftKickCommand.java index b841b945..5b0fddcd 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/SoftKickCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/SoftKickCommand.java @@ -14,12 +14,11 @@ public class SoftKickCommand extends Command { @Override public boolean handle(GameClient gameClient, String[] params) throws Exception { - if (params.length == 2) { - final String username = params[1]; - final Habbo habbo = gameClient.getHabbo().getHabboInfo().getCurrentRoom().getHabbo(username); + if (params.length != 2) return true; + final Habbo habbo = gameClient.getHabbo().getHabboInfo().getCurrentRoom().getHabbo(params[1]); if (habbo == null) { - gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.keys.cmd_softkick_error").replace("%user%", username), RoomChatMessageBubbles.ALERT); + gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.keys.cmd_softkick_error").replace("%user%", params[1]), RoomChatMessageBubbles.ALERT); return true; } @@ -30,12 +29,9 @@ public class SoftKickCommand extends Command { final Room room = gameClient.getHabbo().getHabboInfo().getCurrentRoom(); - if (room != null) { - if (!(habbo.hasPermission(Permission.ACC_UNKICKABLE) || habbo.hasPermission(Permission.ACC_SUPPORTTOOL) || room.isOwner(habbo))) { + if (room != null && (!(habbo.hasPermission(Permission.ACC_UNKICKABLE) || habbo.hasPermission(Permission.ACC_SUPPORTTOOL) || room.isOwner(habbo)))) { room.kickHabbo(habbo, false); } - } - } - return true; + return true; } } diff --git a/src/main/java/com/eu/habbo/habbohotel/games/freeze/FreezeGame.java b/src/main/java/com/eu/habbo/habbohotel/games/freeze/FreezeGame.java index 993e2457..1f341d45 100644 --- a/src/main/java/com/eu/habbo/habbohotel/games/freeze/FreezeGame.java +++ b/src/main/java/com/eu/habbo/habbohotel/games/freeze/FreezeGame.java @@ -255,7 +255,7 @@ public class FreezeGame extends Game { scoreboard.setExtradata("0"); } - int oldScore = Integer.valueOf(scoreboard.getExtradata()); + int oldScore = Integer.parseInt(scoreboard.getExtradata()); if (oldScore == totalScore) continue; diff --git a/src/main/java/com/eu/habbo/habbohotel/games/freeze/FreezeGamePlayer.java b/src/main/java/com/eu/habbo/habbohotel/games/freeze/FreezeGamePlayer.java index a701a023..1b736b98 100644 --- a/src/main/java/com/eu/habbo/habbohotel/games/freeze/FreezeGamePlayer.java +++ b/src/main/java/com/eu/habbo/habbohotel/games/freeze/FreezeGamePlayer.java @@ -38,7 +38,7 @@ public class FreezeGamePlayer extends GamePlayer { } @Override - public void addScore(int amount) { + public synchronized void addScore(int amount) { super.addScore(amount); if (amount > 0) { @@ -122,10 +122,7 @@ public class FreezeGamePlayer extends GamePlayer { } public boolean canGetFrozen() { - if (this.isFrozen() || this.isProtected()) - return false; - - return true; + return !this.isFrozen() && !this.isProtected(); } public void addProtection() { diff --git a/src/main/java/com/eu/habbo/habbohotel/guides/GuardianTicket.java b/src/main/java/com/eu/habbo/habbohotel/guides/GuardianTicket.java index a0cbd115..4e2caa19 100644 --- a/src/main/java/com/eu/habbo/habbohotel/guides/GuardianTicket.java +++ b/src/main/java/com/eu/habbo/habbohotel/guides/GuardianTicket.java @@ -22,7 +22,7 @@ public class GuardianTicket { private final Habbo reporter; private final Habbo reported; private final Date date; - private ArrayList chatLogs; + private final ArrayList chatLogs; private GuardianVoteType verdict; private int timeLeft = 120; private int resendCount = 0; @@ -45,7 +45,7 @@ public class GuardianTicket { this.votes.put(guardian, new GuardianVote(this.guardianCount, guardian)); - Emulator.getThreading().run(new GuardianNotAccepted(this, guardian), Emulator.getConfig().getInt("guardians.accept.timer") * 1000); + Emulator.getThreading().run(new GuardianNotAccepted(this, guardian), Emulator.getConfig().getInt("guardians.accept.timer") * 1000L); } diff --git a/src/main/java/com/eu/habbo/habbohotel/guides/GuardianVote.java b/src/main/java/com/eu/habbo/habbohotel/guides/GuardianVote.java index 0066bc33..6c7dc673 100644 --- a/src/main/java/com/eu/habbo/habbohotel/guides/GuardianVote.java +++ b/src/main/java/com/eu/habbo/habbohotel/guides/GuardianVote.java @@ -29,6 +29,11 @@ public class GuardianVote implements Comparable { return false; } + @Override + public int hashCode() { + return this.id; + } + public void ignore() { this.ignore = true; } diff --git a/src/main/java/com/eu/habbo/habbohotel/guilds/GuildManager.java b/src/main/java/com/eu/habbo/habbohotel/guilds/GuildManager.java index eebd19a8..b93c75de 100644 --- a/src/main/java/com/eu/habbo/habbohotel/guilds/GuildManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/guilds/GuildManager.java @@ -185,7 +185,7 @@ public class GuildManager { } - public void joinGuild(Guild guild, GameClient client, int userId, boolean acceptRequest) { + public boolean joinGuild(Guild guild, GameClient client, int userId, boolean acceptRequest) { boolean error = false; try (Connection connection = Emulator.getDatabase().getDataSource().getConnection()) { try (PreparedStatement statement = connection.prepareStatement("SELECT COUNT(id) as total FROM guilds_members WHERE user_id = ?")) { @@ -282,6 +282,8 @@ public class GuildManager { } catch (SQLException e) { LOGGER.error("Caught SQL exception", e); } + + return !error; } diff --git a/src/main/java/com/eu/habbo/habbohotel/guilds/GuildMember.java b/src/main/java/com/eu/habbo/habbohotel/guilds/GuildMember.java index 173bed2f..5b0d9ee3 100644 --- a/src/main/java/com/eu/habbo/habbohotel/guilds/GuildMember.java +++ b/src/main/java/com/eu/habbo/habbohotel/guilds/GuildMember.java @@ -3,9 +3,9 @@ package com.eu.habbo.habbohotel.guilds; import java.sql.ResultSet; import java.sql.SQLException; -public class GuildMember implements Comparable { - private int userId; - private String username; +public class GuildMember implements Comparable { + private final int userId; + private final String username; private String look; private int joinDate; private GuildRank rank; @@ -59,8 +59,22 @@ public class GuildMember implements Comparable { } @Override - public int compareTo(Object o) { - return 0; + public int compareTo(GuildMember o) { + return this.userId - o.userId; + } + + @Override + public boolean equals(Object o) { + if (o instanceof GuildMember) { + return ((GuildMember) o).userId == this.userId && ((GuildMember) o).joinDate == this.joinDate && ((GuildMember) o).rank == this.rank; + } + + return false; + } + + @Override + public int hashCode() { + return this.userId; } public GuildMembershipStatus getMembershipStatus() { diff --git a/src/main/java/com/eu/habbo/habbohotel/guilds/forums/ForumThread.java b/src/main/java/com/eu/habbo/habbohotel/guilds/forums/ForumThread.java index f4325c0d..a65eb87b 100644 --- a/src/main/java/com/eu/habbo/habbohotel/guilds/forums/ForumThread.java +++ b/src/main/java/com/eu/habbo/habbohotel/guilds/forums/ForumThread.java @@ -123,13 +123,13 @@ public class ForumThread implements Runnable, ISerialize { THashSet threads = null; if (guildThreadsCache.containsKey(guildId)) { - guildThreadsCache.get(guildId); + threads = guildThreadsCache.get(guildId); } if (threads != null) return threads; - threads = new THashSet(); + threads = new THashSet<>(); guildThreadsCache.put(guildId, threads); @@ -141,8 +141,8 @@ public class ForumThread implements Runnable, ISerialize { "WHERE `id` IN (" + "SELECT MAX(id) " + "FROM `guilds_forums_comments` B " + - "GROUP BY `thread_id` " + - "ORDER BY B.`id` ASC " + + "GROUP BY `thread_id` AND B.`id` " + + "ORDER BY B.`id` " + ") " + "ORDER BY `id` DESC " + ") B ON A.`id` = B.`thread_id` " + @@ -154,9 +154,7 @@ public class ForumThread implements Runnable, ISerialize { try (ResultSet set = statement.executeQuery()) { while (set.next()) { ForumThread thread = new ForumThread(set); - synchronized (threads) { threads.add(thread); - } cacheThread(thread); } } @@ -182,8 +180,8 @@ public class ForumThread implements Runnable, ISerialize { "WHERE `id` IN (" + "SELECT MAX(id) " + "FROM `guilds_forums_comments` B " + - "GROUP BY `thread_id` " + - "ORDER BY B.`id` ASC " + + "GROUP BY `thread_id` AND b.`id`" + + "ORDER BY B.`id` " + ") " + "ORDER BY `id` DESC " + ") B ON A.`id` = B.`thread_id` " + @@ -219,10 +217,7 @@ public class ForumThread implements Runnable, ISerialize { guildThreadsCache.put(thread.guildId, guildThreads); } } - - synchronized (guildThreads) { guildThreads.add(thread); - } } public static void clearCache() { diff --git a/src/main/java/com/eu/habbo/habbohotel/items/YoutubeManager.java b/src/main/java/com/eu/habbo/habbohotel/items/YoutubeManager.java index a383541a..3672c6fd 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/YoutubeManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/YoutubeManager.java @@ -15,7 +15,10 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.net.URL; -import java.sql.*; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; import java.time.Duration; import java.util.ArrayList; import java.util.concurrent.ExecutorService; @@ -118,19 +121,20 @@ public class YoutubeManager { youtubeDataLoaderPool.shutdown(); try { - youtubeDataLoaderPool.awaitTermination(60, TimeUnit.SECONDS); + if(!youtubeDataLoaderPool.awaitTermination(60, TimeUnit.SECONDS)) + LOGGER.error("Youtube Manager -> Failed, timeout elapsed before termination!"); } catch (InterruptedException e) { - e.printStackTrace(); + LOGGER.error("Caught Exception", e); + Thread.currentThread().interrupt(); + } finally { + LOGGER.info("YouTube Manager -> Loaded! (" + (System.currentTimeMillis() - millis) + " MS)"); } - - LOGGER.info("YouTube Manager -> Loaded! (" + (System.currentTimeMillis() - millis) + " MS)"); }); } public YoutubePlaylist getPlaylistDataById(String playlistId) throws IOException { if (this.playlistCache.containsKey(playlistId)) return this.playlistCache.get(playlistId); - if(apiKey.isEmpty()) return null; - + if (apiKey.isEmpty()) return null; YoutubePlaylist playlist; URL playlistInfo = new URL("https://youtube.googleapis.com/youtube/v3/playlists?part=snippet&id=" + playlistId + "&maxResults=1&key=" + apiKey); HttpsURLConnection playlistCon = (HttpsURLConnection) playlistInfo.openConnection(); diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionBuildArea.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionBuildArea.java index 8d5b13fd..a67103b8 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionBuildArea.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionBuildArea.java @@ -10,8 +10,8 @@ import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboInfo; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.users.HabboManager; -import com.eu.habbo.messages.outgoing.rooms.items.RemoveFloorItemComposer; import com.eu.habbo.messages.outgoing.rooms.items.ObjectsMessageComposer; +import com.eu.habbo.messages.outgoing.rooms.items.RemoveFloorItemComposer; import gnu.trove.TCollections; import gnu.trove.map.TIntObjectMap; import gnu.trove.map.hash.THashMap; @@ -24,37 +24,29 @@ import java.util.ArrayList; import java.util.Arrays; public class InteractionBuildArea extends InteractionCustomValues { - public static THashMap defaultValues = new THashMap() { - { - this.put("tilesLeft", "0"); - } + protected static final THashMap defaultValues = new THashMap(); - { - this.put("tilesRight", "0"); - } - - { - this.put("tilesFront", "0"); - } - - { - this.put("tilesBack", "0"); - } - - { - this.put("builders", ""); - } - }; - - private THashSet tiles; + private final THashSet tiles; public InteractionBuildArea(ResultSet set, Item baseItem) throws SQLException { super(set, baseItem, defaultValues); + defaultValues.put("tilesLeft", "0"); + defaultValues.put("tilesRight", "0"); + defaultValues.put("tilesFront", "0"); + defaultValues.put("tilesBack", "0"); + defaultValues.put("builders", ""); + tiles = new THashSet<>(); } public InteractionBuildArea(int id, int userId, Item item, String extradata, int limitedStack, int limitedSells) { super(id, userId, item, extradata, limitedStack, limitedSells, defaultValues); + defaultValues.put("tilesLeft", "0"); + defaultValues.put("tilesRight", "0"); + defaultValues.put("tilesFront", "0"); + defaultValues.put("tilesBack", "0"); + defaultValues.put("builders", ""); + tiles = new THashSet<>(); } @@ -137,7 +129,7 @@ public class InteractionBuildArea extends InteractionCustomValues { if (!canBuild.isEmpty()) { for (RoomTile tile : oldTiles) { THashSet tileItems = room.getItemsAt(tile); - if(newTiles.contains(tile)) continue; + if (newTiles.contains(tile)) continue; for (HabboItem tileItem : tileItems) { if (canBuild.contains(tileItem.getUserId()) && tileItem != this) { room.pickUpItem(tileItem, null); @@ -223,13 +215,13 @@ public class InteractionBuildArea extends InteractionCustomValues { // show the effect Item effectItem = Emulator.getGameEnvironment().getItemManager().getItem("mutearea_sign2"); - if(effectItem != null) { + if (effectItem != null) { TIntObjectMap ownerNames = TCollections.synchronizedMap(new TIntObjectHashMap<>(0)); ownerNames.put(-1, "System"); THashSet items = new THashSet<>(); int id = 0; - for(RoomTile tile : this.tiles) { + for (RoomTile tile : this.tiles) { id--; HabboItem item = new InteractionDefault(id, -1, effectItem, "1", 0, 0); item.setX(tile.x); @@ -240,14 +232,14 @@ public class InteractionBuildArea extends InteractionCustomValues { client.sendResponse(new ObjectsMessageComposer(ownerNames, items)); Emulator.getThreading().run(() -> { - for(HabboItem item : items) { + for (HabboItem item : items) { client.sendResponse(new RemoveFloorItemComposer(item, true)); } }, 3000); } } - public boolean isBuilder(String Username){ + public boolean isBuilder(String Username) { return Arrays.asList(this.values.get("builders").split(";")).contains(Username); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionTrap.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionTrap.java index cf740699..68dd0eec 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionTrap.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionTrap.java @@ -22,7 +22,8 @@ public class InteractionTrap extends InteractionDefault { @Override public void onWalkOn(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { - if (!this.getExtradata().equals("0")) { + if (this.getExtradata().equals("0") || roomUnit == null || room.getHabbo(roomUnit) == null) return; + Habbo habbo = room.getHabbo(roomUnit); int effect = habbo.getClient().getHabbo().getRoomUnit().getEffectId(); roomUnit.stopWalking(); @@ -33,11 +34,9 @@ public class InteractionTrap extends InteractionDefault { delay = 3000; } - if (roomUnit != null) { if (this.getBaseItem().getEffectF() > 0 || this.getBaseItem().getEffectM() > 0) { if (roomUnit.getRoomUnitType().equals(RoomUnitType.USER)) { - if (habbo != null) { if (habbo.getHabboInfo().getGender().equals(HabboGender.M) && this.getBaseItem().getEffectM() > 0 && habbo.getRoomUnit().getEffectId() != this.getBaseItem().getEffectM()) { room.giveEffect(habbo, this.getBaseItem().getEffectM(), -1); return; @@ -55,11 +54,9 @@ public class InteractionTrap extends InteractionDefault { roomUnit.setCanWalk(true); room.giveEffect(roomUnit, effect, -1); }, delay); - } + } } - } - } } @Override diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionVoteCounter.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionVoteCounter.java index 54ea473b..6c8f1538 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionVoteCounter.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionVoteCounter.java @@ -1,6 +1,5 @@ package com.eu.habbo.habbohotel.items.interactions; -import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.items.Item; import com.eu.habbo.habbohotel.rooms.Room; @@ -18,7 +17,7 @@ public class InteractionVoteCounter extends HabboItem { private boolean frozen; private int votes; - private List votedUsers; + private final List votedUsers; public InteractionVoteCounter(ResultSet set, Item baseItem) throws SQLException { super(set, baseItem); @@ -69,7 +68,7 @@ public class InteractionVoteCounter extends HabboItem { @Override public void onClick(GameClient client, Room room, Object[] objects) throws Exception { - if (!((client != null && room != null && room.hasRights(client.getHabbo())) || (objects.length >= 2 && objects[1] instanceof WiredEffectType))) + if (room == null || !((client != null && room.hasRights(client.getHabbo())) || (objects.length >= 2 && objects[1] instanceof WiredEffectType))) return; this.frozen = !this.frozen; diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionWater.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionWater.java index 7bb2e02f..d2b0f6d2 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionWater.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionWater.java @@ -75,6 +75,7 @@ public class InteractionWater extends InteractionDefault { public void onWalkOn(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { super.onWalkOn(roomUnit, room, objects); + if(roomUnit == null) return; roomUnit.isSwimming = true; Pet pet = room.getPet(roomUnit); diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionWiredHighscore.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionWiredHighscore.java index 6c8be89c..b8a638b2 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionWiredHighscore.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionWiredHighscore.java @@ -36,7 +36,7 @@ public class InteractionWiredHighscore extends HabboItem { try { String name = this.getBaseItem().getName().split("_")[1].toUpperCase().split("\\*")[0]; - int ctype = Integer.valueOf(this.getBaseItem().getName().split("\\*")[1]) - 1; + int ctype = Integer.parseInt(this.getBaseItem().getName().split("\\*")[1]) - 1; this.scoreType = WiredHighscoreScoreType.valueOf(name); this.clearType = WiredHighscoreClearType.values()[ctype]; } catch (Exception e) { @@ -54,7 +54,7 @@ public class InteractionWiredHighscore extends HabboItem { try { String name = this.getBaseItem().getName().split("_")[1].toUpperCase().split("\\*")[0]; - int ctype = Integer.valueOf(this.getBaseItem().getName().split("\\*")[1]) - 1; + int ctype = Integer.parseInt(this.getBaseItem().getName().split("\\*")[1]) - 1; this.scoreType = WiredHighscoreScoreType.valueOf(name); this.clearType = WiredHighscoreClearType.values()[ctype]; } catch (Exception e) { @@ -81,7 +81,7 @@ public class InteractionWiredHighscore extends HabboItem { @Override public void onClick(GameClient client, Room room, Object[] objects) throws Exception { - if (!((client != null && room != null && room.hasRights(client.getHabbo())) || (objects.length >= 2 && objects[1] instanceof WiredEffectType))) + if (room == null || !((client != null && room.hasRights(client.getHabbo())) || (objects.length >= 2 && objects[1] instanceof WiredEffectType))) return; if (this.getExtradata() == null || this.getExtradata().isEmpty() || this.getExtradata().length() == 0) { @@ -89,7 +89,7 @@ public class InteractionWiredHighscore extends HabboItem { } try { - int state = Integer.valueOf(this.getExtradata()); + int state = Integer.parseInt(this.getExtradata()); this.setExtradata(Math.abs(state - 1) + ""); room.updateItem(this); } catch (Exception e) { diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiPuck.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiPuck.java index 67436d2a..da8ccf7d 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiPuck.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiPuck.java @@ -63,8 +63,7 @@ public class InteractionBattleBanzaiPuck extends InteractionPushable { @Override public int getNextRollDelay(int currentStep, int totalSteps) { - int t = 2500; - return (totalSteps == 1) ? 500 : 100 * ((t = t / t - 1) * t * t * t * t + 1) + (currentStep * 100); + return (totalSteps == 1) ? 500 : 100 + (currentStep * 100); } @Override diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/football/InteractionFootball.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/football/InteractionFootball.java index 5274aaca..225ed808 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/football/InteractionFootball.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/football/InteractionFootball.java @@ -167,7 +167,7 @@ public class InteractionFootball extends InteractionPushable { BigDecimal topItemHeight = BigDecimal.valueOf(topItem.getZ() + topItem.getBaseItem().getHeight()); BigDecimal ballHeight = BigDecimal.valueOf(this.getZ()); - if (topItemHeight.subtract(ballHeight).compareTo(new BigDecimal(1.65)) > 0) { + if (topItemHeight.subtract(ballHeight).compareTo(BigDecimal.valueOf(1.65)) > 0) { return false; } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetToy.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetToy.java index 4925e4fe..9cb0c9c1 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetToy.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetToy.java @@ -71,7 +71,7 @@ public class InteractionPetToy extends InteractionDefault { pet.getRoomUnit().clearStatus(); new PetClearPosture(pet, RoomUnitStatus.PLAY, null, true).run(); pet.packetUpdate = true; - }, 2500 + (Emulator.getRandom().nextInt(20) * 500)); + }, ((long)(Emulator.getRandom().nextInt(20) * 500) + 2500)); this.setExtradata("1"); room.updateItemState(this); } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetTree.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetTree.java index 698f480c..35965fe6 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetTree.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetTree.java @@ -1,14 +1,10 @@ package com.eu.habbo.habbohotel.items.interactions.pets; import com.eu.habbo.Emulator; -import com.eu.habbo.habbohotel.bots.Bot; import com.eu.habbo.habbohotel.items.Item; import com.eu.habbo.habbohotel.items.interactions.InteractionDefault; import com.eu.habbo.habbohotel.pets.Pet; -import com.eu.habbo.habbohotel.pets.PetTasks; import com.eu.habbo.habbohotel.rooms.*; -import com.eu.habbo.habbohotel.users.Habbo; -import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.threading.runnables.PetClearPosture; import java.sql.ResultSet; @@ -69,7 +65,7 @@ public class InteractionPetTree extends InteractionDefault { } pet.getRoomUnit().setCanWalk(true); pet.packetUpdate = true; - }, 2500 + (Emulator.getRandom().nextInt(20) * 500)); + }, (long) 2500 + (Emulator.getRandom().nextInt(20) * 500)); } else { pet.getRoomUnit().setRotation(RoomUserRotation.values()[this.getRotation()]); pet.getRoomUnit().clearStatus(); diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/totems/InteractionTotemLegs.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/totems/InteractionTotemLegs.java index d8d83da4..6ae0c802 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/totems/InteractionTotemLegs.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/totems/InteractionTotemLegs.java @@ -51,7 +51,7 @@ public class InteractionTotemLegs extends InteractionDefault { public void onClick(GameClient client, Room room, Object[] objects) throws Exception { super.onClick(client, room, objects); - if (!((client != null && room != null && room.hasRights(client.getHabbo())) || (objects.length >= 2 && objects[1] instanceof WiredEffectType))) + if (room == null || !((client != null && room.hasRights(client.getHabbo())) || (objects.length >= 2 && objects[1] instanceof WiredEffectType))) return; updateHead(room, room.getLayout().getTile(this.getX(), this.getY())); diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectBotTeleport.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectBotTeleport.java index 8087d3b3..3374dc57 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectBotTeleport.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectBotTeleport.java @@ -56,7 +56,7 @@ public class WiredEffectBotTeleport extends InteractionWiredEffect { roomUnit.getRoom().unIdle(roomUnit.getRoom().getHabbo(roomUnit)); room.sendComposer(new AvatarEffectMessageComposer(roomUnit, 4).compose()); - Emulator.getThreading().run(new SendRoomUnitEffectComposer(room, roomUnit), WiredHandler.TELEPORT_DELAY + 1000); + Emulator.getThreading().run(new SendRoomUnitEffectComposer(room, roomUnit), (long) WiredHandler.TELEPORT_DELAY + 1000); if (tile == roomUnit.getCurrentLocation()) { return; @@ -218,14 +218,14 @@ public class WiredEffectBotTeleport extends InteractionWiredEffect { String[] wiredDataSplit = set.getString("wired_data").split("\t"); if (wiredDataSplit.length >= 2) { - this.setDelay(Integer.valueOf(wiredDataSplit[0])); + this.setDelay(Integer.parseInt(wiredDataSplit[0])); String[] data = wiredDataSplit[1].split(";"); if (data.length > 1) { this.botName = data[0]; for (int i = 1; i < data.length; i++) { - HabboItem item = room.getHabboItem(Integer.valueOf(data[i])); + HabboItem item = room.getHabboItem(Integer.parseInt(data[i])); if (item != null) this.items.add(item); diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectTeleport.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectTeleport.java index f794e674..5fa59787 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectTeleport.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectTeleport.java @@ -57,7 +57,7 @@ public class WiredEffectTeleport extends InteractionWiredEffect { roomUnit.getRoom().unIdle(roomUnit.getRoom().getHabbo(roomUnit)); room.sendComposer(new AvatarEffectMessageComposer(roomUnit, 4).compose()); - Emulator.getThreading().run(new SendRoomUnitEffectComposer(room, roomUnit), WiredHandler.TELEPORT_DELAY + 1000); + Emulator.getThreading().run(new SendRoomUnitEffectComposer(room, roomUnit), (long) WiredHandler.TELEPORT_DELAY + 1000); if (tile == roomUnit.getCurrentLocation()) { return; @@ -111,14 +111,11 @@ public class WiredEffectTeleport extends InteractionWiredEffect { message.appendInt(this.getDelay()); if (this.requiresTriggeringUser()) { List invalidTriggers = new ArrayList<>(); - room.getRoomSpecialTypes().getTriggers(this.getX(), this.getY()).forEach(new TObjectProcedure() { - @Override - public boolean execute(InteractionWiredTrigger object) { - if (!object.isTriggeredByRoomUnit()) { - invalidTriggers.add(object.getId()); - } - return true; + room.getRoomSpecialTypes().getTriggers(this.getX(), this.getY()).forEach(object -> { + if (!object.isTriggeredByRoomUnit()) { + invalidTriggers.add(object.getId()); } + return true; }); message.appendInt(invalidTriggers.size()); for (Integer i : invalidTriggers) { diff --git a/src/main/java/com/eu/habbo/habbohotel/pets/PetManager.java b/src/main/java/com/eu/habbo/habbohotel/pets/PetManager.java index f1da909d..592027bf 100644 --- a/src/main/java/com/eu/habbo/habbohotel/pets/PetManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/pets/PetManager.java @@ -15,6 +15,7 @@ import gnu.trove.map.hash.TIntIntHashMap; import gnu.trove.map.hash.TIntObjectHashMap; import gnu.trove.procedure.TIntObjectProcedure; import gnu.trove.set.hash.THashSet; +import org.apache.commons.lang3.EnumUtils; import org.apache.commons.math3.distribution.NormalDistribution; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -142,7 +143,7 @@ public class PetManager { } public static NormalDistribution getNormalDistributionForBreeding(int levelOne, int levelTwo) { - return getNormalDistributionForBreeding((levelOne + levelTwo) / 2); + return getNormalDistributionForBreeding( (levelOne + levelTwo) / 2.0); } public static NormalDistribution getNormalDistributionForBreeding(double avgLevel) { @@ -236,7 +237,7 @@ public class PetManager { while (set.next()) { if (set.getInt("pet_id") >= 0) { if (this.petData.containsKey(set.getInt("pet_id"))) { - PetVocalsType petVocalsType = PetVocalsType.valueOf(set.getString("type").toUpperCase()); + PetVocalsType petVocalsType = EnumUtils.getEnum(PetVocalsType.class, set.getString("type").toUpperCase());; if (petVocalsType != null) { this.petData.get(set.getInt("pet_id")).petVocals.get(petVocalsType).add(new PetVocal(set.getString("message"))); @@ -315,7 +316,7 @@ public class PetManager { } try { - int petId = Integer.valueOf(petName.split("t")[1]); + int petId = Integer.parseInt(petName.split("t")[1]); return this.petRaces.get(petId); } catch (Exception e) { LOGGER.error("Caught exception", e); @@ -333,18 +334,15 @@ public class PetManager { TIntObjectHashMap> offspringList = this.breedingReward.get(pet.getPetData().getType()); - offspringList.forEachEntry(new TIntObjectProcedure>() { - @Override - public boolean execute(int i, ArrayList petBreedingRewards) { - for (PetBreedingReward reward : petBreedingRewards) { - if (reward.breed == pet.getRace()) { - rarityLevel[0] = i; - return false; - } + offspringList.forEachEntry((i, petBreedingRewards) -> { + for (PetBreedingReward reward : petBreedingRewards) { + if (reward.breed == pet.getRace()) { + rarityLevel[0] = i; + return false; } - - return true; } + + return true; }); return 4 - rarityLevel[0]; @@ -399,17 +397,17 @@ public class PetManager { } public Pet createPet(Item item, String name, String race, String color, GameClient client) { - int type = Integer.valueOf(item.getName().toLowerCase().replace("a0 pet", "")); + int type = Integer.parseInt(item.getName().toLowerCase().replace("a0 pet", "")); if (this.petData.containsKey(type)) { Pet pet; if (type == 15) - pet = new HorsePet(type, Integer.valueOf(race), color, name, client.getHabbo().getHabboInfo().getId()); + pet = new HorsePet(type, Integer.parseInt(race), color, name, client.getHabbo().getHabboInfo().getId()); else if (type == 16) pet = this.createMonsterplant(null, client.getHabbo(), false, null, 0); else pet = new Pet(type, - Integer.valueOf(race), + Integer.parseInt(race), color, name, client.getHabbo().getHabboInfo().getId() diff --git a/src/main/java/com/eu/habbo/habbohotel/pets/actions/ActionDown.java b/src/main/java/com/eu/habbo/habbohotel/pets/actions/ActionDown.java index 8e46dc5a..70030307 100644 --- a/src/main/java/com/eu/habbo/habbohotel/pets/actions/ActionDown.java +++ b/src/main/java/com/eu/habbo/habbohotel/pets/actions/ActionDown.java @@ -36,6 +36,6 @@ public class ActionDown extends PetAction { return true; } - return true; + return false; } } diff --git a/src/main/java/com/eu/habbo/habbohotel/pets/actions/ActionJump.java b/src/main/java/com/eu/habbo/habbohotel/pets/actions/ActionJump.java index 05042f21..3d2a1b49 100644 --- a/src/main/java/com/eu/habbo/habbohotel/pets/actions/ActionJump.java +++ b/src/main/java/com/eu/habbo/habbohotel/pets/actions/ActionJump.java @@ -20,7 +20,7 @@ public class ActionJump extends PetAction { @Override public boolean apply(Pet pet, Habbo habbo, String[] data) { - if(pet.findPetItem(PetTasks.JUMP, InteractionPetTrampoline.class)) return true; + if(pet.findPetItem(PetTasks.JUMP, InteractionPetTrampoline.class)) return false; pet.clearPosture(); pet.setTask(PetTasks.JUMP); diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java index 6ba419fb..3ffc601f 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java @@ -33,13 +33,13 @@ import com.eu.habbo.habbohotel.wired.WiredTriggerType; import com.eu.habbo.messages.ISerialize; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; -import com.eu.habbo.messages.outgoing.generic.alerts.HabboBroadcastMessageComposer; import com.eu.habbo.messages.outgoing.generic.alerts.GenericErrorComposer; +import com.eu.habbo.messages.outgoing.generic.alerts.HabboBroadcastMessageComposer; import com.eu.habbo.messages.outgoing.guilds.HabboGroupDetailsMessageComposer; import com.eu.habbo.messages.outgoing.hotelview.CloseConnectionMessageComposer; -import com.eu.habbo.messages.outgoing.inventory.UnseenItemsComposer; -import com.eu.habbo.messages.outgoing.inventory.PetAddedToInventoryComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer; +import com.eu.habbo.messages.outgoing.inventory.PetAddedToInventoryComposer; +import com.eu.habbo.messages.outgoing.inventory.UnseenItemsComposer; import com.eu.habbo.messages.outgoing.polls.infobus.QuestionAnsweredComposer; import com.eu.habbo.messages.outgoing.polls.infobus.QuestionComposer; import com.eu.habbo.messages.outgoing.rooms.*; @@ -2589,7 +2589,7 @@ public class Room implements Comparable, ISerialize, Runnable { } else if (item instanceof InteractionSnowboardSlope) { this.roomSpecialTypes.removeUndefined(item); } else if (item instanceof InteractionBuildArea) { - this.roomSpecialTypes.removeUndefined(item); + this.roomSpecialTypes.removeUndefined(item); } } } @@ -4168,7 +4168,7 @@ public class Room implements Comparable, ISerialize, Runnable { } public void giveEffect(RoomUnit roomUnit, int effectId, int duration) { - if (roomUnit == null) return; + if (roomUnit == null || roomUnit.getRoom() == null) return; Habbo habbo = roomUnit.getRoom().getHabbo(roomUnit); @@ -4567,8 +4567,8 @@ public class Room implements Comparable, ISerialize, Runnable { THashSet occupiedTiles = this.layout.getTilesAt(tile, item.getBaseItem().getWidth(), item.getBaseItem().getLength(), rotation); for (RoomTile t : occupiedTiles) { - if(t.state == RoomTileState.INVALID) return FurnitureMovementError.INVALID_MOVE; - if(!Emulator.getConfig().getBoolean("wired.place.under", false) || (Emulator.getConfig().getBoolean("wired.place.under", false) && !item.isWalkable() && !item.getBaseItem().allowSit() && !item.getBaseItem().allowLay())) { + if (t.state == RoomTileState.INVALID) return FurnitureMovementError.INVALID_MOVE; + if (!Emulator.getConfig().getBoolean("wired.place.under", false) || (Emulator.getConfig().getBoolean("wired.place.under", false) && !item.isWalkable() && !item.getBaseItem().allowSit() && !item.getBaseItem().allowLay())) { if (checkForUnits && this.hasHabbosAt(t.x, t.y)) return FurnitureMovementError.TILE_HAS_HABBOS; if (checkForUnits && this.hasBotsAt(t.x, t.y)) return FurnitureMovementError.TILE_HAS_BOTS; if (checkForUnits && this.hasPetsAt(t.x, t.y)) return FurnitureMovementError.TILE_HAS_PETS; @@ -4718,10 +4718,12 @@ public class Room implements Comparable, ISerialize, Runnable { if (oldLocation != tile) { for (RoomTile t : occupiedTiles) { HabboItem tileTopItem = this.getTopItemAt(t.x, t.y); - if ((!magicTile && ((tileTopItem != null && tileTopItem != item ? (t.state.equals(RoomTileState.INVALID) || !t.getAllowStack() || !tileTopItem.getBaseItem().allowStack() || (tileTopItem.getBaseItem().getInteractionType().getType() == InteractionWater.class && item.getBaseItem().getInteractionType().getType() == InteractionWater.class || item.getBaseItem().getInteractionType().getType() != InteractionWaterItem.class)) : this.calculateTileState(t, item).equals(RoomTileState.INVALID))) || stackHelper.isPresent() && item.getBaseItem().getInteractionType().getType() == InteractionWater.class)) + if (!magicTile && (tileTopItem != null && tileTopItem != item ? (t.state.equals(RoomTileState.INVALID) || !t.getAllowStack() || !tileTopItem.getBaseItem().allowStack() || + (tileTopItem.getBaseItem().getInteractionType().getType() == InteractionWater.class && (item.getBaseItem().getInteractionType().getType() != InteractionWaterItem.class || item.getBaseItem().getInteractionType().getType() == InteractionWater.class))) : this.calculateTileState(t, item).equals(RoomTileState.INVALID)) || stackHelper.isPresent() && item.getBaseItem().getInteractionType().getType() == InteractionWater.class) { return FurnitureMovementError.CANT_STACK; + } - if(!Emulator.getConfig().getBoolean("wired.place.under", false) || (Emulator.getConfig().getBoolean("wired.place.under", false) && !item.isWalkable() && !item.getBaseItem().allowSit())) { + if (!Emulator.getConfig().getBoolean("wired.place.under", false) || (Emulator.getConfig().getBoolean("wired.place.under", false) && !item.isWalkable() && !item.getBaseItem().allowSit())) { if (checkForUnits) { if (!magicTile && this.hasHabbosAt(t.x, t.y)) return FurnitureMovementError.TILE_HAS_HABBOS; if (!magicTile && this.hasBotsAt(t.x, t.y)) return FurnitureMovementError.TILE_HAS_BOTS; @@ -4782,8 +4784,9 @@ 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 + 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 if (Emulator.getPluginManager().isRegistered(FurnitureBuildheightEvent.class, true)) { FurnitureBuildheightEvent event = Emulator.getPluginManager().fireEvent(new FurnitureBuildheightEvent(item, actor, 0.00, height)); @@ -4792,8 +4795,9 @@ 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 + 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 item.setX(tile.x); item.setY(tile.y); diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomChatMessage.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomChatMessage.java index 882469e2..abb13894 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomChatMessage.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomChatMessage.java @@ -39,7 +39,7 @@ public class RoomChatMessage implements Runnable, ISerialize, DatabaseLoggable { private byte emotion; public RoomChatMessage(MessageHandler message) { - if (message.packet.getMessageId() == Incoming.WhisperEvent) { + if (message.packet.getMessageId() == Incoming.whisperEvent) { String data = message.packet.readString(); this.targetHabbo = message.client.getHabbo().getHabboInfo().getCurrentRoom().getHabbo(data.split(" ")[0]); this.message = data.substring(data.split(" ")[0].length() + 1); diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java index f699715d..8d48bf07 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java @@ -952,7 +952,7 @@ public class RoomManager { habbo.getRoomUnit().isKicked = false; if (room.getOwnerId() != habbo.getHabboInfo().getId()) { - AchievementManager.progressAchievement(room.getOwnerId(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("RoomDecoHosting"), (int) Math.floor((Emulator.getIntUnixTimestamp() - habbo.getHabboStats().roomEnterTimestamp) / 60000)); + AchievementManager.progressAchievement(room.getOwnerId(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("RoomDecoHosting"), (int) Math.floor((Emulator.getIntUnixTimestamp() - habbo.getHabboStats().roomEnterTimestamp) / 60000.0)); } habbo.getMessenger().connectionChanged(habbo, habbo.isOnline(), false); @@ -1220,7 +1220,7 @@ public class RoomManager { public ArrayList getRoomsVisited(Habbo habbo, boolean includeSelf, int limit) { ArrayList rooms = new ArrayList<>(); - try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("SELECT rooms.* FROM room_enter_log INNER JOIN rooms ON room_enter_log.room_id = rooms.id WHERE user_id = ? AND timestamp >= ? AND rooms.owner_id != ? GROUP BY rooms.id ORDER BY timestamp DESC LIMIT " + limit)) { + try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("SELECT rooms.* FROM room_enter_log INNER JOIN rooms ON room_enter_log.room_id = rooms.id WHERE user_id = ? AND timestamp >= ? AND rooms.owner_id != ? GROUP BY rooms.id AND timestamp ORDER BY timestamp DESC LIMIT " + limit)) { statement.setInt(1, habbo.getHabboInfo().getId()); statement.setInt(2, Emulator.getIntUnixTimestamp() - 259200); statement.setInt(3, (includeSelf ? 0 : habbo.getHabboInfo().getId())); @@ -1289,7 +1289,7 @@ public class RoomManager { Collections.sort(rooms); - return rooms.subList(0, (rooms.size() > limit ? limit : rooms.size())); + return rooms.subList(0, (Math.min(rooms.size(), limit))); } public ArrayList getRoomsWithRights(Habbo habbo) { diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomSpecialTypes.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomSpecialTypes.java index 8a1a1799..ab135ebf 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomSpecialTypes.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomSpecialTypes.java @@ -630,11 +630,7 @@ public class RoomSpecialTypes { } public InteractionFreezeExitTile getFreezeExitTile() { - for (InteractionFreezeExitTile t : this.freezeExitTile.values()) { - return t; - } - - return null; + return this.freezeExitTile.values().stream().findFirst().orElse(null); } public InteractionFreezeExitTile getRandomFreezeExitTile() { diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTile.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTile.java index d3978d8d..574dfa0c 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTile.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTile.java @@ -115,8 +115,8 @@ public class RoomTile { } public double distance(RoomTile roomTile) { - double x = this.x - roomTile.x; - double y = this.y - roomTile.y; + double x = (double) this.x - roomTile.x; + double y = (double) this.y - roomTile.y; return Math.sqrt(x * x + y * y); } @@ -186,7 +186,7 @@ public class RoomTile { public List getUnits() { synchronized (this.units) { - return new ArrayList(this.units); + return new ArrayList<>(this.units); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java index 3f3beeb9..c668ee80 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java @@ -422,7 +422,7 @@ public class RoomUnit { } } - public boolean isInRoom() { + public synchronized boolean isInRoom() { return this.inRoom; } @@ -430,7 +430,7 @@ public class RoomUnit { this.inRoom = inRoom; } - public RoomUnitType getRoomUnitType() { + public synchronized RoomUnitType getRoomUnitType() { return this.roomUnitType; } @@ -459,7 +459,7 @@ public class RoomUnit { this.headRotation = headRotation; } - public DanceType getDanceType() { + public synchronized DanceType getDanceType() { return this.danceType; } diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/TraxManager.java b/src/main/java/com/eu/habbo/habbohotel/rooms/TraxManager.java index 26fa69ba..76e2cd55 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/TraxManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/TraxManager.java @@ -11,12 +11,12 @@ import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.generic.alerts.NotificationDialogMessageComposer; -import com.eu.habbo.messages.outgoing.inventory.UnseenItemsComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListInvalidateComposer; import com.eu.habbo.messages.outgoing.inventory.FurniListRemoveComposer; -import com.eu.habbo.messages.outgoing.rooms.items.jukebox.UserSongDisksInventoryMessageComposer; -import com.eu.habbo.messages.outgoing.rooms.items.jukebox.NowPlayingMessageComposer; +import com.eu.habbo.messages.outgoing.inventory.UnseenItemsComposer; import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeboxSongDisksMessageComposer; +import com.eu.habbo.messages.outgoing.rooms.items.jukebox.NowPlayingMessageComposer; +import com.eu.habbo.messages.outgoing.rooms.items.jukebox.UserSongDisksInventoryMessageComposer; import gnu.trove.map.hash.THashMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -55,13 +55,11 @@ public class TraxManager implements Disposable { if (this.jukeBox == null) { //Check again if there's a jukebox on room but has not been saved on DB before - for (HabboItem item : room.getRoomSpecialTypes().getItemsOfType(InteractionJukeBox.class)) - { + for (HabboItem item : room.getRoomSpecialTypes().getItemsOfType(InteractionJukeBox.class)) { this.jukeBox = (InteractionJukeBox) item; } - if(this.jukeBox != null) - { + if (this.jukeBox != null) { this.loadPlaylist(); this.songsLimit = this.getSongsLimit(this.jukeBox); } @@ -77,7 +75,7 @@ public class TraxManager implements Disposable { try (ResultSet set = statement.executeQuery()) { if (set.next()) { HabboItem jukebox = Emulator.getGameEnvironment().getItemManager().loadHabboItem(set.getInt("trax_item_id")); - if(jukebox != null) { + if (jukebox != null) { if (!(jukebox instanceof InteractionJukeBox)) { return null; } else { @@ -94,7 +92,7 @@ public class TraxManager implements Disposable { } public void loadPlaylist() { - if(this.jukeBox == null) return; + if (this.jukeBox == null) return; this.songs.clear(); @@ -103,8 +101,8 @@ public class TraxManager implements Disposable { try (ResultSet set = statement.executeQuery()) { while (set.next()) { HabboItem musicDisc = Emulator.getGameEnvironment().getItemManager().loadHabboItem(set.getInt("item_id")); - if(musicDisc != null) { - if (!(musicDisc instanceof InteractionMusicDisc) || musicDisc.getRoomId() != -1) { + if (musicDisc != null) { + if (!(musicDisc instanceof InteractionMusicDisc) || musicDisc.getRoomId() != -1) { deleteSongFromPlaylist(this.jukeBox.getId(), musicDisc.getId()); } else { SoundTrack track = Emulator.getGameEnvironment().getItemManager().getSoundTrack(((InteractionMusicDisc) musicDisc).getSongId()); @@ -123,9 +121,8 @@ public class TraxManager implements Disposable { } } - public static void deleteSongFromPlaylist(int jukebox_id, int song_id) - { - try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("DELETE FROM trax_playlist WHERE trax_item_id = ? AND item_id = ? LIMIT 1")) { + public static void deleteSongFromPlaylist(int jukebox_id, int song_id) { + try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("DELETE FROM trax_playlist WHERE trax_item_id = ? AND item_id = ? LIMIT 1")) { statement.setInt(1, jukebox_id); statement.setInt(2, song_id); statement.execute(); @@ -135,15 +132,13 @@ public class TraxManager implements Disposable { } public void addTraxOnRoom(InteractionJukeBox jukeBox) { - if(this.jukeBox != null) return; + if (this.jukeBox != null) return; - try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement_1 = connection.prepareStatement("INSERT INTO room_trax (room_id, trax_item_id) VALUES (?, ?)")) - { + try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement_1 = connection.prepareStatement("INSERT INTO room_trax (room_id, trax_item_id) VALUES (?, ?)")) { statement_1.setInt(1, this.room.getId()); statement_1.setInt(2, jukeBox.getId()); statement_1.execute(); - } - catch (SQLException e) { + } catch (SQLException e) { LOGGER.error("Caught SQL exception", e); return; } @@ -154,14 +149,12 @@ public class TraxManager implements Disposable { } public void removeTraxOnRoom(InteractionJukeBox jukeBox) { - if(this.jukeBox.getId() != jukeBox.getId()) return; + if (this.jukeBox.getId() != jukeBox.getId()) return; - try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement_1 = connection.prepareStatement("DELETE FROM room_trax WHERE room_id = ?")) - { + try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement_1 = connection.prepareStatement("DELETE FROM room_trax WHERE room_id = ?")) { statement_1.setInt(1, this.room.getId()); statement_1.execute(); - } - catch (SQLException e) { + } catch (SQLException e) { LOGGER.error("Caught SQL exception", e); return; } @@ -208,9 +201,10 @@ public class TraxManager implements Disposable { this.starter = starter; this.cycleStartedTimestamp = Emulator.getIntUnixTimestamp(); } - } - this.room.sendComposer(new NowPlayingMessageComposer(Emulator.getGameEnvironment().getItemManager().getSoundTrack(this.currentlyPlaying.getSongId()), this.playingIndex, 0).compose()); + + this.room.sendComposer(new NowPlayingMessageComposer(Emulator.getGameEnvironment().getItemManager().getSoundTrack(this.currentlyPlaying.getSongId()), this.playingIndex, 0).compose()); + } } else { this.stop(); } @@ -242,10 +236,9 @@ public class TraxManager implements Disposable { } public void addSong(InteractionMusicDisc musicDisc, Habbo habbo) { - if(this.jukeBox == null) return; + if (this.jukeBox == null) return; - if(this.songsLimit < this.songs.size() + 1) - { + if (this.songsLimit < this.songs.size() + 1) { THashMap codes = new THashMap<>(); ServerMessage msg = new NotificationDialogMessageComposer("${playlist.editor.alert.playlist.full.title}", "${playlist.editor.alert.playlist.full}").compose(); habbo.getClient().sendResponse(msg); @@ -254,8 +247,7 @@ public class TraxManager implements Disposable { SoundTrack track = Emulator.getGameEnvironment().getItemManager().getSoundTrack(musicDisc.getSongId()); - if (track != null) - { + if (track != null) { this.totalLength += track.getLength(); this.songs.add(musicDisc); @@ -282,7 +274,7 @@ public class TraxManager implements Disposable { } public void removeSong(int itemId) { - if(this.songs.isEmpty()) return; + if (this.songs.isEmpty()) return; InteractionMusicDisc musicDisc = this.getSong(itemId); @@ -318,8 +310,7 @@ public class TraxManager implements Disposable { this.sendUpdatedSongList(); } - public static void removeAllSongs(InteractionJukeBox jukebox) - { + public static void removeAllSongs(InteractionJukeBox jukebox) { try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("SELECT * FROM trax_playlist WHERE trax_item_id = ?")) { statement.setInt(1, jukebox.getId()); try (ResultSet set = statement.executeQuery()) { @@ -327,7 +318,7 @@ public class TraxManager implements Disposable { HabboItem musicDisc = Emulator.getGameEnvironment().getItemManager().loadHabboItem(set.getInt("item_id")); deleteSongFromPlaylist(jukebox.getId(), set.getInt("item_id")); - if(musicDisc != null) { + if (musicDisc != null) { if (musicDisc instanceof InteractionMusicDisc && musicDisc.getRoomId() == -1) { musicDisc.setRoomId(0); musicDisc.needsUpdate(true); diff --git a/src/main/java/com/eu/habbo/habbohotel/users/HabboInfo.java b/src/main/java/com/eu/habbo/habbohotel/users/HabboInfo.java index 89e4cd95..b2f6e9f2 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/HabboInfo.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/HabboInfo.java @@ -451,6 +451,7 @@ public class HabboInfo implements Runnable { roomUnit.setZ(riding.getRoomUnit().getZ()); roomUnit.setPreviousLocationZ(riding.getRoomUnit().getZ()); roomUnit.stopWalking(); + if (room != null) room.sendComposer(new UserUpdateComposer(roomUnit).compose()); List availableTiles = isRemoving ? new ArrayList<>() : this.getCurrentRoom().getLayout().getWalkableTilesAround(roomUnit.getCurrentLocation()); diff --git a/src/main/java/com/eu/habbo/habbohotel/users/HabboStats.java b/src/main/java/com/eu/habbo/habbohotel/users/HabboStats.java index 4d2c8ed1..705ae190 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/HabboStats.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/HabboStats.java @@ -1,7 +1,7 @@ package com.eu.habbo.habbohotel.users; import com.eu.habbo.Emulator; -import com.eu.habbo.habbohotel.campaign.calendar.CalendarRewardClaimed; +import com.eu.habbo.habbohotel.campaign.CalendarRewardClaimed; import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.achievements.Achievement; import com.eu.habbo.habbohotel.achievements.AchievementManager; @@ -421,12 +421,7 @@ public class HabboStats implements Runnable { } public boolean hasGuild(int guildId) { - for (int i : this.guilds) { - if (i == guildId) - return true; - } - - return false; + return this.guilds.contains(guildId); } public int getAchievementScore() { diff --git a/src/main/java/com/eu/habbo/habbohotel/users/clothingvalidation/Figuredata.java b/src/main/java/com/eu/habbo/habbohotel/users/clothingvalidation/Figuredata.java index 0f4aec7c..74eb2260 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/clothingvalidation/Figuredata.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/clothingvalidation/Figuredata.java @@ -7,6 +7,7 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; +import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -36,6 +37,8 @@ public class Figuredata { */ public void parseXML(String uri) throws Exception, ParserConfigurationException, IOException, SAXException { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + factory.setFeature("http://xml.org/sax/features/external-general-entities", false); + factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false); factory.setValidating(false); factory.setIgnoringElementContentWhitespace(true); DocumentBuilder builder = factory.newDocumentBuilder(); @@ -45,7 +48,10 @@ public class Figuredata { if(!rootElement.getTagName().equalsIgnoreCase("figuredata") || document.getElementsByTagName("colors") == null || document.getElementsByTagName("sets") == null) { StringWriter writer = new StringWriter(); - TransformerFactory.newInstance().newTransformer().transform(new DOMSource(document), new StreamResult(writer)); + TransformerFactory transformerFactory = javax.xml.transform.TransformerFactory.newInstance(); + transformerFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, ""); + transformerFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, ""); + transformerFactory.newTransformer().transform(new DOMSource(document), new StreamResult(writer)); String documentString = writer.getBuffer().toString(); throw new Exception("The passed file is not in figuredata format. Received " + documentString.substring(0, Math.min(documentString.length(), 200))); } diff --git a/src/main/java/com/eu/habbo/habbohotel/wired/WiredHandler.java b/src/main/java/com/eu/habbo/habbohotel/wired/WiredHandler.java index c2e3bb86..c510352a 100644 --- a/src/main/java/com/eu/habbo/habbohotel/wired/WiredHandler.java +++ b/src/main/java/com/eu/habbo/habbohotel/wired/WiredHandler.java @@ -72,7 +72,7 @@ public class WiredHandler { return false; long millis = System.currentTimeMillis(); - THashSet effectsToExecute = new THashSet(); + THashSet effectsToExecute = new THashSet<>(); List triggeredTiles = new ArrayList<>(); for (InteractionWiredTrigger trigger : triggers) { @@ -81,7 +81,7 @@ public class WiredHandler { if (triggeredTiles.contains(tile)) continue; - THashSet tEffectsToExecute = new THashSet(); + THashSet tEffectsToExecute = new THashSet<>(); if (handle(trigger, roomUnit, room, stuff, tEffectsToExecute)) { effectsToExecute.addAll(tEffectsToExecute); @@ -244,7 +244,7 @@ public class WiredHandler { effect.activateBox(room, roomUnit, millis); } - }, effect.getDelay() * 500); + }, effect.getDelay() * 500L); } } @@ -327,23 +327,23 @@ public class WiredHandler { return; if (rewardReceived.type.equalsIgnoreCase("credits")) { - int credits = Integer.valueOf(rewardReceived.value); + int credits = Integer.parseInt(rewardReceived.value); habbo.giveCredits(credits); } else if (rewardReceived.type.equalsIgnoreCase("pixels")) { - int pixels = Integer.valueOf(rewardReceived.value); + int pixels = Integer.parseInt(rewardReceived.value); habbo.givePixels(pixels); } else if (rewardReceived.type.startsWith("points")) { - int points = Integer.valueOf(rewardReceived.value); + int points = Integer.parseInt(rewardReceived.value); int type = 5; try { - type = Integer.valueOf(rewardReceived.type.replace("points", "")); - } catch (Exception e) { + type = Integer.parseInt(rewardReceived.type.replace("points", "")); + } catch (Exception ignored) { } habbo.givePoints(type, points); } else if (rewardReceived.type.equalsIgnoreCase("furni")) { - Item baseItem = Emulator.getGameEnvironment().getItemManager().getItem(Integer.valueOf(rewardReceived.value)); + Item baseItem = Emulator.getGameEnvironment().getItemManager().getItem(Integer.parseInt(rewardReceived.value)); if (baseItem != null) { HabboItem item = Emulator.getGameEnvironment().getItemManager().createItem(habbo.getHabboInfo().getId(), baseItem, 0, 0, ""); @@ -356,9 +356,9 @@ public class WiredHandler { } } } else if (rewardReceived.type.equalsIgnoreCase("respect")) { - habbo.getHabboStats().respectPointsReceived += Integer.valueOf(rewardReceived.value); + habbo.getHabboStats().respectPointsReceived += Integer.parseInt(rewardReceived.value); } else if (rewardReceived.type.equalsIgnoreCase("cata")) { - CatalogItem item = Emulator.getGameEnvironment().getCatalogManager().getCatalogItem(Integer.valueOf(rewardReceived.value)); + CatalogItem item = Emulator.getGameEnvironment().getCatalogManager().getCatalogItem(Integer.parseInt(rewardReceived.value)); if (item != null) { Emulator.getGameEnvironment().getCatalogManager().purchaseItem(null, item, habbo, 1, "", true); diff --git a/src/main/java/com/eu/habbo/messages/PacketManager.java b/src/main/java/com/eu/habbo/messages/PacketManager.java index 5559da79..565b4da3 100644 --- a/src/main/java/com/eu/habbo/messages/PacketManager.java +++ b/src/main/java/com/eu/habbo/messages/PacketManager.java @@ -9,6 +9,8 @@ import com.eu.habbo.messages.incoming.achievements.GetAchievementsEvent; import com.eu.habbo.messages.incoming.ambassadors.AmbassadorAlertEvent; import com.eu.habbo.messages.incoming.ambassadors.FollowFriendEvent; import com.eu.habbo.messages.incoming.camera.*; +import com.eu.habbo.messages.incoming.campaign.OpenCampaignCalendarDoorAsStaffEvent; +import com.eu.habbo.messages.incoming.campaign.OpenCampaignCalendarDoorEvent; import com.eu.habbo.messages.incoming.catalog.*; import com.eu.habbo.messages.incoming.catalog.marketplace.*; import com.eu.habbo.messages.incoming.catalog.recycler.PresentOpenEvent; @@ -16,8 +18,6 @@ import com.eu.habbo.messages.incoming.catalog.recycler.RecycleItemsEvent; import com.eu.habbo.messages.incoming.catalog.recycler.GetRecyclerStatusEvent; import com.eu.habbo.messages.incoming.catalog.recycler.GetRecyclerPrizesEvent; import com.eu.habbo.messages.incoming.crafting.*; -import com.eu.habbo.messages.incoming.events.calendar.OpenCampaignCalendarDoorEvent; -import com.eu.habbo.messages.incoming.events.calendar.OpenCampaignCalendarDoorAsStaffEvent; import com.eu.habbo.messages.incoming.floorplaneditor.GetOccupiedTilesEvent; import com.eu.habbo.messages.incoming.floorplaneditor.GetRoomEntryTileEvent; import com.eu.habbo.messages.incoming.floorplaneditor.UpdateFloorPropertiesEvent; @@ -130,7 +130,7 @@ public class PacketManager { for (String s : Emulator.getConfig().getValue("debug.show.headers").split(";")) { try { logList.add(Integer.valueOf(s)); - } catch (NumberFormatException e) { + } catch (NumberFormatException ignored) { } } @@ -223,425 +223,425 @@ public class PacketManager { } private void registerAmbassadors() throws Exception { - this.registerHandler(Incoming.AmbassadorAlertEvent, AmbassadorAlertEvent.class); - this.registerHandler(Incoming.FollowFriendEvent, FollowFriendEvent.class); + this.registerHandler(Incoming.ambassadorAlertEvent, AmbassadorAlertEvent.class); + this.registerHandler(Incoming.followFriendEvent, FollowFriendEvent.class); } private void registerCatalog() throws Exception { - this.registerHandler(Incoming.GetRecyclerPrizesEvent, GetRecyclerPrizesEvent.class); - this.registerHandler(Incoming.GetBundleDiscountRulesetEvent, GetBundleDiscountRulesetEvent.class); - this.registerHandler(Incoming.GetGiftWrappingConfigurationEvent, GetGiftWrappingConfigurationEvent.class); - this.registerHandler(Incoming.GetMarketplaceConfigurationEvent, GetMarketplaceConfigurationEvent.class); - this.registerHandler(Incoming.GetCatalogIndexEvent, GetCatalogIndexEvent.class); - this.registerHandler(Incoming.BuildersClubQueryFurniCountEvent, BuildersClubQueryFurniCountEvent.class); - this.registerHandler(Incoming.GetCatalogPageEvent, GetCatalogPageEvent.class); - this.registerHandler(Incoming.PurchaseFromCatalogAsGiftEvent, PurchaseFromCatalogAsGiftEvent.class); - this.registerHandler(Incoming.PurchaseFromCatalogEvent, PurchaseFromCatalogEvent.class); - this.registerHandler(Incoming.RedeemVoucherEvent, RedeemVoucherEvent.class); - this.registerHandler(Incoming.GetRecyclerStatusEvent, GetRecyclerStatusEvent.class); - this.registerHandler(Incoming.RecycleItemsEvent, RecycleItemsEvent.class); - this.registerHandler(Incoming.PresentOpenEvent, PresentOpenEvent.class); - this.registerHandler(Incoming.GetMarketplaceOwnOffersEvent, GetMarketplaceOwnOffersEvent.class); - this.registerHandler(Incoming.CancelMarketplaceOfferEvent, CancelMarketplaceOfferEvent.class); - this.registerHandler(Incoming.GetMarketplaceOffersEvent, GetMarketplaceOffersEvent.class); - this.registerHandler(Incoming.GetMarketplaceItemStatsEvent, GetMarketplaceItemStatsEvent.class); - this.registerHandler(Incoming.BuyMarketplaceOfferEvent, BuyMarketplaceOfferEvent.class); - this.registerHandler(Incoming.GetMarketplaceCanMakeOfferEvent, GetMarketplaceCanMakeOfferEvent.class); - this.registerHandler(Incoming.MakeOfferEvent, MakeOfferEvent.class); - this.registerHandler(Incoming.RedeemMarketplaceOfferCreditsEvent, RedeemMarketplaceOfferCreditsEvent.class); - this.registerHandler(Incoming.GetSellablePetPalettesEvent, GetSellablePetPalettesEvent.class); - this.registerHandler(Incoming.ApproveNameEvent, ApproveNameEvent.class); - this.registerHandler(Incoming.GetClubOffersEvent, GetClubOffersEvent.class); - this.registerHandler(Incoming.GetClubGiftInfo, GetClubGiftInfo.class); - this.registerHandler(Incoming.GetProductOfferEvent, GetProductOfferEvent.class); - this.registerHandler(Incoming.PurchaseTargetedOfferEvent, PurchaseTargetedOfferEvent.class); - this.registerHandler(Incoming.SetTargetedOfferStateEvent, SetTargetedOfferStateEvent.class); - this.registerHandler(Incoming.SelectClubGiftEvent, SelectClubGiftEvent.class); - this.registerHandler(Incoming.ScrGetKickbackInfoEvent, ScrGetKickbackInfoEvent.class); - this.registerHandler(Incoming.BuildersClubPlaceWallItemEvent, BuildersClubPlaceWallItemEvent.class); - this.registerHandler(Incoming.PurchaseVipMembershipExtensionEvent, PurchaseVipMembershipExtensionEvent.class); + this.registerHandler(Incoming.getRecyclerPrizesEvent, GetRecyclerPrizesEvent.class); + this.registerHandler(Incoming.getBundleDiscountRulesetEvent, GetBundleDiscountRulesetEvent.class); + this.registerHandler(Incoming.getGiftWrappingConfigurationEvent, GetGiftWrappingConfigurationEvent.class); + this.registerHandler(Incoming.getMarketplaceConfigurationEvent, GetMarketplaceConfigurationEvent.class); + this.registerHandler(Incoming.getCatalogIndexEvent, GetCatalogIndexEvent.class); + this.registerHandler(Incoming.buildersClubQueryFurniCountEvent, BuildersClubQueryFurniCountEvent.class); + this.registerHandler(Incoming.getCatalogPageEvent, GetCatalogPageEvent.class); + this.registerHandler(Incoming.purchaseFromCatalogAsGiftEvent, PurchaseFromCatalogAsGiftEvent.class); + this.registerHandler(Incoming.purchaseFromCatalogEvent, PurchaseFromCatalogEvent.class); + this.registerHandler(Incoming.redeemVoucherEvent, RedeemVoucherEvent.class); + this.registerHandler(Incoming.getRecyclerStatusEvent, GetRecyclerStatusEvent.class); + this.registerHandler(Incoming.recycleItemsEvent, RecycleItemsEvent.class); + this.registerHandler(Incoming.presentOpenEvent, PresentOpenEvent.class); + this.registerHandler(Incoming.getMarketplaceOwnOffersEvent, GetMarketplaceOwnOffersEvent.class); + this.registerHandler(Incoming.cancelMarketplaceOfferEvent, CancelMarketplaceOfferEvent.class); + this.registerHandler(Incoming.getMarketplaceOffersEvent, GetMarketplaceOffersEvent.class); + this.registerHandler(Incoming.getMarketplaceItemStatsEvent, GetMarketplaceItemStatsEvent.class); + this.registerHandler(Incoming.buyMarketplaceOfferEvent, BuyMarketplaceOfferEvent.class); + this.registerHandler(Incoming.getMarketplaceCanMakeOfferEvent, GetMarketplaceCanMakeOfferEvent.class); + this.registerHandler(Incoming.makeOfferEvent, MakeOfferEvent.class); + this.registerHandler(Incoming.redeemMarketplaceOfferCreditsEvent, RedeemMarketplaceOfferCreditsEvent.class); + this.registerHandler(Incoming.getSellablePetPalettesEvent, GetSellablePetPalettesEvent.class); + this.registerHandler(Incoming.approveNameEvent, ApproveNameEvent.class); + this.registerHandler(Incoming.getClubOffersEvent, GetClubOffersEvent.class); + this.registerHandler(Incoming.getClubGiftInfo, GetClubGiftInfo.class); + this.registerHandler(Incoming.getProductOfferEvent, GetProductOfferEvent.class); + this.registerHandler(Incoming.purchaseTargetedOfferEvent, PurchaseTargetedOfferEvent.class); + this.registerHandler(Incoming.setTargetedOfferStateEvent, SetTargetedOfferStateEvent.class); + this.registerHandler(Incoming.selectClubGiftEvent, SelectClubGiftEvent.class); + this.registerHandler(Incoming.scrGetKickbackInfoEvent, ScrGetKickbackInfoEvent.class); + this.registerHandler(Incoming.buildersClubPlaceWallItemEvent, BuildersClubPlaceWallItemEvent.class); + this.registerHandler(Incoming.purchaseVipMembershipExtensionEvent, PurchaseVipMembershipExtensionEvent.class); } private void registerEvent() throws Exception { - this.registerHandler(Incoming.OpenCampaignCalendarDoorAsStaffEvent, OpenCampaignCalendarDoorAsStaffEvent.class); - this.registerHandler(Incoming.OpenCampaignCalendarDoorEvent, OpenCampaignCalendarDoorEvent.class); + this.registerHandler(Incoming.openCampaignCalendarDoorAsStaffEvent, OpenCampaignCalendarDoorAsStaffEvent.class); + this.registerHandler(Incoming.openCampaignCalendarDoorEvent, OpenCampaignCalendarDoorEvent.class); } private void registerHandshake() throws Exception { - this.registerHandler(Incoming.ClientHelloEvent, ClientHelloEvent.class); - this.registerHandler(Incoming.InitDiffieHandshakeEvent, InitDiffieHandshakeEvent.class); - this.registerHandler(Incoming.CompleteDiffieHandshakeEvent, CompleteDiffieHandshakeEvent.class); - this.registerHandler(Incoming.SSOTicketEvent, SSOTicketEvent.class); - this.registerHandler(Incoming.UniqueIDEvent, UniqueIDEvent.class); - this.registerHandler(Incoming.GetIgnoredUsersEvent, GetIgnoredUsersEvent.class); - this.registerHandler(Incoming.LatencyPingRequestEvent, LatencyPingRequestEvent.class); + this.registerHandler(Incoming.clientHelloEvent, ClientHelloEvent.class); + this.registerHandler(Incoming.initDiffieHandshakeEvent, InitDiffieHandshakeEvent.class); + this.registerHandler(Incoming.completeDiffieHandshakeEvent, CompleteDiffieHandshakeEvent.class); + this.registerHandler(Incoming.sSOTicketEvent, SSOTicketEvent.class); + this.registerHandler(Incoming.uniqueIDEvent, UniqueIDEvent.class); + this.registerHandler(Incoming.getIgnoredUsersEvent, GetIgnoredUsersEvent.class); + this.registerHandler(Incoming.latencyPingRequestEvent, LatencyPingRequestEvent.class); } private void registerFriends() throws Exception { - this.registerHandler(Incoming.GetMOTDEvent, GetMOTDEvent.class); - this.registerHandler(Incoming.SetRelationshipStatusEvent, SetRelationshipStatusEvent.class); - this.registerHandler(Incoming.RemoveFriendEvent, RemoveFriendEvent.class); - this.registerHandler(Incoming.HabboSearchEvent, HabboSearchEvent.class); - this.registerHandler(Incoming.RequestFriendEvent, RequestFriendEvent.class); - this.registerHandler(Incoming.AcceptFriendEvent, AcceptFriendEvent.class); - this.registerHandler(Incoming.DeclineFriendEvent, DeclineFriendEvent.class); - this.registerHandler(Incoming.SendMsgEvent, SendMsgEvent.class); - this.registerHandler(Incoming.GetFriendRequestsEvent, GetFriendRequestsEvent.class); - this.registerHandler(Incoming.VisitUserEvent, VisitUserEvent.class); - this.registerHandler(Incoming.MessengerInitEvent, MessengerInitEvent.class); - this.registerHandler(Incoming.FindNewFriendsEvent, FindNewFriendsEvent.class); - this.registerHandler(Incoming.SendRoomInviteEvent, SendRoomInviteEvent.class); + this.registerHandler(Incoming.getMOTDEvent, GetMOTDEvent.class); + this.registerHandler(Incoming.setRelationshipStatusEvent, SetRelationshipStatusEvent.class); + this.registerHandler(Incoming.removeFriendEvent, RemoveFriendEvent.class); + this.registerHandler(Incoming.habboSearchEvent, HabboSearchEvent.class); + this.registerHandler(Incoming.requestFriendEvent, RequestFriendEvent.class); + this.registerHandler(Incoming.acceptFriendEvent, AcceptFriendEvent.class); + this.registerHandler(Incoming.declineFriendEvent, DeclineFriendEvent.class); + this.registerHandler(Incoming.sendMsgEvent, SendMsgEvent.class); + this.registerHandler(Incoming.getFriendRequestsEvent, GetFriendRequestsEvent.class); + this.registerHandler(Incoming.visitUserEvent, VisitUserEvent.class); + this.registerHandler(Incoming.messengerInitEvent, MessengerInitEvent.class); + this.registerHandler(Incoming.findNewFriendsEvent, FindNewFriendsEvent.class); + this.registerHandler(Incoming.sendRoomInviteEvent, SendRoomInviteEvent.class); } private void registerUsers() throws Exception { - this.registerHandler(Incoming.InfoRetrieveEvent, InfoRetrieveEvent.class); - this.registerHandler(Incoming.GetCreditsInfoEvent, GetCreditsInfoEvent.class); - this.registerHandler(Incoming.ScrGetUserInfoEvent, ScrGetUserInfoEvent.class); - this.registerHandler(Incoming.GetSoundSettingsEvent, GetSoundSettingsEvent.class); - this.registerHandler(Incoming.GetTalentTrackLevelEvent, GetTalentTrackLevelEvent.class); - this.registerHandler(Incoming.GetExtendedProfileEvent, GetExtendedProfileEvent.class); - this.registerHandler(Incoming.GetRelationshipStatusInfoEvent, GetRelationshipStatusInfoEvent.class); - this.registerHandler(Incoming.GetWardrobeEvent, GetWardrobeEvent.class); - this.registerHandler(Incoming.SaveWardrobeOutfitEvent, SaveWardrobeOutfitEvent.class); - this.registerHandler(Incoming.ChangeMottoEvent, ChangeMottoEvent.class); - this.registerHandler(Incoming.UpdateFigureDataEvent, UpdateFigureDataEvent.class); - this.registerHandler(Incoming.SetActivatedBadgesEvent, SetActivatedBadgesEvent.class); - this.registerHandler(Incoming.GetSelectedBadgesEvent, GetSelectedBadgesEvent.class); - this.registerHandler(Incoming.SetSoundSettingsEvent, SetSoundSettingsEvent.class); - this.registerHandler(Incoming.SetRoomCameraPreferencesEvent, SetRoomCameraPreferencesEvent.class); - this.registerHandler(Incoming.SetIgnoreRoomInvitesEvent, SetIgnoreRoomInvitesEvent.class); - this.registerHandler(Incoming.SetChatPreferencesEvent, SetChatPreferencesEvent.class); - this.registerHandler(Incoming.AvatarEffectActivatedEvent, AvatarEffectActivatedEvent.class); - this.registerHandler(Incoming.AvatarEffectSelectedEvent, AvatarEffectSelectedEvent.class); - this.registerHandler(Incoming.EventLogEvent, EventLogEvent.class); - this.registerHandler(Incoming.NewUserExperienceScriptProceedEvent, NewUserExperienceScriptProceedEvent.class); - this.registerHandler(Incoming.NewUserExperienceGetGiftsEvent, NewUserExperienceGetGiftsEvent.class); - this.registerHandler(Incoming.CheckUserNameEvent, CheckUserNameEvent.class); - this.registerHandler(Incoming.ChangeUserNameEvent, ChangeUserNameEvent.class); - this.registerHandler(Incoming.SetChatStylePreferenceEvent, SetChatStylePreferenceEvent.class); - this.registerHandler(Incoming.UpdateUIFlagsEvent, UpdateUIFlagsEvent.class); + this.registerHandler(Incoming.infoRetrieveEvent, InfoRetrieveEvent.class); + this.registerHandler(Incoming.getCreditsInfoEvent, GetCreditsInfoEvent.class); + this.registerHandler(Incoming.scrGetUserInfoEvent, ScrGetUserInfoEvent.class); + this.registerHandler(Incoming.getSoundSettingsEvent, GetSoundSettingsEvent.class); + this.registerHandler(Incoming.getTalentTrackLevelEvent, GetTalentTrackLevelEvent.class); + this.registerHandler(Incoming.getExtendedProfileEvent, GetExtendedProfileEvent.class); + this.registerHandler(Incoming.getRelationshipStatusInfoEvent, GetRelationshipStatusInfoEvent.class); + this.registerHandler(Incoming.getWardrobeEvent, GetWardrobeEvent.class); + this.registerHandler(Incoming.saveWardrobeOutfitEvent, SaveWardrobeOutfitEvent.class); + this.registerHandler(Incoming.changeMottoEvent, ChangeMottoEvent.class); + this.registerHandler(Incoming.updateFigureDataEvent, UpdateFigureDataEvent.class); + this.registerHandler(Incoming.setActivatedBadgesEvent, SetActivatedBadgesEvent.class); + this.registerHandler(Incoming.getSelectedBadgesEvent, GetSelectedBadgesEvent.class); + this.registerHandler(Incoming.setSoundSettingsEvent, SetSoundSettingsEvent.class); + this.registerHandler(Incoming.setRoomCameraPreferencesEvent, SetRoomCameraPreferencesEvent.class); + this.registerHandler(Incoming.setIgnoreRoomInvitesEvent, SetIgnoreRoomInvitesEvent.class); + this.registerHandler(Incoming.setChatPreferencesEvent, SetChatPreferencesEvent.class); + this.registerHandler(Incoming.avatarEffectActivatedEvent, AvatarEffectActivatedEvent.class); + this.registerHandler(Incoming.avatarEffectSelectedEvent, AvatarEffectSelectedEvent.class); + this.registerHandler(Incoming.eventLogEvent, EventLogEvent.class); + this.registerHandler(Incoming.newUserExperienceScriptProceedEvent, NewUserExperienceScriptProceedEvent.class); + this.registerHandler(Incoming.newUserExperienceGetGiftsEvent, NewUserExperienceGetGiftsEvent.class); + this.registerHandler(Incoming.checkUserNameEvent, CheckUserNameEvent.class); + this.registerHandler(Incoming.changeUserNameEvent, ChangeUserNameEvent.class); + this.registerHandler(Incoming.setChatStylePreferenceEvent, SetChatStylePreferenceEvent.class); + this.registerHandler(Incoming.updateUIFlagsEvent, UpdateUIFlagsEvent.class); } private void registerNavigator() throws Exception { - this.registerHandler(Incoming.GetUserFlatCatsEvent, GetUserFlatCatsEvent.class); - this.registerHandler(Incoming.PopularRoomsSearchEvent, PopularRoomsSearchEvent.class); - this.registerHandler(Incoming.RoomsWithHighestScoreSearchEvent, RoomsWithHighestScoreSearchEvent.class); - this.registerHandler(Incoming.MyRoomsSearchEvent, MyRoomsSearchEvent.class); - this.registerHandler(Incoming.CanCreateRoomEvent, CanCreateRoomEvent.class); - this.registerHandler(Incoming.GetUnreadForumsCountEvent, GetUnreadForumsCountEvent.class); - this.registerHandler(Incoming.CreateFlatEvent, CreateFlatEvent.class); - this.registerHandler(Incoming.GetPopularRoomTagsEvent, GetPopularRoomTagsEvent.class); - this.registerHandler(Incoming.SearchRoomsByTagEvent, SearchRoomsByTagEvent.class); - this.registerHandler(Incoming.RoomTextSearchEvent, RoomTextSearchEvent.class); - this.registerHandler(Incoming.RoomsWhereMyFriendsAreSearchEvent, RoomsWhereMyFriendsAreSearchEvent.class); - this.registerHandler(Incoming.MyFriendsRoomsSearchEvent, MyFriendsRoomsSearchEvent.class); - this.registerHandler(Incoming.MyRoomRightsSearchEvent, MyRoomRightsSearchEvent.class); - this.registerHandler(Incoming.MyGuildBasesSearchEvent, MyGuildBasesSearchEvent.class); - this.registerHandler(Incoming.MyFavouriteRoomsSearchEvent, MyFavouriteRoomsSearchEvent.class); - this.registerHandler(Incoming.MyRoomHistorySearchEvent, MyRoomHistorySearchEvent.class); - this.registerHandler(Incoming.NewNavigatorInitEvent, NewNavigatorInitEvent.class); - this.registerHandler(Incoming.NewNavigatorSearchEvent, NewNavigatorSearchEvent.class); - this.registerHandler(Incoming.ForwardToSomeRoomEvent, ForwardToSomeRoomEvent.class); - this.registerHandler(Incoming.GetUserEventCatsEvent, GetUserEventCatsEvent.class); - this.registerHandler(Incoming.SetNewNavigatorWindowPreferencesEvent, SetNewNavigatorWindowPreferencesEvent.class); - this.registerHandler(Incoming.DeleteRoomEvent, DeleteRoomEvent.class); - this.registerHandler(Incoming.NavigatorSetSearchCodeViewModeEvent, NavigatorSetSearchCodeViewModeEvent.class); - this.registerHandler(Incoming.NavigatorAddCollapsedCategoryEvent, NavigatorAddCollapsedCategoryEvent.class); - this.registerHandler(Incoming.NavigatorRemoveCollapsedCategoryEvent, NavigatorRemoveCollapsedCategoryEvent.class); - this.registerHandler(Incoming.NavigatorAddSavedSearchEvent, NavigatorAddSavedSearchEvent.class); - this.registerHandler(Incoming.NavigatorDeleteSavedSearchEvent, NavigatorDeleteSavedSearchEvent.class); + this.registerHandler(Incoming.getUserFlatCatsEvent, GetUserFlatCatsEvent.class); + this.registerHandler(Incoming.popularRoomsSearchEvent, PopularRoomsSearchEvent.class); + this.registerHandler(Incoming.roomsWithHighestScoreSearchEvent, RoomsWithHighestScoreSearchEvent.class); + this.registerHandler(Incoming.myRoomsSearchEvent, MyRoomsSearchEvent.class); + this.registerHandler(Incoming.canCreateRoomEvent, CanCreateRoomEvent.class); + this.registerHandler(Incoming.getUnreadForumsCountEvent, GetUnreadForumsCountEvent.class); + this.registerHandler(Incoming.createFlatEvent, CreateFlatEvent.class); + this.registerHandler(Incoming.getPopularRoomTagsEvent, GetPopularRoomTagsEvent.class); + this.registerHandler(Incoming.searchRoomsByTagEvent, SearchRoomsByTagEvent.class); + this.registerHandler(Incoming.roomTextSearchEvent, RoomTextSearchEvent.class); + this.registerHandler(Incoming.roomsWhereMyFriendsAreSearchEvent, RoomsWhereMyFriendsAreSearchEvent.class); + this.registerHandler(Incoming.myFriendsRoomsSearchEvent, MyFriendsRoomsSearchEvent.class); + this.registerHandler(Incoming.myRoomRightsSearchEvent, MyRoomRightsSearchEvent.class); + this.registerHandler(Incoming.myGuildBasesSearchEvent, MyGuildBasesSearchEvent.class); + this.registerHandler(Incoming.myFavouriteRoomsSearchEvent, MyFavouriteRoomsSearchEvent.class); + this.registerHandler(Incoming.myRoomHistorySearchEvent, MyRoomHistorySearchEvent.class); + this.registerHandler(Incoming.newNavigatorInitEvent, NewNavigatorInitEvent.class); + this.registerHandler(Incoming.newNavigatorSearchEvent, NewNavigatorSearchEvent.class); + this.registerHandler(Incoming.forwardToSomeRoomEvent, ForwardToSomeRoomEvent.class); + this.registerHandler(Incoming.getUserEventCatsEvent, GetUserEventCatsEvent.class); + this.registerHandler(Incoming.setNewNavigatorWindowPreferencesEvent, SetNewNavigatorWindowPreferencesEvent.class); + this.registerHandler(Incoming.deleteRoomEvent, DeleteRoomEvent.class); + this.registerHandler(Incoming.navigatorSetSearchCodeViewModeEvent, NavigatorSetSearchCodeViewModeEvent.class); + this.registerHandler(Incoming.navigatorAddCollapsedCategoryEvent, NavigatorAddCollapsedCategoryEvent.class); + this.registerHandler(Incoming.navigatorRemoveCollapsedCategoryEvent, NavigatorRemoveCollapsedCategoryEvent.class); + this.registerHandler(Incoming.navigatorAddSavedSearchEvent, NavigatorAddSavedSearchEvent.class); + this.registerHandler(Incoming.navigatorDeleteSavedSearchEvent, NavigatorDeleteSavedSearchEvent.class); } private void registerHotelview() throws Exception { - this.registerHandler(Incoming.QuitEvent, QuitEvent.class); - this.registerHandler(Incoming.GetBonusRareInfoEvent, GetBonusRareInfoEvent.class); - this.registerHandler(Incoming.GetPromoArticlesEvent, GetPromoArticlesEvent.class); - this.registerHandler(Incoming.GetCurrentTimingCodeEvent, GetCurrentTimingCodeEvent.class); - this.registerHandler(Incoming.HotelViewRequestBadgeRewardEvent, HotelViewRequestBadgeRewardEvent.class); - this.registerHandler(Incoming.HotelViewClaimBadgeRewardEvent, HotelViewClaimBadgeRewardEvent.class); - this.registerHandler(Incoming.GetLimitedOfferAppearingNextEvent, GetLimitedOfferAppearingNextEvent.class); - this.registerHandler(Incoming.HotelViewRequestSecondsUntilEvent, HotelViewRequestSecondsUntilEvent.class); + this.registerHandler(Incoming.quitEvent, QuitEvent.class); + this.registerHandler(Incoming.getBonusRareInfoEvent, GetBonusRareInfoEvent.class); + this.registerHandler(Incoming.getPromoArticlesEvent, GetPromoArticlesEvent.class); + this.registerHandler(Incoming.getCurrentTimingCodeEvent, GetCurrentTimingCodeEvent.class); + this.registerHandler(Incoming.hotelViewRequestBadgeRewardEvent, HotelViewRequestBadgeRewardEvent.class); + this.registerHandler(Incoming.hotelViewClaimBadgeRewardEvent, HotelViewClaimBadgeRewardEvent.class); + this.registerHandler(Incoming.getLimitedOfferAppearingNextEvent, GetLimitedOfferAppearingNextEvent.class); + this.registerHandler(Incoming.hotelViewRequestSecondsUntilEvent, HotelViewRequestSecondsUntilEvent.class); } private void registerInventory() throws Exception { - this.registerHandler(Incoming.GetBadgesEvent, GetBadgesEvent.class); - this.registerHandler(Incoming.GetBotInventoryEvent, GetBotInventoryEvent.class); - this.registerHandler(Incoming.RequestFurniInventoryEvent, RequestFurniInventoryWhenNotInRoomEvent.class); - this.registerHandler(Incoming.RequestFurniInventoryWhenNotInRoomEvent, RequestFurniInventoryWhenNotInRoomEvent.class); - this.registerHandler(Incoming.GetPetInventoryEvent, GetPetInventoryEvent.class); + this.registerHandler(Incoming.getBadgesEvent, GetBadgesEvent.class); + this.registerHandler(Incoming.getBotInventoryEvent, GetBotInventoryEvent.class); + this.registerHandler(Incoming.requestFurniInventoryEvent, RequestFurniInventoryWhenNotInRoomEvent.class); + this.registerHandler(Incoming.requestFurniInventoryWhenNotInRoomEvent, RequestFurniInventoryWhenNotInRoomEvent.class); + this.registerHandler(Incoming.getPetInventoryEvent, GetPetInventoryEvent.class); } void registerRooms() throws Exception { - this.registerHandler(Incoming.OpenFlatConnectionEvent, OpenFlatConnectionEvent.class); - this.registerHandler(Incoming.GetFurnitureAliasesEvent, GetRoomEntryDataEvent.class);// should this be seperate event classes? - this.registerHandler(Incoming.GetRoomEntryDataEvent, GetRoomEntryDataEvent.class);// should this be seperate event classes? - this.registerHandler(Incoming.RateFlatEvent, RateFlatEvent.class); - this.registerHandler(Incoming.GetGuestRoomEvent, GetGuestRoomEvent.class); - this.registerHandler(Incoming.SaveRoomSettingsEvent, SaveRoomSettingsEvent.class); - this.registerHandler(Incoming.PlaceObjectEvent, PlaceObjectEvent.class); - this.registerHandler(Incoming.MoveObjectEvent, MoveObjectEvent.class); - this.registerHandler(Incoming.MoveWallItemEvent, MoveWallItemEvent.class); - this.registerHandler(Incoming.PickupObjectEvent, PickupObjectEvent.class); - this.registerHandler(Incoming.RequestRoomPropertySet, RequestRoomPropertySet.class); - this.registerHandler(Incoming.StartTypingEvent, StartTypingEvent.class); - this.registerHandler(Incoming.CancelTypingEvent, CancelTypingEvent.class); - this.registerHandler(Incoming.UseFurnitureEvent, UseFurnitureEvent.class); - this.registerHandler(Incoming.UseWallItemEvent, UseWallItemEvent.class); - this.registerHandler(Incoming.SetRoomBackgroundColorDataEvent, SetRoomBackgroundColorDataEvent.class); - this.registerHandler(Incoming.SetMannequinNameEvent, SetMannequinNameEvent.class); - this.registerHandler(Incoming.SetMannequinFigureEvent, SetMannequinFigureEvent.class); - this.registerHandler(Incoming.SetClothingChangeDataEvent, SetClothingChangeDataEvent.class); - this.registerHandler(Incoming.SetObjectDataEvent, SetObjectDataEvent.class); - this.registerHandler(Incoming.GetRoomSettingsEvent, GetRoomSettingsEvent.class); - this.registerHandler(Incoming.RoomDimmerGetPresetsEvent, RoomDimmerGetPresetsEvent.class); - this.registerHandler(Incoming.RoomDimmerChangeStateEvent, RoomDimmerChangeStateEvent.class); - this.registerHandler(Incoming.DropCarryItemEvent, DropCarryItemEvent.class); - this.registerHandler(Incoming.LookToEvent, LookToEvent.class); - this.registerHandler(Incoming.ChatEvent, ChatEvent.class); - this.registerHandler(Incoming.ShoutEvent, ShoutEvent.class); - this.registerHandler(Incoming.WhisperEvent, WhisperEvent.class); - this.registerHandler(Incoming.AvatarExpressionEvent, AvatarExpressionEvent.class); - this.registerHandler(Incoming.ChangePostureEvent, ChangePostureEvent.class); - this.registerHandler(Incoming.DanceEvent, DanceEvent.class); - this.registerHandler(Incoming.SignEvent, SignEvent.class); - this.registerHandler(Incoming.MoveAvatarEvent, MoveAvatarEvent.class); - this.registerHandler(Incoming.RespectUserEvent, RespectUserEvent.class); - this.registerHandler(Incoming.AssignRightsEvent, AssignRightsEvent.class); - this.registerHandler(Incoming.RemoveOwnRoomRightsRoomEvent, RemoveOwnRoomRightsRoomEvent.class); - this.registerHandler(Incoming.GetFlatControllersEvent, GetFlatControllersEvent.class); - this.registerHandler(Incoming.RemoveAllRightsEvent, RemoveAllRightsEvent.class); - this.registerHandler(Incoming.RemoveRightsEvent, RemoveRightsEvent.class); - this.registerHandler(Incoming.PlaceBotEvent, PlaceBotEvent.class); - this.registerHandler(Incoming.RemoveBotFromFlatEvent, RemoveBotFromFlatEvent.class); - this.registerHandler(Incoming.CommandBotEvent, CommandBotEvent.class); - this.registerHandler(Incoming.GetBotCommandConfigurationDataEvent, GetBotCommandConfigurationDataEvent.class); - this.registerHandler(Incoming.ThrowDiceEvent, ThrowDiceEvent.class); - this.registerHandler(Incoming.DiceOffEvent, DiceOffEvent.class); - this.registerHandler(Incoming.SpinWheelOfFortuneEvent, SpinWheelOfFortuneEvent.class); - this.registerHandler(Incoming.CreditFurniRedeemEvent, CreditFurniRedeemEvent.class); - this.registerHandler(Incoming.PlacePetEvent, PlacePetEvent.class); - this.registerHandler(Incoming.RoomUserKickEvent, RoomUserKickEvent.class); - this.registerHandler(Incoming.SetCustomStackingHeightEvent, SetCustomStackingHeightEvent.class); - this.registerHandler(Incoming.EnterOneWayDoorEvent, EnterOneWayDoorEvent.class); - this.registerHandler(Incoming.LetUserInEvent, LetUserInEvent.class); - this.registerHandler(Incoming.CustomizeAvatarWithFurniEvent, CustomizeAvatarWithFurniEvent.class); - this.registerHandler(Incoming.PlacePostItEvent, PlacePostItEvent.class); - this.registerHandler(Incoming.GetItemDataEvent, GetItemDataEvent.class); - this.registerHandler(Incoming.SetItemDataEvent, SetItemDataEvent.class); - this.registerHandler(Incoming.RemoveItemEvent, RemoveItemEvent.class); - this.registerHandler(Incoming.RoomDimmerSavePresetEvent, RoomDimmerSavePresetEvent.class); - this.registerHandler(Incoming.RentableSpaceRentEvent, RentableSpaceRentEvent.class); - this.registerHandler(Incoming.RentableSpaceCancelRentEvent, RentableSpaceCancelRentEvent.class); - this.registerHandler(Incoming.UpdateHomeRoomEvent, UpdateHomeRoomEvent.class); - this.registerHandler(Incoming.PassCarryItemEvent, PassCarryItemEvent.class); - this.registerHandler(Incoming.MuteAllInRoomEvent, MuteAllInRoomEvent.class); - this.registerHandler(Incoming.GetCustomRoomFilterEvent, GetCustomRoomFilterEvent.class); - this.registerHandler(Incoming.UpdateRoomFilterEvent, UpdateRoomFilterEvent.class); - this.registerHandler(Incoming.SubmitRoomToCompetitionEvent, SubmitRoomToCompetitionEvent.class); - this.registerHandler(Incoming.GetBannedUsersFromRoomEvent, GetBannedUsersFromRoomEvent.class); - this.registerHandler(Incoming.GetOfficialSongIdEvent, GetOfficialSongIdEvent.class); - this.registerHandler(Incoming.GetSongInfoEvent, GetSongInfoEvent.class); - this.registerHandler(Incoming.AddJukeboxDiskEvent, AddJukeboxDiskEvent.class); - this.registerHandler(Incoming.RemoveJukeboxDiskEvent, RemoveJukeboxDiskEvent.class); - this.registerHandler(Incoming.GetNowPlayingEvent, GetNowPlayingEvent.class); - this.registerHandler(Incoming.JukeBoxEventOne, JukeBoxEventOne.class); // this doesnt even exist in the swf src for this prod. - this.registerHandler(Incoming.GetJukeboxPlayListEvent, GetJukeboxPlayListEvent.class); - this.registerHandler(Incoming.AddSpamWallPostItEvent, AddSpamWallPostItEvent.class); - this.registerHandler(Incoming.GetRoomAdPurchaseInfoEvent, GetRoomAdPurchaseInfoEvent.class); - this.registerHandler(Incoming.PurchaseRoomAdEvent, PurchaseRoomAdEvent.class); - this.registerHandler(Incoming.EditEventEvent, EditEventEvent.class); - this.registerHandler(Incoming.IgnoreUserEvent, IgnoreUserEvent.class); - this.registerHandler(Incoming.UnignoreUserEvent, UnignoreUserEvent.class); - this.registerHandler(Incoming.RoomUserMuteEvent, RoomUserMuteEvent.class); - this.registerHandler(Incoming.BanUserWithDurationEvent, BanUserWithDurationEvent.class); - this.registerHandler(Incoming.UnbanUserFromRoomEvent, UnbanUserFromRoomEvent.class); - this.registerHandler(Incoming.GetUserTagsEvent, GetUserTagsEvent.class); - this.registerHandler(Incoming.GetYoutubeDisplayStatusEvent, GetYoutubeDisplayStatusEvent.class); - this.registerHandler(Incoming.ControlYoutubeDisplayPlaybackEvent, ControlYoutubeDisplayPlaybackEvent.class); - this.registerHandler(Incoming.SetYoutubeDisplayPlaylistEvent, SetYoutubeDisplayPlaylistEvent.class); - this.registerHandler(Incoming.AddFavouriteRoomEvent, AddFavouriteRoomEvent.class); - this.registerHandler(Incoming.FriendFurniConfirmLockEvent, FriendFurniConfirmLockEvent.class); - this.registerHandler(Incoming.DeleteFavouriteRoomEvent, DeleteFavouriteRoomEvent.class); - this.registerHandler(Incoming.SetRandomStateEvent, SetRandomStateEvent.class); + this.registerHandler(Incoming.openFlatConnectionEvent, OpenFlatConnectionEvent.class); + this.registerHandler(Incoming.getFurnitureAliasesEvent, GetRoomEntryDataEvent.class);// should this be seperate event classes? + this.registerHandler(Incoming.getRoomEntryDataEvent, GetRoomEntryDataEvent.class);// should this be seperate event classes? + this.registerHandler(Incoming.rateFlatEvent, RateFlatEvent.class); + this.registerHandler(Incoming.getGuestRoomEvent, GetGuestRoomEvent.class); + this.registerHandler(Incoming.saveRoomSettingsEvent, SaveRoomSettingsEvent.class); + this.registerHandler(Incoming.placeObjectEvent, PlaceObjectEvent.class); + this.registerHandler(Incoming.moveObjectEvent, MoveObjectEvent.class); + this.registerHandler(Incoming.moveWallItemEvent, MoveWallItemEvent.class); + this.registerHandler(Incoming.pickupObjectEvent, PickupObjectEvent.class); + this.registerHandler(Incoming.requestRoomPropertySet, RequestRoomPropertySet.class); + this.registerHandler(Incoming.startTypingEvent, StartTypingEvent.class); + this.registerHandler(Incoming.cancelTypingEvent, CancelTypingEvent.class); + this.registerHandler(Incoming.useFurnitureEvent, UseFurnitureEvent.class); + this.registerHandler(Incoming.useWallItemEvent, UseWallItemEvent.class); + this.registerHandler(Incoming.setRoomBackgroundColorDataEvent, SetRoomBackgroundColorDataEvent.class); + this.registerHandler(Incoming.setMannequinNameEvent, SetMannequinNameEvent.class); + this.registerHandler(Incoming.setMannequinFigureEvent, SetMannequinFigureEvent.class); + this.registerHandler(Incoming.setClothingChangeDataEvent, SetClothingChangeDataEvent.class); + this.registerHandler(Incoming.setObjectDataEvent, SetObjectDataEvent.class); + this.registerHandler(Incoming.getRoomSettingsEvent, GetRoomSettingsEvent.class); + this.registerHandler(Incoming.roomDimmerGetPresetsEvent, RoomDimmerGetPresetsEvent.class); + this.registerHandler(Incoming.roomDimmerChangeStateEvent, RoomDimmerChangeStateEvent.class); + this.registerHandler(Incoming.dropCarryItemEvent, DropCarryItemEvent.class); + this.registerHandler(Incoming.lookToEvent, LookToEvent.class); + this.registerHandler(Incoming.chatEvent, ChatEvent.class); + this.registerHandler(Incoming.shoutEvent, ShoutEvent.class); + this.registerHandler(Incoming.whisperEvent, WhisperEvent.class); + this.registerHandler(Incoming.avatarExpressionEvent, AvatarExpressionEvent.class); + this.registerHandler(Incoming.changePostureEvent, ChangePostureEvent.class); + this.registerHandler(Incoming.danceEvent, DanceEvent.class); + this.registerHandler(Incoming.signEvent, SignEvent.class); + this.registerHandler(Incoming.moveAvatarEvent, MoveAvatarEvent.class); + this.registerHandler(Incoming.respectUserEvent, RespectUserEvent.class); + this.registerHandler(Incoming.assignRightsEvent, AssignRightsEvent.class); + this.registerHandler(Incoming.removeOwnRoomRightsRoomEvent, RemoveOwnRoomRightsRoomEvent.class); + this.registerHandler(Incoming.getFlatControllersEvent, GetFlatControllersEvent.class); + this.registerHandler(Incoming.removeAllRightsEvent, RemoveAllRightsEvent.class); + this.registerHandler(Incoming.removeRightsEvent, RemoveRightsEvent.class); + this.registerHandler(Incoming.placeBotEvent, PlaceBotEvent.class); + this.registerHandler(Incoming.removeBotFromFlatEvent, RemoveBotFromFlatEvent.class); + this.registerHandler(Incoming.commandBotEvent, CommandBotEvent.class); + this.registerHandler(Incoming.getBotCommandConfigurationDataEvent, GetBotCommandConfigurationDataEvent.class); + this.registerHandler(Incoming.throwDiceEvent, ThrowDiceEvent.class); + this.registerHandler(Incoming.diceOffEvent, DiceOffEvent.class); + this.registerHandler(Incoming.spinWheelOfFortuneEvent, SpinWheelOfFortuneEvent.class); + this.registerHandler(Incoming.creditFurniRedeemEvent, CreditFurniRedeemEvent.class); + this.registerHandler(Incoming.placePetEvent, PlacePetEvent.class); + this.registerHandler(Incoming.roomUserKickEvent, RoomUserKickEvent.class); + this.registerHandler(Incoming.setCustomStackingHeightEvent, SetCustomStackingHeightEvent.class); + this.registerHandler(Incoming.enterOneWayDoorEvent, EnterOneWayDoorEvent.class); + this.registerHandler(Incoming.letUserInEvent, LetUserInEvent.class); + this.registerHandler(Incoming.customizeAvatarWithFurniEvent, CustomizeAvatarWithFurniEvent.class); + this.registerHandler(Incoming.placePostItEvent, PlacePostItEvent.class); + this.registerHandler(Incoming.getItemDataEvent, GetItemDataEvent.class); + this.registerHandler(Incoming.setItemDataEvent, SetItemDataEvent.class); + this.registerHandler(Incoming.removeItemEvent, RemoveItemEvent.class); + this.registerHandler(Incoming.roomDimmerSavePresetEvent, RoomDimmerSavePresetEvent.class); + this.registerHandler(Incoming.rentableSpaceRentEvent, RentableSpaceRentEvent.class); + this.registerHandler(Incoming.rentableSpaceCancelRentEvent, RentableSpaceCancelRentEvent.class); + this.registerHandler(Incoming.updateHomeRoomEvent, UpdateHomeRoomEvent.class); + this.registerHandler(Incoming.passCarryItemEvent, PassCarryItemEvent.class); + this.registerHandler(Incoming.muteAllInRoomEvent, MuteAllInRoomEvent.class); + this.registerHandler(Incoming.getCustomRoomFilterEvent, GetCustomRoomFilterEvent.class); + this.registerHandler(Incoming.updateRoomFilterEvent, UpdateRoomFilterEvent.class); + this.registerHandler(Incoming.submitRoomToCompetitionEvent, SubmitRoomToCompetitionEvent.class); + this.registerHandler(Incoming.getBannedUsersFromRoomEvent, GetBannedUsersFromRoomEvent.class); + this.registerHandler(Incoming.getOfficialSongIdEvent, GetOfficialSongIdEvent.class); + this.registerHandler(Incoming.getSongInfoEvent, GetSongInfoEvent.class); + this.registerHandler(Incoming.addJukeboxDiskEvent, AddJukeboxDiskEvent.class); + this.registerHandler(Incoming.removeJukeboxDiskEvent, RemoveJukeboxDiskEvent.class); + this.registerHandler(Incoming.getNowPlayingEvent, GetNowPlayingEvent.class); + this.registerHandler(Incoming.jukeBoxEventOne, JukeBoxEventOne.class); // this doesnt even exist in the swf src for this prod. + this.registerHandler(Incoming.getJukeboxPlayListEvent, GetJukeboxPlayListEvent.class); + this.registerHandler(Incoming.addSpamWallPostItEvent, AddSpamWallPostItEvent.class); + this.registerHandler(Incoming.getRoomAdPurchaseInfoEvent, GetRoomAdPurchaseInfoEvent.class); + this.registerHandler(Incoming.purchaseRoomAdEvent, PurchaseRoomAdEvent.class); + this.registerHandler(Incoming.editEventEvent, EditEventEvent.class); + this.registerHandler(Incoming.ignoreUserEvent, IgnoreUserEvent.class); + this.registerHandler(Incoming.unignoreUserEvent, UnignoreUserEvent.class); + this.registerHandler(Incoming.roomUserMuteEvent, RoomUserMuteEvent.class); + this.registerHandler(Incoming.banUserWithDurationEvent, BanUserWithDurationEvent.class); + this.registerHandler(Incoming.unbanUserFromRoomEvent, UnbanUserFromRoomEvent.class); + this.registerHandler(Incoming.getUserTagsEvent, GetUserTagsEvent.class); + this.registerHandler(Incoming.getYoutubeDisplayStatusEvent, GetYoutubeDisplayStatusEvent.class); + this.registerHandler(Incoming.controlYoutubeDisplayPlaybackEvent, ControlYoutubeDisplayPlaybackEvent.class); + this.registerHandler(Incoming.setYoutubeDisplayPlaylistEvent, SetYoutubeDisplayPlaylistEvent.class); + this.registerHandler(Incoming.addFavouriteRoomEvent, AddFavouriteRoomEvent.class); + this.registerHandler(Incoming.friendFurniConfirmLockEvent, FriendFurniConfirmLockEvent.class); + this.registerHandler(Incoming.deleteFavouriteRoomEvent, DeleteFavouriteRoomEvent.class); + this.registerHandler(Incoming.setRandomStateEvent, SetRandomStateEvent.class); } void registerPolls() throws Exception { - this.registerHandler(Incoming.PollRejectEvent, PollRejectEvent.class); - this.registerHandler(Incoming.PollStartEvent, PollStartEvent.class); - this.registerHandler(Incoming.AnswerPollEvent, AnswerPollEvent.class); + this.registerHandler(Incoming.pollRejectEvent, PollRejectEvent.class); + this.registerHandler(Incoming.pollStartEvent, PollStartEvent.class); + this.registerHandler(Incoming.answerPollEvent, AnswerPollEvent.class); } void registerModTool() throws Exception { - this.registerHandler(Incoming.GetModeratorRoomInfoEvent, GetModeratorRoomInfoEvent.class); - this.registerHandler(Incoming.GetRoomChatlogEvent, GetRoomChatlogEvent.class); - this.registerHandler(Incoming.GetModeratorUserInfoEvent, GetModeratorUserInfoEvent.class); - this.registerHandler(Incoming.PickIssuesEvent, PickIssuesEvent.class); - this.registerHandler(Incoming.CloseIssuesEvent, CloseIssuesEvent.class); - this.registerHandler(Incoming.ReleaseIssuesEvent, ReleaseIssuesEvent.class); - this.registerHandler(Incoming.ModMessageEvent, ModMessageEvent.class); - this.registerHandler(Incoming.ModToolWarnEvent, ModToolWarnEvent.class); - this.registerHandler(Incoming.ModKickEvent, ModKickEvent.class); - this.registerHandler(Incoming.ModeratorActionEvent, ModeratorActionEvent.class); - this.registerHandler(Incoming.ModerateRoomEvent, ModerateRoomEvent.class); - this.registerHandler(Incoming.GetRoomVisitsEvent, GetRoomVisitsEvent.class); - this.registerHandler(Incoming.GetCfhChatlogEvent, GetCfhChatlogEvent.class); - this.registerHandler(Incoming.ModToolRequestRoomUserChatlogEvent, ModToolRequestRoomUserChatlogEvent.class); - this.registerHandler(Incoming.GetUserChatlogEvent, GetUserChatlogEvent.class); - this.registerHandler(Incoming.ModAlertEvent, ModAlertEvent.class); - this.registerHandler(Incoming.ModMuteEvent, ModMuteEvent.class); - this.registerHandler(Incoming.ModBanEvent, ModBanEvent.class); - this.registerHandler(Incoming.ModTradingLockEvent, ModTradingLockEvent.class); - this.registerHandler(Incoming.ModToolSanctionEvent, ModToolSanctionEvent.class); - this.registerHandler(Incoming.CloseIssueDefaultActionEvent, CloseIssueDefaultActionEvent.class); + this.registerHandler(Incoming.getModeratorRoomInfoEvent, GetModeratorRoomInfoEvent.class); + this.registerHandler(Incoming.getRoomChatlogEvent, GetRoomChatlogEvent.class); + this.registerHandler(Incoming.getModeratorUserInfoEvent, GetModeratorUserInfoEvent.class); + this.registerHandler(Incoming.pickIssuesEvent, PickIssuesEvent.class); + this.registerHandler(Incoming.closeIssuesEvent, CloseIssuesEvent.class); + this.registerHandler(Incoming.releaseIssuesEvent, ReleaseIssuesEvent.class); + this.registerHandler(Incoming.modMessageEvent, ModMessageEvent.class); + this.registerHandler(Incoming.modToolWarnEvent, ModToolWarnEvent.class); + this.registerHandler(Incoming.modKickEvent, ModKickEvent.class); + this.registerHandler(Incoming.moderatorActionEvent, ModeratorActionEvent.class); + this.registerHandler(Incoming.moderateRoomEvent, ModerateRoomEvent.class); + this.registerHandler(Incoming.getRoomVisitsEvent, GetRoomVisitsEvent.class); + this.registerHandler(Incoming.getCfhChatlogEvent, GetCfhChatlogEvent.class); + this.registerHandler(Incoming.modToolRequestRoomUserChatlogEvent, ModToolRequestRoomUserChatlogEvent.class); + this.registerHandler(Incoming.getUserChatlogEvent, GetUserChatlogEvent.class); + this.registerHandler(Incoming.modAlertEvent, ModAlertEvent.class); + this.registerHandler(Incoming.modMuteEvent, ModMuteEvent.class); + this.registerHandler(Incoming.modBanEvent, ModBanEvent.class); + this.registerHandler(Incoming.modTradingLockEvent, ModTradingLockEvent.class); + this.registerHandler(Incoming.modToolSanctionEvent, ModToolSanctionEvent.class); + this.registerHandler(Incoming.closeIssueDefaultActionEvent, CloseIssueDefaultActionEvent.class); - this.registerHandler(Incoming.GetPendingCallsForHelpEvent, GetPendingCallsForHelpEvent.class); - this.registerHandler(Incoming.GetGuideReportingStatusEvent, GetGuideReportingStatusEvent.class); - this.registerHandler(Incoming.ChatReviewSessionCreateEvent, ChatReviewSessionCreateEvent.class); - this.registerHandler(Incoming.CallForHelpEvent, CallForHelpEvent.class); - this.registerHandler(Incoming.CallForHelpFromIMEvent, CallForHelpFromIMEvent.class); - this.registerHandler(Incoming.CallForHelpFromForumThreadEvent, CallForHelpFromForumThreadEvent.class); - this.registerHandler(Incoming.CallForHelpFromForumMessageEvent, CallForHelpFromForumMessageEvent.class); - this.registerHandler(Incoming.CallForHelpFromPhotoEvent, CallForHelpFromPhotoEvent.class); + this.registerHandler(Incoming.getPendingCallsForHelpEvent, GetPendingCallsForHelpEvent.class); + this.registerHandler(Incoming.getGuideReportingStatusEvent, GetGuideReportingStatusEvent.class); + this.registerHandler(Incoming.chatReviewSessionCreateEvent, ChatReviewSessionCreateEvent.class); + this.registerHandler(Incoming.callForHelpEvent, CallForHelpEvent.class); + this.registerHandler(Incoming.callForHelpFromIMEvent, CallForHelpFromIMEvent.class); + this.registerHandler(Incoming.callForHelpFromForumThreadEvent, CallForHelpFromForumThreadEvent.class); + this.registerHandler(Incoming.callForHelpFromForumMessageEvent, CallForHelpFromForumMessageEvent.class); + this.registerHandler(Incoming.callForHelpFromPhotoEvent, CallForHelpFromPhotoEvent.class); } void registerTrading() throws Exception { - this.registerHandler(Incoming.OpenTradingEvent, OpenTradingEvent.class); - this.registerHandler(Incoming.AddItemToTradeEvent, AddItemToTradeEvent.class); - this.registerHandler(Incoming.AddItemsToTradeEvent, AddItemsToTradeEvent.class); - this.registerHandler(Incoming.RemoveItemFromTradeEvent, RemoveItemFromTradeEvent.class); - this.registerHandler(Incoming.AcceptTradingEvent, AcceptTradingEvent.class); - this.registerHandler(Incoming.UnacceptTradingEvent, UnacceptTradingEvent.class); - this.registerHandler(Incoming.ConfirmAcceptTradingEvent, ConfirmAcceptTradingEvent.class); - this.registerHandler(Incoming.CloseTradingEvent, CloseTradingEvent.class); - this.registerHandler(Incoming.ConfirmDeclineTradingEvent, ConfirmDeclineTradingEvent.class); + this.registerHandler(Incoming.openTradingEvent, OpenTradingEvent.class); + this.registerHandler(Incoming.addItemToTradeEvent, AddItemToTradeEvent.class); + this.registerHandler(Incoming.addItemsToTradeEvent, AddItemsToTradeEvent.class); + this.registerHandler(Incoming.removeItemFromTradeEvent, RemoveItemFromTradeEvent.class); + this.registerHandler(Incoming.acceptTradingEvent, AcceptTradingEvent.class); + this.registerHandler(Incoming.unacceptTradingEvent, UnacceptTradingEvent.class); + this.registerHandler(Incoming.confirmAcceptTradingEvent, ConfirmAcceptTradingEvent.class); + this.registerHandler(Incoming.closeTradingEvent, CloseTradingEvent.class); + this.registerHandler(Incoming.confirmDeclineTradingEvent, ConfirmDeclineTradingEvent.class); } void registerGuilds() throws Exception { - this.registerHandler(Incoming.GetGuildCreationInfoEvent, GetGuildCreationInfoEvent.class); - this.registerHandler(Incoming.GetGuildEditorDataEvent, GetGuildEditorDataEvent.class); - this.registerHandler(Incoming.CreateGuildEvent, CreateGuildEvent.class); - this.registerHandler(Incoming.GetHabboGroupDetailsEvent, GetHabboGroupDetailsEvent.class); - this.registerHandler(Incoming.GetGuildEditInfoEvent, GetGuildEditInfoEvent.class); - this.registerHandler(Incoming.GetGuildMembersEvent, GetGuildMembersEvent.class); - this.registerHandler(Incoming.JoinHabboGroupEvent, JoinHabboGroupEvent.class); - this.registerHandler(Incoming.UpdateGuildIdentityEvent, UpdateGuildIdentityEvent.class); - this.registerHandler(Incoming.UpdateGuildBadgeEvent, UpdateGuildBadgeEvent.class); - this.registerHandler(Incoming.UpdateGuildColorsEvent, UpdateGuildColorsEvent.class); - this.registerHandler(Incoming.RemoveAdminRightsFromMemberEvent, RemoveAdminRightsFromMemberEvent.class); - this.registerHandler(Incoming.KickMemberEvent, KickMemberEvent.class); - this.registerHandler(Incoming.UpdateGuildSettingsEvent, UpdateGuildSettingsEvent.class); - this.registerHandler(Incoming.ApproveMembershipRequestEvent, ApproveMembershipRequestEvent.class); - this.registerHandler(Incoming.RejectMembershipRequestEvent, RejectMembershipRequestEvent.class); - this.registerHandler(Incoming.AddAdminRightsToMemberEvent, AddAdminRightsToMemberEvent.class); - this.registerHandler(Incoming.SelectFavouriteHabboGroupEvent, SelectFavouriteHabboGroupEvent.class); - this.registerHandler(Incoming.GetGuildMembershipsEvent, GetGuildMembershipsEvent.class); - this.registerHandler(Incoming.GetGuildFurniContextMenuInfoEvent, GetGuildFurniContextMenuInfoEvent.class); - this.registerHandler(Incoming.GetMemberGuildItemCountEvent, GetMemberGuildItemCountEvent.class); - this.registerHandler(Incoming.DeselectFavouriteHabboGroupEvent, DeselectFavouriteHabboGroupEvent.class); - this.registerHandler(Incoming.DeactivateGuildEvent, DeactivateGuildEvent.class); - this.registerHandler(Incoming.GetForumsListEvent, GetForumsListEvent.class); - this.registerHandler(Incoming.GetThreadsEvent, GetThreadsEvent.class); - this.registerHandler(Incoming.GetForumStatsEvent, GetForumStatsEvent.class); - this.registerHandler(Incoming.PostMessageEvent, PostMessageEvent.class); - this.registerHandler(Incoming.UpdateForumSettingsEvent, UpdateForumSettingsEvent.class); - this.registerHandler(Incoming.GetMessagesEvent, GetMessagesEvent.class); - this.registerHandler(Incoming.ModerateMessageEvent, ModerateMessageEvent.class); - this.registerHandler(Incoming.ModerateThreadEvent, ModerateThreadEvent.class); - this.registerHandler(Incoming.UpdateThreadEvent, UpdateThreadEvent.class); - this.registerHandler(Incoming.GetHabboGroupBadgesEvent, GetHabboGroupBadgesEvent.class); + this.registerHandler(Incoming.getGuildCreationInfoEvent, GetGuildCreationInfoEvent.class); + this.registerHandler(Incoming.getGuildEditorDataEvent, GetGuildEditorDataEvent.class); + this.registerHandler(Incoming.createGuildEvent, CreateGuildEvent.class); + this.registerHandler(Incoming.getHabboGroupDetailsEvent, GetHabboGroupDetailsEvent.class); + this.registerHandler(Incoming.getGuildEditInfoEvent, GetGuildEditInfoEvent.class); + this.registerHandler(Incoming.getGuildMembersEvent, GetGuildMembersEvent.class); + this.registerHandler(Incoming.joinHabboGroupEvent, JoinHabboGroupEvent.class); + this.registerHandler(Incoming.updateGuildIdentityEvent, UpdateGuildIdentityEvent.class); + this.registerHandler(Incoming.updateGuildBadgeEvent, UpdateGuildBadgeEvent.class); + this.registerHandler(Incoming.updateGuildColorsEvent, UpdateGuildColorsEvent.class); + this.registerHandler(Incoming.removeAdminRightsFromMemberEvent, RemoveAdminRightsFromMemberEvent.class); + this.registerHandler(Incoming.kickMemberEvent, KickMemberEvent.class); + this.registerHandler(Incoming.updateGuildSettingsEvent, UpdateGuildSettingsEvent.class); + this.registerHandler(Incoming.approveMembershipRequestEvent, ApproveMembershipRequestEvent.class); + this.registerHandler(Incoming.rejectMembershipRequestEvent, RejectMembershipRequestEvent.class); + this.registerHandler(Incoming.addAdminRightsToMemberEvent, AddAdminRightsToMemberEvent.class); + this.registerHandler(Incoming.selectFavouriteHabboGroupEvent, SelectFavouriteHabboGroupEvent.class); + this.registerHandler(Incoming.getGuildMembershipsEvent, GetGuildMembershipsEvent.class); + this.registerHandler(Incoming.getGuildFurniContextMenuInfoEvent, GetGuildFurniContextMenuInfoEvent.class); + this.registerHandler(Incoming.getMemberGuildItemCountEvent, GetMemberGuildItemCountEvent.class); + this.registerHandler(Incoming.deselectFavouriteHabboGroupEvent, DeselectFavouriteHabboGroupEvent.class); + this.registerHandler(Incoming.deactivateGuildEvent, DeactivateGuildEvent.class); + this.registerHandler(Incoming.getForumsListEvent, GetForumsListEvent.class); + this.registerHandler(Incoming.getThreadsEvent, GetThreadsEvent.class); + this.registerHandler(Incoming.getForumStatsEvent, GetForumStatsEvent.class); + this.registerHandler(Incoming.postMessageEvent, PostMessageEvent.class); + this.registerHandler(Incoming.updateForumSettingsEvent, UpdateForumSettingsEvent.class); + this.registerHandler(Incoming.getMessagesEvent, GetMessagesEvent.class); + this.registerHandler(Incoming.moderateMessageEvent, ModerateMessageEvent.class); + this.registerHandler(Incoming.moderateThreadEvent, ModerateThreadEvent.class); + this.registerHandler(Incoming.updateThreadEvent, UpdateThreadEvent.class); + this.registerHandler(Incoming.getHabboGroupBadgesEvent, GetHabboGroupBadgesEvent.class); -// this.registerHandler(Incoming.GuildForumDataEvent, GuildForumModerateMessageEvent.class); -// this.registerHandler(Incoming.GuildForumDataEvent, GuildForumModerateThreadEvent.class); -// this.registerHandler(Incoming.GuildForumDataEvent, GuildForumPostThreadEvent.class); -// this.registerHandler(Incoming.GuildForumDataEvent, GuildForumThreadsEvent.class); -// this.registerHandler(Incoming.GuildForumDataEvent, GuildForumThreadsMessagesEvent.class); -// this.registerHandler(Incoming.GuildForumDataEvent, GuildForumUpdateSettingsEvent.class); +// this.registerHandler(Incoming.guildForumDataEvent, GuildForumModerateMessageEvent.class); +// this.registerHandler(Incoming.guildForumDataEvent, GuildForumModerateThreadEvent.class); +// this.registerHandler(Incoming.guildForumDataEvent, GuildForumPostThreadEvent.class); +// this.registerHandler(Incoming.guildForumDataEvent, GuildForumThreadsEvent.class); +// this.registerHandler(Incoming.guildForumDataEvent, GuildForumThreadsMessagesEvent.class); +// this.registerHandler(Incoming.guildForumDataEvent, GuildForumUpdateSettingsEvent.class); } void registerPets() throws Exception { - this.registerHandler(Incoming.GetPetInfoEvent, GetPetInfoEvent.class); - this.registerHandler(Incoming.RemovePetFromFlatEvent, RemovePetFromFlatEvent.class); - this.registerHandler(Incoming.RespectPetEvent, RespectPetEvent.class); - this.registerHandler(Incoming.GetPetCommandsEvent, GetPetCommandsEvent.class); - this.registerHandler(Incoming.CustomizePetWithFurniEvent, CustomizePetWithFurniEvent.class); - this.registerHandler(Incoming.TogglePetRidingPermissionEvent, TogglePetRidingPermissionEvent.class); - this.registerHandler(Incoming.MountPetEvent, MountPetEvent.class); - this.registerHandler(Incoming.RemoveSaddleFromPetEvent, RemoveSaddleFromPetEvent.class); - this.registerHandler(Incoming.TogglePetBreedingPermissionEvent, TogglePetBreedingPermissionEvent.class); - this.registerHandler(Incoming.CompostPlantEvent, CompostPlantEvent.class); - this.registerHandler(Incoming.BreedPetsEvent, BreedPetsEvent.class); - this.registerHandler(Incoming.MovePetEvent, MovePetEvent.class); - this.registerHandler(Incoming.OpenPetPackageEvent, OpenPetPackageEvent.class); - this.registerHandler(Incoming.CancelPetBreedingEvent, CancelPetBreedingEvent.class); - this.registerHandler(Incoming.ConfirmPetBreedingEvent, ConfirmPetBreedingEvent.class); + this.registerHandler(Incoming.getPetInfoEvent, GetPetInfoEvent.class); + this.registerHandler(Incoming.removePetFromFlatEvent, RemovePetFromFlatEvent.class); + this.registerHandler(Incoming.respectPetEvent, RespectPetEvent.class); + this.registerHandler(Incoming.getPetCommandsEvent, GetPetCommandsEvent.class); + this.registerHandler(Incoming.customizePetWithFurniEvent, CustomizePetWithFurniEvent.class); + this.registerHandler(Incoming.togglePetRidingPermissionEvent, TogglePetRidingPermissionEvent.class); + this.registerHandler(Incoming.mountPetEvent, MountPetEvent.class); + this.registerHandler(Incoming.removeSaddleFromPetEvent, RemoveSaddleFromPetEvent.class); + this.registerHandler(Incoming.togglePetBreedingPermissionEvent, TogglePetBreedingPermissionEvent.class); + this.registerHandler(Incoming.compostPlantEvent, CompostPlantEvent.class); + this.registerHandler(Incoming.breedPetsEvent, BreedPetsEvent.class); + this.registerHandler(Incoming.movePetEvent, MovePetEvent.class); + this.registerHandler(Incoming.openPetPackageEvent, OpenPetPackageEvent.class); + this.registerHandler(Incoming.cancelPetBreedingEvent, CancelPetBreedingEvent.class); + this.registerHandler(Incoming.confirmPetBreedingEvent, ConfirmPetBreedingEvent.class); } void registerWired() throws Exception { - this.registerHandler(Incoming.UpdateTriggerEvent, UpdateTriggerEvent.class); - this.registerHandler(Incoming.UpdateActionEvent, UpdateActionEvent.class); - this.registerHandler(Incoming.UpdateConditionEvent, UpdateConditionEvent.class); - this.registerHandler(Incoming.ApplySnapshotEvent, ApplySnapshotEvent.class); + this.registerHandler(Incoming.updateTriggerEvent, UpdateTriggerEvent.class); + this.registerHandler(Incoming.updateActionEvent, UpdateActionEvent.class); + this.registerHandler(Incoming.updateConditionEvent, UpdateConditionEvent.class); + this.registerHandler(Incoming.applySnapshotEvent, ApplySnapshotEvent.class); } void registerUnknown() throws Exception { - this.registerHandler(Incoming.GetResolutionAchievementsEvent, GetResolutionAchievementsEvent.class); - this.registerHandler(Incoming.GetTalentTrackEvent, GetTalentTrackEvent.class); - this.registerHandler(Incoming.GetBadgePointLimitsEvent, GetBadgePointLimitsEvent.class); - this.registerHandler(Incoming.GetCfhStatusEvent, GetCfhStatusEvent.class); + this.registerHandler(Incoming.getResolutionAchievementsEvent, GetResolutionAchievementsEvent.class); + this.registerHandler(Incoming.getTalentTrackEvent, GetTalentTrackEvent.class); + this.registerHandler(Incoming.getBadgePointLimitsEvent, GetBadgePointLimitsEvent.class); + this.registerHandler(Incoming.getCfhStatusEvent, GetCfhStatusEvent.class); } void registerFloorPlanEditor() throws Exception { - this.registerHandler(Incoming.UpdateFloorPropertiesEvent, UpdateFloorPropertiesEvent.class); - this.registerHandler(Incoming.GetOccupiedTilesEvent, GetOccupiedTilesEvent.class); - this.registerHandler(Incoming.GetRoomEntryTileEvent, GetRoomEntryTileEvent.class); + this.registerHandler(Incoming.updateFloorPropertiesEvent, UpdateFloorPropertiesEvent.class); + this.registerHandler(Incoming.getOccupiedTilesEvent, GetOccupiedTilesEvent.class); + this.registerHandler(Incoming.getRoomEntryTileEvent, GetRoomEntryTileEvent.class); } void registerAchievements() throws Exception { - this.registerHandler(Incoming.GetAchievementsEvent, GetAchievementsEvent.class); - this.registerHandler(Incoming.RequestAchievementConfigurationEvent, RequestAchievementConfigurationEvent.class); + this.registerHandler(Incoming.getAchievementsEvent, GetAchievementsEvent.class); + this.registerHandler(Incoming.requestAchievementConfigurationEvent, RequestAchievementConfigurationEvent.class); } void registerGuides() throws Exception { - this.registerHandler(Incoming.GuideSessionOnDutyUpdateEvent, GuideSessionOnDutyUpdateEvent.class); - this.registerHandler(Incoming.GuideSessionCreateEvent, GuideSessionCreateEvent.class); - this.registerHandler(Incoming.GuideSessionIsTypingEvent, GuideSessionIsTypingEvent.class); - this.registerHandler(Incoming.GuideSessionReportEvent, GuideSessionReportEvent.class); - this.registerHandler(Incoming.GuideSessionFeedbackEvent, GuideSessionFeedbackEvent.class); - this.registerHandler(Incoming.GuideSessionMessageEvent, GuideSessionMessageEvent.class); - this.registerHandler(Incoming.GuideSessionRequesterCancelsEvent, GuideSessionRequesterCancelsEvent.class); - this.registerHandler(Incoming.GuideSessionGuideDecidesEvent, GuideSessionGuideDecidesEvent.class); - this.registerHandler(Incoming.GuideSessionInviteRequesterEvent, GuideSessionInviteRequesterEvent.class); - this.registerHandler(Incoming.GuideSessionGetRequesterRoomEvent, GuideSessionGetRequesterRoomEvent.class); - this.registerHandler(Incoming.GuideSessionResolvedEvent, GuideSessionResolvedEvent.class); + this.registerHandler(Incoming.guideSessionOnDutyUpdateEvent, GuideSessionOnDutyUpdateEvent.class); + this.registerHandler(Incoming.guideSessionCreateEvent, GuideSessionCreateEvent.class); + this.registerHandler(Incoming.guideSessionIsTypingEvent, GuideSessionIsTypingEvent.class); + this.registerHandler(Incoming.guideSessionReportEvent, GuideSessionReportEvent.class); + this.registerHandler(Incoming.guideSessionFeedbackEvent, GuideSessionFeedbackEvent.class); + this.registerHandler(Incoming.guideSessionMessageEvent, GuideSessionMessageEvent.class); + this.registerHandler(Incoming.guideSessionRequesterCancelsEvent, GuideSessionRequesterCancelsEvent.class); + this.registerHandler(Incoming.guideSessionGuideDecidesEvent, GuideSessionGuideDecidesEvent.class); + this.registerHandler(Incoming.guideSessionInviteRequesterEvent, GuideSessionInviteRequesterEvent.class); + this.registerHandler(Incoming.guideSessionGetRequesterRoomEvent, GuideSessionGetRequesterRoomEvent.class); + this.registerHandler(Incoming.guideSessionResolvedEvent, GuideSessionResolvedEvent.class); - this.registerHandler(Incoming.ChatReviewGuideDetachedEvent, ChatReviewGuideDetachedEvent.class); - this.registerHandler(Incoming.ChatReviewGuideDecidesOnOfferEvent, ChatReviewGuideDecidesOnOfferEvent.class); - this.registerHandler(Incoming.ChatReviewGuideVoteEvent, ChatReviewGuideVoteEvent.class); + this.registerHandler(Incoming.chatReviewGuideDetachedEvent, ChatReviewGuideDetachedEvent.class); + this.registerHandler(Incoming.chatReviewGuideDecidesOnOfferEvent, ChatReviewGuideDecidesOnOfferEvent.class); + this.registerHandler(Incoming.chatReviewGuideVoteEvent, ChatReviewGuideVoteEvent.class); } void registerCrafting() throws Exception { - this.registerHandler(Incoming.GetCraftingRecipeEvent, GetCraftingRecipeEvent.class); - this.registerHandler(Incoming.GetCraftableProductsEvent, GetCraftableProductsEvent.class); - this.registerHandler(Incoming.CraftEvent, CraftEvent.class); - this.registerHandler(Incoming.CraftSecretEvent, CraftSecretEvent.class); - this.registerHandler(Incoming.GetCraftingRecipesAvailableEvent, GetCraftingRecipesAvailableEvent.class); + this.registerHandler(Incoming.getCraftingRecipeEvent, GetCraftingRecipeEvent.class); + this.registerHandler(Incoming.getCraftableProductsEvent, GetCraftableProductsEvent.class); + this.registerHandler(Incoming.craftEvent, CraftEvent.class); + this.registerHandler(Incoming.craftSecretEvent, CraftSecretEvent.class); + this.registerHandler(Incoming.getCraftingRecipesAvailableEvent, GetCraftingRecipesAvailableEvent.class); } void registerCamera() throws Exception { - this.registerHandler(Incoming.RenderRoomEvent, RenderRoomEvent.class); - this.registerHandler(Incoming.RequestCameraConfigurationEvent, RequestCameraConfigurationEvent.class); - this.registerHandler(Incoming.PurchasePhotoEvent, PurchasePhotoEvent.class); - this.registerHandler(Incoming.RenderRoomThumbnailEvent, RenderRoomThumbnailEvent.class); - this.registerHandler(Incoming.PublishPhotoEvent, PublishPhotoEvent.class); + this.registerHandler(Incoming.renderRoomEvent, RenderRoomEvent.class); + this.registerHandler(Incoming.requestCameraConfigurationEvent, RequestCameraConfigurationEvent.class); + this.registerHandler(Incoming.purchasePhotoEvent, PurchasePhotoEvent.class); + this.registerHandler(Incoming.renderRoomThumbnailEvent, RenderRoomThumbnailEvent.class); + this.registerHandler(Incoming.publishPhotoEvent, PublishPhotoEvent.class); } void registerGameCenter() throws Exception { - this.registerHandler(Incoming.GetGameListEvent, GetGameListEvent.class); - this.registerHandler(Incoming.GetGameStatusEvent, GetGameStatusEvent.class); - this.registerHandler(Incoming.JoinQueueEvent, JoinQueueEvent.class); - this.registerHandler(Incoming.GetWeeklyGameRewardWinnersEvent, GetWeeklyGameRewardWinnersEvent.class); - this.registerHandler(Incoming.GameUnloadedEvent, GameUnloadedEvent.class); - this.registerHandler(Incoming.GetWeeklyGameRewardEvent, GetWeeklyGameRewardEvent.class); - this.registerHandler(Incoming.Game2GetAccountGameStatusEvent, Game2GetAccountGameStatusEvent.class); + this.registerHandler(Incoming.getGameListEvent, GetGameListEvent.class); + this.registerHandler(Incoming.getGameStatusEvent, GetGameStatusEvent.class); + this.registerHandler(Incoming.joinQueueEvent, JoinQueueEvent.class); + this.registerHandler(Incoming.getWeeklyGameRewardWinnersEvent, GetWeeklyGameRewardWinnersEvent.class); + this.registerHandler(Incoming.gameUnloadedEvent, GameUnloadedEvent.class); + this.registerHandler(Incoming.getWeeklyGameRewardEvent, GetWeeklyGameRewardEvent.class); + this.registerHandler(Incoming.game2GetAccountGameStatusEvent, Game2GetAccountGameStatusEvent.class); } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/incoming/Incoming.java b/src/main/java/com/eu/habbo/messages/incoming/Incoming.java index b6f99ae9..2bd4de8e 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/Incoming.java +++ b/src/main/java/com/eu/habbo/messages/incoming/Incoming.java @@ -2,507 +2,507 @@ package com.eu.habbo.messages.incoming; public class Incoming { - /* - Incoming Emulator Packets which are currently implemented. - Named 1:1 based on outgoing client packet names from PRODUCTION-201611291003-338511768 + /** + * Incoming Emulator Packets which are currently implemented. + * Named 1:1 based on outgoing client packet names from PRODUCTION-201611291003-338511768 */ - public static final int AcceptFriendEvent = 137; - public static final int AcceptTradingEvent = 3863; - public static final int AddAdminRightsToMemberEvent = 2894; - public static final int AddFavouriteRoomEvent = 3817; - public static final int AddItemToTradeEvent = 3107; - public static final int AddItemsToTradeEvent = 1263; - public static final int AddJukeboxDiskEvent = 753; - public static final int AddSpamWallPostItEvent = 3283; - public static final int AmbassadorAlertEvent = 2996; - public static final int AnswerPollEvent = 3505; - public static final int ApplySnapshotEvent = 3373; - public static final int ApproveMembershipRequestEvent = 3386; - public static final int ApproveNameEvent = 2109; - public static final int AssignRightsEvent = 808; - public static final int AvatarEffectActivatedEvent = 2959; - public static final int AvatarEffectSelectedEvent = 1752; - public static final int AvatarExpressionEvent = 2456; - public static final int BanUserWithDurationEvent = 1477; - public static final int BreedPetsEvent = 1638; - public static final int BuildersClubPlaceWallItemEvent = 2462; - public static final int BuildersClubQueryFurniCountEvent = 2529; - public static final int BuyMarketplaceOfferEvent = 1603; - public static final int CallForHelpEvent = 1691; - public static final int CallForHelpFromForumMessageEvent = 1412; - public static final int CallForHelpFromForumThreadEvent = 534; - public static final int CallForHelpFromIMEvent = 2950; - public static final int CallForHelpFromPhotoEvent = 2492; - public static final int CanCreateRoomEvent = 2128; - public static final int CancelMarketplaceOfferEvent = 434; - public static final int CancelPetBreedingEvent = 2713; - public static final int CancelTypingEvent = 1474; - public static final int ChangeMottoEvent = 2228; - public static final int ChangePostureEvent = 2235; - public static final int ChangeUserNameEvent = 2977; - public static final int ChatEvent = 1314; - public static final int ChatReviewGuideDecidesOnOfferEvent = 3365; - public static final int ChatReviewGuideDetachedEvent = 2501; - public static final int ChatReviewGuideVoteEvent = 3961; - public static final int ChatReviewSessionCreateEvent = 3060; - public static final int CheckUserNameEvent = 3950; - public static final int ClientHelloEvent = 4000; - public static final int CloseIssueDefaultActionEvent = 2717; - public static final int CloseIssuesEvent = 2067; - public static final int CloseTradingEvent = 2551; - public static final int CommandBotEvent = 2624; - public static final int CompleteDiffieHandshakeEvent = 773; - public static final int CompostPlantEvent = 3835; - public static final int ConfirmAcceptTradingEvent = 2760; - public static final int ConfirmDeclineTradingEvent = 2341; - public static final int ConfirmPetBreedingEvent = 3382; - public static final int ControlYoutubeDisplayPlaybackEvent = 3005; - public static final int CraftEvent = 3591; - public static final int CraftSecretEvent = 1251; - public static final int CreateFlatEvent = 2752; - public static final int CreateGuildEvent = 230; - public static final int CreditFurniRedeemEvent = 3115; - public static final int CustomizeAvatarWithFurniEvent = 3374; - public static final int CustomizePetWithFurniEvent = 1328; - public static final int DanceEvent = 2080; - public static final int DeactivateGuildEvent = 1134; - public static final int DeclineFriendEvent = 2890; - public static final int DeleteFavouriteRoomEvent = 309; - public static final int DeleteRoomEvent = 532; - public static final int DeselectFavouriteHabboGroupEvent = 1820; - public static final int DiceOffEvent = 1533; - public static final int DropCarryItemEvent = 2814; - public static final int EditEventEvent = 3991; - public static final int EnterOneWayDoorEvent = 2765; - public static final int EventLogEvent = 3457; - public static final int FindNewFriendsEvent = 516; - public static final int FollowFriendEvent = 2970; - public static final int ForwardToSomeRoomEvent = 1703; - public static final int FriendFurniConfirmLockEvent = 3775; - public static final int Game2GetAccountGameStatusEvent = 11; - public static final int GameUnloadedEvent = 3207; - public static final int GetAchievementsEvent = 219; - public static final int GetBadgePointLimitsEvent = 1371; - public static final int GetBadgesEvent = 2769; - public static final int GetBannedUsersFromRoomEvent = 2267; - public static final int GetBonusRareInfoEvent = 957; - public static final int GetBotCommandConfigurationDataEvent = 1986; - public static final int GetBotInventoryEvent = 3848; - public static final int GetBundleDiscountRulesetEvent = 223; - public static final int GetCatalogIndexEvent = 1195; - public static final int GetCatalogPageEvent = 412; - public static final int GetCfhChatlogEvent = 211; - public static final int GetCfhStatusEvent = 2746; - public static final int GetClubGiftInfo = 487; - public static final int GetClubOffersEvent = 3285; - public static final int GetCraftableProductsEvent = 633; - public static final int GetCraftingRecipeEvent = 1173; - public static final int GetCraftingRecipesAvailableEvent = 3086; - public static final int GetCreditsInfoEvent = 273; - public static final int GetCurrentTimingCodeEvent = 2912; - public static final int GetCustomRoomFilterEvent = 1911; - public static final int GetExtendedProfileEvent = 3265; - public static final int GetFlatControllersEvent = 3385; - public static final int GetForumStatsEvent = 3149; // previously ConvertGlobalRoomIdEvent - public static final int GetForumsListEvent = 873; - public static final int GetFriendRequestsEvent = 2448; - public static final int GetFurnitureAliasesEvent = 3898; - public static final int GetGameListEvent = 741; - public static final int GetGameStatusEvent = 3171; - public static final int GetGiftWrappingConfigurationEvent = 418; - public static final int GetGuestRoomEvent = 2230; - public static final int GetGuideReportingStatusEvent = 3786; - public static final int GetGuildCreationInfoEvent = 798; - public static final int GetGuildEditInfoEvent = 1004; - public static final int GetGuildEditorDataEvent = 813; - public static final int GetGuildFurniContextMenuInfoEvent = 2651; - public static final int GetGuildMembersEvent = 312; - public static final int GetGuildMembershipsEvent = 367; - public static final int GetHabboGroupBadgesEvent = 21; - public static final int GetHabboGroupDetailsEvent = 2991; - public static final int GetIgnoredUsersEvent = 3878; - public static final int GetItemDataEvent = 3964; - public static final int GetJukeboxPlayListEvent = 1435; - public static final int GetLimitedOfferAppearingNextEvent = 410; - public static final int GetMOTDEvent = 1523; - public static final int GetMarketplaceCanMakeOfferEvent = 848; - public static final int GetMarketplaceConfigurationEvent = 2597; - public static final int GetMarketplaceItemStatsEvent = 3288; - public static final int GetMarketplaceOffersEvent = 2407; - public static final int GetMarketplaceOwnOffersEvent = 2105; - public static final int GetMemberGuildItemCountEvent = 3593; - public static final int GetMessagesEvent = 232; - public static final int GetModeratorRoomInfoEvent = 707; - public static final int GetModeratorUserInfoEvent = 3295; - public static final int GetNowPlayingEvent = 1325; - public static final int GetOccupiedTilesEvent = 1687; - public static final int GetOfficialSongIdEvent = 3189; - public static final int GetPendingCallsForHelpEvent = 3267; - public static final int GetPetCommandsEvent = 2161; - public static final int GetPetInfoEvent = 2934; - public static final int GetPetInventoryEvent = 3095; - public static final int GetPopularRoomTagsEvent = 826; - public static final int GetProductOfferEvent = 2594; - public static final int GetPromoArticlesEvent = 1827; - public static final int GetRecyclerPrizesEvent = 398; - public static final int GetRecyclerStatusEvent = 1342; - public static final int GetRelationshipStatusInfoEvent = 2138; - public static final int GetResolutionAchievementsEvent = 359; - public static final int GetRoomAdPurchaseInfoEvent = 1075; - public static final int GetRoomChatlogEvent = 2587; - public static final int GetRoomEntryDataEvent = 2300; - public static final int GetRoomEntryTileEvent = 3559; - public static final int GetRoomSettingsEvent = 3129; - public static final int GetRoomVisitsEvent = 3526; - public static final int GetSelectedBadgesEvent = 2091; - public static final int GetSellablePetPalettesEvent = 1756; - public static final int GetSongInfoEvent = 3082; - public static final int GetSoundSettingsEvent = 2388; - public static final int GetTalentTrackEvent = 196; - public static final int GetTalentTrackLevelEvent = 2127; - public static final int GetThreadsEvent = 436; - public static final int GetUnreadForumsCountEvent = 2908; // wtf is this wrong? // previously RequestPromotedRoomsEvent - public static final int GetUserChatlogEvent = 1391; - public static final int GetUserEventCatsEvent = 1782; - public static final int GetUserFlatCatsEvent = 3027; - public static final int GetUserTagsEvent = 17; - public static final int GetWardrobeEvent = 2742; - public static final int GetWeeklyGameRewardEvent = 2914; - public static final int GetWeeklyGameRewardWinnersEvent = 1054; - public static final int GetYoutubeDisplayStatusEvent = 336; - public static final int GuideSessionCreateEvent = 3338; - public static final int GuideSessionFeedbackEvent = 477; - public static final int GuideSessionGetRequesterRoomEvent = 1052; - public static final int GuideSessionGuideDecidesEvent = 1424; - public static final int GuideSessionInviteRequesterEvent = 234; - public static final int GuideSessionIsTypingEvent = 519; - public static final int GuideSessionMessageEvent = 3899; - public static final int GuideSessionOnDutyUpdateEvent = 1922; - public static final int GuideSessionReportEvent = 3969; - public static final int GuideSessionRequesterCancelsEvent = 291; - public static final int GuideSessionResolvedEvent = 887; - public static final int HabboSearchEvent = 1210; - public static final int HotelViewClaimBadgeRewardEvent = -1; - public static final int HotelViewRequestBadgeRewardEvent = 2318; - public static final int HotelViewRequestSecondsUntilEvent = 271; - public static final int IgnoreUserEvent = 1117; - public static final int InfoRetrieveEvent = 357; - public static final int InitDiffieHandshakeEvent = 3110; - public static final int JoinHabboGroupEvent = 998; - public static final int JoinQueueEvent = 1458; - public static final int JukeBoxEventOne = 2304; - public static final int KickMemberEvent = 593; - public static final int LatencyPingRequestEvent = 295; - public static final int LetUserInEvent = 1644; - public static final int LookToEvent = 3301; - public static final int MakeOfferEvent = 3447; - public static final int MessengerInitEvent = 2781; - public static final int ModAlertEvent = 229; - public static final int ModBanEvent = 2766; - public static final int ModKickEvent = 2582; - public static final int ModMessageEvent = 1840; - public static final int ModMuteEvent = 1945; - public static final int ModToolRequestRoomUserChatlogEvent = -1; - public static final int ModToolSanctionEvent = 1392; - public static final int ModToolWarnEvent = -1; - public static final int ModTradingLockEvent = 3742; - public static final int ModerateMessageEvent = 286; - public static final int ModerateRoomEvent = 3260; - public static final int ModerateThreadEvent = 1397; - public static final int ModeratorActionEvent = 3842; - public static final int MountPetEvent = 1036; - public static final int MoveAvatarEvent = 3320; - public static final int MoveObjectEvent = 248; - public static final int MovePetEvent = 3449; - public static final int MoveWallItemEvent = 168; - public static final int MuteAllInRoomEvent = 3637; - public static final int MyFavouriteRoomsSearchEvent = 2578; - public static final int MyFriendsRoomsSearchEvent = 2266; - public static final int MyGuildBasesSearchEvent = 39; - public static final int MyRoomHistorySearchEvent = 2264; - public static final int MyRoomRightsSearchEvent = 272; - public static final int MyRoomsSearchEvent = 2277; - public static final int NavigatorAddCollapsedCategoryEvent = 1834; - public static final int NavigatorAddSavedSearchEvent = 2226; - public static final int NavigatorDeleteSavedSearchEvent = 1954; - public static final int NavigatorRemoveCollapsedCategoryEvent = 637; - public static final int NavigatorSetSearchCodeViewModeEvent = 1202; - public static final int NewNavigatorInitEvent = 2110; - public static final int NewNavigatorSearchEvent = 249; - public static final int NewUserExperienceGetGiftsEvent = 1822; - public static final int NewUserExperienceScriptProceedEvent = 1299; - public static final int OpenCampaignCalendarDoorAsStaffEvent = 2257; - public static final int OpenCampaignCalendarDoorEvent = 3889; - public static final int OpenFlatConnectionEvent = 2312; - public static final int OpenPetPackageEvent = 3698; - public static final int OpenTradingEvent = 1481; - public static final int PassCarryItemEvent = 2941; - public static final int PickIssuesEvent = 15; - public static final int PickupObjectEvent = 3456; - public static final int PlaceBotEvent = 1592; - public static final int PlaceObjectEvent = 1258; - public static final int PlacePetEvent = 2647; - public static final int PlacePostItEvent = 2248; - public static final int PollRejectEvent = 1773; - public static final int PollStartEvent = 109; - public static final int PongEvent = 2596; - public static final int PopularRoomsSearchEvent = 2758; - public static final int PostMessageEvent = 3529; - public static final int PresentOpenEvent = 3558; - public static final int PublishPhotoEvent = 2068; - public static final int PurchaseFromCatalogAsGiftEvent = 1411; - public static final int PurchaseFromCatalogEvent = 3492; - public static final int PurchasePhotoEvent = 2408; - public static final int PurchaseRoomAdEvent = 777; - public static final int PurchaseTargetedOfferEvent = 1826; - public static final int PurchaseVipMembershipExtensionEvent = 3407; - public static final int QuitEvent = 105; - public static final int RateFlatEvent = 3582; - public static final int RecycleItemsEvent = 2771; - public static final int RedeemMarketplaceOfferCreditsEvent = 2650; - public static final int RedeemVoucherEvent = 339; - public static final int RejectMembershipRequestEvent = 1894; - public static final int ReleaseIssuesEvent = 1572; - public static final int RemoveAdminRightsFromMemberEvent = 722; - public static final int RemoveAllRightsEvent = 2683; - public static final int RemoveBotFromFlatEvent = 3323; - public static final int RemoveFriendEvent = 1689; - public static final int RemoveItemEvent = 3336; - public static final int RemoveItemFromTradeEvent = 3845; - public static final int RemoveJukeboxDiskEvent = 3050; - public static final int RemoveOwnRoomRightsRoomEvent = 3182; - public static final int RemovePetFromFlatEvent = 1581; - public static final int RemoveRightsEvent = 2064; - public static final int RemoveSaddleFromPetEvent = 186; - public static final int RenderRoomEvent = 3226; - public static final int RenderRoomThumbnailEvent = 1982; - public static final int RentableSpaceCancelRentEvent = 1667; - public static final int RentableSpaceRentEvent = 2946; - public static final int RequestAchievementConfigurationEvent = -1; - public static final int RequestCameraConfigurationEvent = 796; - public static final int RequestFriendEvent = 3157; - public static final int RequestFurniInventoryEvent = 3150; - public static final int RequestFurniInventoryWhenNotInRoomEvent = 3500; - public static final int RequestRoomPropertySet = 711; - public static final int RespectPetEvent = 3202; - public static final int RespectUserEvent = 2694; - public static final int RoomDimmerChangeStateEvent = 2296; - public static final int RoomDimmerGetPresetsEvent = 2813; - public static final int RoomDimmerSavePresetEvent = 1648; - public static final int RoomTextSearchEvent = 3943; - public static final int RoomUserKickEvent = 1320; - public static final int RoomUserMuteEvent = 3485; - public static final int RoomsWhereMyFriendsAreSearchEvent = 1786; - public static final int RoomsWithHighestScoreSearchEvent = 2939; - public static final int SSOTicketEvent = 2419; - public static final int SaveRoomSettingsEvent = 1969; - public static final int SaveWardrobeOutfitEvent = 800; - public static final int ScrGetKickbackInfoEvent = 869; - public static final int ScrGetUserInfoEvent = 3166; - public static final int SearchRoomsByTagEvent = -1; - public static final int SelectClubGiftEvent = 2276; - public static final int SelectFavouriteHabboGroupEvent = 3549; - public static final int SendMsgEvent = 3567; - public static final int SendRoomInviteEvent = 1276; - public static final int SetActivatedBadgesEvent = 644; - public static final int SetChatPreferencesEvent = 1262; - public static final int SetChatStylePreferenceEvent = 1030; - public static final int SetClothingChangeDataEvent = 924; - public static final int SetCustomStackingHeightEvent = 3839; - public static final int SetIgnoreRoomInvitesEvent = 1086; - public static final int SetItemDataEvent = 3666; - public static final int SetMannequinFigureEvent = 2209; - public static final int SetMannequinNameEvent = 2850; - public static final int SetNewNavigatorWindowPreferencesEvent = 3159; - public static final int SetObjectDataEvent = 3608; - public static final int SetRandomStateEvent = 3617; - public static final int SetRelationshipStatusEvent = 3768; - public static final int SetRoomBackgroundColorDataEvent = 2880; - public static final int SetRoomCameraPreferencesEvent = 1461; - public static final int SetSoundSettingsEvent = 1367; - public static final int SetTargetedOfferStateEvent = 2041; - public static final int SetYoutubeDisplayPlaylistEvent = 2069; - public static final int ShoutEvent = 2085; - public static final int SignEvent = 1975; - public static final int SpinWheelOfFortuneEvent = 2144; - public static final int StartTypingEvent = 1597; - public static final int SubmitRoomToCompetitionEvent = 2595; - public static final int ThrowDiceEvent = 1990; - public static final int TogglePetBreedingPermissionEvent = 3379; - public static final int TogglePetRidingPermissionEvent = 1472; - public static final int UnacceptTradingEvent = 1444; - public static final int UnbanUserFromRoomEvent = 992; - public static final int UnignoreUserEvent = 2061; - public static final int UniqueIDEvent = 2490; - public static final int UpdateActionEvent = 2281; - public static final int UpdateConditionEvent = 3203; - public static final int UpdateFigureDataEvent = 2730; - public static final int UpdateFloorPropertiesEvent = 875; - public static final int UpdateForumSettingsEvent = 2214; - public static final int UpdateGuildBadgeEvent = 1991; - public static final int UpdateGuildColorsEvent = 1764; - public static final int UpdateGuildIdentityEvent = 3137; - public static final int UpdateGuildSettingsEvent = 3435; - public static final int UpdateHomeRoomEvent = 1740; - public static final int UpdateRoomFilterEvent = 3001; - public static final int UpdateThreadEvent = 3045; - public static final int UpdateTriggerEvent = 1520; - public static final int UpdateUIFlagsEvent = 2313; - public static final int UseFurnitureEvent = 99; - public static final int UseWallItemEvent = 210; - public static final int VisitUserEvent = 3997; - public static final int WhisperEvent = 1543; + public static final int acceptFriendEvent = 137; + public static final int acceptTradingEvent = 3863; + public static final int addAdminRightsToMemberEvent = 2894; + public static final int addFavouriteRoomEvent = 3817; + public static final int addItemToTradeEvent = 3107; + public static final int addItemsToTradeEvent = 1263; + public static final int addJukeboxDiskEvent = 753; + public static final int addSpamWallPostItEvent = 3283; + public static final int ambassadorAlertEvent = 2996; + public static final int answerPollEvent = 3505; + public static final int applySnapshotEvent = 3373; + public static final int approveMembershipRequestEvent = 3386; + public static final int approveNameEvent = 2109; + public static final int assignRightsEvent = 808; + public static final int avatarEffectActivatedEvent = 2959; + public static final int avatarEffectSelectedEvent = 1752; + public static final int avatarExpressionEvent = 2456; + public static final int banUserWithDurationEvent = 1477; + public static final int breedPetsEvent = 1638; + public static final int buildersClubPlaceWallItemEvent = 2462; + public static final int buildersClubQueryFurniCountEvent = 2529; + public static final int buyMarketplaceOfferEvent = 1603; + public static final int callForHelpEvent = 1691; + public static final int callForHelpFromForumMessageEvent = 1412; + public static final int callForHelpFromForumThreadEvent = 534; + public static final int callForHelpFromIMEvent = 2950; + public static final int callForHelpFromPhotoEvent = 2492; + public static final int canCreateRoomEvent = 2128; + public static final int cancelMarketplaceOfferEvent = 434; + public static final int cancelPetBreedingEvent = 2713; + public static final int cancelTypingEvent = 1474; + public static final int changeMottoEvent = 2228; + public static final int changePostureEvent = 2235; + public static final int changeUserNameEvent = 2977; + public static final int chatEvent = 1314; + public static final int chatReviewGuideDecidesOnOfferEvent = 3365; + public static final int chatReviewGuideDetachedEvent = 2501; + public static final int chatReviewGuideVoteEvent = 3961; + public static final int chatReviewSessionCreateEvent = 3060; + public static final int checkUserNameEvent = 3950; + public static final int clientHelloEvent = 4000; + public static final int closeIssueDefaultActionEvent = 2717; + public static final int closeIssuesEvent = 2067; + public static final int closeTradingEvent = 2551; + public static final int commandBotEvent = 2624; + public static final int completeDiffieHandshakeEvent = 773; + public static final int compostPlantEvent = 3835; + public static final int confirmAcceptTradingEvent = 2760; + public static final int confirmDeclineTradingEvent = 2341; + public static final int confirmPetBreedingEvent = 3382; + public static final int controlYoutubeDisplayPlaybackEvent = 3005; + public static final int craftEvent = 3591; + public static final int craftSecretEvent = 1251; + public static final int createFlatEvent = 2752; + public static final int createGuildEvent = 230; + public static final int creditFurniRedeemEvent = 3115; + public static final int customizeAvatarWithFurniEvent = 3374; + public static final int customizePetWithFurniEvent = 1328; + public static final int danceEvent = 2080; + public static final int deactivateGuildEvent = 1134; + public static final int declineFriendEvent = 2890; + public static final int deleteFavouriteRoomEvent = 309; + public static final int deleteRoomEvent = 532; + public static final int deselectFavouriteHabboGroupEvent = 1820; + public static final int diceOffEvent = 1533; + public static final int dropCarryItemEvent = 2814; + public static final int editEventEvent = 3991; + public static final int enterOneWayDoorEvent = 2765; + public static final int eventLogEvent = 3457; + public static final int findNewFriendsEvent = 516; + public static final int followFriendEvent = 2970; + public static final int forwardToSomeRoomEvent = 1703; + public static final int friendFurniConfirmLockEvent = 3775; + public static final int game2GetAccountGameStatusEvent = 11; + public static final int gameUnloadedEvent = 3207; + public static final int getAchievementsEvent = 219; + public static final int getBadgePointLimitsEvent = 1371; + public static final int getBadgesEvent = 2769; + public static final int getBannedUsersFromRoomEvent = 2267; + public static final int getBonusRareInfoEvent = 957; + public static final int getBotCommandConfigurationDataEvent = 1986; + public static final int getBotInventoryEvent = 3848; + public static final int getBundleDiscountRulesetEvent = 223; + public static final int getCatalogIndexEvent = 1195; + public static final int getCatalogPageEvent = 412; + public static final int getCfhChatlogEvent = 211; + public static final int getCfhStatusEvent = 2746; + public static final int getClubGiftInfo = 487; + public static final int getClubOffersEvent = 3285; + public static final int getCraftableProductsEvent = 633; + public static final int getCraftingRecipeEvent = 1173; + public static final int getCraftingRecipesAvailableEvent = 3086; + public static final int getCreditsInfoEvent = 273; + public static final int getCurrentTimingCodeEvent = 2912; + public static final int getCustomRoomFilterEvent = 1911; + public static final int getExtendedProfileEvent = 3265; + public static final int getFlatControllersEvent = 3385; + public static final int getForumStatsEvent = 3149; // previously ConvertGlobalRoomIdEvent + public static final int getForumsListEvent = 873; + public static final int getFriendRequestsEvent = 2448; + public static final int getFurnitureAliasesEvent = 3898; + public static final int getGameListEvent = 741; + public static final int getGameStatusEvent = 3171; + public static final int getGiftWrappingConfigurationEvent = 418; + public static final int getGuestRoomEvent = 2230; + public static final int getGuideReportingStatusEvent = 3786; + public static final int getGuildCreationInfoEvent = 798; + public static final int getGuildEditInfoEvent = 1004; + public static final int getGuildEditorDataEvent = 813; + public static final int getGuildFurniContextMenuInfoEvent = 2651; + public static final int getGuildMembersEvent = 312; + public static final int getGuildMembershipsEvent = 367; + public static final int getHabboGroupBadgesEvent = 21; + public static final int getHabboGroupDetailsEvent = 2991; + public static final int getIgnoredUsersEvent = 3878; + public static final int getItemDataEvent = 3964; + public static final int getJukeboxPlayListEvent = 1435; + public static final int getLimitedOfferAppearingNextEvent = 410; + public static final int getMOTDEvent = 1523; + public static final int getMarketplaceCanMakeOfferEvent = 848; + public static final int getMarketplaceConfigurationEvent = 2597; + public static final int getMarketplaceItemStatsEvent = 3288; + public static final int getMarketplaceOffersEvent = 2407; + public static final int getMarketplaceOwnOffersEvent = 2105; + public static final int getMemberGuildItemCountEvent = 3593; + public static final int getMessagesEvent = 232; + public static final int getModeratorRoomInfoEvent = 707; + public static final int getModeratorUserInfoEvent = 3295; + public static final int getNowPlayingEvent = 1325; + public static final int getOccupiedTilesEvent = 1687; + public static final int getOfficialSongIdEvent = 3189; + public static final int getPendingCallsForHelpEvent = 3267; + public static final int getPetCommandsEvent = 2161; + public static final int getPetInfoEvent = 2934; + public static final int getPetInventoryEvent = 3095; + public static final int getPopularRoomTagsEvent = 826; + public static final int getProductOfferEvent = 2594; + public static final int getPromoArticlesEvent = 1827; + public static final int getRecyclerPrizesEvent = 398; + public static final int getRecyclerStatusEvent = 1342; + public static final int getRelationshipStatusInfoEvent = 2138; + public static final int getResolutionAchievementsEvent = 359; + public static final int getRoomAdPurchaseInfoEvent = 1075; + public static final int getRoomChatlogEvent = 2587; + public static final int getRoomEntryDataEvent = 2300; + public static final int getRoomEntryTileEvent = 3559; + public static final int getRoomSettingsEvent = 3129; + public static final int getRoomVisitsEvent = 3526; + public static final int getSelectedBadgesEvent = 2091; + public static final int getSellablePetPalettesEvent = 1756; + public static final int getSongInfoEvent = 3082; + public static final int getSoundSettingsEvent = 2388; + public static final int getTalentTrackEvent = 196; + public static final int getTalentTrackLevelEvent = 2127; + public static final int getThreadsEvent = 436; + public static final int getUnreadForumsCountEvent = 2908; // wtf is this wrong? // previously RequestPromotedRoomsEvent + public static final int getUserChatlogEvent = 1391; + public static final int getUserEventCatsEvent = 1782; + public static final int getUserFlatCatsEvent = 3027; + public static final int getUserTagsEvent = 17; + public static final int getWardrobeEvent = 2742; + public static final int getWeeklyGameRewardEvent = 2914; + public static final int getWeeklyGameRewardWinnersEvent = 1054; + public static final int getYoutubeDisplayStatusEvent = 336; + public static final int guideSessionCreateEvent = 3338; + public static final int guideSessionFeedbackEvent = 477; + public static final int guideSessionGetRequesterRoomEvent = 1052; + public static final int guideSessionGuideDecidesEvent = 1424; + public static final int guideSessionInviteRequesterEvent = 234; + public static final int guideSessionIsTypingEvent = 519; + public static final int guideSessionMessageEvent = 3899; + public static final int guideSessionOnDutyUpdateEvent = 1922; + public static final int guideSessionReportEvent = 3969; + public static final int guideSessionRequesterCancelsEvent = 291; + public static final int guideSessionResolvedEvent = 887; + public static final int habboSearchEvent = 1210; + public static final int hotelViewClaimBadgeRewardEvent = -1; + public static final int hotelViewRequestBadgeRewardEvent = 2318; + public static final int hotelViewRequestSecondsUntilEvent = 271; + public static final int ignoreUserEvent = 1117; + public static final int infoRetrieveEvent = 357; + public static final int initDiffieHandshakeEvent = 3110; + public static final int joinHabboGroupEvent = 998; + public static final int joinQueueEvent = 1458; + public static final int jukeBoxEventOne = 2304; + public static final int kickMemberEvent = 593; + public static final int latencyPingRequestEvent = 295; + public static final int letUserInEvent = 1644; + public static final int lookToEvent = 3301; + public static final int makeOfferEvent = 3447; + public static final int messengerInitEvent = 2781; + public static final int modAlertEvent = 229; + public static final int modBanEvent = 2766; + public static final int modKickEvent = 2582; + public static final int modMessageEvent = 1840; + public static final int modMuteEvent = 1945; + public static final int modToolRequestRoomUserChatlogEvent = -1; + public static final int modToolSanctionEvent = 1392; + public static final int modToolWarnEvent = -1; + public static final int modTradingLockEvent = 3742; + public static final int moderateMessageEvent = 286; + public static final int moderateRoomEvent = 3260; + public static final int moderateThreadEvent = 1397; + public static final int moderatorActionEvent = 3842; + public static final int mountPetEvent = 1036; + public static final int moveAvatarEvent = 3320; + public static final int moveObjectEvent = 248; + public static final int movePetEvent = 3449; + public static final int moveWallItemEvent = 168; + public static final int muteAllInRoomEvent = 3637; + public static final int myFavouriteRoomsSearchEvent = 2578; + public static final int myFriendsRoomsSearchEvent = 2266; + public static final int myGuildBasesSearchEvent = 39; + public static final int myRoomHistorySearchEvent = 2264; + public static final int myRoomRightsSearchEvent = 272; + public static final int myRoomsSearchEvent = 2277; + public static final int navigatorAddCollapsedCategoryEvent = 1834; + public static final int navigatorAddSavedSearchEvent = 2226; + public static final int navigatorDeleteSavedSearchEvent = 1954; + public static final int navigatorRemoveCollapsedCategoryEvent = 637; + public static final int navigatorSetSearchCodeViewModeEvent = 1202; + public static final int newNavigatorInitEvent = 2110; + public static final int newNavigatorSearchEvent = 249; + public static final int newUserExperienceGetGiftsEvent = 1822; + public static final int newUserExperienceScriptProceedEvent = 1299; + public static final int openCampaignCalendarDoorEvent = 8809; + public static final int openCampaignCalendarDoorAsStaffEvent = 2507; + public static final int openFlatConnectionEvent = 2312; + public static final int openPetPackageEvent = 3698; + public static final int openTradingEvent = 1481; + public static final int passCarryItemEvent = 2941; + public static final int pickIssuesEvent = 15; + public static final int pickupObjectEvent = 3456; + public static final int placeBotEvent = 1592; + public static final int placeObjectEvent = 1258; + public static final int placePetEvent = 2647; + public static final int placePostItEvent = 2248; + public static final int pollRejectEvent = 1773; + public static final int pollStartEvent = 109; + public static final int pongEvent = 2596; + public static final int popularRoomsSearchEvent = 2758; + public static final int postMessageEvent = 3529; + public static final int presentOpenEvent = 3558; + public static final int publishPhotoEvent = 2068; + public static final int purchaseFromCatalogAsGiftEvent = 1411; + public static final int purchaseFromCatalogEvent = 3492; + public static final int purchasePhotoEvent = 2408; + public static final int purchaseRoomAdEvent = 777; + public static final int purchaseTargetedOfferEvent = 1826; + public static final int purchaseVipMembershipExtensionEvent = 3407; + public static final int quitEvent = 105; + public static final int rateFlatEvent = 3582; + public static final int recycleItemsEvent = 2771; + public static final int redeemMarketplaceOfferCreditsEvent = 2650; + public static final int redeemVoucherEvent = 339; + public static final int rejectMembershipRequestEvent = 1894; + public static final int releaseIssuesEvent = 1572; + public static final int removeAdminRightsFromMemberEvent = 722; + public static final int removeAllRightsEvent = 2683; + public static final int removeBotFromFlatEvent = 3323; + public static final int removeFriendEvent = 1689; + public static final int removeItemEvent = 3336; + public static final int removeItemFromTradeEvent = 3845; + public static final int removeJukeboxDiskEvent = 3050; + public static final int removeOwnRoomRightsRoomEvent = 3182; + public static final int removePetFromFlatEvent = 1581; + public static final int removeRightsEvent = 2064; + public static final int removeSaddleFromPetEvent = 186; + public static final int renderRoomEvent = 3226; + public static final int renderRoomThumbnailEvent = 1982; + public static final int rentableSpaceCancelRentEvent = 1667; + public static final int rentableSpaceRentEvent = 2946; + public static final int requestAchievementConfigurationEvent = -1; + public static final int requestCameraConfigurationEvent = 796; + public static final int requestFriendEvent = 3157; + public static final int requestFurniInventoryEvent = 3150; + public static final int requestFurniInventoryWhenNotInRoomEvent = 3500; + public static final int requestRoomPropertySet = 711; + public static final int respectPetEvent = 3202; + public static final int respectUserEvent = 2694; + public static final int roomDimmerChangeStateEvent = 2296; + public static final int roomDimmerGetPresetsEvent = 2813; + public static final int roomDimmerSavePresetEvent = 1648; + public static final int roomTextSearchEvent = 3943; + public static final int roomUserKickEvent = 1320; + public static final int roomUserMuteEvent = 3485; + public static final int roomsWhereMyFriendsAreSearchEvent = 1786; + public static final int roomsWithHighestScoreSearchEvent = 2939; + public static final int sSOTicketEvent = 2419; + public static final int saveRoomSettingsEvent = 1969; + public static final int saveWardrobeOutfitEvent = 800; + public static final int scrGetKickbackInfoEvent = 869; + public static final int scrGetUserInfoEvent = 3166; + public static final int searchRoomsByTagEvent = -1; + public static final int selectClubGiftEvent = 2276; + public static final int selectFavouriteHabboGroupEvent = 3549; + public static final int sendMsgEvent = 3567; + public static final int sendRoomInviteEvent = 1276; + public static final int setActivatedBadgesEvent = 644; + public static final int setChatPreferencesEvent = 1262; + public static final int setChatStylePreferenceEvent = 1030; + public static final int setClothingChangeDataEvent = 924; + public static final int setCustomStackingHeightEvent = 3839; + public static final int setIgnoreRoomInvitesEvent = 1086; + public static final int setItemDataEvent = 3666; + public static final int setMannequinFigureEvent = 2209; + public static final int setMannequinNameEvent = 2850; + public static final int setNewNavigatorWindowPreferencesEvent = 3159; + public static final int setObjectDataEvent = 3608; + public static final int setRandomStateEvent = 3617; + public static final int setRelationshipStatusEvent = 3768; + public static final int setRoomBackgroundColorDataEvent = 2880; + public static final int setRoomCameraPreferencesEvent = 1461; + public static final int setSoundSettingsEvent = 1367; + public static final int setTargetedOfferStateEvent = 2041; + public static final int setYoutubeDisplayPlaylistEvent = 2069; + public static final int shoutEvent = 2085; + public static final int signEvent = 1975; + public static final int spinWheelOfFortuneEvent = 2144; + public static final int startTypingEvent = 1597; + public static final int submitRoomToCompetitionEvent = 2595; + public static final int throwDiceEvent = 1990; + public static final int togglePetBreedingPermissionEvent = 3379; + public static final int togglePetRidingPermissionEvent = 1472; + public static final int unacceptTradingEvent = 1444; + public static final int unbanUserFromRoomEvent = 992; + public static final int unignoreUserEvent = 2061; + public static final int uniqueIDEvent = 2490; + public static final int updateActionEvent = 2281; + public static final int updateConditionEvent = 3203; + public static final int updateFigureDataEvent = 2730; + public static final int updateFloorPropertiesEvent = 875; + public static final int updateForumSettingsEvent = 2214; + public static final int updateGuildBadgeEvent = 1991; + public static final int updateGuildColorsEvent = 1764; + public static final int updateGuildIdentityEvent = 3137; + public static final int updateGuildSettingsEvent = 3435; + public static final int updateHomeRoomEvent = 1740; + public static final int updateRoomFilterEvent = 3001; + public static final int updateThreadEvent = 3045; + public static final int updateTriggerEvent = 1520; + public static final int updateUIFlagsEvent = 2313; + public static final int useFurnitureEvent = 99; + public static final int useWallItemEvent = 210; + public static final int visitUserEvent = 3997; + public static final int whisperEvent = 1543; - /* - Incoming Emulator Packets which are currently NOT implemented. - Named 1:1 based on outgoing client packet names from PRODUCTION-201611291003-338511768 - If you implement them please move them to the above and remove the todo tag. + /** + * Incoming Emulator Packets which are currently NOT implemented. + * Named 1:1 based on outgoing client packet names from PRODUCTION-201611291003-338511768 + * TODO: Implement them and move them to the above. */ - public static final int AcceptGameInviteEvent = 3802; //todo? - public static final int AcceptQuestEvent = 3604; //todo? - public static final int ApproveAllMembershipRequestsEvent = 882; //todo? - public static final int BuildersClubPlaceRoomItemEvent = 1051; //todo? - public static final int BuyMarketplaceTokensEvent = 1866; //todo? - public static final int CallForHelpFromSelfieEvent = 2755; //todo? - public static final int CancelEventEvent = 2725; //todo? - public static final int CancelQuestEvent = 3133; //todo? - public static final int ChangeEmailEvent = 3965; //todo? - public static final int ChangeQueueEvent = 3093; //todo? - public static final int CommunityGoalVoteEvent = 3536; //todo? - public static final int CompetitionRoomsSearchEvent = 433; //todo? - public static final int DeletePendingCallsForHelpEvent = 3605; //todo? - public static final int DisconnectEvent = 2445; //todo? - public static final int ExtendRentOrBuyoutFurniEvent = 1071; //todo? - public static final int ExtendRentOrBuyoutStripItemEvent = 2115; //todo? - public static final int ForwardToACompetitionRoomEvent = 172; //todo? - public static final int ForwardToARandomPromotedRoomEvent = 10; //todo? - public static final int ForwardToRandomCompetitionRoomEvent = 865; //todo? - public static final int FriendListUpdateEvent = 1419; //todo? - public static final int FriendRequestQuestCompleteEvent = 1148; //todo? - public static final int Game2CheckGameDirectoryStatusEvent = 3259; //todo? - public static final int Game2ExitGameEvent = 1445; //todo? - public static final int Game2GameChatEvent = 2502; //todo? - public static final int Game2GetWeeklyFriendsLeaderboardEvent = 1232; - public static final int Game2GetWeeklyLeaderboardEvent = 2565; //todo? - public static final int Game2LoadStageReadyEvent = 2415; //todo? - public static final int Game2PlayAgainEvent = 3196; //todo? - public static final int Game2RequestFullStatusUpdateEvent = 1598; //todo? - public static final int GetCatalogPageExpirationEvent = 742; //todo? - public static final int GetCatalogPageWithEarliestExpiryEvent = 3135; //todo? - public static final int GetCategoriesWithUserCountEvent = 3782; //todo? - public static final int GetCommunityGoalEarnedPrizesEvent = 2688; //todo? - public static final int GetCommunityGoalHallOfFameEvent = 2167; //todo? - public static final int GetCommunityGoalProgressEvent = 1145; //todo? - public static final int GetConcurrentUsersGoalProgressEvent = 1343; //todo? - public static final int GetConcurrentUsersRewardEvent = 3872; //todo? - public static final int GetDailyQuestEvent = 2486; //todo? - public static final int GetDirectClubBuyAvailableEvent = 801; //todo? - public static final int GetEmailStatusEvent = 2557; //todo? - public static final int GetExtendedProfileByNameEvent = 2249; //todo? - public static final int GetFaqCategoryEvent = 3445; //todo? - public static final int GetFaqTextEvent = 1849; //todo? - public static final int GetGameAchievementsEvent = 2399; //todo? - public static final int GetHabboBasicMembershipExtendOfferEvent = 603; //todo? - public static final int GetInterstitialEvent = 2519; - public static final int GetIsBadgeRequestFulfilledEvent = 1364; //todo? - public static final int GetIsOfferGiftableEvent = 1347; //todo? - public static final int GetIsUserPartOfCompetitionEvent = 2077; //todo? - public static final int GetNextTargetedOfferEvent = 2487; //todo? - public static final int GetOfficialRoomsEvent = 1229; //todo? - public static final int GetQuestsEvent = 3333; //todo? - public static final int GetQuizQuestionsEvent = 1296; //todo? - public static final int GetSeasonalCalendarDailyOfferEvent = 3257; //todo? - public static final int GetSeasonalQuestsOnlyEvent = 1190; //todo? - public static final int GetSoundMachinePlayListEvent = 3498; //todo? - public static final int GetTargetedOfferEvent = 596; //todo? - public static final int GetThreadEvent = 3900; //todo? - public static final int GetUserGameAchievementsEvent = 389; //todo? - public static final int GiveSupplementToPetEvent = 749; //todo? - public static final int GoToFlatEvent = 685; //todo? - public static final int GuideAdvertisementReadEvent = 2455; //todo? - public static final int GuildBaseSearchEvent = 2930; //todo? - public static final int HarvestPetEvent = 1521; //todo? - public static final int IgnoreUserIdEvent = 3314; //todo? - public static final int InterstitialShownEvent = 1109; //todo? - public static final int LagWarningReportEvent = 3847; //todo? - public static final int LatencyPingReportEvent = 96; //todo? - public static final int LeaveQueueEvent = 2384; //todo? - public static final int ModToolPreferencesEvent = 31; //todo? - public static final int MyFrequentRoomHistorySearchEvent = 1002; //todo? - public static final int MyRecommendedRoomsEvent = 2537; //todo? - public static final int MysteryBoxWaitingCanceledEvent = 2012; //todo? - public static final int OpenMysteryTrophyEvent = 3074; //todo? - public static final int OpenQuestTrackerEvent = 2750; //todo? - public static final int OpenWelcomeGiftEvent = 2638; //todo? - public static final int PassCarryItemToPetEvent = 2768; //todo? - public static final int PeerUsersClassificationEvent = 1160; //todo? - public static final int PerformanceLogEvent = 3230; //todo? - public static final int PetSelectedEvent = 549; //todo? - public static final int PhotoCompetitionEvent = 3959; //todo? - public static final int PostQuizAnswersEvent = 3720; //todo? - public static final int PurchaseBasicMembershipExtensionEvent = 2735; //todo? - public static final int RedeemCommunityGoalPrizeEvent = 90; //todo? - public static final int RejectQuestEvent = 2397; //todo? - public static final int RentableSpaceStatusEvent = 872; //todo? - public static final int RequestABadgeEvent = 3077; //todo? - public static final int ResetPhoneNumberStateEvent = 2741; //todo? - public static final int ResetResolutionAchievementEvent = 3144; //todo? - public static final int ResetUnseenItemIdsEvent = 3493; //todo? - public static final int ResetUnseenItemsEvent = 2343; //todo? - public static final int RoomAdEventTabAdClickedEvent = 2412; //todo? - public static final int RoomAdEventTabViewedEvent = 2668; //todo? - public static final int RoomAdPurchaseInitiatedEvent = 2283; //todo? - public static final int RoomAdSearchEvent = 2809; //todo? - public static final int RoomCompetitionInitEvent = 1334; //todo? - public static final int RoomNetworkOpenConnectionEvent = 3736; //todo? - public static final int RoomUsersClassificationEvent = 2285; //todo? - public static final int SearchFaqsEvent = 2031; //todo? - public static final int SetPhoneNumberVerificationStatusEvent = 1379; //todo? - public static final int SetRoomSessionTagsEvent = 3305; //todo? - public static final int ShopTargetedOfferViewedEvent = 3483; //todo? - public static final int StartCampaignEvent = 1697; //todo? - public static final int ToggleStaffPickEvent = 1918; //todo? - public static final int TryPhoneNumberEvent = 790; //todo? - public static final int UnblockGroupMemberEvent = 2864; //todo? - public static final int UpdateForumReadMarkerEvent = 1855; //todo? - public static final int UpdateRoomCategoryAndTradeSettingsEvent = 1265; //todo? - public static final int UpdateRoomThumbnailEvent = 2468; //todo? - public static final int VerifyCodeEvent = 2721; //todo? - public static final int VersionCheckEvent = 1053; //todo? - public static final int VoteForRoomEvent = 143; //todo? - public static final int WelcomeGiftChangeEmailEvent = 66; //todo? + public static final int acceptGameInviteEvent = 3802; + public static final int acceptQuestEvent = 3604; + public static final int approveAllMembershipRequestsEvent = 882; + public static final int buildersClubPlaceRoomItemEvent = 1051; + public static final int buyMarketplaceTokensEvent = 1866; + public static final int callForHelpFromSelfieEvent = 2755; + public static final int cancelEventEvent = 2725; + public static final int cancelQuestEvent = 3133; + public static final int changeEmailEvent = 3965; + public static final int changeQueueEvent = 3093; + public static final int communityGoalVoteEvent = 3536; + public static final int competitionRoomsSearchEvent = 433; + public static final int deletePendingCallsForHelpEvent = 3605; + public static final int disconnectEvent = 2445; + public static final int extendRentOrBuyoutFurniEvent = 1071; + public static final int extendRentOrBuyoutStripItemEvent = 2115; + public static final int forwardToACompetitionRoomEvent = 172; + public static final int forwardToARandomPromotedRoomEvent = 10; + public static final int forwardToRandomCompetitionRoomEvent = 865; + public static final int friendListUpdateEvent = 1419; + public static final int friendRequestQuestCompleteEvent = 1148; + public static final int game2CheckGameDirectoryStatusEvent = 3259; + public static final int game2ExitGameEvent = 1445; + public static final int game2GameChatEvent = 2502; + public static final int game2GetWeeklyFriendsLeaderboardEvent = 1232; + public static final int game2GetWeeklyLeaderboardEvent = 2565; + public static final int game2LoadStageReadyEvent = 2415; + public static final int game2PlayAgainEvent = 3196; + public static final int game2RequestFullStatusUpdateEvent = 1598; + public static final int getCatalogPageExpirationEvent = 742; + public static final int getCatalogPageWithEarliestExpiryEvent = 3135; + public static final int getCategoriesWithUserCountEvent = 3782; + public static final int getCommunityGoalEarnedPrizesEvent = 2688; + public static final int getCommunityGoalHallOfFameEvent = 2167; + public static final int getCommunityGoalProgressEvent = 1145; + public static final int getConcurrentUsersGoalProgressEvent = 1343; + public static final int getConcurrentUsersRewardEvent = 3872; + public static final int getDailyQuestEvent = 2486; + public static final int getDirectClubBuyAvailableEvent = 801; + public static final int getEmailStatusEvent = 2557; + public static final int getExtendedProfileByNameEvent = 2249; + public static final int getFaqCategoryEvent = 3445; + public static final int getFaqTextEvent = 1849; + public static final int getGameAchievementsEvent = 2399; + public static final int getHabboBasicMembershipExtendOfferEvent = 603; + public static final int getInterstitialEvent = 2519; + public static final int getIsBadgeRequestFulfilledEvent = 1364; + public static final int getIsOfferGiftableEvent = 1347; + public static final int getIsUserPartOfCompetitionEvent = 2077; + public static final int getNextTargetedOfferEvent = 2487; + public static final int getOfficialRoomsEvent = 1229; + public static final int getQuestsEvent = 3333; + public static final int getQuizQuestionsEvent = 1296; + public static final int getSeasonalCalendarDailyOfferEvent = 3257; + public static final int getSeasonalQuestsOnlyEvent = 1190; + public static final int getSoundMachinePlayListEvent = 3498; + public static final int getTargetedOfferEvent = 596; + public static final int getThreadEvent = 3900; + public static final int getUserGameAchievementsEvent = 389; + public static final int giveSupplementToPetEvent = 749; + public static final int goToFlatEvent = 685; + public static final int guideAdvertisementReadEvent = 2455; + public static final int guildBaseSearchEvent = 2930; + public static final int harvestPetEvent = 1521; + public static final int ignoreUserIdEvent = 3314; + public static final int interstitialShownEvent = 1109; + public static final int lagWarningReportEvent = 3847; + public static final int latencyPingReportEvent = 96; + public static final int leaveQueueEvent = 2384; + public static final int modToolPreferencesEvent = 31; + public static final int myFrequentRoomHistorySearchEvent = 1002; + public static final int myRecommendedRoomsEvent = 2537; + public static final int mysteryBoxWaitingCanceledEvent = 2012; + public static final int openMysteryTrophyEvent = 3074; + public static final int openQuestTrackerEvent = 2750; + public static final int openWelcomeGiftEvent = 2638; + public static final int passCarryItemToPetEvent = 2768; + public static final int peerUsersClassificationEvent = 1160; + public static final int performanceLogEvent = 3230; + public static final int petSelectedEvent = 549; + public static final int photoCompetitionEvent = 3959; + public static final int postQuizAnswersEvent = 3720; + public static final int purchaseBasicMembershipExtensionEvent = 2735; + public static final int redeemCommunityGoalPrizeEvent = 90; + public static final int rejectQuestEvent = 2397; + public static final int rentableSpaceStatusEvent = 872; + public static final int requestABadgeEvent = 3077; + public static final int resetPhoneNumberStateEvent = 2741; + public static final int resetResolutionAchievementEvent = 3144; + public static final int resetUnseenItemIdsEvent = 3493; + public static final int resetUnseenItemsEvent = 2343; + public static final int roomAdEventTabAdClickedEvent = 2412; + public static final int roomAdEventTabViewedEvent = 2668; + public static final int roomAdPurchaseInitiatedEvent = 2283; + public static final int roomAdSearchEvent = 2809; + public static final int roomCompetitionInitEvent = 1334; + public static final int roomNetworkOpenConnectionEvent = 3736; + public static final int roomUsersClassificationEvent = 2285; + public static final int searchFaqsEvent = 2031; + public static final int setPhoneNumberVerificationStatusEvent = 1379; + public static final int setRoomSessionTagsEvent = 3305; + public static final int shopTargetedOfferViewedEvent = 3483; + public static final int startCampaignEvent = 1697; + public static final int toggleStaffPickEvent = 1918; + public static final int tryPhoneNumberEvent = 790; + public static final int unblockGroupMemberEvent = 2864; + public static final int updateForumReadMarkerEvent = 1855; + public static final int updateRoomCategoryAndTradeSettingsEvent = 1265; + public static final int updateRoomThumbnailEvent = 2468; + public static final int verifyCodeEvent = 2721; + public static final int versionCheckEvent = 1053; + public static final int voteForRoomEvent = 143; + public static final int welcomeGiftChangeEmailEvent = 66; - /* - Snowstorm incoming packets, which are not from PRODUCTION-201611291003-338511768, but are in the OpenSource SWF. + /** + * Snowstorm incoming packets, which are not from PRODUCTION-201611291003-338511768, but are in the OpenSource SWF. */ - public static final int UNKNOWN_SNOWSTORM_6000 = 6000; - public static final int UNKNOWN_SNOWSTORM_6001 = 6001; - public static final int UNKNOWN_SNOWSTORM_6002 = 6002; - public static final int UNKNOWN_SNOWSTORM_6003 = 6003; - public static final int UNKNOWN_SNOWSTORM_6004 = 6004; - public static final int UNKNOWN_SNOWSTORM_6005 = 6005; - public static final int UNKNOWN_SNOWSTORM_6006 = 6006; - public static final int UNKNOWN_SNOWSTORM_6007 = 6007; - public static final int UNKNOWN_SNOWSTORM_6008 = 6008; - public static final int UNKNOWN_SNOWSTORM_6009 = 6009; - public static final int UNKNOWN_SNOWSTORM_6010 = 6010; - public static final int UNKNOWN_SNOWSTORM_6011 = 6011; - public static final int SnowStormJoinQueueEvent = 6012; - public static final int UNKNOWN_SNOWSTORM_6013 = 6013; - public static final int UNKNOWN_SNOWSTORM_6014 = 6014; - public static final int UNKNOWN_SNOWSTORM_6015 = 6015; - public static final int UNKNOWN_SNOWSTORM_6016 = 6016; - public static final int UNKNOWN_SNOWSTORM_6017 = 6017; - public static final int UNKNOWN_SNOWSTORM_6018 = 6018; - public static final int UNKNOWN_SNOWSTORM_6019 = 6019; - public static final int UNKNOWN_SNOWSTORM_6020 = 6020; - public static final int UNKNOWN_SNOWSTORM_6021 = 6021; - public static final int UNKNOWN_SNOWSTORM_6022 = 6022; - public static final int UNKNOWN_SNOWSTORM_6023 = 6023; - public static final int UNKNOWN_SNOWSTORM_6024 = 6024; - public static final int UNKNOWN_SNOWSTORM_6025 = 6025; - public static final int SnowStormUserPickSnowballEvent = 6026; + public static final int unknownSnowStormEvent_6000 = 6000; + public static final int unknownSnowStormEvent_6001 = 6001; + public static final int unknownSnowStormEvent_6002 = 6002; + public static final int unknownSnowStormEvent_6003 = 6003; + public static final int unknownSnowStormEvent_6004 = 6004; + public static final int unknownSnowStormEvent_6005 = 6005; + public static final int unknownSnowStormEvent_6006 = 6006; + public static final int unknownSnowStormEvent_6007 = 6007; + public static final int unknownSnowStormEvent_6008 = 6008; + public static final int unknownSnowStormEvent_6009 = 6009; + public static final int unknownSnowStormEvent_6010 = 6010; + public static final int unknownSnowStormEvent_6011 = 6011; + public static final int snowStormJoinQueueEvent = 6012; + public static final int unknownSnowStormEvent_6013 = 6013; + public static final int unknownSnowStormEvent_6014 = 6014; + public static final int unknownSnowStormEvent_6015 = 6015; + public static final int unknownSnowStormEvent_6016 = 6016; + public static final int unknownSnowStormEvent_6017 = 6017; + public static final int unknownSnowStormEvent_6018 = 6018; + public static final int unknownSnowStormEvent_6019 = 6019; + public static final int unknownSnowStormEvent_6020 = 6020; + public static final int unknownSnowStormEvent_6021 = 6021; + public static final int unknownSnowStormEvent_6022 = 6022; + public static final int unknownSnowStormEvent_6023 = 6023; + public static final int unknownSnowStormEvent_6024 = 6024; + public static final int unknownSnowStormEvent_6025 = 6025; + public static final int snowStormUserPickSnowballEvent = 6026; } diff --git a/src/main/java/com/eu/habbo/messages/incoming/events/calendar/OpenCampaignCalendarDoorAsStaffEvent.java b/src/main/java/com/eu/habbo/messages/incoming/campaign/OpenCampaignCalendarDoorAsStaffEvent.java similarity index 75% rename from src/main/java/com/eu/habbo/messages/incoming/events/calendar/OpenCampaignCalendarDoorAsStaffEvent.java rename to src/main/java/com/eu/habbo/messages/incoming/campaign/OpenCampaignCalendarDoorAsStaffEvent.java index 7922228d..03e4dc47 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/events/calendar/OpenCampaignCalendarDoorAsStaffEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/campaign/OpenCampaignCalendarDoorAsStaffEvent.java @@ -1,4 +1,4 @@ -package com.eu.habbo.messages.incoming.events.calendar; +package com.eu.habbo.messages.incoming.campaign; import com.eu.habbo.Emulator; import com.eu.habbo.messages.incoming.MessageHandler; @@ -9,6 +9,7 @@ public class OpenCampaignCalendarDoorAsStaffEvent extends MessageHandler { String campaignName = this.packet.readString(); int day = this.packet.readInt(); - Emulator.getGameEnvironment().getCalendarManager().claimCalendarReward(this.client.getHabbo(), campaignName, day, false); + Emulator.getGameEnvironment().getCalendarManager().claimCalendarReward(this.client.getHabbo(), campaignName, day, true); } -} \ No newline at end of file +} + diff --git a/src/main/java/com/eu/habbo/messages/incoming/events/calendar/OpenCampaignCalendarDoorEvent.java b/src/main/java/com/eu/habbo/messages/incoming/campaign/OpenCampaignCalendarDoorEvent.java similarity index 75% rename from src/main/java/com/eu/habbo/messages/incoming/events/calendar/OpenCampaignCalendarDoorEvent.java rename to src/main/java/com/eu/habbo/messages/incoming/campaign/OpenCampaignCalendarDoorEvent.java index 1cf7505f..cb66ae3b 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/events/calendar/OpenCampaignCalendarDoorEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/campaign/OpenCampaignCalendarDoorEvent.java @@ -1,4 +1,4 @@ -package com.eu.habbo.messages.incoming.events.calendar; +package com.eu.habbo.messages.incoming.campaign; import com.eu.habbo.Emulator; import com.eu.habbo.messages.incoming.MessageHandler; @@ -9,6 +9,6 @@ public class OpenCampaignCalendarDoorEvent extends MessageHandler { String campaignName = this.packet.readString(); int day = this.packet.readInt(); - Emulator.getGameEnvironment().getCalendarManager().claimCalendarReward(this.client.getHabbo(), campaignName, day, true); + Emulator.getGameEnvironment().getCalendarManager().claimCalendarReward(this.client.getHabbo(), campaignName, day, false); } -} \ No newline at end of file +} diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/RequestFriendEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/RequestFriendEvent.java index 5087b827..591a7949 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/friends/RequestFriendEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/friends/RequestFriendEvent.java @@ -83,7 +83,7 @@ public class RequestFriendEvent extends MessageHandler { } if(targetHabbo.isOnline()) { - targetHabbo.getClient().sendResponse(new NewFriendRequestComposer(this.client.getHabbo())); + targetHabbo.getClient().sendResponse(new NewFriendRequestComposer(this.client.getHabbo().getHabboInfo())); } Messenger.makeFriendRequest(this.client.getHabbo().getHabboInfo().getId(), targetId); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/ApproveMembershipRequestEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/ApproveMembershipRequestEvent.java index a809fe63..bc5ca6cb 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/ApproveMembershipRequestEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/ApproveMembershipRequestEvent.java @@ -5,12 +5,13 @@ import com.eu.habbo.habbohotel.guilds.Guild; import com.eu.habbo.habbohotel.guilds.GuildMember; import com.eu.habbo.habbohotel.guilds.GuildRank; import com.eu.habbo.habbohotel.permissions.Permission; -import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.Habbo; +import com.eu.habbo.habbohotel.users.HabboInfo; +import com.eu.habbo.habbohotel.users.HabboManager; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.guilds.GuildMemberMgmtFailedMessageComposer; -import com.eu.habbo.messages.outgoing.guilds.HabboGroupDetailsMessageComposer; import com.eu.habbo.messages.outgoing.guilds.GuildMembershipRejectedMessageComposer; +import com.eu.habbo.messages.outgoing.guilds.HabboGroupDetailsMessageComposer; import com.eu.habbo.plugin.events.guilds.GuildAcceptedMembershipEvent; public class ApproveMembershipRequestEvent extends MessageHandler { @@ -20,44 +21,44 @@ public class ApproveMembershipRequestEvent extends MessageHandler { int userId = this.packet.readInt(); Guild guild = Emulator.getGameEnvironment().getGuildManager().getGuild(guildId); - Habbo habbo = Emulator.getGameEnvironment().getHabboManager().getHabbo(userId); + HabboInfo userInfo; + if (guild == null) return; + GuildMember groupMember = Emulator.getGameEnvironment().getGuildManager().getGuildMember(guild, this.client.getHabbo()); - if (guild != null) { - GuildMember groupMember = Emulator.getGameEnvironment().getGuildManager().getGuildMember(guild, this.client.getHabbo()); - if (userId == this.client.getHabbo().getHabboInfo().getId() || guild.getOwnerId() == this.client.getHabbo().getHabboInfo().getId() || groupMember.getRank().equals(GuildRank.ADMIN) || groupMember.getRank().equals(GuildRank.OWNER) || this.client.getHabbo().hasPermission(Permission.ACC_GUILD_ADMIN)) { - if (habbo.getHabboStats().hasGuild(guild.getId())) { - if (habbo != null) { - this.client.sendResponse(new GuildMemberMgmtFailedMessageComposer(guild.getId(), GuildMemberMgmtFailedMessageComposer.ALREADY_ACCEPTED)); - return; - } else { - //Check the user has requested - GuildMember member = Emulator.getGameEnvironment().getGuildManager().getGuildMember(guild, habbo); - if (member == null || member.getRank().type != GuildRank.REQUESTED.type) { - this.client.sendResponse(new GuildMemberMgmtFailedMessageComposer(guild.getId(), GuildMemberMgmtFailedMessageComposer.NO_LONGER_MEMBER)); - return; - } else { - GuildAcceptedMembershipEvent event = new GuildAcceptedMembershipEvent(guild, userId, habbo); - Emulator.getPluginManager().fireEvent(event); - if (!event.isCancelled()) { - habbo.getHabboStats().addGuild(guild.getId()); - Emulator.getGameEnvironment().getGuildManager().joinGuild(guild, this.client, habbo.getHabboInfo().getId(), true); - guild.decreaseRequestCount(); - guild.increaseMemberCount(); - this.client.sendResponse(new GuildMembershipRejectedMessageComposer(guild)); - Room room = habbo.getHabboInfo().getCurrentRoom(); - if (room != null) { - if (room.getGuildId() == guildId) { - habbo.getClient().sendResponse(new HabboGroupDetailsMessageComposer(guild, habbo.getClient(), false, Emulator.getGameEnvironment().getGuildManager().getGuildMember(guildId, userId))); - room.refreshRightsForHabbo(habbo); - } - } - } - } - } - } else { - Emulator.getGameEnvironment().getGuildManager().joinGuild(guild, this.client, userId, true); - } - } + Habbo habbo = Emulator.getGameEnvironment().getHabboManager().getHabbo(userId); + if (habbo == null) userInfo = HabboManager.getOfflineHabboInfo(userId); + else userInfo = habbo.getHabboInfo(); + + + if (userInfo == null || groupMember == null || userId == this.client.getHabbo().getHabboInfo().getId() || (!this.client.getHabbo().hasPermission(Permission.ACC_GUILD_ADMIN) && guild.getOwnerId() != this.client.getHabbo().getHabboInfo().getId() && !groupMember.getRank().equals(GuildRank.ADMIN) && !groupMember.getRank().equals(GuildRank.OWNER))) + return; + + if (!userInfo.getHabboStats().hasGuild(guild.getId())) { + this.client.sendResponse(new GuildMemberMgmtFailedMessageComposer(guild.getId(), GuildMemberMgmtFailedMessageComposer.ALREADY_ACCEPTED)); + return; + } + + if (!Emulator.getGameEnvironment().getGuildManager().joinGuild(guild, this.client, userId, true)) return; + GuildMember member = Emulator.getGameEnvironment().getGuildManager().getGuildMember(guild.getId(), userId); + + if (member == null || member.getRank().type != GuildRank.REQUESTED.type) { + this.client.sendResponse(new GuildMemberMgmtFailedMessageComposer(guild.getId(), GuildMemberMgmtFailedMessageComposer.NO_LONGER_MEMBER)); + return; + } + GuildAcceptedMembershipEvent event = new GuildAcceptedMembershipEvent(guild, userId, userInfo); + Emulator.getPluginManager().fireEvent(event); + if (event.isCancelled()) return; + + userInfo.getHabboStats().addGuild(guild.getId()); + boolean joinGuild = Emulator.getGameEnvironment().getGuildManager().joinGuild(guild, this.client, userId, true); + if (!joinGuild) + guild.decreaseRequestCount(); + guild.increaseMemberCount(); + this.client.sendResponse(new GuildMembershipRejectedMessageComposer(guild, userId)); + + if (habbo != null && userInfo.isOnline() && userInfo.getCurrentRoom() != null && userInfo.getCurrentRoom().getGuildId() == guildId) { + habbo.getClient().sendResponse(new HabboGroupDetailsMessageComposer(guild, habbo.getClient(), false, Emulator.getGameEnvironment().getGuildManager().getGuildMember(guildId, userId))); + userInfo.getCurrentRoom().refreshRightsForHabbo(habbo); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GetMemberGuildItemCountEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetMemberGuildItemCountEvent.java index 4a5d77a0..7202ada6 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GetMemberGuildItemCountEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetMemberGuildItemCountEvent.java @@ -17,17 +17,17 @@ public class GetMemberGuildItemCountEvent extends MessageHandler { Guild guild = Emulator.getGameEnvironment().getGuildManager().getGuild(guildId); - if (guild != null) { - GuildMember member = Emulator.getGameEnvironment().getGuildManager().getGuildMember(guild, this.client.getHabbo()); - if (userId == this.client.getHabbo().getHabboInfo().getId() || guild.getOwnerId() == this.client.getHabbo().getHabboInfo().getId() || (member != null && member.getRank().equals(GuildRank.OWNER) || member.getRank().equals(GuildRank.ADMIN)) || this.client.getHabbo().hasPermission(Permission.ACC_GUILD_ADMIN)) { - Room room = Emulator.getGameEnvironment().getRoomManager().loadRoom(guild.getRoomId()); - int count = 0; - if (room != null) { - count = room.getUserFurniCount(userId); - } - this.client.sendResponse(new GuildMemberFurniCountInHQMessageComposer(userId, count)); + if (guild == null) return; + GuildMember member = Emulator.getGameEnvironment().getGuildManager().getGuildMember(guild, this.client.getHabbo()); + if (userId == this.client.getHabbo().getHabboInfo().getId() || guild.getOwnerId() == this.client.getHabbo().getHabboInfo().getId() || (member != null && (member.getRank().equals(GuildRank.OWNER) || member.getRank().equals(GuildRank.ADMIN))) || this.client.getHabbo().hasPermission(Permission.ACC_GUILD_ADMIN)) { + Room room = Emulator.getGameEnvironment().getRoomManager().loadRoom(guild.getRoomId()); + int count = 0; + if (room != null) { + count = room.getUserFurniCount(userId); } + this.client.sendResponse(new GuildMemberFurniCountInHQMessageComposer(userId, count)); } + } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/KickMemberEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/KickMemberEvent.java index 319d371a..cf5e9b98 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/KickMemberEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/KickMemberEvent.java @@ -35,7 +35,7 @@ public class KickMemberEvent extends MessageHandler { guild.decreaseMemberCount(); if (userId != this.client.getHabbo().getHabboInfo().getId()) { - this.client.sendResponse(new GuildMembershipRejectedMessageComposer(guild)); + this.client.sendResponse(new GuildMembershipRejectedMessageComposer(guild, userId)); } Room room = Emulator.getGameEnvironment().getRoomManager().loadRoom(guild.getRoomId()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/RejectMembershipRequestEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/RejectMembershipRequestEvent.java index 3534f488..a21621cd 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/RejectMembershipRequestEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/RejectMembershipRequestEvent.java @@ -27,7 +27,7 @@ public class RejectMembershipRequestEvent extends MessageHandler { guild.decreaseRequestCount(); Emulator.getGameEnvironment().getGuildManager().removeMember(guild, userId); this.client.sendResponse(new GuildMembersComposer(guild, Emulator.getGameEnvironment().getGuildManager().getGuildMembers(guild, 0, 0, ""), this.client.getHabbo(), 0, 0, "", true, Emulator.getGameEnvironment().getGuildManager().getGuildMembersCount(guild, 0, 0, ""))); - this.client.sendResponse(new GuildMembershipRejectedMessageComposer(guild)); + this.client.sendResponse(new GuildMembershipRejectedMessageComposer(guild, userId)); Habbo habbo = Emulator.getGameEnvironment().getHabboManager().getHabbo(userId); Emulator.getPluginManager().fireEvent(new GuildDeclinedMembershipEvent(guild, userId, habbo, this.client.getHabbo())); diff --git a/src/main/java/com/eu/habbo/messages/incoming/handshake/SSOTicketEvent.java b/src/main/java/com/eu/habbo/messages/incoming/handshake/SSOTicketEvent.java index 0ed19b3d..013c1e77 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/handshake/SSOTicketEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/handshake/SSOTicketEvent.java @@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.handshake; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.achievements.AchievementManager; -import com.eu.habbo.habbohotel.campaign.calendar.CalendarCampaign; +import com.eu.habbo.habbohotel.campaign.CalendarCampaign; import com.eu.habbo.habbohotel.catalog.TargetOffer; import com.eu.habbo.habbohotel.messenger.Messenger; import com.eu.habbo.habbohotel.modtool.ModToolSanctionItem; @@ -25,10 +25,7 @@ import com.eu.habbo.messages.outgoing.generic.alerts.HabboBroadcastMessageCompos import com.eu.habbo.messages.outgoing.generic.alerts.MOTDNotificationComposer; import com.eu.habbo.messages.outgoing.habboway.nux.NoobnessLevelMessageComposer; import com.eu.habbo.messages.outgoing.habboway.nux.InClientLinkMessageComposer; -import com.eu.habbo.messages.outgoing.handshake.EnableNotificationsComposer; -import com.eu.habbo.messages.outgoing.handshake.AuthenticationOKMessageComposer; -import com.eu.habbo.messages.outgoing.handshake.AvailabilityStatusMessageComposer; -import com.eu.habbo.messages.outgoing.handshake.PingMessageComposer; +import com.eu.habbo.messages.outgoing.handshake.*; import com.eu.habbo.messages.outgoing.inventory.BadgePointLimitsComposer; import com.eu.habbo.messages.outgoing.inventory.AvatarEffectsMessageComposer; import com.eu.habbo.messages.outgoing.modtool.CfhTopicsInitComposer; diff --git a/src/main/java/com/eu/habbo/messages/incoming/hotelview/GetCurrentTimingCodeEvent.java b/src/main/java/com/eu/habbo/messages/incoming/hotelview/GetCurrentTimingCodeEvent.java index fc6c72b0..39caa82d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/hotelview/GetCurrentTimingCodeEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/hotelview/GetCurrentTimingCodeEvent.java @@ -24,8 +24,6 @@ public class GetCurrentTimingCodeEvent extends MessageHandler { } else { this.client.sendResponse(new CurrentTimingCodeMessageComposer(data, s)); } - - break; } //this.client.sendResponse(new HotelViewDataComposer("2013-05-08 13:0", "gamesmaker")); diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpEvent.java index b812da4e..761e7987 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpEvent.java @@ -66,9 +66,9 @@ public class CallForHelpEvent extends MessageHandler { Emulator.getGameEnvironment().getModToolManager().addTicket(issue); Emulator.getGameEnvironment().getModToolManager().updateTicketToMods(issue); - this.client.sendResponse(new CallForHelpResultMessageComposer(CallForHelpResultMessageComposer.REPORT_RECEIVED, cfhTopic.reply)); if (cfhTopic != null) { + this.client.sendResponse(new CallForHelpResultMessageComposer(CallForHelpResultMessageComposer.REPORT_RECEIVED, cfhTopic.reply)); if (cfhTopic.action != CfhActionType.MODS) { Emulator.getThreading().run(() -> { if (issue.state == ModToolTicketState.OPEN) { @@ -81,7 +81,7 @@ public class CallForHelpEvent extends MessageHandler { CallForHelpEvent.this.client.sendResponse(new IssueCloseNotificationMessageComposer(cfhTopic.reply).compose()); Emulator.getGameEnvironment().getModToolManager().closeTicketAsHandled(issue, null); } - }, 30 * 1000); + }, (long) 30 * 1000); } } } @@ -111,7 +111,7 @@ public class CallForHelpEvent extends MessageHandler { CallForHelpEvent.this.client.sendResponse(new IssueCloseNotificationMessageComposer(cfhTopic.reply).compose()); Emulator.getGameEnvironment().getModToolManager().closeTicketAsHandled(issue, null); } - }, 30 * 1000); + }, (long) 30 * 1000); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpFromIMEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpFromIMEvent.java index 3ae6b09e..001d133f 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpFromIMEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpFromIMEvent.java @@ -35,15 +35,15 @@ public class CallForHelpFromIMEvent extends MessageHandler { info = HabboManager.getOfflineHabboInfo(userId); } - if (info != null) { - for (int i = 0; i < count; i++) { - int chatUserId = this.packet.readInt(); - String username = this.packet.readInt() == info.getId() ? info.getUsername() : this.client.getHabbo().getHabboInfo().getUsername(); + if (info == null) return; + for (int i = 0; i < count; i++) { + int chatUserId = this.packet.readInt(); + String username = this.packet.readInt() == info.getId() ? info.getUsername() : this.client.getHabbo().getHabboInfo().getUsername(); - chatLogs.add(new ModToolChatLog(0, chatUserId, username, this.packet.readString())); - } + chatLogs.add(new ModToolChatLog(0, chatUserId, username, this.packet.readString())); } + ModToolIssue issue = new ModToolIssue(this.client.getHabbo().getHabboInfo().getId(), this.client.getHabbo().getHabboInfo().getUsername(), userId, info.getUsername(), 0, message, ModToolTicketType.IM); issue.category = category; issue.chatLogs = chatLogs; diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModAlertEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModAlertEvent.java index 9704f8f6..73af83bf 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModAlertEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModAlertEvent.java @@ -18,33 +18,31 @@ public class ModAlertEvent extends MessageHandler { String message = this.packet.readString(); int cfhTopic = this.packet.readInt(); - if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) { - Habbo habbo = Emulator.getGameEnvironment().getHabboManager().getHabbo(userId); + if (!this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) return; + Habbo habbo = Emulator.getGameEnvironment().getHabboManager().getHabbo(userId); - if (habbo != null) { - ModToolSanctions modToolSanctions = Emulator.getGameEnvironment().getModToolSanctions(); - - if (Emulator.getConfig().getBoolean("hotel.sanctions.enabled")) { - THashMap> modToolSanctionItemsHashMap = Emulator.getGameEnvironment().getModToolSanctions().getSanctions(habbo.getHabboInfo().getId()); - ArrayList modToolSanctionItems = modToolSanctionItemsHashMap.get(habbo.getHabboInfo().getId()); - - if (modToolSanctionItems != null && !modToolSanctionItems.isEmpty()) { - ModToolSanctionItem item = modToolSanctionItems.get(modToolSanctionItems.size() - 1); - - if (item != null && item.probationTimestamp > 0 && item.probationTimestamp >= Emulator.getIntUnixTimestamp()) { - modToolSanctions.run(userId, this.client.getHabbo(), item.sanctionLevel, cfhTopic, message, 0, false, 0); - } else { - modToolSanctions.run(userId, this.client.getHabbo(), item.sanctionLevel, cfhTopic, message, 0, false, 0); - } - } else { - modToolSanctions.run(userId, this.client.getHabbo(), 0, cfhTopic, message, 0, false, 0); - } - } else { - habbo.alert(message); - } - } else { - this.client.sendResponse(new IssueCloseNotificationMessageComposer(Emulator.getTexts().getValue("generic.user.not_found").replace("%user%", Emulator.getConfig().getValue("hotel.player.name")))); - } + if (habbo == null) { + this.client.sendResponse(new IssueCloseNotificationMessageComposer(Emulator.getTexts().getValue("generic.user.not_found").replace("%user%", Emulator.getConfig().getValue("hotel.player.name")))); + return; } + ModToolSanctions modToolSanctions = Emulator.getGameEnvironment().getModToolSanctions(); + + if (!Emulator.getConfig().getBoolean("hotel.sanctions.enabled")) { + habbo.alert(message); + return; + } + THashMap> modToolSanctionItemsHashMap = Emulator.getGameEnvironment().getModToolSanctions().getSanctions(habbo.getHabboInfo().getId()); + ArrayList modToolSanctionItems = modToolSanctionItemsHashMap.get(habbo.getHabboInfo().getId()); + + if (modToolSanctionItems == null || modToolSanctionItems.isEmpty()) { + modToolSanctions.run(userId, this.client.getHabbo(), 0, cfhTopic, message, 0, false, 0); + return; + } + + ModToolSanctionItem item = modToolSanctionItems.get(modToolSanctionItems.size() - 1); + if (item == null) return; + modToolSanctions.run(userId, this.client.getHabbo(), item.sanctionLevel, cfhTopic, message, 0, false, 0); + + } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModBanEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModBanEvent.java index c8e607a3..6cb5b35d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModBanEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModBanEvent.java @@ -46,30 +46,28 @@ public class ModBanEvent extends MessageHandler { case BAN_AVATAR_ONLY_100_YEARS: duration = Emulator.getIntUnixTimestamp(); } - if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) { - ModToolSanctions modToolSanctions = Emulator.getGameEnvironment().getModToolSanctions(); - - if (Emulator.getConfig().getBoolean("hotel.sanctions.enabled")) { - THashMap> modToolSanctionItemsHashMap = Emulator.getGameEnvironment().getModToolSanctions().getSanctions(userId); - ArrayList modToolSanctionItems = modToolSanctionItemsHashMap.get(userId); - - if (modToolSanctionItems != null && !modToolSanctionItemsHashMap.isEmpty()) { - ModToolSanctionItem item = modToolSanctionItems.get(modToolSanctionItems.size() - 1); - - if (item.probationTimestamp > 0 && item.probationTimestamp >= Emulator.getIntUnixTimestamp()) { - modToolSanctions.run(userId, this.client.getHabbo(), item.sanctionLevel, cfhTopic, message, 0, false, 0); - } else { - modToolSanctions.run(userId, this.client.getHabbo(), item.sanctionLevel, cfhTopic, message, 0, false, 0); - } - } else { - modToolSanctions.run(userId, this.client.getHabbo(), 0, cfhTopic, message, 0, false, 0); - } - } else { - Emulator.getGameEnvironment().getModToolManager().ban(userId, this.client.getHabbo(), message, duration, ModToolBanType.ACCOUNT, cfhTopic); - } - - } else { + if (!this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) { ScripterManager.scripterDetected(this.client, Emulator.getTexts().getValue("scripter.warning.modtools.ban").replace("%username%", this.client.getHabbo().getHabboInfo().getUsername())); + return; } + + if (!Emulator.getConfig().getBoolean("hotel.sanctions.enabled")) { + Emulator.getGameEnvironment().getModToolManager().ban(userId, this.client.getHabbo(), message, duration, ModToolBanType.ACCOUNT, cfhTopic); + return; + } + ModToolSanctions modToolSanctions = Emulator.getGameEnvironment().getModToolSanctions(); + THashMap> modToolSanctionItemsHashMap = Emulator.getGameEnvironment().getModToolSanctions().getSanctions(userId); + ArrayList modToolSanctionItems = modToolSanctionItemsHashMap.get(userId); + + if (modToolSanctionItemsHashMap.isEmpty()) { + modToolSanctions.run(userId, this.client.getHabbo(), 0, cfhTopic, message, 0, false, 0); + return; + } + + ModToolSanctionItem item = modToolSanctionItems.get(modToolSanctionItems.size() - 1); + if (item == null) return; + modToolSanctions.run(userId, this.client.getHabbo(), item.sanctionLevel, cfhTopic, message, 0, false, 0); + + } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModMuteEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModMuteEvent.java index dc6042b4..f6edd10e 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModMuteEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModMuteEvent.java @@ -20,43 +20,37 @@ public class ModMuteEvent extends MessageHandler { String message = this.packet.readString(); int cfhTopic = this.packet.readInt(); - if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) { - Habbo habbo = Emulator.getGameEnvironment().getHabboManager().getHabbo(userId); + if (!this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) return; - if (habbo != null) { - ModToolSanctions modToolSanctions = Emulator.getGameEnvironment().getModToolSanctions(); + Habbo habbo = Emulator.getGameEnvironment().getHabboManager().getHabbo(userId); + if (habbo == null) { + this.client.sendResponse(new IssueCloseNotificationMessageComposer(Emulator.getTexts().getValue("generic.user.not_found").replace("%user%", Emulator.getConfig().getValue("hotel.player.name")))); + return; + } - if (Emulator.getConfig().getBoolean("hotel.sanctions.enabled")) { - THashMap> modToolSanctionItemsHashMap = Emulator.getGameEnvironment().getModToolSanctions().getSanctions(habbo.getHabboInfo().getId()); - ArrayList modToolSanctionItems = modToolSanctionItemsHashMap.get(habbo.getHabboInfo().getId()); + ModToolSanctions modToolSanctions = Emulator.getGameEnvironment().getModToolSanctions(); - if (modToolSanctionItems != null && !modToolSanctionItemsHashMap.isEmpty()) { - ModToolSanctionItem item = modToolSanctionItems.get(modToolSanctionItems.size() - 1); + if (!Emulator.getConfig().getBoolean("hotel.sanctions.enabled")) { + habbo.mute(60 * 60, false); + habbo.alert(message); + this.client.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_mute.muted").replace("%user%", habbo.getHabboInfo().getUsername())); + return; + } - if (item.probationTimestamp > 0 && item.probationTimestamp >= Emulator.getIntUnixTimestamp()) { - ModToolSanctionLevelItem modToolSanctionLevelItem = modToolSanctions.getSanctionLevelItem(item.sanctionLevel); + THashMap> modToolSanctionItemsHashMap = Emulator.getGameEnvironment().getModToolSanctions().getSanctions(habbo.getHabboInfo().getId()); + ArrayList modToolSanctionItems = modToolSanctionItemsHashMap.get(habbo.getHabboInfo().getId()); + if (modToolSanctionItems == null || modToolSanctionItemsHashMap.isEmpty()) { + modToolSanctions.run(userId, this.client.getHabbo(), 0, cfhTopic, message, 0, false, 0); + return; + } - int muteDurationTimestamp = Math.toIntExact(new Date( System.currentTimeMillis() + (modToolSanctionLevelItem.sanctionHourLength * 60 * 60)).getTime() / 1000); + ModToolSanctionItem item = modToolSanctionItems.get(modToolSanctionItems.size() - 1); + if (item == null) return; - modToolSanctions.run(userId, this.client.getHabbo(), item.sanctionLevel, cfhTopic, message, 0, true, muteDurationTimestamp); - } else { - ModToolSanctionLevelItem modToolSanctionLevelItem = modToolSanctions.getSanctionLevelItem(item.sanctionLevel); - - int muteDurationTimestamp = Math.toIntExact(new Date( System.currentTimeMillis() + (modToolSanctionLevelItem.sanctionHourLength * 60 * 60)).getTime() / 1000); - - modToolSanctions.run(userId, this.client.getHabbo(), item.sanctionLevel, cfhTopic, message, 0, true, muteDurationTimestamp); - } - } else { - modToolSanctions.run(userId, this.client.getHabbo(), 0, cfhTopic, message, 0, false, 0); - } - } else { - habbo.mute(60 * 60, false); - habbo.alert(message); - this.client.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_mute.muted").replace("%user%", habbo.getHabboInfo().getUsername())); - } - } else { - this.client.sendResponse(new IssueCloseNotificationMessageComposer(Emulator.getTexts().getValue("generic.user.not_found").replace("%user%", Emulator.getConfig().getValue("hotel.player.name")))); - } + if (item.probationTimestamp >= Emulator.getIntUnixTimestamp()) { + ModToolSanctionLevelItem modToolSanctionLevelItem = modToolSanctions.getSanctionLevelItem(item.sanctionLevel); + int muteDurationTimestamp = Math.toIntExact(new Date(System.currentTimeMillis() + ((long) modToolSanctionLevelItem.sanctionHourLength * 60 * 60)).getTime() / 1000); + modToolSanctions.run(userId, this.client.getHabbo(), item.sanctionLevel, cfhTopic, message, 0, true, muteDurationTimestamp); } } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModTradingLockEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModTradingLockEvent.java index 8f7b79ec..198b308f 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModTradingLockEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModTradingLockEvent.java @@ -31,12 +31,8 @@ public class ModTradingLockEvent extends MessageHandler { if (modToolSanctionItems != null && !modToolSanctionItems.isEmpty()) { ModToolSanctionItem item = modToolSanctionItems.get(modToolSanctionItems.size() - 1); + modToolSanctions.run(userId, this.client.getHabbo(), item.sanctionLevel, cfhTopic, message, duration, false, 0); - if (item.probationTimestamp > 0 && item.probationTimestamp >= Emulator.getIntUnixTimestamp()) { - modToolSanctions.run(userId, this.client.getHabbo(), item.sanctionLevel, cfhTopic, message, duration, false, 0); - } else { - modToolSanctions.run(userId, this.client.getHabbo(), item.sanctionLevel, cfhTopic, message, duration, false, 0); - } } else { modToolSanctions.run(userId, this.client.getHabbo(), 0, cfhTopic, message, duration, false, 0); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetCustomStackingHeightEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetCustomStackingHeightEvent.java index 55fd0f44..7958b0e0 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetCustomStackingHeightEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetCustomStackingHeightEvent.java @@ -34,7 +34,7 @@ public class SetCustomStackingHeightEvent extends MessageHandler { } } } else { - stackerHeight = Math.min(Math.max(stackerHeight, itemTile.z * 100), Room.MAXIMUM_FURNI_HEIGHT * 100); + stackerHeight = Math.min(Math.max(stackerHeight, itemTile.z * 100.0), Room.MAXIMUM_FURNI_HEIGHT * 100); } double height = 0; diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/ControlYoutubeDisplayPlaybackEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/ControlYoutubeDisplayPlaybackEvent.java index 7af486a2..6c5bac12 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/ControlYoutubeDisplayPlaybackEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/ControlYoutubeDisplayPlaybackEvent.java @@ -18,7 +18,7 @@ public class ControlYoutubeDisplayPlaybackEvent extends MessageHandler { PAUSE(2), RESUME(3); - private int state; + private final int state; YoutubeState(int state) { this.state = state; @@ -80,7 +80,7 @@ public class ControlYoutubeDisplayPlaybackEvent extends MessageHandler { case RESUME: tv.playing = true; tv.startedWatchingAt = Emulator.getIntUnixTimestamp(); - tv.autoAdvance = Emulator.getThreading().run(new YoutubeAdvanceVideo(tv), (tv.currentVideo.getDuration() - tv.offset) * 1000); + tv.autoAdvance = Emulator.getThreading().run(new YoutubeAdvanceVideo(tv), (tv.currentVideo.getDuration() - tv.offset) * 1000L); room.sendComposer(new YoutubeControlVideoMessageComposer(tv.getId(), 1).compose()); break; case PREVIOUS: @@ -99,7 +99,7 @@ public class ControlYoutubeDisplayPlaybackEvent extends MessageHandler { room.sendComposer(new YoutubeDisplayVideoMessageComposer(tv.getId(), tv.currentVideo, true, 0).compose()); tv.cancelAdvancement(); - tv.autoAdvance = Emulator.getThreading().run(new YoutubeAdvanceVideo(tv), tv.currentVideo.getDuration() * 1000); + tv.autoAdvance = Emulator.getThreading().run(new YoutubeAdvanceVideo(tv), tv.currentVideo.getDuration() * 1000L); tv.startedWatchingAt = Emulator.getIntUnixTimestamp(); tv.offset = 0; tv.playing = true; diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/SetYoutubeDisplayPlaylistEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/SetYoutubeDisplayPlaylistEvent.java index 5d0c92d5..b509ec47 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/SetYoutubeDisplayPlaylistEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/SetYoutubeDisplayPlaylistEvent.java @@ -32,7 +32,7 @@ public class SetYoutubeDisplayPlaylistEvent extends MessageHandler { HabboItem item = this.client.getHabbo().getHabboInfo().getCurrentRoom().getHabboItem(itemId); - if (item == null || !(item instanceof InteractionYoutubeTV)) return; + if (!(item instanceof InteractionYoutubeTV)) return; Optional playlist = Emulator.getGameEnvironment().getItemManager().getYoutubeManager().getPlaylistsForItemId(item.getBaseItem().getId()).stream().filter(p -> p.getId().equals(playlistId)).findAny(); @@ -47,7 +47,7 @@ public class SetYoutubeDisplayPlaylistEvent extends MessageHandler { room.updateItem(item); room.sendComposer(new YoutubeDisplayVideoMessageComposer(itemId, video, true, 0).compose()); - ((InteractionYoutubeTV) item).autoAdvance = Emulator.getThreading().run(new YoutubeAdvanceVideo((InteractionYoutubeTV) item), video.getDuration() * 1000); + ((InteractionYoutubeTV) item).autoAdvance = Emulator.getThreading().run(new YoutubeAdvanceVideo((InteractionYoutubeTV) item), video.getDuration() * 1000L); item.needsUpdate(true); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/MoveAvatarEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/MoveAvatarEvent.java index 02ab1de6..9e13a1a2 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/MoveAvatarEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/MoveAvatarEvent.java @@ -157,8 +157,9 @@ public class MoveAvatarEvent extends MessageHandler { } } } - } catch (Exception e) { + } catch (InterruptedException e) { LOGGER.error("Caught exception", e); + Thread.currentThread().interrupt(); } } } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/Outgoing.java b/src/main/java/com/eu/habbo/messages/outgoing/Outgoing.java index 49b08a9e..db703464 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/Outgoing.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/Outgoing.java @@ -1,512 +1,520 @@ package com.eu.habbo.messages.outgoing; public class Outgoing { - //todo REORDER AND DOCUMENT EACH PACKET COMPOSER - Harmonic - public final static int AcceptFriendResultComposer = 896; - public final static int AccountPreferencesComposer = 513; - public final static int AccountSafetyLockStatusChangeMessageComposer = 1243; - public final static int AchievementComposer = 2107; - public final static int AchievementResolutionCompletedMessageComposer = 740; - public final static int AchievementResolutionProgressMessageComposer = 3370; - public final static int AchievementResolutionsMessageComposer = 66; - public final static int AchievementsComposer = 305; - public final static int AchievementsScoreComposer = 1968; - public final static int ActivityPointsMessageComposer = 2018; - public final static int ApproveNameMessageComposer = 1503; - public final static int AuthenticationOKMessageComposer = 2491; - public final static int AvailabilityStatusMessageComposer = 2033; - public final static int AvailabilityTimeMessageComposer = 600;//todo? - public final static int AvatarEffectActivatedMessageComposer = 1959; - public final static int AvatarEffectAddedMessageComposer = 2867; - public final static int AvatarEffectExpiredMessageComposer = 2228; - public final static int AvatarEffectMessageComposer = 1167; - public final static int AvatarEffectSelectedMessageComposer = 3473; - public final static int AvatarEffectsMessageComposer = 340; - public final static int BadgePointLimitsComposer = 2501; - public final static int BadgeReceivedComposer = 2493; - public final static int BadgesComposer = 717; - public final static int BannedUsersFromRoomComposer = 1869; - public final static int BonusRareInfoMessageComposer = 1533; - public final static int BotAddedToInventoryComposer = 1352; - public final static int BotCommandConfigurationComposer = 1618; - public final static int BotErrorComposer = 639; - public final static int BotForceOpenContextMenuComposer = 296; - public final static int BotInventoryComposer = 3086; - public final static int BotReceivedMessageComposer = 3684; //todo? - public final static int BotRemovedFromInventoryComposer = 233; - public final static int BotSkillListUpdateComposer = 69; - public final static int BuildersClubFurniCountMessageComposer = 3828; - public final static int BuildersClubSubscriptionStatusMessageComposer = 1452; - public final static int BundleDiscountRulesetMessageComposer = 2347; - public final static int CallForHelpDisabledNotifyMessageComposer = 1651; - public final static int CallForHelpPendingCallsDeletedMessageComposer = 77; - public final static int CallForHelpPendingCallsMessageComposer = 1121; - public final static int CallForHelpReplyMessageComposer = 3796; - public final static int CallForHelpResultMessageComposer = 3635; - public final static int CameraPublishStatusMessageComposer = 2057; - public final static int CameraPurchaseOKMessageComposer = 2783; - public final static int CameraSnapshotMessageComposer = 463; // todo? - public final static int CameraStorageUrlMessageComposer = 3696; - public final static int CampaignCalendarDataMessageComposer = 2531; - public final static int CampaignCalendarDoorOpenedMessageComposer = 2551; - public final static int CanCreateRoomComposer = 378; - public final static int CanCreateRoomEventComposer = 2599; - public final static int CantConnectMessageComposer = 899; - public final static int CarryObjectMessageComposer = 1474; - public final static int CatalogPageExpirationComposer = 2668;//todo? - public final static int CatalogPageMessageComposer = 804; - public final static int CatalogPagesListComposer = 1032; - public final static int CatalogPageWithEarliestExpiryMessageComposer = 2515; - public final static int CatalogPublishedMessageComposer = 1866; - public final static int CategoriesWithVisitorCountComposer = 1455; - public final static int CfhChatlogComposer = 607; - public final static int CfhSanctionMessageComposer = 2782; - public final static int CfhTopicsInitComposer = 325; - public final static int ChangeEmailResultComposer = 1815; - public final static int ChangeUserNameResultMessageEvent = 118; - public final static int ChatMessageComposer = 1446; - public final static int ChatReviewSessionDetachedMessageComposer = 30; - public final static int ChatReviewSessionOfferedToGuideMessageComposer = 735; - public final static int ChatReviewSessionResultsMessageComposer = 3276; - public final static int ChatReviewSessionStartedMessageComposer = 143; - public final static int ChatReviewSessionVotingStatusMessageComposer = 1829; - public final static int CheckUserNameResultMessageComposer = 563; - public final static int CitizenshipVipOfferPromoEnabledComposer = 2278; - public final static int CloseConnectionMessageComposer = 122; - public final static int ClubGiftInfoComposer = 619; - public final static int ClubGiftNotificationComposer = 2188; - public final static int ClubGiftSelectedComposer = 659; - public final static int CollapsedCategoriesComposer = 1543; - public final static int CommunityGoalEarnedPrizesMessageComposer = 3319;//todo? - public final static int CommunityGoalHallOfFameMessageComposer = 3005; - public final static int CommunityGoalProgressMessageComposer = 2525; - public final static int CommunityGoalVoteMessageComposer = 1435; - public final static int CompetitionEntrySubmitResultComposer = 1177; - public final static int CompetitionRoomsDataMessageComposer = 3954;//todo? - public final static int CompetitionStatusMessageComposer = 133; - public final static int CompetitionVotingInfoMessageComposer = 3506; - public final static int CompleteDiffieHandshakeComposer = 3885; - public final static int ConcurrentUsersGoalProgressMessageComposer = 2737; - public final static int ConfirmBreedingRequestComposer = 634; - public final static int ConfirmBreedingResultComposer = 1625; - public final static int ConvertedRoomIdComposer = 1331; - public final static int CraftableProductsComposer = 1000; - public final static int CraftingRecipeComposer = 2774; - public final static int CraftingRecipesAvailableComposer = 2124; - public final static int CraftingResultComposer = 618; - public final static int CreditBalanceComposer = 3475; - public final static int CurrentTimingCodeMessageComposer = 1745; - public final static int CustomUserNotificationMessageComposer = 909; - public final static int DanceMessageComposer = 2080; - public final static int DiceValueMessageComposer = 3431; - public final static int DirectSMSClubBuyAvailableMessageComposer = 195; // todo? - public final static int DisconnectReasonComposer = 4000; - public final static int DoorbellMessageComposer = 2309; - public final static int ElementPointerMessageComposer = 1787; - public final static int EmailStatusResultComposer = 612; - public final static int EpicPopupMessageComposer = 3945; - public final static int ErrorReportComposer = 1004; - public final static int ExpressionMessageComposer = 1631; - public final static int ExtendedProfileChangedMessageComposer = 876; - public final static int ExtendedProfileMessageComposer = 3898; - public final static int FaqCategoriesMessageComposer = 2756; //todo? - public final static int FaqCategoryMessageComposer = 2819; //todo? - public final static int FaqClientFaqsMessageComposer = 2492; //todo? - public final static int FaqSearchResultsMessageComposer = 1551; //todo? - public final static int FaqTextMessageComposer = 3292;//todo? - public final static int FavoriteMembershipUpdateMessageComposer = 3403; - public final static int FavouriteChangedComposer = 2524; - public final static int FavouritesComposer = 151; - public final static int FigureSetIdsComposer = 1450; - public final static int FigureUpdateComposer = 2429; - public final static int FindFriendsProcessResultComposer = 1210; - public final static int FlatAccessDeniedMessageComposer = 878; - public final static int FlatAccessibleMessageComposer = 3783; - public final static int FlatControllerAddedComposer = 2088; - public final static int FlatControllerRemovedComposer = 1327; - public final static int FlatControllersComposer = 1284; - public final static int FlatCreatedComposer = 1304; - public final static int FloodControlMessageComposer = 566; - public final static int FloorHeightMapComposer = 1301; - public final static int FollowFriendFailedComposer = 3048; - public final static int ForumDataMessageComposer = 3011; - public final static int ForumsListMessageComposer = 3001; - public final static int FriendFurniCancelLockMessageComposer = 770; - public final static int FriendFurniOtherLockConfirmedMessageComposer = 382; - public final static int FriendFurniStartConfirmationMessageComposer = 3753; - public final static int FriendListFragmentMessageComposer = 3130; - public final static int FriendListUpdateComposer = 2800; - public final static int FriendNotificationComposer = 3082; - public final static int FriendRequestsComposer = 280; - public final static int FurniListAddOrUpdateComposer = 104; - public final static int FurniListComposer = 994; - public final static int FurniListInvalidateComposer = 3151; - public final static int FurniListRemoveComposer = 159; - public final static int FurniRentOrBuyoutOfferMessageComposer = 35; - public final static int FurnitureAliasesMessageComposer = 1723; - public final static int Game2AccountGameStatusMessageComposer = 2893; - public final static int Game2GameDirectoryStatusMessageComposer = 2246; //todo? - public final static int Game2InArenaQueueMessageComposer = 872;//todo? - public final static int Game2JoiningGameFailedMessageComposer = 1730; // todo? - public final static int Game2StopCounterMessageComposer = 2233; //todo? - public final static int Game2UserLeftGameMessageComposer = 2383;//todo? - public final static int Game2WeeklyFriendsLeaderboardComposer = 2270;//todo? - public final static int Game2WeeklyLeaderboardComposer = 2196; //todo? - public final static int GameAchievementsMessageComposer = 1689;//todo? - public final static int GameInviteMessageComposer = 904; //todo? - public final static int GameListMessageComposer = 222; - public final static int GamePlayerValueMessageComposer = 2324; - public final static int GameStatusMessageComposer = 3805; - public final static int GenericErrorComposer = 1600; - public final static int GetGuestRoomResultComposer = 687; - public final static int GiftReceiverNotFoundComposer = 1517; - public final static int GiftWrappingConfigurationComposer = 2234; - public final static int GotMysteryBoxPrizeMessageComposer = 3712; - public final static int GoToBreedingNestFailureComposer = 2621; - public final static int GroupDetailsChangedMessageComposer = 1459; - public final static int GroupMembershipRequestedMessageComposer = 1180;//todo? - public final static int GuestRoomSearchResultComposer = 52; - public final static int GuideOnDutyStatusMessageComposer = 1548; - public final static int GuideReportingStatusMessageComposer = 3463; - public final static int GuideSessionAttachedMessageComposer = 1591; - public final static int GuideSessionDetachedMessageComposer = 138; - public final static int GuideSessionEndedMessageComposer = 1456; - public final static int GuideSessionErrorMessageComposer = 673; - public final static int GuideSessionInvitedToGuideRoomMessageComposer = 219; - public final static int GuideSessionMessageMessageComposer = 841; - public final static int GuideSessionPartnerIsTypingComposer = 1016; - public final static int GuideSessionRequesterRoomMessageComposer = 1847; - public final static int GuideSessionStartedComposer = 3209; - public final static int GuideTicketCreationResultMessageComposer = 3285; - public final static int GuideTicketResolutionMessageComposer = 2674; - public final static int GuildCreatedMessageComposer = 2808; - public final static int GuildCreationInfoMessageComposer = 2159; - public final static int GuildEditFailedMessageComposer = 3988; - public final static int GuildEditInfoMessageComposer = 3965; - public final static int GuildEditorDataMessageComposer = 2238; - public final static int GuildForumThreadsComposer = 1073; - public final static int GuildFurniContextMenuInfoMessageComposer = 3293; - public final static int GuildMemberFurniCountInHQMessageComposer = 1876; - public final static int GuildMemberMgmtFailedMessageComposer = 818; - public final static int GuildMembersComposer = 1200; - public final static int GuildMembershipRejectedMessageComposer = 2445; - public final static int GuildMembershipsMessageComposer = 420; - public final static int GuildMembershipUpdatedMessageComposer = 265; - public final static int HabboAchievementNotificationMessageComposer = 806; - public final static int HabboActivityPointNotificationMessageComposer = 2275; - public final static int HabboBroadcastMessageComposer = 3801; - public final static int HabboClubExtendOfferMessageComposer = 3964; - public final static int HabboClubOffersMessageComposer = 2405; - public final static int HabboGroupBadgesMessageComposer = 2402; - public final static int HabboGroupDeactivatedMessageComposer = 3129; - public final static int HabboGroupDetailsMessageComposer = 1702; - public final static int HabboGroupJoinFailedMessageComposer = 762; - public final static int HabboSearchResultComposer = 973; - public final static int HabboWayQuizComposer1 = 3379; - public final static int HandItemReceivedMessageComposer = 354; - public final static int HeightMapComposer = 2753; - public final static int HeightMapUpdateMessageComposer = 558; - public final static int HotelClosedAndOpensComposer = 3728; - public final static int HotelClosesAndWillOpenAtComposer = 2771; - public final static int HotelMergeNameChangeComposer = 1663;//todo? - public final static int HotelViewCatalogPageExpiringComposer = 690; - public final static int HotelViewCustomTimerComposer = -1; - public final static int HotelWillCloseInMinutesComposer = 1050; - public final static int IdentityAccountsComposer = 3523; - public final static int IgnoredUsersMessageComposer = 126; - public final static int IgnoreResultMessageComposer = 207; - public final static int InClientLinkMessageComposer = 2023; - public final static int InfoFeedEnableMessageComposer = 3284; - public final static int InitCameraMessageComposer = 3878; - public final static int InitDiffieHandshakeComposer = 1347; - public final static int InstantMessageErrorComposer = 3359; - public final static int InterstitialMessageComposer = 1808; - public final static int IsBadgeRequestFulfilledComposer = 2998; - public final static int IsFirstLoginOfDayComposer = 793; - public final static int IsOfferGiftableMessageComposer = 761;//todo? - public final static int IssueCloseNotificationMessageComposer = 934; - public final static int IssueDeletedMessageComposer = 3192; - public final static int IssueInfoMessageComposer = 3609; - public final static int IssuePickFailedMessageComposer = 3150; - public final static int IsUserPartOfCompetitionMessageComposer = 3841;//todo? - public final static int ItemAddMessageComposer = 2187; - public final static int ItemDataUpdateMessageComposer = 2202; - public final static int ItemRemoveMessageComposer = 3208; - public final static int ItemsComposer = 1369; - public final static int ItemUpdateMessageComposer = 2009; - public final static int JoinedQueueMessageComposer = 2260; - public final static int JoiningQueueFailedMessageComposer = 3035;//todo? - public final static int JukeBoxPlaylistFullMessageComposer = 105; - public final static int JukeboxSongDisksMessageComposer = 34; - public final static int LatencyPingResponseMessageComposer = 10; - public final static int LeftQueueMessageComposer = 1477; - public final static int LimitedEditionSoldOutComposer = 377; - public final static int LimitedOfferAppearingNextMessageComposer = 44; - public final static int LoadGameMessageComposer = 3654; - public final static int LoadGameUrlMessageComposer = 2624; - public final static int MaintenanceStatusMessageComposer = 1350; - public final static int MarketplaceBuyOfferResultComposer = 2032; - public final static int MarketplaceCancelOfferResultComposer = 3264; - public final static int MarketplaceCanMakeOfferResult = 54; - public final static int MarketplaceConfigurationComposer = 1823; - public final static int MarketplaceItemStatsComposer = 725; - public final static int MarketplaceMakeOfferResult = 1359; - public final static int MarketplaceOffersComposer = 680; - public final static int MarketPlaceOwnOffersComposer = 3884; - public final static int MessengerErrorComposer = 892; - public final static int MessengerInitComposer = 1605; - public final static int MiniMailNewMessageComposer = 1911; - public final static int MiniMailUnreadCountComposer = 2803; - public final static int ModeratorActionResultMessageComposer = 2335;//todo? - public final static int ModeratorCautionComposer = 1890; - public final static int ModeratorInitMessageComposer = 2696; - public final static int ModeratorMessageComposer = 2030; - public final static int ModeratorRoomInfoComposer = 1333; - public final static int ModeratorToolPreferencesComposer = 1576; - public final static int ModeratorUserInfoComposer = 2866; - public final static int MOTDNotificationComposer = 2035; - public final static int MuteAllInRoomComposer = 2533; - public final static int MysteryBoxClosingComposer = 596; - public final static int MysteryBoxKeysMessageComposer = 2833; - public final static int MysteryBoxStartComposer = 3201; - public final static int NavigatorLiftedRoomsComposer = 3104; - public final static int NavigatorMetaDataComposer = 3052; - public final static int NavigatorSavedSearchesComposer = 3984; - public final static int NavigatorSearchResultBlocksComposer = 2690; - public final static int NavigatorSettingsComposer = 2875; - public final static int NestBreedingSuccessComposer = 2527; - public final static int NewConsoleMessageComposer = 1587; - public final static int NewFriendRequestComposer = 2219; - public final static int NewNavigatorPreferencesComposer = 518; - public final static int NewUserExperienceGiftOfferComposer = 3575; - public final static int NewUserExperienceNotCompleteComposer = 3639; - public final static int NoobnessLevelMessageComposer = 3738; - public final static int NoOwnedRoomsAlertMessageComposer = 2064; - public final static int NoSuchFlatComposer = 84; - public final static int NotEnoughBalanceMessageComposer = 3914; - public final static int NotificationDialogMessageComposer = 1992; - public final static int NowPlayingMessageComposer = 469; - public final static int ObjectAddMessageComposer = 1534; - public final static int ObjectDataUpdateMessageComposer = 2547; - public final static int ObjectRemoveMessageComposer = 2703; - public final static int ObjectsDataUpdateMessageComposer = 1453; - public final static int ObjectsMessageComposer = 1778; - public final static int ObjectUpdateMessageComposer = 3776; - public final static int OfferRewardDeliveredMessageComposer = 2125; - public final static int OfficialRoomsComposer = 2726;//todo? - public final static int OfficialSongIdMessageComposer = 1381; - public final static int OneWayDoorStatusMessageComposer = 2376; - public final static int OpenComposer = 1830; - public final static int OpenConnectionMessageComposer = 758; - public final static int OpenPetPackageRequestedMessageComposer = 2380; - public final static int OpenPetPackageResultMessageComposer = 546; - public final static int PerkAllowancesComposer = 2586; - public final static int PetAddedToInventoryComposer = 2101; - public final static int PetBreedingComposer = 1746; - public final static int PetBreedingResultComposer = 1553; //todo? - public final static int PetExperienceComposer = 2156; - public final static int PetFigureUpdateComposer = 1924; - public final static int PetInfoMessageComposer = 2901; - public final static int PetInventoryComposer = 3522; - public final static int PetLevelNotificationComposer = 859; - public final static int PetLevelUpdateComposer = 2824; - public final static int PetPlacingErrorComposer = 2913; - public final static int PetReceivedMessageComposer = 1111; - public final static int PetRemovedFromInventoryComposer = 3253; - public final static int PetRespectFailedComposer = 1130; - public final static int PetRespectNotificationComposer = 2788; - public static final int PetStatusUpdateComposer = 1907; - public final static int PetSupplementedNotificationComposer = 3441; - public final static int PetTrainingPanelComposer = 1164; - public final static int PhoneCollectionStateMessageComposer = 2890; - public final static int PingMessageComposer = 3928; - public final static int PlayListMessageComposer = 1748; - public final static int PlayListSongAddedMessageComposer = 1140; - public final static int PollContentsComposer = 2997; - public final static int PollErrorComposer = 662; - public final static int PollOfferComposer = 3785; - public final static int PopularRoomTagsResultComposer = 2012; - public final static int PostItPlacedComposer = 1501; - public final static int PostMessageMessageComposer = 2049; - public final static int PostThreadMessageComposer = 1862; - public final static int PresentOpenedMessageComposer = 56; - public final static int ProductOfferComposer = 3388; - public final static int PromoArticlesMessageComposer = 286; - public final static int PurchaseErrorMessageComposer = 1404; - public final static int PurchaseNotAllowedMessageComposer = 3770; - public final static int PurchaseOKMessageComposer = 869; - public final static int QuestCancelledMessageComposer = 3027; - public final static int QuestCompletedMessageComposer = 949; - public final static int QuestDailyMessageComposer = 1878; //todo? - public final static int QuestionAnsweredComposer = 2589; - public final static int QuestionComposer = 2665; - public final static int QuestionFinishedComposer = 1066; - public final static int QuestionInfoComposer = -1; - public final static int QuestMessageComposer = 230; - public final static int QuestsMessageComposer = 3625; - public final static int QuizDataMessageComposer = 2927; - public final static int QuizResultsMessageComposer = 2772; - public final static int RecyclerFinishedComposer = 468; - public final static int RecyclerPrizesComposer = 3164; - public final static int RecyclerStatusComposer = 3433; - public final static int RelationshipStatusInfoComposer = 2016; - public final static int RemainingMutePeriodComposer = 826; - public final static int RentableSpaceRentFailedMessageComposer = 1868; - public final static int RentableSpaceRentOkMessageComposer = 2046; - public final static int RentableSpaceStatusMessageComposer = 3559; - public final static int RequestSpamWallPostItMessageComposer = 2366; - public final static int RestoreClientMessageComposer = 426; - public final static int RoomAdErrorComposer = 1759; - public final static int RoomAdPurchaseInfoComposer = 2468; - public final static int RoomChatlogComposer = 3434; - public final static int RoomChatSettingsMessageComposer = 1191; - public final static int RoomDimmerPresetsComposer = 2710; - public final static int RoomEntryInfoComposer = -1; - public final static int RoomEntryInfoMessageComposer = 749; - public final static int RoomEntryTileMessageComposer = 1664; - public final static int RoomEventCancelComposer = 3479; - public final static int RoomEventComposer = 1840; - public final static int RoomFilterSettingsMessageComposer = 2937; - public final static int RoomFloorThicknessUpdatedComposer = 3786; - public final static int RoomForwardMessageComposer = 160; - public final static int RoomInfoUpdatedComposer = 3297; - public final static int RoomInviteComposer = 3870; - public final static int RoomInviteErrorComposer = 462; - public final static int RoomMessageNotificationMessageComposer = 1634; - public final static int RoomOccupiedTilesMessageComposer = 3990; - public final static int RoomPropertyMessageComposer = 2454; - public final static int RoomQueueStatusMessageComposer = 2208; - public final static int RoomRatingComposer = 482; - public final static int RoomReadyMessageComposer = 2031; - public final static int RoomSettingsDataComposer = 1498; - public final static int RoomSettingsErrorComposer = 2897;//todo? - public final static int RoomSettingsSavedComposer = 948; - public final static int RoomSettingsSaveErrorComposer = 1555; - public final static int RoomThumbnailUpdateResultComposer = 1927; //todo? - public final static int RoomUserQuestionAnsweredComposer = -1; - public final static int RoomUserRespectComposer = 2815; - public final static int RoomVisitsComposer = 1752; - public final static int RoomVisualizationSettingsComposer = 3547; - public final static int SanctionStatusComposer = 2221; - public final static int ScrSendKickbackInfoMessageComposer = 3277; - public final static int ScrSendUserInfoComposer = 954; - public final static int SeasonalCalendarDailyOfferMessageComposer = 1889; - public final static int SeasonalQuestsMessageComposer = 1122; //todo? - public final static int SecondsUntilMessageComposer = 3926; - public final static int SellablePetPalettesMessageComposer = 3331; - public final static int ShoutMessageComposer = 1036; - public final static int ShowEnforceRoomCategoryDialogComposer = 3896; - public final static int SleepMessageComposer = 1797; - public final static int SlideObjectBundleMessageComposer = 3207; - public final static int _Str_16258_Composer = 1660; //todo? - public final static int _Str_16667_Composer = 3099; //todo? - public final static int _Str_17054_Composer = 416; //todo? - public final static int TalentLevelUpComposer = 638; - public final static int TalentTrackLevelMessageEvent = 1203; - public final static int TalentTrackMessageComposer = 3406; - public final static int TargetedOfferComposer = 119; - public final static int TargetedOfferNotFoundComposer = 1237; - public final static int ThreadMessagesMessageComposer = 509; - public final static int ThumbnailStatusMessageComposer = 3595; - public final static int TradeCloseWindowComposer = 1001; - public final static int TradeCompleteComposer = 2369; - public final static int TradingAcceptComposer = 2568; - public final static int TradingCloseComposer = 1373; - public final static int TradingConfirmationComposer = 2720; - public final static int TradingItemListComposer = 2024; - public final static int TradingNoSuchItemComposer = 2873;//todo? - public final static int TradingNotOpenComposer = 3128; - public final static int TradingOpenComposer = 2505; - public final static int TradingOpenFailedComposer = 217; - public final static int TradingOtherNotAllowedComposer = 1254; - public final static int TradingYouAreNotAllowedComposer = 3058; - public final static int TraxSongInfoMessageComposer = 3365; - public final static int TryPhoneNumberResultMessageComposer = 800; - public final static int TryVerificationCodeResultMessageComposer = 91; - public final static int UniqueMachineIDComposer = 1488; - public final static int UnknownComposer_1188 = 1437; //todo? - public final static int UnloadGameMessageComposer = 1715; - public final static int UnreadForumsCountMessageComposer = 2379; - public final static int UnseenItemsComposer = 2103; - public final static int UpdateMessageMessageComposer = 324; - public final static int UpdateStackHeightTileHeightComposer = 2816; - public final static int UpdateThreadMessageComposer = 2528; - public final static int UseObjectMessageComposer = 1774; //todo? - public final static int UserBadgesComposer = 1087; - public final static int UserBannedMessageComposer = 1683; - public final static int UserBCLimitsComposer = -1; - public final static int UserChangeMessageComposer = 3920; - public final static int UserChatlogComposer = 3377; - public final static int UserClassificationMessageComposer = 966; - public final static int UserEventCatsComposer = 3244; - public final static int UserFlatCatsComposer = 1562; - public final static int UserGameAchievementsMessageComposer = 2265; - public final static int UserNameChangedMessageComposer = 2182; - public final static int UserObjectComposer = 2725; - public final static int UserRemoveMessageComposer = 2661; - public final static int UserRightsMessageComposer = 411; - public final static int UsersComposer = 374; - public final static int UserSongDisksInventoryMessageComposer = 2602; - public final static int UserTagsMessageComposer = 1255; - public final static int UserTypingMessageComposer = 1717; - public final static int UserUnbannedFromRoomComposer = 3429; - public final static int UserUpdateComposer = 1640; - public final static int VoucherRedeemErrorMessageComposer = 714; - public final static int VoucherRedeemOkMessageComposer = 3336; - public final static int WardrobeMessageComposer = 3315; - public final static int WeeklyCompetitiveFriendsLeaderboardComposer = 3560;//todo? - public final static int WeeklyCompetitiveLeaderboardComposer = 3512;//todo? - public final static int WeeklyGameRewardComposer = 2641;//todo? - public final static int WeeklyGameRewardWinnersComposer = 3097;//todo? - public final static int WelcomeGiftChangeEmailResultComposer = 2293; - public final static int WelcomeGiftStatusComposer = 2707; - public final static int WhisperMessageComposer = 2704; - public final static int WiredConditionDataComposer = 1108; - public final static int WiredEffectDataComposer = 1434; - public final static int WiredRewardResultMessageComposer = 178; - public final static int WiredSavedComposer = 1155; - public final static int WiredTriggerDataComposer = 383; - public final static int WiredValidationErrorComposer = 156; - public final static int YouAreControllerMessageComposer = 780; - public final static int YouAreNotControllerMessageComposer = 2392; - public final static int YouAreOwnerMessageComposer = 339; - public final static int YouArePlayingGameMessageComposer = 448; - public final static int YouAreSpectatorMessageEvent = 1033; - public final static int YoutubeControlVideoMessageComposer = 1554; - public final static int YoutubeDisplayPlaylistsComposer = 1112; - public final static int YoutubeDisplayVideoMessageComposer = 1411; - //Snowstorm packets, these are not in PRODUCTION-201611291003-338511768 by default, but are in the OpenSource SWF. + /** + * Outgoing Emulator Packets which are currently implemented. + * Named 1:1 based on outgoing client packet names from PRODUCTION-201611291003-338511768 + * TODO: Implement the missing ones. + */ - public static final int SnowStormGameStartedComposer = 5000; - public static final int SnowStormQuePositionComposer = 5001; - public static final int SnowStormStartBlockTickerComposer = 5002; - public static final int SnowStormStartLobbyCounterComposer = 5003; - public static final int SnowStormUnusedAlertGenericComposer = 5004; - public static final int SnowStormLongDataComposer = 5005; - public static final int SnowStormGameEndedComposer = 5006; - public static final int SnowStormQuePlayerAddedComposer = 5008; - public static final int SnowStormPlayAgainComposer = 5009; - public static final int SnowStormGamesLeftComposer = 5010; - public static final int SnowStormQuePlayerRemovedComposer = 5011; - public static final int SnowStormGamesInformationComposer = 5012; - public static final int SnowStormLongData2Composer = 5013; - public static final int UNUSED_SNOWSTORM_5014 = 5014; - public static final int SnowStormGameStatusComposer = 5015; - public static final int SnowStormFullGameStatusComposer = 5016; - public static final int SnowStormOnStageStartComposer = 5017; - public static final int SnowStormIntializeGameArenaViewComposer = 5018; - public static final int SnowStormRejoinPreviousRoomComposer = 5019; - public static final int UNKNOWN_SNOWSTORM_5020 = 5020; - public static final int SnowStormLevelDataComposer = 5021; - public static final int SnowStormOnGameEndingComposer = 5022; - public static final int SnowStormUserChatMessageComposer = 5023; - public static final int SnowStormOnStageRunningComposer = 5024; - public static final int SnowStormOnStageEndingComposer = 5025; - public static final int SnowStormIntializedPlayersComposer = 5026; - public static final int SnowStormOnPlayerExitedArenaComposer = 5027; - public static final int SnowStormGenericErrorComposer = 5028; - public static final int SnowStormUserRematchedComposer = 5029; + public static final int acceptFriendResultComposer = 896; + public static final int accountPreferencesComposer = 513; + public static final int accountSafetyLockStatusChangeMessageComposer = 1243; + public static final int achievementComposer = 2107; + public static final int achievementResolutionCompletedMessageComposer = 740; + public static final int achievementResolutionProgressMessageComposer = 3370; + public static final int achievementResolutionsMessageComposer = 66; + public static final int achievementsComposer = 305; + public static final int achievementsScoreComposer = 1968; + public static final int activityPointsMessageComposer = 2018; + public static final int approveNameMessageComposer = 1503; + public static final int authenticationOKMessageComposer = 2491; + public static final int availabilityStatusMessageComposer = 2033; + public static final int availabilityTimeMessageComposer = 600;//todo? + public static final int avatarEffectActivatedMessageComposer = 1959; + public static final int avatarEffectAddedMessageComposer = 2867; + public static final int avatarEffectExpiredMessageComposer = 2228; + public static final int avatarEffectMessageComposer = 1167; + public static final int avatarEffectSelectedMessageComposer = 3473; + public static final int avatarEffectsMessageComposer = 340; + public static final int badgePointLimitsComposer = 2501; + public static final int badgeReceivedComposer = 2493; + public static final int badgesComposer = 717; + public static final int bannedUsersFromRoomComposer = 1869; + public static final int bonusRareInfoMessageComposer = 1533; + public static final int botAddedToInventoryComposer = 1352; + public static final int botCommandConfigurationComposer = 1618; + public static final int botErrorComposer = 639; + public static final int botForceOpenContextMenuComposer = 296; + public static final int botInventoryComposer = 3086; + public static final int botReceivedMessageComposer = 3684; //todo? + public static final int botRemovedFromInventoryComposer = 233; + public static final int botSkillListUpdateComposer = 69; + public static final int buildersClubFurniCountMessageComposer = 3828; + public static final int buildersClubSubscriptionStatusMessageComposer = 1452; + public static final int bundleDiscountRulesetMessageComposer = 2347; + public static final int callForHelpDisabledNotifyMessageComposer = 1651; + public static final int callForHelpPendingCallsDeletedMessageComposer = 77; + public static final int callForHelpPendingCallsMessageComposer = 1121; + public static final int callForHelpReplyMessageComposer = 3796; + public static final int callForHelpResultMessageComposer = 3635; + public static final int cameraPublishStatusMessageComposer = 2057; + public static final int cameraPurchaseOKMessageComposer = 2783; + public static final int cameraSnapshotMessageComposer = 463; // todo? + public static final int cameraStorageUrlMessageComposer = 3696; + public static final int campaignCalendarDataMessageComposer = 2531; + public static final int campaignCalendarDoorOpenedMessageComposer = 2551; + public static final int canCreateRoomComposer = 378; + public static final int canCreateRoomEventComposer = 2599; + public static final int cantConnectMessageComposer = 899; + public static final int carryObjectMessageComposer = 1474; + public static final int catalogPageExpirationComposer = 2668;//todo? + public static final int catalogPageMessageComposer = 804; + public static final int catalogPagesListComposer = 1032; + public static final int catalogPageWithEarliestExpiryMessageComposer = 2515; + public static final int catalogPublishedMessageComposer = 1866; + public static final int categoriesWithVisitorCountComposer = 1455; + public static final int cfhChatlogComposer = 607; + public static final int cfhSanctionMessageComposer = 2782; + public static final int cfhTopicsInitComposer = 325; + public static final int changeEmailResultComposer = 1815; + public static final int changeUserNameResultMessageEvent = 118; + public static final int chatMessageComposer = 1446; + public static final int chatReviewSessionDetachedMessageComposer = 30; + public static final int chatReviewSessionOfferedToGuideMessageComposer = 735; + public static final int chatReviewSessionResultsMessageComposer = 3276; + public static final int chatReviewSessionStartedMessageComposer = 143; + public static final int chatReviewSessionVotingStatusMessageComposer = 1829; + public static final int checkUserNameResultMessageComposer = 563; + public static final int citizenshipVipOfferPromoEnabledComposer = 2278; + public static final int closeConnectionMessageComposer = 122; + public static final int clubGiftInfoComposer = 619; + public static final int clubGiftNotificationComposer = 2188; + public static final int clubGiftSelectedComposer = 659; + public static final int collapsedCategoriesComposer = 1543; + public static final int communityGoalEarnedPrizesMessageComposer = 3319;//todo? + public static final int communityGoalHallOfFameMessageComposer = 3005; + public static final int communityGoalProgressMessageComposer = 2525; + public static final int communityGoalVoteMessageComposer = 1435; + public static final int competitionEntrySubmitResultComposer = 1177; + public static final int competitionRoomsDataMessageComposer = 3954;//todo? + public static final int competitionStatusMessageComposer = 133; + public static final int competitionVotingInfoMessageComposer = 3506; + public static final int completeDiffieHandshakeComposer = 3885; + public static final int concurrentUsersGoalProgressMessageComposer = 2737; + public static final int confirmBreedingRequestComposer = 634; + public static final int confirmBreedingResultComposer = 1625; + public static final int convertedRoomIdComposer = 1331; + public static final int craftableProductsComposer = 1000; + public static final int craftingRecipeComposer = 2774; + public static final int craftingRecipesAvailableComposer = 2124; + public static final int craftingResultComposer = 618; + public static final int creditBalanceComposer = 3475; + public static final int currentTimingCodeMessageComposer = 1745; + public static final int customUserNotificationMessageComposer = 909; + public static final int danceMessageComposer = 2080; + public static final int diceValueMessageComposer = 3431; + public static final int directSMSClubBuyAvailableMessageComposer = 195; // todo? + public static final int disconnectReasonComposer = 4000; + public static final int doorbellMessageComposer = 2309; + public static final int elementPointerMessageComposer = 1787; + public static final int emailStatusResultComposer = 612; + public static final int epicPopupMessageComposer = 3945; + public static final int errorReportComposer = 1004; + public static final int expressionMessageComposer = 1631; + public static final int extendedProfileChangedMessageComposer = 876; + public static final int extendedProfileMessageComposer = 3898; + public static final int faqCategoriesMessageComposer = 2756; //todo? + public static final int faqCategoryMessageComposer = 2819; //todo? + public static final int faqClientFaqsMessageComposer = 2492; //todo? + public static final int faqSearchResultsMessageComposer = 1551; //todo? + public static final int faqTextMessageComposer = 3292;//todo? + public static final int favoriteMembershipUpdateMessageComposer = 3403; + public static final int favouriteChangedComposer = 2524; + public static final int favouritesComposer = 151; + public static final int figureSetIdsComposer = 1450; + public static final int figureUpdateComposer = 2429; + public static final int findFriendsProcessResultComposer = 1210; + public static final int flatAccessDeniedMessageComposer = 878; + public static final int flatAccessibleMessageComposer = 3783; + public static final int flatControllerAddedComposer = 2088; + public static final int flatControllerRemovedComposer = 1327; + public static final int flatControllersComposer = 1284; + public static final int flatCreatedComposer = 1304; + public static final int floodControlMessageComposer = 566; + public static final int floorHeightMapComposer = 1301; + public static final int followFriendFailedComposer = 3048; + public static final int forumDataMessageComposer = 3011; + public static final int forumsListMessageComposer = 3001; + public static final int friendFurniCancelLockMessageComposer = 770; + public static final int friendFurniOtherLockConfirmedMessageComposer = 382; + public static final int friendFurniStartConfirmationMessageComposer = 3753; + public static final int friendListFragmentMessageComposer = 3130; + public static final int friendListUpdateComposer = 2800; + public static final int friendNotificationComposer = 3082; + public static final int friendRequestsComposer = 280; + public static final int furniListAddOrUpdateComposer = 104; + public static final int furniListComposer = 994; + public static final int furniListInvalidateComposer = 3151; + public static final int furniListRemoveComposer = 159; + public static final int furniRentOrBuyoutOfferMessageComposer = 35; + public static final int furnitureAliasesMessageComposer = 1723; + public static final int game2AccountGameStatusMessageComposer = 2893; + public static final int game2GameDirectoryStatusMessageComposer = 2246; //todo? + public static final int game2InArenaQueueMessageComposer = 872;//todo? + public static final int game2JoiningGameFailedMessageComposer = 1730; // todo? + public static final int game2StopCounterMessageComposer = 2233; //todo? + public static final int game2UserLeftGameMessageComposer = 2383;//todo? + public static final int game2WeeklyFriendsLeaderboardComposer = 2270;//todo? + public static final int game2WeeklyLeaderboardComposer = 2196; //todo? + public static final int gameAchievementsMessageComposer = 1689;//todo? + public static final int gameInviteMessageComposer = 904; //todo? + public static final int gameListMessageComposer = 222; + public static final int gamePlayerValueMessageComposer = 2324; + public static final int gameStatusMessageComposer = 3805; + public static final int genericErrorComposer = 1600; + public static final int getGuestRoomResultComposer = 687; + public static final int giftReceiverNotFoundComposer = 1517; + public static final int giftWrappingConfigurationComposer = 2234; + public static final int gotMysteryBoxPrizeMessageComposer = 3712; + public static final int goToBreedingNestFailureComposer = 2621; + public static final int groupDetailsChangedMessageComposer = 1459; + public static final int groupMembershipRequestedMessageComposer = 1180;//todo? + public static final int guestRoomSearchResultComposer = 52; + public static final int guideOnDutyStatusMessageComposer = 1548; + public static final int guideReportingStatusMessageComposer = 3463; + public static final int guideSessionAttachedMessageComposer = 1591; + public static final int guideSessionDetachedMessageComposer = 138; + public static final int guideSessionEndedMessageComposer = 1456; + public static final int guideSessionErrorMessageComposer = 673; + public static final int guideSessionInvitedToGuideRoomMessageComposer = 219; + public static final int guideSessionMessageMessageComposer = 841; + public static final int guideSessionPartnerIsTypingComposer = 1016; + public static final int guideSessionRequesterRoomMessageComposer = 1847; + public static final int guideSessionStartedComposer = 3209; + public static final int guideTicketCreationResultMessageComposer = 3285; + public static final int guideTicketResolutionMessageComposer = 2674; + public static final int guildCreatedMessageComposer = 2808; + public static final int guildCreationInfoMessageComposer = 2159; + public static final int guildEditFailedMessageComposer = 3988; + public static final int guildEditInfoMessageComposer = 3965; + public static final int guildEditorDataMessageComposer = 2238; + public static final int guildForumThreadsComposer = 1073; + public static final int guildFurniContextMenuInfoMessageComposer = 3293; + public static final int guildMemberFurniCountInHQMessageComposer = 1876; + public static final int guildMemberMgmtFailedMessageComposer = 818; + public static final int guildMembersComposer = 1200; + public static final int guildMembershipRejectedMessageComposer = 2445; + public static final int guildMembershipsMessageComposer = 420; + public static final int guildMembershipUpdatedMessageComposer = 265; + public static final int habboAchievementNotificationMessageComposer = 806; + public static final int habboActivityPointNotificationMessageComposer = 2275; + public static final int habboBroadcastMessageComposer = 3801; + public static final int habboClubExtendOfferMessageComposer = 3964; + public static final int habboClubOffersMessageComposer = 2405; + public static final int habboGroupBadgesMessageComposer = 2402; + public static final int habboGroupDeactivatedMessageComposer = 3129; + public static final int habboGroupDetailsMessageComposer = 1702; + public static final int habboGroupJoinFailedMessageComposer = 762; + public static final int habboSearchResultComposer = 973; + public static final int habboWayQuizComposer1 = 3379; + public static final int handItemReceivedMessageComposer = 354; + public static final int heightMapComposer = 2753; + public static final int heightMapUpdateMessageComposer = 558; + public static final int hotelClosedAndOpensComposer = 3728; + public static final int hotelClosesAndWillOpenAtComposer = 2771; + public static final int hotelMergeNameChangeComposer = 1663;//todo? + public static final int hotelViewCatalogPageExpiringComposer = 690; + public static final int hotelViewCustomTimerComposer = -1; + public static final int hotelWillCloseInMinutesComposer = 1050; + public static final int identityAccountsComposer = 3523; + public static final int ignoredUsersMessageComposer = 126; + public static final int ignoreResultMessageComposer = 207; + public static final int inClientLinkMessageComposer = 2023; + public static final int infoFeedEnableMessageComposer = 3284; + public static final int initCameraMessageComposer = 3878; + public static final int initDiffieHandshakeComposer = 1347; + public static final int instantMessageErrorComposer = 3359; + public static final int interstitialMessageComposer = 1808; + public static final int isBadgeRequestFulfilledComposer = 2998; + public static final int isFirstLoginOfDayComposer = 793; + public static final int isOfferGiftableMessageComposer = 761;//todo? + public static final int issueCloseNotificationMessageComposer = 934; + public static final int issueDeletedMessageComposer = 3192; + public static final int issueInfoMessageComposer = 3609; + public static final int issuePickFailedMessageComposer = 3150; + public static final int isUserPartOfCompetitionMessageComposer = 3841;//todo? + public static final int itemAddMessageComposer = 2187; + public static final int itemDataUpdateMessageComposer = 2202; + public static final int itemRemoveMessageComposer = 3208; + public static final int itemsComposer = 1369; + public static final int itemUpdateMessageComposer = 2009; + public static final int joinedQueueMessageComposer = 2260; + public static final int joiningQueueFailedMessageComposer = 3035;//todo? + public static final int jukeBoxPlaylistFullMessageComposer = 105; + public static final int jukeboxSongDisksMessageComposer = 34; + public static final int latencyPingResponseMessageComposer = 10; + public static final int leftQueueMessageComposer = 1477; + public static final int limitedEditionSoldOutComposer = 377; + public static final int limitedOfferAppearingNextMessageComposer = 44; + public static final int loadGameMessageComposer = 3654; + public static final int loadGameUrlMessageComposer = 2624; + public static final int maintenanceStatusMessageComposer = 1350; + public static final int marketplaceBuyOfferResultComposer = 2032; + public static final int marketplaceCancelOfferResultComposer = 3264; + public static final int marketplaceCanMakeOfferResult = 54; + public static final int marketplaceConfigurationComposer = 1823; + public static final int marketplaceItemStatsComposer = 725; + public static final int marketplaceMakeOfferResult = 1359; + public static final int marketplaceOffersComposer = 680; + public static final int marketPlaceOwnOffersComposer = 3884; + public static final int messengerErrorComposer = 892; + public static final int messengerInitComposer = 1605; + public static final int miniMailNewMessageComposer = 1911; + public static final int miniMailUnreadCountComposer = 2803; + public static final int moderatorActionResultMessageComposer = 2335;//todo? + public static final int moderatorCautionComposer = 1890; + public static final int moderatorInitMessageComposer = 2696; + public static final int moderatorMessageComposer = 2030; + public static final int moderatorRoomInfoComposer = 1333; + public static final int moderatorToolPreferencesComposer = 1576; + public static final int moderatorUserInfoComposer = 2866; + public static final int mOTDNotificationComposer = 2035; + public static final int muteAllInRoomComposer = 2533; + public static final int mysteryBoxClosingComposer = 596; + public static final int mysteryBoxKeysMessageComposer = 2833; + public static final int mysteryBoxStartComposer = 3201; + public static final int navigatorLiftedRoomsComposer = 3104; + public static final int navigatorMetaDataComposer = 3052; + public static final int navigatorSavedSearchesComposer = 3984; + public static final int navigatorSearchResultBlocksComposer = 2690; + public static final int navigatorSettingsComposer = 2875; + public static final int nestBreedingSuccessComposer = 2527; + public static final int newConsoleMessageComposer = 1587; + public static final int newFriendRequestComposer = 2219; + public static final int newNavigatorPreferencesComposer = 518; + public static final int newUserExperienceGiftOfferComposer = 3575; + public static final int newUserExperienceNotCompleteComposer = 3639; + public static final int noobnessLevelMessageComposer = 3738; + public static final int noOwnedRoomsAlertMessageComposer = 2064; + public static final int noSuchFlatComposer = 84; + public static final int notEnoughBalanceMessageComposer = 3914; + public static final int notificationDialogMessageComposer = 1992; + public static final int nowPlayingMessageComposer = 469; + public static final int objectAddMessageComposer = 1534; + public static final int objectDataUpdateMessageComposer = 2547; + public static final int objectRemoveMessageComposer = 2703; + public static final int objectsDataUpdateMessageComposer = 1453; + public static final int objectsMessageComposer = 1778; + public static final int objectUpdateMessageComposer = 3776; + public static final int offerRewardDeliveredMessageComposer = 2125; + public static final int officialRoomsComposer = 2726;//todo? + public static final int officialSongIdMessageComposer = 1381; + public static final int oneWayDoorStatusMessageComposer = 2376; + public static final int openComposer = 1830; + public static final int openConnectionMessageComposer = 758; + public static final int openPetPackageRequestedMessageComposer = 2380; + public static final int openPetPackageResultMessageComposer = 546; + public static final int perkAllowancesComposer = 2586; + public static final int petAddedToInventoryComposer = 2101; + public static final int petBreedingComposer = 1746; + public static final int petBreedingResultComposer = 1553; //todo? + public static final int petExperienceComposer = 2156; + public static final int petFigureUpdateComposer = 1924; + public static final int petInfoMessageComposer = 2901; + public static final int petInventoryComposer = 3522; + public static final int petLevelNotificationComposer = 859; + public static final int petLevelUpdateComposer = 2824; + public static final int petPlacingErrorComposer = 2913; + public static final int petReceivedMessageComposer = 1111; + public static final int petRemovedFromInventoryComposer = 3253; + public static final int petRespectFailedComposer = 1130; + public static final int petRespectNotificationComposer = 2788; + public static final int petStatusUpdateComposer = 1907; + public static final int petSupplementedNotificationComposer = 3441; + public static final int petTrainingPanelComposer = 1164; + public static final int phoneCollectionStateMessageComposer = 2890; + public static final int pingMessageComposer = 3928; + public static final int playListMessageComposer = 1748; + public static final int playListSongAddedMessageComposer = 1140; + public static final int pollContentsComposer = 2997; + public static final int pollErrorComposer = 662; + public static final int pollOfferComposer = 3785; + public static final int popularRoomTagsResultComposer = 2012; + public static final int postItPlacedComposer = 1501; + public static final int postMessageMessageComposer = 2049; + public static final int postThreadMessageComposer = 1862; + public static final int presentOpenedMessageComposer = 56; + public static final int productOfferComposer = 3388; + public static final int promoArticlesMessageComposer = 286; + public static final int purchaseErrorMessageComposer = 1404; + public static final int purchaseNotAllowedMessageComposer = 3770; + public static final int purchaseOKMessageComposer = 869; + public static final int questCancelledMessageComposer = 3027; + public static final int questCompletedMessageComposer = 949; + public static final int questDailyMessageComposer = 1878; //todo? + public static final int questionAnsweredComposer = 2589; + public static final int questionComposer = 2665; + public static final int questionFinishedComposer = 1066; + public static final int questionInfoComposer = -1; + public static final int questMessageComposer = 230; + public static final int questsMessageComposer = 3625; + public static final int quizDataMessageComposer = 2927; + public static final int quizResultsMessageComposer = 2772; + public static final int recyclerFinishedComposer = 468; + public static final int recyclerPrizesComposer = 3164; + public static final int recyclerStatusComposer = 3433; + public static final int relationshipStatusInfoComposer = 2016; + public static final int remainingMutePeriodComposer = 826; + public static final int rentableSpaceRentFailedMessageComposer = 1868; + public static final int rentableSpaceRentOkMessageComposer = 2046; + public static final int rentableSpaceStatusMessageComposer = 3559; + public static final int requestSpamWallPostItMessageComposer = 2366; + public static final int restoreClientMessageComposer = 426; + public static final int roomAdErrorComposer = 1759; + public static final int roomAdPurchaseInfoComposer = 2468; + public static final int roomChatlogComposer = 3434; + public static final int roomChatSettingsMessageComposer = 1191; + public static final int roomDimmerPresetsComposer = 2710; + public static final int roomEntryInfoComposer = -1; + public static final int roomEntryInfoMessageComposer = 749; + public static final int roomEntryTileMessageComposer = 1664; + public static final int roomEventCancelComposer = 3479; + public static final int roomEventComposer = 1840; + public static final int roomFilterSettingsMessageComposer = 2937; + public static final int roomFloorThicknessUpdatedComposer = 3786; + public static final int roomForwardMessageComposer = 160; + public static final int roomInfoUpdatedComposer = 3297; + public static final int roomInviteComposer = 3870; + public static final int roomInviteErrorComposer = 462; + public static final int roomMessageNotificationMessageComposer = 1634; + public static final int roomOccupiedTilesMessageComposer = 3990; + public static final int roomPropertyMessageComposer = 2454; + public static final int roomQueueStatusMessageComposer = 2208; + public static final int roomRatingComposer = 482; + public static final int roomReadyMessageComposer = 2031; + public static final int roomSettingsDataComposer = 1498; + public static final int roomSettingsErrorComposer = 2897;//todo? + public static final int roomSettingsSavedComposer = 948; + public static final int roomSettingsSaveErrorComposer = 1555; + public static final int roomThumbnailUpdateResultComposer = 1927; //todo? + public static final int roomUserQuestionAnsweredComposer = -1; + public static final int roomUserRespectComposer = 2815; + public static final int roomVisitsComposer = 1752; + public static final int roomVisualizationSettingsComposer = 3547; + public static final int sanctionStatusComposer = 2221; + public static final int scrSendKickbackInfoMessageComposer = 3277; + public static final int scrSendUserInfoComposer = 954; + public static final int seasonalCalendarDailyOfferMessageComposer = 1889; + public static final int seasonalQuestsMessageComposer = 1122; //todo? + public static final int secondsUntilMessageComposer = 3926; + public static final int sellablePetPalettesMessageComposer = 3331; + public static final int shoutMessageComposer = 1036; + public static final int showEnforceRoomCategoryDialogComposer = 3896; + public static final int sleepMessageComposer = 1797; + public static final int slideObjectBundleMessageComposer = 3207; + public static final int _str_16258_composer = 1660; //todo? + public static final int _str_16667_composer = 3099; //todo? + public static final int _str_17054_composer = 416; //todo? + public static final int talentLevelUpComposer = 638; + public static final int talentTrackLevelMessageEvent = 1203; + public static final int talentTrackMessageComposer = 3406; + public static final int targetedOfferComposer = 119; + public static final int targetedOfferNotFoundComposer = 1237; + public static final int threadMessagesMessageComposer = 509; + public static final int thumbnailStatusMessageComposer = 3595; + public static final int tradeCloseWindowComposer = 1001; + public static final int tradeCompleteComposer = 2369; + public static final int tradingAcceptComposer = 2568; + public static final int tradingCloseComposer = 1373; + public static final int tradingConfirmationComposer = 2720; + public static final int tradingItemListComposer = 2024; + public static final int tradingNoSuchItemComposer = 2873;//todo? + public static final int tradingNotOpenComposer = 3128; + public static final int tradingOpenComposer = 2505; + public static final int tradingOpenFailedComposer = 217; + public static final int tradingOtherNotAllowedComposer = 1254; + public static final int tradingYouAreNotAllowedComposer = 3058; + public static final int traxSongInfoMessageComposer = 3365; + public static final int tryPhoneNumberResultMessageComposer = 800; + public static final int tryVerificationCodeResultMessageComposer = 91; + public static final int uniqueMachineIDComposer = 1488; + public static final int unknowncomposer_1188 = 1437; //todo? + public static final int unloadGameMessageComposer = 1715; + public static final int unreadForumsCountMessageComposer = 2379; + public static final int unseenItemsComposer = 2103; + public static final int updateMessageMessageComposer = 324; + public static final int updateStackHeightTileHeightComposer = 2816; + public static final int updateThreadMessageComposer = 2528; + public static final int useObjectMessageComposer = 1774; //todo? + public static final int userBadgesComposer = 1087; + public static final int userBannedMessageComposer = 1683; + public static final int userBCLimitsComposer = -1; + public static final int userChangeMessageComposer = 3920; + public static final int userChatlogComposer = 3377; + public static final int userClassificationMessageComposer = 966; + public static final int userEventCatsComposer = 3244; + public static final int userFlatCatsComposer = 1562; + public static final int userGameAchievementsMessageComposer = 2265; + public static final int userNameChangedMessageComposer = 2182; + public static final int userObjectComposer = 2725; + public static final int userRemoveMessageComposer = 2661; + public static final int userRightsMessageComposer = 411; + public static final int usersComposer = 374; + public static final int userSongDisksInventoryMessageComposer = 2602; + public static final int userTagsMessageComposer = 1255; + public static final int userTypingMessageComposer = 1717; + public static final int userUnbannedFromRoomComposer = 3429; + public static final int userUpdateComposer = 1640; + public static final int voucherRedeemErrorMessageComposer = 714; + public static final int voucherRedeemOkMessageComposer = 3336; + public static final int wardrobeMessageComposer = 3315; + public static final int weeklyCompetitiveFriendsLeaderboardComposer = 3560;//todo? + public static final int weeklyCompetitiveLeaderboardComposer = 3512;//todo? + public static final int weeklyGameRewardComposer = 2641;//todo? + public static final int weeklyGameRewardWinnersComposer = 3097;//todo? + public static final int welcomeGiftChangeEmailResultComposer = 2293; + public static final int welcomeGiftStatusComposer = 2707; + public static final int whisperMessageComposer = 2704; + public static final int wiredConditionDataComposer = 1108; + public static final int wiredEffectDataComposer = 1434; + public static final int wiredRewardResultMessageComposer = 178; + public static final int wiredSavedComposer = 1155; + public static final int wiredTriggerDataComposer = 383; + public static final int wiredValidationErrorComposer = 156; + public static final int youAreControllerMessageComposer = 780; + public static final int youAreNotControllerMessageComposer = 2392; + public static final int youAreOwnerMessageComposer = 339; + public static final int youArePlayingGameMessageComposer = 448; + public static final int youAreSpectatorMessageEvent = 1033; + public static final int youtubeControlVideoMessageComposer = 1554; + public static final int youtubeDisplayPlaylistsComposer = 1112; + public static final int youtubeDisplayVideoMessageComposer = 1411; + + /** + * Snowstorm incoming packets, which are not from PRODUCTION-201611291003-338511768, but are in the OpenSource SWF. + * */ + + public static final int snowStormGameStartedComposer = 5000; + public static final int snowStormQuePositionComposer = 5001; + public static final int snowStormStartBlockTickerComposer = 5002; + public static final int snowStormStartLobbyCounterComposer = 5003; + public static final int snowStormUnusedAlertGenericComposer = 5004; + public static final int snowStormLongDataComposer = 5005; + public static final int snowStormGameEndedComposer = 5006; + public static final int snowStormQuePlayerAddedComposer = 5008; + public static final int snowStormPlayAgainComposer = 5009; + public static final int snowStormGamesLeftComposer = 5010; + public static final int snowStormQuePlayerRemovedComposer = 5011; + public static final int snowStormGamesInformationComposer = 5012; + public static final int snowStormLongData2Composer = 5013; + public static final int unused_snowstorm_5014 = 5014; + public static final int snowStormGameStatusComposer = 5015; + public static final int snowStormFullGameStatusComposer = 5016; + public static final int snowStormOnStageStartComposer = 5017; + public static final int snowStormIntializeGameArenaViewComposer = 5018; + public static final int snowStormRejoinPreviousRoomComposer = 5019; + public static final int unknown_snowstorm_5020 = 5020; + public static final int snowStormLevelDataComposer = 5021; + public static final int snowStormOnGameEndingComposer = 5022; + public static final int snowStormUserChatMessageComposer = 5023; + public static final int snowStormOnStageRunningComposer = 5024; + public static final int snowStormOnStageEndingComposer = 5025; + public static final int snowStormIntializedPlayersComposer = 5026; + public static final int snowStormOnPlayerExitedArenaComposer = 5027; + public static final int snowStormGenericErrorComposer = 5028; + public static final int snowStormUserRematchedComposer = 5029; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementComposer.java index e9da89e3..e2062bb3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementComposer.java @@ -19,7 +19,7 @@ public class AchievementComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.AchievementComposer); + this.response.init(Outgoing.achievementComposer); int achievementProgress; AchievementLevel currentLevel; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementUnlockedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementUnlockedComposer.java index 527078a0..bae76270 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementUnlockedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementUnlockedComposer.java @@ -18,7 +18,7 @@ public class AchievementUnlockedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.HabboAchievementNotificationMessageComposer); + this.response.init(Outgoing.habboAchievementNotificationMessageComposer); AchievementLevel level = this.achievement.getLevelForProgress(this.habbo.getHabboStats().getAchievementProgress(this.achievement)); this.response.appendInt(this.achievement.id); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementsComposer.java index 93b52756..36635c92 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementsComposer.java @@ -22,7 +22,7 @@ public class AchievementsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.AchievementsComposer); + this.response.init(Outgoing.achievementsComposer); try { this.response.appendInt(Emulator.getGameEnvironment().getAchievementManager().getAchievements().size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentLevelUpComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentLevelUpComposer.java index fbfcd3e2..5a966952 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentLevelUpComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentLevelUpComposer.java @@ -18,7 +18,7 @@ public class TalentLevelUpComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.TalentLevelUpComposer); + this.response.init(Outgoing.talentLevelUpComposer); this.response.appendString(this.talentTrackType.name()); this.response.appendInt(this.talentTrackLevel.level); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentTrackMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentTrackMessageComposer.java index 14fae294..7964e7d0 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentTrackMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentTrackMessageComposer.java @@ -24,7 +24,7 @@ public class TalentTrackMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.TalentTrackMessageComposer); + this.response.init(Outgoing.talentTrackMessageComposer); this.response.appendString(this.type.name().toLowerCase()); LinkedHashMap talentTrackLevels = Emulator.getGameEnvironment().getAchievementManager().getTalenTrackLevels(this.type); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPriceComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPriceComposer.java index 9b39bebb..264fc828 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPriceComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPriceComposer.java @@ -17,7 +17,7 @@ public class CameraPriceComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.InitCameraMessageComposer); + this.response.init(Outgoing.initCameraMessageComposer); this.response.appendInt(this.credits); this.response.appendInt(this.points); this.response.appendInt(this.pointsType); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPublishStatusMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPublishStatusMessageComposer.java index bc0bba0d..1f33dbcc 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPublishStatusMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPublishStatusMessageComposer.java @@ -17,7 +17,7 @@ public class CameraPublishStatusMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CameraPublishStatusMessageComposer); + this.response.init(Outgoing.cameraPublishStatusMessageComposer); this.response.appendBoolean(this.isOk); this.response.appendInt(this.cooldownSeconds); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPurchaseOKMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPurchaseOKMessageComposer.java index e07524a5..4e93b32e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPurchaseOKMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPurchaseOKMessageComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class CameraPurchaseOKMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CameraPurchaseOKMessageComposer); + this.response.init(Outgoing.cameraPurchaseOKMessageComposer); return this.response; } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraStorageUrlMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraStorageUrlMessageComposer.java index c5ebed72..270078ac 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraStorageUrlMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraStorageUrlMessageComposer.java @@ -13,7 +13,7 @@ public class CameraStorageUrlMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CameraStorageUrlMessageComposer); + this.response.init(Outgoing.cameraStorageUrlMessageComposer); this.response.appendString(this.URL); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/camera/CompetitionStatusMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/camera/CompetitionStatusMessageComposer.java index cad2b7d2..7db4c6c5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/camera/CompetitionStatusMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/camera/CompetitionStatusMessageComposer.java @@ -15,7 +15,7 @@ public class CompetitionStatusMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CompetitionStatusMessageComposer); + this.response.init(Outgoing.competitionStatusMessageComposer); this.response.appendBoolean(this.unknownBoolean); this.response.appendString(this.unknownString); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/camera/ThumbnailStatusMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/camera/ThumbnailStatusMessageComposer.java index 1c2b3bfa..ae4e0b12 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/camera/ThumbnailStatusMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/camera/ThumbnailStatusMessageComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class ThumbnailStatusMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ThumbnailStatusMessageComposer); + this.response.init(Outgoing.thumbnailStatusMessageComposer); return this.response; } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ApproveNameMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ApproveNameMessageComposer.java index 2ad21cd3..0e8f7337 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ApproveNameMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ApproveNameMessageComposer.java @@ -21,7 +21,7 @@ public class ApproveNameMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ApproveNameMessageComposer); + this.response.init(Outgoing.approveNameMessageComposer); this.response.appendInt(this.type); this.response.appendString(this.value); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/BuildersClubFurniCountMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/BuildersClubFurniCountMessageComposer.java index a3ce84d2..f4f2f9dd 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/BuildersClubFurniCountMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/BuildersClubFurniCountMessageComposer.java @@ -13,7 +13,7 @@ public class BuildersClubFurniCountMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.BuildersClubFurniCountMessageComposer); + this.response.init(Outgoing.buildersClubFurniCountMessageComposer); this.response.appendInt(this.mode); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/BundleDiscountRulesetMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/BundleDiscountRulesetMessageComposer.java index 7691ef6a..b467df1d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/BundleDiscountRulesetMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/BundleDiscountRulesetMessageComposer.java @@ -13,7 +13,7 @@ public class BundleDiscountRulesetMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.BundleDiscountRulesetMessageComposer); + this.response.init(Outgoing.bundleDiscountRulesetMessageComposer); this.response.appendInt(MAXIMUM_ALLOWED_ITEMS); this.response.appendInt(DISCOUNT_BATCH_SIZE); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPageMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPageMessageComposer.java index 7efd39af..fab21fa0 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPageMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPageMessageComposer.java @@ -32,7 +32,7 @@ public class CatalogPageMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CatalogPageMessageComposer); + this.response.init(Outgoing.catalogPageMessageComposer); this.response.appendInt(this.page.getId()); this.response.appendString(this.mode); this.page.serialize(this.response); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPagesListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPagesListComposer.java index 829c48b3..453458b2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPagesListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPagesListComposer.java @@ -30,7 +30,7 @@ public class CatalogPagesListComposer extends MessageComposer { try { List pages = Emulator.getGameEnvironment().getCatalogManager().getCatalogPages(-1, this.habbo); - this.response.init(Outgoing.CatalogPagesListComposer); + this.response.init(Outgoing.catalogPagesListComposer); this.response.appendBoolean(true); this.response.appendInt(0); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPublishedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPublishedMessageComposer.java index cbcfac3e..b4235c29 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPublishedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPublishedMessageComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class CatalogPublishedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CatalogPublishedMessageComposer); + this.response.init(Outgoing.catalogPublishedMessageComposer); this.response.appendBoolean(false); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubGiftInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubGiftInfoComposer.java index 3c606087..dddb863b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubGiftInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubGiftInfoComposer.java @@ -26,7 +26,7 @@ public class ClubGiftInfoComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ClubGiftInfoComposer); + this.response.init(Outgoing.clubGiftInfoComposer); this.response.appendInt(this.daysTillNextGift); //Days Until Next Gift this.response.appendInt(this.availableGifts); //Gift Selectable diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/GiftReceiverNotFoundComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/GiftReceiverNotFoundComposer.java index 27ee4e34..9a60e0b9 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/GiftReceiverNotFoundComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/GiftReceiverNotFoundComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class GiftReceiverNotFoundComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GiftReceiverNotFoundComposer); + this.response.init(Outgoing.giftReceiverNotFoundComposer); return this.response; } } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/GiftWrappingConfigurationComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/GiftWrappingConfigurationComposer.java index 0e619434..954d7693 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/GiftWrappingConfigurationComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/GiftWrappingConfigurationComposer.java @@ -15,7 +15,7 @@ public class GiftWrappingConfigurationComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GiftWrappingConfigurationComposer); + this.response.init(Outgoing.giftWrappingConfigurationComposer); this.response.appendBoolean(true); this.response.appendInt(Emulator.getConfig().getInt("hotel.gifts.special.price", 2)); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/HabboClubOffersMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/HabboClubOffersMessageComposer.java index 5b7b283f..2dc02cd3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/HabboClubOffersMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/HabboClubOffersMessageComposer.java @@ -20,7 +20,7 @@ public class HabboClubOffersMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.HabboClubOffersMessageComposer); + this.response.init(Outgoing.habboClubOffersMessageComposer); List offers = Emulator.getGameEnvironment().getCatalogManager().getClubOffers(); this.response.appendInt(offers.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/LimitedEditionSoldOutComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/LimitedEditionSoldOutComposer.java index f56f08ab..d95a58cc 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/LimitedEditionSoldOutComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/LimitedEditionSoldOutComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class LimitedEditionSoldOutComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.LimitedEditionSoldOutComposer); + this.response.init(Outgoing.limitedEditionSoldOutComposer); return this.response; } } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/NotEnoughBalanceMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/NotEnoughBalanceMessageComposer.java index eab155d0..505313d3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/NotEnoughBalanceMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/NotEnoughBalanceMessageComposer.java @@ -17,7 +17,7 @@ public class NotEnoughBalanceMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.NotEnoughBalanceMessageComposer); + this.response.init(Outgoing.notEnoughBalanceMessageComposer); this.response.appendBoolean(this.isCredits); this.response.appendBoolean(this.isPixels); this.response.appendInt(this.pointsType); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetReceivedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetReceivedMessageComposer.java index 48ff498b..297f8c4a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetReceivedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetReceivedMessageComposer.java @@ -16,7 +16,7 @@ public class PetReceivedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PetReceivedMessageComposer); + this.response.init(Outgoing.petReceivedMessageComposer); this.response.appendBoolean(this.gift); this.pet.serialize(this.response); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ProductOfferComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ProductOfferComposer.java index 02185d1c..1f9e5ea6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ProductOfferComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ProductOfferComposer.java @@ -14,7 +14,7 @@ public class ProductOfferComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ProductOfferComposer); + this.response.init(Outgoing.productOfferComposer); this.item.serialize(this.response); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/PurchaseErrorMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/PurchaseErrorMessageComposer.java index 9fd84661..f0d36d92 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/PurchaseErrorMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/PurchaseErrorMessageComposer.java @@ -16,7 +16,7 @@ public class PurchaseErrorMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PurchaseErrorMessageComposer); + this.response.init(Outgoing.purchaseErrorMessageComposer); this.response.appendInt(this.error); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/PurchaseNotAllowedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/PurchaseNotAllowedMessageComposer.java index 0aacfc7c..4b748398 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/PurchaseNotAllowedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/PurchaseNotAllowedMessageComposer.java @@ -16,7 +16,7 @@ public class PurchaseNotAllowedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PurchaseNotAllowedMessageComposer); + this.response.init(Outgoing.purchaseNotAllowedMessageComposer); this.response.appendInt(this.code); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/PurchaseOKMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/PurchaseOKMessageComposer.java index 7b520a05..9c6d571a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/PurchaseOKMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/PurchaseOKMessageComposer.java @@ -18,7 +18,7 @@ public class PurchaseOKMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PurchaseOKMessageComposer); + this.response.init(Outgoing.purchaseOKMessageComposer); if (this.catalogItem != null) { this.catalogItem.serialize(this.response); } else { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerFinishedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerFinishedComposer.java index 37cccf87..cfeedd79 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerFinishedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerFinishedComposer.java @@ -16,7 +16,7 @@ public class RecyclerFinishedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RecyclerFinishedComposer); + this.response.init(Outgoing.recyclerFinishedComposer); this.response.appendInt(this.code); this.response.appendInt(0); //prize ID. return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerPrizesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerPrizesComposer.java index 56b46d95..2468038d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerPrizesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerPrizesComposer.java @@ -12,7 +12,7 @@ import java.util.Map; public class RecyclerPrizesComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RecyclerPrizesComposer); + this.response.init(Outgoing.recyclerPrizesComposer); this.response.appendInt(Emulator.getGameEnvironment().getCatalogManager().prizes.size()); for (Map.Entry> map : Emulator.getGameEnvironment().getCatalogManager().prizes.entrySet()) { this.response.appendInt(map.getKey()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerStatusComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerStatusComposer.java index 6d636deb..8a09f37c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerStatusComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerStatusComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class RecyclerStatusComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RecyclerStatusComposer); + this.response.init(Outgoing.recyclerStatusComposer); this.response.appendInt(1); this.response.appendInt(0); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ScrSendKickbackInfoMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ScrSendKickbackInfoMessageComposer.java index 298f3919..1f61ae09 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ScrSendKickbackInfoMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ScrSendKickbackInfoMessageComposer.java @@ -29,7 +29,7 @@ public class ScrSendKickbackInfoMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ScrSendKickbackInfoMessageComposer); + this.response.init(Outgoing.scrSendKickbackInfoMessageComposer); this.response.appendInt(this.currentHcStreak); // currentHcStreak (days) this.response.appendString(this.firstSubDate); // firstSubscriptionDate (dd-mm-yyyy) this.response.appendDouble(this.kickbackPercentage); // kickbackPercentage (e.g. 0.1 for 10%) diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/SellablePetPalettesMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/SellablePetPalettesMessageComposer.java index c2648312..adf68e78 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/SellablePetPalettesMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/SellablePetPalettesMessageComposer.java @@ -19,7 +19,7 @@ public class SellablePetPalettesMessageComposer extends MessageComposer { protected ServerMessage composeInternal() { if (this.petRaces == null) return null; - this.response.init(Outgoing.SellablePetPalettesMessageComposer); + this.response.init(Outgoing.sellablePetPalettesMessageComposer); this.response.appendString(this.petName); this.response.appendInt(this.petRaces.size()); for (PetRace race : this.petRaces) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/TargetedOfferComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/TargetedOfferComposer.java index ee8cbb66..099501e4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/TargetedOfferComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/TargetedOfferComposer.java @@ -18,7 +18,7 @@ public class TargetedOfferComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.TargetedOfferComposer); + this.response.init(Outgoing.targetedOfferComposer); HabboOfferPurchase purchase = HabboOfferPurchase.getOrCreate(this.habbo, this.offer.getId()); this.offer.serialize(this.response, purchase); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/VoucherRedeemErrorMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/VoucherRedeemErrorMessageComposer.java index 8ad2382e..66a0ffaa 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/VoucherRedeemErrorMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/VoucherRedeemErrorMessageComposer.java @@ -16,7 +16,7 @@ public class VoucherRedeemErrorMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.VoucherRedeemErrorMessageComposer); + this.response.init(Outgoing.voucherRedeemErrorMessageComposer); this.response.appendString(this.code + ""); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/VoucherRedeemOkMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/VoucherRedeemOkMessageComposer.java index 941f2d38..78d6a415 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/VoucherRedeemOkMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/VoucherRedeemOkMessageComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class VoucherRedeemOkMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.VoucherRedeemOkMessageComposer); + this.response.init(Outgoing.voucherRedeemOkMessageComposer); this.response.appendString(""); this.response.appendString(""); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketPlaceOwnOffersComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketPlaceOwnOffersComposer.java index e6d06f76..51ed5278 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketPlaceOwnOffersComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketPlaceOwnOffersComposer.java @@ -21,7 +21,7 @@ public class MarketPlaceOwnOffersComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.MarketPlaceOwnOffersComposer); + this.response.init(Outgoing.marketPlaceOwnOffersComposer); this.response.appendInt(this.habbo.getInventory().getSoldPriceTotal()); this.response.appendInt(this.habbo.getInventory().getMarketplaceItems().size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceBuyOfferResultComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceBuyOfferResultComposer.java index ba2ac71a..a462e8f5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceBuyOfferResultComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceBuyOfferResultComposer.java @@ -24,7 +24,7 @@ public class MarketplaceBuyOfferResultComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.MarketplaceBuyOfferResultComposer); + this.response.init(Outgoing.marketplaceBuyOfferResultComposer); this.response.appendInt(this.errorCode); //result this.response.appendInt(this.unknown); //newOfferId this.response.appendInt(this.offerId); //newPrice diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCanMakeOfferResult.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCanMakeOfferResult.java index adca3123..82e71f3b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCanMakeOfferResult.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCanMakeOfferResult.java @@ -21,7 +21,7 @@ public class MarketplaceCanMakeOfferResult extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.MarketplaceCanMakeOfferResult); + this.response.init(Outgoing.marketplaceCanMakeOfferResult); this.response.appendInt(this.errorCode); this.response.appendInt(this.valueA); this.response.appendInt(this.valueB); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCancelOfferResultComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCancelOfferResultComposer.java index b1f744c3..683a22bb 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCancelOfferResultComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCancelOfferResultComposer.java @@ -16,7 +16,7 @@ public class MarketplaceCancelOfferResultComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.MarketplaceCancelOfferResultComposer); + this.response.init(Outgoing.marketplaceCancelOfferResultComposer); this.response.appendInt(this.offer.getOfferId()); this.response.appendBoolean(this.success); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceConfigurationComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceConfigurationComposer.java index f81aa0b5..53bfa375 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceConfigurationComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceConfigurationComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class MarketplaceConfigurationComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.MarketplaceConfigurationComposer); + this.response.init(Outgoing.marketplaceConfigurationComposer); this.response.appendBoolean(true); this.response.appendInt(1); //Commision Percentage. this.response.appendInt(10); //Credits diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemStatsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemStatsComposer.java index bb3a5ab5..4725986a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemStatsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemStatsComposer.java @@ -14,7 +14,7 @@ public class MarketplaceItemStatsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.MarketplaceItemStatsComposer); + this.response.init(Outgoing.marketplaceItemStatsComposer); MarketPlace.serializeItemInfo(this.itemId, this.response); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceMakeOfferResult.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceMakeOfferResult.java index 76b0e2c3..3093d647 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceMakeOfferResult.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceMakeOfferResult.java @@ -18,7 +18,7 @@ public class MarketplaceMakeOfferResult extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.MarketplaceMakeOfferResult); + this.response.init(Outgoing.marketplaceMakeOfferResult); this.response.appendInt(this.code); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOffersComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOffersComposer.java index e2e28d34..c4ed75d4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOffersComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOffersComposer.java @@ -17,7 +17,7 @@ public class MarketplaceOffersComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.MarketplaceOffersComposer); + this.response.init(Outgoing.marketplaceOffersComposer); int total = 0; this.response.appendInt(this.offers.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftableProductsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftableProductsComposer.java index 0c2254e3..d5fb8538 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftableProductsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftableProductsComposer.java @@ -20,7 +20,7 @@ public class CraftableProductsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CraftableProductsComposer); + this.response.init(Outgoing.craftableProductsComposer); this.response.appendInt(this.recipes.size()); for (CraftingRecipe recipe : this.recipes) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingRecipeComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingRecipeComposer.java index a8db6787..f3c9791e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingRecipeComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingRecipeComposer.java @@ -17,7 +17,7 @@ public class CraftingRecipeComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CraftingRecipeComposer); + this.response.init(Outgoing.craftingRecipeComposer); this.response.appendInt(this.recipe.getIngredients().size()); for (Map.Entry ingredient : this.recipe.getIngredients().entrySet()) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingRecipesAvailableComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingRecipesAvailableComposer.java index 12ab408a..b85f523e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingRecipesAvailableComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingRecipesAvailableComposer.java @@ -15,7 +15,7 @@ public class CraftingRecipesAvailableComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CraftingRecipesAvailableComposer); + this.response.init(Outgoing.craftingRecipesAvailableComposer); this.response.appendInt((this.found ? -1 : 0) + this.count); this.response.appendBoolean(this.found); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingResultComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingResultComposer.java index d7967e80..979543fa 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingResultComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingResultComposer.java @@ -21,7 +21,7 @@ public class CraftingResultComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CraftingResultComposer); + this.response.init(Outgoing.craftingResultComposer); this.response.appendBoolean(this.succes); //succes diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/CampaignCalendarDataMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/CampaignCalendarDataMessageComposer.java index 7154b4dc..71977e24 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/CampaignCalendarDataMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/CampaignCalendarDataMessageComposer.java @@ -1,6 +1,6 @@ package com.eu.habbo.messages.outgoing.events.calendar; -import com.eu.habbo.habbohotel.campaign.calendar.CalendarRewardClaimed; +import com.eu.habbo.habbohotel.campaign.CalendarRewardClaimed; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; @@ -27,7 +27,7 @@ public class CampaignCalendarDataMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CampaignCalendarDataMessageComposer); + this.response.init(Outgoing.campaignCalendarDataMessageComposer); this.response.appendString(this.eventName); this.response.appendString(this.campaignImage); this.response.appendInt(this.currentDay); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/CampaignCalendarDoorOpenedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/CampaignCalendarDoorOpenedMessageComposer.java index 8f46b07c..b7ef0ce5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/CampaignCalendarDoorOpenedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/CampaignCalendarDoorOpenedMessageComposer.java @@ -1,7 +1,7 @@ package com.eu.habbo.messages.outgoing.events.calendar; -import com.eu.habbo.habbohotel.campaign.calendar.CalendarManager; -import com.eu.habbo.habbohotel.campaign.calendar.CalendarRewardObject; +import com.eu.habbo.habbohotel.campaign.CalendarManager; +import com.eu.habbo.habbohotel.campaign.CalendarRewardObject; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; @@ -20,7 +20,7 @@ public class CampaignCalendarDoorOpenedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CampaignCalendarDoorOpenedMessageComposer); + this.response.init(Outgoing.campaignCalendarDoorOpenedMessageComposer); this.response.appendBoolean(this.visible); String className = ""; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/GotMysteryBoxPrizeMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/GotMysteryBoxPrizeMessageComposer.java index 93977abf..5924e28a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/GotMysteryBoxPrizeMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/GotMysteryBoxPrizeMessageComposer.java @@ -15,7 +15,7 @@ public class GotMysteryBoxPrizeMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GotMysteryBoxPrizeMessageComposer); + this.response.init(Outgoing.gotMysteryBoxPrizeMessageComposer); this.response.appendString(this.type); this.response.appendInt(this.itemId); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysteryBoxClosingComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysteryBoxClosingComposer.java index d89f1a4c..281fd2e8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysteryBoxClosingComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysteryBoxClosingComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class MysteryBoxClosingComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.MysteryBoxClosingComposer); + this.response.init(Outgoing.mysteryBoxClosingComposer); return this.response; } } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysteryBoxStartComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysteryBoxStartComposer.java index 218aeb5f..601529db 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysteryBoxStartComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysteryBoxStartComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class MysteryBoxStartComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.MysteryBoxStartComposer); + this.response.init(Outgoing.mysteryBoxStartComposer); return this.response; } } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/AchievementResolutionCompletedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/AchievementResolutionCompletedMessageComposer.java index 1e2b58fe..6845eb61 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/AchievementResolutionCompletedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/AchievementResolutionCompletedMessageComposer.java @@ -13,7 +13,7 @@ public class AchievementResolutionCompletedMessageComposer extends MessageCompos @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.AchievementResolutionCompletedMessageComposer); + this.response.init(Outgoing.achievementResolutionCompletedMessageComposer); this.response.appendString(this.badge); this.response.appendString(this.badge); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/AchievementResolutionProgressMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/AchievementResolutionProgressMessageComposer.java index 96bcef98..641c27b3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/AchievementResolutionProgressMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/AchievementResolutionProgressMessageComposer.java @@ -23,7 +23,7 @@ public class AchievementResolutionProgressMessageComposer extends MessageCompose @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.AchievementResolutionProgressMessageComposer); + this.response.init(Outgoing.achievementResolutionProgressMessageComposer); this.response.appendInt(this.stuffId); this.response.appendInt(this.achievementId); this.response.appendString(this.achievementName); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/AchievementResolutionsMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/AchievementResolutionsMessageComposer.java index ffa4b267..c6068f47 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/AchievementResolutionsMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/AchievementResolutionsMessageComposer.java @@ -8,7 +8,7 @@ public class AchievementResolutionsMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { //:test 817 i:230 i:1 i:1 i:1 s:NY2013RES i:3 i:0 i:60000000 - this.response.init(Outgoing.AchievementResolutionsMessageComposer); + this.response.init(Outgoing.achievementResolutionsMessageComposer); this.response.appendInt(230); //reward ID or item id? (stuffId) this.response.appendInt(2); //count diff --git a/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/RoomEntryTileMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/RoomEntryTileMessageComposer.java index a2b8a793..cac31a1a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/RoomEntryTileMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/RoomEntryTileMessageComposer.java @@ -14,7 +14,7 @@ public class RoomEntryTileMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomEntryTileMessageComposer); + this.response.init(Outgoing.roomEntryTileMessageComposer); this.response.appendInt(this.room.getLayout().getDoorX()); this.response.appendInt(this.room.getLayout().getDoorY()); this.response.appendInt(this.room.getLayout().getDoorDirection()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/RoomOccupiedTilesMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/RoomOccupiedTilesMessageComposer.java index ad280e67..d6c54eb6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/RoomOccupiedTilesMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/RoomOccupiedTilesMessageComposer.java @@ -16,7 +16,7 @@ public class RoomOccupiedTilesMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomOccupiedTilesMessageComposer); + this.response.init(Outgoing.roomOccupiedTilesMessageComposer); THashSet tileList = this.room.getLockedTiles(); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/FindFriendsProcessResultComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/FindFriendsProcessResultComposer.java index ddb764da..26f0dc70 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/FindFriendsProcessResultComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/FindFriendsProcessResultComposer.java @@ -16,7 +16,7 @@ public class FindFriendsProcessResultComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FindFriendsProcessResultComposer); + this.response.init(Outgoing.findFriendsProcessResultComposer); this.response.appendInt(this.errorCode); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/FollowFriendFailedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/FollowFriendFailedComposer.java index f97c1d3b..02dc863a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/FollowFriendFailedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/FollowFriendFailedComposer.java @@ -18,7 +18,7 @@ public class FollowFriendFailedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FollowFriendFailedComposer); + this.response.init(Outgoing.followFriendFailedComposer); this.response.appendInt(this.errorCode); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendListFragmentMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendListFragmentMessageComposer.java index 5806b110..48f1a02f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendListFragmentMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendListFragmentMessageComposer.java @@ -28,7 +28,7 @@ public class FriendListFragmentMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { try { - this.response.init(Outgoing.FriendListFragmentMessageComposer); + this.response.init(Outgoing.friendListFragmentMessageComposer); this.response.appendInt(this.totalPages); this.response.appendInt(this.pageIndex); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendNotificationComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendNotificationComposer.java index 06a57d8f..311d02cf 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendNotificationComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendNotificationComposer.java @@ -25,7 +25,7 @@ public class FriendNotificationComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FriendNotificationComposer); + this.response.init(Outgoing.friendNotificationComposer); this.response.appendString(this.userId + ""); this.response.appendInt(this.type); this.response.appendString(this.data); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestsComposer.java index 0348cb86..758a34fb 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestsComposer.java @@ -15,7 +15,7 @@ public class FriendRequestsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FriendRequestsComposer); + this.response.init(Outgoing.friendRequestsComposer); synchronized (this.habbo.getMessenger().getFriendRequests()) { this.response.appendInt(this.habbo.getMessenger().getFriendRequests().size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/HabboSearchResultComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/HabboSearchResultComposer.java index fbf67a58..2ae8c395 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/HabboSearchResultComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/HabboSearchResultComposer.java @@ -26,7 +26,7 @@ public class HabboSearchResultComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.HabboSearchResultComposer); + this.response.init(Outgoing.habboSearchResultComposer); List u = new ArrayList<>(); for (MessengerBuddy buddy : this.users) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/MessengerErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/MessengerErrorComposer.java index 1cd234b7..403bb00f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/MessengerErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/MessengerErrorComposer.java @@ -18,7 +18,7 @@ public class MessengerErrorComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.MessengerErrorComposer); + this.response.init(Outgoing.messengerErrorComposer); this.response.appendInt(0); this.response.appendInt(this.errorCode); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/MessengerInitComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/MessengerInitComposer.java index de3b9206..92a85f8f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/MessengerInitComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/MessengerInitComposer.java @@ -20,7 +20,7 @@ public class MessengerInitComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.MessengerInitComposer); + this.response.init(Outgoing.messengerInitComposer); if (this.habbo.hasPermission("acc_infinite_friends")) { this.response.appendInt(Integer.MAX_VALUE); this.response.appendInt(1337); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/NewConsoleMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/NewConsoleMessageComposer.java index 0c88b6fa..f7ea9aaa 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/NewConsoleMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/NewConsoleMessageComposer.java @@ -26,7 +26,7 @@ public class NewConsoleMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.NewConsoleMessageComposer); + this.response.init(Outgoing.newConsoleMessageComposer); this.response.appendInt(this.toId); this.response.appendString(this.message.getMessage()); this.response.appendInt(Emulator.getIntUnixTimestamp() - this.message.getTimestamp()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/NewFriendRequestComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/NewFriendRequestComposer.java index 4d21ef2d..af1857fc 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/NewFriendRequestComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/NewFriendRequestComposer.java @@ -1,24 +1,24 @@ package com.eu.habbo.messages.outgoing.friends; -import com.eu.habbo.habbohotel.users.Habbo; +import com.eu.habbo.habbohotel.users.HabboInfo; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; public class NewFriendRequestComposer extends MessageComposer { - private final Habbo habbo; + private final HabboInfo habbo; - public NewFriendRequestComposer(Habbo habbo) { + public NewFriendRequestComposer(HabboInfo habbo) { this.habbo = habbo; } @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.NewFriendRequestComposer); + this.response.init(Outgoing.newFriendRequestComposer); - this.response.appendInt(this.habbo.getHabboInfo().getId()); - this.response.appendString(this.habbo.getHabboInfo().getUsername()); - this.response.appendString(this.habbo.getHabboInfo().getLook()); + this.response.appendInt(this.habbo.getId()); + this.response.appendString(this.habbo.getUsername()); + this.response.appendString(this.habbo.getLook()); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/RemoveFriendComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/RemoveFriendComposer.java index 61a05363..43d6d5be 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/RemoveFriendComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/RemoveFriendComposer.java @@ -19,7 +19,7 @@ public class RemoveFriendComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FriendListUpdateComposer); + this.response.init(Outgoing.friendListUpdateComposer); this.response.appendInt(0); this.response.appendInt(this.unfriendIds.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/RoomInviteComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/RoomInviteComposer.java index 1b761a51..5c42c4cf 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/RoomInviteComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/RoomInviteComposer.java @@ -15,7 +15,7 @@ public class RoomInviteComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomInviteComposer); + this.response.init(Outgoing.roomInviteComposer); this.response.appendInt(this.userId); this.response.appendString(this.message); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/RoomInviteErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/RoomInviteErrorComposer.java index b2d3c54c..2567243a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/RoomInviteErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/RoomInviteErrorComposer.java @@ -18,7 +18,7 @@ public class RoomInviteErrorComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomInviteErrorComposer); + this.response.init(Outgoing.roomInviteErrorComposer); this.response.appendInt(this.errorCode); this.response.appendInt(this.buddies.size()); this.buddies.forEach(new TObjectProcedure() { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/UpdateFriendComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/UpdateFriendComposer.java index 740c929e..d739b38b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/UpdateFriendComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/UpdateFriendComposer.java @@ -33,7 +33,7 @@ public class UpdateFriendComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FriendListUpdateComposer); + this.response.init(Outgoing.friendListUpdateComposer); if (this.habbo != null && !this.habbo.getHabboInfo().getMessengerCategories().isEmpty()) { List messengerCategories = this.habbo.getHabboInfo().getMessengerCategories(); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/Game2AccountGameStatusMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/Game2AccountGameStatusMessageComposer.java index 1d6d8031..ff02140a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/Game2AccountGameStatusMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/Game2AccountGameStatusMessageComposer.java @@ -15,7 +15,7 @@ public class Game2AccountGameStatusMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.Game2AccountGameStatusMessageComposer); + this.response.init(Outgoing.game2AccountGameStatusMessageComposer); this.response.appendInt(this.gameId); this.response.appendInt(this.gamesLeft); this.response.appendInt(1); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterGameComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterGameComposer.java index fd4823d2..c31b5b31 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterGameComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterGameComposer.java @@ -18,7 +18,7 @@ public class GameCenterGameComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GameStatusMessageComposer); + this.response.init(Outgoing.gameStatusMessageComposer); this.response.appendInt(this.gameId); this.response.appendInt(this.status); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameListMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameListMessageComposer.java index aacdc2a5..11b5b242 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameListMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameListMessageComposer.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class GameListMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GameListMessageComposer); + this.response.init(Outgoing.gameListMessageComposer); this.response.appendInt(2);//Count this.response.appendInt(0); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/JoinedQueueMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/JoinedQueueMessageComposer.java index 4eb691cd..75ca70ee 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/JoinedQueueMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/JoinedQueueMessageComposer.java @@ -13,7 +13,7 @@ public class JoinedQueueMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.JoinedQueueMessageComposer); + this.response.init(Outgoing.joinedQueueMessageComposer); this.response.appendInt(this.gameId); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/LeftQueueMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/LeftQueueMessageComposer.java index ac7a9b92..66228399 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/LeftQueueMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/LeftQueueMessageComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class LeftQueueMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.LeftQueueMessageComposer); + this.response.init(Outgoing.leftQueueMessageComposer); this.response.appendInt(3); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/LoadGameMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/LoadGameMessageComposer.java index 38245dc5..7b98b99a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/LoadGameMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/LoadGameMessageComposer.java @@ -19,7 +19,7 @@ public class LoadGameMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.LoadGameMessageComposer); + this.response.init(Outgoing.loadGameMessageComposer); if (this.game == 3) { this.response.appendInt(3); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/LoadGameUrlMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/LoadGameUrlMessageComposer.java index 6f9cd00c..93a32ac0 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/LoadGameUrlMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/LoadGameUrlMessageComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class LoadGameUrlMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.LoadGameUrlMessageComposer); + this.response.init(Outgoing.loadGameUrlMessageComposer); this.response.appendInt(4); this.response.appendString("1351418858673"); this.response.appendString("http://images.habbo.com/speedway/200912/index.html?accessToken=ff5d09d1-ef22-4ee5-8b1b-8260d13d0d6f&gameServerHost=localhost&gameServerPort=30000&socketPolicyPort=30000"); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/UnloadGameMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/UnloadGameMessageComposer.java index 8edd62d9..e5df3b93 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/UnloadGameMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/UnloadGameMessageComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class UnloadGameMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UnloadGameMessageComposer); + this.response.init(Outgoing.unloadGameMessageComposer); this.response.appendInt(3); this.response.appendString("basejump"); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/ClubGiftNotificationComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/ClubGiftNotificationComposer.java index fdf792a2..32ddf924 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/ClubGiftNotificationComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/ClubGiftNotificationComposer.java @@ -13,7 +13,7 @@ public class ClubGiftNotificationComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ClubGiftNotificationComposer); + this.response.init(Outgoing.clubGiftNotificationComposer); this.response.appendInt(this.count); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/MiniMailUnreadCountComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/MiniMailUnreadCountComposer.java index 1ad7a494..b0328e55 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/MiniMailUnreadCountComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/MiniMailUnreadCountComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class MiniMailUnreadCountComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.MiniMailUnreadCountComposer); + this.response.init(Outgoing.miniMailUnreadCountComposer); this.response.appendInt(0); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/BotErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/BotErrorComposer.java index 8773d9c8..9e442044 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/BotErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/BotErrorComposer.java @@ -19,7 +19,7 @@ public class BotErrorComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.BotErrorComposer); + this.response.init(Outgoing.botErrorComposer); this.response.appendInt(this.errorCode); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/CustomUserNotificationMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/CustomUserNotificationMessageComposer.java index 11c9c8cd..ee52885e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/CustomUserNotificationMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/CustomUserNotificationMessageComposer.java @@ -19,7 +19,7 @@ public class CustomUserNotificationMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CustomUserNotificationMessageComposer); + this.response.init(Outgoing.customUserNotificationMessageComposer); this.response.appendInt(this.type); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericErrorComposer.java index 608f3643..bada8f68 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericErrorComposer.java @@ -21,7 +21,7 @@ public class GenericErrorComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GenericErrorComposer); + this.response.init(Outgoing.genericErrorComposer); this.response.appendInt(this.errorCode); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HabboBroadcastMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HabboBroadcastMessageComposer.java index 79d9e741..65ace982 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HabboBroadcastMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HabboBroadcastMessageComposer.java @@ -18,7 +18,7 @@ public class HabboBroadcastMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.HabboBroadcastMessageComposer); + this.response.init(Outgoing.habboBroadcastMessageComposer); this.response.appendString(this.message); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelClosedAndOpensComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelClosedAndOpensComposer.java index fc7cc923..b30f7f48 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelClosedAndOpensComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelClosedAndOpensComposer.java @@ -15,7 +15,7 @@ public class HotelClosedAndOpensComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.HotelClosedAndOpensComposer); + this.response.init(Outgoing.hotelClosedAndOpensComposer); this.response.appendInt(this.hour); this.response.appendInt(this.minute); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelClosesAndWillOpenAtComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelClosesAndWillOpenAtComposer.java index d92497f6..8e316823 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelClosesAndWillOpenAtComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelClosesAndWillOpenAtComposer.java @@ -17,7 +17,7 @@ public class HotelClosesAndWillOpenAtComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.HotelClosesAndWillOpenAtComposer); + this.response.init(Outgoing.hotelClosesAndWillOpenAtComposer); this.response.appendInt(this.hour); this.response.appendInt(this.minute); this.response.appendBoolean(this.disconnected); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelWillCloseInMinutesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelWillCloseInMinutesComposer.java index 0a4f1a94..c5e2d655 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelWillCloseInMinutesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelWillCloseInMinutesComposer.java @@ -13,7 +13,7 @@ public class HotelWillCloseInMinutesComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.HotelWillCloseInMinutesComposer); + this.response.init(Outgoing.hotelWillCloseInMinutesComposer); this.response.appendInt(this.minutes); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/MOTDNotificationComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/MOTDNotificationComposer.java index beea5729..b028bb1b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/MOTDNotificationComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/MOTDNotificationComposer.java @@ -23,7 +23,7 @@ public class MOTDNotificationComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.MOTDNotificationComposer); + this.response.init(Outgoing.mOTDNotificationComposer); this.response.appendInt(this.messages.length + this.newMessages.size()); for (String s : this.messages) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/MaintenanceStatusMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/MaintenanceStatusMessageComposer.java index 471afea2..d5ca8844 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/MaintenanceStatusMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/MaintenanceStatusMessageComposer.java @@ -15,7 +15,7 @@ public class MaintenanceStatusMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.MaintenanceStatusMessageComposer); + this.response.init(Outgoing.maintenanceStatusMessageComposer); this.response.appendBoolean(true); this.response.appendInt(this.closeInMinutes); this.response.appendInt(this.reopenInMinutes); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/ModeratorCautionComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/ModeratorCautionComposer.java index 385b29a9..f065655b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/ModeratorCautionComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/ModeratorCautionComposer.java @@ -15,7 +15,7 @@ public class ModeratorCautionComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ModeratorCautionComposer); + this.response.init(Outgoing.moderatorCautionComposer); this.response.appendString(this.message); this.response.appendString(this.link); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/ModeratorMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/ModeratorMessageComposer.java index 4da87a39..fa74b62c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/ModeratorMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/ModeratorMessageComposer.java @@ -15,7 +15,7 @@ public class ModeratorMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ModeratorMessageComposer); + this.response.init(Outgoing.moderatorMessageComposer); this.response.appendString(this.message); this.response.appendString(this.link); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/NotificationDialogMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/NotificationDialogMessageComposer.java index 6d9d73f6..898fd42e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/NotificationDialogMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/NotificationDialogMessageComposer.java @@ -29,7 +29,7 @@ public class NotificationDialogMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.NotificationDialogMessageComposer); + this.response.init(Outgoing.notificationDialogMessageComposer); this.response.appendString(this.errorKey); this.response.appendInt(this.keys.size()); for (Map.Entry set : this.keys.entrySet()) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/PetPlacingErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/PetPlacingErrorComposer.java index 34017d00..0548bf90 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/PetPlacingErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/PetPlacingErrorComposer.java @@ -20,7 +20,7 @@ public class PetPlacingErrorComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PetPlacingErrorComposer); + this.response.init(Outgoing.petPlacingErrorComposer); this.response.appendInt(this.errorCode); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/UserBannedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/UserBannedMessageComposer.java index a30ddebc..8bee31e8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/UserBannedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/UserBannedMessageComposer.java @@ -13,7 +13,7 @@ public class UserBannedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UserBannedMessageComposer); + this.response.init(Outgoing.userBannedMessageComposer); this.response.appendString(this.message); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/WiredValidationErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/WiredValidationErrorComposer.java index 6bbbabd1..b352581b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/WiredValidationErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/WiredValidationErrorComposer.java @@ -13,7 +13,7 @@ public class WiredValidationErrorComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.WiredValidationErrorComposer); + this.response.init(Outgoing.wiredValidationErrorComposer); this.response.appendString(this.message); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionDetachedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionDetachedMessageComposer.java index 934c7c60..db665617 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionDetachedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionDetachedMessageComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class ChatReviewSessionDetachedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ChatReviewSessionDetachedMessageComposer); + this.response.init(Outgoing.chatReviewSessionDetachedMessageComposer); return this.response; } } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionOfferedToGuideMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionOfferedToGuideMessageComposer.java index b175aba7..c874c994 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionOfferedToGuideMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionOfferedToGuideMessageComposer.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class ChatReviewSessionOfferedToGuideMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ChatReviewSessionOfferedToGuideMessageComposer); + this.response.init(Outgoing.chatReviewSessionOfferedToGuideMessageComposer); this.response.appendInt(Emulator.getConfig().getInt("guardians.accept.timer")); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionResultsMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionResultsMessageComposer.java index 64c96936..988f9b05 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionResultsMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionResultsMessageComposer.java @@ -20,7 +20,7 @@ public class ChatReviewSessionResultsMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ChatReviewSessionResultsMessageComposer); + this.response.init(Outgoing.chatReviewSessionResultsMessageComposer); this.response.appendInt(this.ticket.getVerdict().getType()); //Final Verdict this.response.appendInt(this.vote.type.getType()); //Your vote diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionStartedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionStartedMessageComposer.java index 9c121abe..0816f2e4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionStartedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionStartedMessageComposer.java @@ -40,7 +40,7 @@ public class ChatReviewSessionStartedMessageComposer extends MessageComposer { fullMessage.append("unused;").append(mappedUsers.get(chatLog.habboId)).append(";").append(chatLog.message).append("\r"); } - this.response.init(Outgoing.ChatReviewSessionStartedMessageComposer); + this.response.init(Outgoing.chatReviewSessionStartedMessageComposer); this.response.appendInt(this.ticket.getTimeLeft()); this.response.appendString(fullMessage.toString()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionVotingStatusMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionVotingStatusMessageComposer.java index fdea6627..8dcba487 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionVotingStatusMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guardians/ChatReviewSessionVotingStatusMessageComposer.java @@ -20,7 +20,7 @@ public class ChatReviewSessionVotingStatusMessageComposer extends MessageCompose @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ChatReviewSessionVotingStatusMessageComposer); + this.response.init(Outgoing.chatReviewSessionVotingStatusMessageComposer); ArrayList votes = this.ticket.getSortedVotes(this.guardian); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideOnDutyStatusMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideOnDutyStatusMessageComposer.java index 4e0c4b7d..fbf844e9 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideOnDutyStatusMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideOnDutyStatusMessageComposer.java @@ -14,7 +14,7 @@ public class GuideOnDutyStatusMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuideOnDutyStatusMessageComposer); + this.response.init(Outgoing.guideOnDutyStatusMessageComposer); this.response.appendBoolean(this.onDuty); //OnDuty this.response.appendInt(0); //Guides On Duty this.response.appendInt(Emulator.getGameEnvironment().getGuideManager().getGuidesCount()); //Helpers On Duty diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionAttachedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionAttachedMessageComposer.java index e7b620d7..79fc88a2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionAttachedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionAttachedMessageComposer.java @@ -18,7 +18,7 @@ public class GuideSessionAttachedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { //:test 3549 b:1 i:1 s:abcd i:100 - this.response.init(Outgoing.GuideSessionAttachedMessageComposer); + this.response.init(Outgoing.guideSessionAttachedMessageComposer); this.response.appendBoolean(this.isHelper); //? //isHelper this.response.appendInt(1); //? Tour type this.response.appendString(this.tour.getHelpRequest()); //? Instruction (Help message) diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionDetachedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionDetachedMessageComposer.java index 9c5ad5e4..1bfbe5e6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionDetachedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionDetachedMessageComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class GuideSessionDetachedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuideSessionDetachedMessageComposer); + this.response.init(Outgoing.guideSessionDetachedMessageComposer); return this.response; } } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionEndedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionEndedMessageComposer.java index f75d2433..65c948c0 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionEndedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionEndedMessageComposer.java @@ -16,7 +16,7 @@ public class GuideSessionEndedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuideSessionEndedMessageComposer); + this.response.init(Outgoing.guideSessionEndedMessageComposer); this.response.appendInt(this.errorCode); //? return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionErrorMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionErrorMessageComposer.java index 03788c33..ae59e8fd 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionErrorMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionErrorMessageComposer.java @@ -17,7 +17,7 @@ public class GuideSessionErrorMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuideSessionErrorMessageComposer); + this.response.init(Outgoing.guideSessionErrorMessageComposer); this.response.appendInt(this.errorCode); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionInvitedToGuideRoomMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionInvitedToGuideRoomMessageComposer.java index a21a84de..fcb83565 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionInvitedToGuideRoomMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionInvitedToGuideRoomMessageComposer.java @@ -15,7 +15,7 @@ public class GuideSessionInvitedToGuideRoomMessageComposer extends MessageCompos //Helper invites noob @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuideSessionInvitedToGuideRoomMessageComposer); + this.response.init(Outgoing.guideSessionInvitedToGuideRoomMessageComposer); this.response.appendInt(this.room != null ? this.room.getId() : 0); this.response.appendString(this.room != null ? this.room.getName() : ""); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionMessageMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionMessageMessageComposer.java index 542888f1..aa9c40f7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionMessageMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionMessageMessageComposer.java @@ -14,7 +14,7 @@ public class GuideSessionMessageMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuideSessionMessageMessageComposer); + this.response.init(Outgoing.guideSessionMessageMessageComposer); this.response.appendString(this.message.message); //Message this.response.appendInt(this.message.userId); //Sender ID return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionPartnerIsTypingComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionPartnerIsTypingComposer.java index 3781c455..46cc53bf 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionPartnerIsTypingComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionPartnerIsTypingComposer.java @@ -13,7 +13,7 @@ public class GuideSessionPartnerIsTypingComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuideSessionPartnerIsTypingComposer); + this.response.init(Outgoing.guideSessionPartnerIsTypingComposer); this.response.appendBoolean(this.typing); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionRequesterRoomMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionRequesterRoomMessageComposer.java index b7489cdc..e80fdd9c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionRequesterRoomMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionRequesterRoomMessageComposer.java @@ -14,7 +14,7 @@ public class GuideSessionRequesterRoomMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuideSessionRequesterRoomMessageComposer); + this.response.init(Outgoing.guideSessionRequesterRoomMessageComposer); this.response.appendInt(this.room != null ? this.room.getId() : 0); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionStartedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionStartedComposer.java index dd1ce315..6fefed90 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionStartedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionStartedComposer.java @@ -14,7 +14,7 @@ public class GuideSessionStartedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuideSessionStartedComposer); + this.response.init(Outgoing.guideSessionStartedComposer); this.response.appendInt(this.tour.getNoob().getHabboInfo().getId()); this.response.appendString(this.tour.getNoob().getHabboInfo().getUsername()); this.response.appendString(this.tour.getNoob().getHabboInfo().getLook()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideTicketResolutionMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideTicketResolutionMessageComposer.java index 2ee20eeb..71f1d0a8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideTicketResolutionMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideTicketResolutionMessageComposer.java @@ -16,7 +16,7 @@ public class GuideTicketResolutionMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuideTicketResolutionMessageComposer); + this.response.init(Outgoing.guideTicketResolutionMessageComposer); this.response.appendInt(this.code); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/YouArePlayingGameMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/YouArePlayingGameMessageComposer.java index 92bcfb0c..7635197e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/YouArePlayingGameMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/YouArePlayingGameMessageComposer.java @@ -13,7 +13,7 @@ public class YouArePlayingGameMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.YouArePlayingGameMessageComposer); + this.response.init(Outgoing.youArePlayingGameMessageComposer); this.response.appendBoolean(this.isPlaying); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/FavoriteMembershipUpdateMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/FavoriteMembershipUpdateMessageComposer.java index 3aaab980..b12f125b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/FavoriteMembershipUpdateMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/FavoriteMembershipUpdateMessageComposer.java @@ -17,7 +17,7 @@ public class FavoriteMembershipUpdateMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FavoriteMembershipUpdateMessageComposer); + this.response.init(Outgoing.favoriteMembershipUpdateMessageComposer); this.response.appendInt(this.roomUnit.getId()); this.response.appendInt(this.guild != null ? this.guild.getId() : 0); this.response.appendInt(this.guild != null ? this.guild.getState().state : 3); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildCreatedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildCreatedMessageComposer.java index 9671b49a..2bbfd7de 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildCreatedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildCreatedMessageComposer.java @@ -14,7 +14,7 @@ public class GuildCreatedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuildCreatedMessageComposer); + this.response.init(Outgoing.guildCreatedMessageComposer); this.response.appendInt(this.guild.getRoomId()); this.response.appendInt(this.guild.getId()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildCreationInfoMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildCreationInfoMessageComposer.java index 67d105d4..bae6c227 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildCreationInfoMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildCreationInfoMessageComposer.java @@ -16,7 +16,7 @@ public class GuildCreationInfoMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuildCreationInfoMessageComposer); + this.response.init(Outgoing.guildCreationInfoMessageComposer); this.response.appendInt(Emulator.getConfig().getInt("catalog.guild.price")); this.response.appendInt(this.rooms.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditFailedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditFailedMessageComposer.java index f2dfb5cc..67822552 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditFailedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditFailedMessageComposer.java @@ -18,7 +18,7 @@ public class GuildEditFailedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuildEditFailedMessageComposer); + this.response.init(Outgoing.guildEditFailedMessageComposer); this.response.appendInt(this.errorCode); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditInfoMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditInfoMessageComposer.java index d48d538d..137669bf 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditInfoMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditInfoMessageComposer.java @@ -14,7 +14,7 @@ public class GuildEditInfoMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuildEditInfoMessageComposer); + this.response.init(Outgoing.guildEditInfoMessageComposer); this.response.appendInt(1); this.response.appendInt(guild.getRoomId()); this.response.appendString(guild.getRoomName()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditorDataMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditorDataMessageComposer.java index 9e310c4e..acf86d00 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditorDataMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditorDataMessageComposer.java @@ -9,7 +9,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class GuildEditorDataMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuildEditorDataMessageComposer); + this.response.init(Outgoing.guildEditorDataMessageComposer); this.response.appendInt(Emulator.getGameEnvironment().getGuildManager().getBases().size()); for (GuildPart part : Emulator.getGameEnvironment().getGuildManager().getBases()) { this.response.appendInt(part.id); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFurniContextMenuInfoMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFurniContextMenuInfoMessageComposer.java index c042f6c2..a9a3fb93 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFurniContextMenuInfoMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFurniContextMenuInfoMessageComposer.java @@ -21,7 +21,7 @@ public class GuildFurniContextMenuInfoMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuildFurniContextMenuInfoMessageComposer); + this.response.init(Outgoing.guildFurniContextMenuInfoMessageComposer); this.response.appendInt(item.getId()); this.response.appendInt(this.guild.getId()); this.response.appendString(this.guild.getName()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMemberFurniCountInHQMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMemberFurniCountInHQMessageComposer.java index 181c397f..4cfa64cc 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMemberFurniCountInHQMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMemberFurniCountInHQMessageComposer.java @@ -15,7 +15,7 @@ public class GuildMemberFurniCountInHQMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuildMemberFurniCountInHQMessageComposer); + this.response.init(Outgoing.guildMemberFurniCountInHQMessageComposer); this.response.appendInt(this.userId); this.response.appendInt(this.furniCount); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMemberMgmtFailedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMemberMgmtFailedMessageComposer.java index 76d0914a..988cf2b5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMemberMgmtFailedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMemberMgmtFailedMessageComposer.java @@ -19,7 +19,7 @@ public class GuildMemberMgmtFailedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuildMemberMgmtFailedMessageComposer); + this.response.init(Outgoing.guildMemberMgmtFailedMessageComposer); this.response.appendInt(this.guildId); this.response.appendInt(this.errorCode); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembersComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembersComposer.java index 8bacc764..99b1bf5c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembersComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembersComposer.java @@ -34,7 +34,7 @@ public class GuildMembersComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuildMembersComposer); + this.response.init(Outgoing.guildMembersComposer); this.response.appendInt(this.guild.getId()); this.response.appendString(this.guild.getName()); this.response.appendInt(this.guild.getRoomId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembershipRejectedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembershipRejectedMessageComposer.java index 2e3c6867..3f57559a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembershipRejectedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembershipRejectedMessageComposer.java @@ -7,16 +7,18 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class GuildMembershipRejectedMessageComposer extends MessageComposer { private final Guild guild; + private final Integer userId; - public GuildMembershipRejectedMessageComposer(Guild guild) { + public GuildMembershipRejectedMessageComposer(Guild guild, int userId) { this.guild = guild; + this.userId = userId; } @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuildMembershipRejectedMessageComposer); + this.response.init(Outgoing.guildMembershipRejectedMessageComposer); this.response.appendInt(this.guild.getId()); - this.response.appendInt(0); + this.response.appendInt(this.userId); return this.response; } } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembershipUpdatedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembershipUpdatedMessageComposer.java index 21f9d141..513e5fa6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembershipUpdatedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembershipUpdatedMessageComposer.java @@ -17,7 +17,7 @@ public class GuildMembershipUpdatedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuildMembershipUpdatedMessageComposer); + this.response.init(Outgoing.guildMembershipUpdatedMessageComposer); this.response.appendInt(this.guild.getId()); this.response.appendInt(this.guildMember.getRank().type); this.response.appendInt(this.guildMember.getUserId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembershipsMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembershipsMessageComposer.java index 48c2eaa5..4ce44347 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembershipsMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembershipsMessageComposer.java @@ -19,7 +19,7 @@ public class GuildMembershipsMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuildMembershipsMessageComposer); + this.response.init(Outgoing.guildMembershipsMessageComposer); this.response.appendInt(this.guilds.size()); for (Guild guild : this.guilds) { this.response.appendInt(guild.getId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/HabboGroupDeactivatedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/HabboGroupDeactivatedMessageComposer.java index f4e20f9a..b33ccaa3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/HabboGroupDeactivatedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/HabboGroupDeactivatedMessageComposer.java @@ -13,7 +13,7 @@ public class HabboGroupDeactivatedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.HabboGroupDeactivatedMessageComposer); + this.response.init(Outgoing.habboGroupDeactivatedMessageComposer); this.response.appendInt(this.guildId); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/HabboGroupDetailsMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/HabboGroupDetailsMessageComposer.java index 45cf9cb4..3e0d1714 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/HabboGroupDetailsMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/HabboGroupDetailsMessageComposer.java @@ -30,7 +30,7 @@ public class HabboGroupDetailsMessageComposer 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.HabboGroupDetailsMessageComposer); + this.response.init(Outgoing.habboGroupDetailsMessageComposer); this.response.appendInt(this.guild.getId()); this.response.appendBoolean(true); this.response.appendInt(this.guild.getState().state); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/HabboGroupJoinFailedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/HabboGroupJoinFailedMessageComposer.java index e0e101cb..e7d4f4b4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/HabboGroupJoinFailedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/HabboGroupJoinFailedMessageComposer.java @@ -21,7 +21,7 @@ public class HabboGroupJoinFailedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.HabboGroupJoinFailedMessageComposer); + this.response.init(Outgoing.habboGroupJoinFailedMessageComposer); this.response.appendInt(this.code); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/ForumDataMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/ForumDataMessageComposer.java index 51413c28..bc714cac 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/ForumDataMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/ForumDataMessageComposer.java @@ -103,7 +103,7 @@ public class ForumDataMessageComposer extends MessageComposer { protected ServerMessage composeInternal() { try { - this.response.init(Outgoing.ForumDataMessageComposer); + this.response.init(Outgoing.forumDataMessageComposer); serializeForumData(this.response, guild, habbo); GuildMember member = Emulator.getGameEnvironment().getGuildManager().getGuildMember(guild, habbo); @@ -160,7 +160,7 @@ public class ForumDataMessageComposer extends MessageComposer { this.response.appendBoolean(guild.getOwnerId() == this.habbo.getHabboInfo().getId() || isStaff || isAdmin); //Can Mod (staff) } } catch (Exception e) { - e.printStackTrace(); + LOGGER.error("Caught SQL exception", e); return new ErrorReportComposer(500).compose(); } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/ForumsListMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/ForumsListMessageComposer.java index e76b17cf..b6203ced 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/ForumsListMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/ForumsListMessageComposer.java @@ -24,7 +24,7 @@ public class ForumsListMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ForumsListMessageComposer); + this.response.init(Outgoing.forumsListMessageComposer); this.response.appendInt(this.mode); this.response.appendInt(this.guilds.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumThreadsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumThreadsComposer.java index 49612ca1..d2fe3bba 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumThreadsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumThreadsComposer.java @@ -37,7 +37,7 @@ public class GuildForumThreadsComposer extends MessageComposer { Iterator it = threads.iterator(); int count = threads.size() > 20 ? 20 : threads.size(); - this.response.init(Outgoing.GuildForumThreadsComposer); + this.response.init(Outgoing.guildForumThreadsComposer); this.response.appendInt(this.guild.getId()); this.response.appendInt(this.index); this.response.appendInt(count); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/PostMessageMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/PostMessageMessageComposer.java index 5c053d1e..5dd6003e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/PostMessageMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/PostMessageMessageComposer.java @@ -14,7 +14,7 @@ public class PostMessageMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PostMessageMessageComposer); + this.response.init(Outgoing.postMessageMessageComposer); this.response.appendInt(this.comment.getThread().getGuildId()); //guild_id this.response.appendInt(this.comment.getThreadId()); //thread_id this.comment.serialize(this.response); //Comment diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/PostThreadMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/PostThreadMessageComposer.java index 389efc05..374b7345 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/PostThreadMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/PostThreadMessageComposer.java @@ -14,7 +14,7 @@ public class PostThreadMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PostThreadMessageComposer); + this.response.init(Outgoing.postThreadMessageComposer); this.response.appendInt(this.thread.getGuildId()); this.thread.serialize(this.response); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/ThreadMessagesMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/ThreadMessagesMessageComposer.java index 3bc9358e..ef062643 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/ThreadMessagesMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/ThreadMessagesMessageComposer.java @@ -22,7 +22,7 @@ public class ThreadMessagesMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ThreadMessagesMessageComposer); + this.response.init(Outgoing.threadMessagesMessageComposer); this.response.appendInt(this.guildId); //guild_id this.response.appendInt(this.threadId); //thread_id diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/UnreadForumsCountMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/UnreadForumsCountMessageComposer.java index 1a585bd3..8aa765f3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/UnreadForumsCountMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/UnreadForumsCountMessageComposer.java @@ -13,7 +13,7 @@ public class UnreadForumsCountMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UnreadForumsCountMessageComposer); + this.response.init(Outgoing.unreadForumsCountMessageComposer); this.response.appendInt(this.count); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/UpdateMessageMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/UpdateMessageMessageComposer.java index 77e03c23..5266b208 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/UpdateMessageMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/UpdateMessageMessageComposer.java @@ -18,7 +18,7 @@ public class UpdateMessageMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UpdateMessageMessageComposer); + this.response.init(Outgoing.updateMessageMessageComposer); this.response.appendInt(this.guildId); //guild_id this.response.appendInt(this.threadId); //thread_id diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/UpdateThreadMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/UpdateThreadMessageComposer.java index 9c2688e4..14a5648b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/UpdateThreadMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/UpdateThreadMessageComposer.java @@ -29,7 +29,7 @@ public class UpdateThreadMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UpdateThreadMessageComposer); + this.response.init(Outgoing.updateThreadMessageComposer); this.response.appendInt(this.thread.getGuildId()); this.thread.serialize(this.response); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/habboway/HabboWayQuizComposer1.java b/src/main/java/com/eu/habbo/messages/outgoing/habboway/HabboWayQuizComposer1.java index d2f73e4d..3d69e9c7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/habboway/HabboWayQuizComposer1.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/habboway/HabboWayQuizComposer1.java @@ -15,7 +15,7 @@ public class HabboWayQuizComposer1 extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.HabboWayQuizComposer1); + this.response.init(Outgoing.habboWayQuizComposer1); this.response.appendString(this.name); this.response.appendInt(this.items.length); for (int item : this.items) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/habboway/QuizDataMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/habboway/QuizDataMessageComposer.java index 872af81c..5bda0d99 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/habboway/QuizDataMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/habboway/QuizDataMessageComposer.java @@ -15,7 +15,7 @@ public class QuizDataMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.QuizDataMessageComposer); + this.response.init(Outgoing.quizDataMessageComposer); this.response.appendString(this.name); this.response.appendInt(this.items.length); for (int item : this.items) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/InClientLinkMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/InClientLinkMessageComposer.java index 129b7995..41b6ca51 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/InClientLinkMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/InClientLinkMessageComposer.java @@ -13,7 +13,7 @@ public class InClientLinkMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.InClientLinkMessageComposer); + this.response.init(Outgoing.inClientLinkMessageComposer); this.response.appendString(this.link); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserExperienceGiftOfferComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserExperienceGiftOfferComposer.java index 8fddbff8..5aeb9f6f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserExperienceGiftOfferComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserExperienceGiftOfferComposer.java @@ -16,7 +16,7 @@ public class NewUserExperienceGiftOfferComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.NewUserExperienceGiftOfferComposer); + this.response.init(Outgoing.newUserExperienceGiftOfferComposer); this.response.appendInt(this.options.size()); for (List option : this.options) { this.response.appendInt(1); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NoobnessLevelMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NoobnessLevelMessageComposer.java index 7285e1de..93ac42bc 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NoobnessLevelMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NoobnessLevelMessageComposer.java @@ -14,7 +14,7 @@ public class NoobnessLevelMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.NoobnessLevelMessageComposer); + this.response.init(Outgoing.noobnessLevelMessageComposer); this.response.appendInt(this.habbo.noobStatus()); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/handshake/AuthenticationOKMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/handshake/AuthenticationOKMessageComposer.java index ad40e0ad..ee86f63c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/handshake/AuthenticationOKMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/handshake/AuthenticationOKMessageComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class AuthenticationOKMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.AuthenticationOKMessageComposer); + this.response.init(Outgoing.authenticationOKMessageComposer); return this.response; } } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/handshake/AvailabilityStatusMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/handshake/AvailabilityStatusMessageComposer.java index d65cc78c..a1c0862e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/handshake/AvailabilityStatusMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/handshake/AvailabilityStatusMessageComposer.java @@ -17,7 +17,7 @@ public class AvailabilityStatusMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.AvailabilityStatusMessageComposer); + this.response.init(Outgoing.availabilityStatusMessageComposer); this.response.appendBoolean(isOpen);//isOpen this.response.appendBoolean(isShuttingDown);//onShutdown diff --git a/src/main/java/com/eu/habbo/messages/outgoing/handshake/CompleteDiffieHandshakeComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/handshake/CompleteDiffieHandshakeComposer.java index dc2c5fbc..9c9ef8b5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/handshake/CompleteDiffieHandshakeComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/handshake/CompleteDiffieHandshakeComposer.java @@ -20,7 +20,7 @@ public class CompleteDiffieHandshakeComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CompleteDiffieHandshakeComposer); + this.response.init(Outgoing.completeDiffieHandshakeComposer); this.response.appendString(this.publicKey); this.response.appendBoolean(this.clientEncryption); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/handshake/EnableNotificationsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/handshake/EnableNotificationsComposer.java index 2a7085c7..4febea68 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/handshake/EnableNotificationsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/handshake/EnableNotificationsComposer.java @@ -13,7 +13,7 @@ public class EnableNotificationsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.InfoFeedEnableMessageComposer); + this.response.init(Outgoing.infoFeedEnableMessageComposer); this.response.appendBoolean(this.enabled); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/handshake/ErrorReportComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/handshake/ErrorReportComposer.java index 0b094aff..761f97a2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/handshake/ErrorReportComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/handshake/ErrorReportComposer.java @@ -23,7 +23,7 @@ public class ErrorReportComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ErrorReportComposer); + this.response.init(Outgoing.errorReportComposer); this.response.appendInt(this.messageId); this.response.appendInt(this.errorCode); this.response.appendString(this.timestamp); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/handshake/InitDiffieHandshakeComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/handshake/InitDiffieHandshakeComposer.java index 72ffdb0e..22c54ae1 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/handshake/InitDiffieHandshakeComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/handshake/InitDiffieHandshakeComposer.java @@ -16,7 +16,7 @@ public class InitDiffieHandshakeComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.InitDiffieHandshakeComposer); + this.response.init(Outgoing.initDiffieHandshakeComposer); this.response.appendString(this.signedPrime); this.response.appendString(this.signedGenerator); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/incoming/handshake/IsFirstLoginOfDayComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/handshake/IsFirstLoginOfDayComposer.java similarity index 82% rename from src/main/java/com/eu/habbo/messages/incoming/handshake/IsFirstLoginOfDayComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/handshake/IsFirstLoginOfDayComposer.java index 39fa17ee..f1c638b5 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/handshake/IsFirstLoginOfDayComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/handshake/IsFirstLoginOfDayComposer.java @@ -1,4 +1,4 @@ -package com.eu.habbo.messages.incoming.handshake; +package com.eu.habbo.messages.outgoing.handshake; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; @@ -13,7 +13,7 @@ public class IsFirstLoginOfDayComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.IsFirstLoginOfDayComposer); + this.response.init(Outgoing.isFirstLoginOfDayComposer); this.response.appendBoolean(this.isFirstLoginOfDay); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/handshake/LatencyPingResponseMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/handshake/LatencyPingResponseMessageComposer.java index 04d42bd0..e1244b0d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/handshake/LatencyPingResponseMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/handshake/LatencyPingResponseMessageComposer.java @@ -13,7 +13,7 @@ public class LatencyPingResponseMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.LatencyPingResponseMessageComposer); + this.response.init(Outgoing.latencyPingResponseMessageComposer); this.response.appendInt(this.id); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/handshake/PingMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/handshake/PingMessageComposer.java index 2966bdd1..265b52ef 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/handshake/PingMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/handshake/PingMessageComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class PingMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PingMessageComposer); + this.response.init(Outgoing.pingMessageComposer); return this.response; } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/outgoing/handshake/UniqueMachineIDComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/handshake/UniqueMachineIDComposer.java index c0667b15..3090b467 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/handshake/UniqueMachineIDComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/handshake/UniqueMachineIDComposer.java @@ -14,7 +14,7 @@ public class UniqueMachineIDComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UniqueMachineIDComposer); + this.response.init(Outgoing.uniqueMachineIDComposer); this.response.appendString(this.machineId); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/BonusRareInfoMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/BonusRareInfoMessageComposer.java index db0f53f0..82a9b97e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/BonusRareInfoMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/BonusRareInfoMessageComposer.java @@ -15,7 +15,7 @@ public class BonusRareInfoMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.BonusRareInfoMessageComposer); + this.response.init(Outgoing.bonusRareInfoMessageComposer); this.response.appendString(Emulator.getConfig().getValue("hotelview.promotional.reward.name", "prizetrophy_breed_gold")); //Furniture Name. Note: Image is in external_variables.txt this.response.appendInt(Emulator.getConfig().getInt("hotelview.promotional.reward.id", 0)); //Furniture ID this.response.appendInt(Emulator.getConfig().getInt("hotelview.promotional.points", 120)); //Total Required diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CatalogPageWithEarliestExpiryMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CatalogPageWithEarliestExpiryMessageComposer.java index af20d0c1..9e9c89de 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CatalogPageWithEarliestExpiryMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CatalogPageWithEarliestExpiryMessageComposer.java @@ -16,7 +16,7 @@ public class CatalogPageWithEarliestExpiryMessageComposer extends MessageCompose @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CatalogPageWithEarliestExpiryMessageComposer); + this.response.init(Outgoing.catalogPageWithEarliestExpiryMessageComposer); this.response.appendString(this.page.getCaption()); this.response.appendInt(this.page.getId()); this.response.appendString(this.image); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CloseConnectionMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CloseConnectionMessageComposer.java index d7336679..d1e65895 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CloseConnectionMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CloseConnectionMessageComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class CloseConnectionMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CloseConnectionMessageComposer); + this.response.init(Outgoing.closeConnectionMessageComposer); return this.response; } } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CommunityGoalHallOfFameMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CommunityGoalHallOfFameMessageComposer.java index 044efada..2b4e09d1 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CommunityGoalHallOfFameMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CommunityGoalHallOfFameMessageComposer.java @@ -19,7 +19,7 @@ public class CommunityGoalHallOfFameMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CommunityGoalHallOfFameMessageComposer); + this.response.init(Outgoing.communityGoalHallOfFameMessageComposer); this.response.appendString(this.hallOfFame.getCompetitionName()); this.response.appendInt(this.hallOfFame.getWinners().size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CommunityGoalProgressMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CommunityGoalProgressMessageComposer.java index 8a4fe3ce..564079bc 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CommunityGoalProgressMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CommunityGoalProgressMessageComposer.java @@ -41,7 +41,7 @@ public class CommunityGoalProgressMessageComposer extends MessageComposer { //:test 1579 b:1 i:0 i:1 i:2 i:3 i:4 i:5 s:a i:6 i:1 i:1 @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CommunityGoalProgressMessageComposer); + this.response.init(Outgoing.communityGoalProgressMessageComposer); this.response.appendBoolean(this.achieved); //Achieved? this.response.appendInt(this.personalContributionScore); //User Amount this.response.appendInt(this.personalRank); //User Rank diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CommunityGoalVoteMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CommunityGoalVoteMessageComposer.java index 12230eed..f87aaa7c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CommunityGoalVoteMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CommunityGoalVoteMessageComposer.java @@ -13,7 +13,7 @@ public class CommunityGoalVoteMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CommunityGoalVoteMessageComposer); + this.response.init(Outgoing.communityGoalVoteMessageComposer); this.response.appendBoolean(this.unknownBoolean); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/ConcurrentUsersGoalProgressMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/ConcurrentUsersGoalProgressMessageComposer.java index 22851e17..ec0a47f1 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/ConcurrentUsersGoalProgressMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/ConcurrentUsersGoalProgressMessageComposer.java @@ -21,7 +21,7 @@ public class ConcurrentUsersGoalProgressMessageComposer extends MessageComposer @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ConcurrentUsersGoalProgressMessageComposer); + this.response.init(Outgoing.concurrentUsersGoalProgressMessageComposer); this.response.appendInt(this.state); this.response.appendInt(this.userCount); this.response.appendInt(this.goal); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CurrentTimingCodeMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CurrentTimingCodeMessageComposer.java index 3a651f59..6bc07ea4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CurrentTimingCodeMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/CurrentTimingCodeMessageComposer.java @@ -15,7 +15,7 @@ public class CurrentTimingCodeMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CurrentTimingCodeMessageComposer); + this.response.init(Outgoing.currentTimingCodeMessageComposer); this.response.appendString(this.data); this.response.appendString(this.key); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewBadgeButtonConfigComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewBadgeButtonConfigComposer.java index e99a219a..321db15a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewBadgeButtonConfigComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewBadgeButtonConfigComposer.java @@ -15,7 +15,7 @@ public class HotelViewBadgeButtonConfigComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.IsBadgeRequestFulfilledComposer); + this.response.init(Outgoing.isBadgeRequestFulfilledComposer); this.response.appendString(this.badge); this.response.appendBoolean(this.enabled); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCatalogPageExpiringComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCatalogPageExpiringComposer.java index bc98a0c4..6a371e3a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCatalogPageExpiringComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCatalogPageExpiringComposer.java @@ -17,7 +17,7 @@ public class HotelViewCatalogPageExpiringComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.HotelViewCatalogPageExpiringComposer); + this.response.init(Outgoing.hotelViewCatalogPageExpiringComposer); this.response.appendString(this.name); this.response.appendInt(this.time); this.response.appendString(this.image); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCustomTimerComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCustomTimerComposer.java index f31e3203..0b0c4285 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCustomTimerComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCustomTimerComposer.java @@ -15,7 +15,7 @@ public class HotelViewCustomTimerComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.HotelViewCustomTimerComposer); + this.response.init(Outgoing.hotelViewCustomTimerComposer); this.response.appendString(this.name); //Send by the client. this.response.appendInt(this.seconds); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/LimitedOfferAppearingNextMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/LimitedOfferAppearingNextMessageComposer.java index 6b5d1c98..9a6ae106 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/LimitedOfferAppearingNextMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/LimitedOfferAppearingNextMessageComposer.java @@ -19,7 +19,7 @@ public class LimitedOfferAppearingNextMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.LimitedOfferAppearingNextMessageComposer); + this.response.init(Outgoing.limitedOfferAppearingNextMessageComposer); this.response.appendInt(this.time); this.response.appendInt(this.pageId); this.response.appendInt(this.itemId); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/PromoArticlesMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/PromoArticlesMessageComposer.java index bc070290..8c930a51 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/PromoArticlesMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/PromoArticlesMessageComposer.java @@ -10,7 +10,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class PromoArticlesMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PromoArticlesMessageComposer); + this.response.init(Outgoing.promoArticlesMessageComposer); NewsList newsList = Emulator.getGameEnvironment().getHotelViewManager().getNewsList(); this.response.appendInt(newsList.getNewsWidgets().size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/SecondsUntilMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/SecondsUntilMessageComposer.java index 9491cb3e..ff39528e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/SecondsUntilMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/SecondsUntilMessageComposer.java @@ -15,7 +15,7 @@ public class SecondsUntilMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.SecondsUntilMessageComposer); + this.response.init(Outgoing.secondsUntilMessageComposer); this.response.appendString(this.dateString); this.response.appendInt(this.seconds); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectActivatedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectActivatedMessageComposer.java index 94d0aa55..be5e1017 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectActivatedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectActivatedMessageComposer.java @@ -14,7 +14,7 @@ public class AvatarEffectActivatedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.AvatarEffectActivatedMessageComposer); + this.response.init(Outgoing.avatarEffectActivatedMessageComposer); this.response.appendInt(this.effect.effect); //Type this.response.appendInt(this.effect.duration); //Duration this.response.appendBoolean(this.effect.enabled); //activated diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectAddedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectAddedMessageComposer.java index b7281724..b52c9d0d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectAddedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectAddedMessageComposer.java @@ -14,7 +14,7 @@ public class AvatarEffectAddedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.AvatarEffectAddedMessageComposer); + this.response.init(Outgoing.avatarEffectAddedMessageComposer); this.response.appendInt(this.effect.effect); //Type this.response.appendInt(0); //Unknown Costume? this.response.appendInt(effect.duration > 0 ? effect.duration : Integer.MAX_VALUE); //Duration diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectExpiredMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectExpiredMessageComposer.java index c47cb784..42808baa 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectExpiredMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectExpiredMessageComposer.java @@ -14,7 +14,7 @@ public class AvatarEffectExpiredMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.AvatarEffectExpiredMessageComposer); + this.response.init(Outgoing.avatarEffectExpiredMessageComposer); this.response.appendInt(this.effect.effect); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectsMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectsMessageComposer.java index 998c3d30..4aa85f2c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectsMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectsMessageComposer.java @@ -21,7 +21,7 @@ public class AvatarEffectsMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.AvatarEffectsMessageComposer); + this.response.init(Outgoing.avatarEffectsMessageComposer); if (this.habbo == null || this.habbo.getInventory() == null || this.habbo.getInventory().getEffectsComponent() == null || this.habbo.getInventory().getEffectsComponent().effects == null) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/BadgePointLimitsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/BadgePointLimitsComposer.java index b855a2bb..f3939ac6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/BadgePointLimitsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/BadgePointLimitsComposer.java @@ -12,7 +12,7 @@ import gnu.trove.procedure.TObjectProcedure; public class BadgePointLimitsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.BadgePointLimitsComposer); + this.response.init(Outgoing.badgePointLimitsComposer); synchronized (Emulator.getGameEnvironment().getAchievementManager().getAchievements()) { THashMap achievements = Emulator.getGameEnvironment().getAchievementManager().getAchievements(); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/BadgesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/BadgesComposer.java index d27aced8..80e5dd2e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/BadgesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/BadgesComposer.java @@ -21,7 +21,7 @@ public class BadgesComposer extends MessageComposer { THashSet equippedBadges = new THashSet<>(); - this.response.init(Outgoing.BadgesComposer); + this.response.init(Outgoing.badgesComposer); this.response.appendInt(this.habbo.getInventory().getBadgesComponent().getBadges().size()); for (HabboBadge badge : this.habbo.getInventory().getBadgesComponent().getBadges()) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/BotAddedToInventoryComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/BotAddedToInventoryComposer.java index b9d27fc9..5d4b3601 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/BotAddedToInventoryComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/BotAddedToInventoryComposer.java @@ -14,7 +14,7 @@ public class BotAddedToInventoryComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.BotAddedToInventoryComposer); + this.response.init(Outgoing.botAddedToInventoryComposer); this.response.appendInt(this.bot.getId()); this.response.appendString(this.bot.getName()); this.response.appendString(this.bot.getMotto()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/BotInventoryComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/BotInventoryComposer.java index e8b90195..6e001228 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/BotInventoryComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/BotInventoryComposer.java @@ -16,7 +16,7 @@ public class BotInventoryComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.BotInventoryComposer); + this.response.init(Outgoing.botInventoryComposer); THashMap userBots = this.habbo.getInventory().getBotsComponent().getBots(); this.response.appendInt(userBots.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/BotRemovedFromInventoryComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/BotRemovedFromInventoryComposer.java index b09b733c..90bfba4c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/BotRemovedFromInventoryComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/BotRemovedFromInventoryComposer.java @@ -14,7 +14,7 @@ public class BotRemovedFromInventoryComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.BotRemovedFromInventoryComposer); + this.response.init(Outgoing.botRemovedFromInventoryComposer); this.response.appendInt(this.bot.getId()); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/FurniListAddOrUpdateComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/FurniListAddOrUpdateComposer.java index 7f8b01b6..342ac66d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/FurniListAddOrUpdateComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/FurniListAddOrUpdateComposer.java @@ -15,7 +15,7 @@ public class FurniListAddOrUpdateComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FurniListAddOrUpdateComposer); + this.response.init(Outgoing.furniListAddOrUpdateComposer); this.response.appendInt(this.habboItem.getGiftAdjustedId()); this.response.appendString(this.habboItem.getBaseItem().getType().code); this.response.appendInt(this.habboItem.getId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/FurniListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/FurniListComposer.java index 74b0d18f..d6c787b5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/FurniListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/FurniListComposer.java @@ -27,7 +27,7 @@ public class FurniListComposer extends MessageComposer implements TIntObjectProc @Override protected ServerMessage composeInternal() { try { - this.response.init(Outgoing.FurniListComposer); + this.response.init(Outgoing.furniListComposer); this.response.appendInt(this.totalFragments); this.response.appendInt(this.fragmentNumber - 1); this.response.appendInt(this.items.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/FurniListInvalidateComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/FurniListInvalidateComposer.java index 94762197..25b0109f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/FurniListInvalidateComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/FurniListInvalidateComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class FurniListInvalidateComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FurniListInvalidateComposer); + this.response.init(Outgoing.furniListInvalidateComposer); return this.response; } } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/FurniListRemoveComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/FurniListRemoveComposer.java index 436fb134..8f7bacb3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/FurniListRemoveComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/FurniListRemoveComposer.java @@ -13,7 +13,7 @@ public class FurniListRemoveComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FurniListRemoveComposer); + this.response.init(Outgoing.furniListRemoveComposer); this.response.appendInt(this.itemId); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/PetAddedToInventoryComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/PetAddedToInventoryComposer.java index 632d43df..a9184d31 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/PetAddedToInventoryComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/PetAddedToInventoryComposer.java @@ -14,7 +14,7 @@ public class PetAddedToInventoryComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PetAddedToInventoryComposer); + this.response.init(Outgoing.petAddedToInventoryComposer); this.pet.serialize(this.response); this.response.appendBoolean(false); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/PetInventoryComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/PetInventoryComposer.java index 50e31f72..115df618 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/PetInventoryComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/PetInventoryComposer.java @@ -18,7 +18,7 @@ public class PetInventoryComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PetInventoryComposer); + this.response.init(Outgoing.petInventoryComposer); this.response.appendInt(1); this.response.appendInt(1); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/PetRemovedFromInventoryComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/PetRemovedFromInventoryComposer.java index 3405d687..b111dd1d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/PetRemovedFromInventoryComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/PetRemovedFromInventoryComposer.java @@ -14,7 +14,7 @@ public class PetRemovedFromInventoryComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PetRemovedFromInventoryComposer); + this.response.init(Outgoing.petRemovedFromInventoryComposer); this.response.appendInt(this.petId); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/UnseenItemsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/UnseenItemsComposer.java index 2fc0ae88..670f204e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/UnseenItemsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/UnseenItemsComposer.java @@ -42,7 +42,7 @@ public class UnseenItemsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UnseenItemsComposer); + this.response.init(Outgoing.unseenItemsComposer); if (this.ids != null) { this.response.appendInt(1); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/CallForHelpDisabledNotifyMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/CallForHelpDisabledNotifyMessageComposer.java index 6968ac1e..529cce7d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/CallForHelpDisabledNotifyMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/CallForHelpDisabledNotifyMessageComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class CallForHelpDisabledNotifyMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CallForHelpDisabledNotifyMessageComposer); + this.response.init(Outgoing.callForHelpDisabledNotifyMessageComposer); this.response.appendString(""); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/CallForHelpPendingCallsMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/CallForHelpPendingCallsMessageComposer.java index 8c87d4f1..a4d584bf 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/CallForHelpPendingCallsMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/CallForHelpPendingCallsMessageComposer.java @@ -16,7 +16,7 @@ public class CallForHelpPendingCallsMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CallForHelpPendingCallsMessageComposer); + this.response.init(Outgoing.callForHelpPendingCallsMessageComposer); this.response.appendInt(this.pendingIssues.size()); //Current standing help request(s) amount: for (ModToolIssue issue : this.pendingIssues) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/CallForHelpReplyMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/CallForHelpReplyMessageComposer.java index 61231b8b..6b5df221 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/CallForHelpReplyMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/CallForHelpReplyMessageComposer.java @@ -13,7 +13,7 @@ public class CallForHelpReplyMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CallForHelpReplyMessageComposer); + this.response.init(Outgoing.callForHelpReplyMessageComposer); this.response.appendString(this.message); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/CallForHelpResultMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/CallForHelpResultMessageComposer.java index 1f376883..44172a73 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/CallForHelpResultMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/CallForHelpResultMessageComposer.java @@ -19,7 +19,7 @@ public class CallForHelpResultMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CallForHelpResultMessageComposer); + this.response.init(Outgoing.callForHelpResultMessageComposer); this.response.appendInt(this.errorCode); this.response.appendString(this.message); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/CfhChatlogComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/CfhChatlogComposer.java index 127aa3d3..f28dff0d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/CfhChatlogComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/CfhChatlogComposer.java @@ -12,7 +12,7 @@ import java.util.Collections; import java.util.List; public class CfhChatlogComposer extends MessageComposer { - public static SimpleDateFormat format = new SimpleDateFormat("HH:mm"); + private final SimpleDateFormat format = new SimpleDateFormat("HH:mm"); private final ModToolIssue issue; private final List chatlog; private final String roomName; @@ -33,7 +33,7 @@ public class CfhChatlogComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CfhChatlogComposer); + this.response.init(Outgoing.cfhChatlogComposer); this.response.appendInt(this.issue.id); this.response.appendInt(this.issue.senderId); this.response.appendInt(this.issue.reportedId); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/CfhTopicsInitComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/CfhTopicsInitComposer.java index 19f55c0a..b44ebbc0 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/CfhTopicsInitComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/CfhTopicsInitComposer.java @@ -11,7 +11,7 @@ import gnu.trove.procedure.TObjectProcedure; public class CfhTopicsInitComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CfhTopicsInitComposer); + this.response.init(Outgoing.cfhTopicsInitComposer); this.response.appendInt(Emulator.getGameEnvironment().getModToolManager().getCfhCategories().valueCollection().size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/GuideReportingStatusMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/GuideReportingStatusMessageComposer.java index 9087da75..911966fb 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/GuideReportingStatusMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/GuideReportingStatusMessageComposer.java @@ -20,7 +20,7 @@ public class GuideReportingStatusMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuideReportingStatusMessageComposer); + this.response.init(Outgoing.guideReportingStatusMessageComposer); this.response.appendInt(this.errorCode); if (this.errorCode == ONGOING_HELPER_CASE) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/GuideTicketCreationResultMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/GuideTicketCreationResultMessageComposer.java index 829a57ad..15f6e4cd 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/GuideTicketCreationResultMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/GuideTicketCreationResultMessageComposer.java @@ -19,7 +19,7 @@ public class GuideTicketCreationResultMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GuideTicketCreationResultMessageComposer); + this.response.init(Outgoing.guideTicketCreationResultMessageComposer); this.response.appendInt(this.code); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/IssueCloseNotificationMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/IssueCloseNotificationMessageComposer.java index 49e1c276..107a88e9 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/IssueCloseNotificationMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/IssueCloseNotificationMessageComposer.java @@ -24,7 +24,7 @@ public class IssueCloseNotificationMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.IssueCloseNotificationMessageComposer); + this.response.init(Outgoing.issueCloseNotificationMessageComposer); this.response.appendInt(this.code); this.response.appendString(this.message); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/IssueInfoMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/IssueInfoMessageComposer.java index a16bed18..07f626ff 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/IssueInfoMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/IssueInfoMessageComposer.java @@ -14,7 +14,7 @@ public class IssueInfoMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.IssueInfoMessageComposer); + this.response.init(Outgoing.issueInfoMessageComposer); this.issue.serialize(this.response); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/IssuePickFailedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/IssuePickFailedMessageComposer.java index 4c9940af..959caed9 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/IssuePickFailedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/IssuePickFailedMessageComposer.java @@ -14,7 +14,7 @@ public class IssuePickFailedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.IssuePickFailedMessageComposer); + this.response.init(Outgoing.issuePickFailedMessageComposer); this.issue.serialize(this.response); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorInitMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorInitMessageComposer.java index 25790f32..62fdafc1 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorInitMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorInitMessageComposer.java @@ -24,7 +24,7 @@ public class ModeratorInitMessageComposer extends MessageComposer implements TOb @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ModeratorInitMessageComposer); + this.response.init(Outgoing.moderatorInitMessageComposer); if (this.habbo.hasPermission(Permission.ACC_MODTOOL_TICKET_Q)) { THashSet openTickets = new THashSet<>(); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorRoomInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorRoomInfoComposer.java index c8f04111..4b2f2206 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorRoomInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorRoomInfoComposer.java @@ -14,7 +14,7 @@ public class ModeratorRoomInfoComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ModeratorRoomInfoComposer); + this.response.init(Outgoing.moderatorRoomInfoComposer); this.response.appendInt(this.room.getId()); this.response.appendInt(this.room.getCurrentHabbos().size()); this.response.appendBoolean(this.room.getHabbo(this.room.getOwnerId()) != null); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorToolPreferencesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorToolPreferencesComposer.java index d5d7ef5f..90ab9fa2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorToolPreferencesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorToolPreferencesComposer.java @@ -19,7 +19,7 @@ public class ModeratorToolPreferencesComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ModeratorToolPreferencesComposer); + this.response.init(Outgoing.moderatorToolPreferencesComposer); this.response.appendInt(this.x); this.response.appendInt(this.y); this.response.appendInt(this.width); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorUserInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorUserInfoComposer.java index 37d1dcb8..4da65747 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorUserInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModeratorUserInfoComposer.java @@ -25,7 +25,7 @@ public class ModeratorUserInfoComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ModeratorUserInfoComposer); + this.response.init(Outgoing.moderatorUserInfoComposer); try { int totalBans = 0; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/RoomChatlogComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/RoomChatlogComposer.java index f1ba1950..cadf3fa2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/RoomChatlogComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/RoomChatlogComposer.java @@ -21,7 +21,7 @@ public class RoomChatlogComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomChatlogComposer); + this.response.init(Outgoing.roomChatlogComposer); this.response.appendByte(1); this.response.appendShort(2); this.response.appendString("roomName"); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/RoomVisitsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/RoomVisitsComposer.java index 9dc4f7af..589f839a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/RoomVisitsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/RoomVisitsComposer.java @@ -21,14 +21,14 @@ public class RoomVisitsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomVisitsComposer); + this.response.init(Outgoing.roomVisitsComposer); this.response.appendInt(this.habboInfo.getId()); this.response.appendString(this.habboInfo.getUsername()); this.response.appendInt(this.roomVisits.size()); Calendar cal = Calendar.getInstance(TimeZone.getDefault()); for (ModToolRoomVisit visit : this.roomVisits) { - cal.setTimeInMillis(visit.timestamp * 1000); + cal.setTimeInMillis(visit.timestamp * 1000L); this.response.appendInt(visit.roomId); this.response.appendString(visit.roomName); this.response.appendInt(cal.get(Calendar.HOUR)); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/SanctionStatusComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/SanctionStatusComposer.java index 8a041b05..12afce6b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/SanctionStatusComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/SanctionStatusComposer.java @@ -55,7 +55,7 @@ public class SanctionStatusComposer extends MessageComposer { tradeLockedUntil = new Date((long) item.tradeLockedUntil * 1000); } - this.response.init(Outgoing.SanctionStatusComposer); + this.response.init(Outgoing.sanctionStatusComposer); this.response.appendBoolean(prevItem != null && prevItem.probationTimestamp > 0); // has prev sanction this.response.appendBoolean(item.probationTimestamp >= Emulator.getIntUnixTimestamp()); // is on probation @@ -83,7 +83,7 @@ public class SanctionStatusComposer extends MessageComposer { } private ServerMessage cleanResponse() { - this.response.init(Outgoing.SanctionStatusComposer); + this.response.init(Outgoing.sanctionStatusComposer); this.response.appendBoolean(false); // has prev sanction this.response.appendBoolean(false); // is on probation diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/UserChatlogComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/UserChatlogComposer.java index ba93cb0f..803186a7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/UserChatlogComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/UserChatlogComposer.java @@ -10,7 +10,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; public class UserChatlogComposer extends MessageComposer { - public static SimpleDateFormat format = new SimpleDateFormat("HH:mm"); + private final SimpleDateFormat format = new SimpleDateFormat("HH:mm"); private final ArrayList set; private final int userId; private final String username; @@ -23,7 +23,7 @@ public class UserChatlogComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UserChatlogComposer); + this.response.init(Outgoing.userChatlogComposer); this.response.appendInt(this.userId); this.response.appendString(this.username); this.response.appendInt(this.set.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/mysterybox/MysteryBoxKeysMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/mysterybox/MysteryBoxKeysMessageComposer.java index a4660301..13b72b73 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/mysterybox/MysteryBoxKeysMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/mysterybox/MysteryBoxKeysMessageComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class MysteryBoxKeysMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.MysteryBoxKeysMessageComposer); + this.response.init(Outgoing.mysteryBoxKeysMessageComposer); this.response.appendString(""); //Box color this.response.appendString(""); //Key color return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/CanCreateRoomComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/CanCreateRoomComposer.java index 051d651b..256ac763 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/CanCreateRoomComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/CanCreateRoomComposer.java @@ -15,7 +15,7 @@ public class CanCreateRoomComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CanCreateRoomComposer); + this.response.init(Outgoing.canCreateRoomComposer); this.response.appendInt(this.count >= this.max ? 1 : 0); this.response.appendInt(this.max); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/CanCreateRoomEventComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/CanCreateRoomEventComposer.java index 81bd1cc2..74f1f80d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/CanCreateRoomEventComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/CanCreateRoomEventComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class CanCreateRoomEventComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CanCreateRoomEventComposer); + this.response.init(Outgoing.canCreateRoomEventComposer); this.response.appendBoolean(true); this.response.appendInt(0); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/CategoriesWithVisitorCountComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/CategoriesWithVisitorCountComposer.java index 7cf8b202..b66a7950 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/CategoriesWithVisitorCountComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/CategoriesWithVisitorCountComposer.java @@ -16,7 +16,7 @@ public class CategoriesWithVisitorCountComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CategoriesWithVisitorCountComposer); + this.response.init(Outgoing.categoriesWithVisitorCountComposer); this.response.appendInt(this.roomCategories.size()); for (RoomCategory category : this.roomCategories) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/CollapsedCategoriesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/CollapsedCategoriesComposer.java index 0cbf39a2..91c1a8ed 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/CollapsedCategoriesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/CollapsedCategoriesComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class CollapsedCategoriesComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CollapsedCategoriesComposer); + this.response.init(Outgoing.collapsedCategoriesComposer); this.response.appendInt(46); this.response.appendString("new_ads"); this.response.appendString("friend_finding"); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/FlatCreatedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/FlatCreatedComposer.java index 18a0e957..b7fd1b0e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/FlatCreatedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/FlatCreatedComposer.java @@ -14,7 +14,7 @@ public class FlatCreatedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FlatCreatedComposer); + this.response.init(Outgoing.flatCreatedComposer); this.response.appendInt(this.room.getId()); this.response.appendString(this.room.getName()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/GuestRoomSearchResultComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/GuestRoomSearchResultComposer.java index 714f89d4..ae568272 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/GuestRoomSearchResultComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/GuestRoomSearchResultComposer.java @@ -21,7 +21,7 @@ public class GuestRoomSearchResultComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { try { - this.response.init(Outgoing.GuestRoomSearchResultComposer); + this.response.init(Outgoing.guestRoomSearchResultComposer); this.response.appendInt(2); this.response.appendString(""); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorLiftedRoomsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorLiftedRoomsComposer.java index 6cd554a7..d3f0a223 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorLiftedRoomsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorLiftedRoomsComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class NavigatorLiftedRoomsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.NavigatorLiftedRoomsComposer); + this.response.init(Outgoing.navigatorLiftedRoomsComposer); this.response.appendInt(0); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorMetaDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorMetaDataComposer.java index 5bb0c8c7..22f9eca6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorMetaDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorMetaDataComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class NavigatorMetaDataComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.NavigatorMetaDataComposer); + this.response.init(Outgoing.navigatorMetaDataComposer); this.response.appendInt(4); this.response.appendString("official_view"); this.response.appendInt(0); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorSavedSearchesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorSavedSearchesComposer.java index 0abaa0f6..e6db71ad 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorSavedSearchesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorSavedSearchesComposer.java @@ -16,7 +16,7 @@ public class NavigatorSavedSearchesComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.NavigatorSavedSearchesComposer); + this.response.init(Outgoing.navigatorSavedSearchesComposer); this.response.appendInt(this.searches.size()); for (NavigatorSavedSearch search : this.searches) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorSearchResultBlocksComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorSearchResultBlocksComposer.java index 19d509aa..e059ddca 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorSearchResultBlocksComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NavigatorSearchResultBlocksComposer.java @@ -20,7 +20,7 @@ public class NavigatorSearchResultBlocksComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.NavigatorSearchResultBlocksComposer); + this.response.init(Outgoing.navigatorSearchResultBlocksComposer); this.response.appendString(this.searchCode); this.response.appendString(this.searchQuery); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorPreferencesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorPreferencesComposer.java index 7df2ac01..feeb7801 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorPreferencesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorPreferencesComposer.java @@ -14,7 +14,7 @@ public class NewNavigatorPreferencesComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.NewNavigatorPreferencesComposer); + this.response.init(Outgoing.newNavigatorPreferencesComposer); this.response.appendInt(this.windowSettings.x); this.response.appendInt(this.windowSettings.y); this.response.appendInt(this.windowSettings.width); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NoOwnedRoomsAlertMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NoOwnedRoomsAlertMessageComposer.java index 9d48f6ad..56f59251 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NoOwnedRoomsAlertMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NoOwnedRoomsAlertMessageComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class NoOwnedRoomsAlertMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.NoOwnedRoomsAlertMessageComposer); + this.response.init(Outgoing.noOwnedRoomsAlertMessageComposer); return this.response; } } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/PopularRoomTagsResultComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/PopularRoomTagsResultComposer.java index 27e98f1f..c3405640 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/PopularRoomTagsResultComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/PopularRoomTagsResultComposer.java @@ -15,7 +15,7 @@ public class PopularRoomTagsResultComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PopularRoomTagsResultComposer); + this.response.init(Outgoing.popularRoomTagsResultComposer); this.response.appendInt(this.tags.size()); int i = 1; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/UserEventCatsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/UserEventCatsComposer.java index f0c8a0cd..209c7630 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/UserEventCatsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/UserEventCatsComposer.java @@ -13,7 +13,7 @@ public class UserEventCatsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UserEventCatsComposer); + this.response.init(Outgoing.userEventCatsComposer); this.response.appendInt(UserEventCatsComposer.CATEGORIES.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/UserFlatCatsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/UserFlatCatsComposer.java index a850da27..bd1ec555 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/UserFlatCatsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/UserFlatCatsComposer.java @@ -16,7 +16,7 @@ public class UserFlatCatsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UserFlatCatsComposer); + this.response.init(Outgoing.userFlatCatsComposer); this.response.appendInt(this.categories.size()); for (RoomCategory category : this.categories) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/polls/PollContentsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/polls/PollContentsComposer.java index b5058eb5..37fcfb50 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/polls/PollContentsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/polls/PollContentsComposer.java @@ -15,7 +15,7 @@ public class PollContentsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PollContentsComposer); + this.response.init(Outgoing.pollContentsComposer); this.response.appendInt(this.poll.id); this.response.appendString(this.poll.title); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/polls/PollOfferComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/polls/PollOfferComposer.java index 48611e14..23bc4114 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/polls/PollOfferComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/polls/PollOfferComposer.java @@ -14,7 +14,7 @@ public class PollOfferComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PollOfferComposer); + this.response.init(Outgoing.pollOfferComposer); this.response.appendInt(this.poll.id); this.response.appendString(this.poll.title); this.response.appendString(this.poll.thanksMessage); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/QuestionAnsweredComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/QuestionAnsweredComposer.java index a3dafc34..ff5cd917 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/QuestionAnsweredComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/QuestionAnsweredComposer.java @@ -19,7 +19,7 @@ public class QuestionAnsweredComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.QuestionAnsweredComposer); + this.response.init(Outgoing.questionAnsweredComposer); this.response.appendInt(this.userId); this.response.appendString(this.choice); this.response.appendInt(2); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/QuestionComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/QuestionComposer.java index 77a366eb..83e6eb62 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/QuestionComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/QuestionComposer.java @@ -16,7 +16,7 @@ public class QuestionComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.QuestionComposer); + this.response.init(Outgoing.questionComposer); this.response.appendString(this.question); this.response.appendInt(0); this.response.appendInt(0); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/QuestionFinishedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/QuestionFinishedComposer.java index f46f8314..025298b1 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/QuestionFinishedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/QuestionFinishedComposer.java @@ -15,7 +15,7 @@ public class QuestionFinishedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.QuestionFinishedComposer); + this.response.init(Outgoing.questionFinishedComposer); this.response.appendInt(-1); this.response.appendInt(2); this.response.appendString("0"); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestCancelledMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestCancelledMessageComposer.java index ac96548a..8f1ccbae 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestCancelledMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestCancelledMessageComposer.java @@ -13,7 +13,7 @@ public class QuestCancelledMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.QuestCancelledMessageComposer); + this.response.init(Outgoing.questCancelledMessageComposer); this.response.appendBoolean(this.expired); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestCompletedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestCompletedMessageComposer.java index 3c266234..44667b34 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestCompletedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestCompletedMessageComposer.java @@ -16,7 +16,7 @@ public class QuestCompletedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.QuestCompletedMessageComposer); + this.response.init(Outgoing.questCompletedMessageComposer); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestMessageComposer.java index 5c7eca75..26c2e012 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestMessageComposer.java @@ -13,7 +13,7 @@ public class QuestMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.QuestMessageComposer); + this.response.init(Outgoing.questMessageComposer); this.response.append(this.quest); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestionInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestionInfoComposer.java index 1aa05743..bdc13f17 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestionInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestionInfoComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class QuestionInfoComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.QuestionInfoComposer); + this.response.init(Outgoing.questionInfoComposer); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestsMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestsMessageComposer.java index bea2eea1..5cecad71 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestsMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestsMessageComposer.java @@ -18,7 +18,7 @@ public class QuestsMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.QuestsMessageComposer); + this.response.init(Outgoing.questsMessageComposer); this.response.appendInt(this.quests.size()); for (Quest quest : this.quests) { this.response.append(quest); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/BannedUsersFromRoomComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/BannedUsersFromRoomComposer.java index 902018e4..bc993aa3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/BannedUsersFromRoomComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/BannedUsersFromRoomComposer.java @@ -40,7 +40,7 @@ public class BannedUsersFromRoomComposer extends MessageComposer { if (roomBans.isEmpty()) return null; - this.response.init(Outgoing.BannedUsersFromRoomComposer); + this.response.init(Outgoing.bannedUsersFromRoomComposer); this.response.appendInt(this.room.getId()); this.response.appendInt(roomBans.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/BotCommandConfigurationComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/BotCommandConfigurationComposer.java index 44225e18..b64b1395 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/BotCommandConfigurationComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/BotCommandConfigurationComposer.java @@ -16,7 +16,7 @@ public class BotCommandConfigurationComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.BotCommandConfigurationComposer); + this.response.init(Outgoing.botCommandConfigurationComposer); this.response.appendInt(-this.bot.getId()); this.response.appendInt(this.settingId); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/BotForceOpenContextMenuComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/BotForceOpenContextMenuComposer.java index 3e7a7bf3..546962a2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/BotForceOpenContextMenuComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/BotForceOpenContextMenuComposer.java @@ -13,7 +13,7 @@ public class BotForceOpenContextMenuComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.BotForceOpenContextMenuComposer); + this.response.init(Outgoing.botForceOpenContextMenuComposer); this.response.appendInt(this.botId); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/CantConnectMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/CantConnectMessageComposer.java index 464eabbb..bf421149 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/CantConnectMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/CantConnectMessageComposer.java @@ -30,7 +30,7 @@ public class CantConnectMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CantConnectMessageComposer); + this.response.init(Outgoing.cantConnectMessageComposer); this.response.appendInt(this.errorCode); this.response.appendString(this.queError); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/DoorbellMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/DoorbellMessageComposer.java index d192ccd4..3e5a08bf 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/DoorbellMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/DoorbellMessageComposer.java @@ -13,7 +13,7 @@ public class DoorbellMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.DoorbellMessageComposer); + this.response.init(Outgoing.doorbellMessageComposer); this.response.appendString(this.habbo); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/FavouriteChangedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/FavouriteChangedComposer.java index ed10e941..9c81839d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/FavouriteChangedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/FavouriteChangedComposer.java @@ -15,7 +15,7 @@ public class FavouriteChangedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FavouriteChangedComposer); + this.response.init(Outgoing.favouriteChangedComposer); this.response.appendInt(this.roomId); this.response.appendBoolean(this.favorite); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/FlatAccessDeniedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/FlatAccessDeniedMessageComposer.java index 08aff148..d8bffa10 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/FlatAccessDeniedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/FlatAccessDeniedMessageComposer.java @@ -13,7 +13,7 @@ public class FlatAccessDeniedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FlatAccessDeniedMessageComposer); + this.response.init(Outgoing.flatAccessDeniedMessageComposer); this.response.appendString(this.habbo); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/FlatAccessibleMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/FlatAccessibleMessageComposer.java index 01e556db..f82929cf 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/FlatAccessibleMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/FlatAccessibleMessageComposer.java @@ -13,7 +13,7 @@ public class FlatAccessibleMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FlatAccessibleMessageComposer); + this.response.init(Outgoing.flatAccessibleMessageComposer); this.response.appendString(this.username); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/FlatControllerAddedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/FlatControllerAddedComposer.java index 179e8036..8c613606 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/FlatControllerAddedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/FlatControllerAddedComposer.java @@ -18,7 +18,7 @@ public class FlatControllerAddedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FlatControllerAddedComposer); + this.response.init(Outgoing.flatControllerAddedComposer); this.response.appendInt(this.room.getId()); this.response.appendInt(this.userId); this.response.appendString(this.userName); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/FlatControllerRemovedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/FlatControllerRemovedComposer.java index 7a842da0..4cce03f4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/FlatControllerRemovedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/FlatControllerRemovedComposer.java @@ -17,7 +17,7 @@ public class FlatControllerRemovedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FlatControllerRemovedComposer); + this.response.init(Outgoing.flatControllerRemovedComposer); this.response.appendInt(this.room.getId()); this.response.appendInt(this.userId); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/FlatControllersComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/FlatControllersComposer.java index 916f8c91..96bfe1f4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/FlatControllersComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/FlatControllersComposer.java @@ -17,7 +17,7 @@ public class FlatControllersComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FlatControllersComposer); + this.response.init(Outgoing.flatControllersComposer); this.response.appendInt(this.room.getId()); THashMap rightsMap = this.room.getUsersWithRights(); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/FloodControlMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/FloodControlMessageComposer.java index 8c4bd472..f8dcca3c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/FloodControlMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/FloodControlMessageComposer.java @@ -13,7 +13,7 @@ public class FloodControlMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FloodControlMessageComposer); + this.response.init(Outgoing.floodControlMessageComposer); this.response.appendInt(this.time); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/FloorHeightMapComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/FloorHeightMapComposer.java index 99330ccb..da317555 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/FloorHeightMapComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/FloorHeightMapComposer.java @@ -14,7 +14,7 @@ public class FloorHeightMapComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FloorHeightMapComposer); + this.response.init(Outgoing.floorHeightMapComposer); this.response.appendBoolean(true); this.response.appendInt(this.room.getWallHeight()); //FixedWallsHeight this.response.appendString(this.room.getLayout().getRelativeMap()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/GamePlayerValueMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/GamePlayerValueMessageComposer.java index 6f6ab8dd..2ab7b15e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/GamePlayerValueMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/GamePlayerValueMessageComposer.java @@ -14,7 +14,7 @@ public class GamePlayerValueMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GamePlayerValueMessageComposer); + this.response.init(Outgoing.gamePlayerValueMessageComposer); this.response.appendInt(this.gamePlayer.getHabbo().getRoomUnit().getId()); this.response.appendInt(this.gamePlayer.getLives()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/GetGuestRoomResultComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/GetGuestRoomResultComposer.java index 26d28a57..b0b490d2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/GetGuestRoomResultComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/GetGuestRoomResultComposer.java @@ -23,7 +23,7 @@ public class GetGuestRoomResultComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GetGuestRoomResultComposer); + this.response.init(Outgoing.getGuestRoomResultComposer); this.response.appendBoolean(this.enterRoom); this.response.appendInt(this.room.getId()); this.response.appendString(this.room.getName()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/HeightMapComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/HeightMapComposer.java index 271fd85c..90ed8ea5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/HeightMapComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/HeightMapComposer.java @@ -16,7 +16,7 @@ public class HeightMapComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.HeightMapComposer); + this.response.init(Outgoing.heightMapComposer); this.response.appendInt(this.room.getLayout().getMapSize() / this.room.getLayout().getMapSizeY()); this.response.appendInt(this.room.getLayout().getMapSize()); for (short y = 0; y < this.room.getLayout().getMapSizeY(); y++) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/HeightMapUpdateMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/HeightMapUpdateMessageComposer.java index 4be988f5..a698cf2b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/HeightMapUpdateMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/HeightMapUpdateMessageComposer.java @@ -32,7 +32,7 @@ public class HeightMapUpdateMessageComposer 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.HeightMapUpdateMessageComposer); + this.response.init(Outgoing.heightMapUpdateMessageComposer); if (this.updateTiles != null) { // prevent overflow. Byte max value is 127 if(this.updateTiles.size() > 127) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/MuteAllInRoomComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/MuteAllInRoomComposer.java index b1bcbabf..8a54bbcf 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/MuteAllInRoomComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/MuteAllInRoomComposer.java @@ -14,7 +14,7 @@ public class MuteAllInRoomComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.MuteAllInRoomComposer); + this.response.init(Outgoing.muteAllInRoomComposer); this.response.appendBoolean(this.room.isMuted()); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/OpenConnectionMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/OpenConnectionMessageComposer.java index 46ee2647..a323cf60 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/OpenConnectionMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/OpenConnectionMessageComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class OpenConnectionMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.OpenConnectionMessageComposer); + this.response.init(Outgoing.openConnectionMessageComposer); return this.response; } } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomChatSettingsMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomChatSettingsMessageComposer.java index b9117942..784c7a89 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomChatSettingsMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomChatSettingsMessageComposer.java @@ -14,7 +14,7 @@ public class RoomChatSettingsMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomChatSettingsMessageComposer); + this.response.init(Outgoing.roomChatSettingsMessageComposer); this.response.appendInt(this.room.getChatMode()); this.response.appendInt(this.room.getChatWeight()); this.response.appendInt(this.room.getChatSpeed()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEntryInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEntryInfoComposer.java index be3d1185..cb0b4d50 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEntryInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEntryInfoComposer.java @@ -14,7 +14,7 @@ public class RoomEntryInfoComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomEntryInfoComposer); + this.response.init(Outgoing.roomEntryInfoComposer); this.response.appendInt(this.room.getId()); this.response.appendString(this.room.getOwnerName()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEntryInfoMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEntryInfoMessageComposer.java index bd602b6a..40c8dce3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEntryInfoMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEntryInfoMessageComposer.java @@ -16,7 +16,7 @@ public class RoomEntryInfoMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomEntryInfoMessageComposer); + this.response.init(Outgoing.roomEntryInfoMessageComposer); this.response.appendInt(this.room.getId()); this.response.appendBoolean(this.roomOwner); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFilterSettingsMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFilterSettingsMessageComposer.java index e825d0cf..d2c2deac 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFilterSettingsMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFilterSettingsMessageComposer.java @@ -14,7 +14,7 @@ public class RoomFilterSettingsMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomFilterSettingsMessageComposer); + this.response.init(Outgoing.roomFilterSettingsMessageComposer); this.response.appendInt(this.room.getWordFilterWords().size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFloorThicknessUpdatedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFloorThicknessUpdatedComposer.java index 9d8c46c8..3a03275b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFloorThicknessUpdatedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFloorThicknessUpdatedComposer.java @@ -14,7 +14,7 @@ public class RoomFloorThicknessUpdatedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomFloorThicknessUpdatedComposer); + this.response.init(Outgoing.roomFloorThicknessUpdatedComposer); this.response.appendBoolean(this.room.isHideWall()); //Hide walls? this.response.appendInt(this.room.getFloorSize()); //Floor Thickness this.response.appendInt(this.room.getWallSize()); //Wall Thickness diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomForwardMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomForwardMessageComposer.java index a8b33b35..2d45f0d2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomForwardMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomForwardMessageComposer.java @@ -13,7 +13,7 @@ public class RoomForwardMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomForwardMessageComposer); + this.response.init(Outgoing.roomForwardMessageComposer); this.response.appendInt(this.roomId); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomInfoUpdatedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomInfoUpdatedComposer.java index cbcb2890..f7b40967 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomInfoUpdatedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomInfoUpdatedComposer.java @@ -14,7 +14,7 @@ public class RoomInfoUpdatedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomInfoUpdatedComposer); + this.response.init(Outgoing.roomInfoUpdatedComposer); this.response.appendInt(this.room.getId()); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPropertyMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPropertyMessageComposer.java index 41d1716c..311ca936 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPropertyMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPropertyMessageComposer.java @@ -15,7 +15,7 @@ public class RoomPropertyMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomPropertyMessageComposer); + this.response.init(Outgoing.roomPropertyMessageComposer); this.response.appendString(this.type); this.response.appendString(this.value); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomQueueStatusMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomQueueStatusMessageComposer.java index 2a198aac..dead98c6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomQueueStatusMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomQueueStatusMessageComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class RoomQueueStatusMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomQueueStatusMessageComposer); + this.response.init(Outgoing.roomQueueStatusMessageComposer); this.response.appendInt(1); //Count { this.response.appendString("TEST"); //Name diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRatingComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRatingComposer.java index 8f6fe2cf..0b65fe9c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRatingComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRatingComposer.java @@ -15,7 +15,7 @@ public class RoomRatingComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomRatingComposer); + this.response.init(Outgoing.roomRatingComposer); this.response.appendInt(this.score); this.response.appendBoolean(this.canVote); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomReadyMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomReadyMessageComposer.java index 004abd94..4e13d686 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomReadyMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomReadyMessageComposer.java @@ -14,7 +14,7 @@ public class RoomReadyMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomReadyMessageComposer); + this.response.init(Outgoing.roomReadyMessageComposer); this.response.appendString(this.room.getLayout().getName()); this.response.appendInt(this.room.getId()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsDataComposer.java index ea1040ce..a4f3da26 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsDataComposer.java @@ -14,7 +14,7 @@ public class RoomSettingsDataComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomSettingsDataComposer); + this.response.init(Outgoing.roomSettingsDataComposer); this.response.appendInt(this.room.getId()); this.response.appendString(this.room.getName()); this.response.appendString(this.room.getDescription()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsSaveErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsSaveErrorComposer.java index f1fa322b..95bca36b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsSaveErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsSaveErrorComposer.java @@ -25,7 +25,7 @@ public class RoomSettingsSaveErrorComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomSettingsSaveErrorComposer); + this.response.init(Outgoing.roomSettingsSaveErrorComposer); this.response.appendInt(this.roomId); this.response.appendInt(this.errorCode); this.response.appendString(this.info); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsSavedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsSavedComposer.java index b6c6ac42..31b80d3f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsSavedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsSavedComposer.java @@ -14,7 +14,7 @@ public class RoomSettingsSavedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomSettingsSavedComposer); + this.response.init(Outgoing.roomSettingsSavedComposer); this.response.appendInt(this.room.getId()); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomVisualizationSettingsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomVisualizationSettingsComposer.java index f5c3fb2a..44a845cc 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomVisualizationSettingsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomVisualizationSettingsComposer.java @@ -14,7 +14,7 @@ public class RoomVisualizationSettingsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomVisualizationSettingsComposer); + this.response.init(Outgoing.roomVisualizationSettingsComposer); this.response.appendBoolean(this.room.isHideWall()); this.response.appendInt(this.room.getWallSize()); this.response.appendInt(this.room.getFloorSize()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/YouAreControllerMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/YouAreControllerMessageComposer.java index 89f8a3ef..1ff3bfd5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/YouAreControllerMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/YouAreControllerMessageComposer.java @@ -14,7 +14,7 @@ public class YouAreControllerMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.YouAreControllerMessageComposer); + this.response.init(Outgoing.youAreControllerMessageComposer); this.response.appendInt(this.type.level); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/YouAreNotControllerMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/YouAreNotControllerMessageComposer.java index 295f8aad..db5cc5d5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/YouAreNotControllerMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/YouAreNotControllerMessageComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class YouAreNotControllerMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.YouAreNotControllerMessageComposer); + this.response.init(Outgoing.youAreNotControllerMessageComposer); return this.response; } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/YouAreOwnerMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/YouAreOwnerMessageComposer.java index ccea4b76..229d30b3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/YouAreOwnerMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/YouAreOwnerMessageComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class YouAreOwnerMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.YouAreOwnerMessageComposer); + this.response.init(Outgoing.youAreOwnerMessageComposer); return this.response; } } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/DiceValueMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/DiceValueMessageComposer.java index c3474188..3360f64e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/DiceValueMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/DiceValueMessageComposer.java @@ -15,7 +15,7 @@ public class DiceValueMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.DiceValueMessageComposer); + this.response.init(Outgoing.diceValueMessageComposer); this.response.appendInt(this.id); this.response.appendInt(this.value); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/FloorItemOnRollerComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/FloorItemOnRollerComposer.java index 4e39a5b0..751d8aef 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/FloorItemOnRollerComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/FloorItemOnRollerComposer.java @@ -46,7 +46,7 @@ public class FloorItemOnRollerComposer extends MessageComposer { short oldX = this.item.getX(); short oldY = this.item.getY(); - this.response.init(Outgoing.SlideObjectBundleMessageComposer); + this.response.init(Outgoing.slideObjectBundleMessageComposer); this.response.appendInt(this.oldLocation != null ? this.oldLocation.x : this.item.getX()); this.response.appendInt(this.oldLocation != null ? this.oldLocation.y : this.item.getY()); this.response.appendInt(this.newLocation.x); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemAddMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemAddMessageComposer.java index 559de05a..5cf6bd80 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemAddMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemAddMessageComposer.java @@ -16,7 +16,7 @@ public class ItemAddMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ItemAddMessageComposer); + this.response.init(Outgoing.itemAddMessageComposer); this.item.serializeWallData(this.response); this.response.appendString(this.itemOwnerName); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemDataUpdateMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemDataUpdateMessageComposer.java index b7444f2a..cdaad108 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemDataUpdateMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemDataUpdateMessageComposer.java @@ -18,7 +18,7 @@ public class ItemDataUpdateMessageComposer extends MessageComposer { this.postIt.setExtradata("FFFF33"); } - this.response.init(Outgoing.ItemDataUpdateMessageComposer); + this.response.init(Outgoing.itemDataUpdateMessageComposer); this.response.appendString(this.postIt.getId() + ""); this.response.appendString(this.postIt.getExtradata()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemRemoveMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemRemoveMessageComposer.java index d48dce53..5ef368b5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemRemoveMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemRemoveMessageComposer.java @@ -14,7 +14,7 @@ public class ItemRemoveMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ItemRemoveMessageComposer); + this.response.init(Outgoing.itemRemoveMessageComposer); this.response.appendString(this.item.getId() + ""); this.response.appendInt(this.item.getUserId()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemUpdateMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemUpdateMessageComposer.java index 7c43c7f1..1cd0c4ef 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemUpdateMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemUpdateMessageComposer.java @@ -14,7 +14,7 @@ public class ItemUpdateMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ItemUpdateMessageComposer); + this.response.init(Outgoing.itemUpdateMessageComposer); this.item.serializeWallData(this.response); this.response.appendString(this.item.getUserId() + ""); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemsComposer.java index f4463abc..d770e9aa 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemsComposer.java @@ -22,7 +22,7 @@ public class ItemsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ItemsComposer); + this.response.init(Outgoing.itemsComposer); THashMap userNames = new THashMap<>(); TIntObjectMap furniOwnerNames = this.room.getFurniOwnerNames(); TIntObjectIterator iterator = furniOwnerNames.iterator(); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemsDataUpdateComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemsDataUpdateComposer.java index a069e1bc..e63edcdc 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemsDataUpdateComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemsDataUpdateComposer.java @@ -16,7 +16,7 @@ public class ItemsDataUpdateComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ObjectsDataUpdateMessageComposer); + this.response.init(Outgoing.objectsDataUpdateMessageComposer); this.response.appendInt(this.items.size()); for (HabboItem item : this.items) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ObjectAddMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ObjectAddMessageComposer.java index 62556402..da86e395 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ObjectAddMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ObjectAddMessageComposer.java @@ -18,7 +18,7 @@ public class ObjectAddMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ObjectAddMessageComposer); + this.response.init(Outgoing.objectAddMessageComposer); this.item.serializeFloorData(this.response); 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); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ObjectDataUpdateMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ObjectDataUpdateMessageComposer.java index cf03094c..0d9242b7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ObjectDataUpdateMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ObjectDataUpdateMessageComposer.java @@ -14,7 +14,7 @@ public class ObjectDataUpdateMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ObjectDataUpdateMessageComposer); + this.response.init(Outgoing.objectDataUpdateMessageComposer); this.response.appendString(this.item.getId() + ""); this.item.serializeExtradata(this.response); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ObjectUpdateMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ObjectUpdateMessageComposer.java index 26afbe4e..17072b06 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ObjectUpdateMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ObjectUpdateMessageComposer.java @@ -16,9 +16,9 @@ public class ObjectUpdateMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ObjectUpdateMessageComposer); + this.response.init(Outgoing.objectUpdateMessageComposer); this.item.serializeFloorData(this.response); - this.response.appendInt(this.item instanceof InteractionGift ? ((((InteractionGift) this.item).getColorId() * 1000) + ((InteractionGift) this.item).getRibbonId()) : (this.item instanceof InteractionMusicDisc ? ((InteractionMusicDisc) this.item).getSongId() : item.isUsable() ? 0 : 0)); + this.response.appendInt(this.item instanceof InteractionGift ? ((((InteractionGift) this.item).getColorId() * 1000) + ((InteractionGift) this.item).getRibbonId()) : (this.item instanceof InteractionMusicDisc ? ((InteractionMusicDisc) this.item).getSongId() : item.isUsable() ? 1 : 0)); this.item.serializeExtradata(this.response); this.response.appendInt(-1); this.response.appendInt(0); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ObjectsMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ObjectsMessageComposer.java index 9702f05c..5cd90fce 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ObjectsMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ObjectsMessageComposer.java @@ -23,7 +23,7 @@ public class ObjectsMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ObjectsMessageComposer); + this.response.init(Outgoing.objectsMessageComposer); TIntObjectIterator iterator = this.furniOwnerNames.iterator(); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/OneWayDoorStatusMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/OneWayDoorStatusMessageComposer.java index e37dfee9..88eed980 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/OneWayDoorStatusMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/OneWayDoorStatusMessageComposer.java @@ -14,7 +14,7 @@ public class OneWayDoorStatusMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.OneWayDoorStatusMessageComposer); + this.response.init(Outgoing.oneWayDoorStatusMessageComposer); this.response.appendInt(this.item.getId()); try { int state = Integer.valueOf(this.item.getExtradata()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PresentOpenedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PresentOpenedMessageComposer.java index 9d4eaea1..c9365c8b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PresentOpenedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PresentOpenedMessageComposer.java @@ -18,7 +18,7 @@ public class PresentOpenedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PresentOpenedMessageComposer); + this.response.init(Outgoing.presentOpenedMessageComposer); this.response.appendString(this.item.getBaseItem().getType().code.toLowerCase()); this.response.appendInt(this.item.getBaseItem().getSpriteId()); this.response.appendString(this.item.getBaseItem().getName()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RemoveFloorItemComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RemoveFloorItemComposer.java index 03ac90e3..71b6b3ac 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RemoveFloorItemComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RemoveFloorItemComposer.java @@ -21,7 +21,7 @@ public class RemoveFloorItemComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ObjectRemoveMessageComposer); + this.response.init(Outgoing.objectRemoveMessageComposer); this.response.appendString(this.item.getId() + ""); this.response.appendBoolean(false); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RequestSpamWallPostItMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RequestSpamWallPostItMessageComposer.java index d351523f..583589cf 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RequestSpamWallPostItMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RequestSpamWallPostItMessageComposer.java @@ -14,7 +14,7 @@ public class RequestSpamWallPostItMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RequestSpamWallPostItMessageComposer); + this.response.init(Outgoing.requestSpamWallPostItMessageComposer); this.response.appendInt(this.item == null ? -1234 : this.item.getId()); this.response.appendString(""); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RoomDimmerPresetsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RoomDimmerPresetsComposer.java index bb6c142a..c79b4a42 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RoomDimmerPresetsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RoomDimmerPresetsComposer.java @@ -15,7 +15,7 @@ public class RoomDimmerPresetsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomDimmerPresetsComposer); + this.response.init(Outgoing.roomDimmerPresetsComposer); this.response.appendInt(3); //PresetCount int index = 1; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/UpdateStackHeightTileHeightComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/UpdateStackHeightTileHeightComposer.java index 2b378c95..6d991303 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/UpdateStackHeightTileHeightComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/UpdateStackHeightTileHeightComposer.java @@ -17,7 +17,7 @@ public class UpdateStackHeightTileHeightComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UpdateStackHeightTileHeightComposer); + this.response.init(Outgoing.updateStackHeightTileHeightComposer); this.response.appendInt(this.item.getId()); this.response.appendInt(this.height); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlaylistFullMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlaylistFullMessageComposer.java index 0f34244a..fac2e7bb 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlaylistFullMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlaylistFullMessageComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class JukeBoxPlaylistFullMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.JukeBoxPlaylistFullMessageComposer); + this.response.init(Outgoing.jukeBoxPlaylistFullMessageComposer); return this.response; } } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeboxSongDisksMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeboxSongDisksMessageComposer.java index 938f4a25..5202fc3c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeboxSongDisksMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeboxSongDisksMessageComposer.java @@ -18,7 +18,7 @@ public class JukeboxSongDisksMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.JukeboxSongDisksMessageComposer); + this.response.init(Outgoing.jukeboxSongDisksMessageComposer); this.response.appendInt(this.totalLength); //Dunno //TODO Total play length? this.response.appendInt(this.songs.size()); for (InteractionMusicDisc soundTrack : this.songs) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/NowPlayingMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/NowPlayingMessageComposer.java index e05cd75b..d1b29028 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/NowPlayingMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/NowPlayingMessageComposer.java @@ -18,7 +18,7 @@ public class NowPlayingMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.NowPlayingMessageComposer); + this.response.init(Outgoing.nowPlayingMessageComposer); if (this.track != null) { this.response.appendInt(this.track.getId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/OfficialSongIdMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/OfficialSongIdMessageComposer.java index 6eb9fda4..8a0ac6f2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/OfficialSongIdMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/OfficialSongIdMessageComposer.java @@ -14,7 +14,7 @@ public class OfficialSongIdMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.OfficialSongIdMessageComposer); + this.response.init(Outgoing.officialSongIdMessageComposer); this.response.appendString(this.track.getCode()); this.response.appendInt(this.track.getId()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/PlayListMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/PlayListMessageComposer.java index 96392626..e4abcb9f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/PlayListMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/PlayListMessageComposer.java @@ -15,7 +15,7 @@ public class PlayListMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PlayListMessageComposer); + this.response.init(Outgoing.playListMessageComposer); int length = 0; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/PlayListSongAddedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/PlayListSongAddedMessageComposer.java index d52f7d81..baaff7de 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/PlayListSongAddedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/PlayListSongAddedMessageComposer.java @@ -14,7 +14,7 @@ public class PlayListSongAddedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PlayListSongAddedMessageComposer); + this.response.init(Outgoing.playListSongAddedMessageComposer); this.response.appendInt(this.track.getId()); this.response.appendInt(this.track.getLength() * 1000); this.response.appendString(this.track.getCode()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/TraxSongInfoMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/TraxSongInfoMessageComposer.java index b0f0e233..1e6d2edd 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/TraxSongInfoMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/TraxSongInfoMessageComposer.java @@ -16,7 +16,7 @@ public class TraxSongInfoMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.TraxSongInfoMessageComposer); + this.response.init(Outgoing.traxSongInfoMessageComposer); this.response.appendInt(this.tracks.size()); for (SoundTrack track : this.tracks) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/UserSongDisksInventoryMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/UserSongDisksInventoryMessageComposer.java index 2f19a090..068f158c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/UserSongDisksInventoryMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/UserSongDisksInventoryMessageComposer.java @@ -17,7 +17,7 @@ public class UserSongDisksInventoryMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UserSongDisksInventoryMessageComposer); + this.response.init(Outgoing.userSongDisksInventoryMessageComposer); this.response.appendInt(this.items.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/FriendFurniCancelLockMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/FriendFurniCancelLockMessageComposer.java index 4aa72235..68e5a3a3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/FriendFurniCancelLockMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/FriendFurniCancelLockMessageComposer.java @@ -14,7 +14,7 @@ public class FriendFurniCancelLockMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FriendFurniCancelLockMessageComposer); + this.response.init(Outgoing.friendFurniCancelLockMessageComposer); this.response.appendInt(this.loveLock.getId()); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/FriendFurniOtherLockConfirmedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/FriendFurniOtherLockConfirmedMessageComposer.java index c972d1ac..139a6e97 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/FriendFurniOtherLockConfirmedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/FriendFurniOtherLockConfirmedMessageComposer.java @@ -14,7 +14,7 @@ public class FriendFurniOtherLockConfirmedMessageComposer extends MessageCompose @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FriendFurniOtherLockConfirmedMessageComposer); + this.response.init(Outgoing.friendFurniOtherLockConfirmedMessageComposer); this.response.appendInt(this.loveLock.getId()); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/FriendFurniStartConfirmationMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/FriendFurniStartConfirmationMessageComposer.java index d7f05ae4..0c18d081 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/FriendFurniStartConfirmationMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/FriendFurniStartConfirmationMessageComposer.java @@ -14,7 +14,7 @@ public class FriendFurniStartConfirmationMessageComposer extends MessageComposer @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FriendFurniStartConfirmationMessageComposer); + this.response.init(Outgoing.friendFurniStartConfirmationMessageComposer); this.response.appendInt(this.loveLock.getId()); this.response.appendBoolean(true); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceRentFailedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceRentFailedMessageComposer.java index 05dcec32..aae98e16 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceRentFailedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceRentFailedMessageComposer.java @@ -13,7 +13,7 @@ public class RentableSpaceRentFailedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RentableSpaceRentFailedMessageComposer); + this.response.init(Outgoing.rentableSpaceRentFailedMessageComposer); this.response.appendInt(this.itemId); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceRentOkMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceRentOkMessageComposer.java index d65c9343..86db86c6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceRentOkMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceRentOkMessageComposer.java @@ -13,7 +13,7 @@ public class RentableSpaceRentOkMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RentableSpaceRentOkMessageComposer); + this.response.init(Outgoing.rentableSpaceRentOkMessageComposer); this.response.appendInt(this.itemId); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceStatusMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceStatusMessageComposer.java index 2bef58fb..18b0fa34 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceStatusMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceStatusMessageComposer.java @@ -42,7 +42,7 @@ public class RentableSpaceStatusMessageComposer extends MessageComposer { if (!(this.item instanceof InteractionRentableSpace)) return null; - this.response.init(Outgoing.RentableSpaceStatusMessageComposer); + this.response.init(Outgoing.rentableSpaceStatusMessageComposer); this.response.appendBoolean(((InteractionRentableSpace) this.item).isRented()); //In Use this.response.appendInt(this.errorCode); //Error code. this.response.appendInt(((InteractionRentableSpace) this.item).getRenterId()); //User ID diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeControlVideoMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeControlVideoMessageComposer.java index 90a4b3d5..8f0569d5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeControlVideoMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeControlVideoMessageComposer.java @@ -15,7 +15,7 @@ public class YoutubeControlVideoMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.YoutubeControlVideoMessageComposer); + this.response.init(Outgoing.youtubeControlVideoMessageComposer); this.response.appendInt(this.furniId); this.response.appendInt(this.state); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeDisplayPlaylistsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeDisplayPlaylistsComposer.java index 5641f216..b7674dd7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeDisplayPlaylistsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeDisplayPlaylistsComposer.java @@ -20,7 +20,7 @@ public class YoutubeDisplayPlaylistsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.YoutubeDisplayPlaylistsComposer); + this.response.init(Outgoing.youtubeDisplayPlaylistsComposer); this.response.appendInt(this.itemId); this.response.appendInt(this.playlists.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeDisplayVideoMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeDisplayVideoMessageComposer.java index 2654b661..a06f8913 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeDisplayVideoMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeDisplayVideoMessageComposer.java @@ -20,7 +20,7 @@ public class YoutubeDisplayVideoMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.YoutubeDisplayVideoMessageComposer); + this.response.init(Outgoing.youtubeDisplayVideoMessageComposer); this.response.appendInt(this.itemId); this.response.appendString(this.video.getId()); this.response.appendInt(this.startTime); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/OpenPetPackageRequestedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/OpenPetPackageRequestedMessageComposer.java index 7fa55990..6b1c382f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/OpenPetPackageRequestedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/OpenPetPackageRequestedMessageComposer.java @@ -14,7 +14,7 @@ public class OpenPetPackageRequestedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.OpenPetPackageRequestedMessageComposer); + this.response.init(Outgoing.openPetPackageRequestedMessageComposer); this.response.appendInt(this.item.getId()); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PerkAllowancesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PerkAllowancesComposer.java index 1e7414a6..66f53c6b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PerkAllowancesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PerkAllowancesComposer.java @@ -23,7 +23,7 @@ public class PerkAllowancesComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.OpenPetPackageResultMessageComposer); + this.response.init(Outgoing.openPetPackageResultMessageComposer); this.response.appendInt(this.itemId); this.response.appendInt(this.errorCode); this.response.appendString(this.errorString); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetExperienceComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetExperienceComposer.java index 91d6c7b3..6b195364 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetExperienceComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetExperienceComposer.java @@ -16,7 +16,7 @@ public class PetExperienceComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PetExperienceComposer); + this.response.init(Outgoing.petExperienceComposer); this.response.appendInt(this.pet.getId()); this.response.appendInt(this.pet.getRoomUnit().getId()); this.response.appendInt(this.amount); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetFigureUpdateComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetFigureUpdateComposer.java index 81b037eb..d3c9a3e3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetFigureUpdateComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetFigureUpdateComposer.java @@ -14,7 +14,7 @@ public class PetFigureUpdateComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PetFigureUpdateComposer); + this.response.init(Outgoing.petFigureUpdateComposer); this.response.appendInt(this.pet.getRoomUnit().getId()); this.response.appendInt(this.pet.getId()); this.response.appendInt(this.pet.getPetData().getType()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetInfoMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetInfoMessageComposer.java index d52a462c..8511657b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetInfoMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetInfoMessageComposer.java @@ -24,8 +24,8 @@ public class PetInfoMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - double days = Math.floor((Emulator.getIntUnixTimestamp() - this.pet.getCreated()) / (3600 * 24)); - this.response.init(Outgoing.PetInfoMessageComposer); + double days = Math.floor((Emulator.getIntUnixTimestamp() - this.pet.getCreated()) / (3600.0 * 24)); + this.response.init(Outgoing.petInfoMessageComposer); this.response.appendInt(this.pet.getId()); this.response.appendString(this.pet.getName()); if (this.pet instanceof MonsterplantPet) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetLevelNotificationComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetLevelNotificationComposer.java index 24a9a4f4..dbf3ad61 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetLevelNotificationComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetLevelNotificationComposer.java @@ -14,7 +14,7 @@ public class PetLevelNotificationComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PetLevelNotificationComposer); + this.response.init(Outgoing.petLevelNotificationComposer); this.response.appendInt(this.pet.getId()); this.response.appendString(this.pet.getName()); this.response.appendInt(this.pet.getLevel()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetLevelUpdatedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetLevelUpdatedComposer.java index 32db9ef1..770e40c1 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetLevelUpdatedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetLevelUpdatedComposer.java @@ -14,7 +14,7 @@ public class PetLevelUpdatedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PetLevelUpdateComposer); + this.response.init(Outgoing.petLevelUpdateComposer); this.response.appendInt(this.pet.getRoomUnit().getId()); this.response.appendInt(this.pet.getId()); this.response.appendInt(this.pet.getLevel()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetRespectFailedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetRespectFailedComposer.java index e561b88a..02a87f16 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetRespectFailedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetRespectFailedComposer.java @@ -15,7 +15,7 @@ public class PetRespectFailedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PetRespectFailedComposer); + this.response.init(Outgoing.petRespectFailedComposer); this.response.appendInt(this.currentAge); this.response.appendInt(this.requiredAge); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetRespectNotificationComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetRespectNotificationComposer.java index 7bbebf81..40820f20 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetRespectNotificationComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetRespectNotificationComposer.java @@ -24,7 +24,7 @@ public class PetRespectNotificationComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PetRespectNotificationComposer); + this.response.init(Outgoing.petRespectNotificationComposer); this.response.appendInt(this.type); this.response.appendInt(100); this.pet.serialize(this.response); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetStatusUpdateComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetStatusUpdateComposer.java index 37549fe6..1c2bdffe 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetStatusUpdateComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetStatusUpdateComposer.java @@ -16,7 +16,7 @@ public class PetStatusUpdateComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PetStatusUpdateComposer); + this.response.init(Outgoing.petStatusUpdateComposer); this.response.appendInt(this.pet.getRoomUnit().getId()); this.response.appendInt(this.pet instanceof RideablePet && ((RideablePet) this.pet).anyoneCanRide() ? 1 : 0); this.response.appendBoolean((this.pet instanceof MonsterplantPet && ((MonsterplantPet) this.pet).canBreed())); //unknown 1 diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetTrainingPanelComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetTrainingPanelComposer.java index f9254269..80f365b0 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetTrainingPanelComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetTrainingPanelComposer.java @@ -22,7 +22,7 @@ public class PetTrainingPanelComposer extends MessageComposer { List enabled = new ArrayList<>(); Collections.sort(this.pet.getPetData().getPetCommands()); - this.response.init(Outgoing.PetTrainingPanelComposer); + this.response.init(Outgoing.petTrainingPanelComposer); this.response.appendInt(this.pet.getId()); this.response.appendInt(this.pet.getPetData().getPetCommands().size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetComposer.java index 56e52bca..ffd6e403 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetComposer.java @@ -22,7 +22,7 @@ public class RoomPetComposer extends MessageComposer implements TIntObjectProced @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UsersComposer); + this.response.init(Outgoing.usersComposer); this.response.appendInt(this.pets.size()); this.pets.forEachEntry(this); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/ConfirmBreedingRequestComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/ConfirmBreedingRequestComposer.java index 35d0daa2..59505529 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/ConfirmBreedingRequestComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/ConfirmBreedingRequestComposer.java @@ -28,7 +28,7 @@ public class ConfirmBreedingRequestComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ConfirmBreedingRequestComposer); + this.response.init(Outgoing.confirmBreedingRequestComposer); this.response.appendInt(this.boxId); this.petOne.serialize(this.response); this.petTwo.serialize(this.response); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/ConfirmBreedingResultComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/ConfirmBreedingResultComposer.java index b4f8be51..35eb6cf0 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/ConfirmBreedingResultComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/ConfirmBreedingResultComposer.java @@ -15,7 +15,7 @@ public class ConfirmBreedingResultComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ConfirmBreedingResultComposer); + this.response.init(Outgoing.confirmBreedingResultComposer); this.response.appendInt(this.anInt1); this.response.appendInt(this.anInt2); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/GoToBreedingNestFailureComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/GoToBreedingNestFailureComposer.java index 39200719..f226b6d7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/GoToBreedingNestFailureComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/GoToBreedingNestFailureComposer.java @@ -21,7 +21,7 @@ public class GoToBreedingNestFailureComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GoToBreedingNestFailureComposer); + this.response.init(Outgoing.goToBreedingNestFailureComposer); this.response.appendInt(this.reason); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/NestBreedingSuccessComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/NestBreedingSuccessComposer.java index b5c30822..8ea74d5a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/NestBreedingSuccessComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/NestBreedingSuccessComposer.java @@ -15,7 +15,7 @@ public class NestBreedingSuccessComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.NestBreedingSuccessComposer); + this.response.init(Outgoing.nestBreedingSuccessComposer); this.response.appendInt(this.type); this.response.appendInt(this.race); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingComposer.java index 8707b629..3c4628c7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingComposer.java @@ -18,7 +18,7 @@ public class PetBreedingComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PetBreedingComposer); + this.response.init(Outgoing.petBreedingComposer); this.response.appendInt(this.state); this.response.appendInt(this.anInt1); this.response.appendInt(this.anInt2); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/RoomAdPurchaseInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/RoomAdPurchaseInfoComposer.java index 7cdc4a31..437f05dd 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/RoomAdPurchaseInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/RoomAdPurchaseInfoComposer.java @@ -20,7 +20,7 @@ public class RoomAdPurchaseInfoComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomAdPurchaseInfoComposer); + this.response.init(Outgoing.roomAdPurchaseInfoComposer); this.response.appendBoolean(true); this.response.appendInt(this.rooms.size()); for (Room room : this.rooms) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/RoomEventComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/RoomEventComposer.java index f5e61f55..da6b9c26 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/RoomEventComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/RoomEventComposer.java @@ -19,7 +19,7 @@ public class RoomEventComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomEventComposer); + this.response.init(Outgoing.roomEventComposer); if (this.room == null || this.roomPromotion == null) { this.response.appendInt(-1); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/AvatarEffectMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/AvatarEffectMessageComposer.java index 799f39a3..7c0ee60d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/AvatarEffectMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/AvatarEffectMessageComposer.java @@ -21,7 +21,7 @@ public class AvatarEffectMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.AvatarEffectMessageComposer); + this.response.init(Outgoing.avatarEffectMessageComposer); this.response.appendInt(this.roomUnit.getId()); this.response.appendInt(this.effectId == -1 ? this.roomUnit.getEffectId() : this.effectId); this.response.appendInt(0); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/CarryObjectMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/CarryObjectMessageComposer.java index f87b8cd7..af8d2209 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/CarryObjectMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/CarryObjectMessageComposer.java @@ -14,7 +14,7 @@ public class CarryObjectMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CarryObjectMessageComposer); + this.response.init(Outgoing.carryObjectMessageComposer); this.response.appendInt(this.roomUnit.getId()); this.response.appendInt(this.roomUnit.getHandItem()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ChangeUserNameResultMessageEvent.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ChangeUserNameResultMessageEvent.java index 855b3122..88e63811 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ChangeUserNameResultMessageEvent.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ChangeUserNameResultMessageEvent.java @@ -14,7 +14,7 @@ public class ChangeUserNameResultMessageEvent extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ChangeUserNameResultMessageEvent); + this.response.init(Outgoing.changeUserNameResultMessageEvent); this.response.appendInt(0); this.response.appendString(this.habbo.getHabboInfo().getUsername()); this.response.appendInt(0); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ChatMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ChatMessageComposer.java index 56af64dd..32ec302e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ChatMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ChatMessageComposer.java @@ -14,7 +14,7 @@ public class ChatMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ChatMessageComposer); + this.response.init(Outgoing.chatMessageComposer); if (this.roomChatMessage.getMessage().isEmpty()) return null; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/DanceMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/DanceMessageComposer.java index 5572eca6..f61f2cf2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/DanceMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/DanceMessageComposer.java @@ -14,7 +14,7 @@ public class DanceMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.DanceMessageComposer); + this.response.init(Outgoing.danceMessageComposer); this.response.appendInt(this.roomUnit.getId()); this.response.appendInt(this.roomUnit.getDanceType().getType()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ExpressionMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ExpressionMessageComposer.java index 3ca1fe64..5ee03e95 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ExpressionMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ExpressionMessageComposer.java @@ -17,7 +17,7 @@ public class ExpressionMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ExpressionMessageComposer); + this.response.init(Outgoing.expressionMessageComposer); this.response.appendInt(this.roomUnit.getId()); this.response.appendInt(this.action.getAction()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/HabboAddGroupBadgesMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/HabboAddGroupBadgesMessageComposer.java index de3687d8..2c81a1c5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/HabboAddGroupBadgesMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/HabboAddGroupBadgesMessageComposer.java @@ -14,7 +14,7 @@ public class HabboAddGroupBadgesMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.HabboGroupBadgesMessageComposer); + this.response.init(Outgoing.habboGroupBadgesMessageComposer); this.response.appendInt(1); this.response.appendInt(this.guild.getId()); this.response.appendString(this.guild.getBadge()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/HabboGroupBadgesMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/HabboGroupBadgesMessageComposer.java index 3a85d5f8..480ff693 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/HabboGroupBadgesMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/HabboGroupBadgesMessageComposer.java @@ -15,7 +15,7 @@ public class HabboGroupBadgesMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.HabboGroupBadgesMessageComposer); + this.response.init(Outgoing.habboGroupBadgesMessageComposer); this.response.appendInt(this.guildBadges.size()); this.guildBadges.forEachEntry(new TObjectObjectProcedure() { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/HandItemReceivedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/HandItemReceivedMessageComposer.java index 37b5a54f..f0f1d25f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/HandItemReceivedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/HandItemReceivedMessageComposer.java @@ -16,7 +16,7 @@ public class HandItemReceivedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.HandItemReceivedMessageComposer); + this.response.init(Outgoing.handItemReceivedMessageComposer); this.response.appendInt(this.from.getId()); this.response.appendInt(this.handItem); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/IgnoreResultMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/IgnoreResultMessageComposer.java index 5c833c99..31026681 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/IgnoreResultMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/IgnoreResultMessageComposer.java @@ -20,7 +20,7 @@ public class IgnoreResultMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.IgnoreResultMessageComposer); + this.response.init(Outgoing.ignoreResultMessageComposer); this.response.appendInt(this.state); this.response.appendString(this.habbo.getHabboInfo().getUsername()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/NoSuchFlatComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/NoSuchFlatComposer.java index 473dc212..f872e15a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/NoSuchFlatComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/NoSuchFlatComposer.java @@ -16,7 +16,7 @@ public class NoSuchFlatComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.NoSuchFlatComposer); + this.response.init(Outgoing.noSuchFlatComposer); this.response.appendInt(this.room.getId()); this.response.appendInt(this.habboId); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUnitOnRollerComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUnitOnRollerComposer.java index bdfa6dc3..151df5ff 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUnitOnRollerComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUnitOnRollerComposer.java @@ -53,7 +53,7 @@ public class RoomUnitOnRollerComposer extends MessageComposer { if (!this.room.isLoaded()) return null; - this.response.init(Outgoing.SlideObjectBundleMessageComposer); + this.response.init(Outgoing.slideObjectBundleMessageComposer); this.response.appendInt(this.oldLocation.x); this.response.appendInt(this.oldLocation.y); this.response.appendInt(this.newLocation.x); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRespectComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRespectComposer.java index 4e807eef..7e8945bb 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRespectComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRespectComposer.java @@ -14,7 +14,7 @@ public class RoomUserRespectComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomUserRespectComposer); + this.response.init(Outgoing.roomUserRespectComposer); this.response.appendInt(this.habbo.getHabboInfo().getId()); this.response.appendInt(this.habbo.getHabboStats().respectPointsReceived); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersComposer.java index dce83f2a..a1c6ea26 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersComposer.java @@ -34,7 +34,7 @@ public class RoomUsersComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UsersComposer); + this.response.init(Outgoing.usersComposer); if (this.habbo != null) { this.response.appendInt(1); this.response.appendInt(this.habbo.getHabboInfo().getId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ShoutMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ShoutMessageComposer.java index d51915d3..d1843236 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ShoutMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ShoutMessageComposer.java @@ -17,7 +17,7 @@ public class ShoutMessageComposer extends MessageComposer { if (this.roomChatMessage.getMessage().isEmpty()) return null; - this.response.init(Outgoing.ShoutMessageComposer); + this.response.init(Outgoing.shoutMessageComposer); this.roomChatMessage.serialize(this.response); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/SleepMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/SleepMessageComposer.java index fb4002f4..582f851f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/SleepMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/SleepMessageComposer.java @@ -14,7 +14,7 @@ public class SleepMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.SleepMessageComposer); + this.response.init(Outgoing.sleepMessageComposer); this.response.appendInt(this.roomUnit.getId()); this.response.appendBoolean(this.roomUnit.isIdle()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserChangeMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserChangeMessageComposer.java index 9dba6f42..9b73a4e5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserChangeMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserChangeMessageComposer.java @@ -14,7 +14,7 @@ public class UserChangeMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UserChangeMessageComposer); + this.response.init(Outgoing.userChangeMessageComposer); this.response.appendInt(this.habbo.getRoomUnit() == null ? -1 : this.habbo.getRoomUnit().getId()); this.response.appendString(this.habbo.getHabboInfo().getLook()); this.response.appendString(this.habbo.getHabboInfo().getGender().name() + ""); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserNameChangedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserNameChangedMessageComposer.java index 68881709..5953a118 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserNameChangedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserNameChangedMessageComposer.java @@ -30,7 +30,7 @@ public class UserNameChangedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UserNameChangedMessageComposer); + this.response.init(Outgoing.userNameChangedMessageComposer); this.response.appendInt(this.userId); this.response.appendInt(this.roomId); this.response.appendString(this.name); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserRemoveMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserRemoveMessageComposer.java index 787a0b99..7859c1e1 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserRemoveMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserRemoveMessageComposer.java @@ -14,7 +14,7 @@ public class UserRemoveMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UserRemoveMessageComposer); + this.response.init(Outgoing.userRemoveMessageComposer); this.response.appendString(this.roomUnit.getId() + ""); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserTagsMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserTagsMessageComposer.java index 033d8f6b..e3400ea1 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserTagsMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserTagsMessageComposer.java @@ -14,7 +14,7 @@ public class UserTagsMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UserTagsMessageComposer); + this.response.init(Outgoing.userTagsMessageComposer); this.response.appendInt(this.habbo.getRoomUnit().getId()); this.response.appendInt(this.habbo.getHabboStats().tags.length); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserTypingMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserTypingMessageComposer.java index 12a437b4..489a55d7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserTypingMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserTypingMessageComposer.java @@ -16,7 +16,7 @@ public class UserTypingMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UserTypingMessageComposer); + this.response.init(Outgoing.userTypingMessageComposer); this.response.appendInt(this.roomUnit.getId()); this.response.appendInt(this.typing ? 1 : 0); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserUnbannedFromRoomComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserUnbannedFromRoomComposer.java index ff4def17..5e0cc0f1 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserUnbannedFromRoomComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserUnbannedFromRoomComposer.java @@ -16,7 +16,7 @@ public class UserUnbannedFromRoomComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UserUnbannedFromRoomComposer); + this.response.init(Outgoing.userUnbannedFromRoomComposer); this.response.appendInt(this.room.getId()); this.response.appendInt(this.userId); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserUpdateComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserUpdateComposer.java index 8494a3b6..91ab1784 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserUpdateComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/UserUpdateComposer.java @@ -36,7 +36,7 @@ public class UserUpdateComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UserUpdateComposer); + this.response.init(Outgoing.userUpdateComposer); if (this.roomUnits != null) { this.response.appendInt(this.roomUnits.size()); for (RoomUnit roomUnit : this.roomUnits) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/WhisperMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/WhisperMessageComposer.java index 213e92ab..bda7ee34 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/WhisperMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/WhisperMessageComposer.java @@ -17,7 +17,7 @@ public class WhisperMessageComposer extends MessageComposer { if (this.roomChatMessage.getMessage().isEmpty()) return null; - this.response.init(Outgoing.WhisperMessageComposer); + this.response.init(Outgoing.whisperMessageComposer); this.roomChatMessage.serialize(this.response); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeCloseWindowComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeCloseWindowComposer.java index 225abef7..15a1c785 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeCloseWindowComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeCloseWindowComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class TradeCloseWindowComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.TradeCloseWindowComposer); + this.response.init(Outgoing.tradeCloseWindowComposer); return this.response; } } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingAcceptComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingAcceptComposer.java index fc8ffccd..463f22e0 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingAcceptComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingAcceptComposer.java @@ -14,7 +14,7 @@ public class TradingAcceptComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.TradingAcceptComposer); + this.response.init(Outgoing.tradingAcceptComposer); this.response.appendInt(this.tradeUser.getUserId()); this.response.appendInt(this.tradeUser.getAccepted()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingCloseComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingCloseComposer.java index ea5f0e2c..67100fb2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingCloseComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingCloseComposer.java @@ -18,7 +18,7 @@ public class TradingCloseComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.TradingCloseComposer); + this.response.init(Outgoing.tradingCloseComposer); this.response.appendInt(this.userId); this.response.appendInt(this.errorCode); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingConfirmationComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingConfirmationComposer.java index f61ce7c8..9e145f76 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingConfirmationComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingConfirmationComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class TradingConfirmationComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.TradingConfirmationComposer); + this.response.init(Outgoing.tradingConfirmationComposer); return this.response; } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingItemListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingItemListComposer.java index 8c290573..111d49f3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingItemListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingItemListComposer.java @@ -17,7 +17,7 @@ public class TradingItemListComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.TradingItemListComposer); + this.response.init(Outgoing.tradingItemListComposer); for (RoomTradeUser roomTradeUser : this.roomTrade.getRoomTradeUsers()) { this.response.appendInt(roomTradeUser.getUserId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingNotOpenComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingNotOpenComposer.java index 58ae7c28..4c78929f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingNotOpenComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingNotOpenComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class TradingNotOpenComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.TradingNotOpenComposer); + this.response.init(Outgoing.tradingNotOpenComposer); return this.response; } } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingOpenComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingOpenComposer.java index 6287ac2e..0efa92a8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingOpenComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingOpenComposer.java @@ -22,7 +22,7 @@ public class TradingOpenComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.TradingOpenComposer); + this.response.init(Outgoing.tradingOpenComposer); for (RoomTradeUser tradeUser : this.roomTrade.getRoomTradeUsers()) { this.response.appendInt(tradeUser.getHabbo().getHabboInfo().getId()); this.response.appendInt(this.state); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingOpenFailedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingOpenFailedComposer.java index f8dd724f..4869e128 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingOpenFailedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingOpenFailedComposer.java @@ -26,7 +26,7 @@ public class TradingOpenFailedComposer extends MessageComposer { } protected ServerMessage composeInternal() { - this.response.init(Outgoing.TradingOpenFailedComposer); + this.response.init(Outgoing.tradingOpenFailedComposer); this.response.appendInt(this.code); this.response.appendString(this.username); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingOtherNotAllowedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingOtherNotAllowedComposer.java index b3289589..79368bb9 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingOtherNotAllowedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingOtherNotAllowedComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class TradingOtherNotAllowedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.TradingOtherNotAllowedComposer); + this.response.init(Outgoing.tradingOtherNotAllowedComposer); return this.response; } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingYouAreNotAllowedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingYouAreNotAllowedComposer.java index 52b8743e..1154b145 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingYouAreNotAllowedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingYouAreNotAllowedComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class TradingYouAreNotAllowedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.TradingYouAreNotAllowedComposer); + this.response.init(Outgoing.tradingYouAreNotAllowedComposer); return this.response; } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/AcceptFriendResultComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/AcceptFriendResultComposer.java index 159fd715..4caf6901 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/AcceptFriendResultComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/AcceptFriendResultComposer.java @@ -15,7 +15,7 @@ public class AcceptFriendResultComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.AcceptFriendResultComposer); + this.response.init(Outgoing.acceptFriendResultComposer); this.response.appendInt(this.errors.size()); for (Map.Entry entry : this.errors.entrySet()) { this.response.appendInt(entry.getKey()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/AccountSafetyLockStatusChangeMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/AccountSafetyLockStatusChangeMessageComposer.java index 25da340a..e3e32823 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/AccountSafetyLockStatusChangeMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/AccountSafetyLockStatusChangeMessageComposer.java @@ -16,7 +16,7 @@ public class AccountSafetyLockStatusChangeMessageComposer extends MessageCompose @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.AccountSafetyLockStatusChangeMessageComposer); + this.response.init(Outgoing.accountSafetyLockStatusChangeMessageComposer); this.response.appendInt(this.status); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/AvatarEffectSelectedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/AvatarEffectSelectedMessageComposer.java index 17c7f7fd..891e9672 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/AvatarEffectSelectedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/AvatarEffectSelectedMessageComposer.java @@ -13,7 +13,7 @@ public class AvatarEffectSelectedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.AvatarEffectSelectedMessageComposer); + this.response.init(Outgoing.avatarEffectSelectedMessageComposer); this.response.appendInt(this.type); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/BotSkillListUpdateComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/BotSkillListUpdateComposer.java index dbb859a7..db9e6bc8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/BotSkillListUpdateComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/BotSkillListUpdateComposer.java @@ -17,7 +17,7 @@ public class BotSkillListUpdateComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.BotSkillListUpdateComposer); + this.response.init(Outgoing.botSkillListUpdateComposer); this.response.appendInt(this.unknownInt1); this.response.appendInt(this.unknownMap.size()); for (Map.Entry entry : this.unknownMap.entrySet()) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/BuildersClubSubscriptionStatusMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/BuildersClubSubscriptionStatusMessageComposer.java index f60e3f80..e78750ee 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/BuildersClubSubscriptionStatusMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/BuildersClubSubscriptionStatusMessageComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class BuildersClubSubscriptionStatusMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.BuildersClubSubscriptionStatusMessageComposer); + this.response.init(Outgoing.buildersClubSubscriptionStatusMessageComposer); this.response.appendInt(Integer.MAX_VALUE); this.response.appendInt(0); this.response.appendInt(100); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/CallForHelpPendingCallsDeletedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/CallForHelpPendingCallsDeletedMessageComposer.java index 257986a2..f1ba25bb 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/CallForHelpPendingCallsDeletedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/CallForHelpPendingCallsDeletedMessageComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class CallForHelpPendingCallsDeletedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CallForHelpPendingCallsDeletedMessageComposer); + this.response.init(Outgoing.callForHelpPendingCallsDeletedMessageComposer); //Empty body return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/CfhSanctionMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/CfhSanctionMessageComposer.java index b6eed87c..3080d217 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/CfhSanctionMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/CfhSanctionMessageComposer.java @@ -18,7 +18,7 @@ public class CfhSanctionMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CfhSanctionMessageComposer); + this.response.init(Outgoing.cfhSanctionMessageComposer); this.response.appendInt(this.unknownInt1); this.response.appendInt(this.accountId); this.sanction.serialize(this.response); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ChangeEmailResultComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ChangeEmailResultComposer.java index 1c9a3988..2de35fb4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ChangeEmailResultComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ChangeEmailResultComposer.java @@ -13,7 +13,7 @@ public class ChangeEmailResultComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ChangeEmailResultComposer); + this.response.init(Outgoing.changeEmailResultComposer); this.response.appendInt(this.result); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/CitizenshipVipOfferPromoEnabledComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/CitizenshipVipOfferPromoEnabledComposer.java index 6901afb6..e2f1e91e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/CitizenshipVipOfferPromoEnabledComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/CitizenshipVipOfferPromoEnabledComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class CitizenshipVipOfferPromoEnabledComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CitizenshipVipOfferPromoEnabledComposer); + this.response.init(Outgoing.citizenshipVipOfferPromoEnabledComposer); //Empty Body return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/CompetitionEntrySubmitResultComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/CompetitionEntrySubmitResultComposer.java index 36db1a94..1f2d2991 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/CompetitionEntrySubmitResultComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/CompetitionEntrySubmitResultComposer.java @@ -23,7 +23,7 @@ public class CompetitionEntrySubmitResultComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CompetitionEntrySubmitResultComposer); + this.response.init(Outgoing.competitionEntrySubmitResultComposer); this.response.appendInt(this.unknownInt1); this.response.appendString(this.unknownString1); this.response.appendInt(this.result); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/CompetitionVotingInfoMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/CompetitionVotingInfoMessageComposer.java index 5927b4b7..0a70f7b0 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/CompetitionVotingInfoMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/CompetitionVotingInfoMessageComposer.java @@ -19,7 +19,7 @@ public class CompetitionVotingInfoMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CompetitionVotingInfoMessageComposer); + this.response.init(Outgoing.competitionVotingInfoMessageComposer); this.response.appendInt(this.unknownInt1); this.response.appendString(this.unknownString1); this.response.appendInt(this.unknownInt2); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ConvertedRoomIdComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ConvertedRoomIdComposer.java index 74362c16..25f2c302 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ConvertedRoomIdComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ConvertedRoomIdComposer.java @@ -15,7 +15,7 @@ public class ConvertedRoomIdComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ConvertedRoomIdComposer); + this.response.init(Outgoing.convertedRoomIdComposer); this.response.appendString(this.unknownString1); this.response.appendInt(this.unknownInt1); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/DisconnectReasonComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/DisconnectReasonComposer.java index 7e81c378..9507a7b7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/DisconnectReasonComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/DisconnectReasonComposer.java @@ -13,7 +13,7 @@ public class DisconnectReasonComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.DisconnectReasonComposer); + this.response.init(Outgoing.disconnectReasonComposer); this.response.appendInt(this.errorCode); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ElementPointerMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ElementPointerMessageComposer.java index bce89bd7..c381c108 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ElementPointerMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ElementPointerMessageComposer.java @@ -13,7 +13,7 @@ public class ElementPointerMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ElementPointerMessageComposer); + this.response.init(Outgoing.elementPointerMessageComposer); this.response.appendString(this.key); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/EmailStatusResultComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/EmailStatusResultComposer.java index 70826d54..3b944442 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/EmailStatusResultComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/EmailStatusResultComposer.java @@ -17,7 +17,7 @@ public class EmailStatusResultComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.EmailStatusResultComposer); + this.response.init(Outgoing.emailStatusResultComposer); this.response.appendString(this.email); this.response.appendBoolean(this.unknownB1); this.response.appendBoolean(this.unknownB2); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/EpicPopupMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/EpicPopupMessageComposer.java index c487013b..48172c6c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/EpicPopupMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/EpicPopupMessageComposer.java @@ -14,7 +14,7 @@ public class EpicPopupMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.EpicPopupMessageComposer); + this.response.init(Outgoing.epicPopupMessageComposer); this.response.appendString(this.assetURI); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ExtendedProfileChangedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ExtendedProfileChangedMessageComposer.java index 19b7dc9f..2bdee081 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ExtendedProfileChangedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ExtendedProfileChangedMessageComposer.java @@ -13,7 +13,7 @@ public class ExtendedProfileChangedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ExtendedProfileChangedMessageComposer); + this.response.init(Outgoing.extendedProfileChangedMessageComposer); this.response.appendInt(this.userId); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/FurniRentOrBuyoutOfferMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/FurniRentOrBuyoutOfferMessageComposer.java index 6293f7b5..22b5b0a6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/FurniRentOrBuyoutOfferMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/FurniRentOrBuyoutOfferMessageComposer.java @@ -23,7 +23,7 @@ public class FurniRentOrBuyoutOfferMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FurniRentOrBuyoutOfferMessageComposer); + this.response.init(Outgoing.furniRentOrBuyoutOfferMessageComposer); this.response.appendBoolean(this.unknownBoolean1); this.response.appendString(this.unknownString1); this.response.appendBoolean(this.unknownBoolean2); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/FurnitureAliasesMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/FurnitureAliasesMessageComposer.java index 91a25966..aa214d0a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/FurnitureAliasesMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/FurnitureAliasesMessageComposer.java @@ -15,7 +15,7 @@ public class FurnitureAliasesMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FurnitureAliasesMessageComposer); + this.response.init(Outgoing.furnitureAliasesMessageComposer); this.response.appendInt(this.unknownMap.size()); for (Map.Entry entry : this.unknownMap.entrySet()) { this.response.appendString(entry.getKey()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/GroupDetailsChangedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/GroupDetailsChangedMessageComposer.java index e27c29f1..be08f2d9 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/GroupDetailsChangedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/GroupDetailsChangedMessageComposer.java @@ -13,7 +13,7 @@ public class GroupDetailsChangedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.GroupDetailsChangedMessageComposer); + this.response.init(Outgoing.groupDetailsChangedMessageComposer); this.response.appendInt(this.guildId); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/HabboClubExtendOfferMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/HabboClubExtendOfferMessageComposer.java index 487a8003..c691bec4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/HabboClubExtendOfferMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/HabboClubExtendOfferMessageComposer.java @@ -25,7 +25,7 @@ public class HabboClubExtendOfferMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.HabboClubExtendOfferMessageComposer); + this.response.init(Outgoing.habboClubExtendOfferMessageComposer); this.offer.serialize(this.response, this.habbo.getHabboStats().getClubExpireTimestamp()); this.response.appendInt(this.normalCreditCost); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/IdentityAccountsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/IdentityAccountsComposer.java index dc0c549e..25d8f4cc 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/IdentityAccountsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/IdentityAccountsComposer.java @@ -15,7 +15,7 @@ public class IdentityAccountsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.IdentityAccountsComposer); + this.response.init(Outgoing.identityAccountsComposer); this.response.appendInt(this.unknownMap.size()); for (Map.Entry entry : this.unknownMap.entrySet()) { this.response.appendInt(entry.getKey()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/IgnoredUsersMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/IgnoredUsersMessageComposer.java index 9b4f4c53..90fa161c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/IgnoredUsersMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/IgnoredUsersMessageComposer.java @@ -16,7 +16,7 @@ public class IgnoredUsersMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.IgnoredUsersMessageComposer); + this.response.init(Outgoing.ignoredUsersMessageComposer); this.response.appendInt(0); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/IssueDeletedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/IssueDeletedMessageComposer.java index fdb1a345..56b6dcc6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/IssueDeletedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/IssueDeletedMessageComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class IssueDeletedMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.IssueDeletedMessageComposer); + this.response.init(Outgoing.issueDeletedMessageComposer); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/MiniMailNewMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/MiniMailNewMessageComposer.java index 8a8be06b..985e5bee 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/MiniMailNewMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/MiniMailNewMessageComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class MiniMailNewMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.MiniMailNewMessageComposer); + this.response.init(Outgoing.miniMailNewMessageComposer); return this.response; } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/OfferRewardDeliveredMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/OfferRewardDeliveredMessageComposer.java index 9c631681..85a2ea32 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/OfferRewardDeliveredMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/OfferRewardDeliveredMessageComposer.java @@ -14,7 +14,7 @@ public class OfferRewardDeliveredMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.OfferRewardDeliveredMessageComposer); + this.response.init(Outgoing.offerRewardDeliveredMessageComposer); this.response.appendString(this.item.getType().code); this.response.appendInt(this.item.getId()); this.response.appendString(this.item.getName()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/PetSupplementedNotificationComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/PetSupplementedNotificationComposer.java index 2cb0b0ba..73240865 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/PetSupplementedNotificationComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/PetSupplementedNotificationComposer.java @@ -17,7 +17,7 @@ public class PetSupplementedNotificationComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PetSupplementedNotificationComposer); + this.response.init(Outgoing.petSupplementedNotificationComposer); this.response.appendInt(this.unknownInt1); this.response.appendInt(this.userId); this.response.appendInt(this.unknownInt2); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/PollErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/PollErrorComposer.java index 1c532dba..3f41d5cd 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/PollErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/PollErrorComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class PollErrorComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PollErrorComposer); + this.response.init(Outgoing.pollErrorComposer); //EMpty Body return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/PostItPlacedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/PostItPlacedComposer.java index fe91615a..ef2c7249 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/PostItPlacedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/PostItPlacedComposer.java @@ -16,7 +16,7 @@ public class PostItPlacedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PostItPlacedComposer); + this.response.init(Outgoing.postItPlacedComposer); this.response.appendInt(this.item.getId()); this.response.appendInt(this.unknownInt); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/QuizResultsMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/QuizResultsMessageComposer.java index ed822f6c..a89a7490 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/QuizResultsMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/QuizResultsMessageComposer.java @@ -17,7 +17,7 @@ public class QuizResultsMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.QuizResultsMessageComposer); + this.response.init(Outgoing.quizResultsMessageComposer); this.response.appendString(this.unknownString); this.response.appendInt(this.unknownIntegerList.size()); for (Integer i : this.unknownIntegerList) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RestoreClientMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RestoreClientMessageComposer.java index 9e144230..f98fec72 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RestoreClientMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RestoreClientMessageComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class RestoreClientMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RestoreClientMessageComposer); + this.response.init(Outgoing.restoreClientMessageComposer); //Empty body return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomAdErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomAdErrorComposer.java index 0fb0752b..3fa1bea5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomAdErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomAdErrorComposer.java @@ -15,7 +15,7 @@ public class RoomAdErrorComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomAdErrorComposer); + this.response.init(Outgoing.roomAdErrorComposer); this.response.appendInt(this.errorCode); this.response.appendString(this.unknownString); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomEventCancelComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomEventCancelComposer.java index 61e5deec..ea44ad84 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomEventCancelComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomEventCancelComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class RoomEventCancelComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomEventCancelComposer); + this.response.init(Outgoing.roomEventCancelComposer); //Empty Body return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomMessageNotificationMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomMessageNotificationMessageComposer.java index 5a0e2e16..5227ffab 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomMessageNotificationMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomMessageNotificationMessageComposer.java @@ -16,7 +16,7 @@ public class RoomMessageNotificationMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomMessageNotificationMessageComposer); + this.response.init(Outgoing.roomMessageNotificationMessageComposer); this.response.appendInt(this.room.getId()); this.response.appendString(this.room.getName()); this.response.appendInt(this.count); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomUserQuestionAnsweredComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomUserQuestionAnsweredComposer.java index 3bd9a877..b8493fa3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomUserQuestionAnsweredComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomUserQuestionAnsweredComposer.java @@ -19,7 +19,7 @@ public class RoomUserQuestionAnsweredComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RoomUserQuestionAnsweredComposer); + this.response.init(Outgoing.roomUserQuestionAnsweredComposer); this.response.appendInt(this.userId); this.response.appendString(this.value); this.response.appendInt(this.unknownMap.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SeasonalCalendarDailyOfferMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SeasonalCalendarDailyOfferMessageComposer.java index 335b5cdb..106585ba 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SeasonalCalendarDailyOfferMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SeasonalCalendarDailyOfferMessageComposer.java @@ -16,7 +16,7 @@ public class SeasonalCalendarDailyOfferMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.SeasonalCalendarDailyOfferMessageComposer); + this.response.init(Outgoing.seasonalCalendarDailyOfferMessageComposer); this.response.appendInt(this.pageId); this.catalogItem.serialize(this.response); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ShowEnforceRoomCategoryDialogComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ShowEnforceRoomCategoryDialogComposer.java index a65efc9f..f269f31a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ShowEnforceRoomCategoryDialogComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ShowEnforceRoomCategoryDialogComposer.java @@ -13,7 +13,7 @@ public class ShowEnforceRoomCategoryDialogComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ShowEnforceRoomCategoryDialogComposer); + this.response.init(Outgoing.showEnforceRoomCategoryDialogComposer); this.response.appendInt(this.unknownInt1); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/TargetedOfferNotFoundComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/TargetedOfferNotFoundComposer.java index 46cd138d..df128382 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/TargetedOfferNotFoundComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/TargetedOfferNotFoundComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class TargetedOfferNotFoundComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.TargetedOfferNotFoundComposer); + this.response.init(Outgoing.targetedOfferNotFoundComposer); //Empty body return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownAdManagerComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownAdManagerComposer.java index 4f145e1e..13832c30 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownAdManagerComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownAdManagerComposer.java @@ -13,7 +13,7 @@ public class UnknownAdManagerComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.InterstitialMessageComposer); + this.response.init(Outgoing.interstitialMessageComposer); this.response.appendBoolean(this.unknownBoolean); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownComposer4.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownComposer4.java index 780db475..d5494ee6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownComposer4.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownComposer4.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class UnknownComposer4 extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.IsFirstLoginOfDayComposer); + this.response.init(Outgoing.isFirstLoginOfDayComposer); this.response.appendBoolean(false); //Think something related to promo. Not sure though. return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownMessengerErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownMessengerErrorComposer.java index 6eefc7a7..4a414354 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownMessengerErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownMessengerErrorComposer.java @@ -17,7 +17,7 @@ public class UnknownMessengerErrorComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.InstantMessageErrorComposer); + this.response.init(Outgoing.instantMessageErrorComposer); this.response.appendInt(this.errorCode); this.response.appendInt(this.userId); this.response.appendString(this.message); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownPollQuestionComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownPollQuestionComposer.java index 0f48d296..b4eb89a8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownPollQuestionComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownPollQuestionComposer.java @@ -17,7 +17,7 @@ public class UnknownPollQuestionComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.QuestionFinishedComposer); + this.response.init(Outgoing.questionFinishedComposer); this.response.appendInt(this.unknownInt); this.response.appendInt(this.unknownMap.size()); for (Map.Entry entry : this.unknownMap.entrySet()) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UserClassificationMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UserClassificationMessageComposer.java index 3d7e5b22..5e19db28 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UserClassificationMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UserClassificationMessageComposer.java @@ -16,7 +16,7 @@ public class UserClassificationMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UserClassificationMessageComposer); + this.response.init(Outgoing.userClassificationMessageComposer); this.response.appendInt(this.info.size()); for (Pair> set : this.info) { this.response.appendInt(set.getKey()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftChangeEmailResultComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftChangeEmailResultComposer.java index f84d4a47..7a86bb02 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftChangeEmailResultComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftChangeEmailResultComposer.java @@ -18,7 +18,7 @@ public class WelcomeGiftChangeEmailResultComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.WelcomeGiftChangeEmailResultComposer); + this.response.init(Outgoing.welcomeGiftChangeEmailResultComposer); this.response.appendInt(this.error); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftStatusComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftStatusComposer.java index be700a6b..2204f439 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftStatusComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftStatusComposer.java @@ -21,7 +21,7 @@ public class WelcomeGiftStatusComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.WelcomeGiftStatusComposer); + this.response.init(Outgoing.welcomeGiftStatusComposer); this.response.appendString(this.email); this.response.appendBoolean(this.unknownB1); this.response.appendBoolean(this.unknownB2); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/YouAreSpectatorMessageEvent.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/YouAreSpectatorMessageEvent.java index 6f0eb63a..9a9bb02f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/YouAreSpectatorMessageEvent.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/YouAreSpectatorMessageEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class YouAreSpectatorMessageEvent extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.YouAreSpectatorMessageEvent); + this.response.init(Outgoing.youAreSpectatorMessageEvent); //Empty body return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/AccountPreferencesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/AccountPreferencesComposer.java index a2cb0242..91586605 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/AccountPreferencesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/AccountPreferencesComposer.java @@ -14,7 +14,7 @@ public class AccountPreferencesComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.AccountPreferencesComposer); + this.response.init(Outgoing.accountPreferencesComposer); this.response.appendInt(this.habbo.getHabboStats().volumeSystem); this.response.appendInt(this.habbo.getHabboStats().volumeFurni); this.response.appendInt(this.habbo.getHabboStats().volumeTrax); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/AchievementsScoreComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/AchievementsScoreComposer.java index ab7f7a72..a1dd2c37 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/AchievementsScoreComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/AchievementsScoreComposer.java @@ -14,7 +14,7 @@ public class AchievementsScoreComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.AchievementsScoreComposer); + this.response.init(Outgoing.achievementsScoreComposer); this.response.appendInt(this.habbo.getHabboStats().getAchievementScore()); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/ActivityPointsMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/ActivityPointsMessageComposer.java index 8bd2be0f..b3221865 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/ActivityPointsMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/ActivityPointsMessageComposer.java @@ -19,7 +19,7 @@ public class ActivityPointsMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ActivityPointsMessageComposer); + this.response.init(Outgoing.activityPointsMessageComposer); String[] pointsTypes = Emulator.getConfig().getValue("seasonal.types").split(";"); this.response.appendInt(pointsTypes.length); for (String s : pointsTypes) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/BadgeReceivedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/BadgeReceivedComposer.java index 97a28f44..296d87ba 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/BadgeReceivedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/BadgeReceivedComposer.java @@ -14,7 +14,7 @@ public class BadgeReceivedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.BadgeReceivedComposer); + this.response.init(Outgoing.badgeReceivedComposer); this.response.appendInt(this.badge.getId()); this.response.appendString(this.badge.getCode()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/CheckUserNameResultMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/CheckUserNameResultMessageComposer.java index 34ca358e..77cc794a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/CheckUserNameResultMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/CheckUserNameResultMessageComposer.java @@ -26,7 +26,7 @@ public class CheckUserNameResultMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CheckUserNameResultMessageComposer); + this.response.init(Outgoing.checkUserNameResultMessageComposer); this.response.appendInt(this.status); this.response.appendString(this.name); this.response.appendInt(this.suggestions.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/ClubGiftSelectedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/ClubGiftSelectedComposer.java index 84d64b96..17d04d65 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/ClubGiftSelectedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/ClubGiftSelectedComposer.java @@ -18,7 +18,7 @@ public class ClubGiftSelectedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ClubGiftSelectedComposer); + this.response.init(Outgoing.clubGiftSelectedComposer); this.response.appendString(this.name); this.response.appendInt(this.items.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/CreditBalanceComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/CreditBalanceComposer.java index 10406977..56c8586b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/CreditBalanceComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/CreditBalanceComposer.java @@ -14,7 +14,7 @@ public class CreditBalanceComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.CreditBalanceComposer); + this.response.init(Outgoing.creditBalanceComposer); this.response.appendString(this.habbo.getHabboInfo().getCredits() + ".0"); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/ExtendedProfileMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/ExtendedProfileMessageComposer.java index 637b7f87..e1d53f2d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/ExtendedProfileMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/ExtendedProfileMessageComposer.java @@ -44,7 +44,7 @@ public class ExtendedProfileMessageComposer extends MessageComposer { if (this.habboInfo == null) return null; - this.response.init(Outgoing.ExtendedProfileMessageComposer); + this.response.init(Outgoing.extendedProfileMessageComposer); this.response.appendInt(this.habboInfo.getId()); this.response.appendString(this.habboInfo.getUsername()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/FavouriteChangedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/FavouriteChangedComposer.java index 8bc84d51..2752cad9 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/FavouriteChangedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/FavouriteChangedComposer.java @@ -16,7 +16,7 @@ public class FavouriteChangedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FavouritesComposer); + this.response.init(Outgoing.favouritesComposer); this.response.appendInt(Emulator.getConfig().getInt("hotel.rooms.max.favorite")); this.response.appendInt(this.habbo.getHabboStats().getFavoriteRooms().size()); this.habbo.getHabboStats().getFavoriteRooms().forEach(new TIntProcedure() { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/FigureSetIdsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/FigureSetIdsComposer.java index c2bd6927..448b5100 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/FigureSetIdsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/FigureSetIdsComposer.java @@ -35,7 +35,7 @@ public class FigureSetIdsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FigureSetIdsComposer); + this.response.init(Outgoing.figureSetIdsComposer); this.response.appendInt(this.idList.size()); this.idList.forEach(this.response::appendInt); this.response.appendInt(this.nameList.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/FigureUpdateComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/FigureUpdateComposer.java index 903dc4b2..fe6d300f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/FigureUpdateComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/FigureUpdateComposer.java @@ -14,7 +14,7 @@ public class FigureUpdateComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.FigureUpdateComposer); + this.response.init(Outgoing.figureUpdateComposer); this.response.appendString(this.habbo.getHabboInfo().getLook()); this.response.appendString(this.habbo.getHabboInfo().getGender().name()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/HabboActivityPointNotificationMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/HabboActivityPointNotificationMessageComposer.java index ee99e9f9..0076d582 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/HabboActivityPointNotificationMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/HabboActivityPointNotificationMessageComposer.java @@ -17,7 +17,7 @@ public class HabboActivityPointNotificationMessageComposer extends MessageCompos @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.HabboActivityPointNotificationMessageComposer); + this.response.init(Outgoing.habboActivityPointNotificationMessageComposer); this.response.appendInt(this.currentAmount); this.response.appendInt(this.amountAdded); this.response.appendInt(this.type); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/NavigatorSettingsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/NavigatorSettingsComposer.java index 1f6adea7..54ec1f07 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/NavigatorSettingsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/NavigatorSettingsComposer.java @@ -15,7 +15,7 @@ public class NavigatorSettingsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.NavigatorSettingsComposer); + this.response.init(Outgoing.navigatorSettingsComposer); this.response.appendInt(this.homeRoom); this.response.appendInt(this.roomToEnter); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/RelationshipStatusInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/RelationshipStatusInfoComposer.java index 202b3fd7..4d3ac651 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/RelationshipStatusInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/RelationshipStatusInfoComposer.java @@ -1,5 +1,6 @@ package com.eu.habbo.messages.outgoing.users; +import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.messenger.MessengerBuddy; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.ServerMessage; @@ -59,7 +60,7 @@ public class RelationshipStatusInfoComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { try { - this.response.init(Outgoing.RelationshipStatusInfoComposer); + this.response.init(Outgoing.relationshipStatusInfoComposer); this.response.appendInt(this.userId); int total = 0; @@ -75,7 +76,7 @@ public class RelationshipStatusInfoComposer extends MessageComposer { this.response.appendInt(total); - Random random = new Random(); + Random random = Emulator.getRandom(); if (!this.lovers.isEmpty()) { int loversIndex = random.nextInt(this.lovers.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/RemainingMutePeriodComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/RemainingMutePeriodComposer.java index 1323ac94..6923cdcf 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/RemainingMutePeriodComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/RemainingMutePeriodComposer.java @@ -13,7 +13,7 @@ public class RemainingMutePeriodComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.RemainingMutePeriodComposer); + this.response.init(Outgoing.remainingMutePeriodComposer); this.response.appendInt(this.seconds); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/ScrSendUserInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/ScrSendUserInfoComposer.java index 55651f0c..645a9565 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/ScrSendUserInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/ScrSendUserInfoComposer.java @@ -39,7 +39,7 @@ public class ScrSendUserInfoComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.ScrSendUserInfoComposer); + this.response.init(Outgoing.scrSendUserInfoComposer); this.response.appendString(this.subscriptionType.toLowerCase()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/TalentTrackLevelMessageEvent.java b/src/main/java/com/eu/habbo/messages/outgoing/users/TalentTrackLevelMessageEvent.java index 3e2da784..bd216321 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/TalentTrackLevelMessageEvent.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/TalentTrackLevelMessageEvent.java @@ -13,7 +13,7 @@ public class TalentTrackLevelMessageEvent extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.TalentTrackLevelMessageEvent); + this.response.init(Outgoing.talentTrackLevelMessageEvent); this.response.appendString(this.name); this.response.appendInt(4); this.response.appendInt(4); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserBCLimitsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserBCLimitsComposer.java index 3b745395..d2dcba12 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserBCLimitsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserBCLimitsComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class UserBCLimitsComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UserBCLimitsComposer); + this.response.init(Outgoing.userBCLimitsComposer); this.response.appendInt(0); this.response.appendInt(500); this.response.appendInt(0); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserBadgesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserBadgesComposer.java index 7574c3a6..24e2621c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserBadgesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserBadgesComposer.java @@ -18,7 +18,7 @@ public class UserBadgesComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UserBadgesComposer); + this.response.init(Outgoing.userBadgesComposer); this.response.appendInt(this.habbo); synchronized (this.badges) { this.response.appendInt(this.badges.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserObjectComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserObjectComposer.java index dc8c1f13..5f486dbd 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserObjectComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserObjectComposer.java @@ -14,7 +14,7 @@ public class UserObjectComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UserObjectComposer); + this.response.init(Outgoing.userObjectComposer); this.response.appendInt(this.habbo.getHabboInfo().getId()); this.response.appendString(this.habbo.getHabboInfo().getUsername()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserPerksComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserPerksComposer.java index 47806261..239cb416 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserPerksComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserPerksComposer.java @@ -16,7 +16,7 @@ public class UserPerksComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PerkAllowancesComposer); + this.response.init(Outgoing.perkAllowancesComposer); this.response.appendInt(15); this.response.appendString("USE_GUIDE_TOOL"); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserRightsMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserRightsMessageComposer.java index 775c5c67..ca926e87 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserRightsMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserRightsMessageComposer.java @@ -18,7 +18,7 @@ public class UserRightsMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.UserRightsMessageComposer); + this.response.init(Outgoing.userRightsMessageComposer); this.response.appendInt(this.clubLevel); this.response.appendInt(this.habbo.getHabboInfo().getRank().getLevel()); this.response.appendBoolean(this.habbo.hasPermission(Permission.ACC_AMBASSADOR)); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/WardrobeMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/WardrobeMessageComposer.java index e023a0f8..963230c2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/WardrobeMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/WardrobeMessageComposer.java @@ -14,7 +14,7 @@ public class WardrobeMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.WardrobeMessageComposer); + this.response.init(Outgoing.wardrobeMessageComposer); this.response.appendInt(1); this.response.appendInt(this.wardrobeComponent.getLooks().size()); for (WardrobeComponent.WardrobeItem wardrobeItem : this.wardrobeComponent.getLooks().values()) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/verification/NewUserExperienceNotCompleteComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/verification/NewUserExperienceNotCompleteComposer.java index d15056e5..a4099c63 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/verification/NewUserExperienceNotCompleteComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/verification/NewUserExperienceNotCompleteComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class NewUserExperienceNotCompleteComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.NewUserExperienceNotCompleteComposer); + this.response.init(Outgoing.newUserExperienceNotCompleteComposer); return this.response; } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/verification/PhoneCollectionStateMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/verification/PhoneCollectionStateMessageComposer.java index d5150078..ce928de4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/verification/PhoneCollectionStateMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/verification/PhoneCollectionStateMessageComposer.java @@ -17,7 +17,7 @@ public class PhoneCollectionStateMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.PhoneCollectionStateMessageComposer); + this.response.init(Outgoing.phoneCollectionStateMessageComposer); this.response.appendInt(this.unknownInt1); this.response.appendInt(this.unknownInt2); this.response.appendInt(this.unknownInt3); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/verification/TryPhoneNumberResultMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/verification/TryPhoneNumberResultMessageComposer.java index 2dff2ae3..99d22ec9 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/verification/TryPhoneNumberResultMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/verification/TryPhoneNumberResultMessageComposer.java @@ -15,7 +15,7 @@ public class TryPhoneNumberResultMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.TryPhoneNumberResultMessageComposer); + this.response.init(Outgoing.tryPhoneNumberResultMessageComposer); this.response.appendInt(this.unknownInt1); this.response.appendInt(this.unknownInt2); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/verification/TryVerificationCodeResultMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/verification/TryVerificationCodeResultMessageComposer.java index 1ce8f425..cd1ba654 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/verification/TryVerificationCodeResultMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/verification/TryVerificationCodeResultMessageComposer.java @@ -15,7 +15,7 @@ public class TryVerificationCodeResultMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.TryVerificationCodeResultMessageComposer); + this.response.init(Outgoing.tryVerificationCodeResultMessageComposer); this.response.appendInt(this.unknownInt1); this.response.appendInt(this.unknownInt2); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/wired/OpenComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/wired/OpenComposer.java index 6582b22a..70ac2d88 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/wired/OpenComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/wired/OpenComposer.java @@ -14,7 +14,7 @@ public class OpenComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.OpenComposer); + this.response.init(Outgoing.openComposer); this.response.appendInt(this.item.getId()); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredConditionDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredConditionDataComposer.java index b3dcae0a..27bd703f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredConditionDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredConditionDataComposer.java @@ -17,7 +17,7 @@ public class WiredConditionDataComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.WiredConditionDataComposer); + this.response.init(Outgoing.wiredConditionDataComposer); this.condition.serializeWiredData(this.response, this.room); this.condition.needsUpdate(true); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredEffectDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredEffectDataComposer.java index 73c84f2f..c9978cf2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredEffectDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredEffectDataComposer.java @@ -17,7 +17,7 @@ public class WiredEffectDataComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.WiredEffectDataComposer); + this.response.init(Outgoing.wiredEffectDataComposer); this.effect.serializeWiredData(this.response, this.room); this.effect.needsUpdate(true); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredRewardResultMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredRewardResultMessageComposer.java index 64f1a9e4..f494313c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredRewardResultMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredRewardResultMessageComposer.java @@ -23,7 +23,7 @@ public class WiredRewardResultMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.WiredRewardResultMessageComposer); + this.response.init(Outgoing.wiredRewardResultMessageComposer); this.response.appendInt(this.code); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredSavedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredSavedComposer.java index 17be832b..929ce659 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredSavedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredSavedComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class WiredSavedComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.WiredSavedComposer); + this.response.init(Outgoing.wiredSavedComposer); return this.response; } } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredTriggerDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredTriggerDataComposer.java index 8541e814..25fc09ab 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredTriggerDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredTriggerDataComposer.java @@ -17,7 +17,7 @@ public class WiredTriggerDataComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { - this.response.init(Outgoing.WiredTriggerDataComposer); + this.response.init(Outgoing.wiredTriggerDataComposer); this.trigger.serializeWiredData(this.response, this.room); this.trigger.needsUpdate(true); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/rcon/ChangeUsername.java b/src/main/java/com/eu/habbo/messages/rcon/ChangeUsername.java index 848d6d25..24dd7a11 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/ChangeUsername.java +++ b/src/main/java/com/eu/habbo/messages/rcon/ChangeUsername.java @@ -44,10 +44,12 @@ public class ChangeUsername extends RCONMessage { success = statement.executeUpdate() >= 1; } catch (SQLException sqlException) { - sqlException.printStackTrace(); + this.message = "SQL Exception occurred"; + LOGGER.error(this.message, sqlException); } } catch (SQLException sqlException) { - sqlException.printStackTrace(); + this.message = "SQL Exception occurred"; + LOGGER.error(this.message, sqlException); } } @@ -57,7 +59,7 @@ public class ChangeUsername extends RCONMessage { catch (Exception e) { this.status = RCONMessage.SYSTEM_ERROR; this.message = "Exception occurred"; - LOGGER.error("Exception occurred", e); + LOGGER.error(this.message, e); } } diff --git a/src/main/java/com/eu/habbo/messages/rcon/FriendRequest.java b/src/main/java/com/eu/habbo/messages/rcon/FriendRequest.java index 6f649565..2aed1e85 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/FriendRequest.java +++ b/src/main/java/com/eu/habbo/messages/rcon/FriendRequest.java @@ -26,21 +26,12 @@ public class FriendRequest extends RCONMessage { Habbo from = Emulator.getGameEnvironment().getHabboManager().getHabbo(json.user_id); if (from != null) { - target.getClient().sendResponse(new NewFriendRequestComposer(from)); + target.getClient().sendResponse(new NewFriendRequestComposer(from.getHabboInfo())); } else { final HabboInfo info = HabboManager.getOfflineHabboInfo(json.user_id); if (info != null) { - target.getClient().sendResponse(new MessageComposer() { - @Override - protected ServerMessage composeInternal() { - this.response.init(Outgoing.NewFriendRequestComposer); - this.response.appendInt(info.getId()); - this.response.appendString(info.getUsername()); - this.response.appendString(info.getLook()); - return this.response; - } - }); + target.getClient().sendResponse(new NewFriendRequestComposer(info)); } } } diff --git a/src/main/java/com/eu/habbo/messages/rcon/GiveRespect.java b/src/main/java/com/eu/habbo/messages/rcon/GiveRespect.java index 93fe2449..bef769e8 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/GiveRespect.java +++ b/src/main/java/com/eu/habbo/messages/rcon/GiveRespect.java @@ -29,7 +29,7 @@ public class GiveRespect extends RCONMessage { habbo.getHabboStats().respectPointsToGive += object.daily_respects; habbo.getClient().sendResponse(new UserObjectComposer(habbo)); } else { - try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("UPDATE users_settings SET respects_given = respects_give + ?, respects_received = respects_received + ?, daily_respect_points = daily_respect_points + ? WHERE user_id = ? LIMIT 1")) { + try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("UPDATE users_settings SET respects_given = respects_given + ?, respects_received = respects_received + ?, daily_respect_points = daily_respect_points + ? WHERE user_id = ? LIMIT 1")) { statement.setInt(1, object.respect_received); statement.setInt(2, object.respect_given); statement.setInt(3, object.daily_respects); diff --git a/src/main/java/com/eu/habbo/networking/Server.java b/src/main/java/com/eu/habbo/networking/Server.java index 3b6d17f8..49d3d0e1 100644 --- a/src/main/java/com/eu/habbo/networking/Server.java +++ b/src/main/java/com/eu/habbo/networking/Server.java @@ -69,6 +69,7 @@ public abstract class Server { this.bossGroup.shutdownGracefully(0, 0, TimeUnit.MILLISECONDS).sync(); } catch(InterruptedException e) { LOGGER.error("Exception during {} shutdown... HARD STOP", this.name, e); + Thread.currentThread().interrupt(); } LOGGER.info("GameServer Stopped!"); } diff --git a/src/main/java/com/eu/habbo/networking/camera/CameraClient.java b/src/main/java/com/eu/habbo/networking/camera/CameraClient.java index 5635d9c9..2a5bb499 100644 --- a/src/main/java/com/eu/habbo/networking/camera/CameraClient.java +++ b/src/main/java/com/eu/habbo/networking/camera/CameraClient.java @@ -31,7 +31,7 @@ public class CameraClient { this.bootstrap.option(ChannelOption.SO_KEEPALIVE, false); this.bootstrap.handler(new ChannelInitializer() { @Override - public void initChannel(SocketChannel ch) throws Exception { + public void initChannel(SocketChannel ch) { ch.pipeline().addLast(new CameraDecoder()); ch.pipeline().addLast(new CameraHandler()); } @@ -44,10 +44,6 @@ public class CameraClient { public void connect() { CameraClient.channelFuture = this.bootstrap.connect(host, port); - - while (!CameraClient.channelFuture.isDone()) { - } - if (CameraClient.channelFuture.isSuccess()) { CameraClient.attemptReconnect = false; CameraClient.channel = channelFuture.channel(); @@ -68,7 +64,8 @@ public class CameraClient { channelFuture.channel().close().sync(); channelFuture = null; } catch (Exception e) { - e.printStackTrace(); + LOGGER.error("Caught Exception: ", e); + Thread.currentThread().interrupt(); } } diff --git a/src/main/java/com/eu/habbo/networking/gameserver/handlers/IdleTimeoutHandler.java b/src/main/java/com/eu/habbo/networking/gameserver/handlers/IdleTimeoutHandler.java index 9a3c007f..493e1ae3 100644 --- a/src/main/java/com/eu/habbo/networking/gameserver/handlers/IdleTimeoutHandler.java +++ b/src/main/java/com/eu/habbo/networking/gameserver/handlers/IdleTimeoutHandler.java @@ -94,12 +94,16 @@ public class IdleTimeoutHandler extends ChannelDuplexHandler { super.channelInactive(ctx); } + @Override public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception { - // check if its a pong message + /* check if its a pong message + * TODO: is it the right place to do it? + * how to handle it if you are using multi revision? + */ if(msg instanceof ClientMessage) { ClientMessage packet = (ClientMessage) msg; - if(packet.getMessageId() == Incoming.PongEvent) { + if(packet.getMessageId() == Incoming.pongEvent) { this.lastPongTime = System.nanoTime(); } } diff --git a/src/main/java/com/eu/habbo/plugin/EventHandler.java b/src/main/java/com/eu/habbo/plugin/EventHandler.java index 218811ad..a3bc0d94 100644 --- a/src/main/java/com/eu/habbo/plugin/EventHandler.java +++ b/src/main/java/com/eu/habbo/plugin/EventHandler.java @@ -5,7 +5,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; - +@SuppressWarnings("unused") @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) public @interface EventHandler { diff --git a/src/main/java/com/eu/habbo/plugin/events/guilds/GuildAcceptedMembershipEvent.java b/src/main/java/com/eu/habbo/plugin/events/guilds/GuildAcceptedMembershipEvent.java index ab700f01..cd9cac42 100644 --- a/src/main/java/com/eu/habbo/plugin/events/guilds/GuildAcceptedMembershipEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/guilds/GuildAcceptedMembershipEvent.java @@ -2,19 +2,20 @@ package com.eu.habbo.plugin.events.guilds; import com.eu.habbo.habbohotel.guilds.Guild; import com.eu.habbo.habbohotel.users.Habbo; +import com.eu.habbo.habbohotel.users.HabboInfo; public class GuildAcceptedMembershipEvent extends GuildEvent { public final int userId; - public final Habbo user; + public final HabboInfo userInfo; - public GuildAcceptedMembershipEvent(Guild guild, int userId, Habbo user) { + public GuildAcceptedMembershipEvent(Guild guild, int userId, HabboInfo user) { super(guild); this.userId = userId; - this.user = user; + this.userInfo = user; } } diff --git a/src/main/java/com/eu/habbo/plugin/events/users/calendar/UserClaimRewardEvent.java b/src/main/java/com/eu/habbo/plugin/events/users/calendar/UserClaimRewardEvent.java index c57f60db..e63e8383 100644 --- a/src/main/java/com/eu/habbo/plugin/events/users/calendar/UserClaimRewardEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/users/calendar/UserClaimRewardEvent.java @@ -1,7 +1,7 @@ package com.eu.habbo.plugin.events.users.calendar; -import com.eu.habbo.habbohotel.campaign.calendar.CalendarCampaign; -import com.eu.habbo.habbohotel.campaign.calendar.CalendarRewardObject; +import com.eu.habbo.habbohotel.campaign.CalendarCampaign; +import com.eu.habbo.habbohotel.campaign.CalendarRewardObject; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.plugin.events.users.UserEvent; diff --git a/src/main/java/com/eu/habbo/threading/runnables/AchievementUpdater.java b/src/main/java/com/eu/habbo/threading/runnables/AchievementUpdater.java index 2ee1dcbf..55865a60 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/AchievementUpdater.java +++ b/src/main/java/com/eu/habbo/threading/runnables/AchievementUpdater.java @@ -14,7 +14,7 @@ public class AchievementUpdater implements Runnable { @Override public void run() { if (!Emulator.isShuttingDown) { - Emulator.getThreading().run(this, INTERVAL * 1000); + Emulator.getThreading().run(this, INTERVAL * 1000L); } if (Emulator.isReady) { @@ -27,7 +27,7 @@ public class AchievementUpdater implements Runnable { if (habbo.getHabboInfo().getLastOnline() > this.lastExecutionTimestamp) { timeOnlineSinceLastInterval = timestamp - habbo.getHabboInfo().getLastOnline(); } - AchievementManager.progressAchievement(habbo, onlineTime, (int) Math.floor((timeOnlineSinceLastInterval) / 60)); + AchievementManager.progressAchievement(habbo, onlineTime, (int) Math.floor((timeOnlineSinceLastInterval) / 60.0)); } this.lastExecutionTimestamp = timestamp; diff --git a/src/main/java/com/eu/habbo/threading/runnables/QueryDeleteHabboBadge.java b/src/main/java/com/eu/habbo/threading/runnables/QueryDeleteHabboBadge.java index 2910fedd..c938f8f3 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/QueryDeleteHabboBadge.java +++ b/src/main/java/com/eu/habbo/threading/runnables/QueryDeleteHabboBadge.java @@ -22,7 +22,7 @@ class QueryDeleteHabboBadge implements Runnable { @Override public void run() { - try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("DELETE FROM user_badges WHERE users_id = ? AND badge_code = ?")) { + try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("DELETE FROM users_badges WHERE user_id = ? AND badge_code = ?")) { statement.setInt(1, this.habbo.getHabboInfo().getId()); statement.setString(2, this.name); statement.execute(); diff --git a/src/main/java/com/eu/habbo/threading/runnables/RoomUnitTeleportWalkToAction.java b/src/main/java/com/eu/habbo/threading/runnables/RoomUnitTeleportWalkToAction.java index 61c65c74..32c393eb 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/RoomUnitTeleportWalkToAction.java +++ b/src/main/java/com/eu/habbo/threading/runnables/RoomUnitTeleportWalkToAction.java @@ -38,7 +38,7 @@ public class RoomUnitTeleportWalkToAction implements Runnable { } else { if (tile.isWalkable()) { this.habbo.getRoomUnit().setGoalLocation(tile); - Emulator.getThreading().run(this, this.habbo.getRoomUnit().getPath().size() + 2 * 510); + Emulator.getThreading().run(this, (long) this.habbo.getRoomUnit().getPath().size() + 2 * 510); } } } diff --git a/src/main/java/com/eu/habbo/threading/runnables/RoomUnitVendingMachineAction.java b/src/main/java/com/eu/habbo/threading/runnables/RoomUnitVendingMachineAction.java index 926e38f3..ab5c1e3a 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/RoomUnitVendingMachineAction.java +++ b/src/main/java/com/eu/habbo/threading/runnables/RoomUnitVendingMachineAction.java @@ -37,7 +37,7 @@ public class RoomUnitVendingMachineAction implements Runnable { } else { if (this.room.getLayout().getTile(tile.x, tile.y).isWalkable()) { this.habbo.getRoomUnit().setGoalLocation(tile); - Emulator.getThreading().run(this, this.habbo.getRoomUnit().getPath().size() + 2 * 510); + Emulator.getThreading().run(this, (long) this.habbo.getRoomUnit().getPath().size() + 2 * 510); } } } diff --git a/src/main/java/com/eu/habbo/threading/runnables/YouAreAPirate.java b/src/main/java/com/eu/habbo/threading/runnables/YouAreAPirate.java index a9eb50a0..b500ffb4 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/YouAreAPirate.java +++ b/src/main/java/com/eu/habbo/threading/runnables/YouAreAPirate.java @@ -75,7 +75,7 @@ public class YouAreAPirate implements Runnable { public final Room room; private int index = 0; - private int oldEffect; + private final int oldEffect; public YouAreAPirate(Habbo habbo, Room room) { this.habbo = habbo; @@ -97,7 +97,7 @@ public class YouAreAPirate implements Runnable { return; } - Emulator.getThreading().run(this, iamapirate[this.index - 1].length() * 100); + Emulator.getThreading().run(this, iamapirate[this.index - 1].length() * 100L); } } } diff --git a/src/main/java/com/eu/habbo/threading/runnables/YoutubeAdvanceVideo.java b/src/main/java/com/eu/habbo/threading/runnables/YoutubeAdvanceVideo.java index c1eb576d..40ecf450 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/YoutubeAdvanceVideo.java +++ b/src/main/java/com/eu/habbo/threading/runnables/YoutubeAdvanceVideo.java @@ -28,6 +28,6 @@ public class YoutubeAdvanceVideo implements Runnable { room.updateItem(this.tv); room.sendComposer(new YoutubeDisplayVideoMessageComposer(tv.getId(), tv.currentVideo, true, 0).compose()); - tv.autoAdvance = Emulator.getThreading().run(new YoutubeAdvanceVideo(this.tv), tv.currentVideo.getDuration() * 1000); + tv.autoAdvance = Emulator.getThreading().run(new YoutubeAdvanceVideo(this.tv), tv.currentVideo.getDuration() * 1000L); } } diff --git a/src/main/java/com/eu/habbo/threading/runnables/teleport/TeleportActionTwo.java b/src/main/java/com/eu/habbo/threading/runnables/teleport/TeleportActionTwo.java index c448f2ef..332d9fb2 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/teleport/TeleportActionTwo.java +++ b/src/main/java/com/eu/habbo/threading/runnables/teleport/TeleportActionTwo.java @@ -90,7 +90,7 @@ class TeleportActionTwo implements Runnable { } Emulator.getThreading().run(new HabboItemNewState(this.currentTeleport, this.room, "2"), delayOffset); - Emulator.getThreading().run(new HabboItemNewState(this.currentTeleport, this.room, "0"), delayOffset + 1000); + Emulator.getThreading().run(new HabboItemNewState(this.currentTeleport, this.room, "0"), delayOffset + 1000L); Emulator.getThreading().run(new TeleportActionThree(this.currentTeleport, this.room, this.client), delayOffset); } }