improving logs and fixing some issues with XML parsing

.gitignore

@@ -3,4 +3,5 @@
 /.settings/
 /.idea/
 /target/
-logs/
+logs/
+hexid.txt

src/main/java/com/l2jserver/gameserver/GameServer.java

@@ -18,6 +18,8 @@
  */
 package com.l2jserver.gameserver;
 
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
 import java.awt.Toolkit;
 import java.io.File;
 import java.io.IOException;
@@ -25,16 +27,15 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.nio.file.Paths;
 import java.util.Calendar;
-import java.util.concurrent.TimeUnit;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.l2jserver.gameserver.config.Config;
 import com.l2jserver.Server;
 import com.l2jserver.UPnPService;
 import com.l2jserver.commons.database.ConnectionFactory;
 import com.l2jserver.gameserver.cache.HtmCache;
+import com.l2jserver.gameserver.config.Config;
 import com.l2jserver.gameserver.dao.factory.impl.DAOFactory;
 import com.l2jserver.gameserver.data.json.ExperienceData;
 import com.l2jserver.gameserver.data.sql.impl.AnnouncementsTable;
@@ -93,10 +94,10 @@ import com.l2jserver.gameserver.instancemanager.AirShipManager;
 import com.l2jserver.gameserver.instancemanager.AntiFeedManager;
 import com.l2jserver.gameserver.instancemanager.AuctionManager;
 import com.l2jserver.gameserver.instancemanager.BoatManager;
-import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
 import com.l2jserver.gameserver.instancemanager.CastleManager;
 import com.l2jserver.gameserver.instancemanager.CastleManorManager;
 import com.l2jserver.gameserver.instancemanager.ClanHallManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
 import com.l2jserver.gameserver.instancemanager.CoupleManager;
 import com.l2jserver.gameserver.instancemanager.CursedWeaponsManager;
 import com.l2jserver.gameserver.instancemanager.DayNightSpawnManager;
@@ -165,11 +166,11 @@ public final class GameServer {
 	public GameServer() throws Exception {
 		final var serverLoadStart = System.currentTimeMillis();
 		
-		LOG.info("{}: Used memory: {}MB.", getClass().getSimpleName(), getUsedMemoryMB());
+		LOG.info("Used memory {}MB.", getUsedMemoryMB());
 		
 		if (!IdFactory.getInstance().isInitialized()) {
-			LOG.error("{}: Could not read object IDs from database. Please check your configuration.", getClass().getSimpleName());
-			throw new Exception("Could not initialize the ID factory!");
+			LOG.error("Could not read object IDs from database. Please check your configuration.");
+			throw new Exception("Could not initialize the Id factory!");
 		}
 		
 		ThreadPoolManager.getInstance();
@@ -233,7 +234,7 @@ public final class GameServer {
 		
 		printSection("Clans");
 		ClanTable.getInstance();
-		CHSiegeManager.getInstance();
+		ClanHallSiegeManager.getInstance();
 		ClanHallManager.getInstance();
 		AuctionManager.getInstance();
 		
@@ -321,8 +322,6 @@ public final class GameServer {
 		AutoSpawnHandler.getInstance();
 		FaenorScriptEngine.getInstance();
 		
-		LOG.info("AutoSpawnHandler: Loaded {} handlers in total.", AutoSpawnHandler.getInstance().size());
-		
 		if (Config.L2JMOD_ALLOW_WEDDING) {
 			CoupleManager.getInstance();
 		}
@@ -360,7 +359,7 @@ public final class GameServer {
 		// the current allocation pool, freeMemory the unused memory in the allocation pool
 		long freeMem = ((Runtime.getRuntime().maxMemory() - Runtime.getRuntime().totalMemory()) + Runtime.getRuntime().freeMemory()) / 1048576;
 		long totalMem = Runtime.getRuntime().maxMemory() / 1048576;
-		LOG.info("{}: Started, free memory {} Mb of {} Mb", getClass().getSimpleName(), freeMem, totalMem);
+		LOG.info("Started, free memory {} Mb of {} Mb", freeMem, totalMem);
 		Toolkit.getDefaultToolkit().beep();
 		LoginServerThread.getInstance().start();
 		
@@ -378,22 +377,22 @@ public final class GameServer {
 		if (!Config.GAMESERVER_HOSTNAME.equals("*")) {
 			try {
 				bindAddress = InetAddress.getByName(Config.GAMESERVER_HOSTNAME);
-			} catch (UnknownHostException e1) {
-				LOG.error("{}: The GameServer bind address is invalid, using all avaliable IPs!", getClass().getSimpleName(), e1);
+			} catch (UnknownHostException ex) {
+				LOG.warn("Bind address is invalid, using all avaliable IPs!", ex);
 			}
 		}
 		
 		try {
 			_selectorThread.openServerSocket(bindAddress, Config.PORT_GAME);
 			_selectorThread.start();
-			LOG.info("{}: is now listening on: {}:{}", getClass().getSimpleName(), Config.GAMESERVER_HOSTNAME, Config.PORT_GAME);
-		} catch (IOException e) {
-			LOG.error("{}: Failed to open server socket!", getClass().getSimpleName(), e);
+			LOG.info("Now listening on {}:{}", Config.GAMESERVER_HOSTNAME, Config.PORT_GAME);
+		} catch (IOException ex) {
+			LOG.error("Failed to open server socket!", ex);
 			System.exit(1);
 		}
 		
-		LOG.info("{}: Maximum numbers of connected players: {}", getClass().getSimpleName(), Config.MAXIMUM_ONLINE_USERS);
-		LOG.info("{}: Server loaded in {} seconds.", getClass().getSimpleName(), TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis() - serverLoadStart));
+		LOG.info("Maximum numbers of connected players: {}.", Config.MAXIMUM_ONLINE_USERS);
+		LOG.info("Server loaded in {} seconds.", MILLISECONDS.toSeconds(System.currentTimeMillis() - serverLoadStart));
 		
 		if (Config.ENABLE_UPNP) {
 			printSection("UPnP");
@@ -434,7 +433,7 @@ public final class GameServer {
 		if (Config.IS_TELNET_ENABLED) {
 			new Status(Server.serverMode).start();
 		} else {
-			LOG.info("{}: Telnet server is currently disabled.", GameServer.class.getSimpleName());
+			LOG.info("Telnet server is currently disabled.");
 		}
 	}
 	

src/main/java/com/l2jserver/gameserver/GeoData.java

@@ -38,13 +38,19 @@ import com.l2jserver.geodriver.GeoDriver;
 
 /**
  * Geodata.
- * @author -Nemesiss-, HorridoJoho
+ * @author -Nemesiss-
+ * @author HorridoJoho
  */
 public class GeoData {
+	
 	private static final Logger LOG = LoggerFactory.getLogger(GeoData.class);
+	
 	private static final String FILE_NAME_FORMAT = "%d_%d.l2j";
+	
 	private static final int ELEVATED_SEE_OVER_DISTANCE = 2;
+	
 	private static final int MAX_SEE_OVER_HEIGHT = 48;
+	
 	private static final int SPAWN_Z_DELTA_LIMIT = 100;
 	
 	private final GeoDriver _driver = new GeoDriver();
@@ -58,27 +64,27 @@ public class GeoData {
 					final Boolean loadFile = Config.GEODATA_REGIONS.get(regionX + "_" + regionY);
 					if (loadFile != null) {
 						if (loadFile) {
-							LOG.info("{}: Loading {}...", getClass().getSimpleName(), geoFilePath.getFileName());
+							LOG.info("Loading {}...", geoFilePath.getFileName());
 							_driver.loadRegion(geoFilePath, regionX, regionY);
 							loadedRegions++;
 						}
 					} else if (Config.TRY_LOAD_UNSPECIFIED_REGIONS && Files.exists(geoFilePath)) {
 						try {
-							LOG.info("{}: Loading {}...", getClass().getSimpleName(), geoFilePath.getFileName());
+							LOG.info("Loading {}...", geoFilePath.getFileName());
 							_driver.loadRegion(geoFilePath, regionX, regionY);
 							loadedRegions++;
-						} catch (Exception e) {
-							LOG.warn("{}: Failed to load {}!", getClass().getSimpleName(), geoFilePath.getFileName(), e);
+						} catch (Exception ex) {
+							LOG.warn("Failed to load {}!", geoFilePath.getFileName(), ex);
 						}
 					}
 				}
 			}
-		} catch (Exception e) {
-			LOG.error("{}: Failed to load geodata!", e);
+		} catch (Exception ex) {
+			LOG.error("Failed to load geodata!", ex);
 			System.exit(1);
 		}
 		
-		LOG.info("{}: Loaded {} regions.", getClass().getSimpleName(), loadedRegions);
+		LOG.info("Loaded {} regions.", loadedRegions);
 	}
 	
 	public boolean hasGeoPos(int geoX, int geoY) {
@@ -551,10 +557,10 @@ public class GeoData {
 	}
 	
 	public static GeoData getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final GeoData _instance = new GeoData();
+		protected static final GeoData INSTANCE = new GeoData();
 	}
 }

src/main/java/com/l2jserver/gameserver/LoginServerThread.java

@@ -141,7 +141,7 @@ public class LoginServerThread extends Thread {
 			boolean checksumOk = false;
 			try {
 				// Connection
-				LOG.info("Connecting to login on {}:{}", _hostname, _port);
+				LOG.info("Connecting to login server on {}:{}", _hostname, _port);
 				_loginSocket = new Socket(_hostname, _port);
 				InputStream in = _loginSocket.getInputStream();
 				_out = new BufferedOutputStream(_loginSocket.getOutputStream());

src/main/java/com/l2jserver/gameserver/SevenSigns.java

@@ -18,6 +18,24 @@
  */
 package com.l2jserver.gameserver;
 
+import static com.l2jserver.gameserver.network.SystemMessageId.COMPETITION_PERIOD_BEGUN;
+import static com.l2jserver.gameserver.network.SystemMessageId.DAWN_OBTAINED_AVARICE;
+import static com.l2jserver.gameserver.network.SystemMessageId.DAWN_OBTAINED_GNOSIS;
+import static com.l2jserver.gameserver.network.SystemMessageId.DAWN_OBTAINED_STRIFE;
+import static com.l2jserver.gameserver.network.SystemMessageId.DAWN_WON;
+import static com.l2jserver.gameserver.network.SystemMessageId.DUSK_OBTAINED_AVARICE;
+import static com.l2jserver.gameserver.network.SystemMessageId.DUSK_OBTAINED_GNOSIS;
+import static com.l2jserver.gameserver.network.SystemMessageId.DUSK_OBTAINED_STRIFE;
+import static com.l2jserver.gameserver.network.SystemMessageId.DUSK_WON;
+import static com.l2jserver.gameserver.network.SystemMessageId.PREPARATIONS_PERIOD_BEGUN;
+import static com.l2jserver.gameserver.network.SystemMessageId.QUEST_EVENT_PERIOD_BEGUN;
+import static com.l2jserver.gameserver.network.SystemMessageId.QUEST_EVENT_PERIOD_ENDED;
+import static com.l2jserver.gameserver.network.SystemMessageId.RESULTS_PERIOD_BEGUN;
+import static com.l2jserver.gameserver.network.SystemMessageId.SEAL_OF_STRIFE_FORBIDS_SUMMONING;
+import static com.l2jserver.gameserver.network.SystemMessageId.SEAL_VALIDATION_PERIOD_BEGUN;
+import static com.l2jserver.gameserver.network.SystemMessageId.SEAL_VALIDATION_PERIOD_ENDED;
+import static com.l2jserver.gameserver.network.SystemMessageId.VALIDATION_PERIOD_BEGUN;
+
 import java.sql.SQLException;
 import java.util.Calendar;
 import java.util.LinkedHashMap;
@@ -49,9 +67,9 @@ import com.l2jserver.gameserver.util.Broadcast;
  * @author Tempy
  */
 public class SevenSigns {
-	protected static final Logger LOG = LoggerFactory.getLogger(SevenSigns.class);
 	
-	// Basic Seven Signs Constants \\
+	private static final Logger LOG = LoggerFactory.getLogger(SevenSigns.class);
+	
 	public static final String SEVEN_SIGNS_HTML_PATH = "data/html/seven_signs/";
 	
 	public static final int CABAL_NULL = 0;
@@ -141,29 +159,29 @@ public class SevenSigns {
 	protected SevenSigns() {
 		try {
 			restoreSevenSignsData();
-		} catch (Exception e) {
-			LOG.error("SevenSigns: Failed to load configuration!", e);
+		} catch (Exception ex) {
+			LOG.error("Failed to load configuration!", ex);
 		}
 		
-		LOG.info("SevenSigns: Currently in the {} period.", getCurrentPeriodName());
+		LOG.info("Currently in the {} period.", getCurrentPeriodName());
 		
 		initializeSeals();
 		
 		if (isSealValidationPeriod()) {
 			if (getCabalHighestScore() == CABAL_NULL) {
-				LOG.info("SevenSigns: The competition ended with a tie last week.");
+				LOG.info("The competition ended with a tie last week.");
 			} else {
-				LOG.info("SevenSigns: The {} were victorious last week.", getCabalName(getCabalHighestScore()));
+				LOG.info("The {} were victorious last week.", getCabalName(getCabalHighestScore()));
 			}
 		} else if (getCabalHighestScore() == CABAL_NULL) {
-			LOG.info("SevenSigns: The competition, if the current trend continues, will end in a tie this week.");
+			LOG.info("The competition, if the current trend continues, will end in a tie this week.");
 		} else {
-			LOG.info("SevenSigns: The {} are in the lead this week.", getCabalName(getCabalHighestScore()));
+			LOG.info("The {} are in the lead this week.", getCabalName(getCabalHighestScore()));
 		}
 		
 		long milliToChange = 0;
 		if (isNextPeriodChangeInPast()) {
-			LOG.info("SevenSigns: Next period change was in the past (server was offline), changing periods now!");
+			LOG.info("Next period change was in the past (server was offline), changing periods now!");
 		} else {
 			setCalendarForNextPeriodChange();
 			milliToChange = getMilliToPeriodChange();
@@ -181,7 +199,7 @@ public class SevenSigns {
 		int numHours = (int) Math.floor(countDown % 24);
 		int numDays = (int) Math.floor((countDown - numHours) / 24);
 		
-		LOG.info("SevenSigns: Next period begins in {} days, {} hours and {} mins.", numDays, numHours, numMins);
+		LOG.info("Next period begins in {} days, {} hours and {} mins.", numDays, numHours, numMins);
 		
 	}
 	
@@ -346,10 +364,6 @@ public class SevenSigns {
 		}
 	}
 	
-	public static SevenSigns getInstance() {
-		return SingletonHolder._instance;
-	}
-	
 	public static long calcContributionScore(long blueCount, long greenCount, long redCount) {
 		long contrib = blueCount * BLUE_CONTRIB_POINTS;
 		contrib += greenCount * GREEN_CONTRIB_POINTS;
@@ -455,7 +469,7 @@ public class SevenSigns {
 				_nextPeriodChange.add(Calendar.MILLISECOND, PERIOD_MINOR_LENGTH);
 				break;
 		}
-		LOG.info("SevenSigns: Next period change set to {}.", _nextPeriodChange.getTime());
+		LOG.info("Next period change set to {}.", _nextPeriodChange.getTime());
 	}
 	
 	public final String getCurrentPeriodName() {
@@ -722,8 +736,8 @@ public class SevenSigns {
 					_lastSave.setTimeInMillis(rs.getLong("date"));
 				}
 			}
-		} catch (SQLException e) {
-			LOG.error("SevenSigns: Unable to load Seven Signs data from database!", e);
+		} catch (SQLException ex) {
+			LOG.warn("Unable to load Seven Signs data from database!", ex);
 		}
 	}
 	
@@ -746,8 +760,8 @@ public class SevenSigns {
 				ps.addBatch();
 			}
 			ps.executeBatch();
-		} catch (SQLException e) {
-			LOG.error("SevenSigns: Unable to save data to database!", e);
+		} catch (SQLException ex) {
+			LOG.warn("Unable to save data to database!", ex);
 		}
 	}
 	
@@ -768,8 +782,8 @@ public class SevenSigns {
 			ps.setDouble(7, sevenDat.getDouble("contribution_score"));
 			ps.setInt(8, sevenDat.getInt("charId"));
 			ps.execute();
-		} catch (SQLException e) {
-			LOG.error("SevenSigns: Unable to save data to database!", e);
+		} catch (SQLException ex) {
+			LOG.error("Unable to save data to database!", ex);
 		}
 	}
 	
@@ -800,8 +814,8 @@ public class SevenSigns {
 			_lastSave = Calendar.getInstance();
 			ps.setLong(18 + SevenSignsFestival.FESTIVAL_COUNT, _lastSave.getTimeInMillis());
 			ps.execute();
-		} catch (SQLException e) {
-			LOG.error("SevenSigns: Unable to save data to database!", e);
+		} catch (SQLException ex) {
+			LOG.warn("Unable to save data to database!", ex);
 		}
 	}
 	
@@ -857,8 +871,8 @@ public class SevenSigns {
 				ps.setString(2, getCabalShortName(chosenCabal));
 				ps.setInt(3, chosenSeal);
 				ps.execute();
-			} catch (SQLException e) {
-				LOG.error("SevenSigns: Failed to save data!", e);
+			} catch (SQLException ex) {
+				LOG.warn("Failed to save data!", ex);
 			}
 		}
 		
@@ -980,16 +994,16 @@ public class SevenSigns {
 		
 		switch (getCurrentPeriod()) {
 			case PERIOD_COMP_RECRUITING:
-				sm = SystemMessage.getSystemMessage(SystemMessageId.PREPARATIONS_PERIOD_BEGUN);
+				sm = SystemMessage.getSystemMessage(PREPARATIONS_PERIOD_BEGUN);
 				break;
 			case PERIOD_COMPETITION:
-				sm = SystemMessage.getSystemMessage(SystemMessageId.COMPETITION_PERIOD_BEGUN);
+				sm = SystemMessage.getSystemMessage(COMPETITION_PERIOD_BEGUN);
 				break;
 			case PERIOD_COMP_RESULTS:
-				sm = SystemMessage.getSystemMessage(SystemMessageId.RESULTS_PERIOD_BEGUN);
+				sm = SystemMessage.getSystemMessage(RESULTS_PERIOD_BEGUN);
 				break;
 			case PERIOD_SEAL_VALIDATION:
-				sm = SystemMessage.getSystemMessage(SystemMessageId.VALIDATION_PERIOD_BEGUN);
+				sm = SystemMessage.getSystemMessage(VALIDATION_PERIOD_BEGUN);
 				break;
 		}
 		
@@ -1013,12 +1027,12 @@ public class SevenSigns {
 		for (Entry<Integer, Integer> e : _signsSealOwners.entrySet()) {
 			if (e.getValue() != CABAL_NULL) {
 				if (isSealValidationPeriod()) {
-					LOG.info("SevenSigns: The {} have won the {}.", getCabalName(e.getValue()), getSealName(e.getKey(), false));
+					LOG.info("The {} have won the {}.", getCabalName(e.getValue()), getSealName(e.getKey(), false));
 				} else {
-					LOG.info("SevenSigns: The {} is currently owned by {}.", getSealName(e.getKey(), false), getCabalName(e.getValue()));
+					LOG.info("The {} is currently owned by {}.", getSealName(e.getKey(), false), getCabalName(e.getValue()));
 				}
 			} else {
-				LOG.info("SevenSigns: The {} remains unclaimed.", getSealName(e.getKey(), false));
+				LOG.info("The {} remains unclaimed.", getSealName(e.getKey(), false));
 			}
 		}
 	}
@@ -1141,23 +1155,23 @@ public class SevenSigns {
 			switch (currSeal) {
 				case SEAL_AVARICE:
 					if (newSealOwner == CABAL_DAWN) {
-						sendMessageToAll(SystemMessageId.DAWN_OBTAINED_AVARICE);
+						sendMessageToAll(DAWN_OBTAINED_AVARICE);
 					} else if (newSealOwner == CABAL_DUSK) {
-						sendMessageToAll(SystemMessageId.DUSK_OBTAINED_AVARICE);
+						sendMessageToAll(DUSK_OBTAINED_AVARICE);
 					}
 					break;
 				case SEAL_GNOSIS:
 					if (newSealOwner == CABAL_DAWN) {
-						sendMessageToAll(SystemMessageId.DAWN_OBTAINED_GNOSIS);
+						sendMessageToAll(DAWN_OBTAINED_GNOSIS);
 					} else if (newSealOwner == CABAL_DUSK) {
-						sendMessageToAll(SystemMessageId.DUSK_OBTAINED_GNOSIS);
+						sendMessageToAll(DUSK_OBTAINED_GNOSIS);
 					}
 					break;
 				case SEAL_STRIFE:
 					if (newSealOwner == CABAL_DAWN) {
-						sendMessageToAll(SystemMessageId.DAWN_OBTAINED_STRIFE);
+						sendMessageToAll(DAWN_OBTAINED_STRIFE);
 					} else if (newSealOwner == CABAL_DUSK) {
-						sendMessageToAll(SystemMessageId.DUSK_OBTAINED_STRIFE);
+						sendMessageToAll(DUSK_OBTAINED_STRIFE);
 					}
 					
 					CastleManager.getInstance().validateTaxes(newSealOwner);
@@ -1210,12 +1224,12 @@ public class SevenSigns {
 					SevenSignsFestival.getInstance().startFestivalManager();
 					
 					// Send message that Competition has begun.
-					sendMessageToAll(SystemMessageId.QUEST_EVENT_PERIOD_BEGUN);
+					sendMessageToAll(QUEST_EVENT_PERIOD_BEGUN);
 					break;
 				case PERIOD_COMPETITION: // Results Calculation
 					
 					// Send message that Competition has ended.
-					sendMessageToAll(SystemMessageId.QUEST_EVENT_PERIOD_ENDED);
+					sendMessageToAll(QUEST_EVENT_PERIOD_ENDED);
 					
 					int compWinner = getCabalHighestScore();
 					
@@ -1227,10 +1241,10 @@ public class SevenSigns {
 					
 					switch (compWinner) {
 						case CABAL_DAWN:
-							sendMessageToAll(SystemMessageId.DAWN_WON);
+							sendMessageToAll(DAWN_WON);
 							break;
 						case CABAL_DUSK:
-							sendMessageToAll(SystemMessageId.DUSK_WON);
+							sendMessageToAll(DUSK_WON);
 							break;
 					}
 					
@@ -1250,9 +1264,9 @@ public class SevenSigns {
 					giveCPMult(getSealOwner(SEAL_STRIFE));
 					
 					// Send message that Seal Validation has begun.
-					sendMessageToAll(SystemMessageId.SEAL_VALIDATION_PERIOD_BEGUN);
+					sendMessageToAll(SEAL_VALIDATION_PERIOD_BEGUN);
 					
-					LOG.info("SevenSigns: The {} have won the competition with {} points!", getCabalName(_previousWinner), getCurrentScore(_previousWinner));
+					LOG.info("The {} have won the competition with {} points!", getCabalName(_previousWinner), getCurrentScore(_previousWinner));
 					break;
 				case PERIOD_SEAL_VALIDATION: // Reset for New Cycle
 					
@@ -1260,7 +1274,7 @@ public class SevenSigns {
 					_activePeriod = PERIOD_COMP_RECRUITING;
 					
 					// Send message that Seal Validation has ended.
-					sendMessageToAll(SystemMessageId.SEAL_VALIDATION_PERIOD_ENDED);
+					sendMessageToAll(SEAL_VALIDATION_PERIOD_ENDED);
 					// Clear Seal of Strife influence.
 					removeCPMult();
 					// Reset all data
@@ -1291,7 +1305,7 @@ public class SevenSigns {
 			Broadcast.toAllOnlinePlayers(ss);
 			spawnSevenSignsNPC();
 			
-			LOG.info("SevenSigns: The {} period has begun!", getCurrentPeriodName());
+			LOG.info("The {} period has begun!", getCurrentPeriodName());
 			
 			setCalendarForNextPeriodChange();
 			
@@ -1377,7 +1391,7 @@ public class SevenSigns {
 		if (isSealValidationPeriod()) {
 			if (getSealOwner(SEAL_STRIFE) == CABAL_DAWN) {
 				if (getPlayerCabal(activeChar.getObjectId()) == CABAL_DUSK) {
-					activeChar.sendPacket(SystemMessageId.SEAL_OF_STRIFE_FORBIDS_SUMMONING);
+					activeChar.sendPacket(SEAL_OF_STRIFE_FORBIDS_SUMMONING);
 					return true;
 				}
 			}
@@ -1386,7 +1400,11 @@ public class SevenSigns {
 		return false;
 	}
 	
+	public static SevenSigns getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
 	private static class SingletonHolder {
-		protected static final SevenSigns _instance = new SevenSigns();
+		protected static final SevenSigns INSTANCE = new SevenSigns();
 	}
 }

src/main/java/com/l2jserver/gameserver/Shutdown.java

@@ -29,7 +29,7 @@ import com.l2jserver.commons.database.ConnectionFactory;
 import com.l2jserver.gameserver.data.sql.impl.ClanTable;
 import com.l2jserver.gameserver.data.sql.impl.OfflineTradersTable;
 import com.l2jserver.gameserver.datatables.BotReportTable;
-import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
 import com.l2jserver.gameserver.instancemanager.CastleManorManager;
 import com.l2jserver.gameserver.instancemanager.CursedWeaponsManager;
 import com.l2jserver.gameserver.instancemanager.GlobalVariablesManager;
@@ -464,7 +464,7 @@ public class Shutdown extends Thread {
 			LOG.info("Castle Manor Manager: Data saved({}ms).", tc.getEstimatedTimeAndRestartCounter());
 		}
 		
-		CHSiegeManager.getInstance().onServerShutDown();
+		ClanHallSiegeManager.getInstance().onServerShutDown();
 		LOG.info("CHSiegeManager: Siegable hall attacker lists saved!");
 		
 		// Save all global (non-player specific) Quest data that needs to persist after reboot

src/main/java/com/l2jserver/gameserver/data/sql/impl/ClanTable.java

@@ -33,7 +33,7 @@ import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.communitybbs.Manager.ForumsBBSManager;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.instancemanager.AuctionManager;
-import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
 import com.l2jserver.gameserver.instancemanager.FortManager;
 import com.l2jserver.gameserver.instancemanager.FortSiegeManager;
 import com.l2jserver.gameserver.instancemanager.SiegeManager;
@@ -214,7 +214,7 @@ public class ClanTable {
 		
 		int hallId = clan.getHideoutId();
 		if (hallId == 0) {
-			for (SiegableHall hall : CHSiegeManager.getInstance().getConquerableHalls().values()) {
+			for (SiegableHall hall : ClanHallSiegeManager.getInstance().getConquerableHalls().values()) {
 				hall.removeAttacker(clan);
 			}
 		}
@@ -288,7 +288,7 @@ public class ClanTable {
 			}
 			
 			if (hallId != 0) {
-				SiegableHall hall = CHSiegeManager.getInstance().getSiegableHall(hallId);
+				SiegableHall hall = ClanHallSiegeManager.getInstance().getSiegableHall(hallId);
 				if ((hall != null) && (hall.getOwnerId() == clanId)) {
 					hall.free();
 				}

src/main/java/com/l2jserver/gameserver/data/xml/impl/AdminData.java

@@ -25,6 +25,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -44,6 +46,8 @@ import com.l2jserver.gameserver.util.IXmlReader;
  */
 public final class AdminData implements IXmlReader {
 	
+	private static final Logger LOG = LoggerFactory.getLogger(AdminData.class);
+	
 	private final Map<Integer, L2AccessLevel> _accessLevels = new HashMap<>();
 	
 	private final Map<String, L2AdminCommandAccessRight> _adminCommandAccessRights = new HashMap<>();
@@ -61,9 +65,9 @@ public final class AdminData implements IXmlReader {
 		_accessLevels.clear();
 		_adminCommandAccessRights.clear();
 		parseDatapackFile("config/accessLevels.xml");
-		LOG.info("{}: Loaded: {} Access Levels.", getClass().getSimpleName(), _accessLevels.size());
+		LOG.info("Loaded {} access levels.", _accessLevels.size());
 		parseDatapackFile("config/adminCommands.xml");
-		LOG.info("{}: Loaded: {} Access Commands.", getClass().getSimpleName(), _adminCommandAccessRights.size());
+		LOG.info("Loaded {} access commands.", _adminCommandAccessRights.size());
 	}
 	
 	@Override
@@ -145,9 +149,9 @@ public final class AdminData implements IXmlReader {
 			if ((accessLevel.getLevel() > 0) && (accessLevel.getLevel() == _highestLevel)) {
 				acar = new L2AdminCommandAccessRight(adminCommand, true, accessLevel.getLevel());
 				_adminCommandAccessRights.put(adminCommand, acar);
-				LOG.info("{}: No rights defined for admin command {} auto setting accesslevel: {}!", getClass().getSimpleName(), adminCommand, accessLevel.getLevel());
+				LOG.info("No rights defined for admin command {} auto setting accesslevel {}!", adminCommand, accessLevel.getLevel());
 			} else {
-				LOG.info("{}: No rights defined for admin command {}!", getClass().getSimpleName(), adminCommand);
+				LOG.info("No rights defined for admin command {}!", adminCommand);
 				return false;
 			}
 		}
@@ -162,7 +166,7 @@ public final class AdminData implements IXmlReader {
 	public boolean requireConfirm(String command) {
 		final L2AdminCommandAccessRight acar = _adminCommandAccessRights.get(command);
 		if (acar == null) {
-			LOG.info("{}: No rights defined for admin command {}.", getClass().getSimpleName(), command);
+			LOG.info("No rights defined for admin command {}.", command);
 			return false;
 		}
 		return acar.getRequireConfirm();
@@ -289,15 +293,11 @@ public final class AdminData implements IXmlReader {
 		}
 	}
 	
-	/**
-	 * Gets the single instance of AdminTable.
-	 * @return the one and only instance of this class
-	 */
 	public static AdminData getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final AdminData _instance = new AdminData();
+		protected static final AdminData INSTANCE = new AdminData();
 	}
 }

src/main/java/com/l2jserver/gameserver/data/xml/impl/ArmorSetsData.java

@@ -21,6 +21,8 @@ package com.l2jserver.gameserver.data.xml.impl;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -31,14 +33,16 @@ import com.l2jserver.gameserver.util.IXmlReader;
 
 /**
  * Loads armor set bonuses.
- * @author godson, Luno, UnAfraid
+ * @author godson
+ * @author Luno
+ * @author UnAfraid
  */
 public final class ArmorSetsData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(ArmorSetsData.class);
+	
 	private final Map<Integer, L2ArmorSet> _armorSets = new HashMap<>();
 	
-	/**
-	 * Instantiates a new armor sets data.
-	 */
 	protected ArmorSetsData() {
 		load();
 	}
@@ -47,7 +51,7 @@ public final class ArmorSetsData implements IXmlReader {
 	public void load() {
 		_armorSets.clear();
 		parseDatapackDirectory("data/stats/armorsets", false);
-		LOG.info("{}: Loaded {} Armor sets.", getClass().getSimpleName(), _armorSets.size());
+		LOG.info("Loaded {} armor sets.", _armorSets.size());
 	}
 	
 	@Override
@@ -153,15 +157,11 @@ public final class ArmorSetsData implements IXmlReader {
 		return _armorSets.get(chestId);
 	}
 	
-	/**
-	 * Gets the single instance of ArmorSetsData.
-	 * @return single instance of ArmorSetsData
-	 */
 	public static ArmorSetsData getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final ArmorSetsData _instance = new ArmorSetsData();
+		protected static final ArmorSetsData INSTANCE = new ArmorSetsData();
 	}
 }

src/main/java/com/l2jserver/gameserver/data/xml/impl/BuyListData.java

@@ -23,6 +23,8 @@ import java.io.FileFilter;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -42,10 +44,12 @@ import com.l2jserver.util.file.filter.NumericNameFilter;
  */
 public final class BuyListData implements IXmlReader {
 	
-	private final Map<Integer, L2BuyList> _buyLists = new HashMap<>();
+	private static final Logger LOG = LoggerFactory.getLogger(BuyListData.class);
 	
 	private static final FileFilter NUMERIC_FILTER = new NumericNameFilter();
 	
+	private final Map<Integer, L2BuyList> _buyLists = new HashMap<>();
+	
 	protected BuyListData() {
 		load();
 	}
@@ -58,7 +62,7 @@ public final class BuyListData implements IXmlReader {
 			parseDatapackDirectory("data/buylists/custom", false);
 		}
 		
-		LOG.info("{}: Loaded {} BuyLists.", getClass().getSimpleName(), _buyLists.size());
+		LOG.info("Loaded {} buy lists.", _buyLists.size());
 		
 		try (var con = ConnectionFactory.getInstance().getConnection();
 			var statement = con.createStatement();
@@ -70,12 +74,12 @@ public final class BuyListData implements IXmlReader {
 				long nextRestockTime = rs.getLong("next_restock_time");
 				final L2BuyList buyList = getBuyList(buyListId);
 				if (buyList == null) {
-					LOG.warn("BuyList found in database but not loaded from xml! BuyListId: {}", buyListId);
+					LOG.warn("Buy list {} found in database but not loaded from XML!", buyListId);
 					continue;
 				}
 				final Product product = buyList.getProductByItemId(itemId);
 				if (product == null) {
-					LOG.warn("ItemId found in database but not loaded from xml! BuyListId: {} Item ID: {}", buyListId, itemId);
+					LOG.warn("Item Id {} found in database but not loaded from XML {}!", itemId, buyListId);
 					continue;
 				}
 				if (count < product.getMaxCount()) {
@@ -83,8 +87,8 @@ public final class BuyListData implements IXmlReader {
 					product.restartRestockTask(nextRestockTime);
 				}
 			}
-		} catch (Exception e) {
-			LOG.warn("Failed to load buyList data from database.", e);
+		} catch (Exception ex) {
+			LOG.warn("Failed to load buy list data from database.", ex);
 		}
 	}
 	
@@ -135,8 +139,8 @@ public final class BuyListData implements IXmlReader {
 					_buyLists.put(buyList.getListId(), buyList);
 				}
 			}
-		} catch (Exception e) {
-			LOG.warn("Failed to load buyList data from xml File: {}", f.getName(), e);
+		} catch (Exception ex) {
+			LOG.warn("Failed to load buy list data from XML {}!", f.getName(), ex);
 		}
 	}
 	
@@ -150,10 +154,10 @@ public final class BuyListData implements IXmlReader {
 	}
 	
 	public static BuyListData getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final BuyListData _instance = new BuyListData();
+		protected static final BuyListData INSTANCE = new BuyListData();
 	}
 }

src/main/java/com/l2jserver/gameserver/data/xml/impl/ClassListData.java

@@ -21,6 +21,8 @@ package com.l2jserver.gameserver.data.xml.impl;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -34,11 +36,11 @@ import com.l2jserver.gameserver.util.IXmlReader;
  * @author Zoey76
  */
 public final class ClassListData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(ClassListData.class);
+	
 	private final Map<ClassId, ClassInfo> _classData = new HashMap<>();
 	
-	/**
-	 * Instantiates a new class list data.
-	 */
 	protected ClassListData() {
 		load();
 	}
@@ -47,7 +49,7 @@ public final class ClassListData implements IXmlReader {
 	public void load() {
 		_classData.clear();
 		parseDatapackFile("data/stats/chars/classList.xml");
-		LOG.info("{}: Loaded {} Class data.", getClass().getSimpleName(), _classData.size());
+		LOG.info("Loaded {} class data.", _classData.size());
 	}
 	
 	@Override
@@ -97,15 +99,11 @@ public final class ClassListData implements IXmlReader {
 		return (id != null) ? _classData.get(id) : null;
 	}
 	
-	/**
-	 * Gets the single instance of ClassListData.
-	 * @return single instance of ClassListData
-	 */
 	public static ClassListData getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final ClassListData _instance = new ClassListData();
+		protected static final ClassListData INSTANCE = new ClassListData();
 	}
 }

src/main/java/com/l2jserver/gameserver/data/xml/impl/DoorData.java

@@ -26,6 +26,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -42,11 +44,13 @@ import com.l2jserver.gameserver.util.IXmlReader;
  * Loads doors.
  * @author JIV
  * @author GodKratos
- * @authro UnAfraid
+ * @author UnAfraid
  */
 public class DoorData implements IXmlReader {
 	
-	private static final Map<String, Set<Integer>> _groups = new HashMap<>();
+	private static final Logger LOG = LoggerFactory.getLogger(DoorData.class);
+	
+	private static final Map<String, Set<Integer>> GROUPS = new HashMap<>();
 	
 	private final Map<Integer, L2DoorInstance> _doors = new HashMap<>();
 	
@@ -61,10 +65,10 @@ public class DoorData implements IXmlReader {
 	@Override
 	public void load() {
 		_doors.clear();
-		_groups.clear();
+		GROUPS.clear();
 		_regions.clear();
 		parseDatapackFile("data/doors.xml");
-		LOG.info("{}: Loaded {} Door templates for {} regions.", getClass().getSimpleName(), _doors.size(), _regions.size());
+		LOG.info("Loaded {} door templates for {} regions.", _doors.size(), _regions.size());
 	}
 	
 	@Override
@@ -107,9 +111,6 @@ public class DoorData implements IXmlReader {
 		set.set("collisionHeight", height);
 	}
 	
-	/**
-	 * @param set
-	 */
 	private void makeDoor(StatsSet set) {
 		insertCollisionData(set);
 		L2DoorTemplate template = new L2DoorTemplate(set);
@@ -137,16 +138,16 @@ public class DoorData implements IXmlReader {
 	}
 	
 	public static void addDoorGroup(String groupName, int doorId) {
-		Set<Integer> set = _groups.get(groupName);
+		Set<Integer> set = GROUPS.get(groupName);
 		if (set == null) {
 			set = new HashSet<>();
-			_groups.put(groupName, set);
+			GROUPS.put(groupName, set);
 		}
 		set.add(doorId);
 	}
 	
 	public static Set<Integer> getDoorsByGroup(String groupName) {
-		return _groups.get(groupName);
+		return GROUPS.get(groupName);
 	}
 	
 	public Collection<L2DoorInstance> getDoors() {
@@ -219,10 +220,10 @@ public class DoorData implements IXmlReader {
 	}
 	
 	public static DoorData getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final DoorData _instance = new DoorData();
+		protected static final DoorData INSTANCE = new DoorData();
 	}
 }

src/main/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemHPBonusData.java

@@ -24,6 +24,8 @@ import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
@@ -43,13 +45,12 @@ import com.l2jserver.gameserver.util.IXmlReader;
  */
 public class EnchantItemHPBonusData implements IXmlReader {
 	
+	private static final Logger LOG = LoggerFactory.getLogger(EnchantItemHPBonusData.class);
+	
 	private static final float FULL_ARMOR_MODIFIER = 1.5f; // TODO: Move it to config!
 	
 	private final Map<CrystalType, List<Integer>> _armorHPBonuses = new EnumMap<>(CrystalType.class);
 	
-	/**
-	 * Instantiates a new enchant hp bonus data.
-	 */
 	protected EnchantItemHPBonusData() {
 		load();
 	}
@@ -58,7 +59,7 @@ public class EnchantItemHPBonusData implements IXmlReader {
 	public void load() {
 		_armorHPBonuses.clear();
 		parseDatapackFile("data/stats/enchantHPBonus.xml");
-		LOG.info("{}: Loaded {} Enchant HP Bonuses.", getClass().getSimpleName(), _armorHPBonuses.size());
+		LOG.info("Loaded {} Enchant HP Bonuses.", _armorHPBonuses.size());
 	}
 	
 	@Override
@@ -125,15 +126,11 @@ public class EnchantItemHPBonusData implements IXmlReader {
 		return bonus;
 	}
 	
-	/**
-	 * Gets the single instance of EnchantHPBonusData.
-	 * @return single instance of EnchantHPBonusData
-	 */
 	public static final EnchantItemHPBonusData getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final EnchantItemHPBonusData _instance = new EnchantItemHPBonusData();
+		protected static final EnchantItemHPBonusData INSTANCE = new EnchantItemHPBonusData();
 	}
 }

src/main/java/com/l2jserver/gameserver/data/xml/impl/EnchantSkillGroupsData.java

@@ -21,6 +21,8 @@ package com.l2jserver.gameserver.data.xml.impl;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -39,20 +41,25 @@ import com.l2jserver.gameserver.util.IXmlReader;
  * @author Micr0
  */
 public class EnchantSkillGroupsData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(EnchantSkillGroupsData.class);
+	
 	public static final int NORMAL_ENCHANT_COST_MULTIPLIER = Config.NORMAL_ENCHANT_COST_MULTIPLIER;
+	
 	public static final int SAFE_ENCHANT_COST_MULTIPLIER = Config.SAFE_ENCHANT_COST_MULTIPLIER;
 	
 	public static final int NORMAL_ENCHANT_BOOK = 6622;
+	
 	public static final int SAFE_ENCHANT_BOOK = 9627;
+	
 	public static final int CHANGE_ENCHANT_BOOK = 9626;
+	
 	public static final int UNTRAIN_ENCHANT_BOOK = 9625;
 	
 	private final Map<Integer, L2EnchantSkillGroup> _enchantSkillGroups = new HashMap<>();
+	
 	private final Map<Integer, L2EnchantSkillLearn> _enchantSkillTrees = new HashMap<>();
 	
-	/**
-	 * Instantiates a new enchant groups table.
-	 */
 	protected EnchantSkillGroupsData() {
 		load();
 	}
@@ -66,7 +73,7 @@ public class EnchantSkillGroupsData implements IXmlReader {
 		for (L2EnchantSkillGroup group : _enchantSkillGroups.values()) {
 			routes += group.getEnchantGroupDetails().size();
 		}
-		LOG.info("{}: Loaded {} groups and {} routes.", getClass().getSimpleName(), _enchantSkillGroups.size(), routes);
+		LOG.info("Loaded {} groups and {} routes.", _enchantSkillGroups.size(), routes);
 	}
 	
 	@Override
@@ -120,7 +127,7 @@ public class EnchantSkillGroupsData implements IXmlReader {
 			
 			return _enchantSkillGroups.get(group).getEnchantGroupDetails().size();
 		}
-		LOG.error("{}: Error while loading generating enchant skill ID: {} route: {} missing group: {}", skillId, route, group);
+		LOG.error("There has been an error while loading generating enchant skill Id {}, route {} and group {}!", skillId, route, group);
 		return 0;
 	}
 	
@@ -205,15 +212,11 @@ public class EnchantSkillGroupsData implements IXmlReader {
 		return 0;
 	}
 	
-	/**
-	 * Gets the single instance of EnchantGroupsData.
-	 * @return single instance of EnchantGroupsData
-	 */
 	public static EnchantSkillGroupsData getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final EnchantSkillGroupsData _instance = new EnchantSkillGroupsData();
+		protected static final EnchantSkillGroupsData INSTANCE = new EnchantSkillGroupsData();
 	}
 }

src/main/java/com/l2jserver/gameserver/data/xml/impl/FishData.java

@@ -23,6 +23,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -36,13 +38,15 @@ import com.l2jserver.gameserver.util.IXmlReader;
  * @author nonom
  */
 public final class FishData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(FishData.class);
+	
 	private final Map<Integer, L2Fish> _fishNormal = new HashMap<>();
+	
 	private final Map<Integer, L2Fish> _fishEasy = new HashMap<>();
+	
 	private final Map<Integer, L2Fish> _fishHard = new HashMap<>();
 	
-	/**
-	 * Instantiates a new fish data.
-	 */
 	protected FishData() {
 		load();
 	}
@@ -53,7 +57,7 @@ public final class FishData implements IXmlReader {
 		_fishNormal.clear();
 		_fishHard.clear();
 		parseDatapackFile("data/stats/fishing/fishes.xml");
-		LOG.info("{}: Loaded {} Fish.", getClass().getSimpleName(), (_fishEasy.size() + _fishNormal.size() + _fishHard.size()));
+		LOG.info("Loaded {} fish.", (_fishEasy.size() + _fishNormal.size() + _fishHard.size()));
 	}
 	
 	@Override
@@ -115,7 +119,7 @@ public final class FishData implements IXmlReader {
 				break;
 			}
 			default: {
-				LOG.warn("{}: Unmanaged fish grade!", getClass().getSimpleName());
+				LOG.warn("Unmanaged fish grade!");
 				return result;
 			}
 		}
@@ -128,20 +132,16 @@ public final class FishData implements IXmlReader {
 		}
 		
 		if (result.isEmpty()) {
-			LOG.warn("{}: Cannot find any fish for level: {} group: {} and grade: {}!", getClass().getSimpleName(), level, group, grade);
+			LOG.warn("Cannot find any fish for level: {} group: {} and grade: {}!", level, group, grade);
 		}
 		return result;
 	}
 	
-	/**
-	 * Gets the single instance of FishData.
-	 * @return single instance of FishData
-	 */
 	public static FishData getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final FishData _instance = new FishData();
+		protected static final FishData INSTANCE = new FishData();
 	}
 }

src/main/java/com/l2jserver/gameserver/data/xml/impl/FishingMonstersData.java

@@ -21,6 +21,8 @@ package com.l2jserver.gameserver.data.xml.impl;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -34,11 +36,11 @@ import com.l2jserver.gameserver.util.IXmlReader;
  * @author nonom
  */
 public final class FishingMonstersData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(FishingMonstersData.class);
+	
 	private final Map<Integer, L2FishingMonster> _fishingMonstersData = new HashMap<>();
 	
-	/**
-	 * Instantiates a new fishing monsters data.
-	 */
 	protected FishingMonstersData() {
 		load();
 	}
@@ -47,7 +49,7 @@ public final class FishingMonstersData implements IXmlReader {
 	public void load() {
 		_fishingMonstersData.clear();
 		parseDatapackFile("data/stats/fishing/fishingMonsters.xml");
-		LOG.info("{}: Loaded {} Fishing Monsters.", getClass().getSimpleName(), _fishingMonstersData.size());
+		LOG.info("Loaded {} fishing monsters.", _fishingMonstersData.size());
 	}
 	
 	@Override
@@ -98,15 +100,11 @@ public final class FishingMonstersData implements IXmlReader {
 		return null;
 	}
 	
-	/**
-	 * Gets the single instance of FishingMonsterData.
-	 * @return single instance of FishingMonsterData
-	 */
 	public static FishingMonstersData getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final FishingMonstersData _instance = new FishingMonstersData();
+		protected static final FishingMonstersData INSTANCE = new FishingMonstersData();
 	}
 }

src/main/java/com/l2jserver/gameserver/data/xml/impl/FishingRodsData.java

@@ -21,6 +21,8 @@ package com.l2jserver.gameserver.data.xml.impl;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -35,11 +37,10 @@ import com.l2jserver.gameserver.util.IXmlReader;
  */
 public final class FishingRodsData implements IXmlReader {
 	
+	private static final Logger LOG = LoggerFactory.getLogger(FishingRodsData.class);
+	
 	private final Map<Integer, L2FishingRod> _fishingRods = new HashMap<>();
 	
-	/**
-	 * Instantiates a new fishing rods data.
-	 */
 	protected FishingRodsData() {
 		load();
 	}
@@ -48,7 +49,7 @@ public final class FishingRodsData implements IXmlReader {
 	public void load() {
 		_fishingRods.clear();
 		parseDatapackFile("data/stats/fishing/fishingRods.xml");
-		LOG.info("{}: Loaded {} Fishing Rods.", getClass().getSimpleName(), _fishingRods.size());
+		LOG.info("Loaded {} fishing rods.", _fishingRods.size());
 	}
 	
 	@Override
@@ -81,15 +82,11 @@ public final class FishingRodsData implements IXmlReader {
 		return _fishingRods.get(itemId);
 	}
 	
-	/**
-	 * Gets the single instance of FishingRodsData.
-	 * @return single instance of FishingRodsData
-	 */
 	public static FishingRodsData getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final FishingRodsData _instance = new FishingRodsData();
+		protected static final FishingRodsData INSTANCE = new FishingRodsData();
 	}
 }

src/main/java/com/l2jserver/gameserver/data/xml/impl/HennaData.java

@@ -23,6 +23,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -41,11 +43,10 @@ import com.l2jserver.gameserver.util.IXmlReader;
  */
 public final class HennaData implements IXmlReader {
 	
+	private static final Logger LOG = LoggerFactory.getLogger(HennaData.class);
+	
 	private final Map<Integer, L2Henna> _hennaList = new HashMap<>();
 	
-	/**
-	 * Instantiates a new henna data.
-	 */
 	protected HennaData() {
 		load();
 	}
@@ -54,7 +55,7 @@ public final class HennaData implements IXmlReader {
 	public void load() {
 		_hennaList.clear();
 		parseDatapackFile("data/stats/hennaList.xml");
-		LOG.info("{}: Loaded {} Henna data.", getClass().getSimpleName(), _hennaList.size());
+		LOG.info("Loaded {} Henna data.", _hennaList.size());
 	}
 	
 	@Override
@@ -144,15 +145,11 @@ public final class HennaData implements IXmlReader {
 		return list;
 	}
 	
-	/**
-	 * Gets the single instance of HennaData.
-	 * @return single instance of HennaData
-	 */
 	public static HennaData getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final HennaData _instance = new HennaData();
+		protected static final HennaData INSTANCE = new HennaData();
 	}
 }

src/main/java/com/l2jserver/gameserver/data/xml/impl/HitConditionBonusData.java

@@ -18,6 +18,8 @@
  */
 package com.l2jserver.gameserver.data.xml.impl;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -32,6 +34,8 @@ import com.l2jserver.gameserver.util.IXmlReader;
  */
 public final class HitConditionBonusData implements IXmlReader {
 	
+	private static final Logger LOG = LoggerFactory.getLogger(HitConditionBonusData.class);
+	
 	private int frontBonus = 0;
 	
 	private int sideBonus = 0;
@@ -46,9 +50,6 @@ public final class HitConditionBonusData implements IXmlReader {
 	
 	private int rainBonus = 0;
 	
-	/**
-	 * Instantiates a new hit condition bonus.
-	 */
 	protected HitConditionBonusData() {
 		load();
 	}
@@ -56,14 +57,14 @@ public final class HitConditionBonusData implements IXmlReader {
 	@Override
 	public void load() {
 		parseDatapackFile("data/stats/hitConditionBonus.xml");
-		LOG.info("{}: Loaded Hit Condition bonuses.", getClass().getSimpleName());
-		LOG.debug("{}: Front bonus: {}", getClass().getSimpleName(), frontBonus);
-		LOG.debug("{}: Side bonus: {}", getClass().getSimpleName(), sideBonus);
-		LOG.debug("{}: Back bonus: {}", getClass().getSimpleName(), backBonus);
-		LOG.debug("{}: High bonus: {}", getClass().getSimpleName(), highBonus);
-		LOG.debug("{}: Low bonus: {}", getClass().getSimpleName(), lowBonus);
-		LOG.debug("{}: Dark bonus: {}", getClass().getSimpleName(), darkBonus);
-		LOG.debug("{}: Rain bonus: {}", getClass().getSimpleName(), rainBonus);
+		LOG.info("Loaded Hit Condition bonuses.");
+		LOG.debug("Front bonus {}.", frontBonus);
+		LOG.debug("Side bonus {}.", sideBonus);
+		LOG.debug("Back bonus {}.", backBonus);
+		LOG.debug("High bonus {}.", highBonus);
+		LOG.debug("Low bonus {}.", lowBonus);
+		LOG.debug("Dark bonus {}.", darkBonus);
+		LOG.debug("Rain bonus {}.", rainBonus);
 	}
 	
 	@Override
@@ -138,15 +139,11 @@ public final class HitConditionBonusData implements IXmlReader {
 		return Math.max(mod / 100, 0);
 	}
 	
-	/**
-	 * Gets the single instance of HitConditionBonus.
-	 * @return single instance of HitConditionBonus
-	 */
 	public static HitConditionBonusData getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final HitConditionBonusData _instance = new HitConditionBonusData();
+		protected static final HitConditionBonusData INSTANCE = new HitConditionBonusData();
 	}
 }

src/main/java/com/l2jserver/gameserver/data/xml/impl/InitialEquipmentData.java

@@ -23,6 +23,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -40,15 +42,14 @@ import com.l2jserver.gameserver.util.IXmlReader;
  */
 public final class InitialEquipmentData implements IXmlReader {
 	
+	private static final Logger LOG = LoggerFactory.getLogger(InitialEquipmentData.class);
+	
 	private static final String NORMAL = "data/stats/initialEquipment.xml";
 	
 	private static final String EVENT = "data/stats/initialEquipmentEvent.xml";
 	
 	private final Map<ClassId, List<PcItemTemplate>> _initialEquipmentList = new HashMap<>();
 	
-	/**
-	 * Instantiates a new initial equipment data.
-	 */
 	protected InitialEquipmentData() {
 		load();
 	}
@@ -57,7 +58,7 @@ public final class InitialEquipmentData implements IXmlReader {
 	public void load() {
 		_initialEquipmentList.clear();
 		parseDatapackFile(Config.INITIAL_EQUIPMENT_EVENT ? EVENT : NORMAL);
-		LOG.info("{}: Loaded {} Initial Equipment data.", getClass().getSimpleName(), _initialEquipmentList.size());
+		LOG.info("Loaded {} initial equipment data.", _initialEquipmentList.size());
 	}
 	
 	@Override
@@ -113,15 +114,11 @@ public final class InitialEquipmentData implements IXmlReader {
 		return _initialEquipmentList.get(ClassId.getClassId(cId));
 	}
 	
-	/**
-	 * Gets the single instance of InitialEquipmentData.
-	 * @return single instance of InitialEquipmentData
-	 */
 	public static InitialEquipmentData getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final InitialEquipmentData _instance = new InitialEquipmentData();
+		protected static final InitialEquipmentData INSTANCE = new InitialEquipmentData();
 	}
 }

src/main/java/com/l2jserver/gameserver/data/xml/impl/InitialShortcutData.java

@@ -23,6 +23,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -45,15 +47,14 @@ import com.l2jserver.gameserver.util.IXmlReader;
  */
 public final class InitialShortcutData implements IXmlReader {
 	
+	private static final Logger LOG = LoggerFactory.getLogger(InitialShortcutData.class);
+	
 	private final Map<ClassId, List<Shortcut>> _initialShortcutData = new HashMap<>();
 	
 	private final List<Shortcut> _initialGlobalShortcutList = new ArrayList<>();
 	
 	private final Map<Integer, Macro> _macroPresets = new HashMap<>();
 	
-	/**
-	 * Instantiates a new initial shortcuts data.
-	 */
 	protected InitialShortcutData() {
 		load();
 	}
@@ -65,9 +66,9 @@ public final class InitialShortcutData implements IXmlReader {
 		
 		parseDatapackFile("data/stats/initialShortcuts.xml");
 		
-		LOG.info("{}: Loaded {} Initial Global Shortcuts data.", getClass().getSimpleName(), _initialGlobalShortcutList.size());
-		LOG.info("{}: Loaded {} Initial Shortcuts data.", getClass().getSimpleName(), _initialShortcutData.size());
-		LOG.info("{}: Loaded {} Macros presets.", getClass().getSimpleName(), _macroPresets.size());
+		LOG.info("Loaded {} initial dlobal shortcuts data.", _initialGlobalShortcutList.size());
+		LOG.info("Loaded {} initial shortcuts data.", _initialShortcutData.size());
+		LOG.info("Loaded {} macros presets.", _macroPresets.size());
 	}
 	
 	@Override
@@ -302,15 +303,11 @@ public final class InitialShortcutData implements IXmlReader {
 		}
 	}
 	
-	/**
-	 * Gets the single instance of InitialEquipmentData.
-	 * @return single instance of InitialEquipmentData
-	 */
 	public static InitialShortcutData getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final InitialShortcutData _instance = new InitialShortcutData();
+		protected static final InitialShortcutData INSTANCE = new InitialShortcutData();
 	}
 }

