Proper total geodata file size information.

L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/GameServer.java

@@ -301,13 +301,7 @@ public class GameServer
 		ClanEntryManager.getInstance();
 		
 		printSection("Geodata");
-		long geodataMemory = getUsedMemoryMB();
 		GeoEngine.getInstance();
-		geodataMemory = getUsedMemoryMB() - geodataMemory;
-		if (geodataMemory < 0)
-		{
-			geodataMemory = 0;
-		}
 		
 		printSection("NPCs");
 		NpcData.getInstance();
@@ -444,7 +438,6 @@ public class GameServer
 		System.gc();
 		final long totalMem = Runtime.getRuntime().maxMemory() / 1048576;
 		LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory.");
-		LOGGER.info(getClass().getSimpleName() + ": Geodata use " + geodataMemory + " MB of memory.");
 		LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + ".");
 		LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds.");
 		

L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -53,15 +53,6 @@ public class GeoEngine
 	private final ABlock[][] _blocks;
 	private final BlockNull _nullBlock;
 	
-	/**
-	 * Returns the instance of the {@link GeoEngine}.
-	 * @return {@link GeoEngine} : The instance.
-	 */
-	public static GeoEngine getInstance()
-	{
-		return SingletonHolder._instance;
-	}
-	
 	/**
 	 * GeoEngine constructor. Loads all geodata files of chosen geodata format.
 	 */
@@ -80,6 +71,7 @@ public class GeoEngine
 		
 		// load geo files according to geoengine config setup
 		int loaded = 0;
+		long _fileSize = 0;
 		for (int rx = World.TILE_X_MIN; rx <= World.TILE_X_MAX; rx++)
 		{
 			for (int ry = World.TILE_Y_MIN; ry <= World.TILE_Y_MAX; ry++)
@@ -91,6 +83,7 @@ public class GeoEngine
 					if (loadGeoBlocks(rx, ry))
 					{
 						loaded++;
+						_fileSize += f.length();
 					}
 				}
 				else
@@ -102,6 +95,10 @@ public class GeoEngine
 		}
 		
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
+		if (loaded > 0)
+		{
+			LOGGER.info("GeoEngine: Total geodata file size " + (_fileSize / 1024 / 1024) + " MB.");
+		}
 		
 		// avoid wrong configs when no files are loaded
 		if (loaded == 0)
@@ -940,6 +937,15 @@ public class GeoEngine
 		return null;
 	}
 	
+	/**
+	 * Returns the instance of the {@link GeoEngine}.
+	 * @return {@link GeoEngine} : The instance.
+	 */
+	public static GeoEngine getInstance()
+	{
+		return SingletonHolder._instance;
+	}
+	
 	private static class SingletonHolder
 	{
 		protected static final GeoEngine _instance = Config.PATHFINDING ? new GeoEnginePathfinding() : new GeoEngine();

L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/GameServer.java

@@ -309,13 +309,7 @@ public class GameServer
 		ClanEntryManager.getInstance();
 		
 		printSection("Geodata");
-		long geodataMemory = getUsedMemoryMB();
 		GeoEngine.getInstance();
-		geodataMemory = getUsedMemoryMB() - geodataMemory;
-		if (geodataMemory < 0)
-		{
-			geodataMemory = 0;
-		}
 		
 		printSection("NPCs");
 		NpcData.getInstance();
@@ -452,7 +446,6 @@ public class GameServer
 		System.gc();
 		final long totalMem = Runtime.getRuntime().maxMemory() / 1048576;
 		LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory.");
-		LOGGER.info(getClass().getSimpleName() + ": Geodata use " + geodataMemory + " MB of memory.");
 		LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + ".");
 		LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds.");
 		

L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -53,15 +53,6 @@ public class GeoEngine
 	private final ABlock[][] _blocks;
 	private final BlockNull _nullBlock;
 	
-	/**
-	 * Returns the instance of the {@link GeoEngine}.
-	 * @return {@link GeoEngine} : The instance.
-	 */
-	public static GeoEngine getInstance()
-	{
-		return SingletonHolder._instance;
-	}
-	
 	/**
 	 * GeoEngine constructor. Loads all geodata files of chosen geodata format.
 	 */
@@ -80,6 +71,7 @@ public class GeoEngine
 		
 		// load geo files according to geoengine config setup
 		int loaded = 0;
