From 89ff26f21b45154a8d562b608dcbf905717c795e Mon Sep 17 00:00:00 2001 From: Mike <76-Mike@users.noreply.git.krews.org> Date: Mon, 4 May 2020 22:24:09 +0200 Subject: [PATCH] More logging progress --- .../achievements/AchievementManager.java | 27 ++--- .../achievements/TalentTrackLevel.java | 17 +-- .../com/eu/habbo/habbohotel/bots/Bot.java | 6 +- .../eu/habbo/habbohotel/bots/BotManager.java | 28 +++-- .../eu/habbo/habbohotel/bots/ButlerBot.java | 5 +- .../habbo/habbohotel/catalog/CatalogItem.java | 13 ++- .../catalog/CatalogLimitedConfiguration.java | 10 +- .../habbo/habbohotel/catalog/CatalogPage.java | 9 +- .../eu/habbo/habbohotel/catalog/Voucher.java | 8 +- .../catalog/layouts/RoomBundleLayout.java | 10 +- .../catalog/marketplace/MarketPlace.java | 22 ++-- .../catalog/marketplace/MarketPlaceOffer.java | 10 +- .../commands/AddYoutubePlaylistCommand.java | 6 +- .../habbohotel/commands/BadgeCommand.java | 6 +- .../habbohotel/commands/EnableCommand.java | 6 +- .../commands/FilterWordCommand.java | 6 +- .../commands/RoomBundleCommand.java | 6 +- .../habbohotel/crafting/CraftingManager.java | 9 +- .../com/eu/habbo/habbohotel/games/Game.java | 6 +- .../games/battlebanzai/BattleBanzaiGame.java | 6 +- .../habbohotel/games/freeze/FreezeGame.java | 6 +- .../com/eu/habbo/habbohotel/guilds/Guild.java | 7 +- .../habbohotel/guilds/forums/ForumThread.java | 14 ++- .../guilds/forums/ForumThreadComment.java | 9 +- .../habbohotel/hotelview/HallOfFame.java | 5 +- .../habbo/habbohotel/hotelview/NewsList.java | 6 +- .../habbohotel/items/CrackableReward.java | 8 +- .../habbohotel/items/RandomStateParams.java | 7 +- .../habbohotel/items/YoutubeManager.java | 13 ++- .../interactions/InteractionColorPlate.java | 7 +- .../interactions/InteractionDefault.java | 7 +- .../items/interactions/InteractionGift.java | 8 +- .../interactions/InteractionMusicDisc.java | 10 +- .../InteractionRentableSpace.java | 8 +- .../items/interactions/InteractionWired.java | 5 +- .../InteractionWiredHighscore.java | 12 +- .../games/InteractionGameTimer.java | 8 +- .../WiredConditionHabboHasHandItem.java | 7 +- .../wired/effects/WiredEffectMatchFurni.java | 6 +- .../wired/effects/WiredEffectToggleFurni.java | 6 +- .../effects/WiredEffectToggleRandom.java | 6 +- .../interactions/wired/extra/WiredBlob.java | 10 +- .../triggers/WiredTriggerBotReachedFurni.java | 6 +- .../habbo/habbohotel/messenger/Message.java | 6 +- .../habbo/habbohotel/messenger/Messenger.java | 31 +++--- .../habbohotel/messenger/MessengerBuddy.java | 9 +- .../habbo/habbohotel/modtool/ModToolBan.java | 6 +- .../habbohotel/modtool/ModToolManager.java | 45 ++++---- .../habbohotel/modtool/ModToolSanctions.java | 17 +-- .../habbo/habbohotel/modtool/WordFilter.java | 10 +- .../permissions/PermissionsManager.java | 10 +- .../eu/habbo/habbohotel/pets/GnomePet.java | 6 +- .../eu/habbo/habbohotel/pets/HorsePet.java | 6 +- .../habbohotel/pets/MonsterplantPet.java | 6 +- .../com/eu/habbo/habbohotel/pets/Pet.java | 9 +- .../eu/habbo/habbohotel/pets/PetManager.java | 42 +++---- .../habbo/habbohotel/polls/PollManager.java | 8 +- .../habbohotel/rooms/CustomRoomLayout.java | 6 +- .../com/eu/habbo/habbohotel/rooms/Room.java | 105 +++++++++--------- .../eu/habbo/habbohotel/rooms/RoomBan.java | 14 +-- .../eu/habbo/habbohotel/rooms/RoomLayout.java | 5 +- .../habbo/habbohotel/rooms/RoomPromotion.java | 5 +- .../eu/habbo/habbohotel/rooms/RoomTrade.java | 5 +- .../eu/habbo/habbohotel/rooms/RoomUnit.java | 7 +- .../habbo/habbohotel/rooms/TraxManager.java | 13 ++- .../com/eu/habbo/habbohotel/users/Habbo.java | 13 ++- .../eu/habbo/habbohotel/users/HabboBadge.java | 5 +- .../eu/habbo/habbohotel/users/HabboInfo.java | 26 +++-- .../habbohotel/users/HabboInventory.java | 18 +-- .../eu/habbo/habbohotel/users/HabboItem.java | 14 ++- .../users/HabboNavigatorWindowSettings.java | 7 +- .../eu/habbo/habbohotel/users/HabboStats.java | 21 ++-- .../users/cache/HabboOfferPurchase.java | 5 +- .../users/inventory/BadgesComponent.java | 12 +- .../users/inventory/BotsComponent.java | 5 +- .../users/inventory/EffectsComponent.java | 15 ++- .../users/inventory/ItemsComponent.java | 12 +- .../users/inventory/PetsComponent.java | 5 +- .../users/inventory/WardrobeComponent.java | 7 +- .../habbo/habbohotel/wired/WiredHandler.java | 12 +- .../highscores/WiredHighscoreManager.java | 10 +- .../camera/CameraPublishToWebEvent.java | 6 +- .../catalog/CatalogBuyItemAsGiftEvent.java | 10 +- .../catalog/marketplace/SellItemEvent.java | 8 +- .../incoming/friends/FriendRequestEvent.java | 6 +- .../incoming/guardians/GuardianVoteEvent.java | 6 +- .../incoming/guilds/RequestGuildBuyEvent.java | 6 +- .../guilds/forums/GuildForumListEvent.java | 8 +- .../incoming/handshake/SecureLoginEvent.java | 6 +- .../hotelview/HotelViewDataEvent.java | 7 +- .../inventory/RequestInventoryItemsEvent.java | 7 +- .../navigator/RequestCreateRoomEvent.java | 8 +- .../navigator/RequestDeleteRoomEvent.java | 8 +- .../RequestNewNavigatorRoomsEvent.java | 8 +- .../incoming/polls/AnswerPollEvent.java | 6 +- .../incoming/polls/CancelPollEvent.java | 6 +- .../incoming/rooms/RoomSettingsSaveEvent.java | 6 +- .../rooms/items/RedeemClothingEvent.java | 8 +- .../incoming/rooms/items/RedeemItemEvent.java | 14 ++- .../items/SavePostItStickyPoleEvent.java | 6 +- .../rooms/items/ToggleFloorItemEvent.java | 8 +- .../rooms/items/UseRandomStateItemEvent.java | 7 +- .../youtube/YoutubeRequestPlaylists.java | 6 +- .../rooms/pets/CompostMonsterplantEvent.java | 6 +- .../rooms/pets/HorseRemoveSaddleEvent.java | 8 +- .../rooms/users/RoomUserShoutEvent.java | 6 +- .../rooms/users/RoomUserTalkEvent.java | 6 +- .../rooms/users/RoomUserWalkEvent.java | 6 +- .../rooms/users/RoomUserWhisperEvent.java | 6 +- .../users/ConfirmChangeNameEvent.java | 6 +- .../incoming/users/RequestUserDataEvent.java | 6 +- .../incoming/users/UserSaveLookEvent.java | 6 +- .../achievements/AchievementListComposer.java | 6 +- .../catalog/CatalogPagesListComposer.java | 6 +- .../MarketplaceOwnItemsComposer.java | 6 +- .../outgoing/friends/FriendsComposer.java | 7 +- .../guilds/forums/GuildForumDataComposer.java | 6 +- .../inventory/InventoryItemsComposer.java | 7 +- .../modtool/ModToolUserInfoComposer.java | 6 +- .../navigator/PrivateRoomsComposer.java | 7 +- .../users/ProfileFriendsComposer.java | 9 +- .../outgoing/users/UserCurrencyComposer.java | 6 +- .../outgoing/users/UserProfileComposer.java | 6 +- .../habbo/messages/rcon/ExecuteCommand.java | 6 +- .../com/eu/habbo/messages/rcon/GiveBadge.java | 6 +- .../eu/habbo/messages/rcon/GiveCredits.java | 6 +- .../eu/habbo/messages/rcon/GivePixels.java | 6 +- .../eu/habbo/messages/rcon/GivePoints.java | 6 +- .../eu/habbo/messages/rcon/GiveRespect.java | 6 +- .../habbo/messages/rcon/GiveUserClothing.java | 6 +- .../eu/habbo/messages/rcon/IgnoreUser.java | 6 +- .../com/eu/habbo/messages/rcon/MuteUser.java | 6 +- .../com/eu/habbo/messages/rcon/SendGift.java | 5 +- .../com/eu/habbo/messages/rcon/SetMotto.java | 6 +- .../eu/habbo/messages/rcon/UpdateUser.java | 5 +- .../camera/CameraPacketHandler.java | 7 +- .../decoders/GameMessageHandler.java | 16 +-- .../habbo/threading/HabboExecutorService.java | 10 +- .../RejectedExecutionHandlerImpl.java | 6 +- .../com/eu/habbo/threading/ThreadPooling.java | 3 +- .../habbo/threading/runnables/OpenGift.java | 6 +- .../runnables/QueryDeleteHabboBadge.java | 6 +- .../runnables/QueryDeleteHabboItem.java | 6 +- .../runnables/QueryDeleteHabboItems.java | 6 +- .../threading/runnables/RoomUnitTeleport.java | 7 +- .../RoomUnitTeleportWalkToAction.java | 6 +- .../RoomUnitVendingMachineAction.java | 6 +- .../threading/runnables/SaveScoreForTeam.java | 6 +- .../runnables/TeleportInteraction.java | 6 +- .../runnables/UpdateModToolIssue.java | 6 +- .../freeze/FreezeHandleSnowballExplosion.java | 6 +- .../runnables/hopper/HopperActionTwo.java | 6 +- .../runnables/teleport/TeleportActionTwo.java | 6 +- 153 files changed, 987 insertions(+), 448 deletions(-) diff --git a/src/main/java/com/eu/habbo/habbohotel/achievements/AchievementManager.java b/src/main/java/com/eu/habbo/habbohotel/achievements/AchievementManager.java index a00a79cf..9de60de5 100644 --- a/src/main/java/com/eu/habbo/habbohotel/achievements/AchievementManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/achievements/AchievementManager.java @@ -18,20 +18,21 @@ import com.eu.habbo.plugin.events.users.achievements.UserAchievementLeveledEvent import com.eu.habbo.plugin.events.users.achievements.UserAchievementProgressEvent; import gnu.trove.map.hash.THashMap; import gnu.trove.procedure.TObjectIntProcedure; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.*; import java.util.LinkedHashMap; import java.util.Map; public class AchievementManager { + private static final Logger LOGGER = LoggerFactory.getLogger(AchievementManager.class); + public static boolean TALENTTRACK_ENABLED = false; - private final THashMap achievements; - private final THashMap> talentTrackLevels; - public AchievementManager() { this.achievements = new THashMap<>(); this.talentTrackLevels = new THashMap<>(); @@ -58,7 +59,7 @@ public class AchievementManager { statement.setInt(4, amount); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } @@ -140,7 +141,7 @@ public class AchievementManager { try { badge = habbo.getInventory().getBadgesComponent().getBadge(("ACH_" + achievement.name + oldLevel.level).toLowerCase()); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); return; } } @@ -203,7 +204,7 @@ public class AchievementManager { statement.setInt(3, 1); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -217,7 +218,7 @@ public class AchievementManager { } statement.executeBatch(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -231,7 +232,7 @@ public class AchievementManager { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return 0; @@ -254,9 +255,9 @@ public class AchievementManager { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } @@ -276,13 +277,13 @@ public class AchievementManager { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); - Emulator.getLogging().logErrorLine("Achievement Manager -> Failed to load!"); + LOGGER.error("Caught SQL exception", e); + LOGGER.error("Achievement Manager -> Failed to load!"); return; } } - logger.info("Achievement Manager -> Loaded! (" + (System.currentTimeMillis() - millis) + " MS)"); + LOGGER.info("Achievement Manager -> Loaded! (" + (System.currentTimeMillis() - millis) + " MS)"); } public Achievement getAchievement(String name) { diff --git a/src/main/java/com/eu/habbo/habbohotel/achievements/TalentTrackLevel.java b/src/main/java/com/eu/habbo/habbohotel/achievements/TalentTrackLevel.java index e104c4fa..e491523f 100644 --- a/src/main/java/com/eu/habbo/habbohotel/achievements/TalentTrackLevel.java +++ b/src/main/java/com/eu/habbo/habbohotel/achievements/TalentTrackLevel.java @@ -5,27 +5,20 @@ import com.eu.habbo.habbohotel.items.Item; import gnu.trove.map.TObjectIntMap; import gnu.trove.map.hash.TObjectIntHashMap; import gnu.trove.set.hash.THashSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.ResultSet; import java.sql.SQLException; public class TalentTrackLevel { + private static final Logger LOGGER = LoggerFactory.getLogger(TalentTrackLevel.class); public TalentTrackType type; - - public int level; - - public TObjectIntMap achievements; - - public THashSet items; - - public String[] perks; - - public String[] badges; public TalentTrackLevel(ResultSet set) throws SQLException { @@ -46,7 +39,7 @@ public class TalentTrackLevel { if (achievement != null) { this.achievements.put(achievement, Integer.valueOf(achievementLevels[i])); } else { - Emulator.getLogging().logErrorLine("Could not find achievement with ID " + achievements[i] + " for talenttrack level " + this.level + " of type " + this.type); + LOGGER.error("Could not find achievement with ID " + achievements[i] + " for talenttrack level " + this.level + " of type " + this.type); } } } @@ -57,7 +50,7 @@ public class TalentTrackLevel { if (item != null) { this.items.add(item); } else { - logger.info("Incorrect reward furni (ID: " + s + ") for talent track level " + this.level); + LOGGER.error("Incorrect reward furni (ID: " + s + ") for talent track level " + this.level); } } 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 197ecd4c..8cedc5ff 100644 --- a/src/main/java/com/eu/habbo/habbohotel/bots/Bot.java +++ b/src/main/java/com/eu/habbo/habbohotel/bots/Bot.java @@ -12,6 +12,8 @@ import com.eu.habbo.plugin.events.bots.BotShoutEvent; import com.eu.habbo.plugin.events.bots.BotTalkEvent; import com.eu.habbo.plugin.events.bots.BotWhisperEvent; import com.eu.habbo.threading.runnables.BotFollowHabbo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -21,6 +23,8 @@ import java.util.ArrayList; import java.util.Arrays; public class Bot implements Runnable { + private static final Logger LOGGER = LoggerFactory.getLogger(Bot.class); + public static final String NO_CHAT_SET = "${bot.skill.chatter.configuration.text.placeholder}"; public static String[] PLACEMENT_MESSAGES = "Yo!;Hello I'm a real party animal!;Hello!".split(";"); @@ -155,7 +159,7 @@ public class Bot implements Runnable { statement.execute(); this.needsUpdate = false; } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/bots/BotManager.java b/src/main/java/com/eu/habbo/habbohotel/bots/BotManager.java index 3d5754dc..e1b88271 100644 --- a/src/main/java/com/eu/habbo/habbohotel/bots/BotManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/bots/BotManager.java @@ -6,6 +6,7 @@ import com.eu.habbo.habbohotel.permissions.Permission; import com.eu.habbo.habbohotel.rooms.*; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; +import com.eu.habbo.habbohotel.users.cache.HabboOfferPurchase; import com.eu.habbo.messages.outgoing.generic.alerts.BotErrorComposer; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys; @@ -15,12 +16,15 @@ import com.eu.habbo.messages.outgoing.rooms.users.RoomUsersComposer; import com.eu.habbo.plugin.events.bots.BotPickUpEvent; import com.eu.habbo.plugin.events.bots.BotPlacedEvent; import gnu.trove.map.hash.THashMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.lang.reflect.Method; import java.sql.*; import java.util.Map; public class BotManager { + private static final Logger LOGGER = LoggerFactory.getLogger(BotManager.class); final private static THashMap> botDefenitions = new THashMap<>(); public static int MINIMUM_CHAT_SPEED = 7; @@ -38,7 +42,7 @@ public class BotManager { this.reload(); - logger.info("Bot Manager -> Loaded! (" + (System.currentTimeMillis() - millis) + " MS)"); + LOGGER.info("Bot Manager -> Loaded! (" + (System.currentTimeMillis() - millis) + " MS)"); } public static void addBotDefinition(String type, Class botClazz) throws Exception { @@ -58,10 +62,10 @@ public class BotManager { m.setAccessible(true); m.invoke(null); } catch (NoSuchMethodException e) { - logger.info("Bot Manager -> Failed to execute initialise method upon bot type '" + set.getKey() + "'. No Such Method!"); + LOGGER.info("Bot Manager -> Failed to execute initialise method upon bot type '" + set.getKey() + "'. No Such Method!"); return false; } catch (Exception e) { - logger.info("Bot Manager -> Failed to execute initialise method upon bot type '" + set.getKey() + "'. Error: " + e.getMessage()); + LOGGER.info("Bot Manager -> Failed to execute initialise method upon bot type '" + set.getKey() + "'. Error: " + e.getMessage()); return false; } } @@ -88,12 +92,12 @@ public class BotManager { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return bot; @@ -143,7 +147,7 @@ public class BotManager { try { topItem.onWalkOn(bot.getRoomUnit(), room, null); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } bot.cycle(false); @@ -193,11 +197,11 @@ public class BotManager { if (botClazz != null) return botClazz.getDeclaredConstructor(ResultSet.class).newInstance(set); else - Emulator.getLogging().logErrorLine("Unknown Bot Type: " + type); + LOGGER.error("Unknown Bot Type: " + type); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } return null; @@ -208,7 +212,7 @@ public class BotManager { statement.setInt(1, bot.getId()); return statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return false; @@ -221,9 +225,9 @@ public class BotManager { m.setAccessible(true); m.invoke(null); } catch (NoSuchMethodException e) { - logger.info("Bot Manager -> Failed to execute dispose method upon bot type '" + set.getKey() + "'. No Such Method!"); + LOGGER.info("Bot Manager -> Failed to execute dispose method upon bot type '" + set.getKey() + "'. No Such Method!"); } catch (Exception e) { - logger.info("Bot Manager -> Failed to execute dispose method upon bot type '" + set.getKey() + "'. Error: " + e.getMessage()); + LOGGER.info("Bot Manager -> Failed to execute dispose method upon bot type '" + set.getKey() + "'. Error: " + e.getMessage()); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/bots/ButlerBot.java b/src/main/java/com/eu/habbo/habbohotel/bots/ButlerBot.java index 11c82cc3..d776bee9 100644 --- a/src/main/java/com/eu/habbo/habbohotel/bots/ButlerBot.java +++ b/src/main/java/com/eu/habbo/habbohotel/bots/ButlerBot.java @@ -8,6 +8,8 @@ import com.eu.habbo.threading.runnables.RoomUnitGiveHanditem; import com.eu.habbo.threading.runnables.RoomUnitWalkToRoomUnit; import gnu.trove.map.hash.THashMap; import gnu.trove.set.hash.THashSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.ResultSet; @@ -19,6 +21,7 @@ import java.util.List; import java.util.Map; public class ButlerBot extends Bot { + private static final Logger LOGGER = LoggerFactory.getLogger(ButlerBot.class); public static THashMap, Integer> serveItems = new THashMap<>(); public ButlerBot(ResultSet set) throws SQLException { @@ -43,7 +46,7 @@ public class ButlerBot extends Bot { serveItems.put(ks, set.getInt("item")); } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogItem.java b/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogItem.java index 21e02620..c8d015e6 100644 --- a/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogItem.java +++ b/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogItem.java @@ -3,9 +3,12 @@ package com.eu.habbo.habbohotel.catalog; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.items.FurnitureType; import com.eu.habbo.habbohotel.items.Item; +import com.eu.habbo.habbohotel.users.HabboBadge; import com.eu.habbo.messages.ISerialize; import com.eu.habbo.messages.ServerMessage; import gnu.trove.set.hash.THashSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -14,7 +17,7 @@ import java.sql.SQLException; import java.util.HashMap; public class CatalogItem implements ISerialize, Runnable, Comparable { - + private static final Logger LOGGER = LoggerFactory.getLogger(CatalogItem.class); int id; int limitedStack; private int pageId; @@ -211,7 +214,7 @@ public class CatalogItem implements ISerialize, Runnable, Comparable 0) { @@ -258,8 +261,8 @@ public class CatalogItem implements ISerialize, Runnable, Comparable limitedNumbers; private int totalSet; @@ -47,7 +51,7 @@ public class CatalogLimitedConfiguration implements Runnable { statement.setInt(5, item.getLimitedSells()); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } @@ -65,7 +69,7 @@ public class CatalogLimitedConfiguration implements Runnable { statement.executeBatch(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } this.totalSet += amount; @@ -98,7 +102,7 @@ public class CatalogLimitedConfiguration implements Runnable { statement.setInt(3, this.itemId); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogPage.java b/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogPage.java index 53fab1c3..b161c201 100644 --- a/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogPage.java +++ b/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogPage.java @@ -1,6 +1,5 @@ package com.eu.habbo.habbohotel.catalog; -import com.eu.habbo.Emulator; import com.eu.habbo.messages.ISerialize; import com.eu.habbo.messages.ServerMessage; import gnu.trove.TCollections; @@ -8,12 +7,16 @@ import gnu.trove.list.array.TIntArrayList; import gnu.trove.map.TIntObjectMap; import gnu.trove.map.hash.THashMap; import gnu.trove.map.hash.TIntObjectHashMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; public abstract class CatalogPage implements Comparable, ISerialize { + private static final Logger LOGGER = LoggerFactory.getLogger(CatalogPage.class); + protected final TIntArrayList offerIds = new TIntArrayList(); protected final THashMap childPages = new THashMap<>(); private final TIntObjectMap catalogItems = TCollections.synchronizedMap(new TIntObjectHashMap<>()); @@ -70,8 +73,8 @@ public abstract class CatalogPage implements Comparable, ISerialize try { this.included.add(Integer.valueOf(id)); } catch (Exception e) { - logger.error("Caught exception", e); - Emulator.getLogging().logErrorLine("Failed to parse includes column value of (" + id + ") for catalog page (" + this.id + ")"); + LOGGER.error("Caught exception", e); + LOGGER.error("Failed to parse includes column value of (" + id + ") for catalog page (" + this.id + ")"); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/catalog/Voucher.java b/src/main/java/com/eu/habbo/habbohotel/catalog/Voucher.java index cf37a8e2..b5e93b13 100644 --- a/src/main/java/com/eu/habbo/habbohotel/catalog/Voucher.java +++ b/src/main/java/com/eu/habbo/habbohotel/catalog/Voucher.java @@ -1,6 +1,8 @@ package com.eu.habbo.habbohotel.catalog; import com.eu.habbo.Emulator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -10,6 +12,8 @@ import java.util.ArrayList; import java.util.List; public class Voucher { + private static final Logger LOGGER = LoggerFactory.getLogger(Voucher.class); + public final int id; public final String code; public final int credits; @@ -41,7 +45,7 @@ public class Voucher { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -64,7 +68,7 @@ public class Voucher { statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/catalog/layouts/RoomBundleLayout.java b/src/main/java/com/eu/habbo/habbohotel/catalog/layouts/RoomBundleLayout.java index e2bb6ed4..680d3e9b 100644 --- a/src/main/java/com/eu/habbo/habbohotel/catalog/layouts/RoomBundleLayout.java +++ b/src/main/java/com/eu/habbo/habbohotel/catalog/layouts/RoomBundleLayout.java @@ -13,11 +13,15 @@ import com.eu.habbo.messages.outgoing.navigator.CanCreateRoomComposer; import gnu.trove.map.TIntObjectMap; import gnu.trove.map.hash.THashMap; import gnu.trove.procedure.TObjectProcedure; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.*; import java.util.Map; public class RoomBundleLayout extends SingleBundle { + private static final Logger LOGGER = LoggerFactory.getLogger(RoomBundleLayout.class); + public int roomId; public Room room; private int lastUpdate = 0; @@ -43,7 +47,7 @@ public class RoomBundleLayout extends SingleBundle { if (this.room != null) this.room.preventUnloading = true; } else { - Emulator.getLogging().logErrorLine("No room id specified for room bundle " + this.getPageName() + "(" + this.getId() + ")"); + LOGGER.error("No room id specified for room bundle " + this.getPageName() + "(" + this.getId() + ")"); } } @@ -185,7 +189,7 @@ public class RoomBundleLayout extends SingleBundle { statement.setInt(3, this.room.getId()); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -219,7 +223,7 @@ public class RoomBundleLayout extends SingleBundle { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } Room r = Emulator.getGameEnvironment().getRoomManager().loadRoom(roomId); diff --git a/src/main/java/com/eu/habbo/habbohotel/catalog/marketplace/MarketPlace.java b/src/main/java/com/eu/habbo/habbohotel/catalog/marketplace/MarketPlace.java index ca7ba320..f18ad446 100644 --- a/src/main/java/com/eu/habbo/habbohotel/catalog/marketplace/MarketPlace.java +++ b/src/main/java/com/eu/habbo/habbohotel/catalog/marketplace/MarketPlace.java @@ -16,6 +16,8 @@ import com.eu.habbo.plugin.events.marketplace.MarketPlaceItemCancelledEvent; import com.eu.habbo.plugin.events.marketplace.MarketPlaceItemOfferedEvent; import com.eu.habbo.plugin.events.marketplace.MarketPlaceItemSoldEvent; import gnu.trove.set.hash.THashSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -26,6 +28,8 @@ import java.util.List; public class MarketPlace { + private static final Logger LOGGER = LoggerFactory.getLogger(MarketPlace.class); + //Configuration. Loaded from database & updated accordingly. public static boolean MARKETPLACE_ENABLED = true; @@ -43,7 +47,7 @@ public class MarketPlace { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return offers; @@ -101,7 +105,7 @@ public class MarketPlace { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); habbo.getClient().sendResponse(new MarketplaceCancelSaleComposer(offer, false)); } } @@ -163,7 +167,7 @@ public class MarketPlace { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return offers; @@ -193,7 +197,7 @@ public class MarketPlace { message.appendInt(1); message.appendInt(itemId); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -208,7 +212,7 @@ public class MarketPlace { number = set.getInt("number"); } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return number; @@ -226,7 +230,7 @@ public class MarketPlace { avg = set.getInt("avg"); } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return calculateCommision(avg); @@ -294,7 +298,7 @@ public class MarketPlace { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -321,7 +325,7 @@ public class MarketPlace { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -388,7 +392,7 @@ public class MarketPlace { statement.setInt(2, offer.getOfferId()); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/catalog/marketplace/MarketPlaceOffer.java b/src/main/java/com/eu/habbo/habbohotel/catalog/marketplace/MarketPlaceOffer.java index 4bfb6307..196544e7 100644 --- a/src/main/java/com/eu/habbo/habbohotel/catalog/marketplace/MarketPlaceOffer.java +++ b/src/main/java/com/eu/habbo/habbohotel/catalog/marketplace/MarketPlaceOffer.java @@ -5,10 +5,14 @@ import com.eu.habbo.habbohotel.items.FurnitureType; import com.eu.habbo.habbohotel.items.Item; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.*; public class MarketPlaceOffer implements Runnable { + private static final Logger LOGGER = LoggerFactory.getLogger(MarketPlaceOffer.class); + public int avarage; public int count; private int offerId; @@ -66,7 +70,7 @@ public class MarketPlaceOffer implements Runnable { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -86,7 +90,7 @@ public class MarketPlaceOffer implements Runnable { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -160,7 +164,7 @@ public class MarketPlaceOffer implements Runnable { statement.setInt(3, this.offerId); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/AddYoutubePlaylistCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/AddYoutubePlaylistCommand.java index 28fe8339..d590bb0e 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/AddYoutubePlaylistCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/AddYoutubePlaylistCommand.java @@ -3,12 +3,16 @@ package com.eu.habbo.habbohotel.commands; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.items.YoutubeManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; public class AddYoutubePlaylistCommand extends Command { + private static final Logger LOGGER = LoggerFactory.getLogger(AddYoutubePlaylistCommand.class); + public AddYoutubePlaylistCommand() { super("cmd_add_youtube_playlist", Emulator.getTexts().getValue("commands.keys.cmd_add_youtube_playlist").split(";")); } @@ -49,7 +53,7 @@ public class AddYoutubePlaylistCommand extends Command { statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_add_youtube_playlist")); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/BadgeCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/BadgeCommand.java index 31f54aac..1328ed19 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/BadgeCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/BadgeCommand.java @@ -6,6 +6,8 @@ import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboInfo; import com.eu.habbo.habbohotel.users.HabboManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -13,6 +15,8 @@ import java.sql.ResultSet; import java.sql.SQLException; public class BadgeCommand extends Command { + private static final Logger LOGGER = LoggerFactory.getLogger(BadgeCommand.class); + public BadgeCommand() { super("cmd_badge", Emulator.getTexts().getValue("commands.keys.cmd_badge").split(";")); } @@ -72,7 +76,7 @@ public class BadgeCommand extends Command { return true; } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/EnableCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/EnableCommand.java index b2a9cef6..c56842b6 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/EnableCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/EnableCommand.java @@ -4,8 +4,12 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles; import com.eu.habbo.habbohotel.users.Habbo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class EnableCommand extends Command { + private static final Logger LOGGER = LoggerFactory.getLogger(EnableCommand.class); + public EnableCommand() { super("cmd_enable", Emulator.getTexts().getValue("commands.keys.cmd_enable").split(";")); } @@ -38,7 +42,7 @@ public class EnableCommand extends Command { } } } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/FilterWordCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/FilterWordCommand.java index 73cfb7e5..9e208a0a 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/FilterWordCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/FilterWordCommand.java @@ -4,12 +4,16 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.modtool.WordFilter; import com.eu.habbo.habbohotel.modtool.WordFilterWord; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; public class FilterWordCommand extends Command { + private static final Logger LOGGER = LoggerFactory.getLogger(FilterWordCommand.class); + public FilterWordCommand() { super("cmd_filterword", Emulator.getTexts().getValue("commands.keys.cmd_filterword").split(";")); } @@ -35,7 +39,7 @@ public class FilterWordCommand extends Command { statement.setString(2, replacement); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_filterword.error")); return true; } diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/RoomBundleCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/RoomBundleCommand.java index 2fd4031e..3b3f5161 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/RoomBundleCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/RoomBundleCommand.java @@ -7,10 +7,14 @@ import com.eu.habbo.habbohotel.catalog.CatalogPageLayouts; import com.eu.habbo.habbohotel.catalog.layouts.RoomBundleLayout; import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.*; public class RoomBundleCommand extends Command { + private static final Logger LOGGER = LoggerFactory.getLogger(RoomBundleCommand.class); + public RoomBundleCommand() { super("cmd_bundle", Emulator.getTexts().getValue("commands.keys.cmd_bundle").split(";")); } @@ -62,7 +66,7 @@ public class RoomBundleCommand extends Command { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } ((RoomBundleLayout) page).loadItems(gameClient.getHabbo().getHabboInfo().getCurrentRoom()); diff --git a/src/main/java/com/eu/habbo/habbohotel/crafting/CraftingManager.java b/src/main/java/com/eu/habbo/habbohotel/crafting/CraftingManager.java index abdbf28e..9fe611a4 100644 --- a/src/main/java/com/eu/habbo/habbohotel/crafting/CraftingManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/crafting/CraftingManager.java @@ -4,6 +4,8 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.items.Item; import gnu.trove.map.hash.THashMap; import gnu.trove.procedure.TObjectProcedure; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -11,6 +13,7 @@ import java.sql.ResultSet; import java.sql.SQLException; public class CraftingManager { + private static final Logger LOGGER = LoggerFactory.getLogger(CraftingManager.class); private final THashMap altars; @@ -53,14 +56,14 @@ public class CraftingManager { recipe.addIngredient(ingredientItem, set.getInt("crafting_recipes_ingredients.amount")); altar.addIngredient(ingredientItem); } else { - Emulator.getLogging().logErrorLine("Unknown ingredient item " + set.getInt("crafting_recipes_ingredients.item_id")); + LOGGER.error("Unknown ingredient item " + set.getInt("crafting_recipes_ingredients.item_id")); } } } } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -114,7 +117,7 @@ public class CraftingManager { } statement.executeBatch(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } this.altars.clear(); diff --git a/src/main/java/com/eu/habbo/habbohotel/games/Game.java b/src/main/java/com/eu/habbo/habbohotel/games/Game.java index 619423e3..f8aa6c37 100644 --- a/src/main/java/com/eu/habbo/habbohotel/games/Game.java +++ b/src/main/java/com/eu/habbo/habbohotel/games/Game.java @@ -20,12 +20,14 @@ import com.eu.habbo.plugin.events.games.GameStartedEvent; import com.eu.habbo.plugin.events.games.GameStoppedEvent; import com.eu.habbo.threading.runnables.SaveScoreForTeam; import gnu.trove.map.hash.THashMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Map; import java.util.stream.Collectors; public abstract class Game implements Runnable { - + private static final Logger LOGGER = LoggerFactory.getLogger(Game.class); protected final THashMap teams = new THashMap<>(); protected final Room room; private final Class gameTeamClazz; @@ -73,7 +75,7 @@ public abstract class Game implements Runnable { return true; } } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } return false; diff --git a/src/main/java/com/eu/habbo/habbohotel/games/battlebanzai/BattleBanzaiGame.java b/src/main/java/com/eu/habbo/habbohotel/games/battlebanzai/BattleBanzaiGame.java index 094ee146..31a561b5 100644 --- a/src/main/java/com/eu/habbo/habbohotel/games/battlebanzai/BattleBanzaiGame.java +++ b/src/main/java/com/eu/habbo/habbohotel/games/battlebanzai/BattleBanzaiGame.java @@ -17,12 +17,16 @@ import com.eu.habbo.messages.outgoing.rooms.users.RoomUserActionComposer; import com.eu.habbo.threading.runnables.BattleBanzaiTilesFlicker; import gnu.trove.map.hash.THashMap; import gnu.trove.set.hash.THashSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.*; import java.util.concurrent.Executors; import java.util.concurrent.ThreadPoolExecutor; public class BattleBanzaiGame extends Game { + private static final Logger LOGGER = LoggerFactory.getLogger(BattleBanzaiGame.class); + public static final int effectId = 32; @@ -149,7 +153,7 @@ public class BattleBanzaiGame extends Game { } } } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } 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 c44a7fa0..eb625350 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 @@ -23,11 +23,15 @@ import com.eu.habbo.threading.runnables.freeze.FreezeThrowSnowball; import gnu.trove.map.hash.THashMap; import gnu.trove.procedure.TObjectProcedure; import gnu.trove.set.hash.THashSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.HashMap; import java.util.Map; public class FreezeGame extends Game { + private static final Logger LOGGER = LoggerFactory.getLogger(FreezeGame.class); + public static final int effectId = 39; public static int POWER_UP_POINTS; @@ -261,7 +265,7 @@ public class FreezeGame extends Game { } } } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/guilds/Guild.java b/src/main/java/com/eu/habbo/habbohotel/guilds/Guild.java index f43e52b0..d77f6773 100644 --- a/src/main/java/com/eu/habbo/habbohotel/guilds/Guild.java +++ b/src/main/java/com/eu/habbo/habbohotel/guilds/Guild.java @@ -1,6 +1,8 @@ package com.eu.habbo.habbohotel.guilds; import com.eu.habbo.Emulator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -8,6 +10,7 @@ import java.sql.ResultSet; import java.sql.SQLException; public class Guild implements Runnable { + private static final Logger LOGGER = LoggerFactory.getLogger(Guild.class); public boolean needsUpdate; public int lastRequested = Emulator.getIntUnixTimestamp(); private int id; @@ -91,7 +94,7 @@ public class Guild implements Runnable { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -116,7 +119,7 @@ public class Guild implements Runnable { this.needsUpdate = false; } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } 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 a1c7227a..5107be53 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 @@ -9,11 +9,15 @@ import com.eu.habbo.plugin.events.guilds.forums.GuildForumThreadBeforeCreated; import com.eu.habbo.plugin.events.guilds.forums.GuildForumThreadCreated; import gnu.trove.map.hash.THashMap; import gnu.trove.set.hash.THashSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.*; import java.util.*; public class ForumThread implements Runnable, ISerialize { + private static final Logger LOGGER = LoggerFactory.getLogger(ForumThread.class); + private final static THashMap> guildThreadsCache = new THashMap<>(); private final static THashMap forumThreadsCache = new THashMap<>(); @@ -108,7 +112,7 @@ public class ForumThread implements Runnable, ISerialize { Emulator.getPluginManager().fireEvent(new GuildForumThreadCreated(createdThread)); } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return createdThread; @@ -156,7 +160,7 @@ public class ForumThread implements Runnable, ISerialize { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return threads; @@ -195,7 +199,7 @@ public class ForumThread implements Runnable, ISerialize { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return foundThread; @@ -337,7 +341,7 @@ public class ForumThread implements Runnable, ISerialize { addComment(comment); } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } @@ -461,7 +465,7 @@ public class ForumThread implements Runnable, ISerialize { this.needsUpdate = false; } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/guilds/forums/ForumThreadComment.java b/src/main/java/com/eu/habbo/habbohotel/guilds/forums/ForumThreadComment.java index 9ff93d55..1be9631a 100644 --- a/src/main/java/com/eu/habbo/habbohotel/guilds/forums/ForumThreadComment.java +++ b/src/main/java/com/eu/habbo/habbohotel/guilds/forums/ForumThreadComment.java @@ -8,10 +8,13 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.plugin.events.guilds.forums.GuildForumThreadCommentBeforeCreated; import com.eu.habbo.plugin.events.guilds.forums.GuildForumThreadCommentCreated; import gnu.trove.map.hash.THashMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.*; public class ForumThreadComment implements Runnable, ISerialize { + private static final Logger LOGGER = LoggerFactory.getLogger(ForumThreadComment.class); private static THashMap forumCommentsCache = new THashMap<>(); private final int commentId; @@ -64,7 +67,7 @@ public class ForumThreadComment implements Runnable, ISerialize { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return foundComment; @@ -103,7 +106,7 @@ public class ForumThreadComment implements Runnable, ISerialize { Emulator.getPluginManager().fireEvent(new GuildForumThreadCommentCreated(createdComment)); } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return createdComment; @@ -200,7 +203,7 @@ public class ForumThreadComment implements Runnable, ISerialize { this.needsUpdate = false; } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/hotelview/HallOfFame.java b/src/main/java/com/eu/habbo/habbohotel/hotelview/HallOfFame.java index ef7f1986..a4c398b8 100644 --- a/src/main/java/com/eu/habbo/habbohotel/hotelview/HallOfFame.java +++ b/src/main/java/com/eu/habbo/habbohotel/hotelview/HallOfFame.java @@ -2,6 +2,8 @@ package com.eu.habbo.habbohotel.hotelview; import com.eu.habbo.Emulator; import gnu.trove.map.hash.THashMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.ResultSet; @@ -9,6 +11,7 @@ import java.sql.SQLException; import java.sql.Statement; public class HallOfFame { + private static final Logger LOGGER = LoggerFactory.getLogger(HallOfFame.class); private final THashMap winners = new THashMap<>(); @@ -32,7 +35,7 @@ public class HallOfFame { this.winners.put(winner.getId(), winner); } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/hotelview/NewsList.java b/src/main/java/com/eu/habbo/habbohotel/hotelview/NewsList.java index 623cb2c5..b3bebc4f 100644 --- a/src/main/java/com/eu/habbo/habbohotel/hotelview/NewsList.java +++ b/src/main/java/com/eu/habbo/habbohotel/hotelview/NewsList.java @@ -1,6 +1,8 @@ package com.eu.habbo.habbohotel.hotelview; import com.eu.habbo.Emulator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.ResultSet; @@ -9,6 +11,8 @@ import java.sql.Statement; import java.util.ArrayList; public class NewsList { + private static final Logger LOGGER = LoggerFactory.getLogger(NewsList.class); + private final ArrayList newsWidgets; public NewsList() { @@ -25,7 +29,7 @@ public class NewsList { this.newsWidgets.add(new NewsWidget(set)); } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/CrackableReward.java b/src/main/java/com/eu/habbo/habbohotel/items/CrackableReward.java index 727fb47a..60497794 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/CrackableReward.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/CrackableReward.java @@ -1,6 +1,8 @@ package com.eu.habbo.habbohotel.items; import com.eu.habbo.Emulator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.ResultSet; import java.sql.SQLException; @@ -9,6 +11,8 @@ import java.util.HashMap; import java.util.Map; public class CrackableReward { + private static final Logger LOGGER = LoggerFactory.getLogger(CrackableReward.class); + public final int itemId; public final int count; public final Map> prizes; @@ -44,7 +48,7 @@ public class CrackableReward { itemId = Integer.valueOf(prize.split(":")[0]); chance = Integer.valueOf(prize.split(":")[1]); } else if (prize.contains(":")) { - Emulator.getLogging().logErrorLine("Invalid configuration of crackable prizes (item id: " + this.itemId + "). '" + prize + "' format should be itemId:chance."); + LOGGER.error("Invalid configuration of crackable prizes (item id: " + this.itemId + "). '" + prize + "' format should be itemId:chance."); } else { itemId = Integer.valueOf(prize.replace(":", "")); } @@ -52,7 +56,7 @@ public class CrackableReward { this.prizes.put(itemId, new AbstractMap.SimpleEntry<>(this.totalChance, this.totalChance + chance)); this.totalChance += chance; } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/RandomStateParams.java b/src/main/java/com/eu/habbo/habbohotel/items/RandomStateParams.java index 931be676..bc9662a3 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/RandomStateParams.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/RandomStateParams.java @@ -1,10 +1,13 @@ package com.eu.habbo.habbohotel.items; -import com.eu.habbo.Emulator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Arrays; public class RandomStateParams { + private static final Logger LOGGER = LoggerFactory.getLogger(RandomStateParams.class); + private int states = -1; private int delay = -1; @@ -22,7 +25,7 @@ public class RandomStateParams { this.delay = Integer.parseInt(keyValue[1]); break; default: - Emulator.getLogging().logDebugLine("RandomStateParams: unknown key: " + keyValue[0]); + LOGGER.warn("RandomStateParams: unknown key: " + keyValue[0]); break; } }); 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 e3b680cd..d2f3d3bf 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/YoutubeManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/YoutubeManager.java @@ -6,12 +6,13 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import gnu.trove.map.hash.THashMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.net.ssl.HttpsURLConnection; import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; -import java.net.MalformedURLException; import java.net.URL; import java.sql.*; import java.util.ArrayList; @@ -20,6 +21,8 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; public class YoutubeManager { + private static final Logger LOGGER = LoggerFactory.getLogger(YoutubeManager.class); + public class YoutubeVideo { private final String id; private final int duration; @@ -80,7 +83,7 @@ public class YoutubeManager { Emulator.getThreading().run(() -> { ExecutorService youtubeDataLoaderPool = Executors.newFixedThreadPool(10); - logger.info("YouTube Manager -> Loading..."); + LOGGER.info("YouTube Manager -> Loading..."); try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("SELECT * FROM youtube_playlists")) { try (ResultSet set = statement.executeQuery()) { @@ -95,7 +98,7 @@ public class YoutubeManager { if (playlist != null) { playlists.add(playlist); } else { - Emulator.getLogging().logErrorLine("Failed to load YouTube playlist: " + playlistId); + LOGGER.error("Failed to load YouTube playlist: " + playlistId); } this.playlists.put(itemId, playlists); @@ -103,7 +106,7 @@ public class YoutubeManager { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } youtubeDataLoaderPool.shutdown(); @@ -113,7 +116,7 @@ public class YoutubeManager { e.printStackTrace(); } - logger.info("YouTube Manager -> Loaded! (" + (System.currentTimeMillis() - millis) + " MS)"); + LOGGER.info("YouTube Manager -> Loaded! (" + (System.currentTimeMillis() - millis) + " MS)"); }); } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionColorPlate.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionColorPlate.java index cd089ec3..133e83c9 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionColorPlate.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionColorPlate.java @@ -1,14 +1,17 @@ package com.eu.habbo.habbohotel.items.interactions; -import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.items.Item; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomUnit; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.ResultSet; import java.sql.SQLException; public class InteractionColorPlate extends InteractionDefault { + private static final Logger LOGGER = LoggerFactory.getLogger(InteractionColorPlate.class); + public InteractionColorPlate(ResultSet set, Item baseItem) throws SQLException { super(set, baseItem); } @@ -41,7 +44,7 @@ public class InteractionColorPlate extends InteractionDefault { try { state = Integer.valueOf(this.getExtradata()); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } state += amount; diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionDefault.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionDefault.java index 95308f40..1db3a1d2 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionDefault.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionDefault.java @@ -1,6 +1,5 @@ package com.eu.habbo.habbohotel.items.interactions; -import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.bots.Bot; import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.items.Item; @@ -10,11 +9,15 @@ import com.eu.habbo.habbohotel.users.HabboGender; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.wired.WiredEffectType; import com.eu.habbo.messages.ServerMessage; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.ResultSet; import java.sql.SQLException; public class InteractionDefault extends HabboItem { + private static final Logger LOGGER = LoggerFactory.getLogger(InteractionDefault.class); + public InteractionDefault(ResultSet set, Item baseItem) throws SQLException { super(set, baseItem); } @@ -74,7 +77,7 @@ public class InteractionDefault extends HabboItem { try { currentState = Integer.valueOf(this.getExtradata()); } catch (NumberFormatException e) { - Emulator.getLogging().logErrorLine("Incorrect extradata (" + this.getExtradata() + ") for item ID (" + this.getId() + ") of type (" + this.getBaseItem().getName() + ")"); + LOGGER.error("Incorrect extradata (" + this.getExtradata() + ") for item ID (" + this.getId() + ") of type (" + this.getBaseItem().getName() + ")"); } this.setExtradata("" + (currentState + 1) % this.getBaseItem().getStateCount()); diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionGift.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionGift.java index 869b59a3..41fb4dc1 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionGift.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionGift.java @@ -8,11 +8,15 @@ import com.eu.habbo.habbohotel.rooms.RoomUnit; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.ServerMessage; import gnu.trove.set.hash.THashSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.ResultSet; import java.sql.SQLException; public class InteractionGift extends HabboItem { + private static final Logger LOGGER = LoggerFactory.getLogger(InteractionGift.class); + public boolean explode = false; private int[] itemId; private int colorId = 0; @@ -28,7 +32,7 @@ public class InteractionGift extends HabboItem { try { this.loadData(); } catch (Exception e) { - Emulator.getLogging().logDebugLine("Incorrect extradata for gift with ID " + this.getId()); + LOGGER.warn("Incorrect extradata for gift with ID " + this.getId()); } } @@ -38,7 +42,7 @@ public class InteractionGift extends HabboItem { try { this.loadData(); } catch (Exception e) { - Emulator.getLogging().logDebugLine("Incorrect extradata for gift with ID " + this.getId()); + LOGGER.warn("Incorrect extradata for gift with ID " + this.getId()); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMusicDisc.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMusicDisc.java index 9a163257..f001fc20 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMusicDisc.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMusicDisc.java @@ -1,17 +1,19 @@ package com.eu.habbo.habbohotel.items.interactions; -import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.items.Item; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomUnit; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.ServerMessage; -import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxMySongsComposer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.ResultSet; import java.sql.SQLException; public class InteractionMusicDisc extends HabboItem { + private static final Logger LOGGER = LoggerFactory.getLogger(InteractionMusicDisc.class); + private int songId; public InteractionMusicDisc(ResultSet set, Item baseItem) throws SQLException { @@ -23,7 +25,7 @@ public class InteractionMusicDisc extends HabboItem { try { this.songId = Integer.valueOf(stuff[6]); } catch (Exception e) { - Emulator.getLogging().logErrorLine("Warning: Item " + this.getId() + " has an invalid song id set for its music disk!"); + LOGGER.error("Warning: Item " + this.getId() + " has an invalid song id set for its music disk!"); } } } @@ -37,7 +39,7 @@ public class InteractionMusicDisc extends HabboItem { try { this.songId = Integer.valueOf(stuff[6]); } catch (Exception e) { - Emulator.getLogging().logErrorLine("Warning: Item " + this.getId() + " has an invalid song id set for its music disk!"); + LOGGER.error("Warning: Item " + this.getId() + " has an invalid song id set for its music disk!"); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionRentableSpace.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionRentableSpace.java index d1ee8065..48a4d35a 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionRentableSpace.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionRentableSpace.java @@ -12,6 +12,8 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.rooms.items.rentablespaces.RentableSpaceInfoComposer; import com.eu.habbo.threading.runnables.ClearRentedSpace; import gnu.trove.set.hash.THashSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.awt.*; import java.sql.Connection; @@ -20,6 +22,8 @@ import java.sql.ResultSet; import java.sql.SQLException; public class InteractionRentableSpace extends HabboItem { + private static final Logger LOGGER = LoggerFactory.getLogger(InteractionRentableSpace.class); + private int renterId; private String renterName; private int endTimestamp; @@ -50,7 +54,7 @@ public class InteractionRentableSpace extends HabboItem { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } else { @@ -180,7 +184,7 @@ public class InteractionRentableSpace extends HabboItem { statement.setInt(1, zero); statement.setInt(2, zero); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionWired.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionWired.java index e3c9c702..a465367c 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionWired.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionWired.java @@ -7,6 +7,8 @@ import com.eu.habbo.habbohotel.rooms.RoomUnit; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.rooms.items.ItemStateComposer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -14,6 +16,7 @@ import java.sql.ResultSet; import java.sql.SQLException; public abstract class InteractionWired extends HabboItem { + private static final Logger LOGGER = LoggerFactory.getLogger(InteractionWired.class); private long cooldown; InteractionWired(ResultSet set, Item baseItem) throws SQLException { @@ -71,7 +74,7 @@ public abstract class InteractionWired extends HabboItem { statement.setInt(2, this.getId()); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } super.run(); 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 88a196ac..9708c565 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 @@ -3,19 +3,23 @@ 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.wired.highscores.WiredHighscoreRow; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomUnit; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.wired.highscores.WiredHighscoreClearType; +import com.eu.habbo.habbohotel.wired.highscores.WiredHighscoreRow; import com.eu.habbo.habbohotel.wired.highscores.WiredHighscoreScoreType; import com.eu.habbo.messages.ServerMessage; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.ResultSet; import java.sql.SQLException; import java.util.List; public class InteractionWiredHighscore extends HabboItem { + private static final Logger LOGGER = LoggerFactory.getLogger(InteractionWiredHighscore.class); + public WiredHighscoreScoreType scoreType; public WiredHighscoreClearType clearType; @@ -33,7 +37,7 @@ public class InteractionWiredHighscore extends HabboItem { this.scoreType = WiredHighscoreScoreType.valueOf(name); this.clearType = WiredHighscoreClearType.values()[ctype]; } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } this.reloadData(); @@ -51,7 +55,7 @@ public class InteractionWiredHighscore extends HabboItem { this.scoreType = WiredHighscoreScoreType.valueOf(name); this.clearType = WiredHighscoreClearType.values()[ctype]; } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } this.reloadData(); @@ -83,7 +87,7 @@ public class InteractionWiredHighscore extends HabboItem { this.setExtradata(Math.abs(state - 1) + ""); room.updateItem(this); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/InteractionGameTimer.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/InteractionGameTimer.java index 3b064dfa..6197b017 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/InteractionGameTimer.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/InteractionGameTimer.java @@ -13,12 +13,16 @@ import com.eu.habbo.habbohotel.wired.WiredEffectType; import com.eu.habbo.habbohotel.wired.WiredHandler; import com.eu.habbo.habbohotel.wired.WiredTriggerType; import com.eu.habbo.messages.ServerMessage; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Arrays; public class InteractionGameTimer extends HabboItem implements Runnable { + private static final Logger LOGGER = LoggerFactory.getLogger(InteractionGameTimer.class); + private int[] TIMER_INTERVAL_STEPS = new int[] { 30, 60, 120, 180, 300, 600 }; private int baseTime = 0; @@ -89,7 +93,7 @@ public class InteractionGameTimer extends HabboItem implements Runnable { } }).toArray(); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } @@ -117,7 +121,7 @@ public class InteractionGameTimer extends HabboItem implements Runnable { room.addGame(game); game.initialise(); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionHabboHasHandItem.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionHabboHasHandItem.java index 079ac0e0..e47107c3 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionHabboHasHandItem.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionHabboHasHandItem.java @@ -1,6 +1,5 @@ package com.eu.habbo.habbohotel.items.interactions.wired.conditions; -import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.items.Item; import com.eu.habbo.habbohotel.items.interactions.InteractionWiredCondition; import com.eu.habbo.habbohotel.rooms.Room; @@ -8,11 +7,15 @@ import com.eu.habbo.habbohotel.rooms.RoomUnit; import com.eu.habbo.habbohotel.wired.WiredConditionType; import com.eu.habbo.messages.ClientMessage; import com.eu.habbo.messages.ServerMessage; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.ResultSet; import java.sql.SQLException; public class WiredConditionHabboHasHandItem extends InteractionWiredCondition { + private static final Logger LOGGER = LoggerFactory.getLogger(WiredConditionHabboHasHandItem.class); + public static final WiredConditionType type = WiredConditionType.ACTOR_HAS_HANDITEM; private int handItem; @@ -71,7 +74,7 @@ public class WiredConditionHabboHasHandItem extends InteractionWiredCondition { try { this.handItem = Integer.valueOf(set.getString("wired_data")); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMatchFurni.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMatchFurni.java index b379fe9c..f4642bf5 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMatchFurni.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMatchFurni.java @@ -17,11 +17,15 @@ import com.eu.habbo.messages.ClientMessage; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.rooms.items.FloorItemOnRollerComposer; import gnu.trove.set.hash.THashSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.ResultSet; import java.sql.SQLException; public class WiredEffectMatchFurni extends InteractionWiredEffect { + private static final Logger LOGGER = LoggerFactory.getLogger(WiredEffectMatchFurni.class); + private static final WiredEffectType type = WiredEffectType.MATCH_SSHOT; public boolean checkForWiredResetPermission = true; private THashSet settings; @@ -189,7 +193,7 @@ public class WiredEffectMatchFurni extends InteractionWiredEffect { } } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectToggleFurni.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectToggleFurni.java index 2605a4f8..e602c042 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectToggleFurni.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectToggleFurni.java @@ -19,6 +19,8 @@ import com.eu.habbo.messages.ClientMessage; import com.eu.habbo.messages.ServerMessage; import gnu.trove.procedure.TObjectProcedure; import gnu.trove.set.hash.THashSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.ResultSet; import java.sql.SQLException; @@ -26,6 +28,8 @@ import java.util.ArrayList; import java.util.List; public class WiredEffectToggleFurni extends InteractionWiredEffect { + private static final Logger LOGGER = LoggerFactory.getLogger(WiredEffectToggleFurni.class); + public static final WiredEffectType type = WiredEffectType.TOGGLE_STATE; private final THashSet items; @@ -136,7 +140,7 @@ public class WiredEffectToggleFurni extends InteractionWiredEffect { item.onClick(habbo != null && !(item instanceof InteractionGameTimer) ? habbo.getClient() : null, room, new Object[]{state, this.getType()}); } } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectToggleRandom.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectToggleRandom.java index 0caf0ef3..98b41137 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectToggleRandom.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectToggleRandom.java @@ -17,6 +17,8 @@ import com.eu.habbo.messages.ClientMessage; import com.eu.habbo.messages.ServerMessage; import gnu.trove.procedure.TObjectProcedure; import gnu.trove.set.hash.THashSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.ResultSet; import java.sql.SQLException; @@ -24,6 +26,8 @@ import java.util.ArrayList; import java.util.List; public class WiredEffectToggleRandom extends InteractionWiredEffect { + private static final Logger LOGGER = LoggerFactory.getLogger(WiredEffectToggleRandom.class); + public static final WiredEffectType type = WiredEffectType.TOGGLE_RANDOM; private final THashSet items = new THashSet<>(); @@ -120,7 +124,7 @@ public class WiredEffectToggleRandom extends InteractionWiredEffect { item.setExtradata(Emulator.getRandom().nextInt(item.getBaseItem().getStateCount() + 1) + ""); room.updateItem(item); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/extra/WiredBlob.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/extra/WiredBlob.java index b46c81c9..0017efe8 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/extra/WiredBlob.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/extra/WiredBlob.java @@ -1,22 +1,24 @@ package com.eu.habbo.habbohotel.items.interactions.wired.extra; -import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.games.GamePlayer; import com.eu.habbo.habbohotel.games.GameState; import com.eu.habbo.habbohotel.games.battlebanzai.BattleBanzaiGame; -import com.eu.habbo.habbohotel.games.freeze.FreezeGame; import com.eu.habbo.habbohotel.items.Item; import com.eu.habbo.habbohotel.items.interactions.InteractionDefault; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomUnit; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.wired.WiredEffectType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.ResultSet; import java.sql.SQLException; public class WiredBlob extends InteractionDefault { + private static final Logger LOGGER = LoggerFactory.getLogger(WiredBlob.class); + enum WiredBlobState { ACTIVE("0"), USED("1"); @@ -104,14 +106,14 @@ public class WiredBlob extends InteractionDefault { String[] params = this.getBaseItem().getCustomParams().split(","); if (params.length != 2) { - Emulator.getLogging().logErrorLine("Wired blobs should have customparams with two parameters (points,resetsWithGame)"); + LOGGER.error("Wired blobs should have customparams with two parameters (points,resetsWithGame)"); return; } try { this.POINTS_REWARD = Integer.parseInt(params[0]); } catch (NumberFormatException e) { - Emulator.getLogging().logErrorLine("Wired blobs should have customparams with the first parameter being the amount of points (number)"); + LOGGER.error("Wired blobs should have customparams with the first parameter being the amount of points (number)"); return; } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/triggers/WiredTriggerBotReachedFurni.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/triggers/WiredTriggerBotReachedFurni.java index 56b98ebd..73c543c3 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/triggers/WiredTriggerBotReachedFurni.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/triggers/WiredTriggerBotReachedFurni.java @@ -14,6 +14,8 @@ import com.eu.habbo.messages.ClientMessage; import com.eu.habbo.messages.ServerMessage; import gnu.trove.procedure.TObjectProcedure; import gnu.trove.set.hash.THashSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.ResultSet; import java.sql.SQLException; @@ -21,6 +23,8 @@ import java.util.ArrayList; import java.util.List; public class WiredTriggerBotReachedFurni extends InteractionWiredTrigger { + private static final Logger LOGGER = LoggerFactory.getLogger(WiredTriggerBotReachedFurni.class); + public final static WiredTriggerType type = WiredTriggerType.BOT_REACHED_STF; private THashSet items; @@ -157,7 +161,7 @@ public class WiredTriggerBotReachedFurni extends InteractionWiredTrigger { if (item != null) this.items.add(item); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/messenger/Message.java b/src/main/java/com/eu/habbo/habbohotel/messenger/Message.java index 5949ae4b..a081bfc5 100644 --- a/src/main/java/com/eu/habbo/habbohotel/messenger/Message.java +++ b/src/main/java/com/eu/habbo/habbohotel/messenger/Message.java @@ -1,12 +1,16 @@ package com.eu.habbo.habbohotel.messenger; import com.eu.habbo.Emulator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; public class Message implements Runnable { + private static final Logger LOGGER = LoggerFactory.getLogger(Message.class); + private final int fromId; private final int toId; private final int timestamp; @@ -31,7 +35,7 @@ public class Message implements Runnable { statement.setInt(4, this.timestamp); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/messenger/Messenger.java b/src/main/java/com/eu/habbo/habbohotel/messenger/Messenger.java index 250a7a52..15ef797a 100644 --- a/src/main/java/com/eu/habbo/habbohotel/messenger/Messenger.java +++ b/src/main/java/com/eu/habbo/habbohotel/messenger/Messenger.java @@ -11,6 +11,8 @@ import com.eu.habbo.plugin.events.users.friends.UserAcceptFriendRequestEvent; import gnu.trove.map.hash.THashMap; import gnu.trove.set.hash.THashSet; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -20,6 +22,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class Messenger { + + private static final Logger LOGGER = LoggerFactory.getLogger(Messenger.class); + //Configuration. Loaded from database & updated accordingly. public static boolean SAVE_PRIVATE_CHATS = false; public static int MAXIMUM_FRIENDS = 200; @@ -41,7 +46,7 @@ public class Messenger { statement.setInt(4, userOne); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -55,7 +60,7 @@ public class Messenger { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return users; } @@ -85,7 +90,7 @@ public class Messenger { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return false; @@ -102,7 +107,7 @@ public class Messenger { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return false; @@ -114,7 +119,7 @@ public class Messenger { statement.setInt(2, userFrom); statement.executeUpdate(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -133,7 +138,7 @@ public class Messenger { count = set.getInt("count"); } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return count; @@ -157,7 +162,7 @@ public class Messenger { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return map; } @@ -213,7 +218,7 @@ public class Messenger { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -237,7 +242,7 @@ public class Messenger { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return buddy; @@ -252,7 +257,7 @@ public class Messenger { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -311,7 +316,7 @@ public class Messenger { statement.setInt(1, userTo); statement.executeUpdate(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -323,7 +328,7 @@ public class Messenger { statement.setInt(3, userFrom); return statement.executeUpdate(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return 0; @@ -345,7 +350,7 @@ public class Messenger { statement.setInt(3, Emulator.getIntUnixTimestamp()); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } Habbo habboTo = Emulator.getGameServer().getGameClientManager().getHabbo(userTo); diff --git a/src/main/java/com/eu/habbo/habbohotel/messenger/MessengerBuddy.java b/src/main/java/com/eu/habbo/habbohotel/messenger/MessengerBuddy.java index 2ce143bf..4a292b87 100644 --- a/src/main/java/com/eu/habbo/habbohotel/messenger/MessengerBuddy.java +++ b/src/main/java/com/eu/habbo/habbohotel/messenger/MessengerBuddy.java @@ -7,6 +7,8 @@ import com.eu.habbo.habbohotel.users.HabboGender; import com.eu.habbo.messages.ISerialize; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.friends.FriendChatMessageComposer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -14,6 +16,7 @@ import java.sql.ResultSet; import java.sql.SQLException; public class MessengerBuddy implements Runnable, ISerialize { + private static final Logger LOGGER = LoggerFactory.getLogger(MessengerBuddy.class); private int id; private String username; @@ -44,7 +47,7 @@ public class MessengerBuddy implements Runnable, ISerialize { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -56,7 +59,7 @@ public class MessengerBuddy implements Runnable, ISerialize { this.relation = 0; this.userOne = 0; } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -149,7 +152,7 @@ public class MessengerBuddy implements Runnable, ISerialize { statement.setInt(3, this.id); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolBan.java b/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolBan.java index e79c9ad3..3c8517da 100644 --- a/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolBan.java +++ b/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolBan.java @@ -1,6 +1,8 @@ package com.eu.habbo.habbohotel.modtool; import com.eu.habbo.Emulator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -9,6 +11,8 @@ import java.sql.SQLException; import java.text.SimpleDateFormat; public class ModToolBan implements Runnable { + private static final Logger LOGGER = LoggerFactory.getLogger(ModToolBan.class); + public static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); public int userId; public String ip; @@ -63,7 +67,7 @@ public class ModToolBan implements Runnable { statement.setInt(9, this.cfhTopic); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolManager.java b/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolManager.java index de887280..da144f97 100644 --- a/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolManager.java @@ -1,6 +1,7 @@ package com.eu.habbo.habbohotel.modtool; import com.eu.habbo.Emulator; +import com.eu.habbo.habbohotel.bots.BotManager; import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.permissions.Permission; import com.eu.habbo.habbohotel.rooms.Room; @@ -21,6 +22,8 @@ import gnu.trove.map.hash.TIntObjectHashMap; import gnu.trove.procedure.TObjectProcedure; import gnu.trove.set.hash.THashSet; import io.netty.channel.Channel; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.net.InetSocketAddress; import java.sql.*; @@ -29,6 +32,8 @@ import java.util.List; import java.util.Map; public class ModToolManager { + private static final Logger LOGGER = LoggerFactory.getLogger(ModToolManager.class); + private final TIntObjectMap category; private final THashMap> presets; private final THashMap tickets; @@ -41,7 +46,7 @@ public class ModToolManager { this.tickets = new THashMap<>(); this.cfhCategories = new TIntObjectHashMap<>(); this.loadModTool(); - logger.info("ModTool Manager -> Loaded! (" + (System.currentTimeMillis() - millis) + " MS)"); + LOGGER.info("ModTool Manager -> Loaded! (" + (System.currentTimeMillis() - millis) + " MS)"); } public static void requestUserInfo(GameClient client, ClientMessage packet) { @@ -58,9 +63,9 @@ public class ModToolManager { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } @@ -78,7 +83,7 @@ public class ModToolManager { this.loadTickets(connection); this.loadCfhCategories(connection); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -97,7 +102,7 @@ public class ModToolManager { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -108,7 +113,7 @@ public class ModToolManager { this.presets.get(set.getString("type")).add(set.getString("preset")); } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } @@ -120,7 +125,7 @@ public class ModToolManager { this.tickets.put(set.getInt("id"), new ModToolIssue(set)); } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } @@ -146,7 +151,7 @@ public class ModToolManager { this.cfhCategories.get(set.getInt("support_cfh_category_id")).addTopic(new CfhTopic(set, this.getIssuePreset(set.getInt("default_sanction")))); } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -198,7 +203,7 @@ public class ModToolManager { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return chatlogs; @@ -215,7 +220,7 @@ public class ModToolManager { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return chatlogs; @@ -235,7 +240,7 @@ public class ModToolManager { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return chatLogs; @@ -272,7 +277,7 @@ public class ModToolManager { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return chatlogs; @@ -290,7 +295,7 @@ public class ModToolManager { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return roomVisits; @@ -348,7 +353,7 @@ public class ModToolManager { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return roomVisits; @@ -378,7 +383,7 @@ public class ModToolManager { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return null; @@ -495,7 +500,7 @@ public class ModToolManager { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return ban; @@ -519,7 +524,7 @@ public class ModToolManager { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return banned; @@ -543,7 +548,7 @@ public class ModToolManager { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return false; @@ -557,7 +562,7 @@ public class ModToolManager { statement.execute(); return statement.getUpdateCount() > 0; } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return false; @@ -662,7 +667,7 @@ public class ModToolManager { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return total; diff --git a/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolSanctions.java b/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolSanctions.java index e909120a..3960d07e 100644 --- a/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolSanctions.java +++ b/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolSanctions.java @@ -4,6 +4,8 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.plugin.events.sanctions.SanctionEvent; import gnu.trove.map.hash.THashMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -13,6 +15,7 @@ import java.util.ArrayList; import java.util.Date; public class ModToolSanctions { + private static final Logger LOGGER = LoggerFactory.getLogger(ModToolSanctions.class); private final THashMap> sanctionHashmap; private final THashMap sanctionLevelsHashmap; @@ -22,8 +25,8 @@ public class ModToolSanctions { this.sanctionHashmap = new THashMap<>(); this.sanctionLevelsHashmap = new THashMap<>(); this.loadModSanctions(); - logger.info("Sanctions Manager -> Loaded! (" + (System.currentTimeMillis() - millis) + " MS)"); + LOGGER.info("Sanctions Manager -> Loaded! (" + (System.currentTimeMillis() - millis) + " MS)"); } public synchronized void loadModSanctions() { @@ -41,7 +44,7 @@ public class ModToolSanctions { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -68,7 +71,7 @@ public class ModToolSanctions { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return this.sanctionHashmap; @@ -87,7 +90,7 @@ public class ModToolSanctions { statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -98,7 +101,7 @@ public class ModToolSanctions { statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -109,7 +112,7 @@ public class ModToolSanctions { statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -120,7 +123,7 @@ public class ModToolSanctions { statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/modtool/WordFilter.java b/src/main/java/com/eu/habbo/habbohotel/modtool/WordFilter.java index f13e95fc..791d12d5 100644 --- a/src/main/java/com/eu/habbo/habbohotel/modtool/WordFilter.java +++ b/src/main/java/com/eu/habbo/habbohotel/modtool/WordFilter.java @@ -9,6 +9,8 @@ import com.eu.habbo.plugin.events.users.UserTriggerWordFilterEvent; import gnu.trove.iterator.hash.TObjectHashIterator; import gnu.trove.set.hash.THashSet; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.ResultSet; @@ -18,6 +20,8 @@ import java.text.Normalizer; import java.util.regex.Pattern; public class WordFilter { + private static final Logger LOGGER = LoggerFactory.getLogger(WordFilter.class); + private static final Pattern DIACRITICS_AND_FRIENDS = Pattern.compile("[\\p{InCombiningDiacriticalMarks}\\p{IsLm}\\p{IsSk}]+"); //Configuration. Loaded from database & updated accordingly. public static boolean ENABLED_FRIENDCHAT = true; @@ -29,7 +33,7 @@ public class WordFilter { public WordFilter() { long start = System.currentTimeMillis(); this.reload(); - logger.info("WordFilter -> Loaded! (" + (System.currentTimeMillis() - start) + " MS)"); + LOGGER.info("WordFilter -> Loaded! (" + (System.currentTimeMillis() - start) + " MS)"); } private static String stripDiacritics(String str) { @@ -54,7 +58,7 @@ public class WordFilter { try { word = new WordFilterWord(set); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); continue; } @@ -67,7 +71,7 @@ public class WordFilter { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/permissions/PermissionsManager.java b/src/main/java/com/eu/habbo/habbohotel/permissions/PermissionsManager.java index 7051d864..e815b4b1 100644 --- a/src/main/java/com/eu/habbo/habbohotel/permissions/PermissionsManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/permissions/PermissionsManager.java @@ -6,6 +6,8 @@ import com.eu.habbo.plugin.HabboPlugin; import gnu.trove.map.hash.THashMap; import gnu.trove.map.hash.TIntIntHashMap; import gnu.trove.map.hash.TIntObjectHashMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.*; import java.util.ArrayList; @@ -13,6 +15,8 @@ import java.util.List; import java.util.Set; public class PermissionsManager { + private static final Logger LOGGER = LoggerFactory.getLogger(PermissionsManager.class); + private final TIntObjectHashMap ranks; private final TIntIntHashMap enables; private final THashMap> badges; @@ -25,7 +29,7 @@ public class PermissionsManager { this.reload(); - logger.info("Permissions Manager -> Loaded! (" + (System.currentTimeMillis() - millis) + " MS)"); + LOGGER.info("Permissions Manager -> Loaded! (" + (System.currentTimeMillis() - millis) + " MS)"); } public void reload() { @@ -58,7 +62,7 @@ public class PermissionsManager { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -71,7 +75,7 @@ public class PermissionsManager { this.enables.put(set.getInt("effect_id"), set.getInt("min_rank")); } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/pets/GnomePet.java b/src/main/java/com/eu/habbo/habbohotel/pets/GnomePet.java index de49ac85..b488f968 100644 --- a/src/main/java/com/eu/habbo/habbohotel/pets/GnomePet.java +++ b/src/main/java/com/eu/habbo/habbohotel/pets/GnomePet.java @@ -4,6 +4,8 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.achievements.AchievementManager; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.ServerMessage; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -11,6 +13,8 @@ import java.sql.ResultSet; import java.sql.SQLException; public class GnomePet extends Pet implements IPetLook { + private static final Logger LOGGER = LoggerFactory.getLogger(GnomePet.class); + private final String gnomeData; public GnomePet(ResultSet set) throws SQLException { @@ -47,7 +51,7 @@ public class GnomePet extends Pet implements IPetLook { statement.setInt(2, this.id); statement.executeUpdate(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/pets/HorsePet.java b/src/main/java/com/eu/habbo/habbohotel/pets/HorsePet.java index c4cbc233..666fa8d1 100644 --- a/src/main/java/com/eu/habbo/habbohotel/pets/HorsePet.java +++ b/src/main/java/com/eu/habbo/habbohotel/pets/HorsePet.java @@ -1,6 +1,8 @@ package com.eu.habbo.habbohotel.pets; import com.eu.habbo.Emulator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -8,6 +10,8 @@ import java.sql.ResultSet; import java.sql.SQLException; public class HorsePet extends RideablePet { + private static final Logger LOGGER = LoggerFactory.getLogger(HorsePet.class); + private int hairColor; private int hairStyle; @@ -40,7 +44,7 @@ public class HorsePet extends RideablePet { statement.setInt(6, super.getId()); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } super.run(); diff --git a/src/main/java/com/eu/habbo/habbohotel/pets/MonsterplantPet.java b/src/main/java/com/eu/habbo/habbohotel/pets/MonsterplantPet.java index 3f242328..7d4d0300 100644 --- a/src/main/java/com/eu/habbo/habbohotel/pets/MonsterplantPet.java +++ b/src/main/java/com/eu/habbo/habbohotel/pets/MonsterplantPet.java @@ -13,6 +13,8 @@ import com.eu.habbo.messages.outgoing.rooms.pets.PetStatusUpdateComposer; import com.eu.habbo.messages.outgoing.rooms.pets.RoomPetRespectComposer; import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; import org.apache.commons.math3.util.Pair; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -23,6 +25,8 @@ import java.util.LinkedHashMap; import java.util.Map; public class MonsterplantPet extends Pet implements IPetLook { + private static final Logger LOGGER = LoggerFactory.getLogger(MonsterplantPet.class); + public static final Map> bodyRarity = new LinkedHashMap>() { { this.put(1, new Pair<>("Blungon", 0)); @@ -138,7 +142,7 @@ public class MonsterplantPet extends Pet implements IPetLook { statement.setInt(13, this.id); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/pets/Pet.java b/src/main/java/com/eu/habbo/habbohotel/pets/Pet.java index 143f7962..d5e13742 100644 --- a/src/main/java/com/eu/habbo/habbohotel/pets/Pet.java +++ b/src/main/java/com/eu/habbo/habbohotel/pets/Pet.java @@ -14,6 +14,8 @@ import com.eu.habbo.messages.outgoing.rooms.users.RoomUserRemoveComposer; import com.eu.habbo.messages.outgoing.rooms.users.RoomUserTalkComposer; import com.eu.habbo.plugin.events.pets.PetTalkEvent; import gnu.trove.map.hash.THashMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.*; import java.util.Calendar; @@ -21,6 +23,7 @@ import java.util.Map; import java.util.TimeZone; public class Pet implements ISerialize, Runnable { + private static final Logger LOGGER = LoggerFactory.getLogger(Pet.class); public int levelThirst; public int levelHunger; @@ -62,7 +65,7 @@ public class Pet implements ISerialize, Runnable { this.name = set.getString("name"); this.petData = Emulator.getGameEnvironment().getPetManager().getPetData(set.getInt("type")); if (this.petData == null) { - Emulator.getLogging().logErrorLine("WARNING! Missing pet data for type: " + set.getInt("type") + "! Insert a new entry into the pet_actions table for this type!"); + LOGGER.error("WARNING! Missing pet data for type: " + set.getInt("type") + "! Insert a new entry into the pet_actions table for this type!"); this.petData = Emulator.getGameEnvironment().getPetManager().getPetData(0); } this.race = set.getInt("race"); @@ -85,7 +88,7 @@ public class Pet implements ISerialize, Runnable { this.petData = Emulator.getGameEnvironment().getPetManager().getPetData(type); if (this.petData == null) { - Emulator.getLogging().logErrorLine(new Exception("WARNING! Missing pet data for type: " + type + "! Insert a new entry into the pet_actions table for this type!")); + LOGGER.warn("Missing pet data for type: " + type + "! Insert a new entry into the pet_actions table for this type!"); } this.race = race; @@ -205,7 +208,7 @@ public class Pet implements ISerialize, Runnable { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } this.needsUpdate = false; 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 dce3d5f4..6b8b3d77 100644 --- a/src/main/java/com/eu/habbo/habbohotel/pets/PetManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/pets/PetManager.java @@ -19,7 +19,8 @@ import gnu.trove.map.hash.TIntObjectHashMap; import gnu.trove.procedure.TIntObjectProcedure; import gnu.trove.set.hash.THashSet; import org.apache.commons.math3.distribution.NormalDistribution; -import org.apache.commons.math3.util.Pair; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.*; import java.util.ArrayList; @@ -27,6 +28,7 @@ import java.util.Collection; import java.util.Map; public class PetManager { + private static final Logger LOGGER = LoggerFactory.getLogger(PetManager.class); public static final int[] experiences = new int[]{100, 200, 400, 600, 900, 1300, 1800, 2400, 3200, 4300, 5700, 7600, 10100, 13300, 17500, 23000, 30200, 39600, 51900}; static int[] skins = new int[]{0, 1, 6, 7}; public final THashMap petActions = new THashMap() { @@ -80,7 +82,7 @@ public class PetManager { reloadPetData(); - logger.info("Pet Manager -> Loaded! (" + (System.currentTimeMillis() - millis) + " MS)"); + LOGGER.info("Pet Manager -> Loaded! (" + (System.currentTimeMillis() - millis) + " MS)"); } public static int getLevel(int experience) { @@ -151,8 +153,8 @@ public class PetManager { this.loadPetCommands(connection); this.loadPetBreeding(connection); } catch (SQLException e) { - logger.error("Caught SQL exception", e); - Emulator.getLogging().logErrorLine("Pet Manager -> Failed to load!"); + LOGGER.error("Caught SQL exception", e); + LOGGER.error("Pet Manager -> Failed to load!"); } } @@ -167,7 +169,7 @@ public class PetManager { this.petRaces.get(set.getInt("race")).add(new PetRace(set)); } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -177,7 +179,7 @@ public class PetManager { this.petData.put(set.getInt("pet_type"), new PetData(set)); } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } this.loadPetItems(connection); @@ -217,7 +219,7 @@ public class PetManager { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -231,10 +233,10 @@ public class PetManager { if (petVocalsType != null) { this.petData.get(set.getInt("pet_id")).petVocals.get(petVocalsType).add(new PetVocal(set.getString("message"))); } else { - Emulator.getLogging().logErrorLine("Unknown pet vocal type " + set.getString("type")); + LOGGER.error("Unknown pet vocal type " + set.getString("type")); } } else { - Emulator.getLogging().logErrorLine("Missing pet_actions table entry for pet id " + set.getInt("pet_id")); + LOGGER.error("Missing pet_actions table entry for pet id " + set.getInt("pet_id")); } } else { if (!PetData.generalPetVocals.containsKey(PetVocalsType.valueOf(set.getString("type").toUpperCase()))) @@ -244,7 +246,7 @@ public class PetManager { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -255,7 +257,7 @@ public class PetManager { commandsList.put(set.getInt("command_id"), new PetCommand(set, this.petActions.get(set.getInt("command_id")))); } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } try (Statement statement = connection.createStatement(); ResultSet set = statement.executeQuery("SELECT * FROM pet_commands ORDER BY pet_id ASC")) { @@ -267,7 +269,7 @@ public class PetManager { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -277,7 +279,7 @@ public class PetManager { this.breedingPetType.put(set.getInt("pet_id"), set.getInt("offspring_id")); } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } try (Statement statement = connection.createStatement(); ResultSet set = statement.executeQuery("SELECT * FROM pet_breeding_races")) { @@ -294,13 +296,13 @@ public class PetManager { this.breedingReward.get(reward.petType).get(reward.rarityLevel).add(reward); } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } public THashSet getBreeds(String petName) { if (!petName.startsWith("a0 pet")) { - Emulator.getLogging().logErrorLine("Pet " + petName + " not found. Make sure it matches the pattern \"a0 pet\"!"); + LOGGER.error("Pet " + petName + " not found. Make sure it matches the pattern \"a0 pet\"!"); return null; } @@ -308,7 +310,7 @@ public class PetManager { int petId = Integer.valueOf(petName.split("t")[1]); return this.petRaces.get(petId); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } return null; @@ -346,7 +348,7 @@ public class PetManager { return this.petData.get(type); } else { try (Connection connection = Emulator.getDatabase().getDataSource().getConnection()) { - Emulator.getLogging().logErrorLine("Missing petdata for type " + type + ". Adding this to the database..."); + LOGGER.error("Missing petdata for type " + type + ". Adding this to the database..."); try (PreparedStatement statement = connection.prepareStatement("INSERT INTO pet_actions (pet_type) VALUES (?)")) { statement.setInt(1, type); statement.execute(); @@ -358,13 +360,13 @@ public class PetManager { if (set.next()) { PetData petData = new PetData(set); this.petData.put(type, petData); - Emulator.getLogging().logErrorLine("Missing petdata for type " + type + " added to the database!"); + LOGGER.error("Missing petdata for type " + type + " added to the database!"); return petData; } } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } @@ -511,7 +513,7 @@ public class PetManager { statement.setInt(1, pet.getId()); return statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return false; diff --git a/src/main/java/com/eu/habbo/habbohotel/polls/PollManager.java b/src/main/java/com/eu/habbo/habbohotel/polls/PollManager.java index 2841e741..8e2d78a5 100644 --- a/src/main/java/com/eu/habbo/habbohotel/polls/PollManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/polls/PollManager.java @@ -3,10 +3,14 @@ package com.eu.habbo.habbohotel.polls; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.Habbo; import gnu.trove.map.hash.THashMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.*; public class PollManager { + private static final Logger LOGGER = LoggerFactory.getLogger(PollManager.class); + private final THashMap activePolls = new THashMap<>(); public PollManager() { @@ -23,7 +27,7 @@ public class PollManager { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return false; } @@ -63,7 +67,7 @@ public class PollManager { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/CustomRoomLayout.java b/src/main/java/com/eu/habbo/habbohotel/rooms/CustomRoomLayout.java index 4a30e521..3ca0650f 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/CustomRoomLayout.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/CustomRoomLayout.java @@ -1,6 +1,8 @@ package com.eu.habbo.habbohotel.rooms; import com.eu.habbo.Emulator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -8,6 +10,8 @@ import java.sql.ResultSet; import java.sql.SQLException; public class CustomRoomLayout extends RoomLayout implements Runnable { + private static final Logger LOGGER = LoggerFactory.getLogger(CustomRoomLayout.class); + private final int roomId; private boolean needsUpdate; @@ -30,7 +34,7 @@ public class CustomRoomLayout extends RoomLayout implements Runnable { statement.setInt(5, this.roomId); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } 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 a5d3975c..69b53ec0 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java @@ -72,6 +72,8 @@ import gnu.trove.procedure.TObjectProcedure; import gnu.trove.set.hash.THashSet; import io.netty.util.internal.ConcurrentSet; import org.apache.commons.math3.util.Pair; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.awt.*; import java.sql.Connection; @@ -86,6 +88,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; public class Room implements Comparable, ISerialize, Runnable { + + private static final Logger LOGGER = LoggerFactory.getLogger(Room.class); + public static final Comparator SORT_SCORE = (o1, o2) -> { if (!(o1 instanceof Room && o2 instanceof Room)) @@ -265,7 +270,7 @@ public class Room implements Comparable, ISerialize, Runnable { this.loadBans(connection); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } this.tradeMode = set.getInt("trade_mode"); @@ -313,49 +318,49 @@ public class Room implements Comparable, ISerialize, Runnable { try { this.loadLayout(); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } try { this.loadRights(connection); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } try { this.loadItems(connection); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } try { this.loadHeightmap(); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } try { this.loadBots(connection); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } try { this.loadPets(connection); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } try { this.loadWordFilter(connection); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } try { this.loadWiredData(connection); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } this.idleCycles = 0; @@ -363,7 +368,7 @@ public class Room implements Comparable, ISerialize, Runnable { this.roomCycleTask = Emulator.getThreading().getService().scheduleAtFixedRate(this, 500, 500, TimeUnit.MILLISECONDS); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } this.traxManager = new TraxManager(this); @@ -401,7 +406,7 @@ public class Room implements Comparable, ISerialize, Runnable { } } } else { - Emulator.getLogging().logErrorLine("Unknown Room Layout for Room (ID: " + this.id + ")"); + LOGGER.error("Unknown Room Layout for Room (ID: {})", this.id); } } @@ -416,11 +421,11 @@ public class Room implements Comparable, ISerialize, Runnable { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } if (this.itemCount() > Room.MAXIMUM_FURNI) { - Emulator.getLogging().logErrorLine("Room ID: " + this.getId() + " has exceeded the furniture limit (" + this.itemCount() + " > " + Room.MAXIMUM_FURNI + ")."); + LOGGER.error("Room ID: {} has exceeded the furniture limit ({} > {}).", this.getId(), this.itemCount(), Room.MAXIMUM_FURNI); } } @@ -438,14 +443,14 @@ public class Room implements Comparable, ISerialize, Runnable { ((InteractionWired) item).loadWiredData(set, this); } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } @@ -481,7 +486,7 @@ public class Room implements Comparable, ISerialize, Runnable { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -511,12 +516,12 @@ public class Room implements Comparable, ISerialize, Runnable { this.getFurniOwnerNames().put(pet.getUserId(), set.getString("pet_owner_name")); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -531,7 +536,7 @@ public class Room implements Comparable, ISerialize, Runnable { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -921,7 +926,7 @@ public class Room implements Comparable, ISerialize, Runnable { botIterator.value().needsUpdate(true); Emulator.getThreading().run(botIterator.value()); } catch (NoSuchElementException e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); break; } } @@ -929,7 +934,7 @@ public class Room implements Comparable, ISerialize, Runnable { this.currentBots.clear(); this.currentPets.clear(); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } @@ -941,7 +946,7 @@ public class Room implements Comparable, ISerialize, Runnable { this.preLoaded = true; this.layout = null; } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } @@ -1033,7 +1038,7 @@ public class Room implements Comparable, ISerialize, Runnable { Emulator.getThreading().run( Room.this::cycle); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } } @@ -1096,7 +1101,7 @@ public class Room implements Comparable, ISerialize, Runnable { statement.executeUpdate(); this.needsUpdate = false; } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } @@ -1107,7 +1112,7 @@ public class Room implements Comparable, ISerialize, Runnable { statement.setInt(2, this.id); statement.executeUpdate(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -1250,7 +1255,7 @@ public class Room implements Comparable, ISerialize, Runnable { } catch (NoSuchElementException e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); break; } } @@ -1263,7 +1268,7 @@ public class Room implements Comparable, ISerialize, Runnable { try { petIterator.advance(); } catch (NoSuchElementException e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); break; } @@ -1458,7 +1463,7 @@ public class Room implements Comparable, ISerialize, Runnable { try { item.onWalkOn(unit, room, null); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } }, this.getRollerSpeed() == 0 ? 250 : InteractionRoller.DELAY); @@ -2010,7 +2015,7 @@ public class Room implements Comparable, ISerialize, Runnable { pet.needsUpdate = true; pet.run(); } catch (NoSuchElementException e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); break; } } @@ -2123,7 +2128,7 @@ public class Room implements Comparable, ISerialize, Runnable { statement.setInt(10, this.promotion.getCategory()); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } this.needsUpdate = true; @@ -2215,7 +2220,7 @@ public class Room implements Comparable, ISerialize, Runnable { return this.habboQueue.remove(habbo.getHabboInfo().getId()) != null; } } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } return true; @@ -2288,7 +2293,7 @@ public class Room implements Comparable, ISerialize, Runnable { if (habbo != null) { this.furniOwnerNames.put(item.getUserId(), habbo.getUsername()); } else { - Emulator.getLogging().logDebugLine("Failed to find username for item (ID:" + item.getId() + ", UserID: " + item.getUserId() + ")"); + LOGGER.error("Failed to find username for item (ID: {}, UserID: {})", item.getId(), item.getUserId()); } } } @@ -2613,7 +2618,7 @@ public class Room implements Comparable, ISerialize, Runnable { try { item.onWalkOff(habbo.getRoomUnit(), this, new Object[]{}); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } } @@ -2674,7 +2679,7 @@ public class Room implements Comparable, ISerialize, Runnable { try { iterator.advance(); } catch (NoSuchElementException e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); break; } @@ -2694,7 +2699,7 @@ public class Room implements Comparable, ISerialize, Runnable { try { iterator.advance(); } catch (NoSuchElementException e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); break; } @@ -2716,7 +2721,7 @@ public class Room implements Comparable, ISerialize, Runnable { try { iterator.advance(); } catch (NoSuchElementException e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); break; } @@ -2759,7 +2764,7 @@ public class Room implements Comparable, ISerialize, Runnable { try { petIterator.advance(); } catch (NoSuchElementException e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); break; } @@ -2838,7 +2843,7 @@ public class Room implements Comparable, ISerialize, Runnable { try { petIterator.advance(); } catch (NoSuchElementException e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); break; } @@ -2993,7 +2998,7 @@ public class Room implements Comparable, ISerialize, Runnable { try { doorTileTopItem.onWalkOn(habbo.getRoomUnit(), this, new Object[]{}); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } } @@ -3180,7 +3185,7 @@ public class Room implements Comparable, ISerialize, Runnable { bot.onUserSay(roomChatMessage); } catch (NoSuchElementException e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); break; } } @@ -3204,7 +3209,7 @@ public class Room implements Comparable, ISerialize, Runnable { item.onClick(habbo.getClient(), this, new Object[0]); break; } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } } @@ -3757,7 +3762,7 @@ public class Room implements Comparable, ISerialize, Runnable { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -3776,7 +3781,7 @@ public class Room implements Comparable, ISerialize, Runnable { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -3820,7 +3825,7 @@ public class Room implements Comparable, ISerialize, Runnable { statement.setInt(2, userId); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -3857,7 +3862,7 @@ public class Room implements Comparable, ISerialize, Runnable { statement.setInt(2, userId); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -3875,7 +3880,7 @@ public class Room implements Comparable, ISerialize, Runnable { statement.setInt(1, this.id); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } this.refreshRightsInRoom(); @@ -3942,7 +3947,7 @@ public class Room implements Comparable, ISerialize, Runnable { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -4246,7 +4251,7 @@ public class Room implements Comparable, ISerialize, Runnable { statement.setString(2, word); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); return; } @@ -4263,7 +4268,7 @@ public class Room implements Comparable, ISerialize, Runnable { statement.setString(2, word); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomBan.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomBan.java index d22adb0d..3765175b 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomBan.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomBan.java @@ -1,6 +1,8 @@ package com.eu.habbo.habbohotel.rooms; import com.eu.habbo.Emulator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -9,15 +11,11 @@ import java.sql.SQLException; public class RoomBan { + private static final Logger LOGGER = LoggerFactory.getLogger(RoomBan.class); + public final int roomId; - - public final int userId; - - public final String username; - - public final int endTimestamp; public RoomBan(int roomId, int userId, String username, int endTimestamp) { @@ -42,7 +40,7 @@ public class RoomBan { statement.setInt(3, this.endTimestamp); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -53,7 +51,7 @@ public class RoomBan { statement.setInt(2, this.userId); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomLayout.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomLayout.java index 7eb6dbb0..80eec020 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomLayout.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomLayout.java @@ -2,6 +2,8 @@ package com.eu.habbo.habbohotel.rooms; import com.eu.habbo.Emulator; import gnu.trove.set.hash.THashSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.awt.*; import java.sql.ResultSet; @@ -12,6 +14,7 @@ import java.util.LinkedList; import java.util.List; public class RoomLayout { + private static final Logger LOGGER = LoggerFactory.getLogger(RoomLayout.class); protected static final int BASICMOVEMENTCOST = 10; protected static final int DIAGONALMOVEMENTCOST = 14; public static double MAXIMUM_STEP_HEIGHT = 1.1; @@ -42,7 +45,7 @@ public class RoomLayout { this.parse(); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomPromotion.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomPromotion.java index 853a452d..f24e111a 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomPromotion.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomPromotion.java @@ -1,6 +1,8 @@ package com.eu.habbo.habbohotel.rooms; import com.eu.habbo.Emulator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -8,6 +10,7 @@ import java.sql.ResultSet; import java.sql.SQLException; public class RoomPromotion { + private static final Logger LOGGER = LoggerFactory.getLogger(RoomPromotion.class); private final Room room; public boolean needsUpdate; private String title; @@ -43,7 +46,7 @@ public class RoomPromotion { statement.setInt(4, this.room.getId()); statement.executeUpdate(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } this.needsUpdate = false; diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTrade.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTrade.java index 86fd5922..c6ba64e0 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTrade.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTrade.java @@ -10,12 +10,15 @@ import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; import com.eu.habbo.messages.outgoing.trading.*; import com.eu.habbo.threading.runnables.QueryDeleteHabboItem; import gnu.trove.set.hash.THashSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.*; import java.util.ArrayList; import java.util.List; public class RoomTrade { + private static final Logger LOGGER = LoggerFactory.getLogger(RoomTrade.class); //Configuration. Loaded from database & updated accordingly. public static boolean TRADING_ENABLED = true; public static boolean TRADING_REQUIRES_PERK = true; @@ -206,7 +209,7 @@ public class RoomTrade { statement.executeBatch(); } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } THashSet itemsUserOne = new THashSet<>(userOne.getItems()); 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 07c2a093..e6eb506d 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java @@ -24,6 +24,8 @@ import com.eu.habbo.util.pathfinding.Rotation; import gnu.trove.map.TMap; import gnu.trove.map.hash.THashMap; import gnu.trove.set.hash.THashSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.*; import java.util.concurrent.ConcurrentHashMap; @@ -31,6 +33,9 @@ import java.util.concurrent.ScheduledFuture; import java.util.stream.Collectors; public class RoomUnit { + + private static final Logger LOGGER = LoggerFactory.getLogger(RoomUnit.class); + public boolean isWiredTeleporting = false; private final ConcurrentHashMap status; private final THashMap cacheable; @@ -361,7 +366,7 @@ public class RoomUnit { return false; } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); return false; } } 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 a4656a57..c445158e 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/TraxManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/TraxManager.java @@ -15,6 +15,8 @@ import com.eu.habbo.messages.outgoing.inventory.RemoveHabboItemComposer; import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxMySongsComposer; import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxNowPlayingMessageComposer; import com.eu.habbo.messages.outgoing.rooms.items.jukebox.JukeBoxPlayListComposer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -25,6 +27,7 @@ import java.util.List; import java.util.stream.Collectors; public class TraxManager implements Disposable { + private static final Logger LOGGER = LoggerFactory.getLogger(TraxManager.class); private final Room room; private final List songs = new ArrayList<>(0); private int totalLength = 0; @@ -51,7 +54,7 @@ public class TraxManager implements Disposable { stmt.setInt(2, musicDisc.getId()); stmt.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); return; } } else { @@ -67,7 +70,7 @@ public class TraxManager implements Disposable { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -157,7 +160,7 @@ public class TraxManager implements Disposable { statement.setInt(2, musicDisc.getId()); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); return; } @@ -184,7 +187,7 @@ public class TraxManager implements Disposable { statement.setInt(2, itemId); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); return; } @@ -277,7 +280,7 @@ public class TraxManager implements Disposable { statement.setInt(1, this.room.getId()); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java b/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java index 120d59bf..242bdd02 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java @@ -20,6 +20,8 @@ import com.eu.habbo.plugin.events.users.UserPointsEvent; import gnu.trove.TIntCollection; import gnu.trove.map.hash.THashMap; import gnu.trove.set.hash.THashSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.net.InetSocketAddress; import java.net.SocketAddress; @@ -28,6 +30,9 @@ import java.util.*; import java.util.stream.Collectors; public class Habbo implements Runnable { + + private static final Logger LOGGER = LoggerFactory.getLogger(Habbo.class); + private final HabboInfo habboInfo; private final HabboStats habboStats; private final Messenger messenger; @@ -122,7 +127,7 @@ public class Habbo implements Runnable { this.messenger.connectionChanged(this, true, false); Emulator.getGameEnvironment().getRoomManager().loadRoomsForHabbo(this); - Emulator.getLogging().logUserLine(this.habboInfo.getUsername() + " logged in from IP " + this.habboInfo.getIpLogin()); + LOGGER.info("{} logged in from IP {}", this.habboInfo.getUsername(), this.habboInfo.getIpLogin()); } @@ -148,7 +153,7 @@ public class Habbo implements Runnable { } } } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } try { @@ -164,13 +169,13 @@ public class Habbo implements Runnable { this.habboStats.dispose(); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); return; } finally { Emulator.getGameEnvironment().getRoomManager().unloadRoomsForHabbo(this); Emulator.getGameEnvironment().getHabboManager().removeHabbo(this); } - Emulator.getLogging().logUserLine(this.habboInfo.getUsername() + " disconnected."); + LOGGER.info("{} disconnected.", this.habboInfo.getUsername()); this.client = null; } diff --git a/src/main/java/com/eu/habbo/habbohotel/users/HabboBadge.java b/src/main/java/com/eu/habbo/habbohotel/users/HabboBadge.java index 59afdfc3..5903cdc5 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/HabboBadge.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/HabboBadge.java @@ -1,10 +1,13 @@ package com.eu.habbo.habbohotel.users; import com.eu.habbo.Emulator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.*; public class HabboBadge implements Runnable { + private static final Logger LOGGER = LoggerFactory.getLogger(HabboBadge.class); private int id; private String code; private int slot; @@ -77,7 +80,7 @@ public class HabboBadge implements Runnable { this.needsUpdate = false; } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } 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 a5a0768f..a7fd28a5 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/HabboInfo.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/HabboInfo.java @@ -14,13 +14,17 @@ import com.eu.habbo.habbohotel.rooms.RoomUnit; import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; import gnu.trove.map.hash.TIntIntHashMap; import gnu.trove.procedure.TIntIntProcedure; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.*; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; public class HabboInfo implements Runnable { + + private static final Logger LOGGER = LoggerFactory.getLogger(HabboInfo.class); + public boolean firstVisit = false; private String username; private String motto; @@ -66,8 +70,8 @@ public class HabboInfo implements Runnable { this.rank = Emulator.getGameEnvironment().getPermissionsManager().getRank(set.getInt("rank")); if (this.rank == null) { - Emulator.getLogging().logErrorLine("No existing rank found with id " + set.getInt("rank") + ". Make sure an entry in the permissions table exists."); - Emulator.getLogging().logUserLine(this.username + " has an invalid rank with id " + set.getInt("rank") + ". Make sure an entry in the permissions table exists."); + LOGGER.error("No existing rank found with id " + set.getInt("rank") + ". Make sure an entry in the permissions table exists."); + LOGGER.warn(this.username + " has an invalid rank with id " + set.getInt("rank") + ". Make sure an entry in the permissions table exists."); this.rank = Emulator.getGameEnvironment().getPermissionsManager().getRank(1); } @@ -79,7 +83,7 @@ public class HabboInfo implements Runnable { this.online = false; this.currentRoom = null; } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } this.loadCurrencies(); @@ -97,7 +101,7 @@ public class HabboInfo implements Runnable { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -113,14 +117,14 @@ public class HabboInfo implements Runnable { statement.setInt(4, b); statement.addBatch(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return true; } }); statement.executeBatch(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -135,7 +139,7 @@ public class HabboInfo implements Runnable { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -160,7 +164,7 @@ public class HabboInfo implements Runnable { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -171,7 +175,7 @@ public class HabboInfo implements Runnable { statement.setInt(1, search.getId()); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -494,7 +498,7 @@ public class HabboInfo implements Runnable { statement.setInt(13, this.id); statement.executeUpdate(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/users/HabboInventory.java b/src/main/java/com/eu/habbo/habbohotel/users/HabboInventory.java index 340819e5..7eaf048d 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/HabboInventory.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/HabboInventory.java @@ -1,13 +1,17 @@ package com.eu.habbo.habbohotel.users; -import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.catalog.marketplace.MarketPlace; import com.eu.habbo.habbohotel.catalog.marketplace.MarketPlaceOffer; import com.eu.habbo.habbohotel.catalog.marketplace.MarketPlaceState; import com.eu.habbo.habbohotel.users.inventory.*; import gnu.trove.set.hash.THashSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class HabboInventory { + + private static final Logger LOGGER = LoggerFactory.getLogger(HabboInventory.class); + //Configuration. Loaded from database & updated accordingly. public static int MAXIMUM_ITEMS = 10000; private final THashSet items; @@ -24,37 +28,37 @@ public class HabboInventory { try { this.badgesComponent = new BadgesComponent(this.habbo); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } try { this.botsComponent = new BotsComponent(this.habbo); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } try { this.effectsComponent = new EffectsComponent(this.habbo); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } try { this.itemsComponent = new ItemsComponent(this, this.habbo); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } try { this.petsComponent = new PetsComponent(this.habbo); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } try { this.wardrobeComponent = new WardrobeComponent(this.habbo); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } this.items = MarketPlace.getOwnOffers(this.habbo); diff --git a/src/main/java/com/eu/habbo/habbohotel/users/HabboItem.java b/src/main/java/com/eu/habbo/habbohotel/users/HabboItem.java index e5e05f68..35b809dd 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/HabboItem.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/HabboItem.java @@ -21,6 +21,8 @@ import com.eu.habbo.messages.outgoing.users.UpdateUserLookComposer; import gnu.trove.set.hash.THashSet; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.math3.util.Pair; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.awt.*; import java.sql.Connection; @@ -29,10 +31,12 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.Arrays; -import java.util.Deque; import java.util.List; public abstract class HabboItem implements Runnable, IEventTriggers { + + private static final Logger LOGGER = LoggerFactory.getLogger(HabboItem.class); + private static Class[] TOGGLING_INTERACTIONS = new Class[]{ InteractionGameTimer.class, InteractionWired.class, @@ -107,7 +111,7 @@ public abstract class HabboItem implements Runnable, IEventTriggers { //serverMessage.appendString( ? "1.0" : ((this.getBaseItem().allowWalk() || this.getBaseItem().allowSit() && this.roomId != 0) ? Item.getCurrentHeight(this) : "")); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } @@ -264,15 +268,15 @@ public abstract class HabboItem implements Runnable, IEventTriggers { statement.setInt(10, this.id); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); - Emulator.getLogging().logErrorLine("SQLException trying to save HabboItem: " + this.toString()); + LOGGER.error("Caught SQL exception", e); + LOGGER.error("SQLException trying to save HabboItem: " + this.toString()); } this.needsUpdate = false; } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/users/HabboNavigatorWindowSettings.java b/src/main/java/com/eu/habbo/habbohotel/users/HabboNavigatorWindowSettings.java index 0b2051f3..36c1c975 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/HabboNavigatorWindowSettings.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/HabboNavigatorWindowSettings.java @@ -4,6 +4,8 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.navigation.DisplayMode; import com.eu.habbo.habbohotel.navigation.ListMode; import gnu.trove.map.hash.THashMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -12,6 +14,7 @@ import java.sql.SQLException; import java.util.Map; public class HabboNavigatorWindowSettings { + private static final Logger LOGGER = LoggerFactory.getLogger(HabboNavigatorWindowSettings.class); public final THashMap displayModes = new THashMap<>(2); private final int userId; public int x = 100; @@ -53,7 +56,7 @@ public class HabboNavigatorWindowSettings { statement.setString(4, displayMode.name().toLowerCase()); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } this.displayModes.put(category, new HabboNavigatorPersonalDisplayMode(listMode, displayMode)); @@ -114,7 +117,7 @@ public class HabboNavigatorWindowSettings { statement.execute(); } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } 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 0069d965..99bf5650 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/HabboStats.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/HabboStats.java @@ -13,6 +13,8 @@ import gnu.trove.map.TIntObjectMap; import gnu.trove.map.hash.THashMap; import gnu.trove.map.hash.TIntObjectHashMap; import gnu.trove.stack.array.TIntArrayStack; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -24,6 +26,9 @@ import java.util.List; import java.util.Map; public class HabboStats implements Runnable { + + private static final Logger LOGGER = LoggerFactory.getLogger(HabboStats.class); + public final TIntArrayList secretRecipes; public final HabboNavigatorWindowSettings navigatorWindowSettings; public final THashMap cache; @@ -228,7 +233,7 @@ public class HabboStats implements Runnable { statement.setInt(1, habboInfo.getId()); statement.executeUpdate(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return load(habboInfo); @@ -287,7 +292,7 @@ public class HabboStats implements Runnable { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return stats; @@ -365,7 +370,7 @@ public class HabboStats implements Runnable { this.navigatorWindowSettings.save(connection); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -479,7 +484,7 @@ public class HabboStats implements Runnable { statement.setInt(2, roomId); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } this.favoriteRooms.add(roomId); @@ -493,7 +498,7 @@ public class HabboStats implements Runnable { statement.setInt(2, roomId); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } @@ -519,7 +524,7 @@ public class HabboStats implements Runnable { statement.setInt(2, id); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } this.secretRecipes.add(id); @@ -605,7 +610,7 @@ public class HabboStats implements Runnable { statement.setInt(2, userId); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } @@ -620,7 +625,7 @@ public class HabboStats implements Runnable { statement.setInt(2, userId); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/users/cache/HabboOfferPurchase.java b/src/main/java/com/eu/habbo/habbohotel/users/cache/HabboOfferPurchase.java index 01307acf..e3591750 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/cache/HabboOfferPurchase.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/cache/HabboOfferPurchase.java @@ -2,6 +2,8 @@ package com.eu.habbo.habbohotel.users.cache; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.Habbo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -9,6 +11,7 @@ import java.sql.ResultSet; import java.sql.SQLException; public class HabboOfferPurchase { + private static final Logger LOGGER = LoggerFactory.getLogger(HabboOfferPurchase.class); private final int userId; private final int offerId; private int state; @@ -38,7 +41,7 @@ public class HabboOfferPurchase { statement.setInt(2, offerId); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); return null; } diff --git a/src/main/java/com/eu/habbo/habbohotel/users/inventory/BadgesComponent.java b/src/main/java/com/eu/habbo/habbohotel/users/inventory/BadgesComponent.java index 1340f8d2..02573ff4 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/inventory/BadgesComponent.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/inventory/BadgesComponent.java @@ -5,6 +5,8 @@ import com.eu.habbo.habbohotel.permissions.Rank; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboBadge; import gnu.trove.set.hash.THashSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -15,6 +17,8 @@ import java.util.Comparator; import java.util.Set; public class BadgesComponent { + private static final Logger LOGGER = LoggerFactory.getLogger(BadgesComponent.class); + private final THashSet badges = new THashSet<>(); public BadgesComponent(Habbo habbo) { @@ -51,7 +55,7 @@ public class BadgesComponent { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return badgesList; @@ -78,7 +82,7 @@ public class BadgesComponent { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return badgesList; } @@ -102,7 +106,7 @@ public class BadgesComponent { statement.setString(2, badge); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -112,7 +116,7 @@ public class BadgesComponent { statement.setString(2, badge); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/users/inventory/BotsComponent.java b/src/main/java/com/eu/habbo/habbohotel/users/inventory/BotsComponent.java index 3db630c3..cf9097bf 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/inventory/BotsComponent.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/inventory/BotsComponent.java @@ -4,6 +4,8 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.bots.Bot; import com.eu.habbo.habbohotel.users.Habbo; import gnu.trove.map.hash.THashMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -12,6 +14,7 @@ import java.sql.SQLException; import java.util.Map; public class BotsComponent { + private static final Logger LOGGER = LoggerFactory.getLogger(BotsComponent.class); private final THashMap bots = new THashMap<>(); @@ -32,7 +35,7 @@ public class BotsComponent { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/users/inventory/EffectsComponent.java b/src/main/java/com/eu/habbo/habbohotel/users/inventory/EffectsComponent.java index e80f876e..99bff77a 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/inventory/EffectsComponent.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/inventory/EffectsComponent.java @@ -6,7 +6,8 @@ import com.eu.habbo.messages.outgoing.inventory.EffectsListAddComposer; import com.eu.habbo.messages.outgoing.inventory.EffectsListEffectEnableComposer; import com.eu.habbo.messages.outgoing.inventory.EffectsListRemoveComposer; import gnu.trove.map.hash.THashMap; -import gnu.trove.procedure.TObjectProcedure; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -14,6 +15,8 @@ import java.sql.ResultSet; import java.sql.SQLException; public class EffectsComponent { + private static final Logger LOGGER = LoggerFactory.getLogger(EffectsComponent.class); + public final THashMap effects = new THashMap<>(); public final Habbo habbo; public int activatedEffect = 0; @@ -28,7 +31,7 @@ public class EffectsComponent { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } if(habbo.getHabboInfo().getRank().getRoomEffect() > 0) this.createRankEffect(habbo.getHabboInfo().getRank().getRoomEffect()); @@ -89,7 +92,7 @@ public class EffectsComponent { statement.setInt(5, effect.effect); statement.addBatch(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } return true; @@ -97,7 +100,7 @@ public class EffectsComponent { statement.executeBatch(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } this.effects.clear(); @@ -205,7 +208,7 @@ public class EffectsComponent { statement.setInt(4, this.duration); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -215,7 +218,7 @@ public class EffectsComponent { statement.setInt(2, this.effect); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/users/inventory/ItemsComponent.java b/src/main/java/com/eu/habbo/habbohotel/users/inventory/ItemsComponent.java index e751ad66..613868c4 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/inventory/ItemsComponent.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/inventory/ItemsComponent.java @@ -15,6 +15,8 @@ import gnu.trove.map.hash.THashMap; import gnu.trove.map.hash.TIntObjectHashMap; import gnu.trove.procedure.TObjectProcedure; import gnu.trove.set.hash.THashSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -23,6 +25,8 @@ import java.sql.SQLException; import java.util.NoSuchElementException; public class ItemsComponent { + private static final Logger LOGGER = LoggerFactory.getLogger(ItemsComponent.class); + private final TIntObjectMap items = TCollections.synchronizedMap(new TIntObjectHashMap<>()); private final HabboInventory inventory; @@ -46,15 +50,15 @@ public class ItemsComponent { if (item != null) { itemsList.put(set.getInt("id"), item); } else { - Emulator.getLogging().logErrorLine("Failed to load HabboItem: " + set.getInt("id")); + LOGGER.error("Failed to load HabboItem: " + set.getInt("id")); } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return itemsList; @@ -150,7 +154,7 @@ public class ItemsComponent { TIntObjectIterator items = this.items.iterator(); if (items == null) { - Emulator.getLogging().logErrorLine(new RuntimeException("Items is NULL!")); + LOGGER.error("Items is NULL!"); return; } diff --git a/src/main/java/com/eu/habbo/habbohotel/users/inventory/PetsComponent.java b/src/main/java/com/eu/habbo/habbohotel/users/inventory/PetsComponent.java index 4d2e20a4..cd963297 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/inventory/PetsComponent.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/inventory/PetsComponent.java @@ -8,6 +8,8 @@ import gnu.trove.TCollections; import gnu.trove.iterator.TIntObjectIterator; import gnu.trove.map.TIntObjectMap; import gnu.trove.map.hash.TIntObjectHashMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -17,6 +19,7 @@ import java.util.NoSuchElementException; import java.util.Set; public class PetsComponent { + private static final Logger LOGGER = LoggerFactory.getLogger(PetsComponent.class); private final TIntObjectMap pets = TCollections.synchronizedMap(new TIntObjectHashMap<>()); public PetsComponent(Habbo habbo) { @@ -34,7 +37,7 @@ public class PetsComponent { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/users/inventory/WardrobeComponent.java b/src/main/java/com/eu/habbo/habbohotel/users/inventory/WardrobeComponent.java index 1e68dacf..2d207132 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/inventory/WardrobeComponent.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/inventory/WardrobeComponent.java @@ -7,6 +7,8 @@ import gnu.trove.TIntCollection; import gnu.trove.map.hash.THashMap; import gnu.trove.set.TIntSet; import gnu.trove.set.hash.TIntHashSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -14,6 +16,7 @@ import java.sql.ResultSet; import java.sql.SQLException; public class WardrobeComponent { + private static final Logger LOGGER = LoggerFactory.getLogger(WardrobeComponent.class); private final THashMap looks; private final TIntSet clothing; @@ -42,7 +45,7 @@ public class WardrobeComponent { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -149,7 +152,7 @@ public class WardrobeComponent { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } 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 935b740f..98924182 100644 --- a/src/main/java/com/eu/habbo/habbohotel/wired/WiredHandler.java +++ b/src/main/java/com/eu/habbo/habbohotel/wired/WiredHandler.java @@ -28,6 +28,8 @@ import com.eu.habbo.plugin.events.furniture.wired.WiredStackExecutedEvent; import com.eu.habbo.plugin.events.furniture.wired.WiredStackTriggeredEvent; import com.eu.habbo.plugin.events.users.UserWiredRewardReceived; import gnu.trove.set.hash.THashSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -38,6 +40,8 @@ import java.util.Collections; import java.util.List; public class WiredHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(WiredHandler.class); + //Configuration. Loaded from database & updated accordingly. public static int MAXIMUM_FURNI_SELECTION = 5; public static int TELEPORT_DELAY = 500; @@ -199,7 +203,7 @@ public class WiredHandler { if (!effect.execute(roomUnit, room, stuff)) return; effect.setCooldown(millis); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } effect.activateBox(room); @@ -235,7 +239,7 @@ public class WiredHandler { statement.setInt(1, wiredId); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -250,7 +254,7 @@ public class WiredHandler { statement.setInt(4, Emulator.getIntUnixTimestamp()); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } if (reward.badge) { @@ -404,7 +408,7 @@ public class WiredHandler { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return false; diff --git a/src/main/java/com/eu/habbo/habbohotel/wired/highscores/WiredHighscoreManager.java b/src/main/java/com/eu/habbo/habbohotel/wired/highscores/WiredHighscoreManager.java index 42a6b353..31431699 100644 --- a/src/main/java/com/eu/habbo/habbohotel/wired/highscores/WiredHighscoreManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/wired/highscores/WiredHighscoreManager.java @@ -3,6 +3,8 @@ package com.eu.habbo.habbohotel.wired.highscores; import com.eu.habbo.Emulator; import com.eu.habbo.plugin.EventHandler; import com.eu.habbo.plugin.events.emulator.EmulatorLoadedEvent; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -17,6 +19,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; public class WiredHighscoreManager { + private static final Logger LOGGER = LoggerFactory.getLogger(WiredHighscoreManager.class); + private final HashMap> data = new HashMap<>(); private final static DayOfWeek firstDayOfWeek = WeekFields.of(new Locale(System.getProperty("user.language"), System.getProperty("user.country"))).getFirstDayOfWeek(); @@ -31,7 +35,7 @@ public class WiredHighscoreManager { this.data.clear(); this.loadHighscoreData(); - logger.info("Highscore Manager -> Loaded! (" + (System.currentTimeMillis() - millis) + " MS, " + this.data.size() + " items)"); + LOGGER.info("Highscore Manager -> Loaded! (" + (System.currentTimeMillis() - millis) + " MS, " + this.data.size() + " items)"); } @EventHandler @@ -65,7 +69,7 @@ public class WiredHighscoreManager { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } @@ -85,7 +89,7 @@ public class WiredHighscoreManager { statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/camera/CameraPublishToWebEvent.java b/src/main/java/com/eu/habbo/messages/incoming/camera/CameraPublishToWebEvent.java index 30eef4b9..9d63b55a 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/camera/CameraPublishToWebEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/camera/CameraPublishToWebEvent.java @@ -6,12 +6,16 @@ import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.camera.CameraPublishWaitMessageComposer; import com.eu.habbo.messages.outgoing.catalog.NotEnoughPointsTypeComposer; import com.eu.habbo.plugin.events.users.UserPublishPictureEvent; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; public class CameraPublishToWebEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(CameraPublishToWebEvent.class); + public static int CAMERA_PUBLISH_POINTS = 5; public static int CAMERA_PUBLISH_POINTS_TYPE = 0; @@ -50,7 +54,7 @@ public class CameraPublishToWebEvent extends MessageHandler { isOk = true; } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemAsGiftEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemAsGiftEvent.java index e7077d1c..8c08198a 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemAsGiftEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemAsGiftEvent.java @@ -25,6 +25,8 @@ import com.eu.habbo.messages.outgoing.users.UserPointsComposer; import com.eu.habbo.threading.runnables.ShutdownEmulator; import gnu.trove.map.hash.THashMap; import gnu.trove.set.hash.THashSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -33,6 +35,8 @@ import java.sql.SQLException; import java.util.Calendar; public class CatalogBuyItemAsGiftEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(CatalogBuyItemAsGiftEvent.class); + @Override public void handle() throws Exception { if (Emulator.getIntUnixTimestamp() - this.client.getHabbo().getHabboStats().lastGiftTimestamp >= CatalogManager.PURCHASE_COOLDOWN) { @@ -104,7 +108,7 @@ public class CatalogBuyItemAsGiftEvent extends MessageHandler { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } else { userId = habbo.getHabboInfo().getId(); @@ -287,7 +291,7 @@ public class CatalogBuyItemAsGiftEvent extends MessageHandler { try { guildId = Integer.parseInt(extraData); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); this.client.sendResponse(new AlertPurchaseFailedComposer(AlertPurchaseFailedComposer.SERVER_ERROR)); return; } @@ -359,7 +363,7 @@ public class CatalogBuyItemAsGiftEvent extends MessageHandler { this.client.sendResponse(new PurchaseOKComposer(item)); } catch (Exception e) { - Emulator.getLogging().logPacketError(e); + LOGGER.error("Exception caught", e); this.client.sendResponse(new AlertPurchaseFailedComposer(AlertPurchaseFailedComposer.SERVER_ERROR)); } } finally { diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/SellItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/SellItemEvent.java index 5e8a793b..f63df2b2 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/SellItemEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/SellItemEvent.java @@ -7,8 +7,12 @@ import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.catalog.AlertPurchaseFailedComposer; import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceItemPostedComposer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class SellItemEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(SellItemEvent.class); + @Override public void handle() throws Exception { if (!MarketPlace.MARKETPLACE_ENABLED) { @@ -26,7 +30,7 @@ public class SellItemEvent extends MessageHandler { if (!item.getBaseItem().allowMarketplace()) { String message = Emulator.getTexts().getValue("scripter.warning.marketplace.forbidden").replace("%username%", this.client.getHabbo().getHabboInfo().getUsername()).replace("%itemname%", item.getBaseItem().getName()).replace("%credits%", credits + ""); ScripterManager.scripterDetected(this.client, message); - Emulator.getLogging().logUserLine(message); + LOGGER.info(message); this.client.sendResponse(new AlertPurchaseFailedComposer(AlertPurchaseFailedComposer.SERVER_ERROR)); return; } @@ -34,7 +38,7 @@ public class SellItemEvent extends MessageHandler { if (credits < 0) { String message = Emulator.getTexts().getValue("scripter.warning.marketplace.negative").replace("%username%", this.client.getHabbo().getHabboInfo().getUsername()).replace("%itemname%", item.getBaseItem().getName()).replace("%credits%", credits + ""); ScripterManager.scripterDetected(this.client, message); - Emulator.getLogging().logUserLine(message); + LOGGER.info(message); this.client.sendResponse(new AlertPurchaseFailedComposer(AlertPurchaseFailedComposer.SERVER_ERROR)); return; } diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/FriendRequestEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/FriendRequestEvent.java index 5d618d19..09f8ec6f 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/friends/FriendRequestEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/friends/FriendRequestEvent.java @@ -8,6 +8,8 @@ import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.friends.FriendRequestComposer; import com.eu.habbo.messages.outgoing.friends.FriendRequestErrorComposer; import com.eu.habbo.plugin.events.users.friends.UserRequestFriendshipEvent; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -16,6 +18,8 @@ import java.sql.SQLException; public class FriendRequestEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(FriendRequestEvent.class); + @Override public void handle() throws Exception { String username = this.packet.readString(); @@ -50,7 +54,7 @@ public class FriendRequestEvent extends MessageHandler { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); return; } } else { diff --git a/src/main/java/com/eu/habbo/messages/incoming/guardians/GuardianVoteEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guardians/GuardianVoteEvent.java index 0356b9ef..b2675d27 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guardians/GuardianVoteEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guardians/GuardianVoteEvent.java @@ -4,8 +4,12 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.guides.GuardianTicket; import com.eu.habbo.habbohotel.guides.GuardianVoteType; import com.eu.habbo.messages.incoming.MessageHandler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class GuardianVoteEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(GuardianVoteEvent.class); + @Override public void handle() throws Exception { int voteType = this.packet.readInt(); @@ -22,7 +26,7 @@ public class GuardianVoteEvent extends MessageHandler { } else if (voteType == 2) { type = GuardianVoteType.AWFULLY; } else { - Emulator.getLogging().logErrorLine("Uknown vote type: " + voteType); + LOGGER.error("Uknown vote type: " + voteType); } ticket.vote(this.client.getHabbo(), type); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyEvent.java index ea5e530b..fd969b85 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyEvent.java @@ -12,8 +12,12 @@ import com.eu.habbo.messages.outgoing.guilds.GuildBoughtComposer; import com.eu.habbo.messages.outgoing.guilds.GuildEditFailComposer; import com.eu.habbo.messages.outgoing.guilds.GuildInfoComposer; import com.eu.habbo.plugin.events.guilds.GuildPurchasedEvent; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class RequestGuildBuyEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(RequestGuildBuyEvent.class); + @Override public void handle() throws Exception { if (!this.client.getHabbo().hasPermission("acc_infinite_credits")) { @@ -95,7 +99,7 @@ public class RequestGuildBuyEvent extends MessageHandler { } else { String message = Emulator.getTexts().getValue("scripter.warning.guild.buy.owner").replace("%username%", this.client.getHabbo().getHabboInfo().getUsername()).replace("%roomname%", r.getName().replace("%owner%", r.getOwnerName())); ScripterManager.scripterDetected(this.client, message); - Emulator.getLogging().logUserLine(message); + LOGGER.info(message); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumListEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumListEvent.java index cd1307a2..991b7a7b 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumListEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumListEvent.java @@ -6,6 +6,8 @@ import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.guilds.forums.GuildForumListComposer; import com.eu.habbo.messages.outgoing.handshake.ConnectionErrorComposer; import gnu.trove.set.hash.THashSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -14,6 +16,8 @@ import java.sql.SQLException; import java.util.Set; public class GuildForumListEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(GuildForumListEvent.class); + @Override public void handle() throws Exception { int mode = this.packet.readInt(); @@ -60,7 +64,7 @@ public class GuildForumListEvent extends MessageHandler { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); this.client.sendResponse(new ConnectionErrorComposer(500)); } @@ -84,7 +88,7 @@ public class GuildForumListEvent extends MessageHandler { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); this.client.sendResponse(new ConnectionErrorComposer(500)); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/handshake/SecureLoginEvent.java b/src/main/java/com/eu/habbo/messages/incoming/handshake/SecureLoginEvent.java index 0923ac86..afe9ddf5 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/handshake/SecureLoginEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/handshake/SecureLoginEvent.java @@ -33,12 +33,16 @@ import com.eu.habbo.messages.outgoing.users.*; import com.eu.habbo.plugin.events.emulator.SSOAuthenticationEvent; import com.eu.habbo.plugin.events.users.UserLoginEvent; import gnu.trove.map.hash.THashMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.Date; @NoAuthMessage public class SecureLoginEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(SecureLoginEvent.class); + @Override @@ -97,7 +101,7 @@ public class SecureLoginEvent extends MessageHandler { Emulator.getThreading().run(habbo); Emulator.getGameEnvironment().getHabboManager().addHabbo(habbo); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); Emulator.getGameServer().getGameClientManager().disposeClient(this.client); return; } diff --git a/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewDataEvent.java index e554ceab..16f7fefd 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewDataEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewDataEvent.java @@ -1,10 +1,13 @@ package com.eu.habbo.messages.incoming.hotelview; -import com.eu.habbo.Emulator; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.hotelview.HotelViewDataComposer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class HotelViewDataEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(HotelViewDataEvent.class); + @Override public void handle() { @@ -30,7 +33,7 @@ public class HotelViewDataEvent extends MessageHandler { this.client.sendResponse(new HotelViewDataComposer(data, data.split(",")[data.split(",").length - 1])); } } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/inventory/RequestInventoryItemsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/inventory/RequestInventoryItemsEvent.java index ad9a7140..2b9641cb 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/inventory/RequestInventoryItemsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/inventory/RequestInventoryItemsEvent.java @@ -1,16 +1,19 @@ package com.eu.habbo.messages.incoming.inventory; -import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.inventory.InventoryItemsComposer; import gnu.trove.iterator.TIntObjectIterator; import gnu.trove.map.TIntObjectMap; import gnu.trove.map.hash.TIntObjectHashMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.NoSuchElementException; public class RequestInventoryItemsEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(RequestInventoryItemsEvent.class); + @Override public void handle() throws Exception { int totalItems = this.client.getHabbo().getInventory().getItemsComponent().getItems().size(); @@ -35,7 +38,7 @@ public class RequestInventoryItemsEvent extends MessageHandler { items.put(iterator.key(), iterator.value()); count++; } catch (NoSuchElementException e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); break; } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestCreateRoomEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestCreateRoomEvent.java index 222063b5..45ba380a 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestCreateRoomEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestCreateRoomEvent.java @@ -7,8 +7,12 @@ import com.eu.habbo.habbohotel.rooms.RoomManager; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.navigator.CanCreateRoomComposer; import com.eu.habbo.messages.outgoing.navigator.RoomCreatedComposer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class RequestCreateRoomEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(RequestCreateRoomEvent.class); + @Override public void handle() throws Exception { @@ -20,14 +24,14 @@ public class RequestCreateRoomEvent extends MessageHandler { int tradeType = this.packet.readInt(); if (!Emulator.getGameEnvironment().getRoomManager().layoutExists(modelName)) { - Emulator.getLogging().logErrorLine("[SCRIPTER] Incorrect layout name \"" + modelName + "\". " + this.client.getHabbo().getHabboInfo().getUsername()); + LOGGER.error("[SCRIPTER] Incorrect layout name \"" + modelName + "\". " + this.client.getHabbo().getHabboInfo().getUsername()); return; } RoomCategory category = Emulator.getGameEnvironment().getRoomManager().getCategory(categoryId); if (category == null || category.getMinRank() > this.client.getHabbo().getHabboInfo().getRank().getId()) { - Emulator.getLogging().logErrorLine("[SCRIPTER] Incorrect rank or non existing category ID: \"" + categoryId + "\"." + this.client.getHabbo().getHabboInfo().getUsername()); + LOGGER.error("[SCRIPTER] Incorrect rank or non existing category ID: \"" + categoryId + "\"." + this.client.getHabbo().getHabboInfo().getUsername()); return; } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestDeleteRoomEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestDeleteRoomEvent.java index 75a7909d..3d7ebf41 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestDeleteRoomEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestDeleteRoomEvent.java @@ -6,12 +6,16 @@ import com.eu.habbo.habbohotel.modtool.ScripterManager; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.plugin.events.navigator.NavigatorRoomDeletedEvent; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; public class RequestDeleteRoomEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(RequestDeleteRoomEvent.class); + @Override public void handle() throws Exception { int roomId = this.packet.readInt(); @@ -69,12 +73,12 @@ public class RequestDeleteRoomEvent extends MessageHandler { filter.execute(); } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } else { String message = Emulator.getTexts().getValue("scripter.warning.room.delete").replace("%username%", this.client.getHabbo().getHabboInfo().getUsername()).replace("%roomname%", room.getName()).replace("%roomowner%", room.getOwnerName()); ScripterManager.scripterDetected(this.client, message); - Emulator.getLogging().logUserLine(message); + LOGGER.info(message); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNewNavigatorRoomsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNewNavigatorRoomsEvent.java index c5f71d4e..4fb1dec0 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNewNavigatorRoomsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestNewNavigatorRoomsEvent.java @@ -8,10 +8,14 @@ import com.eu.habbo.habbohotel.rooms.RoomCategory; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.navigator.NewNavigatorSearchResultsComposer; import gnu.trove.map.hash.THashMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.*; public class RequestNewNavigatorRoomsEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(RequestNewNavigatorRoomsEvent.class); + @Override public void handle() throws Exception { String view = this.packet.readString(); @@ -89,7 +93,7 @@ public class RequestNewNavigatorRoomsEvent extends MessageHandler { resultLists = toQueryResults(resultLists); this.client.sendResponse(new NewNavigatorSearchResultsComposer(view, query, resultLists)); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } /* @@ -104,7 +108,7 @@ public class RequestNewNavigatorRoomsEvent extends MessageHandler { } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } */ } diff --git a/src/main/java/com/eu/habbo/messages/incoming/polls/AnswerPollEvent.java b/src/main/java/com/eu/habbo/messages/incoming/polls/AnswerPollEvent.java index 3abc1a7a..574e50ca 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/polls/AnswerPollEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/polls/AnswerPollEvent.java @@ -6,12 +6,16 @@ import com.eu.habbo.habbohotel.users.HabboBadge; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.users.AddUserBadgeComposer; import com.eu.habbo.messages.outgoing.wired.WiredRewardAlertComposer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; public class AnswerPollEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(AnswerPollEvent.class); + @Override public void handle() throws Exception { int pollId = this.packet.readInt(); @@ -40,7 +44,7 @@ public class AnswerPollEvent extends MessageHandler { statement.setString(4, answer.toString()); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } if (poll.lastQuestionId == questionId) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/polls/CancelPollEvent.java b/src/main/java/com/eu/habbo/messages/incoming/polls/CancelPollEvent.java index 02284cbe..a38b5a03 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/polls/CancelPollEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/polls/CancelPollEvent.java @@ -3,12 +3,16 @@ package com.eu.habbo.messages.incoming.polls; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.polls.Poll; import com.eu.habbo.messages.incoming.MessageHandler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; public class CancelPollEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(CancelPollEvent.class); + @Override public void handle() throws Exception { int pollId = this.packet.readInt(); @@ -24,7 +28,7 @@ public class CancelPollEvent extends MessageHandler { statement.setString(4, ""); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomSettingsSaveEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomSettingsSaveEvent.java index db338bf2..415809d6 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomSettingsSaveEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/RoomSettingsSaveEvent.java @@ -7,8 +7,12 @@ import com.eu.habbo.habbohotel.rooms.RoomCategory; import com.eu.habbo.habbohotel.rooms.RoomState; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.rooms.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class RoomSettingsSaveEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(RoomSettingsSaveEvent.class); + @Override public void handle() throws Exception { int roomId = this.packet.readInt(); @@ -93,7 +97,7 @@ public class RoomSettingsSaveEvent extends MessageHandler { } ScripterManager.scripterDetected(this.client, message); - Emulator.getLogging().logUserLine(message); + LOGGER.info(message); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemClothingEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemClothingEvent.java index 048a772e..95382469 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemClothingEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemClothingEvent.java @@ -12,12 +12,16 @@ import com.eu.habbo.messages.outgoing.rooms.UpdateStackHeightComposer; import com.eu.habbo.messages.outgoing.rooms.items.RemoveFloorItemComposer; import com.eu.habbo.messages.outgoing.users.UserClothesComposer; import com.eu.habbo.threading.runnables.QueryDeleteHabboItem; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; public class RedeemClothingEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(RedeemClothingEvent.class); + @Override public void handle() throws Exception { int itemId = this.packet.readInt(); @@ -45,7 +49,7 @@ public class RedeemClothingEvent extends MessageHandler { statement.setInt(2, clothing.id); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } this.client.getHabbo().getInventory().getWardrobeComponent().getClothing().add(clothing.id); @@ -56,7 +60,7 @@ public class RedeemClothingEvent extends MessageHandler { this.client.sendResponse(new BubbleAlertComposer(BubbleAlertKeys.FIGURESET_OWNED_ALREADY.key)); } } else { - Emulator.getLogging().logErrorLine("[Catalog] No definition in catalog_clothing found for clothing name " + item.getBaseItem().getName() + ". Could not redeem clothing!"); + LOGGER.error("[Catalog] No definition in catalog_clothing found for clothing name " + item.getBaseItem().getName() + ". Could not redeem clothing!"); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemItemEvent.java index a5f72a41..3533ca6d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemItemEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemItemEvent.java @@ -11,8 +11,12 @@ import com.eu.habbo.messages.outgoing.users.UserCreditsComposer; import com.eu.habbo.messages.outgoing.users.UserCurrencyComposer; import com.eu.habbo.plugin.events.furniture.FurnitureRedeemedEvent; import com.eu.habbo.threading.runnables.QueryDeleteHabboItem; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class RedeemItemEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(RedeemItemEvent.class); + @Override public void handle() throws Exception { int itemId = this.packet.readInt(); @@ -32,7 +36,7 @@ public class RedeemItemEvent extends MessageHandler { try { credits = Integer.valueOf(item.getBaseItem().getName().split("_")[1]); } catch (Exception e) { - Emulator.getLogging().logErrorLine("Failed to parse redeemable furniture: " + item.getBaseItem().getName() + ". Must be in format of CF_"); + LOGGER.error("Failed to parse redeemable furniture: " + item.getBaseItem().getName() + ". Must be in format of CF_"); return; } @@ -43,7 +47,7 @@ public class RedeemItemEvent extends MessageHandler { try { pixels = Integer.valueOf(item.getBaseItem().getName().split("_")[1]); } catch (Exception e) { - Emulator.getLogging().logErrorLine("Failed to parse redeemable pixel furniture: " + item.getBaseItem().getName() + ". Must be in format of PF_"); + LOGGER.error("Failed to parse redeemable pixel furniture: " + item.getBaseItem().getName() + ". Must be in format of PF_"); return; } @@ -55,14 +59,14 @@ public class RedeemItemEvent extends MessageHandler { try { pointsType = Integer.valueOf(item.getBaseItem().getName().split("_")[1]); } catch (Exception e) { - Emulator.getLogging().logErrorLine("Failed to parse redeemable points furniture: " + item.getBaseItem().getName() + ". Must be in format of DF__ where equals integer representation of seasonal currency."); + LOGGER.error("Failed to parse redeemable points furniture: " + item.getBaseItem().getName() + ". Must be in format of DF__ where equals integer representation of seasonal currency."); return; } try { points = Integer.valueOf(item.getBaseItem().getName().split("_")[2]); } catch (Exception e) { - Emulator.getLogging().logErrorLine("Failed to parse redeemable points furniture: " + item.getBaseItem().getName() + ". Must be in format of DF__ where equals integer representation of seasonal currency."); + LOGGER.error("Failed to parse redeemable points furniture: " + item.getBaseItem().getName() + ". Must be in format of DF__ where equals integer representation of seasonal currency."); return; } @@ -73,7 +77,7 @@ public class RedeemItemEvent extends MessageHandler { try { points = Integer.valueOf(item.getBaseItem().getName().split("_")[2]); } catch (Exception e) { - Emulator.getLogging().logErrorLine("Failed to parse redeemable diamonds furniture: " + item.getBaseItem().getName() + ". Must be in format of CF_diamond_"); + LOGGER.error("Failed to parse redeemable diamonds furniture: " + item.getBaseItem().getName() + ". Must be in format of CF_diamond_"); return; } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SavePostItStickyPoleEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SavePostItStickyPoleEvent.java index 8a672308..9f393896 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SavePostItStickyPoleEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SavePostItStickyPoleEvent.java @@ -7,10 +7,14 @@ import com.eu.habbo.habbohotel.items.interactions.InteractionPostIt; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.incoming.MessageHandler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.time.LocalDate; public class SavePostItStickyPoleEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(SavePostItStickyPoleEvent.class); + @Override public void handle() throws Exception { int itemId = this.packet.readInt(); @@ -26,7 +30,7 @@ public class SavePostItStickyPoleEvent extends MessageHandler { CommandHandler.handleCommand(this.client, command); } } else { - Emulator.getLogging().logUserLine("Scripter Alert! " + this.client.getHabbo().getHabboInfo().getUsername() + " | " + this.packet.readString()); + LOGGER.info("Scripter Alert! " + this.client.getHabbo().getHabboInfo().getUsername() + " | " + this.packet.readString()); } } else { String text = this.packet.readString(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/ToggleFloorItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/ToggleFloorItemEvent.java index 2bc02132..5b665d79 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/ToggleFloorItemEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/ToggleFloorItemEvent.java @@ -2,8 +2,8 @@ package com.eu.habbo.messages.incoming.rooms.items; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.items.interactions.InteractionDice; -import com.eu.habbo.habbohotel.items.interactions.pets.InteractionMonsterPlantSeed; import com.eu.habbo.habbohotel.items.interactions.InteractionWired; +import com.eu.habbo.habbohotel.items.interactions.pets.InteractionMonsterPlantSeed; import com.eu.habbo.habbohotel.pets.MonsterplantPet; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.HabboItem; @@ -12,8 +12,12 @@ import com.eu.habbo.messages.outgoing.rooms.items.RemoveFloorItemComposer; import com.eu.habbo.messages.outgoing.rooms.pets.PetPackageComposer; import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; import com.eu.habbo.threading.runnables.QueryDeleteHabboItem; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ToggleFloorItemEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(ToggleFloorItemEvent.class); + @Override public void handle() throws Exception { try { @@ -120,7 +124,7 @@ public class ToggleFloorItemEvent extends MessageHandler { this.client.getHabbo().getRoomUnit().setGoalLocation(this.client.getHabbo().getRoomUnit().getCurrentLocation()); } } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/UseRandomStateItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/UseRandomStateItemEvent.java index f8fbcba2..85a357ff 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/UseRandomStateItemEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/UseRandomStateItemEvent.java @@ -1,12 +1,15 @@ package com.eu.habbo.messages.incoming.rooms.items; -import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.items.interactions.InteractionRandomState; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.incoming.MessageHandler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class UseRandomStateItemEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(UseRandomStateItemEvent.class); + @Override public void handle() throws Exception { try { @@ -23,7 +26,7 @@ public class UseRandomStateItemEvent extends MessageHandler { InteractionRandomState randomStateItem = (InteractionRandomState)item; randomStateItem.onRandomStateClick(this.client, room); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestPlaylists.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestPlaylists.java index 6c4b804b..15f9206a 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestPlaylists.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestPlaylists.java @@ -7,10 +7,14 @@ import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.handshake.ConnectionErrorComposer; import com.eu.habbo.messages.outgoing.rooms.items.youtube.YoutubeDisplayListComposer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.ArrayList; public class YoutubeRequestPlaylists extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(YoutubeRequestPlaylists.class); + @Override public void handle() throws Exception { int itemId = this.packet.readInt(); @@ -24,7 +28,7 @@ public class YoutubeRequestPlaylists extends MessageHandler { ArrayList playlists = Emulator.getGameEnvironment().getItemManager().getYoutubeManager().getPlaylistsForItemId(item.getBaseItem().getId()); if (playlists == null) { - Emulator.getLogging().logErrorLine("No YouTube playlists set for base item #" + item.getBaseItem().getId()); + LOGGER.error("No YouTube playlists set for base item #" + item.getBaseItem().getId()); this.client.sendResponse(new ConnectionErrorComposer(1000)); return; } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/CompostMonsterplantEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/CompostMonsterplantEvent.java index 333e86bc..2b87a45a 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/CompostMonsterplantEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/CompostMonsterplantEvent.java @@ -8,12 +8,16 @@ import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.rooms.items.AddFloorItemComposer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; public class CompostMonsterplantEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(CompostMonsterplantEvent.class); + @Override public void handle() throws Exception { int petId = this.packet.readInt(); @@ -42,7 +46,7 @@ public class CompostMonsterplantEvent extends MessageHandler { statement.setInt(1, pet.getId()); statement.executeUpdate(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/HorseRemoveSaddleEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/HorseRemoveSaddleEvent.java index 3b73995d..9c36827c 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/HorseRemoveSaddleEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/HorseRemoveSaddleEvent.java @@ -10,6 +10,8 @@ import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.rooms.pets.RoomPetHorseFigureComposer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -17,6 +19,8 @@ import java.sql.ResultSet; import java.sql.SQLException; public class HorseRemoveSaddleEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(HorseRemoveSaddleEvent.class); + @Override public void handle() throws Exception { Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); @@ -36,12 +40,12 @@ public class HorseRemoveSaddleEvent extends MessageHandler { if (set.next()) { saddleItemId = set.getInt("id"); } else { - Emulator.getLogging().logErrorLine("There is no viable fallback saddle item for old horses with no saddle item ID. Horse pet ID: " + horse.getId()); + LOGGER.error("There is no viable fallback saddle item for old horses with no saddle item ID. Horse pet ID: " + horse.getId()); return; } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserShoutEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserShoutEvent.java index 3e217e75..1c0e4fba 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserShoutEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserShoutEvent.java @@ -6,8 +6,12 @@ import com.eu.habbo.habbohotel.rooms.RoomChatMessage; import com.eu.habbo.habbohotel.rooms.RoomChatType; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.plugin.events.users.UserTalkEvent; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class RoomUserShoutEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(RoomUserShoutEvent.class); + @Override public void handle() throws Exception { if (this.client.getHabbo().getHabboInfo().getCurrentRoom() == null) @@ -34,7 +38,7 @@ public class RoomUserShoutEvent extends MessageHandler { } else { String reportMessage = Emulator.getTexts().getValue("scripter.warning.chat.length").replace("%username%", this.client.getHabbo().getHabboInfo().getUsername()).replace("%length%", message.getMessage().length() + ""); ScripterManager.scripterDetected(this.client, reportMessage); - Emulator.getLogging().logUserLine(reportMessage); + LOGGER.info(reportMessage); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserTalkEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserTalkEvent.java index a3debf17..2201fb4c 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserTalkEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserTalkEvent.java @@ -7,8 +7,12 @@ import com.eu.habbo.habbohotel.rooms.RoomChatMessage; import com.eu.habbo.habbohotel.rooms.RoomChatType; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.plugin.events.users.UserTalkEvent; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class RoomUserTalkEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(RoomUserTalkEvent.class); + @Override public void handle() throws Exception { @@ -36,7 +40,7 @@ public class RoomUserTalkEvent extends MessageHandler { } else { String reportMessage = Emulator.getTexts().getValue("scripter.warning.chat.length").replace("%username%", this.client.getHabbo().getHabboInfo().getUsername()).replace("%length%", message.getMessage().length() + ""); ScripterManager.scripterDetected(this.client, reportMessage); - Emulator.getLogging().logUserLine(reportMessage); + LOGGER.info(reportMessage); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserWalkEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserWalkEvent.java index 1cd43572..859be049 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserWalkEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserWalkEvent.java @@ -12,8 +12,12 @@ import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.rooms.users.RoomUnitOnRollerComposer; import com.eu.habbo.plugin.events.users.UserIdleEvent; import gnu.trove.set.hash.THashSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class RoomUserWalkEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(RoomUserWalkEvent.class); + @Override public int getRatelimit() { return 500; @@ -154,7 +158,7 @@ public class RoomUserWalkEvent extends MessageHandler { } } } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserWhisperEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserWhisperEvent.java index 7a35384e..b153138c 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserWhisperEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserWhisperEvent.java @@ -6,8 +6,12 @@ import com.eu.habbo.habbohotel.rooms.RoomChatMessage; import com.eu.habbo.habbohotel.rooms.RoomChatType; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.plugin.events.users.UserTalkEvent; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class RoomUserWhisperEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(RoomUserWhisperEvent.class); + @Override public void handle() throws Exception { if (this.client.getHabbo().getHabboInfo().getCurrentRoom() == null) @@ -31,7 +35,7 @@ public class RoomUserWhisperEvent extends MessageHandler { } else { String reportMessage = Emulator.getTexts().getValue("scripter.warning.chat.length").replace("%username%", this.client.getHabbo().getHabboInfo().getUsername()).replace("%length%", chatMessage.getMessage().length() + ""); ScripterManager.scripterDetected(this.client, reportMessage); - Emulator.getLogging().logUserLine(reportMessage); + LOGGER.info(reportMessage); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/ConfirmChangeNameEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/ConfirmChangeNameEvent.java index 8d8004b6..03e02149 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/ConfirmChangeNameEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/ConfirmChangeNameEvent.java @@ -10,6 +10,8 @@ import com.eu.habbo.messages.outgoing.rooms.users.RoomUserNameChangedComposer; import com.eu.habbo.messages.outgoing.users.ChangeNameCheckResultComposer; import com.eu.habbo.messages.outgoing.users.UserDataComposer; import com.eu.habbo.plugin.events.users.UserNameChangedEvent; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -18,6 +20,8 @@ import java.util.ArrayList; import java.util.List; public class ConfirmChangeNameEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(ConfirmChangeNameEvent.class); + public static final List changingUsernames = new ArrayList<>(2); @Override @@ -80,7 +84,7 @@ public class ConfirmChangeNameEvent extends MessageHandler { statement.setInt(4, Emulator.getIntUnixTimestamp()); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } else { this.client.sendResponse(new ChangeNameCheckResultComposer(ChangeNameCheckResultComposer.TAKEN_WITH_SUGGESTIONS, name, new ArrayList<>())); diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserDataEvent.java index 01f1f1af..f4d37e90 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserDataEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserDataEvent.java @@ -8,10 +8,14 @@ import com.eu.habbo.messages.outgoing.rooms.ForwardToRoomComposer; import com.eu.habbo.messages.outgoing.users.MeMenuSettingsComposer; import com.eu.habbo.messages.outgoing.users.UserDataComposer; import com.eu.habbo.messages.outgoing.users.UserPerksComposer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.ArrayList; public class RequestUserDataEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(RequestUserDataEvent.class); + @Override public void handle() throws Exception { if (this.client.getHabbo() != null) { @@ -59,7 +63,7 @@ public class RequestUserDataEvent extends MessageHandler { } else { - Emulator.getLogging().logDebugLine("Habbo is NULL!"); + LOGGER.debug("Attempted to request user data where Habbo was null."); Emulator.getGameServer().getGameClientManager().disposeClient(this.client); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/UserSaveLookEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/UserSaveLookEvent.java index 97bcbf93..411f24e3 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/UserSaveLookEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/UserSaveLookEvent.java @@ -8,8 +8,12 @@ import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.rooms.users.RoomUserDataComposer; import com.eu.habbo.messages.outgoing.users.UpdateUserLookComposer; import com.eu.habbo.plugin.events.users.UserSavedLookEvent; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class UserSaveLookEvent extends MessageHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(UserSaveLookEvent.class); + @Override public void handle() throws Exception { String genderCode = this.packet.readString(); @@ -20,7 +24,7 @@ public class UserSaveLookEvent extends MessageHandler { } catch (IllegalArgumentException e) { String message = Emulator.getTexts().getValue("scripter.warning.look.gender").replace("%username%", this.client.getHabbo().getHabboInfo().getUsername()).replace("%gender%", genderCode); ScripterManager.scripterDetected(this.client, message); - Emulator.getLogging().logUserLine(message); + LOGGER.info(message); return; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementListComposer.java index 580ab0da..54418f38 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementListComposer.java @@ -8,8 +8,12 @@ import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class AchievementListComposer extends MessageComposer { + private static final Logger LOGGER = LoggerFactory.getLogger(AchievementListComposer.class); + private final Habbo habbo; public AchievementListComposer(Habbo habbo) { @@ -49,7 +53,7 @@ public class AchievementListComposer extends MessageComposer { this.response.appendString(""); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } return 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 d7c340be..1a23cd62 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 @@ -6,10 +6,14 @@ import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.List; public class CatalogPagesListComposer extends MessageComposer { + private static final Logger LOGGER = LoggerFactory.getLogger(CatalogPagesListComposer.class); + private final Habbo habbo; private final String mode; private final boolean hasPermission; @@ -44,7 +48,7 @@ public class CatalogPagesListComposer extends MessageComposer { return this.response; } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } return null; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOwnItemsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOwnItemsComposer.java index 8507f9a6..d230697b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOwnItemsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOwnItemsComposer.java @@ -7,8 +7,12 @@ import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class MarketplaceOwnItemsComposer extends MessageComposer { + private static final Logger LOGGER = LoggerFactory.getLogger(MarketplaceOwnItemsComposer.class); + private final Habbo habbo; public MarketplaceOwnItemsComposer(Habbo habbo) { @@ -54,7 +58,7 @@ public class MarketplaceOwnItemsComposer extends MessageComposer { this.response.appendInt(0); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendsComposer.java index 4d829ac5..6832ff9e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendsComposer.java @@ -1,6 +1,5 @@ package com.eu.habbo.messages.outgoing.friends; -import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.messenger.Messenger; import com.eu.habbo.habbohotel.messenger.MessengerBuddy; import com.eu.habbo.habbohotel.users.Habbo; @@ -8,10 +7,14 @@ import com.eu.habbo.habbohotel.users.HabboGender; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Map; public class FriendsComposer extends MessageComposer { + private static final Logger LOGGER = LoggerFactory.getLogger(FriendsComposer.class); + private final Habbo habbo; public FriendsComposer(Habbo habbo) { @@ -67,7 +70,7 @@ public class FriendsComposer extends MessageComposer { return this.response; } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } return null; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumDataComposer.java index 588a974a..3a64640a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumDataComposer.java @@ -12,6 +12,8 @@ import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; import com.eu.habbo.messages.outgoing.handshake.ConnectionErrorComposer; import gnu.trove.set.hash.THashSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -20,6 +22,8 @@ import java.sql.SQLException; public class GuildForumDataComposer extends MessageComposer { + private static final Logger LOGGER = LoggerFactory.getLogger(GuildForumDataComposer.class); + public final Guild guild; public Habbo habbo; @@ -73,7 +77,7 @@ public class GuildForumDataComposer extends MessageComposer { newComments = set.getInt(1); } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } response.appendInt(guild.getId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryItemsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryItemsComposer.java index 3a7dae3f..6fb8a0cd 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryItemsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryItemsComposer.java @@ -1,6 +1,5 @@ package com.eu.habbo.messages.outgoing.inventory; -import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.items.FurnitureType; import com.eu.habbo.habbohotel.items.interactions.InteractionGift; import com.eu.habbo.habbohotel.users.HabboItem; @@ -9,8 +8,12 @@ import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; import gnu.trove.map.TIntObjectMap; import gnu.trove.procedure.TIntObjectProcedure; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class InventoryItemsComposer extends MessageComposer implements TIntObjectProcedure { + private static final Logger LOGGER = LoggerFactory.getLogger(InventoryItemsComposer.class); + private final int page; private final int out; private final TIntObjectMap items; @@ -32,7 +35,7 @@ public class InventoryItemsComposer extends MessageComposer implements TIntObjec this.items.forEachEntry(this); return this.response; } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } return null; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java index da10c277..36e63b84 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java @@ -8,12 +8,16 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; import gnu.trove.map.hash.THashMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; public class ModToolUserInfoComposer extends MessageComposer { + private static final Logger LOGGER = LoggerFactory.getLogger(ModToolUserInfoComposer.class); + private final ResultSet set; public ModToolUserInfoComposer(ResultSet set) { @@ -61,7 +65,7 @@ public class ModToolUserInfoComposer extends MessageComposer { return this.response; } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } return null; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/PrivateRoomsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/PrivateRoomsComposer.java index 8628a1d2..36a13e8c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/PrivateRoomsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/PrivateRoomsComposer.java @@ -1,14 +1,17 @@ package com.eu.habbo.messages.outgoing.navigator; -import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.List; public class PrivateRoomsComposer extends MessageComposer { + private static final Logger LOGGER = LoggerFactory.getLogger(PrivateRoomsComposer.class); + private final List rooms; public PrivateRoomsComposer(List rooms) { @@ -42,7 +45,7 @@ public class PrivateRoomsComposer extends MessageComposer { this.response.appendString("E"); return this.response; } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } return null; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/ProfileFriendsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/ProfileFriendsComposer.java index 4bf9a48e..4cae8211 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/ProfileFriendsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/ProfileFriendsComposer.java @@ -1,6 +1,5 @@ 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; @@ -8,6 +7,8 @@ import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; import gnu.trove.map.hash.THashMap; import gnu.trove.set.hash.THashSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.List; @@ -15,6 +16,8 @@ import java.util.Map; import java.util.Random; public class ProfileFriendsComposer extends MessageComposer { + private static final Logger LOGGER = LoggerFactory.getLogger(ProfileFriendsComposer.class); + private final List lovers = new ArrayList<>(); private final List friends = new ArrayList<>(); private final List haters = new ArrayList<>(); @@ -47,7 +50,7 @@ public class ProfileFriendsComposer extends MessageComposer { } } } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } this.userId = habbo.getHabboInfo().getId(); @@ -101,7 +104,7 @@ public class ProfileFriendsComposer extends MessageComposer { this.response.appendString(this.haters.get(hatersIndex).getLook()); } } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserCurrencyComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserCurrencyComposer.java index d4e4df03..d974ce80 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserCurrencyComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserCurrencyComposer.java @@ -5,8 +5,12 @@ import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class UserCurrencyComposer extends MessageComposer { + private static final Logger LOGGER = LoggerFactory.getLogger(UserCurrencyComposer.class); + private final Habbo habbo; public UserCurrencyComposer(Habbo habbo) { @@ -23,7 +27,7 @@ public class UserCurrencyComposer extends MessageComposer { try { type = Integer.valueOf(s); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); return null; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserProfileComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserProfileComposer.java index 75895e72..b2944ea8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserProfileComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserProfileComposer.java @@ -9,6 +9,8 @@ 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; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -20,6 +22,8 @@ import java.util.Date; import java.util.List; public class UserProfileComposer extends MessageComposer { + private static final Logger LOGGER = LoggerFactory.getLogger(UserProfileComposer.class); + private final HabboInfo habboInfo; private Habbo habbo; private GameClient viewer; @@ -60,7 +64,7 @@ public class UserProfileComposer extends MessageComposer { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } this.response.appendInt(achievementScore); diff --git a/src/main/java/com/eu/habbo/messages/rcon/ExecuteCommand.java b/src/main/java/com/eu/habbo/messages/rcon/ExecuteCommand.java index ca772404..fd16a35c 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/ExecuteCommand.java +++ b/src/main/java/com/eu/habbo/messages/rcon/ExecuteCommand.java @@ -4,8 +4,12 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.commands.CommandHandler; import com.eu.habbo.habbohotel.users.Habbo; import com.google.gson.Gson; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ExecuteCommand extends RCONMessage { + private static final Logger LOGGER = LoggerFactory.getLogger(ExecuteCommand.class); + public ExecuteCommand() { super(JSONExecuteCommand.class); @@ -25,7 +29,7 @@ public class ExecuteCommand extends RCONMessage { + private static final Logger LOGGER = LoggerFactory.getLogger(GiveBadge.class); + public GiveBadge() { super(GiveBadgeJSON.class); @@ -74,7 +78,7 @@ public class GiveBadge extends RCONMessage { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); this.status = RCONMessage.STATUS_ERROR; this.message = e.getMessage(); } diff --git a/src/main/java/com/eu/habbo/messages/rcon/GiveCredits.java b/src/main/java/com/eu/habbo/messages/rcon/GiveCredits.java index 6c566e1d..60e9326a 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/GiveCredits.java +++ b/src/main/java/com/eu/habbo/messages/rcon/GiveCredits.java @@ -3,12 +3,16 @@ package com.eu.habbo.messages.rcon; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.Habbo; import com.google.gson.Gson; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; public class GiveCredits extends RCONMessage { + private static final Logger LOGGER = LoggerFactory.getLogger(GiveCredits.class); + public GiveCredits() { super(JSONGiveCredits.class); @@ -27,7 +31,7 @@ public class GiveCredits extends RCONMessage { statement.execute(); } catch (SQLException e) { this.status = RCONMessage.SYSTEM_ERROR; - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } this.message = "offline"; diff --git a/src/main/java/com/eu/habbo/messages/rcon/GivePixels.java b/src/main/java/com/eu/habbo/messages/rcon/GivePixels.java index 82b492c1..45001f98 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/GivePixels.java +++ b/src/main/java/com/eu/habbo/messages/rcon/GivePixels.java @@ -3,12 +3,16 @@ package com.eu.habbo.messages.rcon; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.Habbo; import com.google.gson.Gson; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; public class GivePixels extends RCONMessage { + private static final Logger LOGGER = LoggerFactory.getLogger(GivePixels.class); + public GivePixels() { super(JSONGivePixels.class); @@ -27,7 +31,7 @@ public class GivePixels extends RCONMessage { statement.execute(); } catch (SQLException e) { this.status = RCONMessage.SYSTEM_ERROR; - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } this.message = "offline"; diff --git a/src/main/java/com/eu/habbo/messages/rcon/GivePoints.java b/src/main/java/com/eu/habbo/messages/rcon/GivePoints.java index 072389b6..2afff479 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/GivePoints.java +++ b/src/main/java/com/eu/habbo/messages/rcon/GivePoints.java @@ -3,12 +3,16 @@ package com.eu.habbo.messages.rcon; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.Habbo; import com.google.gson.Gson; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; public class GivePoints extends RCONMessage { + private static final Logger LOGGER = LoggerFactory.getLogger(GivePoints.class); + public GivePoints() { super(JSONGivePoints.class); @@ -29,7 +33,7 @@ public class GivePoints extends RCONMessage { statement.execute(); } catch (SQLException e) { this.status = RCONMessage.SYSTEM_ERROR; - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } this.message = "offline"; 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 ee01e139..078f7143 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/GiveRespect.java +++ b/src/main/java/com/eu/habbo/messages/rcon/GiveRespect.java @@ -3,12 +3,16 @@ package com.eu.habbo.messages.rcon; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.Habbo; import com.google.gson.Gson; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; public class GiveRespect extends RCONMessage { + private static final Logger LOGGER = LoggerFactory.getLogger(GiveRespect.class); + public GiveRespect() { super(JSONGiveRespect.class); @@ -31,7 +35,7 @@ public class GiveRespect extends RCONMessage { statement.execute(); } catch (SQLException e) { this.status = RCONMessage.SYSTEM_ERROR; - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } this.message = "offline"; diff --git a/src/main/java/com/eu/habbo/messages/rcon/GiveUserClothing.java b/src/main/java/com/eu/habbo/messages/rcon/GiveUserClothing.java index 94c27399..41b81669 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/GiveUserClothing.java +++ b/src/main/java/com/eu/habbo/messages/rcon/GiveUserClothing.java @@ -7,12 +7,16 @@ import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys; import com.eu.habbo.messages.outgoing.users.UserClothesComposer; import com.google.gson.Gson; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; public class GiveUserClothing extends RCONMessage { + private static final Logger LOGGER = LoggerFactory.getLogger(GiveUserClothing.class); + public GiveUserClothing() { super(GiveUserClothing.JSONGiveUserClothing.class); } @@ -26,7 +30,7 @@ public class GiveUserClothing extends RCONMessage { + private static final Logger LOGGER = LoggerFactory.getLogger(IgnoreUser.class); + public IgnoreUser() { super(JSONIgnoreUser.class); } @@ -26,7 +30,7 @@ public class IgnoreUser extends RCONMessage { statement.setInt(2, object.target_id); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } this.message = "offline"; diff --git a/src/main/java/com/eu/habbo/messages/rcon/MuteUser.java b/src/main/java/com/eu/habbo/messages/rcon/MuteUser.java index abacad3e..711b7d22 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/MuteUser.java +++ b/src/main/java/com/eu/habbo/messages/rcon/MuteUser.java @@ -3,12 +3,16 @@ package com.eu.habbo.messages.rcon; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.Habbo; import com.google.gson.Gson; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; public class MuteUser extends RCONMessage { + private static final Logger LOGGER = LoggerFactory.getLogger(MuteUser.class); + public MuteUser() { super(MuteUser.JSON.class); } @@ -31,7 +35,7 @@ public class MuteUser extends RCONMessage { this.status = HABBO_NOT_FOUND; } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/messages/rcon/SendGift.java b/src/main/java/com/eu/habbo/messages/rcon/SendGift.java index 33a2cf46..8f644659 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/SendGift.java +++ b/src/main/java/com/eu/habbo/messages/rcon/SendGift.java @@ -6,6 +6,8 @@ import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.google.gson.Gson; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -13,6 +15,7 @@ import java.sql.ResultSet; import java.sql.SQLException; public class SendGift extends RCONMessage { + private static final Logger LOGGER = LoggerFactory.getLogger(SendGift.class); public SendGift() { super(SendGiftJSON.class); @@ -56,7 +59,7 @@ public class SendGift extends RCONMessage { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } else { username = habbo.getHabboInfo().getUsername(); diff --git a/src/main/java/com/eu/habbo/messages/rcon/SetMotto.java b/src/main/java/com/eu/habbo/messages/rcon/SetMotto.java index fc3546d5..88ce9c20 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/SetMotto.java +++ b/src/main/java/com/eu/habbo/messages/rcon/SetMotto.java @@ -4,12 +4,16 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.outgoing.rooms.users.RoomUserDataComposer; import com.google.gson.Gson; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; public class SetMotto extends RCONMessage { + private static final Logger LOGGER = LoggerFactory.getLogger(SetMotto.class); + public SetMotto() { super(SetMottoJSON.class); } @@ -29,7 +33,7 @@ public class SetMotto extends RCONMessage { statement.execute(); } } catch (SQLException e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } } diff --git a/src/main/java/com/eu/habbo/messages/rcon/UpdateUser.java b/src/main/java/com/eu/habbo/messages/rcon/UpdateUser.java index 1e1a6bf2..7357a760 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/UpdateUser.java +++ b/src/main/java/com/eu/habbo/messages/rcon/UpdateUser.java @@ -6,12 +6,15 @@ import com.eu.habbo.messages.outgoing.rooms.users.RoomUserDataComposer; import com.eu.habbo.messages.outgoing.users.MeMenuSettingsComposer; import com.eu.habbo.messages.outgoing.users.UpdateUserLookComposer; import com.google.gson.Gson; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; public class UpdateUser extends RCONMessage { + private static final Logger LOGGER = LoggerFactory.getLogger(UpdateUser.class); public UpdateUser() { super(UpdateUser.JSON.class); @@ -105,7 +108,7 @@ public class UpdateUser extends RCONMessage { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/networking/camera/CameraPacketHandler.java b/src/main/java/com/eu/habbo/networking/camera/CameraPacketHandler.java index 8d52ee08..b0dc0582 100644 --- a/src/main/java/com/eu/habbo/networking/camera/CameraPacketHandler.java +++ b/src/main/java/com/eu/habbo/networking/camera/CameraPacketHandler.java @@ -1,13 +1,16 @@ package com.eu.habbo.networking.camera; -import com.eu.habbo.Emulator; import com.eu.habbo.networking.camera.messages.incoming.*; import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.HashMap; public class CameraPacketHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(CameraPacketHandler.class); + private static CameraPacketHandler INSTANCE; private final HashMap> packetDefinitions; @@ -38,7 +41,7 @@ public class CameraPacketHandler { message.handle(channel); message.buffer.release(); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } } diff --git a/src/main/java/com/eu/habbo/networking/gameserver/decoders/GameMessageHandler.java b/src/main/java/com/eu/habbo/networking/gameserver/decoders/GameMessageHandler.java index 022d5f16..143b6c61 100644 --- a/src/main/java/com/eu/habbo/networking/gameserver/decoders/GameMessageHandler.java +++ b/src/main/java/com/eu/habbo/networking/gameserver/decoders/GameMessageHandler.java @@ -8,11 +8,13 @@ import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.handler.codec.TooLongFrameException; - -import java.io.IOException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @ChannelHandler.Sharable public class GameMessageHandler extends ChannelInboundHandlerAdapter { + private static final Logger LOGGER = LoggerFactory.getLogger(GameMessageHandler.class); + @Override public void channelRegistered(ChannelHandlerContext ctx) { @@ -40,7 +42,7 @@ public class GameMessageHandler extends ChannelInboundHandlerAdapter { handler.run(); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } @@ -52,15 +54,15 @@ public class GameMessageHandler extends ChannelInboundHandlerAdapter { @Override public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { if (cause instanceof TooLongFrameException) { - Emulator.getLogging().logErrorLine("Disconnecting client, reason: \"" + cause.getMessage() + "\"."); + LOGGER.error("Disconnecting client, reason: \"" + cause.getMessage() + "\"."); } else { cause.printStackTrace(); - Emulator.getLogging().logErrorLine("Disconnecting client, exception in GameMessageHander:"); - Emulator.getLogging().logErrorLine(cause.toString()); + LOGGER.error("Disconnecting client, exception in GameMessageHander:"); + LOGGER.error(cause.toString()); for (StackTraceElement element : cause.getStackTrace()) { - Emulator.getLogging().logErrorLine(element.toString()); + LOGGER.error(element.toString()); } } diff --git a/src/main/java/com/eu/habbo/threading/HabboExecutorService.java b/src/main/java/com/eu/habbo/threading/HabboExecutorService.java index be426435..36ccd05a 100644 --- a/src/main/java/com/eu/habbo/threading/HabboExecutorService.java +++ b/src/main/java/com/eu/habbo/threading/HabboExecutorService.java @@ -1,12 +1,15 @@ package com.eu.habbo.threading; -import com.eu.habbo.Emulator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.ThreadFactory; public class HabboExecutorService extends ScheduledThreadPoolExecutor { + private static final Logger LOGGER = LoggerFactory.getLogger(HabboExecutorService.class); + public HabboExecutorService(int corePoolSize, ThreadFactory threadFactory) { super(corePoolSize, threadFactory); } @@ -16,10 +19,7 @@ public class HabboExecutorService extends ScheduledThreadPoolExecutor { super.afterExecute(r, t); if (t != null && !(t instanceof IOException)) { - try { - Emulator.getLogging().logErrorLine(t); - } catch (Exception e) { - } + LOGGER.error("Error in HabboExecutorService", t); } } } diff --git a/src/main/java/com/eu/habbo/threading/RejectedExecutionHandlerImpl.java b/src/main/java/com/eu/habbo/threading/RejectedExecutionHandlerImpl.java index 2888ed04..1517ce17 100644 --- a/src/main/java/com/eu/habbo/threading/RejectedExecutionHandlerImpl.java +++ b/src/main/java/com/eu/habbo/threading/RejectedExecutionHandlerImpl.java @@ -1,14 +1,16 @@ package com.eu.habbo.threading; -import com.eu.habbo.Emulator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.concurrent.RejectedExecutionHandler; import java.util.concurrent.ThreadPoolExecutor; public class RejectedExecutionHandlerImpl implements RejectedExecutionHandler { + private static final Logger LOGGER = LoggerFactory.getLogger(RejectedExecutionHandlerImpl.class); @Override public void rejectedExecution(Runnable r, ThreadPoolExecutor executor) { - Emulator.getLogging().logErrorLine(r.toString() + " is rejected"); + LOGGER.error(r.toString() + " is rejected"); } } diff --git a/src/main/java/com/eu/habbo/threading/ThreadPooling.java b/src/main/java/com/eu/habbo/threading/ThreadPooling.java index 160ca121..eb7e25c4 100644 --- a/src/main/java/com/eu/habbo/threading/ThreadPooling.java +++ b/src/main/java/com/eu/habbo/threading/ThreadPooling.java @@ -1,7 +1,6 @@ package com.eu.habbo.threading; import com.eu.habbo.Emulator; -import com.eu.habbo.util.imager.badges.BadgeImager; import io.netty.util.concurrent.DefaultThreadFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -20,7 +19,7 @@ public class ThreadPooling { public ThreadPooling(Integer threads) { this.threads = threads; - this.scheduledPool = new HabboExecutorService(this.threads, new DefaultThreadFactory("ArcturusThreadFactory")); + this.scheduledPool = new HabboExecutorService(this.threads, new DefaultThreadFactory("HabExec")); this.canAdd = true; LOGGER.info("Thread Pool -> Loaded!"); } diff --git a/src/main/java/com/eu/habbo/threading/runnables/OpenGift.java b/src/main/java/com/eu/habbo/threading/runnables/OpenGift.java index 23f72bba..03e02605 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/OpenGift.java +++ b/src/main/java/com/eu/habbo/threading/runnables/OpenGift.java @@ -11,6 +11,8 @@ import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.inventory.InventoryUpdateItemComposer; import com.eu.habbo.messages.outgoing.rooms.items.PresentItemOpenedComposer; import gnu.trove.set.hash.THashSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.HashMap; @@ -18,6 +20,8 @@ import java.util.List; import java.util.Map; public class OpenGift implements Runnable { + private static final Logger LOGGER = LoggerFactory.getLogger(OpenGift.class); + private final HabboItem item; private final Habbo habbo; private final Room room; @@ -100,7 +104,7 @@ public class OpenGift implements Runnable { this.habbo.getClient().sendResponse(new PresentItemOpenedComposer(inside, "", false)); } } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } } 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 b13decab..2910fedd 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/QueryDeleteHabboBadge.java +++ b/src/main/java/com/eu/habbo/threading/runnables/QueryDeleteHabboBadge.java @@ -2,12 +2,16 @@ package com.eu.habbo.threading.runnables; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.Habbo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; class QueryDeleteHabboBadge implements Runnable { + private static final Logger LOGGER = LoggerFactory.getLogger(QueryDeleteHabboBadge.class); + private final String name; private final Habbo habbo; @@ -23,7 +27,7 @@ class QueryDeleteHabboBadge implements Runnable { statement.setString(2, this.name); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/threading/runnables/QueryDeleteHabboItem.java b/src/main/java/com/eu/habbo/threading/runnables/QueryDeleteHabboItem.java index d12d16de..91579bfd 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/QueryDeleteHabboItem.java +++ b/src/main/java/com/eu/habbo/threading/runnables/QueryDeleteHabboItem.java @@ -2,12 +2,16 @@ package com.eu.habbo.threading.runnables; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.HabboItem; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; public class QueryDeleteHabboItem implements Runnable { + private static final Logger LOGGER = LoggerFactory.getLogger(QueryDeleteHabboItem.class); + private final int itemId; public QueryDeleteHabboItem(int itemId) { @@ -24,7 +28,7 @@ public class QueryDeleteHabboItem implements Runnable { statement.setInt(1, this.itemId); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/threading/runnables/QueryDeleteHabboItems.java b/src/main/java/com/eu/habbo/threading/runnables/QueryDeleteHabboItems.java index 20340ee1..71e30aca 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/QueryDeleteHabboItems.java +++ b/src/main/java/com/eu/habbo/threading/runnables/QueryDeleteHabboItems.java @@ -3,12 +3,16 @@ package com.eu.habbo.threading.runnables; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.HabboItem; import gnu.trove.map.TIntObjectMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; public class QueryDeleteHabboItems implements Runnable { + private static final Logger LOGGER = LoggerFactory.getLogger(QueryDeleteHabboItems.class); + private TIntObjectMap items; public QueryDeleteHabboItems(TIntObjectMap items) { @@ -28,7 +32,7 @@ public class QueryDeleteHabboItems implements Runnable { statement.executeBatch(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } this.items.clear(); diff --git a/src/main/java/com/eu/habbo/threading/runnables/RoomUnitTeleport.java b/src/main/java/com/eu/habbo/threading/runnables/RoomUnitTeleport.java index 399e683f..9228596a 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/RoomUnitTeleport.java +++ b/src/main/java/com/eu/habbo/threading/runnables/RoomUnitTeleport.java @@ -1,6 +1,5 @@ package com.eu.habbo.threading.runnables; -import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomTile; import com.eu.habbo.habbohotel.rooms.RoomUnit; @@ -8,10 +7,14 @@ import com.eu.habbo.habbohotel.rooms.RoomUnitStatus; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.rooms.users.RoomUnitOnRollerComposer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.LinkedList; public class RoomUnitTeleport implements Runnable { + private static final Logger LOGGER = LoggerFactory.getLogger(RoomUnitTeleport.class); + private RoomUnit roomUnit; private Room room; private int x; @@ -42,7 +45,7 @@ public class RoomUnitTeleport implements Runnable { try { topItem.onWalkOff(this.roomUnit, this.room, new Object[]{this}); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } this.roomUnit.setPath(new LinkedList<>()); 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 f3ab7254..61c65c74 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/RoomUnitTeleportWalkToAction.java +++ b/src/main/java/com/eu/habbo/threading/runnables/RoomUnitTeleportWalkToAction.java @@ -5,8 +5,12 @@ import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomTile; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class RoomUnitTeleportWalkToAction implements Runnable { + private static final Logger LOGGER = LoggerFactory.getLogger(RoomUnitTeleportWalkToAction.class); + private final Habbo habbo; private final HabboItem habboItem; private final Room room; @@ -29,7 +33,7 @@ public class RoomUnitTeleportWalkToAction implements Runnable { try { this.habboItem.onClick(this.habbo.getClient(), this.room, new Object[]{0}); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } else { if (tile.isWalkable()) { 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 fde3f333..926e38f3 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/RoomUnitVendingMachineAction.java +++ b/src/main/java/com/eu/habbo/threading/runnables/RoomUnitVendingMachineAction.java @@ -5,8 +5,12 @@ import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomTile; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class RoomUnitVendingMachineAction implements Runnable { + private static final Logger LOGGER = LoggerFactory.getLogger(RoomUnitVendingMachineAction.class); + private final Habbo habbo; private final HabboItem habboItem; private final Room room; @@ -28,7 +32,7 @@ public class RoomUnitVendingMachineAction implements Runnable { try { this.habboItem.onClick(this.habbo.getClient(), this.room, new Object[]{0}); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } else { if (this.room.getLayout().getTile(tile.x, tile.y).isWalkable()) { diff --git a/src/main/java/com/eu/habbo/threading/runnables/SaveScoreForTeam.java b/src/main/java/com/eu/habbo/threading/runnables/SaveScoreForTeam.java index d046b669..44151ae6 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/SaveScoreForTeam.java +++ b/src/main/java/com/eu/habbo/threading/runnables/SaveScoreForTeam.java @@ -4,12 +4,16 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.games.Game; import com.eu.habbo.habbohotel.games.GamePlayer; import com.eu.habbo.habbohotel.games.GameTeam; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; public class SaveScoreForTeam implements Runnable { + private static final Logger LOGGER = LoggerFactory.getLogger(SaveScoreForTeam.class); + public final GameTeam team; public final Game game; @@ -34,7 +38,7 @@ public class SaveScoreForTeam implements Runnable { statement.executeBatch(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/threading/runnables/TeleportInteraction.java b/src/main/java/com/eu/habbo/threading/runnables/TeleportInteraction.java index 3513b8f6..83c6388d 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/TeleportInteraction.java +++ b/src/main/java/com/eu/habbo/threading/runnables/TeleportInteraction.java @@ -11,8 +11,12 @@ import com.eu.habbo.messages.outgoing.rooms.users.RoomUserEffectComposer; import com.eu.habbo.messages.outgoing.rooms.users.RoomUserRemoveComposer; import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; import com.eu.habbo.messages.outgoing.rooms.users.RoomUsersComposer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class TeleportInteraction extends Thread { + private static final Logger LOGGER = LoggerFactory.getLogger(TeleportInteraction.class); + private final Room room; private final GameClient client; private final HabboItem teleportOne; @@ -112,7 +116,7 @@ class TeleportInteraction extends Thread { } } } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } diff --git a/src/main/java/com/eu/habbo/threading/runnables/UpdateModToolIssue.java b/src/main/java/com/eu/habbo/threading/runnables/UpdateModToolIssue.java index b79c87ec..70ea304b 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/UpdateModToolIssue.java +++ b/src/main/java/com/eu/habbo/threading/runnables/UpdateModToolIssue.java @@ -2,12 +2,16 @@ package com.eu.habbo.threading.runnables; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.modtool.ModToolIssue; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; public class UpdateModToolIssue implements Runnable { + private static final Logger LOGGER = LoggerFactory.getLogger(UpdateModToolIssue.class); + private final ModToolIssue issue; public UpdateModToolIssue(ModToolIssue issue) { @@ -24,7 +28,7 @@ public class UpdateModToolIssue implements Runnable { statement.setInt(5, this.issue.id); statement.execute(); } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/threading/runnables/freeze/FreezeHandleSnowballExplosion.java b/src/main/java/com/eu/habbo/threading/runnables/freeze/FreezeHandleSnowballExplosion.java index c7b923a6..c8ba4612 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/freeze/FreezeHandleSnowballExplosion.java +++ b/src/main/java/com/eu/habbo/threading/runnables/freeze/FreezeHandleSnowballExplosion.java @@ -10,8 +10,12 @@ import com.eu.habbo.habbohotel.rooms.RoomTile; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; import gnu.trove.set.hash.THashSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class FreezeHandleSnowballExplosion implements Runnable { + private static final Logger LOGGER = LoggerFactory.getLogger(FreezeHandleSnowballExplosion.class); + private final FreezeThrowSnowball thrownData; public FreezeHandleSnowballExplosion(FreezeThrowSnowball thrownData) { @@ -100,7 +104,7 @@ class FreezeHandleSnowballExplosion implements Runnable { Emulator.getThreading().run(new FreezeResetExplosionTiles(freezeTiles, this.thrownData.room), 1000); } catch (Exception e) { - logger.error("Caught exception", e); + LOGGER.error("Caught exception", e); } } } diff --git a/src/main/java/com/eu/habbo/threading/runnables/hopper/HopperActionTwo.java b/src/main/java/com/eu/habbo/threading/runnables/hopper/HopperActionTwo.java index cdefe057..97b04dca 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/hopper/HopperActionTwo.java +++ b/src/main/java/com/eu/habbo/threading/runnables/hopper/HopperActionTwo.java @@ -4,6 +4,8 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.HabboItem; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -11,6 +13,8 @@ import java.sql.ResultSet; import java.sql.SQLException; class HopperActionTwo implements Runnable { + private static final Logger LOGGER = LoggerFactory.getLogger(HopperActionTwo.class); + private final HabboItem teleportOne; private final Room room; private final GameClient client; @@ -39,7 +43,7 @@ class HopperActionTwo implements Runnable { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } if (targetRoomId != 0 && targetItemId != 0) { 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 3e362919..feedd769 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 @@ -9,6 +9,8 @@ import com.eu.habbo.habbohotel.rooms.RoomUnitStatus; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; import com.eu.habbo.threading.runnables.HabboItemNewState; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.Connection; import java.sql.PreparedStatement; @@ -16,6 +18,8 @@ import java.sql.ResultSet; import java.sql.SQLException; class TeleportActionTwo implements Runnable { + private static final Logger LOGGER = LoggerFactory.getLogger(TeleportActionTwo.class); + private final HabboItem currentTeleport; private final Room room; private final GameClient client; @@ -72,7 +76,7 @@ class TeleportActionTwo implements Runnable { } } } catch (SQLException e) { - logger.error("Caught SQL exception", e); + LOGGER.error("Caught SQL exception", e); } }