src/main/java/com/l2jserver/gameserver/data/xml/impl/KarmaData.java

@@ -21,6 +21,8 @@ package com.l2jserver.gameserver.data.xml.impl;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -33,6 +35,8 @@ import com.l2jserver.gameserver.util.IXmlReader;
  */
 public class KarmaData implements IXmlReader {
 	
+	private static final Logger LOG = LoggerFactory.getLogger(KarmaData.class);
+	
 	private final Map<Integer, Double> _karmaTable = new HashMap<>();
 	
 	public KarmaData() {
@@ -43,7 +47,7 @@ public class KarmaData implements IXmlReader {
 	public synchronized void load() {
 		_karmaTable.clear();
 		parseDatapackFile("data/stats/chars/pcKarmaIncrease.xml");
-		LOG.info("{}: Loaded {} karma modifiers.", getClass().getSimpleName(), _karmaTable.size());
+		LOG.info("Loaded {} karma modifiers.", _karmaTable.size());
 	}
 	
 	@Override
@@ -68,15 +72,11 @@ public class KarmaData implements IXmlReader {
 		return _karmaTable.get(level);
 	}
 	
-	/**
-	 * Gets the single instance of KarmaData.
-	 * @return single instance of KarmaData
-	 */
 	public static KarmaData getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final KarmaData _instance = new KarmaData();
+		protected static final KarmaData INSTANCE = new KarmaData();
 	}
 }

src/main/java/com/l2jserver/gameserver/data/xml/impl/MultisellData.java

@@ -24,6 +24,8 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
@@ -48,6 +50,8 @@ import com.l2jserver.util.file.filter.NumericNameFilter;
 
 public final class MultisellData implements IXmlReader {
 	
+	private static final Logger LOG = LoggerFactory.getLogger(MultisellData.class);
+	
 	public static final int PAGE_SIZE = 40;
 	// Special IDs.
 	public static final int PC_BANG_POINTS = -100;
@@ -71,7 +75,7 @@ public final class MultisellData implements IXmlReader {
 		}
 		
 		verify();
-		LOG.info("{}: Loaded {} multisell lists.", getClass().getSimpleName(), _entries.size());
+		LOG.info("Loaded {} multisell lists.", _entries.size());
 	}
 	
 	@Override
@@ -98,13 +102,12 @@ public final class MultisellData implements IXmlReader {
 						} catch (NumberFormatException e) {
 							try {
 								list.setUseRate(Config.class.getField(att.getNodeValue()).getDouble(Config.class));
-							} catch (Exception e1) {
-								LOG.warn("{}: Unable to parse {}", getClass().getSimpleName(), doc.getLocalName(), e1);
+							} catch (Exception ex) {
+								LOG.warn("Unable to parse {}!", doc.getLocalName(), ex);
 								list.setUseRate(1.0);
 							}
-							
-						} catch (DOMException e) {
-							LOG.warn("{}: Unable to parse {}", getClass().getSimpleName(), doc.getLocalName(), e);
+						} catch (DOMException ex) {
+							LOG.warn("Unable to parse {}!", doc.getLocalName(), ex);
 						}
 					}
 					
@@ -128,8 +131,8 @@ public final class MultisellData implements IXmlReader {
 				}
 			}
 			_entries.put(id, list);
-		} catch (Exception e) {
-			LOG.error("{}: Error in file {}", getClass().getSimpleName(), f, e);
+		} catch (Exception ex) {
+			LOG.error("There has been an error in file {}!", f, ex);
 		}
 	}
 	

src/main/java/com/l2jserver/gameserver/data/xml/impl/NpcData.java