+		long _fileSize = 0;
 		for (int rx = World.TILE_X_MIN; rx <= World.TILE_X_MAX; rx++)
 		{
 			for (int ry = World.TILE_Y_MIN; ry <= World.TILE_Y_MAX; ry++)
@@ -91,6 +83,7 @@ public class GeoEngine
 					if (loadGeoBlocks(rx, ry))
 					{
 						loaded++;
+						_fileSize += f.length();
 					}
 				}
 				else
@@ -102,6 +95,10 @@ public class GeoEngine
 		}
 		
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
+		if (loaded > 0)
+		{
+			LOGGER.info("GeoEngine: Total geodata file size " + (_fileSize / 1024 / 1024) + " MB.");
+		}
 		
 		// avoid wrong configs when no files are loaded
 		if (loaded == 0)
@@ -940,6 +937,15 @@ public class GeoEngine
 		return null;
 	}
 	
+	/**
+	 * Returns the instance of the {@link GeoEngine}.
+	 * @return {@link GeoEngine} : The instance.
+	 */
+	public static GeoEngine getInstance()
+	{
+		return SingletonHolder._instance;
+	}
+	
 	private static class SingletonHolder
 	{
 		protected static final GeoEngine _instance = Config.PATHFINDING ? new GeoEnginePathfinding() : new GeoEngine();

L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/GameServer.java

@@ -309,13 +309,7 @@ public class GameServer
 		ClanEntryManager.getInstance();
 		
 		printSection("Geodata");
-		long geodataMemory = getUsedMemoryMB();
 		GeoEngine.getInstance();
-		geodataMemory = getUsedMemoryMB() - geodataMemory;
-		if (geodataMemory < 0)
-		{
-			geodataMemory = 0;
-		}
 		
 		printSection("NPCs");
 		NpcData.getInstance();
@@ -452,7 +446,6 @@ public class GameServer
 		System.gc();
 		final long totalMem = Runtime.getRuntime().maxMemory() / 1048576;
 		LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory.");
-		LOGGER.info(getClass().getSimpleName() + ": Geodata use " + geodataMemory + " MB of memory.");
 		LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + ".");
 		LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds.");
 		

L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -53,15 +53,6 @@ public class GeoEngine
 	private final ABlock[][] _blocks;
 	private final BlockNull _nullBlock;
 	
-	/**
-	 * Returns the instance of the {@link GeoEngine}.
-	 * @return {@link GeoEngine} : The instance.
-	 */
-	public static GeoEngine getInstance()
-	{
-		return SingletonHolder._instance;
-	}
-	
 	/**
 	 * GeoEngine constructor. Loads all geodata files of chosen geodata format.
 	 */
@@ -80,6 +71,7 @@ public class GeoEngine
 		
 		// load geo files according to geoengine config setup
 		int loaded = 0;
+		long _fileSize = 0;
 		for (int rx = World.TILE_X_MIN; rx <= World.TILE_X_MAX; rx++)
 		{
 			for (int ry = World.TILE_Y_MIN; ry <= World.TILE_Y_MAX; ry++)
@@ -91,6 +83,7 @@ public class GeoEngine
 					if (loadGeoBlocks(rx, ry))
 					{
 						loaded++;
+						_fileSize += f.length();
 					}
 				}
 				else
@@ -102,6 +95,10 @@ public class GeoEngine
 		}
 		
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
+		if (loaded > 0)
+		{
+			LOGGER.info("GeoEngine: Total geodata file size " + (_fileSize / 1024 / 1024) + " MB.");
+		}
 		
 		// avoid wrong configs when no files are loaded
 		if (loaded == 0)
@@ -940,6 +937,15 @@ public class GeoEngine
 		return null;
 	}
 	
+	/**
+	 * Returns the instance of the {@link GeoEngine}.
+	 * @return {@link GeoEngine} : The instance.
+	 */
+	public static GeoEngine getInstance()
+	{
+		return SingletonHolder._instance;
+	}
+	
 	private static class SingletonHolder
 	{
 		protected static final GeoEngine _instance = Config.PATHFINDING ? new GeoEnginePathfinding() : new GeoEngine();

L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/GameServer.java

@@ -308,13 +308,7 @@ public class GameServer
 		ClanEntryManager.getInstance();
 		
 		printSection("Geodata");
-		long geodataMemory = getUsedMemoryMB();
 		GeoEngine.getInstance();
-		geodataMemory = getUsedMemoryMB() - geodataMemory;
-		if (geodataMemory < 0)
-		{
-			geodataMemory = 0;
-		}
 		
 		printSection("NPCs");
 		NpcData.getInstance();
@@ -452,7 +446,6 @@ public class GameServer
 		System.gc();
 		final long totalMem = Runtime.getRuntime().maxMemory() / 1048576;
 		LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory.");
-		LOGGER.info(getClass().getSimpleName() + ": Geodata use " + geodataMemory + " MB of memory.");
 		LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + ".");
 		LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds.");
 		