@@ -31,6 +31,8 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -58,6 +60,8 @@ import com.l2jserver.gameserver.util.Util;
  */
 public class NpcData implements IXmlReader {
 	
+	private static final Logger LOG = LoggerFactory.getLogger(NpcData.class);
+	
 	private final Map<Integer, L2NpcTemplate> _npcs = new ConcurrentHashMap<>();
 	
 	private final Map<String, Integer> _clans = new ConcurrentHashMap<>();
@@ -73,12 +77,12 @@ public class NpcData implements IXmlReader {
 		_minionData = new MinionData();
 		
 		parseDatapackDirectory("data/stats/npcs", false);
-		LOG.info("{}: Loaded {} NPCs.", getClass().getSimpleName(), _npcs.size());
+		LOG.info("Loaded {} NPCs.", _npcs.size());
 		
 		if (Config.CUSTOM_NPC_DATA) {
 			final int npcCount = _npcs.size();
 			parseDatapackDirectory("data/stats/npcs/custom", true);
-			LOG.info("{}: Loaded {} custom NPCs.", getClass().getSimpleName(), (_npcs.size() - npcCount));
+			LOG.info("Loaded {} custom NPCs.", (_npcs.size() - npcCount));
 		}
 		
 		_minionData = null;
@@ -295,7 +299,7 @@ public class NpcData implements IXmlReader {
 											if (skill != null) {
 												skills.put(skill.getId(), skill);
 											} else {
-												LOG.warn("[{}] skill not found. NPC ID: {} Skill ID: {} Skill Level: {}!", f.getName(), npcId, skillId, skillLevel);
+												LOG.warn("{} skill not found. NPC Id {}, skill Id {}, skill level: {}!", f, npcId, skillId, skillLevel);
 											}
 										}
 									}
@@ -528,7 +532,7 @@ public class NpcData implements IXmlReader {
 						if (item instanceof GeneralDropItem) {
 							items.add((GeneralDropItem) item);
 						} else {
-							LOG.warn("[{}] grouped general drop item supports only general drop item.", f);
+							LOG.warn("{} grouped general drop item supports only general drop item.", f);
 						}
 					}
 					dropItem.setItems(items);
@@ -667,7 +671,10 @@ public class NpcData implements IXmlReader {
 	 * Once Spawn System gets reworked delete this class<br>
 	 * @author Zealar
 	 */
-	private final class MinionData implements IXmlReader {
+	private static class MinionData implements IXmlReader {
+		
+		private static final Logger LOG = LoggerFactory.getLogger(MinionData.class);
+		
 		public final Map<Integer, List<MinionHolder>> _tempMinions = new HashMap<>();
 		
 		protected MinionData() {
@@ -678,7 +685,7 @@ public class NpcData implements IXmlReader {
 		public void load() {
 			_tempMinions.clear();
 			parseDatapackFile("data/minionData.xml");
-			LOG.info("{}: Loaded {} minions data.", getClass().getSimpleName(), _tempMinions.size());
+			LOG.info("Loaded {} minions data.", _tempMinions.size());
 		}
 		
 		@Override
@@ -704,15 +711,11 @@ public class NpcData implements IXmlReader {
 		}
 	}
 	
-	/**
-	 * Gets the single instance of NpcData.
-	 * @return single instance of NpcData
-	 */
 	public static NpcData getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final NpcData _instance = new NpcData();
+		protected static final NpcData INSTANCE = new NpcData();
 	}
 }

src/main/java/com/l2jserver/gameserver/data/xml/impl/OptionData.java

@@ -21,6 +21,8 @@ package com.l2jserver.gameserver.data.xml.impl;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -39,6 +41,8 @@ import com.l2jserver.gameserver.util.IXmlReader;
  */
 public class OptionData implements IXmlReader {
 	
+	private static final Logger LOG = LoggerFactory.getLogger(OptionData.class);
+	
 	private final Map<Integer, Options> _optionData = new HashMap<>();
 	
 	protected OptionData() {
@@ -49,7 +53,7 @@ public class OptionData implements IXmlReader {
 	public synchronized void load() {
 		_optionData.clear();
 		parseDatapackDirectory("data/stats/options", false);
-		LOG.info("{}: Loaded: {} Options.", getClass().getSimpleName(), _optionData.size());
+		LOG.info("Loaded {} item options.", _optionData.size());
 	}
 	
 	@Override
@@ -125,15 +129,11 @@ public class OptionData implements IXmlReader {
 		return _optionData.get(id);
 	}
 	
-	/**
-	 * Gets the single instance of OptionsData.
-	 * @return single instance of OptionsData
-	 */
 	public static final OptionData getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final OptionData _instance = new OptionData();
+		protected static final OptionData INSTANCE = new OptionData();
 	}
 }

src/main/java/com/l2jserver/gameserver/data/xml/impl/PetDataTable.java

@@ -21,6 +21,8 @@ package com.l2jserver.gameserver.data.xml.impl;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -38,11 +40,10 @@ import com.l2jserver.gameserver.util.IXmlReader;
  */
 public final class PetDataTable implements IXmlReader {
 	
+	private static final Logger LOG = LoggerFactory.getLogger(PetDataTable.class);
+	
 	private final Map<Integer, L2PetData> _pets = new HashMap<>();
 	
-	/**
-	 * Instantiates a new pet data table.
-	 */
 	protected PetDataTable() {
 		load();
 	}
@@ -51,7 +52,7 @@ public final class PetDataTable implements IXmlReader {
 	public void load() {
 		_pets.clear();
 		parseDatapackDirectory("data/stats/pets", false);
-		LOG.info("{}: Loaded {} Pets.", getClass().getSimpleName(), _pets.size());
+		LOG.info("Loaded {} Pets.", _pets.size());
 	}
 	
 	@Override
@@ -119,10 +120,6 @@ public final class PetDataTable implements IXmlReader {
 		}
 	}
 	
-	/**
-	 * @param itemId
-	 * @return
-	 */
 	public L2PetData getPetDataByItemId(int itemId) {
 		for (L2PetData data : _pets.values()) {
 			if (data.getItemId() == itemId) {
@@ -153,7 +150,7 @@ public final class PetDataTable implements IXmlReader {
 	 */
 	public L2PetData getPetData(int petId) {
 		if (!_pets.containsKey(petId)) {
-			LOG.info("{}: Missing pet data for NPC ID {}!", getClass().getSimpleName(), petId);
+			LOG.warn("Missing pet data for NPC Id {}!", petId);
 		}
 		return _pets.get(petId);
 	}
@@ -185,15 +182,11 @@ public final class PetDataTable implements IXmlReader {
 		return MountType.findByNpcId(npcId) != MountType.NONE;
 	}
 	
-	/**
-	 * Gets the single instance of PetDataTable.
-	 * @return this class unique instance.
-	 */
 	public static PetDataTable getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final PetDataTable _instance = new PetDataTable();
+		protected static final PetDataTable INSTANCE = new PetDataTable();
 	}
 }

src/main/java/com/l2jserver/gameserver/data/xml/impl/PlayerCreationPointData.java

@@ -23,6 +23,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -37,6 +39,8 @@ import com.l2jserver.util.Rnd;
  */
 public class PlayerCreationPointData implements IXmlReader {
 	
+	private static final Logger LOG = LoggerFactory.getLogger(PlayerCreationPointData.class);
+	
 	private final Map<ClassId, Location[]> _creationPointData = new HashMap<>();
 	
 	protected PlayerCreationPointData() {
@@ -47,7 +51,7 @@ public class PlayerCreationPointData implements IXmlReader {
 	public void load() {
 		_creationPointData.clear();
 		parseDatapackFile("data/stats/chars/pcCreationPoints.xml");
-		LOG.info("{}: Loaded {} character creation points.", getClass().getSimpleName(), _creationPointData.values().stream().mapToInt(array -> array.length).sum());
+		LOG.info("Loaded {} character creation points.", _creationPointData.values().stream().mapToInt(array -> array.length).sum());
 	}
 	
 	/**
@@ -80,10 +84,10 @@ public class PlayerCreationPointData implements IXmlReader {
 	}
 	
 	public static final PlayerCreationPointData getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final PlayerCreationPointData _instance = new PlayerCreationPointData();
+		protected static final PlayerCreationPointData INSTANCE = new PlayerCreationPointData();
 	}
 }

src/main/java/com/l2jserver/gameserver/data/xml/impl/PlayerTemplateData.java

@@ -21,6 +21,8 @@ package com.l2jserver.gameserver.data.xml.impl;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -38,6 +40,8 @@ import com.l2jserver.gameserver.util.IXmlReader;
  */
 public final class PlayerTemplateData implements IXmlReader {
 	
+	private static final Logger LOG = LoggerFactory.getLogger(PlayerTemplateData.class);
+	
 	private final Map<ClassId, L2PcTemplate> _playerTemplates = new HashMap<>();
 	
 	private int _dataCount = 0;
@@ -50,8 +54,8 @@ public final class PlayerTemplateData implements IXmlReader {
 	public void load() {
 		_playerTemplates.clear();
 		parseDatapackDirectory("data/stats/chars/baseStats", false);
-		LOG.info("{}: Loaded {} character templates.", getClass().getSimpleName(), _playerTemplates.size());
-		LOG.info("{}: Loaded {} level up gain records.", getClass().getSimpleName(), _dataCount);
+		LOG.info("Loaded {} character templates.", _playerTemplates.size());
+		LOG.info("Loaded {} level up gain records.", _dataCount);
 	}
 	
 	@Override
@@ -135,10 +139,10 @@ public final class PlayerTemplateData implements IXmlReader {
 	}
 	
 	public static final PlayerTemplateData getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final PlayerTemplateData _instance = new PlayerTemplateData();
+		protected static final PlayerTemplateData INSTANCE = new PlayerTemplateData();
 	}
 }

src/main/java/com/l2jserver/gameserver/data/xml/impl/RecipeData.java

@@ -23,6 +23,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -40,6 +42,8 @@ import com.l2jserver.gameserver.util.IXmlReader;
  */
 public class RecipeData implements IXmlReader {
 	
+	private static final Logger LOG = LoggerFactory.getLogger(RecipeData.class);
+	
 	private final Map<Integer, L2RecipeList> _recipes = new HashMap<>();
 	
 	protected RecipeData() {
@@ -50,7 +54,7 @@ public class RecipeData implements IXmlReader {
 	public void load() {
 		_recipes.clear();
 		parseDatapackFile("data/recipes.xml");
-		LOG.info("{}: Loaded {} recipes.", getClass().getSimpleName(), _recipes.size());
+		LOG.info("Loaded {} recipes.", _recipes.size());
 	}
 	
 	@Override
@@ -75,7 +79,7 @@ public class RecipeData implements IXmlReader {
 						
 						att = attrs.getNamedItem("id");
 						if (att == null) {
-							LOG.error("{}: Missing id for recipe item, skipping!", getClass().getSimpleName());
+							LOG.error("Missing id for recipe item, skipping!");
 							continue;
 						}
 						id = Integer.parseInt(att.getNodeValue());
@@ -83,35 +87,35 @@ public class RecipeData implements IXmlReader {
 						
 						att = attrs.getNamedItem("recipeId");
 						if (att == null) {
-							LOG.error("{}: Missing recipeId for recipe item ID: {}, skipping!", getClass().getSimpleName(), id);
+							LOG.error("Missing recipeId for recipe item ID: {}, skipping!", id);
 							continue;
 						}
 						set.set("recipeId", Integer.parseInt(att.getNodeValue()));
 						
 						att = attrs.getNamedItem("name");
 						if (att == null) {
-							LOG.error("{}: Missing name for recipe item ID: {}, skipping!", getClass().getSimpleName(), id);
+							LOG.error("Missing name for recipe item ID: {}, skipping!", id);
 							continue;
 						}
 						set.set("recipeName", att.getNodeValue());
 						
 						att = attrs.getNamedItem("craftLevel");
 						if (att == null) {
-							LOG.error("{}: Missing level for recipe item ID: {}, skipping!", getClass().getSimpleName(), id);
+							LOG.error("Missing level for recipe item ID: {}, skipping!", id);
 							continue;
 						}
 						set.set("craftLevel", Integer.parseInt(att.getNodeValue()));
 						
 						att = attrs.getNamedItem("type");
 						if (att == null) {
-							LOG.error("{}: Missing type for recipe item ID: {}, skipping!", getClass().getSimpleName(), id);
+							LOG.error("Missing type for recipe item ID: {}, skipping!", id);
 							continue;
 						}
 						set.set("isDwarvenRecipe", att.getNodeValue().equalsIgnoreCase("dwarven"));
 						
 						att = attrs.getNamedItem("successRate");
 						if (att == null) {
-							LOG.error("{}: Missing successRate for recipe item ID: {}, skipping!", getClass().getSimpleName(), id);
+							LOG.error("Missing successRate for recipe item ID: {}, skipping!", id);
 							continue;
 						}
 						set.set("successRate", Integer.parseInt(att.getNodeValue()));
@@ -123,7 +127,7 @@ public class RecipeData implements IXmlReader {
 								try {
 									recipeStatUseList.add(new L2RecipeStatInstance(statName, value));
 								} catch (Exception e) {
-									LOG.error("{}: Error in StatUse parameter for recipe item ID: {}, skipping!", getClass().getSimpleName(), id);
+									LOG.error("Error in StatUse parameter for recipe item ID: {}, skipping!", id);
 									continue RECIPES_FILE;
 								}
 							} else if ("altStatChange".equalsIgnoreCase(c.getNodeName())) {
@@ -132,7 +136,7 @@ public class RecipeData implements IXmlReader {
 								try {
 									recipeAltStatChangeList.add(new L2RecipeStatInstance(statName, value));
 								} catch (Exception e) {
-									LOG.error("{}: Error in AltStatChange parameter for recipe item ID: {}, skipping!", getClass().getSimpleName(), id);
+									LOG.error("Error in AltStatChange parameter for recipe item ID: {}, skipping!", id);
 									continue RECIPES_FILE;
 								}
 							} else if ("ingredient".equalsIgnoreCase(c.getNodeName())) {
@@ -220,18 +224,11 @@ public class RecipeData implements IXmlReader {
 		return recipeList;
 	}
 	
-	/**
-	 * Gets the single instance of RecipeData.
-	 * @return single instance of RecipeData
-	 */
 	public static RecipeData getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
-	/**
-	 * The Class SingletonHolder.
-	 */
 	private static class SingletonHolder {
-		protected static final RecipeData _instance = new RecipeData();
+		protected static final RecipeData INSTANCE = new RecipeData();
 	}
 }

src/main/java/com/l2jserver/gameserver/data/xml/impl/SiegeScheduleData.java

@@ -18,10 +18,13 @@
  */
 package com.l2jserver.gameserver.data.xml.impl;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -37,6 +40,8 @@ import com.l2jserver.gameserver.util.Util;
  */
 public class SiegeScheduleData implements IXmlReader {
 	
+	private static final Logger LOG = LoggerFactory.getLogger(SiegeScheduleData.class);
+	
 	private final List<SiegeScheduleDate> _scheduleData = new ArrayList<>();
 	
 	protected SiegeScheduleData() {
@@ -46,11 +51,12 @@ public class SiegeScheduleData implements IXmlReader {
 	@Override
 	public synchronized void load() {
 		_scheduleData.clear();
-		parseDatapackFile("config/SiegeSchedule.xml");
-		LOG.info("{}: Loaded: {} siege schedulers.", getClass().getSimpleName(), _scheduleData.size());
+		parseFile(new File("config/SiegeSchedule.xml"));
+		LOG.info("Loaded: {} siege schedulers.", _scheduleData.size());
+		
 		if (_scheduleData.isEmpty()) {
 			_scheduleData.add(new SiegeScheduleDate(new StatsSet()));
-			LOG.info("{}: Emergency Loaded: {} default siege schedulers.", getClass().getSimpleName(), _scheduleData.size());
+			LOG.info("Emergency Loaded {} default siege schedulers.", _scheduleData.size());
 		}
 	}
 	
@@ -86,8 +92,8 @@ public class SiegeScheduleData implements IXmlReader {
 	private int getValueForField(String field) {
 		try {
 			return Calendar.class.getField(field).getInt(Calendar.class);
-		} catch (Exception e) {
-			LOG.warn("{}: Unable to get value!", getClass().getSimpleName(), e);
+		} catch (Exception ex) {
+			LOG.warn("Unable to get value!", ex);
 			return -1;
 		}
 	}
@@ -97,10 +103,10 @@ public class SiegeScheduleData implements IXmlReader {
 	}
 	
 	public static final SiegeScheduleData getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final SiegeScheduleData _instance = new SiegeScheduleData();
+		protected static final SiegeScheduleData INSTANCE = new SiegeScheduleData();
 	}
 }

src/main/java/com/l2jserver/gameserver/data/xml/impl/SkillLearnData.java

@@ -23,6 +23,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
@@ -35,6 +37,8 @@ import com.l2jserver.gameserver.util.IXmlReader;
  */
 public final class SkillLearnData implements IXmlReader {
 	
+	private static final Logger LOG = LoggerFactory.getLogger(SkillLearnData.class);
+	
 	private final Map<Integer, List<ClassId>> _skillLearn = new HashMap<>();
 	
 	protected SkillLearnData() {
@@ -45,7 +49,7 @@ public final class SkillLearnData implements IXmlReader {
 	public synchronized void load() {
 		_skillLearn.clear();
 		parseDatapackFile("data/skillLearn.xml");
-		LOG.info("{}: Loaded {} Skill Learn data.", getClass().getSimpleName(), _skillLearn.size());
+		LOG.info("Loaded {} skill learn data.", _skillLearn.size());
 	}
 	
 	@Override
@@ -75,15 +79,11 @@ public final class SkillLearnData implements IXmlReader {
 		return _skillLearn.get(npcId);
 	}
 	
-	/**
-	 * Gets the single instance of SkillLearnData.
-	 * @return single instance of SkillLearnData
-	 */
 	public static SkillLearnData getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final SkillLearnData _instance = new SkillLearnData();
+		protected static final SkillLearnData INSTANCE = new SkillLearnData();
 	}
 }

src/main/java/com/l2jserver/gameserver/data/xml/impl/SkillTreesData.java

@@ -29,6 +29,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -76,6 +78,8 @@ import com.l2jserver.gameserver.util.IXmlReader;
  */
 public final class SkillTreesData implements IXmlReader {
 	
+	private static final Logger LOG = LoggerFactory.getLogger(SkillTreesData.class);
+	
 	// ClassId, Map of Skill Hash Code, L2SkillLearn
 	private final Map<ClassId, Map<Integer, L2SkillLearn>> _classSkillTrees = new LinkedHashMap<>();
 	private final Map<ClassId, Map<Integer, L2SkillLearn>> _transferSkillTrees = new LinkedHashMap<>();
@@ -1120,17 +1124,10 @@ public final class SkillTreesData implements IXmlReader {
 		}
 	}
 	
-	/**
-	 * Gets the single instance of SkillTreesData.
-	 * @return the only instance of this class
-	 */
 	public static SkillTreesData getInstance() {
 		return SingletonHolder.INSTANCE;
 	}
 	
-	/**
-	 * Singleton holder for the SkillTreesData class.
-	 */
 	private static class SingletonHolder {
 		protected static final SkillTreesData INSTANCE = new SkillTreesData();
 	}

src/main/java/com/l2jserver/gameserver/data/xml/impl/StaticObjectData.java

@@ -22,6 +22,8 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -37,11 +39,10 @@ import com.l2jserver.gameserver.util.IXmlReader;
  */
 public final class StaticObjectData implements IXmlReader {
 	
+	private static final Logger LOG = LoggerFactory.getLogger(StaticObjectData.class);
+	
 	private final Map<Integer, L2StaticObjectInstance> _staticObjects = new HashMap<>();
 	
-	/**
-	 * Instantiates a new static objects.
-	 */
 	protected StaticObjectData() {
 		load();
 	}
@@ -50,7 +51,7 @@ public final class StaticObjectData implements IXmlReader {
 	public void load() {
 		_staticObjects.clear();
 		parseDatapackFile("data/staticObjects.xml");
-		LOG.info("{}: Loaded {} static object templates.", getClass().getSimpleName(), _staticObjects.size());
+		LOG.info("Loaded {} static object templates.", _staticObjects.size());
 	}
 	
 	@Override
@@ -93,15 +94,11 @@ public final class StaticObjectData implements IXmlReader {
 		return _staticObjects.values();
 	}
 	
-	/**
-	 * Gets the single instance of StaticObjects.
-	 * @return single instance of StaticObjects
-	 */
 	public static StaticObjectData getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final StaticObjectData _instance = new StaticObjectData();
+		protected static final StaticObjectData INSTANCE = new StaticObjectData();
 	}
 }

src/main/java/com/l2jserver/gameserver/data/xml/impl/TransformData.java

@@ -21,6 +21,8 @@ package com.l2jserver.gameserver.data.xml.impl;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -42,6 +44,8 @@ import com.l2jserver.gameserver.util.IXmlReader;
  */
 public final class TransformData implements IXmlReader {
 	
+	private static final Logger LOG = LoggerFactory.getLogger(TransformData.class);
+	
 	private final Map<Integer, Transform> _transformData = new HashMap<>();
 	
 	protected TransformData() {
@@ -52,7 +56,7 @@ public final class TransformData implements IXmlReader {
 	public synchronized void load() {
 		_transformData.clear();
 		parseDatapackDirectory("data/stats/transformations", false);
-		LOG.info("{}: Loaded: {} transform templates.", getClass().getSimpleName(), _transformData.size());
+		LOG.info("Loaded {} transform templates.", _transformData.size());
 	}
 	
 	@Override

src/main/java/com/l2jserver/gameserver/data/xml/impl/UIData.java

@@ -23,6 +23,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
@@ -35,6 +37,8 @@ import com.l2jserver.gameserver.util.IXmlReader;
  */
 public class UIData implements IXmlReader {
 	
+	private static final Logger LOG = LoggerFactory.getLogger(UIData.class);
+	
 	private final Map<Integer, List<ActionKey>> _storedKeys = new HashMap<>();
 	
 	private final Map<Integer, List<Integer>> _storedCategories = new HashMap<>();
@@ -48,7 +52,7 @@ public class UIData implements IXmlReader {
 		_storedKeys.clear();
 		_storedCategories.clear();
 		parseDatapackFile("data/ui/ui_en.xml");
-		LOG.info("{}: Loaded {} keys {} categories.", getClass().getSimpleName(), _storedKeys.size(), _storedCategories.size());
+		LOG.info("Loaded {} keys {} categories.", _storedKeys.size(), _storedCategories.size());
 	}
 	
 	@Override
@@ -153,10 +157,10 @@ public class UIData implements IXmlReader {
 	}
 	
 	public static UIData getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final UIData _instance = new UIData();
+		protected static final UIData INSTANCE = new UIData();
 	}
 }

src/main/java/com/l2jserver/gameserver/datatables/AugmentationData.java

@@ -23,11 +23,11 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import javax.xml.parsers.DocumentBuilderFactory;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -47,8 +47,9 @@ import com.l2jserver.util.Rnd;
  * @author durgus, Gigiikun, Sandro, UnAfraid
  */
 public class AugmentationData {
+	
 	// TODO(Zoey76): Implement using IXmlReader.
-	private static final Logger LOGGER = Logger.getLogger(AugmentationData.class.getName());
+	private static final Logger LOG = LoggerFactory.getLogger(AugmentationData.class);
 	
 	// stats
 	private static final int STAT_BLOCKSIZE = 3640;
@@ -99,13 +100,14 @@ public class AugmentationData {
 		}
 		
 		load();
+		
 		if (!Config.RETAIL_LIKE_AUGMENTATION) {
 			for (int i = 0; i < 10; i++) {
-				LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _blueSkills.get(i).size() + " blue, " + _purpleSkills.get(i).size() + " purple and " + _redSkills.get(i).size() + " red skills for lifeStoneLevel " + i);
+				LOG.info("Loaded {} blue, {} purple and {} red skills for life stone level {}.", _blueSkills.get(i).size(), _purpleSkills.get(i).size(), _redSkills.get(i).size(), i);
 			}
 		} else {
-			LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded: " + _augmentationChances.size() + " augmentations.");
-			LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded: " + _augmentationChancesAcc.size() + " accessory augmentations.");
+			LOG.info("Loaded {} augmentations.", _augmentationChances.size());
+			LOG.info("Loaded {} accessory augmentations.", _augmentationChancesAcc.size());
 		}
 	}
 	
@@ -212,7 +214,7 @@ public class AugmentationData {
 				
 				File file = new File(Config.DATAPACK_ROOT + "/data/stats/augmentation/augmentation_skillmap.xml");
 				if (!file.exists()) {
-					LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": ERROR The augmentation skillmap file is missing.");
+					LOG.warn("The augmentation skillmap file is missing!");
 					return;
 				}
 				
@@ -262,10 +264,10 @@ public class AugmentationData {
 					}
 				}
 				if (badAugmantData != 0) {
-					LOGGER.info(getClass().getSimpleName() + ": " + badAugmantData + " bad skill(s) were skipped.");
+					LOG.warn("{} bad skill(s) were skipped.", badAugmantData);
 				}
-			} catch (Exception e) {
-				LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": ERROR parsing augmentation_skillmap.xml.", e);
+			} catch (Exception ex) {
+				LOG.warn("There has been an error parsing augmentation_skillmap.xml!", ex);
 				return;
 			}
 		} else {
@@ -339,10 +341,11 @@ public class AugmentationData {
 					}
 				}
 			} else {
-				LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": ERROR The retailchances.xml data file is missing.");
+				LOG.warn("The retailchances.xml data file is missing!");
 				return;
 			}
 		}
+		
 		if (Config.RETAIL_LIKE_AUGMENTATION_ACCESSORY) {
 			DocumentBuilderFactory factory3 = DocumentBuilderFactory.newInstance();
 			factory3.setValidating(false);
@@ -413,7 +416,7 @@ public class AugmentationData {
 					}
 				}
 			} else {
-				LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": ERROR The retailchances_accessory.xml data file is missing.");
+				LOG.warn("The retailchances_accessory.xml data file is missing!");
 				return;
 			}
 		}
@@ -701,7 +704,7 @@ public class AugmentationData {
 		stat12 = Rnd.get(offset, (offset + STAT_SUBBLOCKSIZE) - 1);
 		
 		if (Config.DEBUG) {
-			LOGGER.info(getClass().getSimpleName() + ": Augmentation success: stat12=" + stat12 + "; stat34=" + stat34 + "; resultColor=" + resultColor + "; level=" + lifeStoneLevel + "; grade=" + lifeStoneGrade);
+			LOG.info("Augmentation success: stat12={}; stat34={}; resultColor={}; level={}; grade={}", stat12, stat34, resultColor, lifeStoneLevel, lifeStoneGrade);
 		}
 		return new L2Augmentation(((stat34 << 16) + stat12));
 	}
@@ -801,7 +804,7 @@ public class AugmentationData {
 		stat12 = base + skillsLength + (ACC_STAT_SUBBLOCKSIZE * resultColor) + stat12;
 		
 		if (Config.DEBUG) {
-			LOGGER.info(getClass().getSimpleName() + ": Accessory augmentation success: stat12=" + stat12 + "; stat34=" + stat34 + "; level=" + lifeStoneLevel);
+			LOG.info("Accessory augmentation success: stat12={}; stat34={}; level={}", stat12, stat34, lifeStoneLevel);
 		}
 		return new L2Augmentation(((stat34 << 16) + stat12));
 	}

src/main/java/com/l2jserver/gameserver/datatables/BotReportTable.java

@@ -18,18 +18,30 @@
  */
 package com.l2jserver.gameserver.datatables;
 
+import static com.l2jserver.gameserver.network.SystemMessageId.C1_WAS_REPORTED_AS_BOT;
+import static com.l2jserver.gameserver.network.SystemMessageId.CANNOT_REPORT_TARGET_ALREDY_REPORTED_BY_CLAN_ALLY_MEMBER_OR_SAME_IP;
+import static com.l2jserver.gameserver.network.SystemMessageId.TARGET_NOT_REPORT_CANNOT_REPORT_PEACE_PVP_ZONE_OR_OLYMPIAD_OR_CLAN_WAR_ENEMY;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_CANNOT_REPORT_CHARACTER_IN_PEACE_OR_BATTLE_ZONE;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_CANNOT_REPORT_CHAR_AT_THIS_TIME_1;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_CANNOT_REPORT_CHAR_WHO_ACQUIRED_XP;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_CANNOT_REPORT_CLAN_WAR_ENEMY;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_CAN_REPORT_IN_S1_MINS_YOU_HAVE_S2_POINTS_LEFT;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_HAVE_BEEN_REPORTED_AND_CANNOT_REPORT;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_HAVE_USED_ALL_POINTS_POINTS_ARE_RESET_AT_NOON;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_HAVE_USED_REPORT_POINT_ON_C1_YOU_HAVE_C2_POINTS_LEFT;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xml.sax.Attributes;
 import org.xml.sax.helpers.DefaultHandler;
 
@@ -45,12 +57,13 @@ import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
 /**
+ * Bot Report table.
  * @author BiggBoss
  */
 public final class BotReportTable {
 	
 	// Zoey76: TODO: Split XML parsing from SQL operations, use IXmlReader instead of SAXParser.
-	private static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName());
+	private static final Logger LOG = LoggerFactory.getLogger(BotReportTable.class);
 	
 	private static final int COLUMN_BOT_ID = 1;
 	private static final int COLUMN_REPORTER_ID = 2;
@@ -86,8 +99,8 @@ public final class BotReportTable {
 				
 				SAXParser parser = SAXParserFactory.newInstance().newSAXParser();
 				parser.parse(punishments, new PunishmentsLoader());
-			} catch (Exception e) {
-				LOGGER.log(Level.WARNING, "BotReportTable: Could not load punishments from /config/botreport_punishments.xml", e);
+			} catch (Exception ex) {
+				LOG.warn("Could not load punishments from /config/botreport_punishments.xml", ex);
 			}
 			
 			loadReportedCharData();
@@ -143,9 +156,9 @@ public final class BotReportTable {
 				}
 			}
 			
-			LOGGER.info("BotReportTable: Loaded " + _reports.size() + " bot reports");
-		} catch (Exception e) {
-			LOGGER.log(Level.WARNING, "BotReportTable: Could not load reported char data!", e);
+			LOG.info("Loaded {} bot reports.", _reports.size());
+		} catch (Exception ex) {
+			LOG.warn("Could not load reported char data!", ex);
 		}
 	}
 	
@@ -168,8 +181,8 @@ public final class BotReportTable {
 					ps.execute();
 				}
 			}
-		} catch (Exception e) {
-			LOGGER.log(Level.SEVERE, "BotReportTable: Could not update reported char data in database!", e);
+		} catch (Exception ex) {
+			LOG.warn("Could not update reported char data in database!", ex);
 		}
 	}
 	
@@ -192,22 +205,22 @@ public final class BotReportTable {
 		}
 		
 		if (bot.isInsideZone(ZoneId.PEACE) || bot.isInsideZone(ZoneId.PVP)) {
-			reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_CHARACTER_IN_PEACE_OR_BATTLE_ZONE);
+			reporter.sendPacket(YOU_CANNOT_REPORT_CHARACTER_IN_PEACE_OR_BATTLE_ZONE);
 			return false;
 		}
 		
 		if (bot.isInOlympiadMode()) {
-			reporter.sendPacket(SystemMessageId.TARGET_NOT_REPORT_CANNOT_REPORT_PEACE_PVP_ZONE_OR_OLYMPIAD_OR_CLAN_WAR_ENEMY);
+			reporter.sendPacket(TARGET_NOT_REPORT_CANNOT_REPORT_PEACE_PVP_ZONE_OR_OLYMPIAD_OR_CLAN_WAR_ENEMY);
 			return false;
 		}
 		
 		if ((bot.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan())) {
-			reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_CLAN_WAR_ENEMY);
+			reporter.sendPacket(YOU_CANNOT_REPORT_CLAN_WAR_ENEMY);
 			return false;
 		}
 		
 		if (bot.getExp() == bot.getStat().getStartingExp()) {
-			reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_CHAR_WHO_ACQUIRED_XP);
+			reporter.sendPacket(YOU_CANNOT_REPORT_CHAR_WHO_ACQUIRED_XP);
 			return false;
 		}
 		
@@ -217,37 +230,37 @@ public final class BotReportTable {
 		
 		synchronized (this) {
 			if (_reports.containsKey(reporterId)) {
-				reporter.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AND_CANNOT_REPORT);
+				reporter.sendPacket(YOU_HAVE_BEEN_REPORTED_AND_CANNOT_REPORT);
 				return false;
 			}
 			
 			final int ip = hashIp(reporter);
 			if (!timeHasPassed(_ipRegistry, ip)) {
-				reporter.sendPacket(SystemMessageId.CANNOT_REPORT_TARGET_ALREDY_REPORTED_BY_CLAN_ALLY_MEMBER_OR_SAME_IP);
+				reporter.sendPacket(CANNOT_REPORT_TARGET_ALREDY_REPORTED_BY_CLAN_ALLY_MEMBER_OR_SAME_IP);
 				return false;
 			}
 			
 			if (rcd != null) {
 				if (rcd.alredyReportedBy(reporterId)) {
-					reporter.sendPacket(SystemMessageId.YOU_CANNOT_REPORT_CHAR_AT_THIS_TIME_1);
+					reporter.sendPacket(YOU_CANNOT_REPORT_CHAR_AT_THIS_TIME_1);
 					return false;
 				}
 				
 				if (!Config.BOTREPORT_ALLOW_REPORTS_FROM_SAME_CLAN_MEMBERS && rcd.reportedBySameClan(reporter.getClan())) {
-					reporter.sendPacket(SystemMessageId.CANNOT_REPORT_TARGET_ALREDY_REPORTED_BY_CLAN_ALLY_MEMBER_OR_SAME_IP);
+					reporter.sendPacket(CANNOT_REPORT_TARGET_ALREDY_REPORTED_BY_CLAN_ALLY_MEMBER_OR_SAME_IP);
 					return false;
 				}
 			}
 			
 			if (rcdRep != null) {
 				if (rcdRep.getPointsLeft() == 0) {
-					reporter.sendPacket(SystemMessageId.YOU_HAVE_USED_ALL_POINTS_POINTS_ARE_RESET_AT_NOON);
+					reporter.sendPacket(YOU_HAVE_USED_ALL_POINTS_POINTS_ARE_RESET_AT_NOON);
 					return false;
 				}
 				
 				long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime());
 				if (reuse < Config.BOTREPORT_REPORT_DELAY) {
-					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_CAN_REPORT_IN_S1_MINS_YOU_HAVE_S2_POINTS_LEFT);
+					SystemMessage sm = SystemMessage.getSystemMessage(YOU_CAN_REPORT_IN_S1_MINS_YOU_HAVE_S2_POINTS_LEFT);
 					sm.addInt((int) (reuse / 60000));
 					sm.addInt(rcdRep.getPointsLeft());
 					reporter.sendPacket(sm);
@@ -272,11 +285,11 @@ public final class BotReportTable {
 			_charRegistry.put(reporterId, rcdRep);
 		}
 		
-		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_WAS_REPORTED_AS_BOT);
+		SystemMessage sm = SystemMessage.getSystemMessage(C1_WAS_REPORTED_AS_BOT);
 		sm.addCharName(bot);
 		reporter.sendPacket(sm);
 		
-		sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_USED_REPORT_POINT_ON_C1_YOU_HAVE_C2_POINTS_LEFT);
+		sm = SystemMessage.getSystemMessage(YOU_HAVE_USED_REPORT_POINT_ON_C1_YOU_HAVE_C2_POINTS_LEFT);
 		sm.addCharName(bot);
 		sm.addInt(rcdRep.getPointsLeft());
 		reporter.sendPacket(sm);
@@ -332,7 +345,7 @@ public final class BotReportTable {
 		if (sk != null) {
 			_punishments.put(neededReports, new PunishHolder(sk, sysMsg));
 		} else {
-			LOGGER.warning("BotReportTable: Could not add punishment for " + neededReports + " report(s): Skill " + skillId + "-" + skillLevel + " does not exist!");
+			LOG.warn("Could not add punishment for ^* report(s): Skill {}-{} does not exist!", neededReports, skillId, skillLevel);
 		}
 	}
 	
@@ -358,16 +371,12 @@ public final class BotReportTable {
 			}
 			
 			ThreadPoolManager.getInstance().scheduleGeneral(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
-		} catch (Exception e) {
+		} catch (Exception ex) {
 			ThreadPoolManager.getInstance().scheduleGeneral(new ResetPointTask(), 24 * 3600 * 1000);
-			LOGGER.log(Level.WARNING, "BotReportTable: Could not properly schedule bot report points reset task. Scheduled in 24 hours.", e);
+			LOG.warn("Could not properly schedule bot report points reset task. Scheduled in 24 hours!", ex);
 		}
 	}
 	
-	public static BotReportTable getInstance() {
-		return SingletonHolder.INSTANCE;
-	}
-	
 	/**
 	 * Returns a integer representative number from a connection
 	 * @param player (The L2PcInstance owner of the connection)
@@ -514,6 +523,10 @@ public final class BotReportTable {
 		}
 	}
 	
+	public static BotReportTable getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
 	private static final class SingletonHolder {
 		static final BotReportTable INSTANCE = new BotReportTable();
 	}

src/main/java/com/l2jserver/gameserver/datatables/ItemTable.java

@@ -137,10 +137,10 @@ public class ItemTable {
 		
 		buildFastLookupTable(highest);
 		
-		LOG.info("Loaded: {} Etc items.", _etcItems.size());
-		LOG.info("Loaded: {} Armor items.", _armors.size());
-		LOG.info("Loaded: {} Weapon items.", _weapons.size());
-		LOG.info("Loaded: {} items in total.", (_etcItems.size() + _armors.size() + _weapons.size()));
+		LOG.info("Loaded {} Etc items.", _etcItems.size());
+		LOG.info("Loaded {} Armor items.", _armors.size());
+		LOG.info("Loaded {} Weapon items.", _weapons.size());
+		LOG.info("Loaded {} items in total.", (_etcItems.size() + _armors.size() + _weapons.size()));
 	}
 	
 	/**

src/main/java/com/l2jserver/gameserver/datatables/SpawnTable.java

@@ -25,6 +25,8 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -45,6 +47,8 @@ import com.l2jserver.gameserver.util.IXmlReader;
  */
 public final class SpawnTable implements IXmlReader {
 	
+	private static final Logger LOG = LoggerFactory.getLogger(SpawnTable.class);
+	
 	private static final String SELECT_SPAWNS = "SELECT count, npc_templateid, locx, locy, locz, heading, respawn_delay, respawn_random, loc_id, periodOfDay FROM spawnlist";
 	
 	private static final String SELECT_CUSTOM_SPAWNS = "SELECT count, npc_templateid, locx, locy, locz, heading, respawn_delay, respawn_random, loc_id, periodOfDay FROM custom_spawnlist";
@@ -53,23 +57,21 @@ public final class SpawnTable implements IXmlReader {
 	
 	private int _xmlSpawnCount = 0;
 	
-	/**
-	 * Wrapper to load all spawns.
-	 */
 	@Override
 	public void load() {
 		if (!Config.ALT_DEV_NO_SPAWNS) {
 			fillSpawnTable(false);
 			final int spawnCount = _spawnTable.size();
-			LOG.info("{}: Loaded " + spawnCount + " npc spawns.", getClass().getSimpleName());
+			LOG.info("Loaded {} NPC spawns.", spawnCount);
+			
 			if (Config.CUSTOM_SPAWNLIST_TABLE) {
 				fillSpawnTable(true);
-				LOG.info("{}: Loaded " + (_spawnTable.size() - spawnCount) + " custom npc spawns.", getClass().getSimpleName());
+				LOG.info("Loaded {} custom NPC spawns.", (_spawnTable.size() - spawnCount));
 			}
 			
 			// Load XML list
 			parseDatapackDirectory("data/spawnlist", false);
-			LOG.info("{}: Loaded " + _xmlSpawnCount + " npc spawns from XML.", getClass().getSimpleName());
+			LOG.info("Loaded {} NPC spawns from XML.", _xmlSpawnCount);
 		}
 	}
 	
@@ -81,7 +83,7 @@ public final class SpawnTable implements IXmlReader {
 	private boolean checkTemplate(int npcId) {
 		L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(npcId);
 		if (npcTemplate == null) {
-			LOG.warn("{}: Data missing in NPC table for ID: {}.", getClass().getSimpleName(), npcId);
+			LOG.warn("Data missing in NPC table for ID {}!", npcId);
 			return false;
 		}
 		
@@ -163,7 +165,7 @@ public final class SpawnTable implements IXmlReader {
 								
 								if ((x == 0) && (y == 0) && (territoryName == null)) // Both coordinates and zone are unspecified
 								{
-									LOG.warn("{}: Spawn could not be initialized, both coordinates and zone are unspecified for ID {}", getClass().getSimpleName(), templateId);
+									LOG.warn("Spawn could not be initialized, both coordinates and zone are unspecified for ID {}!", templateId);
 									continue;
 								}
 								
@@ -241,8 +243,8 @@ public final class SpawnTable implements IXmlReader {
 				spawnInfo.set("isCustomSpawn", isCustom);
 				npcSpawnCount += addSpawn(spawnInfo);
 			}
-		} catch (Exception e) {
-			LOG.warn("{}: Spawn could not be initialized!", getClass().getSimpleName(), e);
+		} catch (Exception ex) {
+			LOG.warn("Spawn could not be initialized!", ex);
 		}
 		return npcSpawnCount;
 	}
@@ -291,8 +293,8 @@ public final class SpawnTable implements IXmlReader {
 			}
 			
 			addSpawn(spawnDat);
-		} catch (Exception e) {
-			LOG.warn("{}: Spawn could not be initialized!", getClass().getSimpleName(), e);
+		} catch (Exception ex) {
+			LOG.warn("Spawn could not be initialized!", ex);
 		}
 		return ret;
 	}
@@ -363,8 +365,8 @@ public final class SpawnTable implements IXmlReader {
 				insert.setInt(8, spawn.getRespawnMaxDelay() - spawn.getRespawnMinDelay());
 				insert.setInt(9, spawn.getLocationId());
 				insert.execute();
-			} catch (Exception e) {
-				LOG.warn("{}: Could not store spawn in the DB!", getClass().getSimpleName(), e);
+			} catch (Exception ex) {
+				LOG.warn("Could not store spawn in the DB!", ex);
 			}
 		}
 	}