L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -53,15 +53,6 @@ public class GeoEngine
 	private final ABlock[][] _blocks;
 	private final BlockNull _nullBlock;
 	
-	/**
-	 * Returns the instance of the {@link GeoEngine}.
-	 * @return {@link GeoEngine} : The instance.
-	 */
-	public static GeoEngine getInstance()
-	{
-		return SingletonHolder._instance;
-	}
-	
 	/**
 	 * GeoEngine constructor. Loads all geodata files of chosen geodata format.
 	 */
@@ -80,6 +71,7 @@ public class GeoEngine
 		
 		// load geo files according to geoengine config setup
 		int loaded = 0;
+		long _fileSize = 0;
 		for (int rx = World.TILE_X_MIN; rx <= World.TILE_X_MAX; rx++)
 		{
 			for (int ry = World.TILE_Y_MIN; ry <= World.TILE_Y_MAX; ry++)
@@ -91,6 +83,7 @@ public class GeoEngine
 					if (loadGeoBlocks(rx, ry))
 					{
 						loaded++;
+						_fileSize += f.length();
 					}
 				}
 				else
@@ -102,6 +95,10 @@ public class GeoEngine
 		}
 		
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
+		if (loaded > 0)
+		{
+			LOGGER.info("GeoEngine: Total geodata file size " + (_fileSize / 1024 / 1024) + " MB.");
+		}
 		
 		// avoid wrong configs when no files are loaded
 		if (loaded == 0)
@@ -940,6 +937,15 @@ public class GeoEngine
 		return null;
 	}
 	
+	/**
+	 * Returns the instance of the {@link GeoEngine}.
+	 * @return {@link GeoEngine} : The instance.
+	 */
+	public static GeoEngine getInstance()
+	{
+		return SingletonHolder._instance;
+	}
+	
 	private static class SingletonHolder
 	{
 		protected static final GeoEngine _instance = Config.PATHFINDING ? new GeoEnginePathfinding() : new GeoEngine();

L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/GameServer.java

@@ -312,13 +312,7 @@ public class GameServer
 		ClanShopData.getInstance();
 		
 		printSection("Geodata");
-		long geodataMemory = getUsedMemoryMB();
 		GeoEngine.getInstance();
-		geodataMemory = getUsedMemoryMB() - geodataMemory;
-		if (geodataMemory < 0)
-		{
-			geodataMemory = 0;
-		}
 		
 		printSection("NPCs");
 		NpcData.getInstance();
@@ -456,7 +450,6 @@ public class GameServer
 		System.gc();
 		final long totalMem = Runtime.getRuntime().maxMemory() / 1048576;
 		LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory.");
-		LOGGER.info(getClass().getSimpleName() + ": Geodata use " + geodataMemory + " MB of memory.");
 		LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + ".");
 		LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds.");
 		

L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -53,15 +53,6 @@ public class GeoEngine
 	private final ABlock[][] _blocks;
 	private final BlockNull _nullBlock;
 	
-	/**
-	 * Returns the instance of the {@link GeoEngine}.
-	 * @return {@link GeoEngine} : The instance.
-	 */
-	public static GeoEngine getInstance()
-	{
-		return SingletonHolder._instance;
-	}
-	
 	/**
 	 * GeoEngine constructor. Loads all geodata files of chosen geodata format.
 	 */
@@ -80,6 +71,7 @@ public class GeoEngine
 		
 		// load geo files according to geoengine config setup
 		int loaded = 0;
+		long _fileSize = 0;
 		for (int rx = World.TILE_X_MIN; rx <= World.TILE_X_MAX; rx++)
 		{
 			for (int ry = World.TILE_Y_MIN; ry <= World.TILE_Y_MAX; ry++)
@@ -91,6 +83,7 @@ public class GeoEngine
 					if (loadGeoBlocks(rx, ry))
 					{
 						loaded++;
+						_fileSize += f.length();
 					}
 				}
 				else