@@ -388,8 +390,8 @@ public final class SpawnTable implements IXmlReader {
 				delete.setInt(4, spawn.getId());
 				delete.setInt(5, spawn.getHeading());
 				delete.execute();
-			} catch (Exception e) {
-				LOG.warn("{}: Spawn {} could not be removed from DB!", getClass().getSimpleName(), spawn, e);
+			} catch (Exception ex) {
+				LOG.warn("Spawn {} could not be removed from DB!", spawn, ex);
 			}
 		}
 	}
@@ -437,10 +439,10 @@ public final class SpawnTable implements IXmlReader {
 	}
 	
 	public static SpawnTable getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final SpawnTable _instance = new SpawnTable();
+		protected static final SpawnTable INSTANCE = new SpawnTable();
 	}
 }

src/main/java/com/l2jserver/gameserver/instancemanager/AirShipManager.java

@@ -20,8 +20,9 @@ package com.l2jserver.gameserver.instancemanager;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.l2jserver.commons.database.ConnectionFactory;
 import com.l2jserver.gameserver.model.AirShipTeleportList;
@@ -34,7 +35,8 @@ import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate;
 import com.l2jserver.gameserver.network.serverpackets.ExAirShipTeleportList;
 
 public class AirShipManager {
-	private static final Logger _log = Logger.getLogger(AirShipManager.class.getName());
+	
+	private static final Logger LOG = LoggerFactory.getLogger(AirShipManager.class);
 	
 	private static final String LOAD_DB = "SELECT * FROM airships";
 	private static final String ADD_DB = "INSERT INTO airships (owner_id,fuel) VALUES (?,?)";
@@ -157,8 +159,8 @@ public class AirShipManager {
 				ps.setInt(1, ownerId);
 				ps.setInt(2, info.getInt("fuel"));
 				ps.executeUpdate();
-			} catch (Exception e) {
-				_log.log(Level.WARNING, getClass().getSimpleName() + ": Could not add new airship license: " + e.getMessage(), e);
+			} catch (Exception ex) {
+				LOG.warn("Could not add new airship license!", ex);
 			}
 		}
 	}
@@ -235,10 +237,10 @@ public class AirShipManager {
 				info.set("fuel", rs.getInt("fuel"));
 				_airShipsInfo.put(rs.getInt("owner_id"), info);
 			}
-		} catch (Exception e) {
-			_log.log(Level.WARNING, getClass().getSimpleName() + ": Could not load airships table: " + e.getMessage(), e);
+		} catch (Exception ex) {
+			LOG.warn("Could not load airships table!", ex);
 		}
-		_log.info(getClass().getSimpleName() + ": Loaded " + _airShipsInfo.size() + " private airships");
+		LOG.info("Loaded {} private airships.", _airShipsInfo.size());
 	}
 	
 	private void storeInDb(int ownerId) {
@@ -252,8 +254,8 @@ public class AirShipManager {
 			ps.setInt(1, info.getInt("fuel"));
 			ps.setInt(2, ownerId);
 			ps.executeUpdate();
-		} catch (Exception e) {
-			_log.log(Level.WARNING, getClass().getSimpleName() + ": Could not update airships table: " + e.getMessage(), e);
+		} catch (Exception ex) {
+			LOG.warn("Could not update airships table!", ex);
 		}
 	}
 	

src/main/java/com/l2jserver/gameserver/instancemanager/AuctionManager.java

@@ -20,8 +20,9 @@ package com.l2jserver.gameserver.instancemanager;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.l2jserver.commons.database.ConnectionFactory;
 import com.l2jserver.gameserver.model.entity.Auction;
@@ -31,7 +32,7 @@ import com.l2jserver.gameserver.model.entity.Auction;
  */
 public final class AuctionManager {
 	
-	private static final Logger _log = Logger.getLogger(AuctionManager.class.getName());
+	private static final Logger LOG = LoggerFactory.getLogger(AuctionManager.class);
 	
 	private final List<Auction> _auctions = new ArrayList<>();
 	
@@ -77,7 +78,7 @@ public final class AuctionManager {
 	};
 	
 	// @formatter:off
-	private static final int[] ItemInitDataId =
+	private static final int[] ITEM_INIT_DATA_ID =
 	{
 		22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 36, 37, 38, 39, 40, 41, 42,
 		43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61
@@ -100,9 +101,9 @@ public final class AuctionManager {
 			while (rs.next()) {
 				_auctions.add(new Auction(rs.getInt("id")));
 			}
-			_log.info(getClass().getSimpleName() + ": Loaded: " + _auctions.size() + " auction(s)");
-		} catch (Exception e) {
-			_log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: AuctionManager.load(): " + e.getMessage(), e);
+			LOG.info("Loaded {} auction(s).", _auctions.size());
+		} catch (Exception ex) {
+			LOG.warn("There has been an error loading auctions from database!", ex);
 		}
 	}
 	
@@ -131,13 +132,13 @@ public final class AuctionManager {
 	
 	public void initNPC(int id) {
 		int i;
-		for (i = 0; i < ItemInitDataId.length; i++) {
-			if (ItemInitDataId[i] == id) {
+		for (i = 0; i < ITEM_INIT_DATA_ID.length; i++) {
+			if (ITEM_INIT_DATA_ID[i] == id) {
 				break;
 			}
 		}
-		if ((i >= ItemInitDataId.length) || (ItemInitDataId[i] != id)) {
-			_log.warning(getClass().getSimpleName() + ": Clan Hall auction not found for Id :" + id);
+		if ((i >= ITEM_INIT_DATA_ID.length) || (ITEM_INIT_DATA_ID[i] != id)) {
+			LOG.warn("Clan hall auction not found for Id {}!", id);
 			return;
 		}
 		
@@ -145,17 +146,17 @@ public final class AuctionManager {
 			var s = con.createStatement()) {
 			s.executeUpdate("INSERT INTO `auction` VALUES " + ITEM_INIT_DATA[i]);
 			_auctions.add(new Auction(id));
-			_log.info(getClass().getSimpleName() + ": Created auction for ClanHall: " + id);
-		} catch (Exception e) {
-			_log.log(Level.SEVERE, getClass().getSimpleName() + ": Exception: Auction.initNPC(): " + e.getMessage(), e);
+			LOG.info("Created auction for clan hall Id {}.", id);
+		} catch (Exception ex) {
+			LOG.error("There has been an error storing auction!", ex);
 		}
 	}
 	
 	public static final AuctionManager getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final AuctionManager _instance = new AuctionManager();
+		protected static final AuctionManager INSTANCE = new AuctionManager();
 	}
 }

src/main/java/com/l2jserver/gameserver/instancemanager/CastleManager.java

@@ -22,8 +22,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.l2jserver.commons.database.ConnectionFactory;
 import com.l2jserver.gameserver.InstanceListManager;
@@ -37,7 +38,7 @@ import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 
 public final class CastleManager implements InstanceListManager {
 	
-	private static final Logger _log = Logger.getLogger(CastleManager.class.getName());
+	private static final Logger LOG = LoggerFactory.getLogger(CastleManager.class);
 	
 	private final List<Castle> _castles = new ArrayList<>();
 	
@@ -229,8 +230,8 @@ public final class CastleManager implements InstanceListManager {
 				ps.setInt(1, member.getObjectId());
 				ps.setInt(2, circletId);
 				ps.execute();
-			} catch (Exception e) {
-				_log.log(Level.WARNING, "Failed to remove castle circlets offline for player " + member.getName() + ": " + e.getMessage(), e);
+			} catch (Exception ex) {
+				LOG.warn("Failed to remove castle circlets offline for player {}!", player, ex);
 			}
 		}
 	}
@@ -243,9 +244,9 @@ public final class CastleManager implements InstanceListManager {
 			while (rs.next()) {
 				_castles.add(new Castle(rs.getInt("id")));
 			}
-			_log.info(getClass().getSimpleName() + ": Loaded: " + _castles.size() + " castles");
-		} catch (Exception e) {
-			_log.log(Level.WARNING, "Exception: loadCastleData(): " + e.getMessage(), e);
+			LOG.info("Loaded {} castles.", _castles.size());
+		} catch (Exception ex) {
+			LOG.warn("There has been an error loading castles from database!", ex);
 		}
 	}
 	

src/main/java/com/l2jserver/gameserver/instancemanager/CastleManorManager.java

@@ -30,13 +30,15 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.config.Config;
 import com.l2jserver.commons.database.ConnectionFactory;
 import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.config.Config;
 import com.l2jserver.gameserver.enums.ManorMode;
 import com.l2jserver.gameserver.model.CropProcure;
 import com.l2jserver.gameserver.model.L2Clan;
@@ -57,6 +59,8 @@ import com.l2jserver.util.Rnd;
  */
 public final class CastleManorManager implements IXmlReader, IStorable {
 	
+	private static final Logger LOG = LoggerFactory.getLogger(CastleManorManager.class);
+	
 	private static final String INSERT_PRODUCT = "INSERT INTO castle_manor_production VALUES (?, ?, ?, ?, ?, ?)";
 	
 	private static final String INSERT_CROP = "INSERT INTO castle_manor_procure VALUES (?, ?, ?, ?, ?, ?, ?)";
@@ -100,18 +104,18 @@ public final class CastleManorManager implements IXmlReader, IStorable {
 			
 			// Send debug message
 			if (Config.DEBUG) {
-				LOG.info("{}: Current mode {}", getClass().getSimpleName(), _mode.toString());
+				LOG.info("Current mode {}.", _mode);
 			}
 		} else {
 			_mode = ManorMode.DISABLED;
-			LOG.info("{}: Manor system is deactivated.", getClass().getSimpleName());
+			LOG.info("Manor system is deactivated.");
 		}
 	}
 	
 	@Override
 	public final void load() {
 		parseDatapackFile("data/seeds.xml");
-		LOG.info("{}: Loaded {} seeds.", getClass().getSimpleName(), _seeds.size());
+		LOG.info("Loaded {} seeds.", _seeds.size());
 	}
 	
 	@Override
@@ -170,7 +174,7 @@ public final class CastleManorManager implements IXmlReader, IStorable {
 								pCurrent.add(sp);
 							}
 						} else {
-							LOG.warn("{}: Unknown seed ID: {}!", getClass().getSimpleName(), seedId);
+							LOG.warn("Unknown seed Id {}!", seedId);
 						}
 					}
 				}
@@ -194,22 +198,23 @@ public final class CastleManorManager implements IXmlReader, IStorable {
 								current.add(cp);
 							}
 						} else {
-							LOG.warn("{}: Unknown crop ID: {}!", getClass().getSimpleName(), cropId);
+							LOG.warn("Unknown crop Id {}!", cropId);
 						}
 					}
 				}
 				_procure.put(castleId, current);
 				_procureNext.put(castleId, next);
 			}
-			LOG.info("{}: Manor data loaded.", getClass().getSimpleName());
-		} catch (Exception e) {
-			LOG.warn("{}: Unable to load manor data!", getClass().getSimpleName(), e);
+			LOG.info("Manor data loaded.");
+		} catch (Exception ex) {
+			LOG.warn("Unable to load manor data!", ex);
 		}
 	}
 	
 	// -------------------------------------------------------
 	// Manor methods
 	// -------------------------------------------------------
+	
 	private final void scheduleModeChange() {
 		// Calculate next mode change
 		_nextModeChange = Calendar.getInstance();
@@ -355,7 +360,7 @@ public final class CastleManorManager implements IXmlReader, IStorable {
 		}
 		scheduleModeChange();
 		if (Config.DEBUG) {
-			LOG.info("{}: Manor mode changed to {}!", getClass().getSimpleName(), _mode);
+			LOG.info("Manor mode changed to {}!", _mode);
 		}
 	}
 	
@@ -382,8 +387,8 @@ public final class CastleManorManager implements IXmlReader, IStorable {
 					}
 					ips.executeBatch();
 				}
-			} catch (Exception e) {
-				LOG.error("{}: Unable to store manor data!", getClass().getSimpleName(), e);
+			} catch (Exception ex) {
+				LOG.error("Unable to store manor data!", ex);
 			}
 		}
 	}
@@ -412,8 +417,8 @@ public final class CastleManorManager implements IXmlReader, IStorable {
 					}
 					ips.executeBatch();
 				}
-			} catch (Exception e) {
-				LOG.error("{}: Unable to store manor data!", getClass().getSimpleName(), e);
+			} catch (Exception ex) {
+				LOG.warn("Unable to store manor data!", ex);
 			}
 		}
 	}
@@ -428,8 +433,8 @@ public final class CastleManorManager implements IXmlReader, IStorable {
 				ps.addBatch();
 			}
 			ps.executeBatch();
-		} catch (Exception e) {
-			LOG.info("{}: Unable to store manor data!", getClass().getSimpleName(), e);
+		} catch (Exception ex) {
+			LOG.warn("Unable to store manor data!", ex);
 		}
 	}
 	
@@ -443,8 +448,8 @@ public final class CastleManorManager implements IXmlReader, IStorable {
 				ps.addBatch();
 			}
 			ps.executeBatch();
-		} catch (Exception e) {
-			LOG.info("{}: Unable to store manor data!", getClass().getSimpleName(), e);
+		} catch (Exception ex) {
+			LOG.warn("Unable to store manor data!", ex);
 		}
 	}
 	
@@ -563,8 +568,8 @@ public final class CastleManorManager implements IXmlReader, IStorable {
 			ip.executeBatch();
 			
 			return true;
-		} catch (Exception e) {
-			LOG.error("{}: Unable to store manor data!", getClass().getSimpleName(), e);
+		} catch (Exception ex) {
+			LOG.warn("Unable to store manor data!", ex);
 			return false;
 		}
 	}
@@ -590,8 +595,8 @@ public final class CastleManorManager implements IXmlReader, IStorable {
 				// Delete procure
 				dc.setInt(1, castleId);
 				dc.executeUpdate();
-			} catch (Exception e) {
-				LOG.error("{}: Unable to store manor data!", getClass().getSimpleName(), e);
+			} catch (Exception ex) {
+				LOG.warn("Unable to store manor data!", ex);
 			}
 		}
 	}
@@ -619,6 +624,7 @@ public final class CastleManorManager implements IXmlReader, IStorable {
 	// -------------------------------------------------------
 	// Seed methods
 	// -------------------------------------------------------
+	
 	public final List<L2Seed> getCrops() {
 		final List<L2Seed> seeds = new ArrayList<>();
 		final List<Integer> cropIds = new ArrayList<>();
@@ -666,14 +672,11 @@ public final class CastleManorManager implements IXmlReader, IStorable {
 		return null;
 	}
 	
-	// -------------------------------------------------------
-	// Static methods
-	// -------------------------------------------------------
 	public static final CastleManorManager getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final CastleManorManager _instance = new CastleManorManager();
+		protected static final CastleManorManager INSTANCE = new CastleManorManager();
 	}
 }

src/main/java/com/l2jserver/gameserver/instancemanager/ClanHallManager.java

@@ -21,8 +21,9 @@ package com.l2jserver.gameserver.instancemanager;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.l2jserver.commons.database.ConnectionFactory;
 import com.l2jserver.gameserver.data.sql.impl.ClanTable;
@@ -41,7 +42,7 @@ import com.l2jserver.gameserver.model.zone.type.L2ClanHallZone;
  */
 public final class ClanHallManager {
 	
-	private static final Logger _log = Logger.getLogger(ClanHallManager.class.getName());
+	private static final Logger LOG = LoggerFactory.getLogger(ClanHallManager.class);
 	
 	private final Map<Integer, AuctionableHall> _clanHall = new ConcurrentHashMap<>();
 	
@@ -97,11 +98,11 @@ public final class ClanHallManager {
 					AuctionManager.getInstance().initNPC(id);
 				}
 			}
-			_log.info(getClass().getSimpleName() + ": Loaded: " + getClanHalls().size() + " clan halls");
-			_log.info(getClass().getSimpleName() + ": Loaded: " + getFreeClanHalls().size() + " free clan halls");
+			LOG.info("Loaded {} clan halls.", getClanHalls().size());
+			LOG.info("Loaded {} free clan halls.", getFreeClanHalls().size());
 			_loaded = true;
-		} catch (Exception e) {
-			_log.log(Level.WARNING, "Exception: ClanHallManager.load(): " + e.getMessage(), e);
+		} catch (Exception ex) {
+			LOG.warn("There has been an error loading clan halls from database!", ex);
 		}
 	}
 	
@@ -109,9 +110,6 @@ public final class ClanHallManager {
 		return _allClanHalls;
 	}
 	
-	/**
-	 * @return all FreeClanHalls
-	 */
 	public final Map<Integer, AuctionableHall> getFreeClanHalls() {
 		return _freeClanHall;
 	}
@@ -123,9 +121,6 @@ public final class ClanHallManager {
 		return _clanHall;
 	}
 	
-	/**
-	 * @return all ClanHalls
-	 */
 	public final Map<Integer, AuctionableHall> getAllAuctionableClanHalls() {
 		return _allAuctionableClanHalls;
 	}
@@ -134,10 +129,6 @@ public final class ClanHallManager {
 		_allClanHalls.put(hall.getId(), hall);
 	}
 	
-	/**
-	 * @param chId
-	 * @return true is free ClanHall
-	 */
 	public final boolean isFree(int chId) {
 		if (_freeClanHall.containsKey(chId)) {
 			return true;
@@ -145,10 +136,6 @@ public final class ClanHallManager {
 		return false;
 	}
 	
-	/**
-	 * Free a ClanHall
-	 * @param chId
-	 */
 	public final synchronized void setFree(int chId) {
 		_freeClanHall.put(chId, _clanHall.get(chId));
 		ClanTable.getInstance().getClan(_freeClanHall.get(chId).getOwnerId()).setHideoutId(0);
@@ -172,10 +159,6 @@ public final class ClanHallManager {
 		_clanHall.get(chId).setOwner(clan);
 	}
 	
-	/**
-	 * @param clanHallId
-	 * @return Clan Hall by Id
-	 */
 	public final ClanHall getClanHallById(int clanHallId) {
 		return _allClanHalls.get(clanHallId);
 	}
@@ -184,12 +167,6 @@ public final class ClanHallManager {
 		return _allAuctionableClanHalls.get(clanHallId);
 	}
 	
-	/**
-	 * @param x
-	 * @param y
-	 * @param z
-	 * @return Clan Hall by x,y,z
-	 */
 	public final ClanHall getClanHall(int x, int y, int z) {
 		for (ClanHall temp : _allClanHalls.values()) {
 			if (temp.checkIfInZone(x, y, z)) {
@@ -232,10 +209,6 @@ public final class ClanHallManager {
 		return null;
 	}
 	
-	/**
-	 * @param clan
-	 * @return Clan Hall by Owner
-	 */
 	public final AuctionableHall getClanHallByOwner(L2Clan clan) {
 		for (Map.Entry<Integer, AuctionableHall> ch : _clanHall.entrySet()) {
 			if (clan.getId() == ch.getValue().getOwnerId()) {
@@ -252,7 +225,7 @@ public final class ClanHallManager {
 				return ch.getValue();
 			}
 		}
-		for (Map.Entry<Integer, SiegableHall> ch : CHSiegeManager.getInstance().getConquerableHalls().entrySet()) {
+		for (Map.Entry<Integer, SiegableHall> ch : ClanHallSiegeManager.getInstance().getConquerableHalls().entrySet()) {
 			if (clan.getId() == ch.getValue().getOwnerId()) {
 				return ch.getValue();
 			}
@@ -261,10 +234,10 @@ public final class ClanHallManager {
 	}
 	
 	public static ClanHallManager getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final ClanHallManager _instance = new ClanHallManager();
+		protected static final ClanHallManager INSTANCE = new ClanHallManager();
 	}
 }

src/main/java/com/l2jserver/gameserver/instancemanager/CHSiegeManager.java → src/main/java/com/l2jserver/gameserver/instancemanager/ClanHallSiegeManager.java

@@ -20,7 +20,9 @@ package com.l2jserver.gameserver.instancemanager;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.logging.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.l2jserver.commons.database.ConnectionFactory;
 import com.l2jserver.gameserver.config.Config;
@@ -38,15 +40,15 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  * Clan Hall Siege Manager.
  * @author BiggBoss
  */
-public final class CHSiegeManager {
+public final class ClanHallSiegeManager {
 	
-	private static final Logger _log = Logger.getLogger(CHSiegeManager.class.getName());
+	private static final Logger LOG = LoggerFactory.getLogger(ClanHallSiegeManager.class);
 	
 	private static final String SQL_LOAD_HALLS = "SELECT * FROM siegable_clanhall";
 	
 	private final Map<Integer, SiegableHall> _siegableHalls = new HashMap<>();
 	
-	protected CHSiegeManager() {
+	protected ClanHallSiegeManager() {
 		loadClanHalls();
 	}
 	
@@ -73,9 +75,9 @@ public final class CHSiegeManager {
 				_siegableHalls.put(id, hall);
 				ClanHallManager.addClanHall(hall);
 			}
-			_log.info(getClass().getSimpleName() + ": Loaded " + _siegableHalls.size() + " conquerable clan halls.");
-		} catch (Exception e) {
-			_log.warning("CHSiegeManager: Could not load siegable clan halls!:" + e.getMessage());
+			LOG.info("Loaded {} conquerable clan halls.", _siegableHalls.size());
+		} catch (Exception ex) {
+			LOG.warn("Could not load siegable clan halls!", ex);
 		}
 	}
 	
@@ -162,11 +164,11 @@ public final class CHSiegeManager {
 		}
 	}
 	
-	public static CHSiegeManager getInstance() {
-		return SingletonHolder._instance;
+	public static ClanHallSiegeManager getInstance() {
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static final class SingletonHolder {
-		protected static final CHSiegeManager _instance = new CHSiegeManager();
+		protected static final ClanHallSiegeManager INSTANCE = new ClanHallSiegeManager();
 	}
 }

src/main/java/com/l2jserver/gameserver/instancemanager/CursedWeaponsManager.java

@@ -23,11 +23,11 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import javax.xml.parsers.DocumentBuilderFactory;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -56,7 +56,7 @@ import com.l2jserver.gameserver.util.Broadcast;
  */
 public final class CursedWeaponsManager {
 	
-	private static final Logger _log = Logger.getLogger(CursedWeaponsManager.class.getName());
+	private static final Logger LOG = LoggerFactory.getLogger(CursedWeaponsManager.class);
 	
 	private Map<Integer, CursedWeapon> _cursedWeapons;
 	
@@ -74,7 +74,7 @@ public final class CursedWeaponsManager {
 		load();
 		restore();
 		controlPlayers();
-		_log.info(getClass().getSimpleName() + ": Loaded : " + _cursedWeapons.size() + " cursed weapon(s).");
+		LOG.info("Loaded {} cursed weapon(s).", _cursedWeapons.size());
 	}
 	
 	public final void reload() {
@@ -89,7 +89,7 @@ public final class CursedWeaponsManager {
 			
 			File file = new File(Config.DATAPACK_ROOT + "/data/cursedWeapons.xml");
 			if (!file.exists()) {
-				_log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't find data/" + file.getName());
+				LOG.warn("Couldn't find {}!", file.getAbsoluteFile());
 				return;
 			}
 			
@@ -137,10 +137,8 @@ public final class CursedWeaponsManager {
 					}
 				}
 			}
-		} catch (Exception e) {
-			_log.log(Level.SEVERE, "Error parsing cursed weapons file.", e);
-			
-			return;
+		} catch (Exception ex) {
+			LOG.warn("There has been an error parsing cursed weapons file!", ex);
 		}
 	}
 	
@@ -159,8 +157,8 @@ public final class CursedWeaponsManager {
 				cw.setEndTime(rs.getLong("endTime"));
 				cw.reActivate();
 			}
-		} catch (Exception e) {
-			_log.log(Level.WARNING, "Could not restore CursedWeapons data: " + e.getMessage(), e);
+		} catch (Exception ex) {
+			LOG.warn("Could not restore cursed weapons data!", ex);
 		}
 	}
 	
@@ -187,14 +185,14 @@ public final class CursedWeaponsManager {
 					if (rset.next()) {
 						// A player has the cursed weapon in his inventory ...
 						int playerId = rset.getInt("owner_id");
-						_log.info("PROBLEM : Player " + playerId + " owns the cursed weapon " + itemId + " but he shouldn't.");
+						LOG.warn("Player {} owns the cursed weapon {} but he shouldn't!", playerId, itemId);
 						
 						// Delete the item
 						try (var delete = con.prepareStatement("DELETE FROM items WHERE owner_id=? AND item_id=?")) {
 							delete.setInt(1, playerId);
 							delete.setInt(2, itemId);
 							if (delete.executeUpdate() != 1) {
-								_log.warning("Error while deleting cursed weapon " + itemId + " from userId " + playerId);
+								LOG.warn("There has been an error while deleting cursed weapon {} from player Id {}!", itemId, playerId);
 							}
 						}
 						
@@ -204,7 +202,7 @@ public final class CursedWeaponsManager {
 							update.setInt(2, cw.getPlayerPkKills());
 							update.setInt(3, playerId);
 							if (update.executeUpdate() != 1) {
-								_log.warning("Error while updating karma & pkkills for userId " + cw.getPlayerId());
+								LOG.warn("There has been an error while updating karma & pkkills for player Id {}!", cw.getPlayerId());
 							}
 						}
 						// clean up the cursed weapons table.
@@ -213,8 +211,8 @@ public final class CursedWeaponsManager {
 				}
 				ps.clearParameters();
 			}
-		} catch (Exception e) {
-			_log.log(Level.WARNING, "Could not check CursedWeapons data: " + e.getMessage(), e);
+		} catch (Exception ex) {
+			LOG.warn("Could not check cursed weapons data!", ex);
 		}
 	}
 	
@@ -317,8 +315,8 @@ public final class CursedWeaponsManager {
 			var ps = con.prepareStatement("DELETE FROM cursed_weapons WHERE itemId = ?")) {
 			ps.setInt(1, itemId);
 			ps.executeUpdate();
-		} catch (Exception e) {
-			_log.log(Level.SEVERE, "CursedWeaponsManager: Failed to remove data: " + e.getMessage(), e);
+		} catch (Exception ex) {
+			LOG.warn("Failed to remove cursed weapon Id {}!", itemId, ex);
 		}
 	}
 	

src/main/java/com/l2jserver/gameserver/instancemanager/DayNightSpawnManager.java

@@ -22,8 +22,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.l2jserver.gameserver.GameTimeController;
 import com.l2jserver.gameserver.model.L2Spawn;
@@ -35,17 +36,13 @@ import com.l2jserver.gameserver.model.actor.instance.L2RaidBossInstance;
  */
 public final class DayNightSpawnManager {
 	
-	private static Logger _log = Logger.getLogger(DayNightSpawnManager.class.getName());
+	private static final Logger LOG = LoggerFactory.getLogger(DayNightSpawnManager.class);
 	
 	private final List<L2Spawn> _dayCreatures = new ArrayList<>();
-	private final List<L2Spawn> _nightCreatures = new ArrayList<>();
-	private final Map<L2Spawn, L2RaidBossInstance> _bosses = new ConcurrentHashMap<>();
 	
-	// private static int _currentState; // 0 = Day, 1 = Night
+	private final List<L2Spawn> _nightCreatures = new ArrayList<>();
 	
-	public static DayNightSpawnManager getInstance() {
-		return SingletonHolder._instance;
-	}
+	private final Map<L2Spawn, L2RaidBossInstance> _bosses = new ConcurrentHashMap<>();
 	
 	protected DayNightSpawnManager() {
 		// Prevent external initialization.
@@ -77,10 +74,10 @@ public final class DayNightSpawnManager {
 	 * Manage Spawn/Respawn
 	 * @param unSpawnCreatures List with spawns must be unspawned
 	 * @param spawnCreatures List with spawns must be spawned
-	 * @param UnspawnLogInfo String for log info for unspawned L2NpcInstance
-	 * @param SpawnLogInfo String for log info for spawned L2NpcInstance
+	 * @param unspawnLogInfo String for log info for unspawned L2NpcInstance
+	 * @param spawnLogInfo String for log info for spawned L2NpcInstance
 	 */
-	private void spawnCreatures(List<L2Spawn> unSpawnCreatures, List<L2Spawn> spawnCreatures, String UnspawnLogInfo, String SpawnLogInfo) {
+	private void spawnCreatures(List<L2Spawn> unSpawnCreatures, List<L2Spawn> spawnCreatures, String unspawnLogInfo, String spawnLogInfo) {
 		try {
 			if (!unSpawnCreatures.isEmpty()) {
 				int i = 0;
@@ -96,7 +93,7 @@ public final class DayNightSpawnManager {
 						i++;
 					}
 				}
-				_log.info("DayNightSpawnManager: Removed " + i + " " + UnspawnLogInfo + " creatures");
+				LOG.info("Removed {} {} creatures.", i, unspawnLogInfo);
 			}
 			
 			int i = 0;
@@ -109,9 +106,9 @@ public final class DayNightSpawnManager {
 				i++;
 			}
 			
-			_log.info("DayNightSpawnManager: Spawned " + i + " " + SpawnLogInfo + " creatures");
-		} catch (Exception e) {
-			_log.log(Level.WARNING, "Error while spawning creatures: " + e.getMessage(), e);
+			LOG.info("Spawned {} {} creatures.", i, spawnLogInfo);
+		} catch (Exception ex) {
+			LOG.warn("There has been an error while spawning creatures!", ex);
 		}
 	}
 	
@@ -129,9 +126,6 @@ public final class DayNightSpawnManager {
 				spawnNightCreatures();
 				specialNightBoss(1);
 				break;
-			default:
-				_log.warning("DayNightSpawnManager: Wrong mode sent");
-				break;
 		}
 	}
 	
@@ -142,14 +136,10 @@ public final class DayNightSpawnManager {
 	}
 	
 	public void notifyChangeMode() {
-		try {
-			if (GameTimeController.getInstance().isNight()) {
-				changeMode(1);
-			} else {
-				changeMode(0);
-			}
-		} catch (Exception e) {
-			_log.log(Level.WARNING, "Error while notifyChangeMode(): " + e.getMessage(), e);
+		if (GameTimeController.getInstance().isNight()) {
+			changeMode(1);
+		} else {
+			changeMode(0);
 		}
 	}
 	
@@ -161,9 +151,8 @@ public final class DayNightSpawnManager {
 	
 	private void specialNightBoss(int mode) {
 		try {
-			L2RaidBossInstance boss;
 			for (L2Spawn spawn : _bosses.keySet()) {
-				boss = _bosses.get(spawn);
+				var boss = _bosses.get(spawn);
 				if ((boss == null) && (mode == 1)) {
 					boss = (L2RaidBossInstance) spawn.doSpawn();
 					RaidBossSpawnManager.getInstance().notifySpawnNightBoss(boss);
@@ -180,8 +169,8 @@ public final class DayNightSpawnManager {
 				}
 				return;
 			}
-		} catch (Exception e) {
-			_log.log(Level.WARNING, "Error while specialNoghtBoss(): " + e.getMessage(), e);
+		} catch (Exception ex) {
+			LOG.warn("There has been an error while spawning special night boss!", ex);
 		}
 	}
 	
@@ -189,32 +178,36 @@ public final class DayNightSpawnManager {
 		switch (mode) {
 			case 0:
 				boss.deleteMe();
-				_log.info(getClass().getSimpleName() + ": Deleting Hellman raidboss");
+				LOG.info("Deleting Hellman raidboss.");
 				break;
 			case 1:
 				if (!boss.isVisible()) {
 					boss.spawnMe();
 				}
-				_log.info(getClass().getSimpleName() + ": Spawning Hellman raidboss");
+				LOG.info("Spawning Hellman raidboss.");
 				break;
 		}
 	}
 	
-	public L2RaidBossInstance handleBoss(L2Spawn spawnDat) {
-		if (_bosses.containsKey(spawnDat)) {
-			return _bosses.get(spawnDat);
+	public L2RaidBossInstance handleBoss(L2Spawn bossSpawn) {
+		if (_bosses.containsKey(bossSpawn)) {
+			return _bosses.get(bossSpawn);
 		}
 		
 		if (GameTimeController.getInstance().isNight()) {
-			L2RaidBossInstance raidboss = (L2RaidBossInstance) spawnDat.doSpawn();
-			_bosses.put(spawnDat, raidboss);
+			L2RaidBossInstance raidboss = (L2RaidBossInstance) bossSpawn.doSpawn();
+			_bosses.put(bossSpawn, raidboss);
 			
 			return raidboss;
 		}
 		return null;
 	}
 	
+	public static DayNightSpawnManager getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
 	private static class SingletonHolder {
-		protected static final DayNightSpawnManager _instance = new DayNightSpawnManager();
+		protected static final DayNightSpawnManager INSTANCE = new DayNightSpawnManager();
 	}
 }

src/main/java/com/l2jserver/gameserver/instancemanager/DimensionalRiftManager.java

@@ -23,11 +23,11 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import javax.xml.parsers.DocumentBuilderFactory;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -51,7 +51,7 @@ import com.l2jserver.util.Rnd;
  */
 public final class DimensionalRiftManager {
 	
-	private static final Logger _log = Logger.getLogger(DimensionalRiftManager.class.getName());
+	private static final Logger LOG = LoggerFactory.getLogger(DimensionalRiftManager.class);
 	
 	private final Map<Byte, Map<Byte, DimensionalRiftRoom>> _rooms = new HashMap<>(7);
 	
@@ -97,8 +97,8 @@ public final class DimensionalRiftManager {
 				
 				_rooms.get(type).put(room_id, new DimensionalRiftRoom(type, room_id, xMin, xMax, yMin, yMax, z1, z2, xT, yT, zT, isBossRoom));
 			}
-		} catch (Exception e) {
-			_log.log(Level.WARNING, "Can't load Dimension Rift zones. " + e.getMessage(), e);
+		} catch (Exception ex) {
+			LOG.warn("Can not load Dimension Rift zones!", ex);
 		}
 		
 		int typeSize = _rooms.keySet().size();
@@ -108,7 +108,7 @@ public final class DimensionalRiftManager {
 			roomSize += _rooms.get(b).keySet().size();
 		}
 		
-		_log.info(getClass().getSimpleName() + ": Loaded " + typeSize + " room types with " + roomSize + " rooms.");
+		LOG.info("Loaded {} room types with {} rooms.", typeSize, roomSize);
 	}
 	
 	public void loadSpawns() {
@@ -120,7 +120,7 @@ public final class DimensionalRiftManager {
 			
 			File file = new File(Config.DATAPACK_ROOT, "data/dimensionalRift.xml");
 			if (!file.exists()) {
-				_log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't find data/" + file.getName());
+				LOG.warn("Could not find file {}!", file.getAbsoluteFile());
 				return;
 			}
 			
@@ -149,9 +149,9 @@ public final class DimensionalRiftManager {
 											count = Integer.parseInt(attrs.getNamedItem("count").getNodeValue());
 											
 											if (!_rooms.containsKey(type)) {
-												_log.warning("Type " + type + " not found!");
+												LOG.warn("Type {} not found!", type);
 											} else if (!_rooms.get(type).containsKey(roomId)) {
-												_log.warning("Room " + roomId + " in Type " + type + " not found!");
+												LOG.warn("Room {} in type {} not found!", roomId, type);
 											}
 											
 											for (int i = 0; i < count; i++) {
@@ -183,10 +183,15 @@ public final class DimensionalRiftManager {
 					}
 				}
 			}
-		} catch (Exception e) {
-			_log.log(Level.WARNING, "Error on loading dimensional rift spawns: " + e.getMessage(), e);
+		} catch (Exception ex) {
+			LOG.warn("There was an error on loading Dimensional Rift spawns!", ex);
+		}
+		
+		LOG.info("Loaded {} Dimensional Rift spawns.", countGood);
+		
+		if (countBad > 0) {
+			LOG.warn("There has been {} errors in DImensinal Rift spawns!", countBad);
 		}
-		_log.info(getClass().getSimpleName() + ": Loaded " + countGood + " dimensional rift spawns, " + countBad + " errors.");
 	}
 	
 	public void reload() {
@@ -365,7 +370,7 @@ public final class DimensionalRiftManager {
 	public void handleCheat(L2PcInstance player, L2Npc npc) {
 		showHtmlFile(player, "data/html/seven_signs/rift/Cheater.htm", npc);
 		if (!player.isGM()) {
-			_log.warning("Player " + player.getName() + "(" + player.getObjectId() + ") was cheating in dimension rift area!");
+			LOG.warn("Player {} was cheating in dimension rift area!", player);
 			Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " tried to cheat in dimensional rift.", Config.DEFAULT_PUNISH);
 		}
 	}

src/main/java/com/l2jserver/gameserver/instancemanager/FortManager.java

@@ -20,8 +20,9 @@ package com.l2jserver.gameserver.instancemanager;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.l2jserver.commons.database.ConnectionFactory;
 import com.l2jserver.gameserver.InstanceListManager;
@@ -31,7 +32,7 @@ import com.l2jserver.gameserver.model.entity.Fort;
 
 public final class FortManager implements InstanceListManager {
 	
-	private static final Logger _log = Logger.getLogger(FortManager.class.getName());
+	private static final Logger LOG = LoggerFactory.getLogger(FortManager.class);
 	
 	private final List<Fort> _forts = new ArrayList<>();
 	
@@ -138,12 +139,13 @@ public final class FortManager implements InstanceListManager {
 				_forts.add(new Fort(rs.getInt("id")));
 			}
 			
-			_log.info(getClass().getSimpleName() + ": Loaded: " + _forts.size() + " fortress");
+			LOG.info("Loaded {} fortress.", _forts.size());
+			
 			for (Fort fort : _forts) {
 				fort.getSiege().getSiegeGuardManager().loadSiegeGuard();
 			}
-		} catch (Exception e) {
-			_log.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e);
+		} catch (Exception ex) {
+			LOG.warn("There has been an error loading fort instances!", ex);
 		}
 	}
 	

src/main/java/com/l2jserver/gameserver/instancemanager/FourSepulchersManager.java

@@ -28,8 +28,9 @@ import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ScheduledFuture;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.l2jserver.gameserver.config.Config;
 import com.l2jserver.commons.database.ConnectionFactory;
@@ -61,7 +62,7 @@ import com.l2jserver.util.Rnd;
  */
 public final class FourSepulchersManager {
 	
-	private static final Logger LOG = Logger.getLogger(FourSepulchersManager.class.getName());
+	private static final Logger LOG = LoggerFactory.getLogger(FourSepulchersManager.class);
 	
 	private static final int QUEST_ID = 620;
 	
@@ -201,22 +202,22 @@ public final class FourSepulchersManager {
 		{
 			clean();
 			_changeEntryTimeTask = ThreadPoolManager.getInstance().scheduleGeneral(new FourSepulchersChangeEntryTimeTask(), 0);
-			LOG.info(getClass().getSimpleName() + ": Beginning in Entry time");
+			LOG.info("Beginning in entry time");
 		} else if ((currentTime >= _entryTimeEnd) && (currentTime < _warmUpTimeEnd)) // warmup time check
 		{
 			clean();
 			_changeWarmUpTimeTask = ThreadPoolManager.getInstance().scheduleGeneral(new FourSepulchersChangeWarmUpTimeTask(), 0);
-			LOG.info(getClass().getSimpleName() + ": Beginning in WarmUp time");
+			LOG.info("Beginning in warm-up time.");
 		} else if ((currentTime >= _warmUpTimeEnd) && (currentTime < _attackTimeEnd)) // attack time check
 		{
 			clean();
 			_changeAttackTimeTask = ThreadPoolManager.getInstance().scheduleGeneral(new FourSepulchersChangeAttackTimeTask(), 0);
-			LOG.info(getClass().getSimpleName() + ": Beginning in Attack time");
+			LOG.info("Beginning in attack time.");
 		} else
 		// else cooldown time and without cleanup because it's already implemented
 		{
 			_changeCoolDownTimeTask = ThreadPoolManager.getInstance().scheduleGeneral(new FourSepulchersChangeCoolDownTimeTask(), 0);
-			LOG.info(getClass().getSimpleName() + ": Beginning in Cooldown time");
+			LOG.info("Beginning in cooldown time.");
 		}
 	}
 	
@@ -236,11 +237,11 @@ public final class FourSepulchersManager {
 	public void clean() {
 		for (int i = 31921; i < 31925; i++) {
 			if (!_startHallSpawns.containsKey(i)) {
-				LOG.warning("[" + i + "] is not inside " + _startHallSpawns);
+				LOG.warn("NPC Id {} is not inside {}!", i, _startHallSpawns);
 				continue;
 			}
-			int[] Location = _startHallSpawns.get(i);
-			GrandBossManager.getInstance().getZone(Location[0], Location[1], Location[2]).oustAllPlayers();
+			int[] location = _startHallSpawns.get(i);
+			GrandBossManager.getInstance().getZone(location[0], location[1], location[2]).oustAllPlayers();
 		}
 		
 		deleteAllMobs();
@@ -296,9 +297,9 @@ public final class FourSepulchersManager {
 				SpawnTable.getInstance().addNewSpawn(spawnDat, false);
 				spawnDat.doSpawn();
 				spawnDat.startRespawn();
-				LOG.info(getClass().getSimpleName() + ": spawned " + spawnDat.getTemplate().getName());
-			} catch (Exception e) {
-				LOG.log(Level.WARNING, "Error while spawning managers: " + e.getMessage(), e);
+				LOG.info("Spawned {}.", spawnDat.getTemplate().getName());
+			} catch (Exception ex) {
+				LOG.warn("There has been an error while spawning managers!", ex);
 			}
 		}
 	}
@@ -405,9 +406,9 @@ public final class FourSepulchersManager {
 					_mysteriousBoxSpawns.put(keyNpcId, spawnDat);
 				}
 			}
-			LOG.info(getClass().getSimpleName() + ": loaded " + _mysteriousBoxSpawns.size() + " Mysterious-Box spawns.");
-		} catch (Exception e) {
-			LOG.log(Level.WARNING, "FourSepulchersManager.LoadMysteriousBox: Spawn could not be initialized: " + e.getMessage(), e);
+			LOG.info("Loaded {} Mysterious-Box spawns.", _mysteriousBoxSpawns.size());
+		} catch (Exception ex) {
+			LOG.warn("Misterious-Boc spawn could not be initialized!", ex);
 		}
 	}
 	
@@ -423,8 +424,8 @@ public final class FourSepulchersManager {
 				spawnDat.setRespawnDelay(3600);
 				SpawnTable.getInstance().addNewSpawn(spawnDat, false);
 				_keyBoxSpawns.put(keyNpc.getKey(), spawnDat);
-			} catch (Exception e) {
-				LOG.log(Level.WARNING, "FourSepulchersManager.InitKeyBoxSpawns: Spawn could not be initialized: " + e.getMessage(), e);
+			} catch (Exception ex) {
+				LOG.warn("Key Box spawn could not be initialized!", ex);
 			}
 		}
 	}
@@ -462,9 +463,9 @@ public final class FourSepulchersManager {
 					_physicalMonsters.put(keyNpcId, _physicalSpawns);
 				}
 			}
-			LOG.info(getClass().getSimpleName() + ": loaded " + loaded + " Physical type monsters spawns.");
-		} catch (Exception e) {
-			LOG.log(Level.WARNING, "FourSepulchersManager.LoadPhysicalMonsters: Spawn could not be initialized: " + e.getMessage(), e);
+			LOG.info("Loaded {} Physical type monsters spawns.", loaded);
+		} catch (Exception ex) {
+			LOG.warn("Physical monsters spawn could not be initialized!", ex);
 		}
 	}
 	
@@ -502,9 +503,9 @@ public final class FourSepulchersManager {
 					_magicalMonsters.put(keyNpcId, _magicalSpawns);
 				}
 			}