@@ -102,6 +95,10 @@ public class GeoEngine
 		}
 		
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
+		if (loaded > 0)
+		{
+			LOGGER.info("GeoEngine: Total geodata file size " + (_fileSize / 1024 / 1024) + " MB.");
+		}
 		
 		// avoid wrong configs when no files are loaded
 		if (loaded == 0)
@@ -940,6 +937,15 @@ public class GeoEngine
 		return null;
 	}
 	
+	/**
+	 * Returns the instance of the {@link GeoEngine}.
+	 * @return {@link GeoEngine} : The instance.
+	 */
+	public static GeoEngine getInstance()
+	{
+		return SingletonHolder._instance;
+	}
+	
 	private static class SingletonHolder
 	{
 		protected static final GeoEngine _instance = Config.PATHFINDING ? new GeoEnginePathfinding() : new GeoEngine();

L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/GameServer.java

@@ -312,13 +312,7 @@ public class GameServer
 		ClanShopData.getInstance();
 		
 		printSection("Geodata");
-		long geodataMemory = getUsedMemoryMB();
 		GeoEngine.getInstance();
-		geodataMemory = getUsedMemoryMB() - geodataMemory;
-		if (geodataMemory < 0)
-		{
-			geodataMemory = 0;
-		}
 		
 		printSection("NPCs");
 		NpcData.getInstance();
@@ -456,7 +450,6 @@ public class GameServer
 		System.gc();
 		final long totalMem = Runtime.getRuntime().maxMemory() / 1048576;
 		LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory.");
-		LOGGER.info(getClass().getSimpleName() + ": Geodata use " + geodataMemory + " MB of memory.");
 		LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + ".");
 		LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds.");
 		

L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -53,15 +53,6 @@ public class GeoEngine
 	private final ABlock[][] _blocks;
 	private final BlockNull _nullBlock;
 	
-	/**
-	 * Returns the instance of the {@link GeoEngine}.
-	 * @return {@link GeoEngine} : The instance.
-	 */
-	public static GeoEngine getInstance()
-	{
-		return SingletonHolder._instance;
-	}
-	
 	/**
 	 * GeoEngine constructor. Loads all geodata files of chosen geodata format.
 	 */
@@ -80,6 +71,7 @@ public class GeoEngine
 		
 		// load geo files according to geoengine config setup
 		int loaded = 0;
+		long _fileSize = 0;
 		for (int rx = World.TILE_X_MIN; rx <= World.TILE_X_MAX; rx++)
 		{
 			for (int ry = World.TILE_Y_MIN; ry <= World.TILE_Y_MAX; ry++)
@@ -91,6 +83,7 @@ public class GeoEngine
 					if (loadGeoBlocks(rx, ry))
 					{
 						loaded++;
+						_fileSize += f.length();
 					}
 				}
 				else
@@ -102,6 +95,10 @@ public class GeoEngine
 		}
 		
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
+		if (loaded > 0)
+		{
+			LOGGER.info("GeoEngine: Total geodata file size " + (_fileSize / 1024 / 1024) + " MB.");
+		}
 		
 		// avoid wrong configs when no files are loaded
 		if (loaded == 0)
@@ -940,6 +937,15 @@ public class GeoEngine
 		return null;
 	}
 	
+	/**
+	 * Returns the instance of the {@link GeoEngine}.
+	 * @return {@link GeoEngine} : The instance.
+	 */
+	public static GeoEngine getInstance()
+	{
+		return SingletonHolder._instance;
+	}
+	
 	private static class SingletonHolder
 	{
 		protected static final GeoEngine _instance = Config.PATHFINDING ? new GeoEnginePathfinding() : new GeoEngine();

L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/GameServer.java

@@ -312,13 +312,7 @@ public class GameServer
 		ClanShopData.getInstance();
 		
 		printSection("Geodata");
-		long geodataMemory = getUsedMemoryMB();
 		GeoEngine.getInstance();
-		geodataMemory = getUsedMemoryMB() - geodataMemory;
-		if (geodataMemory < 0)
-		{
-			geodataMemory = 0;
-		}
 		
 		printSection("NPCs");
 		NpcData.getInstance();
@@ -456,7 +450,6 @@ public class GameServer
 		System.gc();
 		final long totalMem = Runtime.getRuntime().maxMemory() / 1048576;
 		LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory.");
-		LOGGER.info(getClass().getSimpleName() + ": Geodata use " + geodataMemory + " MB of memory.");
 		LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + ".");
 		LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds.");
 		

L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -53,15 +53,6 @@ public class GeoEngine
 	private final ABlock[][] _blocks;
 	private final BlockNull _nullBlock;
 	
-	/**
-	 * Returns the instance of the {@link GeoEngine}.
-	 * @return {@link GeoEngine} : The instance.
-	 */
-	public static GeoEngine getInstance()
-	{
-		return SingletonHolder._instance;
-	}
-	
 	/**
 	 * GeoEngine constructor. Loads all geodata files of chosen geodata format.
 	 */
@@ -80,6 +71,7 @@ public class GeoEngine
 		
 		// load geo files according to geoengine config setup
 		int loaded = 0;
+		long _fileSize = 0;
 		for (int rx = World.TILE_X_MIN; rx <= World.TILE_X_MAX; rx++)
 		{
 			for (int ry = World.TILE_Y_MIN; ry <= World.TILE_Y_MAX; ry++)
@@ -91,6 +83,7 @@ public class GeoEngine
 					if (loadGeoBlocks(rx, ry))
 					{
 						loaded++;
+						_fileSize += f.length();
 					}
 				}
 				else
@@ -102,6 +95,10 @@ public class GeoEngine
 		}
 		
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
+		if (loaded > 0)
+		{
+			LOGGER.info("GeoEngine: Total geodata file size " + (_fileSize / 1024 / 1024) + " MB.");
+		}
 		
 		// avoid wrong configs when no files are loaded
 		if (loaded == 0)
@@ -940,6 +937,15 @@ public class GeoEngine
 		return null;
 	}
 	
+	/**
+	 * Returns the instance of the {@link GeoEngine}.
+	 * @return {@link GeoEngine} : The instance.
+	 */
+	public static GeoEngine getInstance()
+	{
+		return SingletonHolder._instance;
+	}
+	
 	private static class SingletonHolder
 	{
 		protected static final GeoEngine _instance = Config.PATHFINDING ? new GeoEnginePathfinding() : new GeoEngine();

L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -51,15 +51,6 @@ public class GeoEngine
 	private final ABlock[][] _blocks;
 	private final BlockNull _nullBlock;
 	
-	/**
-	 * Returns the instance of the {@link GeoEngine}.
-	 * @return {@link GeoEngine} : The instance.
-	 */
-	public static GeoEngine getInstance()
-	{
-		return SingletonHolder._instance;
-	}
-	
 	/**
 	 * GeoEngine constructor. Loads all geodata files of chosen geodata format.
 	 */
@@ -78,6 +69,7 @@ public class GeoEngine
 		
 		// load geo files according to geoengine config setup
 		int loaded = 0;
+		long _fileSize = 0;
 		for (int rx = World.TILE_X_MIN; rx <= World.TILE_X_MAX; rx++)
 		{
 			for (int ry = World.TILE_Y_MIN; ry <= World.TILE_Y_MAX; ry++)
@@ -89,6 +81,7 @@ public class GeoEngine
 					if (loadGeoBlocks(rx, ry))
 					{
 						loaded++;
+						_fileSize += f.length();
 					}
 				}
 				else
@@ -100,6 +93,10 @@ public class GeoEngine
 		}
 		
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
+		if (loaded > 0)
+		{
+			LOGGER.info("GeoEngine: Total geodata file size " + (_fileSize / 1024 / 1024) + " MB.");
+		}
 		
 		// avoid wrong configs when no files are loaded
 		if (loaded == 0)
@@ -926,6 +923,15 @@ public class GeoEngine
 		return null;
 	}
 	
+	/**
+	 * Returns the instance of the {@link GeoEngine}.
+	 * @return {@link GeoEngine} : The instance.
+	 */
+	public static GeoEngine getInstance()
+	{
+		return SingletonHolder._instance;
+	}
+	
 	private static class SingletonHolder
 	{
 		protected static final GeoEngine _instance = Config.PATHFINDING ? new GeoEnginePathfinding() : new GeoEngine();

L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/GameServer.java

@@ -285,13 +285,7 @@ public class GameServer
 		ClanHallAuctionManager.getInstance();
 		
 		printSection("Geodata");
-		long geodataMemory = getUsedMemoryMB();
 		GeoEngine.getInstance();
-		geodataMemory = getUsedMemoryMB() - geodataMemory;
-		if (geodataMemory < 0)
-		{
-			geodataMemory = 0;
-		}
 		
 		printSection("NPCs");
 		DoorData.getInstance();
@@ -454,7 +448,6 @@ public class GameServer
 		System.gc();
 		final long totalMem = Runtime.getRuntime().maxMemory() / 1048576;
 		LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory.");
-		LOGGER.info(getClass().getSimpleName() + ": Geodata use " + geodataMemory + " MB of memory.");
 		LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + ".");
 		LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds.");
 		