-			LOG.info(getClass().getSimpleName() + ": loaded " + loaded + " Magical type monsters spawns.");
-		} catch (Exception e) {
-			LOG.log(Level.WARNING, "FourSepulchersManager.LoadMagicalMonsters: Spawn could not be initialized: " + e.getMessage(), e);
+			LOG.info("Loaded {} Magical monsters spawns.", loaded);
+		} catch (Exception ex) {
+			LOG.warn("Magical monsters spawn could not be initialized!", ex);
 		}
 	}
 	
@@ -546,9 +547,9 @@ public final class FourSepulchersManager {
 					_archonSpawned.put(keyNpcId, false);
 				}
 			}
-			LOG.info(getClass().getSimpleName() + ": loaded " + loaded + " Church of duke monsters spawns.");
-		} catch (Exception e) {
-			LOG.log(Level.WARNING, "FourSepulchersManager.LoadDukeMonsters: Spawn could not be initialized: " + e.getMessage(), e);
+			LOG.info("Loaded {} Church of duke monsters spawns.", loaded);
+		} catch (Exception ex) {
+			LOG.warn("Duke monsters spawn could not be initialized", ex);
 		}
 	}
 	
@@ -586,9 +587,9 @@ public final class FourSepulchersManager {
 					_emperorsGraveNpcs.put(keyNpcId, _emperorsGraveSpawns);
 				}
 			}
-			LOG.info(getClass().getSimpleName() + ": loaded " + loaded + " Emperor's grave NPC spawns.");
-		} catch (Exception e) {
-			LOG.log(Level.WARNING, "FourSepulchersManager.LoadEmperorsGraveMonsters: Spawn could not be initialized: " + e.getMessage(), e);
+			LOG.info("Loaded {} Emperor's Grave spawns.", loaded);
+		} catch (Exception ex) {
+			LOG.warn("Emperor's Grave spawns could not be initialized!", ex);
 		}
 	}
 	
@@ -613,8 +614,8 @@ public final class FourSepulchersManager {
 				spawnDat.setHeading(_shadowSpawnLoc[locNo][i][4]);
 				SpawnTable.getInstance().addNewSpawn(spawnDat, false);
 				_shadowSpawns.put(gateKeeper[i], spawnDat);
-			} catch (Exception e) {
-				LOG.log(Level.SEVERE, "Error on InitLocationShadowSpawns", e);
+			} catch (Exception ex) {
+				LOG.warn("There has been an error spawning shadows!", ex);
 			}
 		}
 	}
@@ -631,8 +632,8 @@ public final class FourSepulchersManager {
 				spawnDat.setRespawnDelay(3600);
 				SpawnTable.getInstance().addNewSpawn(spawnDat, false);
 				_executionerSpawns.put(keyNpcId, spawnDat);
-			} catch (Exception e) {
-				LOG.log(Level.WARNING, "FourSepulchersManager.InitExecutionerSpawns: Spawn could not be initialized: " + e.getMessage(), e);
+			} catch (Exception ex) {
+				LOG.warn("Executioner spawns could not be initialized!", ex);
 			}
 		}
 	}
@@ -740,9 +741,10 @@ public final class FourSepulchersManager {
 	public synchronized void tryEntry(L2Npc npc, L2PcInstance player) {
 		Quest hostQuest = QuestManager.getInstance().getQuest(QUEST_ID);
 		if (hostQuest == null) {
-			LOG.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't find quest: " + QUEST_ID);
+			LOG.warn("Could not find quest Id {}!", QUEST_ID);
 			return;
 		}
+		
 		int npcId = npc.getId();
 		switch (npcId) {
 			// ID ok
@@ -752,12 +754,13 @@ public final class FourSepulchersManager {
 			case 31924:
 				break;
 			// ID not ok
-			default:
+			default: {
 				if (!player.isGM()) {
-					LOG.warning("Player " + player.getName() + "(" + player.getObjectId() + ") tried to cheat in four sepulchers.");
+					LOG.warn("Player {} tried to cheat in four sepulchers.", player);
 					Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " tried to enter four sepulchers with invalid npc id.", Config.DEFAULT_PUNISH);
 				}
 				return;
+			}
 		}
 		
 		if (_hallInUse.get(npcId).booleanValue()) {
@@ -979,8 +982,8 @@ public final class FourSepulchersManager {
 						SpawnTable.getInstance().addNewSpawn(keyBoxMobSpawn, false);
 						mob = (L2SepulcherMonsterInstance) keyBoxMobSpawn.doSpawn();
 						keyBoxMobSpawn.stopRespawn();
-					} catch (Exception e) {
-						LOG.log(Level.WARNING, "FourSepulchersManager.SpawnMonster: Spawn could not be initialized: " + e.getMessage(), e);
+					} catch (Exception ex) {
+						LOG.warn("Monster spawns could not be initialized!", ex);
 					}
 					
 					spawnedKeyBoxMob = true;
@@ -1171,8 +1174,8 @@ public final class FourSepulchersManager {
 					mob.getSpawn().stopRespawn();
 				}
 				mob.deleteMe();
-			} catch (Exception e) {
-				LOG.log(Level.SEVERE, getClass().getSimpleName() + ": Failed deleting mob.", e);
+			} catch (Exception ex) {
+				LOG.warn("Failed deleting mob!", ex);
 			}
 		}
 		_allMobs.clear();
@@ -1185,10 +1188,10 @@ public final class FourSepulchersManager {
 				if (door != null) {
 					door.closeMe();
 				} else {
-					LOG.warning(getClass().getSimpleName() + ": Attempted to close undefined door. doorId: " + doorId);
+					LOG.warn("Attempted to close undefined door Id {}!", doorId);
 				}
-			} catch (Exception e) {
-				LOG.log(Level.SEVERE, getClass().getSimpleName() + ": Failed closing door", e);
+			} catch (Exception ex) {
+				LOG.warn("Failed closing door Id {}!", doorId, ex);
 			}
 		}
 	}
@@ -1285,13 +1288,15 @@ public final class FourSepulchersManager {
 			
 			for (L2Spawn temp : _managers) {
 				if (temp == null) {
-					LOG.warning(getClass().getSimpleName() + ": managerSay(): manager is null");
+					LOG.warn("Manager is null on attack time!");
 					continue;
 				}
+				
 				if (!(temp.getLastSpawn() instanceof L2SepulcherNpcInstance)) {
-					LOG.warning(getClass().getSimpleName() + ": managerSay(): manager is not Sepulcher instance");
+					LOG.warn("Manager is not Sepulcher instance on attack time!");
 					continue;
 				}
+				
 				// hall not used right now, so its manager will not tell you anything :)
 				// if you don't need this - delete next two lines.
 				if (!_hallInUse.get(temp.getId()).booleanValue()) {
@@ -1307,11 +1312,11 @@ public final class FourSepulchersManager {
 			NpcStringId msg2 = NpcStringId.IF_YOU_PLACE_YOUR_HAND_ON_THE_STONE_STATUE_IN_FRONT_OF_EACH_SEPULCHER_YOU_WILL_BE_ABLE_TO_ENTER;
 			for (L2Spawn temp : _managers) {
 				if (temp == null) {
-					LOG.warning(getClass().getSimpleName() + ": Something goes wrong in managerSay()...");
+					LOG.warn("Manager is null on entry time!");
 					continue;
 				}
 				if (!(temp.getLastSpawn() instanceof L2SepulcherNpcInstance)) {
-					LOG.warning(getClass().getSimpleName() + ": Something goes wrong in managerSay()...");
+					LOG.warn("Manager is not Sepulcher instance on entry time!");
 					continue;
 				}
 				((L2SepulcherNpcInstance) temp.getLastSpawn()).sayInShout(msg1);

src/main/java/com/l2jserver/gameserver/instancemanager/MailManager.java

@@ -23,8 +23,9 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.l2jserver.commons.database.ConnectionFactory;
 import com.l2jserver.gameserver.ThreadPoolManager;
@@ -36,11 +37,12 @@ import com.l2jserver.gameserver.model.entity.Message;
 import com.l2jserver.gameserver.network.serverpackets.ExNoticePostArrived;
 
 /**
+ * Mail Manager.
  * @author Migi, DS
  */
 public final class MailManager {
 	
-	private static final Logger _log = Logger.getLogger(MailManager.class.getName());
+	private static final Logger LOG = LoggerFactory.getLogger(MailManager.class);
 	
 	private final Map<Integer, Message> _messages = new ConcurrentHashMap<>();
 	
@@ -69,10 +71,10 @@ public final class MailManager {
 					ThreadPoolManager.getInstance().scheduleGeneral(new MessageDeletionTask(msgId), expiration - System.currentTimeMillis());
 				}
 			}
-		} catch (Exception e) {
-			_log.log(Level.WARNING, getClass().getSimpleName() + ": Error loading from database:" + e.getMessage(), e);
+		} catch (Exception ex) {
+			LOG.warn("There has been an error loading from database!", ex);
 		}
-		_log.info(getClass().getSimpleName() + ": Successfully loaded " + count + " messages.");
+		LOG.info("Successfully loaded {} messages.", count);
 	}
 	
 	public final Message getMessage(int msgId) {
@@ -138,8 +140,8 @@ public final class MailManager {
 		try (var con = ConnectionFactory.getInstance().getConnection();
 			var ps = Message.getStatement(msg, con)) {
 			ps.execute();
-		} catch (Exception e) {
-			_log.log(Level.WARNING, getClass().getSimpleName() + ": Error saving message:" + e.getMessage(), e);
+		} catch (Exception ex) {
+			LOG.warn("There has been an error saving message Id {}!", msg.getId(), ex);
 		}
 		
 		final L2PcInstance receiver = L2World.getInstance().getPlayer(msg.getReceiverId());
@@ -155,8 +157,8 @@ public final class MailManager {
 			var ps = con.prepareStatement("UPDATE messages SET isUnread = 'false' WHERE messageId = ?")) {
 			ps.setInt(1, msgId);
 			ps.execute();
-		} catch (Exception e) {
-			_log.log(Level.WARNING, getClass().getSimpleName() + ": Error marking as read message:" + e.getMessage(), e);
+		} catch (Exception ex) {
+			LOG.warn("There has been an error marking as read message Id {}!", msgId, ex);
 		}
 	}
 	
@@ -165,8 +167,8 @@ public final class MailManager {
 			var ps = con.prepareStatement("UPDATE messages SET isDeletedBySender = 'true' WHERE messageId = ?")) {
 			ps.setInt(1, msgId);
 			ps.execute();
-		} catch (Exception e) {
-			_log.log(Level.WARNING, getClass().getSimpleName() + ": Error marking as deleted by sender message:" + e.getMessage(), e);
+		} catch (Exception ex) {
+			LOG.warn("There has been an error marking as deleted by sender message Id {}!", msgId, ex);
 		}
 	}
 	
@@ -175,8 +177,8 @@ public final class MailManager {
 			var ps = con.prepareStatement("UPDATE messages SET isDeletedByReceiver = 'true' WHERE messageId = ?")) {
 			ps.setInt(1, msgId);
 			ps.execute();
-		} catch (Exception e) {
-			_log.log(Level.WARNING, getClass().getSimpleName() + ": Error marking as deleted by receiver message:" + e.getMessage(), e);
+		} catch (Exception ex) {
+			LOG.warn("There has been an error marking as deleted by receiver message Id {}!", msgId, ex);
 		}
 	}
 	
@@ -185,8 +187,8 @@ public final class MailManager {
 			var ps = con.prepareStatement("UPDATE messages SET hasAttachments = 'false' WHERE messageId = ?")) {
 			ps.setInt(1, msgId);
 			ps.execute();
-		} catch (Exception e) {
-			_log.log(Level.WARNING, getClass().getSimpleName() + ": Error removing attachments in message:" + e.getMessage(), e);
+		} catch (Exception ex) {
+			LOG.warn("There has been an error removing attachments in message Id {}!", msgId, ex);
 		}
 	}
 	
@@ -195,23 +197,19 @@ public final class MailManager {
 			var ps = con.prepareStatement("DELETE FROM messages WHERE messageId = ?")) {
 			ps.setInt(1, msgId);
 			ps.execute();
-		} catch (Exception e) {
-			_log.log(Level.WARNING, getClass().getSimpleName() + ": Error deleting message:" + e.getMessage(), e);
+		} catch (Exception ex) {
+			LOG.warn("There has been an error deleting message Id {}!", msgId, ex);
 		}
 		
 		_messages.remove(msgId);
 		IdFactory.getInstance().releaseId(msgId);
 	}
 	
-	/**
-	 * Gets the single instance of {@code MailManager}.
-	 * @return single instance of {@code MailManager}
-	 */
 	public static MailManager getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final MailManager _instance = new MailManager();
+		protected static final MailManager INSTANCE = new MailManager();
 	}
 }

src/main/java/com/l2jserver/gameserver/instancemanager/MercTicketManager.java

@@ -20,8 +20,9 @@ package com.l2jserver.gameserver.instancemanager;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.l2jserver.commons.database.ConnectionFactory;
 import com.l2jserver.gameserver.data.xml.impl.NpcData;
@@ -43,7 +44,7 @@ import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
  */
 public final class MercTicketManager {
 	
-	private static final Logger _log = Logger.getLogger(MercTicketManager.class.getName());
+	private static final Logger LOG = LoggerFactory.getLogger(MercTicketManager.class);
 	
 	private static final List<L2ItemInstance> DROPPED_TICKETS = new CopyOnWriteArrayList<>();
 	
@@ -183,9 +184,9 @@ public final class MercTicketManager {
 			rs.close();
 			s.close();
 			
-			_log.info(getClass().getSimpleName() + ": Loaded: " + DROPPED_TICKETS.size() + " Mercenary Tickets");
-		} catch (Exception e) {
-			_log.log(Level.WARNING, "Exception: loadMercenaryData(): " + e.getMessage(), e);
+			LOG.info("Loaded {} mercenary tickets.", DROPPED_TICKETS.size());
+		} catch (Exception ex) {
+			LOG.warn("There has been an error loading mercenary tickets!", ex);
 		}
 	}
 	

src/main/java/com/l2jserver/gameserver/instancemanager/PunishmentManager.java

@@ -20,8 +20,9 @@ package com.l2jserver.gameserver.instancemanager;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.l2jserver.commons.database.ConnectionFactory;
 import com.l2jserver.gameserver.model.holders.PunishmentHolder;
@@ -35,7 +36,7 @@ import com.l2jserver.gameserver.model.punishment.PunishmentType;
  */
 public final class PunishmentManager {
 	
-	private static final Logger _log = Logger.getLogger(PunishmentManager.class.getName());
+	private static final Logger LOG = LoggerFactory.getLogger(PunishmentManager.class);
 	
 	private final Map<PunishmentAffect, PunishmentHolder> _tasks = new ConcurrentHashMap<>();
 	
@@ -73,11 +74,11 @@ public final class PunishmentManager {
 					}
 				}
 			}
-		} catch (Exception e) {
-			_log.log(Level.WARNING, getClass().getSimpleName() + ": Error while loading punishments: ", e);
+		} catch (Exception ex) {
+			LOG.warn("There has been an error while loading punishments!", ex);
 		}
 		
-		_log.log(Level.INFO, getClass().getSimpleName() + ": Loaded " + initiated + " active and " + expired + " expired punishments.");
+		LOG.info("Loaded {} active and {} expired punishments.", initiated, expired);
 	}
 	
 	public void startPunishment(PunishmentTask task) {

src/main/java/com/l2jserver/gameserver/instancemanager/QuestManager.java

@@ -21,8 +21,9 @@ package com.l2jserver.gameserver.instancemanager;
 import java.io.File;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.l2jserver.gameserver.config.Config;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -35,7 +36,8 @@ import com.l2jserver.util.Util;
  * @author Zoey76
  */
 public final class QuestManager extends ScriptManager<Quest> {
-	protected static final Logger _log = Logger.getLogger(QuestManager.class.getName());
+	
+	private static final Logger LOG = LoggerFactory.getLogger(QuestManager.class);
 	
 	/** Map containing all the quests. */
 	private final Map<String, Quest> _quests = new ConcurrentHashMap<>();
@@ -72,7 +74,7 @@ public final class QuestManager extends ScriptManager<Quest> {
 	 * Unload all quests and scripts and load scripts.cfg.
 	 */
 	public void reloadAllScripts() {
-		_log.info(getClass().getSimpleName() + ": Reloading all server scripts.");
+		LOG.info("Reloading all server scripts.");
 		
 		// Unload quests.
 		for (Quest quest : _quests.values()) {
@@ -93,19 +95,16 @@ public final class QuestManager extends ScriptManager<Quest> {
 		
 		try {
 			ScriptEngineManager.getInstance().executeScriptList(new File(Config.DATAPACK_ROOT, "data/scripts.cfg"));
-		} catch (Exception e) {
-			_log.log(Level.SEVERE, getClass().getSimpleName() + ": Failed loading scripts.cfg, no script going to be loaded!", e);
+		} catch (Exception ex) {
+			LOG.warn("Failed loading scripts.cfg, no script going to be loaded!", ex);
 		}
 		
-		QuestManager.getInstance().report();
+		report();
 	}
 	
-	/**
-	 * Logs how many quests and scripts are loaded.
-	 */
 	public void report() {
-		_log.info(getClass().getSimpleName() + ": Loaded: " + _quests.size() + " quests.");
-		_log.info(getClass().getSimpleName() + ": Loaded: " + _scripts.size() + " scripts.");
+		LOG.info("Loaded {} quests.", _quests.size());
+		LOG.info("Loaded {} scripts.", _scripts.size());
 	}
 	
 	/**
@@ -171,13 +170,13 @@ public final class QuestManager extends ScriptManager<Quest> {
 		final Quest old = _quests.put(quest.getName(), quest);
 		if (old != null) {
 			old.unload();
-			_log.info(getClass().getSimpleName() + ": Replaced quest " + old.getName() + " (" + old.getId() + ") with a new version!");
+			LOG.info("Replaced quest {} with a new version.", old);
 			
 		}
 		
 		if (Config.ALT_DEV_SHOW_QUESTS_LOAD_IN_LOGS) {
 			final String questName = quest.getName().contains("_") ? quest.getName().substring(quest.getName().indexOf('_') + 1) : quest.getName();
-			_log.info("Loaded quest " + Util.splitWords(questName) + ".");
+			LOG.info("Loaded quest {}.", Util.splitWords(questName));
 		}
 	}
 	
@@ -229,23 +228,19 @@ public final class QuestManager extends ScriptManager<Quest> {
 		final Quest old = _scripts.put(script.getClass().getSimpleName(), script);
 		if (old != null) {
 			old.unload();
-			_log.info(getClass().getSimpleName() + ": Replaced script " + old.getName() + " with a new version!");
+			LOG.info("Replaced script {} with a new version.", old);
 		}
 		
 		if (Config.ALT_DEV_SHOW_SCRIPTS_LOAD_IN_LOGS) {
-			_log.info("Loaded script " + Util.splitWords(script.getClass().getSimpleName()) + ".");
+			LOG.info("Loaded script {}.", Util.splitWords(script.getClass().getSimpleName()));
 		}
 	}
 	
-	/**
-	 * Gets the single instance of {@code QuestManager}.
-	 * @return single instance of {@code QuestManager}
-	 */
 	public static QuestManager getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final QuestManager _instance = new QuestManager();
+		protected static final QuestManager INSTANCE = new QuestManager();
 	}
 }

src/main/java/com/l2jserver/gameserver/instancemanager/RaidBossSpawnManager.java

@@ -22,8 +22,9 @@ import java.util.Calendar;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledFuture;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.l2jserver.gameserver.config.Config;
 import com.l2jserver.commons.database.ConnectionFactory;
@@ -40,11 +41,14 @@ import com.l2jserver.util.Rnd;
  */
 public class RaidBossSpawnManager {
 	
-	private static final Logger _log = Logger.getLogger(RaidBossSpawnManager.class.getName());
+	private static final Logger LOG = LoggerFactory.getLogger(RaidBossSpawnManager.class);
 	
 	protected static final Map<Integer, L2RaidBossInstance> _bosses = new ConcurrentHashMap<>();
+	
 	protected static final Map<Integer, L2Spawn> _spawns = new ConcurrentHashMap<>();
+	
 	protected static final Map<Integer, StatsSet> _storedInfo = new ConcurrentHashMap<>();
+	
 	protected static final Map<Integer, ScheduledFuture<?>> _schedules = new ConcurrentHashMap<>();
 	
 	public static enum StatusEnum {
@@ -53,9 +57,6 @@ public class RaidBossSpawnManager {
 		UNDEFINED
 	}
 	
-	/**
-	 * Instantiates a new raid boss spawn manager.
-	 */
 	protected RaidBossSpawnManager() {
 		load();
 	}
@@ -81,22 +82,18 @@ public class RaidBossSpawnManager {
 				addNewSpawn(spawnDat, rs.getLong("respawn_time"), rs.getDouble("currentHP"), rs.getDouble("currentMP"), false);
 			}
 			
-			_log.info(getClass().getSimpleName() + ": Loaded " + _bosses.size() + " Instances");
-			_log.info(getClass().getSimpleName() + ": Scheduled " + _schedules.size() + " Instances");
-		} catch (Exception e) {
-			_log.log(Level.WARNING, getClass().getSimpleName() + ": Error while initializing RaidBossSpawnManager: " + e.getMessage(), e);
+			LOG.info("Loaded {} bosses.", _bosses.size());
+			LOG.info("Scheduled {} boss instances.", _schedules.size());
+		} catch (Exception ex) {
+			LOG.warn("There has been an error while initializing raid boss spawn manager!", ex);
 		}
 	}
 	
 	private static class SpawnSchedule implements Runnable {
-		private static final Logger _log = Logger.getLogger(SpawnSchedule.class.getName());
+		private static final Logger LOG = LoggerFactory.getLogger(SpawnSchedule.class);
 		
 		private final int bossId;
 		
-		/**
-		 * Instantiates a new spawn schedule.
-		 * @param npcId the npc id
-		 */
 		public SpawnSchedule(int npcId) {
 			bossId = npcId;
 		}
@@ -121,7 +118,7 @@ public class RaidBossSpawnManager {
 				
 				_storedInfo.put(bossId, info);
 				
-				_log.info(getClass().getSimpleName() + ": Spawning Raid Boss " + raidboss.getName());
+				LOG.info("Spawning Raid Boss {}.", raidboss.getName());
 				
 				_bosses.put(bossId, raidboss);
 			}
@@ -156,7 +153,7 @@ public class RaidBossSpawnManager {
 			if (!_schedules.containsKey(boss.getId()) && ((respawnMinDelay > 0) || (respawnMaxDelay > 0))) {
 				final Calendar time = Calendar.getInstance();
 				time.setTimeInMillis(respawnTime);
-				_log.info(getClass().getSimpleName() + ": Updated " + boss.getName() + " respawn time to " + time.getTime());
+				LOG.info("Updated {} respawn time to {}.", boss.getName(), time.getTime());
 				
 				_schedules.put(boss.getId(), ThreadPoolManager.getInstance().scheduleGeneral(new SpawnSchedule(boss.getId()), respawnDelay));
 				updateDb();
@@ -235,9 +232,8 @@ public class RaidBossSpawnManager {
 				ps.setDouble(8, currentHP);
 				ps.setDouble(9, currentMP);
 				ps.execute();
-			} catch (Exception e) {
-				// problem with storing spawn
-				_log.log(Level.WARNING, getClass().getSimpleName() + ": Could not store raidboss #" + bossId + " in the DB:" + e.getMessage(), e);
+			} catch (Exception ex) {
+				LOG.warn("Could not store raid boss Id {} in the DB!", bossId, ex);
 			}
 		}
 	}
@@ -278,8 +274,8 @@ public class RaidBossSpawnManager {
 				var ps = con.prepareStatement("DELETE FROM raidboss_spawnlist WHERE boss_id=?")) {
 				ps.setInt(1, bossId);
 				ps.execute();
-			} catch (Exception e) {
-				_log.log(Level.WARNING, getClass().getSimpleName() + ": Could not remove raidboss #" + bossId + " from DB: " + e.getMessage(), e);
+			} catch (Exception ex) {
+				LOG.warn("Could not remove raid boss Id {} from DB!", bossId, ex);
 			}
 		}
 	}
@@ -316,12 +312,12 @@ public class RaidBossSpawnManager {
 					ps.setInt(4, bossId);
 					ps.executeUpdate();
 					ps.clearParameters();
-				} catch (Exception e) {
-					_log.log(Level.WARNING, getClass().getSimpleName() + ": Couldnt update raidboss_spawnlist table " + e.getMessage(), e);
+				} catch (Exception ex) {
+					LOG.warn("Could not update raid boss spawn list table!", ex);
 				}
 			}
-		} catch (Exception e) {
-			_log.log(Level.WARNING, getClass().getSimpleName() + ": SQL error while updating RaidBoss spawn to database: " + e.getMessage(), e);
+		} catch (Exception ex) {
+			LOG.warn("SQL error while updating Raid Boss spawn to database!", ex);
 		}
 	}
 	