L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -51,15 +51,6 @@ public class GeoEngine
 	private final ABlock[][] _blocks;
 	private final BlockNull _nullBlock;
 	
-	/**
-	 * Returns the instance of the {@link GeoEngine}.
-	 * @return {@link GeoEngine} : The instance.
-	 */
-	public static GeoEngine getInstance()
-	{
-		return SingletonHolder._instance;
-	}
-	
 	/**
 	 * GeoEngine constructor. Loads all geodata files of chosen geodata format.
 	 */
@@ -78,6 +69,7 @@ public class GeoEngine
 		
 		// load geo files according to geoengine config setup
 		int loaded = 0;
+		long _fileSize = 0;
 		for (int rx = World.TILE_X_MIN; rx <= World.TILE_X_MAX; rx++)
 		{
 			for (int ry = World.TILE_Y_MIN; ry <= World.TILE_Y_MAX; ry++)
@@ -89,6 +81,7 @@ public class GeoEngine
 					if (loadGeoBlocks(rx, ry))
 					{
 						loaded++;
+						_fileSize += f.length();
 					}
 				}
 				else
@@ -100,6 +93,10 @@ public class GeoEngine
 		}
 		
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
+		if (loaded > 0)
+		{
+			LOGGER.info("GeoEngine: Total geodata file size " + (_fileSize / 1024 / 1024) + " MB.");
+		}
 		
 		// avoid wrong configs when no files are loaded
 		if (loaded == 0)
@@ -926,6 +923,15 @@ public class GeoEngine
 		return null;
 	}
 	
+	/**
+	 * Returns the instance of the {@link GeoEngine}.
+	 * @return {@link GeoEngine} : The instance.
+	 */
+	public static GeoEngine getInstance()
+	{
+		return SingletonHolder._instance;
+	}
+	
 	private static class SingletonHolder
 	{
 		protected static final GeoEngine _instance = Config.PATHFINDING ? new GeoEnginePathfinding() : new GeoEngine();

L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/GameServer.java

@@ -304,13 +304,7 @@ public class GameServer
 		ClanEntryManager.getInstance();
 		
 		printSection("Geodata");
-		long geodataMemory = getUsedMemoryMB();
 		GeoEngine.getInstance();
-		geodataMemory = getUsedMemoryMB() - geodataMemory;
-		if (geodataMemory < 0)
-		{
-			geodataMemory = 0;
-		}
 		
 		printSection("NPCs");
 		NpcData.getInstance();
@@ -445,7 +439,6 @@ public class GameServer
 		System.gc();
 		final long totalMem = Runtime.getRuntime().maxMemory() / 1048576;
 		LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory.");
-		LOGGER.info(getClass().getSimpleName() + ": Geodata use " + geodataMemory + " MB of memory.");
 		LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + ".");
 		LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds.");
 		

L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -53,15 +53,6 @@ public class GeoEngine
 	private final ABlock[][] _blocks;
 	private final BlockNull _nullBlock;
 	
-	/**
-	 * Returns the instance of the {@link GeoEngine}.
-	 * @return {@link GeoEngine} : The instance.
-	 */
-	public static GeoEngine getInstance()
-	{
-		return SingletonHolder._instance;
-	}
-	
 	/**
 	 * GeoEngine constructor. Loads all geodata files of chosen geodata format.
 	 */
@@ -80,6 +71,7 @@ public class GeoEngine
 		
 		// load geo files according to geoengine config setup
 		int loaded = 0;
+		long _fileSize = 0;
 		for (int rx = World.TILE_X_MIN; rx <= World.TILE_X_MAX; rx++)
 		{
 			for (int ry = World.TILE_Y_MIN; ry <= World.TILE_Y_MAX; ry++)
@@ -91,6 +83,7 @@ public class GeoEngine
 					if (loadGeoBlocks(rx, ry))
 					{
 						loaded++;
+						_fileSize += f.length();
 					}
 				}
 				else
@@ -102,6 +95,10 @@ public class GeoEngine
 		}
 		
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
+		if (loaded > 0)
+		{
+			LOGGER.info("GeoEngine: Total geodata file size " + (_fileSize / 1024 / 1024) + " MB.");
+		}
 		
 		// avoid wrong configs when no files are loaded
 		if (loaded == 0)
@@ -940,6 +937,15 @@ public class GeoEngine
 		return null;
 	}
 	
+	/**
+	 * Returns the instance of the {@link GeoEngine}.
+	 * @return {@link GeoEngine} : The instance.
+	 */
+	public static GeoEngine getInstance()
+	{
+		return SingletonHolder._instance;
+	}
+	
 	private static class SingletonHolder
 	{
 		protected static final GeoEngine _instance = Config.PATHFINDING ? new GeoEnginePathfinding() : new GeoEngine();

L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/GameServer.java

@@ -304,13 +304,7 @@ public class GameServer
 		ClanEntryManager.getInstance();
 		
 		printSection("Geodata");
-		long geodataMemory = getUsedMemoryMB();
 		GeoEngine.getInstance();
-		geodataMemory = getUsedMemoryMB() - geodataMemory;
-		if (geodataMemory < 0)
-		{
-			geodataMemory = 0;
-		}
 		
 		printSection("NPCs");
 		NpcData.getInstance();
@@ -445,7 +439,6 @@ public class GameServer
 		System.gc();
 		final long totalMem = Runtime.getRuntime().maxMemory() / 1048576;
 		LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory.");
-		LOGGER.info(getClass().getSimpleName() + ": Geodata use " + geodataMemory + " MB of memory.");
 		LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + ".");
 		LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds.");
 		

L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -53,15 +53,6 @@ public class GeoEngine
 	private final ABlock[][] _blocks;
 	private final BlockNull _nullBlock;
 	
-	/**
-	 * Returns the instance of the {@link GeoEngine}.
-	 * @return {@link GeoEngine} : The instance.
-	 */
-	public static GeoEngine getInstance()
-	{
-		return SingletonHolder._instance;
-	}
-	
 	/**
 	 * GeoEngine constructor. Loads all geodata files of chosen geodata format.
 	 */
@@ -80,6 +71,7 @@ public class GeoEngine
 		
 		// load geo files according to geoengine config setup
 		int loaded = 0;
+		long _fileSize = 0;
 		for (int rx = World.TILE_X_MIN; rx <= World.TILE_X_MAX; rx++)
 		{
 			for (int ry = World.TILE_Y_MIN; ry <= World.TILE_Y_MAX; ry++)
@@ -91,6 +83,7 @@ public class GeoEngine
 					if (loadGeoBlocks(rx, ry))
 					{
 						loaded++;
+						_fileSize += f.length();
 					}
 				}
 				else
@@ -102,6 +95,10 @@ public class GeoEngine
 		}
 		
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
+		if (loaded > 0)
+		{
+			LOGGER.info("GeoEngine: Total geodata file size " + (_fileSize / 1024 / 1024) + " MB.");
+		}
 		
 		// avoid wrong configs when no files are loaded
 		if (loaded == 0)
@@ -940,6 +937,15 @@ public class GeoEngine
 		return null;
 	}
 	
+	/**
+	 * Returns the instance of the {@link GeoEngine}.
+	 * @return {@link GeoEngine} : The instance.
+	 */
+	public static GeoEngine getInstance()
+	{
+		return SingletonHolder._instance;
+	}
+	
 	private static class SingletonHolder
 	{
 		protected static final GeoEngine _instance = Config.PATHFINDING ? new GeoEnginePathfinding() : new GeoEngine();

L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/GameServer.java

@@ -304,13 +304,7 @@ public class GameServer
 		ClanEntryManager.getInstance();
 		
 		printSection("Geodata");
-		long geodataMemory = getUsedMemoryMB();
 		GeoEngine.getInstance();
-		geodataMemory = getUsedMemoryMB() - geodataMemory;
-		if (geodataMemory < 0)
-		{
-			geodataMemory = 0;
-		}
 		
 		printSection("NPCs");
 		NpcData.getInstance();
@@ -445,7 +439,6 @@ public class GameServer
 		System.gc();
 		final long totalMem = Runtime.getRuntime().maxMemory() / 1048576;
 		LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory.");
-		LOGGER.info(getClass().getSimpleName() + ": Geodata use " + geodataMemory + " MB of memory.");
 		LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + ".");
 		LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds.");
 		

L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -53,15 +53,6 @@ public class GeoEngine
 	private final ABlock[][] _blocks;
 	private final BlockNull _nullBlock;
 	