@@ -399,7 +395,7 @@ public class RaidBossSpawnManager {
 		
 		_storedInfo.put(raidboss.getId(), info);
 		
-		_log.info(getClass().getSimpleName() + ": Spawning Night Raid Boss " + raidboss.getName());
+		LOG.info("Spawning Night Raid Boss {}.", raidboss.getName());
 		
 		_bosses.put(raidboss.getId(), raidboss);
 	}
@@ -457,15 +453,11 @@ public class RaidBossSpawnManager {
 		_spawns.clear();
 	}
 	
-	/**
-	 * Gets the single instance of RaidBossSpawnManager.
-	 * @return single instance of RaidBossSpawnManager
-	 */
 	public static RaidBossSpawnManager getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final RaidBossSpawnManager _instance = new RaidBossSpawnManager();
+		protected static final RaidBossSpawnManager INSTANCE = new RaidBossSpawnManager();
 	}
 }

src/main/java/com/l2jserver/gameserver/instancemanager/WalkingManager.java

@@ -23,6 +23,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -52,6 +54,8 @@ import com.l2jserver.gameserver.util.IXmlReader;
  */
 public final class WalkingManager implements IXmlReader {
 	
+	private static final Logger LOG = LoggerFactory.getLogger(WalkingManager.class);
+	
 	// Repeat style:
 	// -1 - no repeat
 	// 0 - go back
@@ -75,7 +79,7 @@ public final class WalkingManager implements IXmlReader {
 	@Override
 	public final void load() {
 		parseDatapackFile("data/Routes.xml");
-		LOG.info("{}: Loaded {} walking routes.", getClass().getSimpleName(), _routes.size());
+		LOG.info("Loaded {} walking routes.", _routes.size());
 	}
 	
 	@Override
@@ -131,7 +135,7 @@ public final class WalkingManager implements IXmlReader {
 							if (node != null) {
 								npcString = NpcStringId.getNpcStringId(node.getNodeValue());
 								if (npcString == null) {
-									LOG.warn("{}: Unknown NPC String {} for route {}!", getClass().getSimpleName(), node.getNodeValue(), routeName);
+									LOG.warn("Unknown NPC String {} for route {}!", node.getNodeValue(), routeName);
 									continue;
 								}
 							} else {
@@ -139,7 +143,7 @@ public final class WalkingManager implements IXmlReader {
 								if (node != null) {
 									npcString = NpcStringId.getNpcStringId(Integer.parseInt(node.getNodeValue()));
 									if (npcString == null) {
-										LOG.warn("{}: Unknown npcString {} for route {}!", getClass().getSimpleName(), node.getNodeValue(), routeName);
+										LOG.warn("Unknown npcString {} for route {}!", node.getNodeValue(), routeName);
 										continue;
 									}
 								}
@@ -160,7 +164,7 @@ public final class WalkingManager implements IXmlReader {
 							holder.addRoute(routeName, new Location(x, y, z));
 							_routesToAttach.put(npcId, holder);
 						} catch (Exception e) {
-							LOG.warn("{}: Error in target definition for route {}!", getClass().getSimpleName(), routeName);
+							LOG.warn("Error in target definition for route {}!", routeName);
 						}
 					}
 				}
@@ -244,8 +248,8 @@ public final class WalkingManager implements IXmlReader {
 					
 					if (!npc.isInsideRadius(node, 3000, true, false)) {
 						final String message = "Route '" + routeName + "': NPC (id=" + npc.getId() + ", x=" + npc.getX() + ", y=" + npc.getY() + ", z=" + npc.getZ() + ") is too far from starting point (node x=" + node.getX() + ", y=" + node.getY() + ", z=" + node.getZ() + ", range="
-							+ npc.calculateDistance(node, true, true) + "), walking will not start";
-						LOG.warn("{}: {}", getClass().getSimpleName(), message);
+							+ npc.calculateDistance(node, true, true) + "), walking will not start!";
+						LOG.warn(message);
 						npc.sendDebugMessage(message);
 						return;
 					}
@@ -408,10 +412,10 @@ public final class WalkingManager implements IXmlReader {
 	}
 	
 	public static final WalkingManager getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final WalkingManager _instance = new WalkingManager();
+		protected static final WalkingManager INSTANCE = new WalkingManager();
 	}
 }

src/main/java/com/l2jserver/gameserver/instancemanager/ZoneManager.java

@@ -27,6 +27,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -55,6 +57,8 @@ import com.l2jserver.gameserver.util.IXmlReader;
  */
 public final class ZoneManager implements IXmlReader {
 	
+	private static final Logger LOG = LoggerFactory.getLogger(ZoneManager.class);
+	
 	private static final Map<String, AbstractZoneSettings> _settings = new HashMap<>();
 	
 	private final Map<Class<? extends L2ZoneType>, Map<Integer, ? extends L2ZoneType>> _classZones = new HashMap<>();
@@ -65,16 +69,10 @@ public final class ZoneManager implements IXmlReader {
 	
 	private List<L2ItemInstance> _debugItems;
 	
-	/**
-	 * Instantiates a new zone manager.
-	 */
 	protected ZoneManager() {
 		load();
 	}
 	
-	/**
-	 * Reload.
-	 */
 	public void reload() {
 		// Get the world regions
 		int count = 0;
@@ -96,8 +94,9 @@ public final class ZoneManager implements IXmlReader {
 				count++;
 			}
 		}
+		
 		GrandBossManager.getInstance().getZones().clear();
-		LOG.info("{}: Removed zones in " + count + " regions.", getClass().getSimpleName());
+		LOG.info("Removed zones in {} regions.", count);
 		
 		// Load the zones
 		load();
@@ -139,7 +138,7 @@ public final class ZoneManager implements IXmlReader {
 						if (attribute != null) {
 							zoneType = attribute.getNodeValue();
 						} else {
-							LOG.warn("ZoneData: Missing type for zone in file {}", f.getName());
+							LOG.warn("Missing type for zone in file {}!", f);
 							continue;
 						}
 						
@@ -160,10 +159,10 @@ public final class ZoneManager implements IXmlReader {
 						// Check zone name for NpcSpawnTerritory. Must exist and to be unique
 						if (zoneType.equalsIgnoreCase("NpcSpawnTerritory")) {
 							if (zoneName == null) {
-								LOG.warn("ZoneData: Missing name for NpcSpawnTerritory in file: {}, skipping zone!", f.getName());
+								LOG.warn("Missing name for NpcSpawnTerritory in file: {}, skipping zone!", f);
 								continue;
 							} else if (_spawnTerritories.containsKey(zoneName)) {
-								LOG.warn("ZoneData: Name {} already used for another zone, check file {}, skipping zone!", zoneName, f.getName());
+								LOG.warn("Name {} already used for another zone, check file {}, skipping zone!", zoneName, f);
 								continue;
 							}
 						}
@@ -191,7 +190,7 @@ public final class ZoneManager implements IXmlReader {
 							rs.clear();
 							
 							if ((coords == null) || (coords.length == 0)) {
-								LOG.warn("{}: ZoneData: missing data for zone: {} XML file {}!", getClass().getSimpleName(), zoneId, f.getName());
+								LOG.warn("Missing data for zone {} XML file {}!", zoneId, f);
 								continue;
 							}
 							
@@ -201,7 +200,7 @@ public final class ZoneManager implements IXmlReader {
 								if (coords.length == 2) {
 									zoneForm = new ZoneCuboid(coords[0][0], coords[1][0], coords[0][1], coords[1][1], minZ, maxZ);
 								} else {
-									LOG.warn("{}: ZoneData: Missing cuboid vertex in sql data for zone: {} in file {}!", getClass().getSimpleName(), zoneId, f.getName());
+									LOG.warn("Missing cuboid vertex in SQL data for zone {} in file {}!", zoneId, f);
 									continue;
 								}
 							} else if (zoneShape.equalsIgnoreCase("NPoly")) {
@@ -215,7 +214,7 @@ public final class ZoneManager implements IXmlReader {
 									}
 									zoneForm = new ZoneNPoly(aX, aY, minZ, maxZ);
 								} else {
-									LOG.warn("{}: ZoneData: Bad data for zone: {} in file {}!", getClass().getSimpleName(), zoneId, f.getName());
+									LOG.warn("Bad data for zone {} in file {}!", zoneId, f);
 									continue;
 								}
 							} else if (zoneShape.equalsIgnoreCase("Cylinder")) {
@@ -226,15 +225,15 @@ public final class ZoneManager implements IXmlReader {
 								if ((coords.length == 1) && (zoneRad > 0)) {
 									zoneForm = new ZoneCylinder(coords[0][0], coords[0][1], minZ, maxZ, zoneRad);
 								} else {
-									LOG.warn("{}: ZoneData: Bad data for zone: {} in file {}!", getClass().getSimpleName(), zoneId, f.getName());
+									LOG.warn("Bad data for zone {} in file {}!", zoneId, f);
 									continue;
 								}
 							} else {
-								LOG.warn("{}: ZoneData: Unknown shape: {}  for zone {} in file {}", getClass().getSimpleName(), zoneShape, zoneId, f.getName());
+								LOG.warn("Unknown shape: {} for zone {} in file {}!", zoneShape, zoneId, f);
 								continue;
 							}
 						} catch (Exception e) {
-							LOG.warn("{}: ZoneData: Failed to load zone {} coordinates!", getClass().getSimpleName(), zoneId, e);
+							LOG.warn("Failed to load zone {} coordinates!", zoneId, e);
 						}
 						
 						// No further parameters needed, if NpcSpawnTerritory is loading
@@ -253,7 +252,7 @@ public final class ZoneManager implements IXmlReader {
 							temp = (L2ZoneType) zoneConstructor.newInstance(zoneId);
 							temp.setZone(zoneForm);
 						} catch (Exception e) {
-							LOG.warn("{}: ZoneData: No such zone type: {} in file {}!", getClass().getSimpleName(), zoneType, f.getName());
+							LOG.warn("No such zone type {} in file {}!", zoneType, f);
 							continue;
 						}
 						
@@ -282,7 +281,7 @@ public final class ZoneManager implements IXmlReader {
 						}
 						
 						if (checkId(zoneId)) {
-							LOG.debug("{}: Caution: Zone ({}) from file {} overrides previous definition.", getClass().getSimpleName(), zoneId, f.getName());
+							LOG.debug("Caution: Zone ({}) from file {} overrides previous definition.", zoneId, f);
 						}
 						
 						if ((zoneName != null) && !zoneName.isEmpty()) {
@@ -318,8 +317,8 @@ public final class ZoneManager implements IXmlReader {
 		_spawnTerritories.clear();
 		parseDatapackDirectory("data/zones", false);
 		parseDatapackDirectory("data/zones/npcSpawnTerritories", false);
-		LOG.info("{}: Loaded {} zone classes and {} zones.", getClass().getSimpleName(), _classZones.size(), getSize());
-		LOG.info("{}: Loaded {} NPC spawn territoriers.", getClass().getSimpleName(), _spawnTerritories.size());
+		LOG.info("Loaded {} zone classes and {} zones.", _classZones.size(), getSize());
+		LOG.info("Loaded {} NPC spawn territoriers.", _spawnTerritories.size());
 	}
 	
 	/**
@@ -617,15 +616,11 @@ public final class ZoneManager implements IXmlReader {
 		return _settings.get(name);
 	}
 	
-	/**
-	 * Gets the single instance of ZoneManager.
-	 * @return single instance of ZoneManager
-	 */
 	public static final ZoneManager getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final ZoneManager _instance = new ZoneManager();
+		protected static final ZoneManager INSTANCE = new ZoneManager();
 	}
 }

src/main/java/com/l2jserver/gameserver/model/AutoSpawnHandler.java

@@ -28,8 +28,9 @@ import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.l2jserver.commons.database.ConnectionFactory;
 import com.l2jserver.gameserver.ThreadPoolManager;
@@ -59,7 +60,7 @@ import com.l2jserver.util.Rnd;
  */
 public class AutoSpawnHandler {
 	
-	protected static final Logger _log = Logger.getLogger(AutoSpawnHandler.class.getName());
+	private static final Logger LOG = LoggerFactory.getLogger(AutoSpawnHandler.class);
 	
 	private static final int DEFAULT_INITIAL_SPAWN = 30000; // 30 seconds after registration
 	
@@ -77,14 +78,6 @@ public class AutoSpawnHandler {
 		restoreSpawnData();
 	}
 	
-	public static AutoSpawnHandler getInstance() {
-		return SingletonHolder._instance;
-	}
-	
-	public final int size() {
-		return _registeredSpawns.size();
-	}
-	
 	public void reload() {
 		// stop all timers
 		for (ScheduledFuture<?> sf : _runningSpawns.values()) {
@@ -133,8 +126,9 @@ public class AutoSpawnHandler {
 					}
 				}
 			}
-		} catch (Exception e) {
-			_log.log(Level.WARNING, "AutoSpawnHandler: Could not restore spawn data: " + e.getMessage(), e);
+			LOG.info("Loaded {} handlers.", _registeredSpawns.size());
+		} catch (Exception ex) {
+			LOG.warn("Could not restore spawn data!", ex);
 		}
 	}
 	
@@ -208,8 +202,8 @@ public class AutoSpawnHandler {
 			// Cancel the currently associated running scheduled task.
 			ScheduledFuture<?> respawnTask = _runningSpawns.remove(spawnInst._objectId);
 			respawnTask.cancel(false);
-		} catch (Exception e) {
-			_log.log(Level.WARNING, "AutoSpawnHandler: Could not auto spawn for NPC ID " + spawnInst._npcId + " (Object ID = " + spawnInst._objectId + "): " + e.getMessage(), e);
+		} catch (Exception ex) {
+			LOG.warn("Could not auto spawn for NPC Id {} (Object Id={})!", spawnInst._npcId, spawnInst._objectId, ex);
 			return false;
 		}
 		
@@ -373,7 +367,7 @@ public class AutoSpawnHandler {
 				
 				// If there are no set co-ordinates, cancel the spawn task.
 				if (locationList.length == 0) {
-					_log.info("AutoSpawnHandler: No location co-ords specified for spawn instance (Object ID = " + _objectId + ").");
+					LOG.warn("No location co-ords specified for spawn instance (Object Id={}).", _objectId);
 					return;
 				}
 				
@@ -444,8 +438,8 @@ public class AutoSpawnHandler {
 					AutoDespawner rd = new AutoDespawner(_objectId);
 					ThreadPoolManager.getInstance().scheduleAi(rd, spawnInst.getDespawnDelay() - 1000);
 				}
-			} catch (Exception e) {
-				_log.log(Level.WARNING, "AutoSpawnHandler: An error occurred while initializing spawn instance (Object ID = " + _objectId + "): " + e.getMessage(), e);
+			} catch (Exception ex) {
+				LOG.warn("An error occurred while initializing spawn instance (Object Id={})!", _objectId, ex);
 			}
 		}
 	}
@@ -466,9 +460,8 @@ public class AutoSpawnHandler {
 		public void run() {
 			try {
 				AutoSpawnInstance spawnInst = _registeredSpawns.get(_objectId);
-				
 				if (spawnInst == null) {
-					_log.info("AutoSpawnHandler: No spawn registered for object ID = " + _objectId + ".");
+					LOG.warn("No spawn registered for object Id={}!", _objectId);
 					return;
 				}
 				
@@ -477,8 +470,8 @@ public class AutoSpawnHandler {
 					SpawnTable.getInstance().deleteSpawn(npcInst.getSpawn(), false);
 					spawnInst.removeNpcInstance(npcInst);
 				}
-			} catch (Exception e) {
-				_log.log(Level.WARNING, "AutoSpawnHandler: An error occurred while despawning spawn (Object ID = " + _objectId + "): " + e.getMessage(), e);
+			} catch (Exception ex) {
+				LOG.warn("An error occurred while despawning spawn (Object Id={})!", _objectId, ex);
 			}
 		}
 	}
@@ -624,7 +617,11 @@ public class AutoSpawnHandler {
 		}
 	}
 	
+	public static AutoSpawnHandler getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
 	private static class SingletonHolder {
-		protected static final AutoSpawnHandler _instance = new AutoSpawnHandler();
+		protected static final AutoSpawnHandler INSTANCE = new AutoSpawnHandler();
 	}
 }

src/main/java/com/l2jserver/gameserver/model/L2Object.java

@@ -869,6 +869,6 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
 	
 	@Override
 	public String toString() {
-		return (getClass().getSimpleName() + ":" + getName() + "[" + getObjectId() + "]");
+		return getName() + " [" + getObjectId() + "]";
 	}
 }

src/main/java/com/l2jserver/gameserver/model/L2World.java

@@ -38,6 +38,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
 
 public final class L2World {
+	
 	private static final Logger LOG = LoggerFactory.getLogger(L2World.class);
 	
 	/** Gracia border Flying objects not allowed to the east of it. */
@@ -97,7 +98,6 @@ public final class L2World {
 	public void storeObject(L2Object object) {
 		if (_allObjects.containsKey(object.getObjectId())) {
 			LOG.warn("Current object: {} already exist in OID map!", object);
-			LOG.warn("---------------------- End ---------------------");
 			return;
 		}
 		_allObjects.put(object.getObjectId(), object);
@@ -243,7 +243,7 @@ public final class L2World {
 		// in a circular area of 2000 units
 		List<L2Object> visibles = getVisibleObjects(object, 2000);
 		if (Config.DEBUG) {
-			LOG.debug("objects in range: {}", visibles.size());
+			LOG.debug("Objects in range {}.", visibles.size());
 		}
 		
 		// tell the player about the surroundings
@@ -517,7 +517,7 @@ public final class L2World {
 			}
 		}
 		
-		LOG.info("L2World: ({} by {}) World Region Grid set up.", REGIONS_X, REGIONS_Y);
+		LOG.info("{} by {} world region grid set up.", REGIONS_X, REGIONS_Y);
 		
 	}
 	
@@ -525,23 +525,20 @@ public final class L2World {
 	 * Deleted all spawns in the world.
 	 */
 	public void deleteVisibleNpcSpawns() {
-		LOG.info("Deleting all visible NPC's.");
+		LOG.info("Deleting all visible NPCs.");
 		for (int i = 0; i <= REGIONS_X; i++) {
 			for (int j = 0; j <= REGIONS_Y; j++) {
 				_worldRegions[i][j].deleteVisibleNpcSpawns();
 			}
 		}
-		LOG.info("All visible NPC's deleted.");
+		LOG.info("All visible NPCs deleted.");
 	}
 	
-	/**
-	 * @return the current instance of L2World
-	 */
 	public static L2World getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final L2World _instance = new L2World();
+		protected static final L2World INSTANCE = new L2World();
 	}
 }

src/main/java/com/l2jserver/gameserver/model/actor/L2Npc.java

@@ -47,7 +47,7 @@ import com.l2jserver.gameserver.enums.ShotType;
 import com.l2jserver.gameserver.enums.Team;
 import com.l2jserver.gameserver.handler.BypassHandler;
 import com.l2jserver.gameserver.handler.IBypassHandler;
-import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
 import com.l2jserver.gameserver.instancemanager.CastleManager;
 import com.l2jserver.gameserver.instancemanager.FortManager;
 import com.l2jserver.gameserver.instancemanager.TownManager;
@@ -557,7 +557,7 @@ public class L2Npc extends L2Character {
 	}
 	
 	public final SiegableHall getConquerableHall() {
-		return CHSiegeManager.getInstance().getNearbyClanHall(getX(), getY(), 10000);
+		return ClanHallSiegeManager.getInstance().getNearbyClanHall(getX(), getY(), 10000);
 	}
 	
 	/**

src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ClanHallManagerInstance.java

@@ -29,7 +29,7 @@ import com.l2jserver.gameserver.cache.HtmCache;
 import com.l2jserver.gameserver.data.sql.impl.TeleportLocationTable;
 import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.enums.InstanceType;
-import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
 import com.l2jserver.gameserver.instancemanager.ClanHallManager;
 import com.l2jserver.gameserver.model.ClanPrivilege;
 import com.l2jserver.gameserver.model.L2TeleportLocation;
@@ -1265,7 +1265,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance {
 		if (_clanHallId < 0) {
 			ClanHall temp = ClanHallManager.getInstance().getNearbyClanHall(getX(), getY(), 500);
 			if (temp == null) {
-				temp = CHSiegeManager.getInstance().getNearbyClanHall(this);
+				temp = ClanHallSiegeManager.getInstance().getNearbyClanHall(this);
 			}
 			
 			if (temp != null) {

src/main/java/com/l2jserver/gameserver/model/actor/instance/L2SiegeFlagInstance.java

@@ -21,7 +21,7 @@ package com.l2jserver.gameserver.model.actor.instance;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.enums.InstanceType;
-import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
 import com.l2jserver.gameserver.instancemanager.FortSiegeManager;
 import com.l2jserver.gameserver.instancemanager.SiegeManager;
 import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
@@ -77,7 +77,7 @@ public class L2SiegeFlagInstance extends L2Npc {
 			_siege = FortSiegeManager.getInstance().getSiege(player.getX(), player.getY(), player.getZ());
 		}
 		if (_siege == null) {
-			_siege = CHSiegeManager.getInstance().getSiege(player);
+			_siege = ClanHallSiegeManager.getInstance().getSiege(player);
 		}
 		if ((_clan == null) || (_siege == null)) {
 			throw new NullPointerException(getClass().getSimpleName() + ": Initialization failed.");

src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java

@@ -18,9 +18,8 @@
  */
 package com.l2jserver.gameserver.model.actor.tasks.player;
 
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.l2jserver.gameserver.config.Config;
 import com.l2jserver.gameserver.data.xml.impl.AdminData;
@@ -35,10 +34,13 @@ import com.l2jserver.gameserver.model.punishment.PunishmentType;
  * Task that handles illegal player actions.
  */
 public final class IllegalPlayerActionTask implements Runnable {
-	private static final Logger _log = Logger.getLogger("audit");
+	
+	private static final Logger LOG = LoggerFactory.getLogger("audit");
 	
 	private final String _message;
+	
 	private final IllegalActionPunishmentType _punishment;
+	
 	private final L2PcInstance _actor;
 	
 	public IllegalPlayerActionTask(L2PcInstance actor, String message, IllegalActionPunishmentType punishment) {
@@ -69,12 +71,7 @@ public final class IllegalPlayerActionTask implements Runnable {
 	
 	@Override
 	public void run() {
-		LogRecord record = new LogRecord(Level.INFO, "AUDIT:" + _message);
-		record.setLoggerName("audit");
-		//@formatter:off
-		record.setParameters(new Object[] { _actor, _punishment	});
-		//@formatter:on
-		_log.log(record);
+		LOG.info("Illegal action [{}] by player {}, action taken {}!", _message, _actor, _punishment);
 		
 		AdminData.getInstance().broadcastMessageToGMs(_message);
 		if (!_actor.isGM()) {

src/main/java/com/l2jserver/gameserver/model/entity/Hero.java

@@ -28,7 +28,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.l2jserver.gameserver.config.Config;
 import com.l2jserver.commons.database.ConnectionFactory;
@@ -61,7 +63,7 @@ import com.l2jserver.util.StringUtil;
  */
 public class Hero {
 	
-	private static final Logger _log = Logger.getLogger(Hero.class.getName());
+	private static final Logger LOG = LoggerFactory.getLogger(Hero.class);
 	
 	private static final String GET_HEROES = "SELECT heroes.charId, characters.char_name, heroes.class_id, heroes.count, heroes.played, heroes.claimed FROM heroes, characters WHERE characters.charId = heroes.charId AND heroes.played = 1";
 	private static final String GET_ALL_HEROES = "SELECT heroes.charId, characters.char_name, heroes.class_id, heroes.count, heroes.played, heroes.claimed FROM heroes, characters WHERE characters.charId = heroes.charId";
@@ -142,12 +144,12 @@ public class Hero {
 				
 				COMPLETE_HEROS.put(charId, hero);
 			}
-		} catch (Exception e) {
-			_log.warning("Hero System: Couldnt load Heroes: " + e.getMessage());
+		} catch (Exception ex) {
+			LOG.warn("Couldnt load Heroes!", ex);
 		}
 		
-		_log.info("Hero System: Loaded " + HEROES.size() + " Heroes.");
-		_log.info("Hero System: Loaded " + COMPLETE_HEROS.size() + " all time Heroes.");
+		LOG.info("Loaded {} Heroes.", HEROES.size());
+		LOG.info("Loaded {} all time Heroes.", COMPLETE_HEROS.size());
 	}
 	
 	private void processHeros(PreparedStatement ps, int charId, StatsSet hero) throws Exception {
@@ -199,14 +201,14 @@ public class Hero {
 					HERO_MESSAGE.put(charId, rset.getString("message"));
 				}
 			}
-		} catch (Exception e) {
-			_log.warning("Hero System: Couldnt load Hero Message for CharId: " + charId + ": " + e.getMessage());
+		} catch (Exception ex) {
+			LOG.warn("Could not load Hero message for player Id {}!", charId, ex);
 		}
 	}
 	
 	public void loadDiary(int charId) {
 		final List<StatsSet> diary = new ArrayList<>();
-		int diaryentries = 0;
+		int diaryEntries = 0;
 		try (var con = ConnectionFactory.getInstance().getConnection();
 			var ps = con.prepareStatement("SELECT * FROM  heroes_diary WHERE charId=? ORDER BY time ASC")) {
 			ps.setInt(1, charId);
@@ -235,14 +237,14 @@ public class Hero {
 						}
 					}
 					diary.add(_diaryentry);
-					diaryentries++;
+					diaryEntries++;
 				}
 			}
 			HERO_DIARY.put(charId, diary);
 			
-			_log.info("Hero System: Loaded " + diaryentries + " diary entries for Hero: " + CharNameTable.getInstance().getNameById(charId));
-		} catch (Exception e) {
-			_log.warning("Hero System: Couldnt load Hero Diary for CharId: " + charId + ": " + e.getMessage());
+			LOG.info("Loaded {} diary entries for Hero {}.", diaryEntries, CharNameTable.getInstance().getNameById(charId));
+		} catch (Exception ex) {
+			LOG.warn("Could not load Hero Diary for player Id {}!", charId, ex);
 		}
 	}
 	
@@ -256,7 +258,7 @@ public class Hero {
 		data.set(Calendar.MILLISECOND, 0);
 		
 		long from = data.getTimeInMillis();
-		int numberoffights = 0;
+		int numberOfFights = 0;
 		int _victorys = 0;
 		int _losses = 0;
 		int _draws = 0;
@@ -311,7 +313,7 @@ public class Hero {
 							
 							fights.add(fight);
 							
-							numberoffights++;
+							numberOfFights++;
 						}
 					} else if (charId == charTwoId) {
 						String name = CharNameTable.getInstance().getNameById(charOneId);
@@ -339,7 +341,7 @@ public class Hero {
 							
 							fights.add(fight);
 							
-							numberoffights++;
+							numberOfFights++;
 						}
 					}
 				}
@@ -352,9 +354,9 @@ public class Hero {
 			HERO_COUNTS.put(charId, heroCountData);
 			HERO_FIGHTS.put(charId, fights);
 			
-			_log.info("Hero System: Loaded " + numberoffights + " fights for Hero: " + CharNameTable.getInstance().getNameById(charId));
-		} catch (Exception e) {
-			_log.warning("Hero System: Couldnt load Hero fights history for CharId: " + charId + ": " + e);
+			LOG.info("Loaded {} fights for Hero {}.", numberOfFights, CharNameTable.getInstance().getNameById(charId));
+		} catch (Exception ex) {
+			LOG.warn("Could not load Hero fights history for player Id {}!", charId, ex);
 		}
 	}
 	
@@ -650,8 +652,8 @@ public class Hero {
 					}
 				}
 			}
-		} catch (Exception e) {
-			_log.warning("Hero System: Couldnt update Heroes: " + e.getMessage());
+		} catch (Exception ex) {
+			LOG.warn("Could not update Heroes!", ex);
 		}
 	}
 	
@@ -699,8 +701,8 @@ public class Hero {
 			ps.setInt(3, action);
 			ps.setInt(4, param);
 			ps.execute();
-		} catch (Exception e) {
-			_log.severe("SQL exception while saving DiaryData: " + e.getMessage());
+		} catch (Exception ex) {
+			LOG.warn("There has been an error saving diary data!", ex);
 		}
 	}
 	