-	/**
-	 * Returns the instance of the {@link GeoEngine}.
-	 * @return {@link GeoEngine} : The instance.
-	 */
-	public static GeoEngine getInstance()
-	{
-		return SingletonHolder._instance;
-	}
-	
 	/**
 	 * GeoEngine constructor. Loads all geodata files of chosen geodata format.
 	 */
@@ -80,6 +71,7 @@ public class GeoEngine
 		
 		// load geo files according to geoengine config setup
 		int loaded = 0;
+		long _fileSize = 0;
 		for (int rx = World.TILE_X_MIN; rx <= World.TILE_X_MAX; rx++)
 		{
 			for (int ry = World.TILE_Y_MIN; ry <= World.TILE_Y_MAX; ry++)
@@ -91,6 +83,7 @@ public class GeoEngine
 					if (loadGeoBlocks(rx, ry))
 					{
 						loaded++;
+						_fileSize += f.length();
 					}
 				}
 				else
@@ -102,6 +95,10 @@ public class GeoEngine
 		}
 		
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
+		if (loaded > 0)
+		{
+			LOGGER.info("GeoEngine: Total geodata file size " + (_fileSize / 1024 / 1024) + " MB.");
+		}
 		
 		// avoid wrong configs when no files are loaded
 		if (loaded == 0)
@@ -940,6 +937,15 @@ public class GeoEngine
 		return null;
 	}
 	
+	/**
+	 * Returns the instance of the {@link GeoEngine}.
+	 * @return {@link GeoEngine} : The instance.
+	 */
+	public static GeoEngine getInstance()
+	{
+		return SingletonHolder._instance;
+	}
+	
 	private static class SingletonHolder
 	{
 		protected static final GeoEngine _instance = Config.PATHFINDING ? new GeoEnginePathfinding() : new GeoEngine();

L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/GameServer.java

@@ -304,13 +304,7 @@ public class GameServer
 		ClanEntryManager.getInstance();
 		
 		printSection("Geodata");
-		long geodataMemory = getUsedMemoryMB();
 		GeoEngine.getInstance();
-		geodataMemory = getUsedMemoryMB() - geodataMemory;
-		if (geodataMemory < 0)
-		{
-			geodataMemory = 0;
-		}
 		
 		printSection("NPCs");
 		NpcData.getInstance();
@@ -445,7 +439,6 @@ public class GameServer
 		System.gc();
 		final long totalMem = Runtime.getRuntime().maxMemory() / 1048576;
 		LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory.");
-		LOGGER.info(getClass().getSimpleName() + ": Geodata use " + geodataMemory + " MB of memory.");
 		LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + ".");
 		LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds.");
 		

L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -53,15 +53,6 @@ public class GeoEngine
 	private final ABlock[][] _blocks;
 	private final BlockNull _nullBlock;
 	
-	/**
-	 * Returns the instance of the {@link GeoEngine}.
-	 * @return {@link GeoEngine} : The instance.
-	 */
-	public static GeoEngine getInstance()
-	{
-		return SingletonHolder._instance;
-	}
-	
 	/**
 	 * GeoEngine constructor. Loads all geodata files of chosen geodata format.
 	 */
@@ -80,6 +71,7 @@ public class GeoEngine
 		
 		// load geo files according to geoengine config setup
 		int loaded = 0;
+		long _fileSize = 0;
 		for (int rx = World.TILE_X_MIN; rx <= World.TILE_X_MAX; rx++)
 		{
 			for (int ry = World.TILE_Y_MIN; ry <= World.TILE_Y_MAX; ry++)
@@ -91,6 +83,7 @@ public class GeoEngine
 					if (loadGeoBlocks(rx, ry))
 					{
 						loaded++;
+						_fileSize += f.length();
 					}
 				}
 				else
@@ -102,6 +95,10 @@ public class GeoEngine
 		}
 		
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
+		if (loaded > 0)
+		{
+			LOGGER.info("GeoEngine: Total geodata file size " + (_fileSize / 1024 / 1024) + " MB.");
+		}
 		
 		// avoid wrong configs when no files are loaded
 		if (loaded == 0)
@@ -940,6 +937,15 @@ public class GeoEngine
 		return null;
 	}
 	
+	/**
+	 * Returns the instance of the {@link GeoEngine}.
+	 * @return {@link GeoEngine} : The instance.
+	 */
+	public static GeoEngine getInstance()
+	{
+		return SingletonHolder._instance;
+	}
+	
 	private static class SingletonHolder
 	{
 		protected static final GeoEngine _instance = Config.PATHFINDING ? new GeoEnginePathfinding() : new GeoEngine();