@@ -715,7 +717,7 @@ public class Hero {
 	
 	/**
 	 * Update hero message in database
-	 * @param charId character objid
+	 * @param charId the character Id
 	 */
 	public void saveHeroMessage(int charId) {
 		if (HERO_MESSAGE.containsKey(charId)) {
@@ -727,8 +729,8 @@ public class Hero {
 			ps.setString(1, HERO_MESSAGE.get(charId));
 			ps.setInt(2, charId);
 			ps.execute();
-		} catch (Exception e) {
-			_log.severe("SQL exception while saving HeroMessage:" + e.getMessage());
+		} catch (Exception ex) {
+			LOG.warn("There has been an error updating Hero message!", ex);
 		}
 	}
 	
@@ -736,8 +738,8 @@ public class Hero {
 		try (var con = ConnectionFactory.getInstance().getConnection();
 			var s = con.createStatement()) {
 			s.executeUpdate(DELETE_ITEMS);
-		} catch (Exception e) {
-			_log.warning("Heroes: " + e.getMessage());
+		} catch (Exception ex) {
+			LOG.warn("There has been an error deleting Hero items!", ex);
 		}
 	}
 	

src/main/java/com/l2jserver/gameserver/model/entity/TvTManager.java

@@ -20,7 +20,9 @@ package com.l2jserver.gameserver.model.entity;
 
 import java.util.Calendar;
 import java.util.concurrent.ScheduledFuture;
-import java.util.logging.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.l2jserver.gameserver.config.Config;
 import com.l2jserver.gameserver.ThreadPoolManager;
@@ -31,7 +33,8 @@ import com.l2jserver.gameserver.util.Broadcast;
  * @author HorridoJoho
  */
 public class TvTManager {
-	protected static final Logger _log = Logger.getLogger(TvTManager.class.getName());
+	
+	private static final Logger LOG = LoggerFactory.getLogger(TvTManager.class);
 	
 	private TvTStartTask _task;
 	
@@ -40,9 +43,9 @@ public class TvTManager {
 			TvTEvent.init();
 			
 			scheduleEventStart();
-			_log.info("TvTEventEngine[TvTManager.TvTManager()]: Started.");
+			LOG.info("Started.");
 		} else {
-			_log.info("TvTEventEngine[TvTManager.TvTManager()]: Engine is disabled.");
+			LOG.info("Engine is disabled.");
 		}
 	}
 	
@@ -50,9 +53,6 @@ public class TvTManager {
 		return SingletonHolder.INSTANCE;
 	}
 	
-	/**
-	 * Starts TvTStartTask
-	 */
 	public void scheduleEventStart() {
 		try {
 			Calendar currentTime = Calendar.getInstance();
@@ -78,8 +78,8 @@ public class TvTManager {
 				_task = new TvTStartTask(nextStartTime.getTimeInMillis());
 				ThreadPoolManager.getInstance().executeGeneral(_task);
 			}
-		} catch (Exception e) {
-			_log.warning("TvTEventEngine[TvTManager.scheduleEventStart()]: Error figuring out a start time. Check TvTEventInterval in config file.");
+		} catch (Exception ex) {
+			LOG.warn("There has been an error figuring out a start time. Check TvTEventInterval in config file.", ex);
 		}
 	}
 	
@@ -89,7 +89,7 @@ public class TvTManager {
 	public void startReg() {
 		if (!TvTEvent.startParticipation()) {
 			Broadcast.toAllOnlinePlayers("TvT Event: Event was cancelled.");
-			_log.warning("TvTEventEngine[TvTManager.run()]: Error spawning event npc for participation.");
+			LOG.warn("There has been an error spawning event NPC for participation.");
 			
 			scheduleEventStart();
 		} else {
@@ -107,7 +107,7 @@ public class TvTManager {
 	public void startEvent() {
 		if (!TvTEvent.startFight()) {
 			Broadcast.toAllOnlinePlayers("TvT Event: Event cancelled due to lack of Participation.");
-			_log.info("TvTEventEngine[TvTManager.run()]: Lack of registration, abort event.");
+			LOG.info("Lack of registration, abort event.");
 			
 			scheduleEventStart();
 		} else {

src/main/java/com/l2jserver/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java

@@ -32,7 +32,7 @@ import com.l2jserver.gameserver.config.Config;
 import com.l2jserver.commons.database.ConnectionFactory;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.data.sql.impl.ClanTable;
-import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
 import com.l2jserver.gameserver.instancemanager.MapRegionManager;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.L2SiegeClan;
@@ -89,7 +89,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable {
 	public ClanHallSiegeEngine(String name, String descr, final int hallId) {
 		super(-1, name, descr);
 		
-		_hall = CHSiegeManager.getInstance().getSiegableHall(hallId);
+		_hall = ClanHallSiegeManager.getInstance().getSiegableHall(hallId);
 		_hall.setSiege(this);
 		
 		_siegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new PrepareOwner(), _hall.getNextSiegeTime() - System.currentTimeMillis() - 3600000);

src/main/java/com/l2jserver/gameserver/model/olympiad/Olympiad.java

@@ -47,6 +47,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.util.Broadcast;
 
 /**
+ * Olympiad.
  * @author godson
  */
 public class Olympiad extends ListenersContainer {

src/main/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameManager.java

@@ -20,20 +20,24 @@ package com.l2jserver.gameserver.model.olympiad;
 
 import java.util.Collection;
 import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.l2jserver.gameserver.instancemanager.ZoneManager;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.zone.type.L2OlympiadStadiumZone;
 
 /**
+ * Olympiad Game Manager.
  * @author GodKratos, DS
  */
 public class OlympiadGameManager implements Runnable {
-	private static final Logger _log = Logger.getLogger(OlympiadGameManager.class.getName());
+	
+	private static final Logger LOG = LoggerFactory.getLogger(OlympiadGameManager.class);
 	
 	private volatile boolean _battleStarted = false;
+	
 	private final OlympiadGameTask[] _tasks;
 	
 	protected OlympiadGameManager() {
@@ -48,11 +52,7 @@ public class OlympiadGameManager implements Runnable {
 			_tasks[i++] = new OlympiadGameTask(zone);
 		}
 		
-		_log.log(Level.INFO, "Olympiad System: Loaded " + _tasks.length + " stadiums.");
-	}
-	
-	public static final OlympiadGameManager getInstance() {
-		return SingletonHolder._instance;
+		LOG.info("Loaded {} stadiums.", _tasks.length);
 	}
 	
 	protected final boolean isBattleStarted() {
@@ -129,7 +129,7 @@ public class OlympiadGameManager implements Runnable {
 			if (isAllTasksFinished()) {
 				OlympiadManager.getInstance().clearRegistered();
 				_battleStarted = false;
-				_log.log(Level.INFO, "Olympiad System: All current games finished.");
+				LOG.info("All current games finished.");
 			}
 		}
 	}
@@ -171,7 +171,11 @@ public class OlympiadGameManager implements Runnable {
 		}
 	}
 	
+	public static final OlympiadGameManager getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
 	private static class SingletonHolder {
-		protected static final OlympiadGameManager _instance = new OlympiadGameManager();
+		protected static final OlympiadGameManager INSTANCE = new OlympiadGameManager();
 	}
 }

src/main/java/com/l2jserver/gameserver/model/quest/Quest.java

@@ -2691,4 +2691,9 @@ public class Quest extends AbstractScript implements IIdentifiable {
 	public boolean isVisibleInQuestWindow() {
 		return true;
 	}
+	
+	@Override
+	public String toString() {
+		return _name + " (" + _questId + ")";
+	}
 }

src/main/java/com/l2jserver/gameserver/model/zone/type/L2SiegeZone.java

@@ -21,7 +21,7 @@ package com.l2jserver.gameserver.model.zone.type;
 import com.l2jserver.gameserver.config.Config;
 import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.enums.MountType;
-import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
 import com.l2jserver.gameserver.instancemanager.FortManager;
 import com.l2jserver.gameserver.instancemanager.FortSiegeManager;
 import com.l2jserver.gameserver.instancemanager.ZoneManager;
@@ -117,7 +117,7 @@ public class L2SiegeZone extends L2ZoneType {
 				throw new IllegalArgumentException("Siege object already defined!");
 			}
 			getSettings().setSiegeableId(Integer.parseInt(value));
-			SiegableHall hall = CHSiegeManager.getInstance().getConquerableHalls().get(getSettings().getSiegeableId());
+			SiegableHall hall = ClanHallSiegeManager.getInstance().getConquerableHalls().get(getSettings().getSiegeableId());
 			if (hall == null) {
 				_log.warning("L2SiegeZone: Siegable clan hall with id " + value + " does not exist!");
 			} else {

src/main/java/com/l2jserver/gameserver/network/L2GameClient.java

@@ -29,9 +29,9 @@ import java.util.concurrent.Future;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.locks.ReentrantLock;
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
-import java.util.logging.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.l2jserver.gameserver.config.Config;
 import com.l2jserver.commons.database.ConnectionFactory;
@@ -65,9 +65,11 @@ import com.l2jserver.mmocore.ReceivablePacket;
  */
 public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>> implements Runnable {
 	
-	protected static final Logger _log = Logger.getLogger(L2GameClient.class.getName());
+	private static final Logger LOG = LoggerFactory.getLogger(L2GameClient.class);
+	
+	private static final Logger LOG_ACCOUNTING = LoggerFactory.getLogger("accounting");
 	
-	protected static final Logger _logAccounting = Logger.getLogger("accounting");
+	private static final Logger LOG_AUDIT = LoggerFactory.getLogger("audit");
 	
 	/**
 	 * @author KenM
@@ -300,18 +302,12 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>> i
 							ps2.execute();
 						}
 					}
-					
-					LogRecord record = new LogRecord(Level.WARNING, "Delete");
-					record.setParameters(new Object[] {
-						objid,
-						this
-					});
-					_logAccounting.log(record);
+					LOG_ACCOUNTING.info("Deleted character Id {} and client {}.", objid, this);
 				}
 			}
 			return answer;
-		} catch (Exception e) {
-			_log.log(Level.SEVERE, "Error updating delete time of character.", e);
+		} catch (Exception ex) {
+			LOG.error("There has been an error updating delete time of character!", ex);
 			return -1;
 		}
 	}
@@ -329,8 +325,8 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>> i
 					getActiveChar().getWarehouse().updateDatabase();
 				}
 			}
-		} catch (Exception e) {
-			_log.log(Level.SEVERE, "Error saving character..", e);
+		} catch (Exception ex) {
+			LOG.error("There has been an error saving character!", ex);
 		}
 	}
 	
@@ -344,16 +340,11 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>> i
 			var ps = con.prepareStatement("UPDATE characters SET deletetime=0 WHERE charId=?")) {
 			ps.setInt(1, objid);
 			ps.execute();
-		} catch (Exception e) {
-			_log.log(Level.SEVERE, "Error restoring character.", e);
+		} catch (Exception ex) {
+			LOG.error("There has been an error restoring character!", ex);
 		}
 		
-		final LogRecord record = new LogRecord(Level.WARNING, "Restore");
-		record.setParameters(new Object[] {
-			objid,
-			this
-		});
-		_logAccounting.log(record);
+		LOG_ACCOUNTING.info("Restoring Character Id {}, client {}.", objid, this);
 	}
 	
 	public static void deleteCharByObjId(int objid) {
@@ -488,8 +479,8 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>> i
 					ps.execute();
 				}
 			}
-		} catch (Exception e) {
-			_log.log(Level.SEVERE, "Error deleting character.", e);
+		} catch (Exception ex) {
+			LOG.warn("There has been an error deleting character Id {}!", objid, ex);
 		}
 	}
 	
@@ -502,7 +493,7 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>> i
 		L2PcInstance character = L2World.getInstance().getPlayer(objId);
 		if (character != null) {
 			// exploit prevention, should not happens in normal way
-			_log.severe("Attempt of double login: " + character.getName() + "(" + objId + ") " + getAccountName());
+			LOG.error("Attempt of double login {}, account {}!", character, getAccountName());
 			if (character.getClient() != null) {
 				character.getClient().closeNow();
 			} else {
@@ -513,19 +504,14 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>> i
 		
 		character = L2PcInstance.load(objId);
 		if (character != null) {
-			
-			// preinit some values for each login
-			character.setRunning(); // running is default
-			character.standUp(); // standing is default
-			
+			character.setRunning();
+			character.standUp();
 			character.refreshOverloaded();
 			character.refreshExpertisePenalty();
 			character.setOnlineStatus(true, false);
 		} else {
-			_log.severe("could not restore in slot: " + charslot);
+			LOG.error("Could not restore in slot {}!", charslot);
 		}
-		
-		// setCharacter(character);
 		return character;
 	}
 	
@@ -565,10 +551,10 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>> i
 		getConnection().close(gspArray);
 	}
 	
-	private int getObjectIdForSlot(int charslot) {
-		final CharSelectInfoPackage info = getCharSelection(charslot);
+	private int getObjectIdForSlot(int charSlot) {
+		final CharSelectInfoPackage info = getCharSelection(charSlot);
 		if (info == null) {
-			_log.warning(toString() + " tried to delete Character in slot " + charslot + " but no characters exits at that slot.");
+			LOG.warn("{} tried to delete character in slot {} but no characters exits at that slot!", this, charSlot);
 			return -1;
 		}
 		return info.getObjectId();
@@ -576,18 +562,14 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>> i
 	
 	@Override
 	protected void onForcedDisconnection() {
-		LogRecord record = new LogRecord(Level.WARNING, "Disconnected abnormally");
-		record.setParameters(new Object[] {
-			this
-		});
-		_logAccounting.log(record);
+		LOG_ACCOUNTING.warn("Client {} disconnected abnormally!", this);
 	}
 	
 	@Override
 	protected void onDisconnection() {
 		// no long running tasks here, do it async
 		try {
-			ThreadPoolManager.getInstance().executeGeneral(new DisconnectTask());
+			ThreadPoolManager.getInstance().executeGeneral(new DisconnectTask(this));
 		} catch (RejectedExecutionException e) {
 			// server is closing
 		}
@@ -631,48 +613,51 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>> i
 	}
 	
 	protected class DisconnectTask implements Runnable {
+		
+		private final L2GameClient client;
+		
+		public DisconnectTask(L2GameClient client) {
+			this.client = client;
+		}
+		
 		@Override
 		public void run() {
 			boolean fast = true;
 			try {
-				if ((getActiveChar() != null) && !isDetached()) {
+				final L2PcInstance player = client.getActiveChar();
+				if ((player != null) && !isDetached()) {
 					setDetached(true);
-					if (offlineMode(getActiveChar())) {
-						getActiveChar().leaveParty();
-						OlympiadManager.getInstance().unRegisterNoble(getActiveChar());
+					if (offlineMode(player)) {
+						player.leaveParty();
+						OlympiadManager.getInstance().unRegisterNoble(player);
 						
 						// If the L2PcInstance has Pet, unsummon it
-						if (getActiveChar().hasSummon()) {
-							getActiveChar().getSummon().setRestoreSummon(true);
+						if (player.hasSummon()) {
+							player.getSummon().setRestoreSummon(true);
 							
-							getActiveChar().getSummon().unSummon(getActiveChar());
+							player.getSummon().unSummon(player);
 							// Dead pet wasn't unsummoned, broadcast npcinfo changes (pet will be without owner name - means owner offline)
-							if (getActiveChar().getSummon() != null) {
-								getActiveChar().getSummon().broadcastNpcInfo(0);
+							if (player.getSummon() != null) {
+								player.getSummon().broadcastNpcInfo(0);
 							}
 						}
 						
 						if (Config.OFFLINE_SET_NAME_COLOR) {
-							getActiveChar().getAppearance().setNameColor(Config.OFFLINE_NAME_COLOR);
-							getActiveChar().broadcastUserInfo();
+							player.getAppearance().setNameColor(Config.OFFLINE_NAME_COLOR);
+							player.broadcastUserInfo();
 						}
 						
-						if (getActiveChar().getOfflineStartTime() == 0) {
-							getActiveChar().setOfflineStartTime(System.currentTimeMillis());
+						if (player.getOfflineStartTime() == 0) {
+							player.setOfflineStartTime(System.currentTimeMillis());
 						}
-						
-						final LogRecord record = new LogRecord(Level.INFO, "Entering offline mode");
-						record.setParameters(new Object[] {
-							L2GameClient.this
-						});
-						_logAccounting.log(record);
+						LOG_ACCOUNTING.info("Client {} entering offline mode.", client);
 						return;
 					}
-					fast = !getActiveChar().isInCombat() && !getActiveChar().isLocked();
+					fast = !player.isInCombat() && !player.isLocked();
 				}
 				cleanMe(fast);
-			} catch (Exception e1) {
-				_log.log(Level.WARNING, "Error while disconnecting client.", e1);
+			} catch (Exception ex) {
+				LOG.warn("There has been an error while disconnecting client {}!", client, ex);
 			}
 		}
 	}
@@ -717,8 +702,8 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>> i
 					_cleanupTask = ThreadPoolManager.getInstance().scheduleGeneral(new CleanupTask(), fast ? 5 : 15000L);
 				}
 			}
-		} catch (Exception e1) {
-			_log.log(Level.WARNING, "Error during cleanup.", e1);
+		} catch (Exception ex) {
+			LOG.warn("There has been an error during cleanup!", ex);
 		}
 	}
 	
@@ -732,10 +717,10 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>> i
 					// ThreadPoolManager.getInstance().removeGeneral((Runnable) _autoSaveInDB);
 				}
 				
-				if (getActiveChar() != null) // this should only happen on connection loss
-				{
+				// this should only happen on connection loss
+				if (getActiveChar() != null) {
 					if (getActiveChar().isLocked()) {
-						_log.log(Level.WARNING, "Player " + getActiveChar().getName() + " still performing subclass actions during disconnect.");
+						LOG.warn("Player {} still performing subclass actions during disconnect!", getActiveChar());
 					}
 					
 					// we store all data from players who are disconnected while in an event in order to restore it in the next login
@@ -752,8 +737,8 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>> i
 					}
 				}
 				setActiveChar(null);
-			} catch (Exception e1) {
-				_log.log(Level.WARNING, "Error while cleanup client.", e1);
+			} catch (Exception ex) {
+				LOG.warn("There has been  an error while cleanup client!", ex);
 			} finally {
 				LoginServerThread.getInstance().sendLogout(getAccountName());
 			}
@@ -764,16 +749,16 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>> i
 		@Override
 		public void run() {
 			try {
-				L2PcInstance player = getActiveChar();
-				if ((player != null) && player.isOnline()) // safety precaution
-				{
+				final var player = getActiveChar();
+				// Safety precaution.
+				if ((player != null) && player.isOnline()) {
 					saveCharToDisk();
 					if (player.hasSummon()) {
 						player.getSummon().storeMe();
 					}
 				}
-			} catch (Exception e) {
-				_log.log(Level.SEVERE, "Error on AutoSaveTask.", e);
+			} catch (Exception ex) {
+				LOG.error("There has been an error on AutoSaveTask!", ex);
 			}
 		}
 	}
@@ -792,8 +777,7 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>> i
 			return true;
 		}
 		
-		Logger _logAudit = Logger.getLogger("audit");
-		_logAudit.log(Level.INFO, "AUDIT: Client " + toString() + " kicked for reason: " + punishment);
+		LOG_AUDIT.warn("Client {} kicked for {}!", this, punishment);
 		closeNow();
 		return false;
 	}
@@ -807,7 +791,7 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>> i
 			return true;
 		}
 		
-		// flood protection
+		// Flood protection.
 		if (getStats().countPacket(_packetQueue.size())) {
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return true;
@@ -821,14 +805,15 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>> i
 	 */
 	public void onBufferUnderflow() {
 		if (getStats().countUnderflowException()) {
-			_log.severe("Client " + toString() + " - Disconnected: Too many buffer underflow exceptions.");
+			LOG.error("Client {} disconnected, too many buffer underflow exceptions!", this);
 			closeNow();
 			return;
 		}
-		if (_state == GameClientState.CONNECTED) // in CONNECTED state kick client immediately
-		{
+		
+		// In CONNECTED state kick client immediately.
+		if (_state == GameClientState.CONNECTED) {
 			if (Config.PACKET_HANDLER_DEBUG) {
-				_log.severe("Client " + toString() + " - Disconnected, too many buffer underflows in non-authed state.");
+				LOG.error("Client {} disconnected, too many buffer underflows in non-authed state!", this);
 			}
 			closeNow();
 		}
@@ -839,14 +824,15 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>> i
 	 */
 	public void onUnknownPacket() {
 		if (getStats().countUnknownPacket()) {
-			_log.severe("Client " + toString() + " - Disconnected: Too many unknown packets.");
+			LOG.error("Client {} disconnected, too many unknown packets!", this);
 			closeNow();
 			return;
 		}
-		if (_state == GameClientState.CONNECTED) // in CONNECTED state kick client immediately
-		{
+		
+		// In CONNECTED state kick client immediately.
+		if (_state == GameClientState.CONNECTED) {
 			if (Config.PACKET_HANDLER_DEBUG) {
-				_log.severe("Client " + toString() + " - Disconnected, too many unknown packets in non-authed state.");
+				LOG.error("Client {} disconnected, too many unknown packets in non-authed state!", this);
 			}
 			closeNow();
 		}
@@ -858,14 +844,14 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>> i
 	 */
 	public void execute(ReceivablePacket<L2GameClient> packet) {
 		if (getStats().countFloods()) {
-			_log.severe("Client " + toString() + " - Disconnected, too many floods:" + getStats().longFloods + " long and " + getStats().shortFloods + " short.");
+			LOG.error("Client {} disconnected, too many floods {} long and {} short!", this, getStats().longFloods, getStats().shortFloods);
 			closeNow();
 			return;
 		}
 		
 		if (!_packetQueue.offer(packet)) {
 			if (getStats().countQueueOverflow()) {
-				_log.severe("Client " + toString() + " - Disconnected, too many queue overflows.");
+				LOG.error("Client {} disconnected, too many queue overflows!", this);
 				closeNow();
 			} else {
 				sendPacket(ActionFailed.STATIC_PACKET);
@@ -881,7 +867,7 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>> i
 			if (_state == GameClientState.CONNECTED) {
 				if (getStats().processedPackets > 3) {
 					if (Config.PACKET_HANDLER_DEBUG) {
-						_log.severe("Client " + toString() + " - Disconnected, too many packets in non-authed state.");
+						LOG.error("Client {} disconnected, too many packets in non-authed state!", this);
 					}
 					closeNow();
 					return;
@@ -890,10 +876,10 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>> i
 			} else {
 				ThreadPoolManager.getInstance().executePacket(this);
 			}
-		} catch (RejectedExecutionException e) {
-			// if the server is shutdown we ignore
+		} catch (RejectedExecutionException ex) {
+			// If the server is shutdown we ignore.
 			if (!ThreadPoolManager.getInstance().isShutdown()) {
-				_log.severe("Failed executing: " + packet.getClass().getSimpleName() + " for Client: " + toString());
+				LOG.error("Failed executing {}, for client {}!", packet.getClass().getSimpleName(), toString(), ex);
 			}
 		}
 	}
@@ -913,16 +899,16 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>> i
 					return;
 				}
 				
-				if (_isDetached) // clear queue immediately after detach
-				{
+				// Clear queue immediately after detach.
+				if (_isDetached) {
 					_packetQueue.clear();
 					return;
 				}
 				
 				try {
 					packet.run();
-				} catch (Exception e) {
-					_log.severe("Exception during execution " + packet.getClass().getSimpleName() + ", client: " + toString() + "," + e.getMessage());
+				} catch (Exception ex) {
+					LOG.error("Exception during execution {}, client {}!", packet.getClass().getSimpleName(), this, ex);
 				}
 				
 				count++;

src/main/java/com/l2jserver/gameserver/network/clientpackets/CharacterSelect.java

@@ -20,9 +20,8 @@ package com.l2jserver.gameserver.network.clientpackets;
 
 import static com.l2jserver.gameserver.network.L2GameClient.GameClientState.JOINING;
 
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.l2jserver.gameserver.config.Config;
 import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
@@ -48,7 +47,7 @@ public class CharacterSelect extends L2GameClientPacket {
 	
 	private static final String _C__12_CHARACTERSELECT = "[C] 12 CharacterSelect";
 	
-	protected static final Logger _logAccounting = Logger.getLogger("accounting");
+	private static final Logger LOG_ACCOUNTING = LoggerFactory.getLogger("accounting");
 	
 	// cd
 	private int _charSlot;
@@ -149,11 +148,7 @@ public class CharacterSelect extends L2GameClientPacket {
 				client.getActiveCharLock().unlock();
 			}
 			
-			LogRecord record = new LogRecord(Level.INFO, "Logged in");
-			record.setParameters(new Object[] {
-				client
-			});
-			_logAccounting.log(record);
+			LOG_ACCOUNTING.info("Client {} logged in.", client);
 		}
 	}
 	

src/main/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java

@@ -45,7 +45,7 @@ import com.l2jserver.gameserver.cache.HtmCache;
 import com.l2jserver.gameserver.data.sql.impl.AnnouncementsTable;
 import com.l2jserver.gameserver.data.xml.impl.AdminData;
 import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
-import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
 import com.l2jserver.gameserver.instancemanager.CastleManager;
 import com.l2jserver.gameserver.instancemanager.ClanHallManager;
 import com.l2jserver.gameserver.instancemanager.CoupleManager;
@@ -253,7 +253,7 @@ public class EnterWorld extends L2GameClientPacket {
 				}
 			}
 			
-			for (SiegableHall hall : CHSiegeManager.getInstance().getConquerableHalls().values()) {
+			for (SiegableHall hall : ClanHallSiegeManager.getInstance().getConquerableHalls().values()) {
 				if (!hall.isInSiege()) {
 					continue;
 				}

src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinSiege.java

@@ -19,7 +19,7 @@
 
 package com.l2jserver.gameserver.network.clientpackets;
 
-import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
 import com.l2jserver.gameserver.instancemanager.CastleManager;
 import com.l2jserver.gameserver.model.ClanPrivilege;
 import com.l2jserver.gameserver.model.L2Clan;
@@ -81,16 +81,16 @@ public final class RequestJoinSiege extends L2GameClientPacket {
 			castle.getSiege().listRegisterClan(activeChar);
 		}
 		
-		SiegableHall hall = CHSiegeManager.getInstance().getSiegableHall(_castleId);
+		SiegableHall hall = ClanHallSiegeManager.getInstance().getSiegableHall(_castleId);
 		if (hall != null) {
 			if (_isJoining == 1) {
 				if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) {
 					activeChar.sendPacket(SystemMessageId.CANT_PARTICIPATE_IN_SIEGE_WHILE_DISSOLUTION_IN_PROGRESS);
 					return;
 				}
-				CHSiegeManager.getInstance().registerClan(clan, hall, activeChar);
+				ClanHallSiegeManager.getInstance().registerClan(clan, hall, activeChar);
 			} else {
-				CHSiegeManager.getInstance().unRegisterClan(clan, hall);
+				ClanHallSiegeManager.getInstance().unRegisterClan(clan, hall);
 			}
 			activeChar.sendPacket(new SiegeInfo(hall));
 		}

src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRestartPoint.java

@@ -19,7 +19,7 @@
 package com.l2jserver.gameserver.network.clientpackets;
 
 import com.l2jserver.gameserver.ThreadPoolManager;
-import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
 import com.l2jserver.gameserver.instancemanager.CastleManager;
 import com.l2jserver.gameserver.instancemanager.ClanHallManager;
 import com.l2jserver.gameserver.instancemanager.FortManager;
@@ -168,7 +168,7 @@ public final class RequestRestartPoint extends L2GameClientPacket {
 				L2SiegeClan siegeClan = null;
 				castle = CastleManager.getInstance().getCastle(activeChar);
 				fort = FortManager.getInstance().getFort(activeChar);
-				hall = CHSiegeManager.getInstance().getNearbyClanHall(activeChar);
+				hall = ClanHallSiegeManager.getInstance().getNearbyClanHall(activeChar);
 				L2SiegeFlagInstance flag = TerritoryWarManager.getInstance().getHQForClan(activeChar.getClan());
 				
 				if ((castle != null) && castle.getSiege().isInProgress()) {

src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSiegeAttackerList.java

@@ -19,7 +19,7 @@
 
 package com.l2jserver.gameserver.network.clientpackets;
 
-import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
 import com.l2jserver.gameserver.instancemanager.CastleManager;
 import com.l2jserver.gameserver.model.entity.Castle;
 import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
@@ -46,7 +46,7 @@ public final class RequestSiegeAttackerList extends L2GameClientPacket {
 			SiegeAttackerList sal = new SiegeAttackerList(castle);
 			sendPacket(sal);
 		} else {
-			SiegableHall hall = CHSiegeManager.getInstance().getSiegableHall(_castleId);
+			SiegableHall hall = ClanHallSiegeManager.getInstance().getSiegableHall(_castleId);
 			if (hall != null) {
 				SiegeAttackerList sal = new SiegeAttackerList(hall);
 				sendPacket(sal);

src/main/java/com/l2jserver/gameserver/network/serverpackets/Die.java

@@ -19,7 +19,7 @@
 package com.l2jserver.gameserver.network.serverpackets;
 
 import com.l2jserver.gameserver.data.xml.impl.AdminData;
-import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
 import com.l2jserver.gameserver.instancemanager.CastleManager;
 import com.l2jserver.gameserver.instancemanager.FortManager;
 import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
@@ -80,7 +80,7 @@ public class Die extends L2GameServerPacket {
 			L2SiegeClan siegeClan = null;
 			Castle castle = CastleManager.getInstance().getCastle(_activeChar);
 			Fort fort = FortManager.getInstance().getFort(_activeChar);
-			SiegableHall hall = CHSiegeManager.getInstance().getNearbyClanHall(_activeChar);
+			SiegableHall hall = ClanHallSiegeManager.getInstance().getNearbyClanHall(_activeChar);
 			if ((castle != null) && castle.getSiege().isInProgress()) {
 				// siege in progress
 				siegeClan = castle.getSiege().getAttackerClan(_clan);

src/main/java/com/l2jserver/gameserver/network/serverpackets/SiegeInfo.java

@@ -22,7 +22,7 @@ import java.util.Calendar;
 
 import com.l2jserver.gameserver.config.Config;
 import com.l2jserver.gameserver.data.sql.impl.ClanTable;
-import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.Castle;
@@ -130,7 +130,7 @@ public class SiegeInfo extends L2GameServerPacket {
 			}
 			
 			writeD((int) (Calendar.getInstance().getTimeInMillis() / 1000));
-			writeD((int) ((CHSiegeManager.getInstance().getSiegableHall(_hall.getId()).getNextSiegeTime()) / 1000));
+			writeD((int) ((ClanHallSiegeManager.getInstance().getSiegableHall(_hall.getId()).getNextSiegeTime()) / 1000));
 			writeD(0x00); // number of choices?
 		}
 	}

src/main/java/com/l2jserver/gameserver/script/faenor/FaenorEventParser.java

@@ -19,11 +19,11 @@
 package com.l2jserver.gameserver.script.faenor;
 
 import java.util.Date;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import javax.script.ScriptContext;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Node;
 
 import com.l2jserver.gameserver.ThreadPoolManager;
@@ -37,22 +37,24 @@ import com.l2jserver.gameserver.script.ScriptEngine;
  * @author Luis Arias
  */
 public class FaenorEventParser extends FaenorParser {
-	static Logger _log = Logger.getLogger(FaenorEventParser.class.getName());
+	
+	private static final Logger LOG = LoggerFactory.getLogger(FaenorEventParser.class);
+	
 	private DateRange _eventDates = null;
 	
 	@Override
 	public void parseScript(final Node eventNode, ScriptContext context) {
-		String ID = attribute(eventNode, "ID");
+		String id = attribute(eventNode, "ID");
 		_eventDates = DateRange.parse(attribute(eventNode, "Active"), DATE_FORMAT);
 		
 		Date currentDate = new Date();
 		if (_eventDates.getEndDate().before(currentDate)) {
-			_log.info("Event ID: (" + ID + ") has passed... Ignored.");
+			LOG.info("Event Id {} has passed... Ignored.", id);
 			return;
 		}
 		
 		if (_eventDates.getStartDate().after(currentDate)) {
-			_log.info("Event ID: (" + ID + ") is not active yet... Ignored.");
+			LOG.info("Event Id {} is not active yet... Ignored.", id);
 			ThreadPoolManager.getInstance().scheduleGeneral(() -> parseEventDropAndMessage(eventNode), _eventDates.getStartDate().getTime() - currentDate.getTime());
 			return;
 		}
@@ -78,8 +80,8 @@ public class FaenorEventParser extends FaenorParser {
 			if (type.equalsIgnoreCase("OnJoin")) {
 				_bridge.onPlayerLogin(message, _eventDates);
 			}
-		} catch (Exception e) {
-			_log.log(Level.WARNING, "Error in event parser: " + e.getMessage(), e);
+		} catch (Exception ex) {
+			LOG.warn("There has been an error in event parser!", ex);
 		}
 	}
 	
@@ -98,8 +100,8 @@ public class FaenorEventParser extends FaenorParser {
 			double chance = getPercent(attribute(drop, "Chance"));
 			
 			_bridge.addEventDrop(items, count, chance, _eventDates);
-		} catch (Exception e) {
-			_log.log(Level.WARNING, "ERROR(parseEventDrop):" + e.getMessage(), e);
+		} catch (Exception ex) {
+			LOG.warn("There has been an error parsing drops!", ex);
 		}
 	}
 	

src/main/java/com/l2jserver/gameserver/script/faenor/FaenorScriptEngine.java

@@ -22,11 +22,11 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import javax.script.ScriptContext;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Node;
 
 import com.l2jserver.gameserver.config.Config;
@@ -40,7 +40,9 @@ import com.l2jserver.util.file.filter.XMLFilter;
  * @author Luis Arias
  */
 public class FaenorScriptEngine extends ScriptEngine {
-	private static final Logger _log = Logger.getLogger(FaenorScriptEngine.class.getName());
+	
+	private static final Logger LOG = LoggerFactory.getLogger(FaenorScriptEngine.class);
+	
 	public static final String PACKAGE_DIRECTORY = "data/faenor/";
 	
 	protected FaenorScriptEngine() {
@@ -50,8 +52,8 @@ public class FaenorScriptEngine extends ScriptEngine {
 			for (File file : files) {
 				try (InputStream in = new FileInputStream(file)) {
 					parseScript(new ScriptDocument(file.getName(), in), null);
-				} catch (IOException e) {
-					_log.log(Level.WARNING, e.getMessage(), e);
+				} catch (IOException ex) {
+					LOG.warn("There has been an error parsing Faenor XMLs!", ex);
 				}
 			}
 		}
@@ -64,28 +66,28 @@ public class FaenorScriptEngine extends ScriptEngine {
 		Parser parser = null;
 		try {
 			parser = createParser(parserClass);
-		} catch (ParserNotCreatedException e) {
-			_log.log(Level.WARNING, "ERROR: No parser registered for Script: " + parserClass + ": " + e.getMessage(), e);
+		} catch (ParserNotCreatedException ex) {
+			LOG.warn("No parser registered for script {}!", parserClass, ex);
 		}
 		
 		if (parser == null) {
-			_log.warning("Unknown Script Type: " + script.getName());
+			LOG.warn("Unknown script type {}!", script.getName());
 			return;
 		}
 		
 		try {
 			parser.parseScript(node, context);
-			_log.info(getClass().getSimpleName() + ": Loaded  " + script.getName() + " successfully.");
-		} catch (Exception e) {
-			_log.log(Level.WARNING, "Script Parsing Failed: " + e.getMessage(), e);
+			LOG.info("Loaded {} successfully.", script.getName());
+		} catch (Exception ex) {
+			LOG.warn("Script parsing failed!", ex);
 		}
 	}
 	
 	public static FaenorScriptEngine getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final FaenorScriptEngine _instance = new FaenorScriptEngine();
+		protected static final FaenorScriptEngine INSTANCE = new FaenorScriptEngine();
 	}
 }

src/main/java/com/l2jserver/gameserver/taskmanager/Task.java

@@ -19,15 +19,14 @@
 package com.l2jserver.gameserver.taskmanager;
 
 import java.util.concurrent.ScheduledFuture;
-import java.util.logging.Logger;
 
 import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
 
 /**
+ * Abstract task.
  * @author Layane
  */
 public abstract class Task {
-	protected final Logger _log = Logger.getLogger(getClass().getName());
 	
 	public void initializate() {
 	}

src/main/java/com/l2jserver/gameserver/taskmanager/TaskManager.java

@@ -32,8 +32,9 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ScheduledFuture;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.l2jserver.commons.database.ConnectionFactory;
 import com.l2jserver.gameserver.ThreadPoolManager;
@@ -51,11 +52,12 @@ import com.l2jserver.gameserver.taskmanager.tasks.TaskSevenSignsUpdate;
 import com.l2jserver.gameserver.taskmanager.tasks.TaskShutdown;
 
 /**
+ * Task Manager.
  * @author Layane
  */
 public final class TaskManager {
 	
-	private static final Logger _log = Logger.getLogger(TaskManager.class.getName());
+	private static final Logger LOG = LoggerFactory.getLogger(TaskManager.class);
 	
 	private final Map<Integer, Task> _tasks = new ConcurrentHashMap<>();
 	
@@ -71,7 +73,7 @@ public final class TaskManager {
 	protected TaskManager() {
 		initializate();
 		startAllTasks();
-		_log.log(Level.INFO, getClass().getSimpleName() + ": Loaded: " + _tasks.size() + " Tasks");
+		LOG.info("Loaded {} tasks.", _tasks.size());
 	}
 	
 	public class ExecutedTask implements Runnable {
@@ -103,8 +105,8 @@ public final class TaskManager {
 				statement.setLong(1, lastActivation);
 				statement.setInt(2, id);
 				statement.executeUpdate();
-			} catch (SQLException e) {
-				_log.log(Level.WARNING, getClass().getSimpleName() + ": Cannot updated the Global Task " + id + ": " + e.getMessage(), e);
+			} catch (SQLException ex) {
+				LOG.warn("Cannot updated global task Id {}!", id, ex);
 			}
 			
 			if ((type == TYPE_SHEDULED) || (type == TYPE_TIME)) {
@@ -201,8 +203,8 @@ public final class TaskManager {
 					}
 				}
 			}
-		} catch (Exception e) {
-			_log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while loading Global Task table: " + e.getMessage(), e);
+		} catch (Exception ex) {
+			LOG.warn("There has been an error while loading global task table!", ex);
 		}
 	}
 	
@@ -231,7 +233,7 @@ public final class TaskManager {
 						task.scheduled = scheduler.scheduleGeneral(task, diff);
 						return true;
 					}
-					_log.info(getClass().getSimpleName() + ": Task " + task.getId() + " is obsoleted.");
+					LOG.info("Task {} is due.", task.getId());
 				} catch (Exception e) {
 				}
 				break;
@@ -247,7 +249,7 @@ public final class TaskManager {
 				String[] hour = task.getParams()[1].split(":");
 				
 				if (hour.length != 3) {
-					_log.warning(getClass().getSimpleName() + ": Task " + task.getId() + " has incorrect parameters");
+					LOG.warn("Task {} has incorrect parameters!", task.getId());
 					return false;
 				}
 				
@@ -259,8 +261,8 @@ public final class TaskManager {
 					min.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0]));
 					min.set(Calendar.MINUTE, Integer.parseInt(hour[1]));
 					min.set(Calendar.SECOND, Integer.parseInt(hour[2]));
-				} catch (Exception e) {
-					_log.log(Level.WARNING, getClass().getSimpleName() + ": Bad parameter on task " + task.getId() + ": " + e.getMessage(), e);
+				} catch (Exception ex) {
+					LOG.warn("Bad parameter on task Id {}!" + task.getId(), ex);
 					return false;
 				}
 				
@@ -299,8 +301,8 @@ public final class TaskManager {
 				}
 			}
 			return true;
-		} catch (SQLException e) {
-			_log.log(Level.WARNING, TaskManager.class.getSimpleName() + ": Cannot add the unique task: " + e.getMessage(), e);
+		} catch (SQLException ex) {
+			LOG.warn("Cannot add the unique task!", ex);
 		}
 		return false;
 	}
@@ -320,17 +322,17 @@ public final class TaskManager {
 			statement.setString(6, param3);
 			statement.execute();
 			return true;
-		} catch (SQLException e) {
-			_log.log(Level.WARNING, TaskManager.class.getSimpleName() + ": Cannot add the task:  " + e.getMessage(), e);
+		} catch (SQLException ex) {
+			LOG.warn("Cannot add the task {}!", task, ex);
 		}
 		return false;
 	}
 	
 	public static TaskManager getInstance() {
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder {
-		protected static final TaskManager _instance = new TaskManager();
+		protected static final TaskManager INSTANCE = new TaskManager();
 	}
 }

src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskBirthday.java

@@ -20,6 +20,9 @@ package com.l2jserver.gameserver.taskmanager.tasks;
 
 import java.util.concurrent.TimeUnit;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.l2jserver.commons.database.ConnectionFactory;
 import com.l2jserver.gameserver.config.Config;
 import com.l2jserver.gameserver.instancemanager.MailManager;
@@ -35,6 +38,8 @@ import com.l2jserver.gameserver.taskmanager.TaskTypes;
  */
 public class TaskBirthday extends Task {
 	
+	private static final Logger LOG = LoggerFactory.getLogger(TaskBirthday.class);
+	
 	private static final String NAME = "birthday";
 	
 	/** Get all players that have had a birthday since last check. */
@@ -50,7 +55,7 @@ public class TaskBirthday extends Task {
 		// TODO(Zoey76): Fix first run.
 		final int birthdayGiftCount = giveBirthdayGifts(task.getLastActivation());
 		
-		_log.info("BirthdayManager: " + birthdayGiftCount + " gifts sent.");
+		LOG.info("{} gifts sent.", birthdayGiftCount);
 	}
 	
 	private int giveBirthdayGifts(long lastActivation) {
@@ -70,15 +75,14 @@ public class TaskBirthday extends Task {
 					birthdayGiftCount++;
 				}
 			}
-		} catch (Exception e) {
-			_log.warning("Error checking birthdays: " + e.getMessage());
+		} catch (Exception ex) {
+			LOG.warn("There has been an error sending gifts!", ex);
 		}
 		return birthdayGiftCount;
 	}
 	
 	@Override
 	public void initializate() {
-		super.initializate();
 		TaskManager.addUniqueTask(NAME, TaskTypes.TYPE_GLOBAL_TASK, "1", "06:30:00", "");
 	}
 }

src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskClanLeaderApply.java

@@ -20,6 +20,9 @@ package com.l2jserver.gameserver.taskmanager.tasks;
 
 import java.util.Calendar;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.l2jserver.gameserver.config.Config;
 import com.l2jserver.gameserver.data.sql.impl.ClanTable;
 import com.l2jserver.gameserver.model.L2Clan;
@@ -33,6 +36,9 @@ import com.l2jserver.gameserver.taskmanager.TaskTypes;
  * @author UnAfraid
  */
 public class TaskClanLeaderApply extends Task {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(TaskClanLeaderApply.class);
+	
 	private static final String NAME = "clanleaderapply";
 	
 	@Override
@@ -54,7 +60,7 @@ public class TaskClanLeaderApply extends Task {
 					clan.setNewLeader(member);
 				}
 			}
-			_log.info(getClass().getSimpleName() + ": launched.");
+			LOG.info("Task launched.");
 		}
 	}
 	

src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskCleanUp.java

@@ -25,6 +25,7 @@ import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
  * @author Tempy
  */
 public final class TaskCleanUp extends Task {
+	
 	public static final String NAME = "clean_up";
 	
 	@Override

src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskDailySkillReuseClean.java

@@ -20,6 +20,9 @@ package com.l2jserver.gameserver.taskmanager.tasks;
 
 import java.sql.PreparedStatement;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.l2jserver.commons.database.ConnectionFactory;
 import com.l2jserver.gameserver.taskmanager.Task;
 import com.l2jserver.gameserver.taskmanager.TaskManager;
@@ -27,10 +30,12 @@ import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
 import com.l2jserver.gameserver.taskmanager.TaskTypes;
 
 public class TaskDailySkillReuseClean extends Task {
+
+	private static final Logger LOG = LoggerFactory.getLogger(TaskDailySkillReuseClean.class);
 	
 	private static final String NAME = "daily_skill_clean";
 	
-	private static final int[] _daily_skills = {
+	private static final int[] DAILY_SKILLS = {
 		2510,
 		22180
 	};
@@ -43,21 +48,20 @@ public class TaskDailySkillReuseClean extends Task {
 	@Override
 	public void onTimeElapsed(ExecutedTask task) {
 		try (var con = ConnectionFactory.getInstance().getConnection()) {
-			for (int skill_id : _daily_skills) {
-				try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_skills_save WHERE skill_id=?;")) {
+			for (int skill_id : DAILY_SKILLS) {
+				try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_skills_save WHERE skill_id=?")) {
 					ps.setInt(1, skill_id);
 					ps.execute();
 				}
 			}
-		} catch (Exception e) {
-			_log.severe(getClass().getSimpleName() + ": Could not reset daily skill reuse: " + e);
+		} catch (Exception ex) {
+			LOG.warn("Could not reset daily skill reuse!", ex);
 		}
-		_log.info("Daily skill reuse cleaned.");
+		LOG.info("Daily skill reuse cleaned.");
 	}
 	
 	@Override
 	public void initializate() {
-		super.initializate();
 		TaskManager.addUniqueTask(NAME, TaskTypes.TYPE_GLOBAL_TASK, "1", "06:30:00", "");
 	}
 }

src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskGlobalVariablesSave.java

@@ -42,7 +42,6 @@ public class TaskGlobalVariablesSave extends Task {
 	
 	@Override
 	public void initializate() {
-		super.initializate();
 		TaskManager.addUniqueTask(NAME, TaskTypes.TYPE_FIXED_SHEDULED, "500000", "1800000", "");
 	}
 }

src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskOlympiadSave.java

@@ -18,6 +18,9 @@
  */
 package com.l2jserver.gameserver.taskmanager.tasks;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.l2jserver.gameserver.model.olympiad.Olympiad;
 import com.l2jserver.gameserver.taskmanager.Task;
 import com.l2jserver.gameserver.taskmanager.TaskManager;
@@ -29,6 +32,9 @@ import com.l2jserver.gameserver.taskmanager.TaskTypes;
  * @author godson
  */
 public class TaskOlympiadSave extends Task {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(TaskOlympiadSave.class);
+	
 	public static final String NAME = "olympiad_save";
 	
 	@Override
@@ -40,7 +46,7 @@ public class TaskOlympiadSave extends Task {
 	public void onTimeElapsed(ExecutedTask task) {
 		if (Olympiad.getInstance().inCompPeriod()) {
 			Olympiad.getInstance().saveOlympiadStatus();
-			_log.info("Olympiad System: Data updated.");
+			LOG.info("Data updated.");
 		}
 	}
 	

src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskRaidPointsReset.java

@@ -22,6 +22,9 @@ import java.util.Calendar;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.l2jserver.gameserver.config.Config;
 import com.l2jserver.gameserver.data.sql.impl.ClanTable;
 import com.l2jserver.gameserver.instancemanager.RaidBossPointsManager;
@@ -32,6 +35,9 @@ import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
 import com.l2jserver.gameserver.taskmanager.TaskTypes;
 
 public class TaskRaidPointsReset extends Task {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(TaskRaidPointsReset.class);
+	
 	public static final String NAME = "raid_points_reset";
 	
 	@Override
@@ -94,13 +100,12 @@ public class TaskRaidPointsReset extends Task {
 			}
 			
 			RaidBossPointsManager.getInstance().cleanUp();
-			_log.info("Raid Points Reset Global Task: launched.");
+			LOG.info("Raid points reset global task launched.");
 		}
 	}
 	
 	@Override
 	public void initializate() {
-		super.initializate();
 		TaskManager.addUniqueTask(NAME, TaskTypes.TYPE_GLOBAL_TASK, "1", "00:10:00", "");
 	}
 }

src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskRecom.java

@@ -18,6 +18,9 @@
  */
 package com.l2jserver.gameserver.taskmanager.tasks;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.l2jserver.commons.database.ConnectionFactory;
 import com.l2jserver.gameserver.taskmanager.Task;
 import com.l2jserver.gameserver.taskmanager.TaskManager;
@@ -29,6 +32,8 @@ import com.l2jserver.gameserver.taskmanager.TaskTypes;
  */
 public class TaskRecom extends Task {
 	
+	private static final Logger LOG = LoggerFactory.getLogger(TaskRecom.class);
+	
 	private static final String NAME = "recommendations";
 	
 	@Override
@@ -50,15 +55,14 @@ public class TaskRecom extends Task {
 				ps.setInt(2, 3600000); // Timer = 1 hour
 				ps.execute();
 			}
-		} catch (Exception e) {
-			_log.severe(getClass().getSimpleName() + ": Could not reset Recommendations System: " + e);
+		} catch (Exception ex) {
+			LOG.warn("Could not reset recommendations system!", ex);
 		}
-		_log.info("Recommendations System reseted");
+		LOG.info("Recommendations System reseted.");
 	}
 	
 	@Override
 	public void initializate() {
-		super.initializate();
 		TaskManager.addUniqueTask(NAME, TaskTypes.TYPE_GLOBAL_TASK, "1", "06:30:00", "");
 	}
 }

src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskRestart.java

@@ -26,6 +26,7 @@ import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
  * @author Layane
  */
 public final class TaskRestart extends Task {
+	
 	public static final String NAME = "restart";
 	
 	@Override

src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskScript.java

@@ -20,6 +20,9 @@ package com.l2jserver.gameserver.taskmanager.tasks;
 
 import java.io.File;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.l2jserver.gameserver.scripting.ScriptEngineManager;
 import com.l2jserver.gameserver.taskmanager.Task;
 import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
@@ -28,7 +31,10 @@ import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
  * @author janiii
  */
 public class TaskScript extends Task {
-	public static final String NAME = "script";
+	
+	private static final Logger LOG = LoggerFactory.getLogger(TaskScript.class);
+	
+	private static final String NAME = "script";
 	
 	@Override
 	public String getName() {
@@ -39,14 +45,14 @@ public class TaskScript extends Task {
 	public void onTimeElapsed(ExecutedTask task) {
 		final File file = new File(ScriptEngineManager.SCRIPT_FOLDER, "cron/" + task.getParams()[2]);
 		if (!file.isFile()) {
-			_log.warning("File Not Found: " + task.getParams()[2]);
+			LOG.warn("File not found {}!", task.getParams()[2]);
 			return;
 		}
 		
 		try {
 			ScriptEngineManager.getInstance().compileScript(file);
-		} catch (Exception e) {
-			_log.warning("Failed loading: " + task.getParams()[2]);
+		} catch (Exception ex) {
+			LOG.warn("Failed loading {}!", task.getParams()[2]);
 		}
 	}
 }

src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskSevenSignsUpdate.java

@@ -18,6 +18,9 @@
  */
 package com.l2jserver.gameserver.taskmanager.tasks;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.l2jserver.gameserver.SevenSigns;
 import com.l2jserver.gameserver.SevenSignsFestival;
 import com.l2jserver.gameserver.taskmanager.Task;
@@ -30,6 +33,9 @@ import com.l2jserver.gameserver.taskmanager.TaskTypes;
  * @author Tempy
  */
 public class TaskSevenSignsUpdate extends Task {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(TaskSevenSignsUpdate.class);
+	
 	private static final String NAME = "seven_signs_update";
 	
 	@Override
@@ -44,15 +50,14 @@ public class TaskSevenSignsUpdate extends Task {
 			if (!SevenSigns.getInstance().isSealValidationPeriod()) {
 				SevenSignsFestival.getInstance().saveFestivalData(false);
 			}
-			_log.info("SevenSigns: Data updated successfully.");
-		} catch (Exception e) {
-			_log.warning(getClass().getSimpleName() + ": SevenSigns: Failed to save Seven Signs configuration: " + e.getMessage());
+			LOG.info("Data updated successfully.");
+		} catch (Exception ex) {
+			LOG.warn("Failed to save Seven Signs configuration!", ex);
 		}
 	}
 	
 	@Override
 	public void initializate() {
-		super.initializate();
 		TaskManager.addUniqueTask(NAME, TaskTypes.TYPE_FIXED_SHEDULED, "1800000", "1800000", "");
 	}
 }

src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskShutdown.java

@@ -26,6 +26,7 @@ import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
  * @author Layane
  */
 public class TaskShutdown extends Task {
+	
 	public static final String NAME = "shutdown";
 	
 	@Override

src/main/java/com/l2jserver/gameserver/util/IXmlReader.java

@@ -40,10 +40,13 @@ import com.l2jserver.util.file.filter.XMLFilter;
  * @author Zoey76
  */
 public interface IXmlReader {
+	
 	static final Logger LOG = LoggerFactory.getLogger(IXmlReader.class);
 	
 	static final String JAXP_SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
+	
 	static final String W3C_XML_SCHEMA = "http://www.w3.org/2001/XMLSchema";
+	
 	/** The default file filter, ".xml" files only. */
 	static final XMLFilter XML_FILTER = new XMLFilter();
 	

src/main/resources/log.cfg

@@ -1,162 +0,0 @@
-############################################################
-#  	Global properties
-############################################################
-
-# "handlers" specifies a comma separated list of log Handler 
-# classes.  These handlers will be installed during VM startup.
-# Note that these classes must be on the system classpath.
-# By default we only configure a ConsoleHandler, which will only
-# show messages at the INFO and above levels.
-#handlers= java.util.logging.ConsoleHandler
-
-# To also add the FileHandler, use the following line instead.
-handlers = java.util.logging.FileHandler,\
-		java.util.logging.ConsoleHandler,\
-		com.l2jserver.log.handler.ErrorLogHandler
-chat.handlers = com.l2jserver.log.handler.ChatLogHandler
-chat.useParentHandlers = false
-gmaudit.handlers = com.l2jserver.log.handler.GMAuditLogHandler
-gmaudit.useParentHandlers = false
-item.handlers = com.l2jserver.log.handler.ItemLogHandler
-item.useParentHandlers = false
-audit.handlers = com.l2jserver.log.handler.AuditLogHandler
-audit.useParentHandlers = false
-enchant.handlers = com.l2jserver.log.handler.EnchantItemLogHandler,\
-		com.l2jserver.log.handler.EnchantSkillLogHandler
-enchant.useParentHandlers = false
-olympiad.handlers = com.l2jserver.log.handler.OlympiadLogHandler
-olympiad.useParentHandlers = false
-damage.handlers = com.l2jserver.log.handler.AllDamageLogHandler,\
-		com.l2jserver.log.handler.PDamageLogHandler,\
-		com.l2jserver.log.handler.MDamageLogHandler
-damage.useParentHandlers = false
-accounting.handlers = com.l2jserver.log.handler.AccountingLogHandler
-accounting.useParentHandlers = false
-
-# Default global logging level.
-# This specifies which kinds of events are logged across
-# all loggers.  For any given facility this global level
-# can be overridden by a facility specific level
-# Note that the ConsoleHandler also has a separate level
-# setting to limit messages printed to the console.
-.level= CONFIG
-
-############################################################
-# Handler specific properties.
-# Describes specific configuration info for Handlers.
-############################################################
-
-# default file output is in user's home directory.
-java.util.logging.FileHandler.pattern = log/java%g.log
-java.util.logging.FileHandler.count = 20
-java.util.logging.FileHandler.limit = 0
-java.util.logging.FileHandler.formatter = com.l2jserver.log.formatter.FileLogFormatter
-java.util.logging.FileHandler.level = CONFIG
-
-# Limit the message that are printed on the console to INFO and above.
-java.util.logging.ConsoleHandler.level = FINER
-java.util.logging.ConsoleHandler.formatter = com.l2jserver.log.formatter.ConsoleLogFormatter
-
-# log errors (exceptions)
-com.l2jserver.log.handler.ErrorLogHandler.pattern = log/error%g.log
-com.l2jserver.log.handler.ErrorLogHandler.count = 20
-com.l2jserver.log.handler.ErrorLogHandler.limit = 0
-com.l2jserver.log.handler.ErrorLogHandler.formatter = java.util.logging.SimpleFormatter
-com.l2jserver.log.handler.ErrorLogHandler.filter = com.l2jserver.log.filter.ErrorFilter
-com.l2jserver.log.handler.ErrorLogHandler.level = CONFIG
-
-# log chats
-com.l2jserver.log.handler.ChatLogHandler.pattern = log/chat.log
-com.l2jserver.log.handler.ChatLogHandler.formatter = com.l2jserver.log.formatter.ChatLogFormatter
-com.l2jserver.log.handler.ChatLogHandler.filter = com.l2jserver.log.filter.ChatFilter
-com.l2jserver.log.handler.ChatLogHandler.append = true
-com.l2jserver.log.handler.ChatLogHandler.level = INFO
-
-# log GM Audit
-com.l2jserver.log.handler.GMAuditLogHandler.pattern = log/gmaudit.log
-com.l2jserver.log.handler.GMAuditLogHandler.formatter = com.l2jserver.log.formatter.GMAuditFormatter
-com.l2jserver.log.handler.GMAuditLogHandler.filter = com.l2jserver.log.filter.GMAuditFilter
-com.l2jserver.log.handler.GMAuditLogHandler.append = true
-com.l2jserver.log.handler.GMAuditLogHandler.level = INFO
-
-# log items
-com.l2jserver.log.handler.ItemLogHandler.pattern = log/item.log
-com.l2jserver.log.handler.ItemLogHandler.formatter = com.l2jserver.log.formatter.ItemLogFormatter
-com.l2jserver.log.handler.ItemLogHandler.filter = com.l2jserver.log.filter.ItemFilter
-com.l2jserver.log.handler.ItemLogHandler.append = true
-com.l2jserver.log.handler.ItemLogHandler.level = INFO
-
-# audit
-com.l2jserver.log.handler.AuditLogHandler.pattern = log/audit.log
-com.l2jserver.log.handler.AuditLogHandler.formatter = com.l2jserver.log.formatter.AuditFormatter
-com.l2jserver.log.handler.AuditLogHandler.filter = com.l2jserver.log.filter.AuditFilter
-com.l2jserver.log.handler.AuditLogHandler.append = true
-com.l2jserver.log.handler.AuditLogHandler.level = INFO
-
-# enchant item log
-com.l2jserver.log.handler.EnchantItemLogHandler.pattern = log/enchantitem.log
-com.l2jserver.log.handler.EnchantItemLogHandler.formatter = com.l2jserver.log.formatter.EnchantFormatter
-com.l2jserver.log.handler.EnchantItemLogHandler.filter = com.l2jserver.log.filter.EnchantItemFilter
-com.l2jserver.log.handler.EnchantItemLogHandler.append = true
-com.l2jserver.log.handler.EnchantItemLogHandler.level = INFO
-
-# enchant skill log
-com.l2jserver.log.handler.EnchantSkillLogHandler.pattern = log/enchantskill.log
-com.l2jserver.log.handler.EnchantSkillLogHandler.formatter = com.l2jserver.log.formatter.EnchantFormatter
-com.l2jserver.log.handler.EnchantSkillLogHandler.filter = com.l2jserver.log.filter.EnchantSkillFilter
-com.l2jserver.log.handler.EnchantSkillLogHandler.append = true
-com.l2jserver.log.handler.EnchantSkillLogHandler.level = INFO
-
-# olympiad log
-com.l2jserver.log.handler.OlympiadLogHandler.pattern = log/olympiad.csv
-com.l2jserver.log.handler.OlympiadLogHandler.formatter = com.l2jserver.log.formatter.OlympiadFormatter
-com.l2jserver.log.handler.OlympiadLogHandler.append = true
-com.l2jserver.log.handler.OlympiadLogHandler.level = INFO
-
-# damage logs
-com.l2jserver.log.handler.AllDamageLogHandler.pattern = log/game/_all.txt
-com.l2jserver.log.handler.AllDamageLogHandler.formatter = com.l2jserver.log.formatter.DamageFormatter
-com.l2jserver.log.handler.AllDamageLogHandler.append = true
-com.l2jserver.log.handler.AllDamageLogHandler.level = INFO
-
-com.l2jserver.log.handler.PDamageLogHandler.pattern = log/game/damage_pdam.txt
-com.l2jserver.log.handler.PDamageLogHandler.formatter = com.l2jserver.log.formatter.DamageFormatter
-com.l2jserver.log.handler.PDamageLogHandler.filter = com.l2jserver.log.filter.PDamageFilter
-com.l2jserver.log.handler.PDamageLogHandler.append = true
-com.l2jserver.log.handler.PDamageLogHandler.level = INFO
-
-com.l2jserver.log.handler.MDamageLogHandler.pattern = log/game/damage_mdam.txt
-com.l2jserver.log.handler.MDamageLogHandler.formatter = com.l2jserver.log.formatter.DamageFormatter
-com.l2jserver.log.handler.MDamageLogHandler.filter = com.l2jserver.log.filter.MDamageFilter
-com.l2jserver.log.handler.MDamageLogHandler.append = true
-com.l2jserver.log.handler.MDamageLogHandler.level = INFO
-
-# accounting
-com.l2jserver.log.handler.AccountingLogHandler.pattern = log/accounting.log
-com.l2jserver.log.handler.AccountingLogHandler.formatter = com.l2jserver.log.formatter.AccountingFormatter
-com.l2jserver.log.handler.AccountingLogHandler.append = true
-com.l2jserver.log.handler.AccountingLogHandler.level = CONFIG
-
-############################################################
-# Facility specific properties.
-# Provides extra control for each logger.
-############################################################
-
-# For example, set the com.xyz.foo logger to only log SEVERE
-# messages:
-com.l2jserver.gameserver.level = CONFIG
-com.l2jserver.loginserver.level = CONFIG
-#com.l2jserver.gameserver.Connection.level = CONFIG
-com.l2jserver.gameserver.network.serverpackets.level = FINER
-com.l2jserver.gameserver.network.clientpackets.level = FINER
-com.l2jserver.gameserver.model.actor.L2Character.level = FINER
-com.l2jserver.gameserver.engines.DocumentEngine.level = INFO
-
-# Alt Privileges Administration
-AltPrivilegesAdmin.pattern = log/admin-commands.log
-AltPrivilegesAdmin.formatter = com.l2jserver.log.formatter.FileLogFormatter
-AltPrivilegesAdmin.append = true
-AltPrivilegesAdmin.level = CONFIG
-
-# c3p0 Logging
-com.mchange.v2.level = WARNING

src/main/resources/log4j2.xml

@@ -1,17 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Configuration status="INFO">
 	<Appenders>
-		<Console name="Console" target="SYSTEM_OUT">
+		<Console name="console" target="SYSTEM_OUT">
 			<PatternLayout pattern="[%-5level] %d{yyyy-MM-dd HH:mm:ss} %c{1}: %msg%n" />
 		</Console>
-		<File name="ServerFile" fileName="logs/server.log">
+		<RollingFile name="server" fileName="logs/server.log" filePattern="logs/server.%d{yyyy-MM-dd-HH-mm-ss}.log" ignoreExceptions="false">
 			<PatternLayout pattern="[%-5level] %d{yyyy-MM-dd HH:mm:ss} %c{1}: %msg%n" />
-		</File>
+			<Policies>
+				<OnStartupTriggeringPolicy />
+				<SizeBasedTriggeringPolicy size="100 MB" />
+			</Policies>
+		</RollingFile>
+		<RollingFile name="audit" fileName="logs/audit/audit.log" filePattern="logs/audit/audit.%d{yyyy-MM-dd-HH-mm-ss}.log" ignoreExceptions="false">
+			<PatternLayout pattern="[%-5level] %d{yyyy-MM-dd HH:mm:ss} %c{1}: %msg%n" />
+			<Policies>
+				<OnStartupTriggeringPolicy />
+				<SizeBasedTriggeringPolicy size="100 MB" />
+			</Policies>
+		</RollingFile>
+		<RollingFile name="accounting" fileName="logs/accounting/accounting.log" filePattern="logs/accounting/accounting.%d{yyyy-MM-dd-HH-mm-ss}.log" ignoreExceptions="false">
+			<PatternLayout pattern="[%-5level] %d{yyyy-MM-dd HH:mm:ss} %c{1}: %msg%n" />
+			<Policies>
+				<OnStartupTriggeringPolicy />
+				<SizeBasedTriggeringPolicy size="100 MB" />
+			</Policies>
+		</RollingFile>
+		<RollingFile name="chat" fileName="logs/chat/chat.log" filePattern="logs/chat/chat.%d{yyyy-MM-dd-HH-mm-ss}.log" ignoreExceptions="false">
+			<PatternLayout pattern="[%-5level] %d{yyyy-MM-dd HH:mm:ss} %c{1}: %msg%n" />
+			<Policies>
+				<OnStartupTriggeringPolicy />
+				<SizeBasedTriggeringPolicy size="100 MB" />
+			</Policies>
+		</RollingFile>
+		<RollingFile name="item" fileName="logs/item/item.log" filePattern="logs/item/item.%d{yyyy-MM-dd-HH-mm-ss}.log" ignoreExceptions="false">
+			<!-- TODO(Zoey76)> Exclude Arrows and Shots. -->
+			<PatternLayout pattern="[%-5level] %d{yyyy-MM-dd HH:mm:ss} %c{1}: %msg%n" />
+			<Policies>
+				<OnStartupTriggeringPolicy />
+				<SizeBasedTriggeringPolicy size="100 MB" />
+			</Policies>
+		</RollingFile>
+		<RollingFile name="error" fileName="logs/error/error.log" filePattern="logs/error/error.%d{yyyy-MM-dd-HH-mm-ss}.log" ignoreExceptions="false">
+			<PatternLayout pattern="[%-5level] %d{yyyy-MM-dd HH:mm:ss} %c{1}: %msg%n" />
+			<Policies>
+				<OnStartupTriggeringPolicy />
+				<SizeBasedTriggeringPolicy size="100 MB" />
+			</Policies>
+		</RollingFile>
 	</Appenders>
 	<Loggers>
 		<Root level="debug">
-			<appender-ref ref="Console" level="info" />
-			<appender-ref ref="ServerFile" level="info" />
+			<appender-ref ref="console" level="info" />
+			<appender-ref ref="server" level="info" />
+			<appender-ref ref="error" level="warn" />
 		</Root>
+		<Logger name="audit" level="info" additivity="false">
+			<AppenderRef ref="audit" />
+		</Logger>
+		<Logger name="chat" level="info" additivity="false">
+			<AppenderRef ref="chat" />
+		</Logger>
+		<Logger name="item" level="info" additivity="false">
+			<AppenderRef ref="item" />
+		</Logger>
 	</Loggers>
 </Configuration>