diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/config/Interface.ini b/L2J_Mobius_1.0_Ertheia/dist/game/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/config/Server.ini b/L2J_Mobius_1.0_Ertheia/dist/game/config/Server.ini index b1c2fcf580..b174b854e7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/config/Server.ini +++ b/L2J_Mobius_1.0_Ertheia/dist/game/config/Server.ini @@ -142,23 +142,6 @@ UrgentPacketThreadCoreSize = 40 ThreadsForLoading = False -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Dead Lock Detector (separate thread for detecting deadlocks) # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_1.0_Ertheia/dist/login/config/Interface.ini b/L2J_Mobius_1.0_Ertheia/dist/login/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/login/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_1.0_Ertheia/dist/login/config/LoginServer.ini b/L2J_Mobius_1.0_Ertheia/dist/login/config/LoginServer.ini index 2359b2b2b3..4841207266 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_1.0_Ertheia/dist/login/config/LoginServer.ini @@ -54,23 +54,6 @@ Password = MaximumDbConnections = 5 -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Automatic Database Backup Settings # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/Config.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/Config.java index e6bf619d07..5c3e739e7c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/Config.java @@ -86,6 +86,7 @@ public class Config // Config File Definitions // -------------------------------------------------- public static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini"; + public static final String INTERFACE_CONFIG_FILE = "./config/Interface.ini"; public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini"; public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini"; public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini"; @@ -96,11 +97,11 @@ public class Config private static final String GENERAL_CONFIG_FILE = "./config/General.ini"; private static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini"; private static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini"; - public static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; + private static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; private static final String NPC_CONFIG_FILE = "./config/NPC.ini"; private static final String PVP_CONFIG_FILE = "./config/PVP.ini"; private static final String RATES_CONFIG_FILE = "./config/Rates.ini"; - public static final String SERVER_CONFIG_FILE = "./config/Server.ini"; + private static final String SERVER_CONFIG_FILE = "./config/Server.ini"; private static final String TELNET_CONFIG_FILE = "./config/Telnet.ini"; private static final String TRAINING_CAMP_CONFIG_FILE = "./config/TrainingCamp.ini"; private static final String CHAT_FILTER_FILE = "./config/chatfilter.txt"; @@ -444,8 +445,6 @@ public class Config public static int INSTANT_THREAD_POOL_COUNT; public static int IO_PACKET_THREAD_CORE_SIZE; public static boolean THREADS_FOR_LOADING; - public static boolean ENABLE_GUI; - public static boolean DARK_THEME; public static boolean DEADLOCK_DETECTOR; public static int DEADLOCK_CHECK_INTERVAL; public static boolean RESTART_ON_DEADLOCK; @@ -1326,6 +1325,9 @@ public class Config public static int L2JBRASIL_DUALBOXES_ALLOWED; public static boolean ALLOW_L2JBRASIL_GAME_SERVER_REPORT; + public static boolean ENABLE_GUI; + public static boolean DARK_THEME; + /** * This class initializes all global variables for configuration.
* If the key doesn't appear in properties file, a default value is set by this class. {@link #SERVER_CONFIG_FILE} (properties file) for configuring your server. diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java index 9069a6128f..64c9c57f7d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java @@ -182,11 +182,11 @@ public class GameServer final long serverLoadStart = Chronos.currentTimeMillis(); // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.SERVER_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("GameServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/loginserver/LoginServer.java index 04aa4c55ee..d8280ba76d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/loginserver/LoginServer.java @@ -64,11 +64,11 @@ public class LoginServer private LoginServer() throws Exception { // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.LOGIN_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("LoginServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/config/Interface.ini b/L2J_Mobius_2.5_Underground/dist/game/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_2.5_Underground/dist/game/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_2.5_Underground/dist/game/config/Server.ini b/L2J_Mobius_2.5_Underground/dist/game/config/Server.ini index 5c581aff36..81047aa753 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/config/Server.ini +++ b/L2J_Mobius_2.5_Underground/dist/game/config/Server.ini @@ -142,23 +142,6 @@ UrgentPacketThreadCoreSize = 40 ThreadsForLoading = False -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Dead Lock Detector (separate thread for detecting deadlocks) # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_2.5_Underground/dist/login/config/Interface.ini b/L2J_Mobius_2.5_Underground/dist/login/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_2.5_Underground/dist/login/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_2.5_Underground/dist/login/config/LoginServer.ini b/L2J_Mobius_2.5_Underground/dist/login/config/LoginServer.ini index 2359b2b2b3..4841207266 100644 --- a/L2J_Mobius_2.5_Underground/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_2.5_Underground/dist/login/config/LoginServer.ini @@ -54,23 +54,6 @@ Password = MaximumDbConnections = 5 -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Automatic Database Backup Settings # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/Config.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/Config.java index f6072013b6..e6a5caf7a8 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/Config.java @@ -86,6 +86,7 @@ public class Config // Config File Definitions // -------------------------------------------------- public static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini"; + public static final String INTERFACE_CONFIG_FILE = "./config/Interface.ini"; public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini"; public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini"; public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini"; @@ -97,11 +98,11 @@ public class Config private static final String GENERAL_CONFIG_FILE = "./config/General.ini"; private static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini"; private static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini"; - public static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; + private static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; private static final String NPC_CONFIG_FILE = "./config/NPC.ini"; private static final String PVP_CONFIG_FILE = "./config/PVP.ini"; private static final String RATES_CONFIG_FILE = "./config/Rates.ini"; - public static final String SERVER_CONFIG_FILE = "./config/Server.ini"; + private static final String SERVER_CONFIG_FILE = "./config/Server.ini"; private static final String TELNET_CONFIG_FILE = "./config/Telnet.ini"; private static final String TRAINING_CAMP_CONFIG_FILE = "./config/TrainingCamp.ini"; private static final String CHAT_FILTER_FILE = "./config/chatfilter.txt"; @@ -451,8 +452,6 @@ public class Config public static int INSTANT_THREAD_POOL_COUNT; public static int IO_PACKET_THREAD_CORE_SIZE; public static boolean THREADS_FOR_LOADING; - public static boolean ENABLE_GUI; - public static boolean DARK_THEME; public static boolean DEADLOCK_DETECTOR; public static int DEADLOCK_CHECK_INTERVAL; public static boolean RESTART_ON_DEADLOCK; @@ -1337,6 +1336,9 @@ public class Config public static int L2JBRASIL_DUALBOXES_ALLOWED; public static boolean ALLOW_L2JBRASIL_GAME_SERVER_REPORT; + public static boolean ENABLE_GUI; + public static boolean DARK_THEME; + /** * This class initializes all global variables for configuration.
* If the key doesn't appear in properties file, a default value is set by this class. {@link #SERVER_CONFIG_FILE} (properties file) for configuring your server. diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java index c4fd6601eb..7ce154a8f1 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java @@ -186,11 +186,11 @@ public class GameServer final long serverLoadStart = Chronos.currentTimeMillis(); // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.SERVER_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("GameServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/loginserver/LoginServer.java index 04aa4c55ee..d8280ba76d 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/loginserver/LoginServer.java @@ -64,11 +64,11 @@ public class LoginServer private LoginServer() throws Exception { // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.LOGIN_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("LoginServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/config/Interface.ini b/L2J_Mobius_3.0_Helios/dist/game/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_3.0_Helios/dist/game/config/Server.ini b/L2J_Mobius_3.0_Helios/dist/game/config/Server.ini index 45325696e8..f5c23c6087 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/config/Server.ini +++ b/L2J_Mobius_3.0_Helios/dist/game/config/Server.ini @@ -142,23 +142,6 @@ UrgentPacketThreadCoreSize = 40 ThreadsForLoading = False -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Dead Lock Detector (separate thread for detecting deadlocks) # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_3.0_Helios/dist/login/config/Interface.ini b/L2J_Mobius_3.0_Helios/dist/login/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/login/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_3.0_Helios/dist/login/config/LoginServer.ini b/L2J_Mobius_3.0_Helios/dist/login/config/LoginServer.ini index 2359b2b2b3..4841207266 100644 --- a/L2J_Mobius_3.0_Helios/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_3.0_Helios/dist/login/config/LoginServer.ini @@ -54,23 +54,6 @@ Password = MaximumDbConnections = 5 -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Automatic Database Backup Settings # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/Config.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/Config.java index f0318e9f68..db7a97875e 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/Config.java @@ -86,6 +86,7 @@ public class Config // Config File Definitions // -------------------------------------------------- public static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini"; + public static final String INTERFACE_CONFIG_FILE = "./config/Interface.ini"; public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini"; public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini"; public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini"; @@ -97,11 +98,11 @@ public class Config private static final String GENERAL_CONFIG_FILE = "./config/General.ini"; private static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini"; private static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini"; - public static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; + private static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; private static final String NPC_CONFIG_FILE = "./config/NPC.ini"; private static final String PVP_CONFIG_FILE = "./config/PVP.ini"; private static final String RATES_CONFIG_FILE = "./config/Rates.ini"; - public static final String SERVER_CONFIG_FILE = "./config/Server.ini"; + private static final String SERVER_CONFIG_FILE = "./config/Server.ini"; private static final String TELNET_CONFIG_FILE = "./config/Telnet.ini"; private static final String TRAINING_CAMP_CONFIG_FILE = "./config/TrainingCamp.ini"; private static final String CHAT_FILTER_FILE = "./config/chatfilter.txt"; @@ -451,8 +452,6 @@ public class Config public static int INSTANT_THREAD_POOL_COUNT; public static int IO_PACKET_THREAD_CORE_SIZE; public static boolean THREADS_FOR_LOADING; - public static boolean ENABLE_GUI; - public static boolean DARK_THEME; public static boolean DEADLOCK_DETECTOR; public static int DEADLOCK_CHECK_INTERVAL; public static boolean RESTART_ON_DEADLOCK; @@ -1350,6 +1349,9 @@ public class Config public static int L2JBRASIL_DUALBOXES_ALLOWED; public static boolean ALLOW_L2JBRASIL_GAME_SERVER_REPORT; + public static boolean ENABLE_GUI; + public static boolean DARK_THEME; + /** * This class initializes all global variables for configuration.
* If the key doesn't appear in properties file, a default value is set by this class. {@link #SERVER_CONFIG_FILE} (properties file) for configuring your server. diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java index c4fd6601eb..7ce154a8f1 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java @@ -186,11 +186,11 @@ public class GameServer final long serverLoadStart = Chronos.currentTimeMillis(); // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.SERVER_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("GameServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/loginserver/LoginServer.java index 04aa4c55ee..d8280ba76d 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/loginserver/LoginServer.java @@ -64,11 +64,11 @@ public class LoginServer private LoginServer() throws Exception { // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.LOGIN_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("LoginServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Interface.ini b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Server.ini b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Server.ini index 788a02b559..bab2b45d5b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Server.ini +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Server.ini @@ -142,23 +142,6 @@ UrgentPacketThreadCoreSize = 40 ThreadsForLoading = False -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Dead Lock Detector (separate thread for detecting deadlocks) # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/login/config/Interface.ini b/L2J_Mobius_4.0_GrandCrusade/dist/login/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/login/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/login/config/LoginServer.ini b/L2J_Mobius_4.0_GrandCrusade/dist/login/config/LoginServer.ini index 2359b2b2b3..4841207266 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_4.0_GrandCrusade/dist/login/config/LoginServer.ini @@ -54,23 +54,6 @@ Password = MaximumDbConnections = 5 -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Automatic Database Backup Settings # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/Config.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/Config.java index e150274253..c5361b37b9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/Config.java @@ -86,6 +86,7 @@ public class Config // Config File Definitions // -------------------------------------------------- public static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini"; + public static final String INTERFACE_CONFIG_FILE = "./config/Interface.ini"; public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini"; public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini"; public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini"; @@ -97,11 +98,11 @@ public class Config private static final String GENERAL_CONFIG_FILE = "./config/General.ini"; private static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini"; private static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini"; - public static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; + private static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; private static final String NPC_CONFIG_FILE = "./config/NPC.ini"; private static final String PVP_CONFIG_FILE = "./config/PVP.ini"; private static final String RATES_CONFIG_FILE = "./config/Rates.ini"; - public static final String SERVER_CONFIG_FILE = "./config/Server.ini"; + private static final String SERVER_CONFIG_FILE = "./config/Server.ini"; private static final String TELNET_CONFIG_FILE = "./config/Telnet.ini"; private static final String TRAINING_CAMP_CONFIG_FILE = "./config/TrainingCamp.ini"; private static final String CHAT_FILTER_FILE = "./config/chatfilter.txt"; @@ -445,8 +446,6 @@ public class Config public static int INSTANT_THREAD_POOL_COUNT; public static int IO_PACKET_THREAD_CORE_SIZE; public static boolean THREADS_FOR_LOADING; - public static boolean ENABLE_GUI; - public static boolean DARK_THEME; public static boolean DEADLOCK_DETECTOR; public static int DEADLOCK_CHECK_INTERVAL; public static boolean RESTART_ON_DEADLOCK; @@ -1337,6 +1336,9 @@ public class Config public static int L2JBRASIL_DUALBOXES_ALLOWED; public static boolean ALLOW_L2JBRASIL_GAME_SERVER_REPORT; + public static boolean ENABLE_GUI; + public static boolean DARK_THEME; + /** * This class initializes all global variables for configuration.
* If the key doesn't appear in properties file, a default value is set by this class. {@link #SERVER_CONFIG_FILE} (properties file) for configuring your server. diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java index 36acbe8fa5..cfc6a86bd0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java @@ -186,11 +186,11 @@ public class GameServer final long serverLoadStart = Chronos.currentTimeMillis(); // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.SERVER_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("GameServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/loginserver/LoginServer.java index 04aa4c55ee..d8280ba76d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/loginserver/LoginServer.java @@ -64,11 +64,11 @@ public class LoginServer private LoginServer() throws Exception { // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.LOGIN_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("LoginServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/config/Interface.ini b/L2J_Mobius_5.0_Salvation/dist/game/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_5.0_Salvation/dist/game/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_5.0_Salvation/dist/game/config/Server.ini b/L2J_Mobius_5.0_Salvation/dist/game/config/Server.ini index c5d2227463..d923afe204 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/config/Server.ini +++ b/L2J_Mobius_5.0_Salvation/dist/game/config/Server.ini @@ -142,23 +142,6 @@ UrgentPacketThreadCoreSize = 40 ThreadsForLoading = False -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Dead Lock Detector (separate thread for detecting deadlocks) # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_5.0_Salvation/dist/login/config/Interface.ini b/L2J_Mobius_5.0_Salvation/dist/login/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_5.0_Salvation/dist/login/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_5.0_Salvation/dist/login/config/LoginServer.ini b/L2J_Mobius_5.0_Salvation/dist/login/config/LoginServer.ini index 2359b2b2b3..4841207266 100644 --- a/L2J_Mobius_5.0_Salvation/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_5.0_Salvation/dist/login/config/LoginServer.ini @@ -54,23 +54,6 @@ Password = MaximumDbConnections = 5 -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Automatic Database Backup Settings # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/Config.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/Config.java index b0cd0c3fe5..0788fd8a30 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/Config.java @@ -86,6 +86,7 @@ public class Config // Config File Definitions // -------------------------------------------------- public static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini"; + public static final String INTERFACE_CONFIG_FILE = "./config/Interface.ini"; public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini"; public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini"; public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini"; @@ -98,11 +99,11 @@ public class Config private static final String GENERAL_CONFIG_FILE = "./config/General.ini"; private static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini"; private static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini"; - public static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; + private static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; private static final String NPC_CONFIG_FILE = "./config/NPC.ini"; private static final String PVP_CONFIG_FILE = "./config/PVP.ini"; private static final String RATES_CONFIG_FILE = "./config/Rates.ini"; - public static final String SERVER_CONFIG_FILE = "./config/Server.ini"; + private static final String SERVER_CONFIG_FILE = "./config/Server.ini"; private static final String TELNET_CONFIG_FILE = "./config/Telnet.ini"; private static final String TRAINING_CAMP_CONFIG_FILE = "./config/TrainingCamp.ini"; private static final String CHAT_FILTER_FILE = "./config/chatfilter.txt"; @@ -440,8 +441,6 @@ public class Config public static int INSTANT_THREAD_POOL_COUNT; public static int IO_PACKET_THREAD_CORE_SIZE; public static boolean THREADS_FOR_LOADING; - public static boolean ENABLE_GUI; - public static boolean DARK_THEME; public static boolean DEADLOCK_DETECTOR; public static int DEADLOCK_CHECK_INTERVAL; public static boolean RESTART_ON_DEADLOCK; @@ -1332,6 +1331,9 @@ public class Config public static int L2JBRASIL_DUALBOXES_ALLOWED; public static boolean ALLOW_L2JBRASIL_GAME_SERVER_REPORT; + public static boolean ENABLE_GUI; + public static boolean DARK_THEME; + /** * This class initializes all global variables for configuration.
* If the key doesn't appear in properties file, a default value is set by this class. {@link #SERVER_CONFIG_FILE} (properties file) for configuring your server. diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java index 1e2987690d..41d5efc11d 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java @@ -188,11 +188,11 @@ public class GameServer final long serverLoadStart = Chronos.currentTimeMillis(); // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.SERVER_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("GameServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/loginserver/LoginServer.java index 04aa4c55ee..d8280ba76d 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/loginserver/LoginServer.java @@ -64,11 +64,11 @@ public class LoginServer private LoginServer() throws Exception { // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.LOGIN_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("LoginServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/config/Interface.ini b/L2J_Mobius_5.5_EtinasFate/dist/game/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/config/Server.ini b/L2J_Mobius_5.5_EtinasFate/dist/game/config/Server.ini index 2ff3e3ef36..343dd520b1 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/config/Server.ini +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/config/Server.ini @@ -142,23 +142,6 @@ UrgentPacketThreadCoreSize = 40 ThreadsForLoading = False -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Dead Lock Detector (separate thread for detecting deadlocks) # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_5.5_EtinasFate/dist/login/config/Interface.ini b/L2J_Mobius_5.5_EtinasFate/dist/login/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_5.5_EtinasFate/dist/login/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_5.5_EtinasFate/dist/login/config/LoginServer.ini b/L2J_Mobius_5.5_EtinasFate/dist/login/config/LoginServer.ini index 2359b2b2b3..4841207266 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_5.5_EtinasFate/dist/login/config/LoginServer.ini @@ -54,23 +54,6 @@ Password = MaximumDbConnections = 5 -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Automatic Database Backup Settings # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/Config.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/Config.java index 6779fb8b89..033510f868 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/Config.java @@ -86,6 +86,7 @@ public class Config // Config File Definitions // -------------------------------------------------- public static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini"; + public static final String INTERFACE_CONFIG_FILE = "./config/Interface.ini"; public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini"; public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini"; public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini"; @@ -98,11 +99,11 @@ public class Config private static final String GENERAL_CONFIG_FILE = "./config/General.ini"; private static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini"; private static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini"; - public static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; + private static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; private static final String NPC_CONFIG_FILE = "./config/NPC.ini"; private static final String PVP_CONFIG_FILE = "./config/PVP.ini"; private static final String RATES_CONFIG_FILE = "./config/Rates.ini"; - public static final String SERVER_CONFIG_FILE = "./config/Server.ini"; + private static final String SERVER_CONFIG_FILE = "./config/Server.ini"; private static final String TELNET_CONFIG_FILE = "./config/Telnet.ini"; private static final String TRAINING_CAMP_CONFIG_FILE = "./config/TrainingCamp.ini"; private static final String CHAT_FILTER_FILE = "./config/chatfilter.txt"; @@ -440,8 +441,6 @@ public class Config public static int INSTANT_THREAD_POOL_COUNT; public static int IO_PACKET_THREAD_CORE_SIZE; public static boolean THREADS_FOR_LOADING; - public static boolean ENABLE_GUI; - public static boolean DARK_THEME; public static boolean DEADLOCK_DETECTOR; public static int DEADLOCK_CHECK_INTERVAL; public static boolean RESTART_ON_DEADLOCK; @@ -1339,6 +1338,9 @@ public class Config public static int L2JBRASIL_DUALBOXES_ALLOWED; public static boolean ALLOW_L2JBRASIL_GAME_SERVER_REPORT; + public static boolean ENABLE_GUI; + public static boolean DARK_THEME; + /** * This class initializes all global variables for configuration.
* If the key doesn't appear in properties file, a default value is set by this class. {@link #SERVER_CONFIG_FILE} (properties file) for configuring your server. diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java index 1e2987690d..41d5efc11d 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java @@ -188,11 +188,11 @@ public class GameServer final long serverLoadStart = Chronos.currentTimeMillis(); // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.SERVER_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("GameServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/loginserver/LoginServer.java index 04aa4c55ee..d8280ba76d 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/loginserver/LoginServer.java @@ -64,11 +64,11 @@ public class LoginServer private LoginServer() throws Exception { // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.LOGIN_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("LoginServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/config/Interface.ini b/L2J_Mobius_6.0_Fafurion/dist/game/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_6.0_Fafurion/dist/game/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/config/Server.ini b/L2J_Mobius_6.0_Fafurion/dist/game/config/Server.ini index ea6528aaf1..4e21050262 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/config/Server.ini +++ b/L2J_Mobius_6.0_Fafurion/dist/game/config/Server.ini @@ -142,23 +142,6 @@ UrgentPacketThreadCoreSize = 40 ThreadsForLoading = False -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Dead Lock Detector (separate thread for detecting deadlocks) # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_6.0_Fafurion/dist/login/config/Interface.ini b/L2J_Mobius_6.0_Fafurion/dist/login/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_6.0_Fafurion/dist/login/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_6.0_Fafurion/dist/login/config/LoginServer.ini b/L2J_Mobius_6.0_Fafurion/dist/login/config/LoginServer.ini index 2359b2b2b3..4841207266 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_6.0_Fafurion/dist/login/config/LoginServer.ini @@ -54,23 +54,6 @@ Password = MaximumDbConnections = 5 -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Automatic Database Backup Settings # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/Config.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/Config.java index 651be3dc35..1b8e54bed0 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/Config.java @@ -86,6 +86,7 @@ public class Config // Config File Definitions // -------------------------------------------------- public static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini"; + public static final String INTERFACE_CONFIG_FILE = "./config/Interface.ini"; public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini"; public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini"; public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini"; @@ -98,11 +99,11 @@ public class Config private static final String GENERAL_CONFIG_FILE = "./config/General.ini"; private static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini"; private static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini"; - public static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; + private static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; private static final String NPC_CONFIG_FILE = "./config/NPC.ini"; private static final String PVP_CONFIG_FILE = "./config/PVP.ini"; private static final String RATES_CONFIG_FILE = "./config/Rates.ini"; - public static final String SERVER_CONFIG_FILE = "./config/Server.ini"; + private static final String SERVER_CONFIG_FILE = "./config/Server.ini"; private static final String TELNET_CONFIG_FILE = "./config/Telnet.ini"; private static final String TRAINING_CAMP_CONFIG_FILE = "./config/TrainingCamp.ini"; private static final String CHAT_FILTER_FILE = "./config/chatfilter.txt"; @@ -441,8 +442,6 @@ public class Config public static int INSTANT_THREAD_POOL_COUNT; public static int IO_PACKET_THREAD_CORE_SIZE; public static boolean THREADS_FOR_LOADING; - public static boolean ENABLE_GUI; - public static boolean DARK_THEME; public static boolean DEADLOCK_DETECTOR; public static int DEADLOCK_CHECK_INTERVAL; public static boolean RESTART_ON_DEADLOCK; @@ -1361,6 +1360,9 @@ public class Config public static int L2JBRASIL_DUALBOXES_ALLOWED; public static boolean ALLOW_L2JBRASIL_GAME_SERVER_REPORT; + public static boolean ENABLE_GUI; + public static boolean DARK_THEME; + /** * This class initializes all global variables for configuration.
* If the key doesn't appear in properties file, a default value is set by this class. {@link #SERVER_CONFIG_FILE} (properties file) for configuring your server. diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java index 341aa3d4ec..64078eee30 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java @@ -189,11 +189,11 @@ public class GameServer final long serverLoadStart = Chronos.currentTimeMillis(); // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.SERVER_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("GameServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/loginserver/LoginServer.java index 04aa4c55ee..d8280ba76d 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/loginserver/LoginServer.java @@ -64,11 +64,11 @@ public class LoginServer private LoginServer() throws Exception { // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.LOGIN_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("LoginServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Interface.ini b/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Server.ini b/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Server.ini index 4bdc6d633b..b739db22c0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Server.ini +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Server.ini @@ -142,23 +142,6 @@ UrgentPacketThreadCoreSize = 40 ThreadsForLoading = False -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Dead Lock Detector (separate thread for detecting deadlocks) # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/login/config/Interface.ini b/L2J_Mobius_7.0_PreludeOfWar/dist/login/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/login/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/login/config/LoginServer.ini b/L2J_Mobius_7.0_PreludeOfWar/dist/login/config/LoginServer.ini index 2359b2b2b3..4841207266 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/login/config/LoginServer.ini @@ -54,23 +54,6 @@ Password = MaximumDbConnections = 5 -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Automatic Database Backup Settings # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/Config.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/Config.java index 90b60a4b82..33dd5395bc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/Config.java @@ -86,6 +86,7 @@ public class Config // Config File Definitions // -------------------------------------------------- public static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini"; + public static final String INTERFACE_CONFIG_FILE = "./config/Interface.ini"; public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini"; public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini"; public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini"; @@ -98,11 +99,11 @@ public class Config private static final String GENERAL_CONFIG_FILE = "./config/General.ini"; private static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini"; private static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini"; - public static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; + private static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; private static final String NPC_CONFIG_FILE = "./config/NPC.ini"; private static final String PVP_CONFIG_FILE = "./config/PVP.ini"; private static final String RATES_CONFIG_FILE = "./config/Rates.ini"; - public static final String SERVER_CONFIG_FILE = "./config/Server.ini"; + private static final String SERVER_CONFIG_FILE = "./config/Server.ini"; private static final String TELNET_CONFIG_FILE = "./config/Telnet.ini"; private static final String TRAINING_CAMP_CONFIG_FILE = "./config/TrainingCamp.ini"; private static final String CHAT_FILTER_FILE = "./config/chatfilter.txt"; @@ -440,8 +441,6 @@ public class Config public static int INSTANT_THREAD_POOL_COUNT; public static int IO_PACKET_THREAD_CORE_SIZE; public static boolean THREADS_FOR_LOADING; - public static boolean ENABLE_GUI; - public static boolean DARK_THEME; public static boolean DEADLOCK_DETECTOR; public static int DEADLOCK_CHECK_INTERVAL; public static boolean RESTART_ON_DEADLOCK; @@ -1367,6 +1366,9 @@ public class Config public static int L2JBRASIL_DUALBOXES_ALLOWED; public static boolean ALLOW_L2JBRASIL_GAME_SERVER_REPORT; + public static boolean ENABLE_GUI; + public static boolean DARK_THEME; + /** * This class initializes all global variables for configuration.
* If the key doesn't appear in properties file, a default value is set by this class. {@link #SERVER_CONFIG_FILE} (properties file) for configuring your server. diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/GameServer.java index a4da6f9025..1646dfe627 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/GameServer.java @@ -192,11 +192,11 @@ public class GameServer final long serverLoadStart = Chronos.currentTimeMillis(); // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.SERVER_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("GameServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/loginserver/LoginServer.java index 04aa4c55ee..d8280ba76d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/loginserver/LoginServer.java @@ -64,11 +64,11 @@ public class LoginServer private LoginServer() throws Exception { // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.LOGIN_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("LoginServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/config/Interface.ini b/L2J_Mobius_8.0_Homunculus/dist/game/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_8.0_Homunculus/dist/game/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/config/Server.ini b/L2J_Mobius_8.0_Homunculus/dist/game/config/Server.ini index 85353a2ae2..d564479ff8 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/config/Server.ini +++ b/L2J_Mobius_8.0_Homunculus/dist/game/config/Server.ini @@ -142,23 +142,6 @@ UrgentPacketThreadCoreSize = 40 ThreadsForLoading = False -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Dead Lock Detector (separate thread for detecting deadlocks) # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_8.0_Homunculus/dist/login/config/Interface.ini b/L2J_Mobius_8.0_Homunculus/dist/login/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_8.0_Homunculus/dist/login/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_8.0_Homunculus/dist/login/config/LoginServer.ini b/L2J_Mobius_8.0_Homunculus/dist/login/config/LoginServer.ini index 2359b2b2b3..4841207266 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_8.0_Homunculus/dist/login/config/LoginServer.ini @@ -54,23 +54,6 @@ Password = MaximumDbConnections = 5 -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Automatic Database Backup Settings # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/Config.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/Config.java index 19da2ca7ba..e3ad952c6a 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/Config.java @@ -86,6 +86,7 @@ public class Config // Config File Definitions // -------------------------------------------------- public static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini"; + public static final String INTERFACE_CONFIG_FILE = "./config/Interface.ini"; public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini"; public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini"; public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini"; @@ -98,11 +99,11 @@ public class Config private static final String GENERAL_CONFIG_FILE = "./config/General.ini"; private static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini"; private static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini"; - public static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; + private static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; private static final String NPC_CONFIG_FILE = "./config/NPC.ini"; private static final String PVP_CONFIG_FILE = "./config/PVP.ini"; private static final String RATES_CONFIG_FILE = "./config/Rates.ini"; - public static final String SERVER_CONFIG_FILE = "./config/Server.ini"; + private static final String SERVER_CONFIG_FILE = "./config/Server.ini"; private static final String TELNET_CONFIG_FILE = "./config/Telnet.ini"; private static final String TRAINING_CAMP_CONFIG_FILE = "./config/TrainingCamp.ini"; private static final String CHAT_FILTER_FILE = "./config/chatfilter.txt"; @@ -440,8 +441,6 @@ public class Config public static int INSTANT_THREAD_POOL_COUNT; public static int IO_PACKET_THREAD_CORE_SIZE; public static boolean THREADS_FOR_LOADING; - public static boolean ENABLE_GUI; - public static boolean DARK_THEME; public static boolean DEADLOCK_DETECTOR; public static int DEADLOCK_CHECK_INTERVAL; public static boolean RESTART_ON_DEADLOCK; @@ -1364,6 +1363,9 @@ public class Config public static int L2JBRASIL_DUALBOXES_ALLOWED; public static boolean ALLOW_L2JBRASIL_GAME_SERVER_REPORT; + public static boolean ENABLE_GUI; + public static boolean DARK_THEME; + /** * This class initializes all global variables for configuration.
* If the key doesn't appear in properties file, a default value is set by this class. {@link #SERVER_CONFIG_FILE} (properties file) for configuring your server. diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/GameServer.java index 487185a8f7..9a74a0e016 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/GameServer.java @@ -191,11 +191,11 @@ public class GameServer final long serverLoadStart = Chronos.currentTimeMillis(); // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.SERVER_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("GameServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/loginserver/LoginServer.java index 04aa4c55ee..d8280ba76d 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/loginserver/LoginServer.java @@ -64,11 +64,11 @@ public class LoginServer private LoginServer() throws Exception { // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.LOGIN_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("LoginServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/config/Interface.ini b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/config/Server.ini b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/config/Server.ini index 0e649c20ea..da30ee05e1 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/config/Server.ini +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/config/Server.ini @@ -142,23 +142,6 @@ UrgentPacketThreadCoreSize = 40 ThreadsForLoading = False -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Dead Lock Detector (separate thread for detecting deadlocks) # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/login/config/Interface.ini b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/login/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/login/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/login/config/LoginServer.ini b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/login/config/LoginServer.ini index 2359b2b2b3..4841207266 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/login/config/LoginServer.ini @@ -54,23 +54,6 @@ Password = MaximumDbConnections = 5 -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Automatic Database Backup Settings # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/Config.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/Config.java index 19da2ca7ba..e3ad952c6a 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/Config.java @@ -86,6 +86,7 @@ public class Config // Config File Definitions // -------------------------------------------------- public static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini"; + public static final String INTERFACE_CONFIG_FILE = "./config/Interface.ini"; public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini"; public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini"; public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini"; @@ -98,11 +99,11 @@ public class Config private static final String GENERAL_CONFIG_FILE = "./config/General.ini"; private static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini"; private static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini"; - public static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; + private static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; private static final String NPC_CONFIG_FILE = "./config/NPC.ini"; private static final String PVP_CONFIG_FILE = "./config/PVP.ini"; private static final String RATES_CONFIG_FILE = "./config/Rates.ini"; - public static final String SERVER_CONFIG_FILE = "./config/Server.ini"; + private static final String SERVER_CONFIG_FILE = "./config/Server.ini"; private static final String TELNET_CONFIG_FILE = "./config/Telnet.ini"; private static final String TRAINING_CAMP_CONFIG_FILE = "./config/TrainingCamp.ini"; private static final String CHAT_FILTER_FILE = "./config/chatfilter.txt"; @@ -440,8 +441,6 @@ public class Config public static int INSTANT_THREAD_POOL_COUNT; public static int IO_PACKET_THREAD_CORE_SIZE; public static boolean THREADS_FOR_LOADING; - public static boolean ENABLE_GUI; - public static boolean DARK_THEME; public static boolean DEADLOCK_DETECTOR; public static int DEADLOCK_CHECK_INTERVAL; public static boolean RESTART_ON_DEADLOCK; @@ -1364,6 +1363,9 @@ public class Config public static int L2JBRASIL_DUALBOXES_ALLOWED; public static boolean ALLOW_L2JBRASIL_GAME_SERVER_REPORT; + public static boolean ENABLE_GUI; + public static boolean DARK_THEME; + /** * This class initializes all global variables for configuration.
* If the key doesn't appear in properties file, a default value is set by this class. {@link #SERVER_CONFIG_FILE} (properties file) for configuring your server. diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/GameServer.java index 487185a8f7..9a74a0e016 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/GameServer.java @@ -191,11 +191,11 @@ public class GameServer final long serverLoadStart = Chronos.currentTimeMillis(); // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.SERVER_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("GameServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/LoginServer.java index 04aa4c55ee..d8280ba76d 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/LoginServer.java @@ -64,11 +64,11 @@ public class LoginServer private LoginServer() throws Exception { // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.LOGIN_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("LoginServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_C1_HarbingersOfWar/dist/config/Interface.ini b/L2J_Mobius_C1_HarbingersOfWar/dist/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_C1_HarbingersOfWar/dist/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_C1_HarbingersOfWar/dist/config/server.ini b/L2J_Mobius_C1_HarbingersOfWar/dist/config/server.ini index fb149dd915..ca2083039f 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/dist/config/server.ini +++ b/L2J_Mobius_C1_HarbingersOfWar/dist/config/server.ini @@ -32,21 +32,4 @@ MaximumOnlineUsers=2000 AutoCreateAccounts=true # Enable unknown packet logging. -LogUnknownPackets=false - - -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True +LogUnknownPackets=false \ No newline at end of file diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/Config.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/Config.java index bc22cd3959..3258aa8a19 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/Config.java @@ -36,12 +36,16 @@ public class Config // -------------------------------------------------- // Config File Definitions // -------------------------------------------------- - public static final String SERVER_CONFIG_FILE = "config/server.ini"; - private static final String RATES_CONFIG_FILE = "config/rates.ini"; - private static final String KARMA_CONFIG_FILE = "config/karma.ini"; - private static final String THREADPOOL_CONFIG_FILE = "config/threadpool.ini"; + public static final String INTERFACE_CONFIG_FILE = "./config/Interface.ini"; + public static final String SERVER_CONFIG_FILE = "./config/server.ini"; + private static final String RATES_CONFIG_FILE = "./config/rates.ini"; + private static final String KARMA_CONFIG_FILE = "./config/karma.ini"; + private static final String THREADPOOL_CONFIG_FILE = "./config/threadpool.ini"; private static final String NPC_CONFIG_FILE = "./config/npc.ini"; + // Interface + public static boolean ENABLE_GUI; + public static boolean DARK_THEME; // Game public static int SERVER_PORT; public static String SERVER_HOST_NAME; @@ -54,9 +58,6 @@ public class Config public static boolean AUTO_CREATE_ACCOUNTS; // Other public static boolean LOG_UNKNOWN_PACKETS; - // GUI - public static boolean ENABLE_GUI; - public static boolean DARK_THEME; // Rates public static float RATE_XP; public static float RATE_SP; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/Server.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/Server.java index 90bdc32a36..a3bc1998d1 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/Server.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/Server.java @@ -46,11 +46,11 @@ public class Server Config.load(); // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.SERVER_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("Server: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/Interface.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/Server.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/Server.ini index 06fdfb4bc8..01c5d54dfd 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/Server.ini +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/Server.ini @@ -134,23 +134,6 @@ InstantThreadPoolCount = 120 UrgentPacketThreadCoreSize = 40 -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Misc Player Settings # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/login/config/Interface.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/login/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/login/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/login/config/main/LoginServer.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/login/config/main/LoginServer.ini index c9ff70e345..237bafbfb0 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/login/config/main/LoginServer.ini +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/login/config/main/LoginServer.ini @@ -60,23 +60,6 @@ Password = MaximumDbConnections = 10 -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Automatic Database Backup Settings # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/login/config/protected/MmoCore.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/login/config/protected/MmoCore.ini deleted file mode 100644 index 505afde297..0000000000 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/login/config/protected/MmoCore.ini +++ /dev/null @@ -1,128 +0,0 @@ -#=========================================# -# MMOCore Connection Settings # -#=========================================# - -# ---------------------------- # -# Debug and Develop logging # -# ---------------------------- # -EnableMMOCoreDebug = False -EnableMMOCoreDevelop = False -EnableMMOCoreExceptions = False -PacketHandlerDebug = False - -# ---------------------------- -# Config BackLog -# ---------------------------- -# Maximum length of request. -# The maximum length for incoming requests (connection request). -# Maximum number of requests, after which the requests -# Will not be accepted. -# The default is 50 -# Must be equal to the estimated number of players. -# Example: Players in the game 1000 +, NetworkBackLog = 1000 -# NetworkBackLog = 50 - -# ---------------- -# Set TOS -# ---------------- -# Set the traffic going to a particular socket. -# Can be ignored JAVA-machine. -# Range: 0 <= tc <= 255 or a ban happens. -# Note: -# To TCP4 should be set high priority and should be RFC 1349. -# You can also create a type priorities bit, example: -# IPTOS_LOWCOST (0x02) -# IPTOS_RELIABILITY (0x04) -# IPTOS_THROUGHPUT (0x08) -# IPTOS_LOWDELAY (0x10) -# The lowest bit is ignored (0). -# Set bits in the priority may cause the collapse of the server. -# depends on the service and platform. -# Note: -# Applications can not change GameServer after connecting. -# To TCP6 value can be found in the header sin6_flowinfo. -# NetworkIpTOS = 0 - -# --------------------------------------- -# Setting TCP_NODELAY -# --------------------------------------- -# On / Off TCP_NODELAY -#NetworkTcpNoDelay = False - -# ------------------------------- -# Setting KeepAlive -# ------------------------------- -# On / Off SO_KEEPALIVE -#NetworkKeepAlive = False - -# ------------------------ -# Set a timeout -# ------------------------ -# Set a timeout in milliseconds. -# If set to 0, the timeout will be standard. -# Timeout must be greater than 0. -# Zero timeout is defined as an infinite timeout. -#NetworkSoTimeOut = 0 - -# --------------------------------------------------- -# Configure repetitions Adresses -# --------------------------------------------------- -# On / Off option. -# If the connection is closed, then turn timeout. -#NetworkSoReuseAddr = True - -# -------------------------------------- -# Set buffer compounds -# -------------------------------------- -# Buffer size in kbit (kilobits) -# By default (Windows) - 64KBits -# Default (* nix) - 128KBits -#NetworkReadBufferSize = 64 -#NetworkWriteBufferSize = 64 -#NetworkHelperBufferSize = 64 - -# The size of the auxiliary buffer -#NetworkHelperBufferCount = 20 - -# -------------------------- -# Client Queue Configuration -# -------------------------- -# Queue size, do not set it too low ! -# Default: 14 -ClientPacketQueueSize = 14 -# Maximum number of packets in burst. -# Execution will be aborted and thread released if more packets executed in raw. -# Default: 50 -ClientPacketQueueMaxBurstSize = 50 -# Maximum number of packets per second. -# Flood detector will be triggered if more packets received. -# After triggering all incoming packets will be dropped until flooding stopped. -# Default: 80 -ClientPacketQueueMaxPacketsPerSecond = 80 -# Average number of packets per second calculated during this interval. -# Using larger value decrease number of false kicks, but slower reaction to flood. -# Avoid using too low or too high values, recommended between 3 and 10. -# Default: 5 -ClientPacketQueueMeasureInterval = 5 -# Maximum average number of packets per second during measure interval. -# Flood detector will be triggered if more packets received. -# After triggering all incoming packets will be dropped until flooding stopped. -# Default: 40 -ClientPacketQueueMaxAveragePacketsPerSecond = 40 -# Maximum number of flood triggers per minute. -# Client will be kicked if more floods detected. -# Default: 2 -ClientPacketQueueMaxFloodPerMin = 6 -# Maximum number of queue overflows per minute. -# After overflow all incoming packets from client are dropped until queue is flushed. -# Client will be kicked if more queue overflows detected. -# Default: 50 -ClientPacketQueueOverflowsPerMin = 50 -# Maximum number of buffer underflows per minute. -# Client will be kicked if more underflow exceptions detected. -# Default: 1 -ClientPacketQueueUnderflowsPerMin = 1 -# Maximum number of unknown packets per minute. -# Client will be kicked if more unknown packets received. -# Default: 5 -ClientPacketQueueUnknownPerMin = 5 diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java index cbb6f9e65d..0371a42398 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java @@ -58,6 +58,8 @@ public class Config // standard private static final String FILTER_FILE = "./config/chatfilter.txt"; private static final String HEXID_FILE = "./config/hexid.txt"; + // interface + public static final String INTERFACE_CONFIG_FILE = "./config/Interface.ini"; // main private static final String ACCESS_CONFIG_FILE = "./config/main/Access.ini"; private static final String CHARACTER_CONFIG_FILE = "./config/main/Character.ini"; @@ -74,7 +76,7 @@ public class Config private static final String PVP_CONFIG_FILE = "./config/main/PvP.ini"; private static final String RAIDBOSS_CONFIG_FILE = "./config/main/RaidBoss.ini"; private static final String RATES_CONFIG_FILE = "./config/main/Rates.ini"; - public static final String SERVER_CONFIG_FILE = "./config/main/Server.ini"; + private static final String SERVER_CONFIG_FILE = "./config/main/Server.ini"; private static final String SEVENSIGNS_CONFIG_FILE = "./config/main/SevenSigns.ini"; public static final String SIEGE_CONFIG_FILE = "./config/main/Siege.ini"; // protected @@ -1128,8 +1130,6 @@ public class Config public static int SCHEDULED_THREAD_POOL_COUNT; public static int INSTANT_THREAD_POOL_COUNT; public static int IO_PACKET_THREAD_CORE_SIZE; - public static boolean ENABLE_GUI; - public static boolean DARK_THEME; public static String CNAME_TEMPLATE; public static String PET_NAME_TEMPLATE; public static String CLAN_NAME_TEMPLATE; @@ -1160,6 +1160,9 @@ public class Config public static long SESSION_TTL; public static int MAX_LOGINSESSIONS; + public static boolean ENABLE_GUI; + public static boolean DARK_THEME; + public static void loadAccessConfig() { final PropertiesParser accessConfig = new PropertiesParser(ACCESS_CONFIG_FILE); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/GameServer.java index 460275cac5..9ae986bf10 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/GameServer.java @@ -148,11 +148,11 @@ public class GameServer final long serverLoadStart = Chronos.currentTimeMillis(); // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.SERVER_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("GameServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/Interface.ini b/L2J_Mobius_C6_Interlude/dist/game/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_C6_Interlude/dist/game/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/main/Server.ini b/L2J_Mobius_C6_Interlude/dist/game/config/main/Server.ini index 4dc22ce89b..48509a7f02 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/config/main/Server.ini +++ b/L2J_Mobius_C6_Interlude/dist/game/config/main/Server.ini @@ -130,23 +130,6 @@ InstantThreadPoolCount = 120 UrgentPacketThreadCoreSize = 40 -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Misc Player Settings # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_C6_Interlude/dist/login/config/Interface.ini b/L2J_Mobius_C6_Interlude/dist/login/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_C6_Interlude/dist/login/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_C6_Interlude/dist/login/config/LoginServer.ini b/L2J_Mobius_C6_Interlude/dist/login/config/LoginServer.ini index 5f9cf9997e..eddcfed49a 100644 --- a/L2J_Mobius_C6_Interlude/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_C6_Interlude/dist/login/config/LoginServer.ini @@ -54,23 +54,6 @@ Password = MaximumDbConnections = 5 -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Automatic Database Backup Settings # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java index c58976b5e8..606ee81a35 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java @@ -69,6 +69,8 @@ public class Config private static final String FILTER_FILE = "./config/chatfilter.txt"; private static final String HEXID_FILE = "./config/hexid.txt"; private static final String IPCONFIG_FILE = "./config/ipconfig.xml"; + // interface + public static final String INTERFACE_CONFIG_FILE = "./config/Interface.ini"; // main private static final String ACCESS_CONFIG_FILE = "./config/main/Access.ini"; private static final String CHARACTER_CONFIG_FILE = "./config/main/Character.ini"; @@ -85,7 +87,7 @@ public class Config private static final String PVP_CONFIG_FILE = "./config/main/PvP.ini"; private static final String RAIDBOSS_CONFIG_FILE = "./config/main/RaidBoss.ini"; private static final String RATES_CONFIG_FILE = "./config/main/Rates.ini"; - public static final String SERVER_CONFIG_FILE = "./config/main/Server.ini"; + private static final String SERVER_CONFIG_FILE = "./config/main/Server.ini"; private static final String SEVENSIGNS_CONFIG_FILE = "./config/main/SevenSigns.ini"; public static final String SIEGE_CONFIG_FILE = "./config/main/Siege.ini"; // protected @@ -113,7 +115,7 @@ public class Config private static final String EVENT_REBIRTH_CONFIG_FILE = "./config/custom/Rebirth.ini"; private static final String EVENT_WEDDING_CONFIG_FILE = "./config/custom/Wedding.ini"; // login - public static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; + private static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; // -------------------------------------------------- // Variable Definitions @@ -1167,8 +1169,6 @@ public class Config public static int SCHEDULED_THREAD_POOL_COUNT; public static int INSTANT_THREAD_POOL_COUNT; public static int IO_PACKET_THREAD_CORE_SIZE; - public static boolean ENABLE_GUI; - public static boolean DARK_THEME; public static String CNAME_TEMPLATE; public static String PET_NAME_TEMPLATE; public static String CLAN_NAME_TEMPLATE; @@ -1194,6 +1194,9 @@ public class Config public static boolean ACCEPT_NEW_GAMESERVER; public static boolean AUTO_CREATE_ACCOUNTS; + public static boolean ENABLE_GUI; + public static boolean DARK_THEME; + public static void loadAccessConfig() { final PropertiesParser accessConfig = new PropertiesParser(ACCESS_CONFIG_FILE); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java index de3541b023..91a4c55b1e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java @@ -152,11 +152,11 @@ public class GameServer final long serverLoadStart = Chronos.currentTimeMillis(); // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.SERVER_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("GameServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginServer.java index 60d7b20534..6fcb1d284d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginServer.java @@ -64,11 +64,11 @@ public class LoginServer private LoginServer() throws Exception { // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.LOGIN_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("LoginServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Interface.ini b/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Server.ini b/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Server.ini index 81f18c7d54..28f5b33d5f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Server.ini +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Server.ini @@ -142,23 +142,6 @@ UrgentPacketThreadCoreSize = 40 ThreadsForLoading = False -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Dead Lock Detector (separate thread for detecting deadlocks) # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/login/config/Interface.ini b/L2J_Mobius_CT_2.4_Epilogue/dist/login/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/login/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/login/config/LoginServer.ini b/L2J_Mobius_CT_2.4_Epilogue/dist/login/config/LoginServer.ini index 9ad5239b10..43cdcdc509 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/login/config/LoginServer.ini @@ -54,23 +54,6 @@ Password = MaximumDbConnections = 5 -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Automatic Database Backup Settings # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java index 968462fd26..8460669ad1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java @@ -84,6 +84,7 @@ public class Config // Config File Definitions // -------------------------------------------------- public static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini"; + public static final String INTERFACE_CONFIG_FILE = "./config/Interface.ini"; public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini"; public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini"; public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini"; @@ -95,11 +96,11 @@ public class Config private static final String GENERAL_CONFIG_FILE = "./config/General.ini"; private static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini"; private static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini"; - public static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; + private static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; private static final String NPC_CONFIG_FILE = "./config/NPC.ini"; private static final String PVP_CONFIG_FILE = "./config/PVP.ini"; private static final String RATES_CONFIG_FILE = "./config/Rates.ini"; - public static final String SERVER_CONFIG_FILE = "./config/Server.ini"; + private static final String SERVER_CONFIG_FILE = "./config/Server.ini"; private static final String TELNET_CONFIG_FILE = "./config/Telnet.ini"; private static final String CHAT_FILTER_FILE = "./config/chatfilter.txt"; private static final String HEXID_FILE = "./config/hexid.txt"; @@ -506,8 +507,6 @@ public class Config public static int INSTANT_THREAD_POOL_COUNT; public static int IO_PACKET_THREAD_CORE_SIZE; public static boolean THREADS_FOR_LOADING; - public static boolean ENABLE_GUI; - public static boolean DARK_THEME; public static boolean DEADLOCK_DETECTOR; public static int DEADLOCK_CHECK_INTERVAL; public static boolean RESTART_ON_DEADLOCK; @@ -1376,6 +1375,9 @@ public class Config public static int L2JBRASIL_DUALBOXES_ALLOWED; public static boolean ALLOW_L2JBRASIL_GAME_SERVER_REPORT; + public static boolean ENABLE_GUI; + public static boolean DARK_THEME; + /** * This class initializes all global variables for configuration.
* If the key doesn't appear in config file, a default value is set by this class. {@link #SERVER_CONFIG_FILE} (config file) for configuring your server. diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/GameServer.java index ff343ae6c1..37c4cd249d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/GameServer.java @@ -182,11 +182,11 @@ public class GameServer final long serverLoadStart = Chronos.currentTimeMillis(); // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.SERVER_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("GameServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/LoginServer.java index 04aa4c55ee..d8280ba76d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/LoginServer.java @@ -64,11 +64,11 @@ public class LoginServer private LoginServer() throws Exception { // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.LOGIN_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("LoginServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Interface.ini b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Server.ini b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Server.ini index cbf4449941..5f4e106e11 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Server.ini +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Server.ini @@ -142,23 +142,6 @@ UrgentPacketThreadCoreSize = 40 ThreadsForLoading = False -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Dead Lock Detector (separate thread for detecting deadlocks) # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/login/config/Interface.ini b/L2J_Mobius_CT_2.6_HighFive/dist/login/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/login/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/login/config/LoginServer.ini b/L2J_Mobius_CT_2.6_HighFive/dist/login/config/LoginServer.ini index d1cdd87b50..65b4c65afa 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_CT_2.6_HighFive/dist/login/config/LoginServer.ini @@ -54,23 +54,6 @@ Password = MaximumDbConnections = 5 -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Automatic Database Backup Settings # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java index e86d8ae8fb..0f19f65d34 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java @@ -84,6 +84,7 @@ public class Config // Config File Definitions // -------------------------------------------------- public static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini"; + public static final String INTERFACE_CONFIG_FILE = "./config/Interface.ini"; public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini"; public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini"; public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini"; @@ -95,11 +96,11 @@ public class Config private static final String GENERAL_CONFIG_FILE = "./config/General.ini"; private static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini"; private static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini"; - public static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; + private static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; private static final String NPC_CONFIG_FILE = "./config/NPC.ini"; private static final String PVP_CONFIG_FILE = "./config/PVP.ini"; private static final String RATES_CONFIG_FILE = "./config/Rates.ini"; - public static final String SERVER_CONFIG_FILE = "./config/Server.ini"; + private static final String SERVER_CONFIG_FILE = "./config/Server.ini"; private static final String TELNET_CONFIG_FILE = "./config/Telnet.ini"; private static final String CHAT_FILTER_FILE = "./config/chatfilter.txt"; private static final String HEXID_FILE = "./config/hexid.txt"; @@ -511,8 +512,6 @@ public class Config public static int INSTANT_THREAD_POOL_COUNT; public static int IO_PACKET_THREAD_CORE_SIZE; public static boolean THREADS_FOR_LOADING; - public static boolean ENABLE_GUI; - public static boolean DARK_THEME; public static boolean DEADLOCK_DETECTOR; public static int DEADLOCK_CHECK_INTERVAL; public static boolean RESTART_ON_DEADLOCK; @@ -1376,6 +1375,9 @@ public class Config public static int L2JBRASIL_DUALBOXES_ALLOWED; public static boolean ALLOW_L2JBRASIL_GAME_SERVER_REPORT; + public static boolean ENABLE_GUI; + public static boolean DARK_THEME; + /** * This class initializes all global variables for configuration.
* If the key doesn't appear in config file, a default value is set by this class. {@link #SERVER_CONFIG_FILE} (config file) for configuring your server. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java index 53aa1d969f..2dc736a90c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java @@ -183,11 +183,11 @@ public class GameServer final long serverLoadStart = Chronos.currentTimeMillis(); // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.SERVER_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("GameServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/LoginServer.java index 04aa4c55ee..d8280ba76d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/LoginServer.java @@ -64,11 +64,11 @@ public class LoginServer private LoginServer() throws Exception { // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.LOGIN_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("LoginServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Interface.ini b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Server.ini b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Server.ini index 87fda974c6..39b5db82f8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Server.ini +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Server.ini @@ -142,23 +142,6 @@ UrgentPacketThreadCoreSize = 40 ThreadsForLoading = False -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Dead Lock Detector (separate thread for detecting deadlocks) # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/login/config/Interface.ini b/L2J_Mobius_Classic_2.0_Saviors/dist/login/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/login/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/login/config/LoginServer.ini b/L2J_Mobius_Classic_2.0_Saviors/dist/login/config/LoginServer.ini index 5dc32c62d9..7ce0641617 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/login/config/LoginServer.ini @@ -54,23 +54,6 @@ Password = MaximumDbConnections = 5 -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Automatic Database Backup Settings # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java index 30c323a046..ffa3204841 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java @@ -86,6 +86,7 @@ public class Config // Config File Definitions // -------------------------------------------------- public static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini"; + public static final String INTERFACE_CONFIG_FILE = "./config/Interface.ini"; public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini"; public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini"; public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini"; @@ -97,11 +98,11 @@ public class Config private static final String GENERAL_CONFIG_FILE = "./config/General.ini"; private static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini"; private static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini"; - public static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; + private static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; private static final String NPC_CONFIG_FILE = "./config/NPC.ini"; private static final String PVP_CONFIG_FILE = "./config/PVP.ini"; private static final String RATES_CONFIG_FILE = "./config/Rates.ini"; - public static final String SERVER_CONFIG_FILE = "./config/Server.ini"; + private static final String SERVER_CONFIG_FILE = "./config/Server.ini"; private static final String TELNET_CONFIG_FILE = "./config/Telnet.ini"; private static final String TRAINING_CAMP_CONFIG_FILE = "./config/TrainingCamp.ini"; private static final String CHAT_FILTER_FILE = "./config/chatfilter.txt"; @@ -466,8 +467,6 @@ public class Config public static int INSTANT_THREAD_POOL_COUNT; public static int IO_PACKET_THREAD_CORE_SIZE; public static boolean THREADS_FOR_LOADING; - public static boolean ENABLE_GUI; - public static boolean DARK_THEME; public static boolean DEADLOCK_DETECTOR; public static int DEADLOCK_CHECK_INTERVAL; public static boolean RESTART_ON_DEADLOCK; @@ -1292,6 +1291,9 @@ public class Config public static int L2JBRASIL_DUALBOXES_ALLOWED; public static boolean ALLOW_L2JBRASIL_GAME_SERVER_REPORT; + public static boolean ENABLE_GUI; + public static boolean DARK_THEME; + /** * This class initializes all global variables for configuration.
* If the key doesn't appear in properties file, a default value is set by this class. {@link #SERVER_CONFIG_FILE} (properties file) for configuring your server. diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java index e5baab79ce..2250579108 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java @@ -185,11 +185,11 @@ public class GameServer final long serverLoadStart = Chronos.currentTimeMillis(); // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.SERVER_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("GameServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/LoginServer.java index 04aa4c55ee..d8280ba76d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/LoginServer.java @@ -64,11 +64,11 @@ public class LoginServer private LoginServer() throws Exception { // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.LOGIN_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("LoginServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Interface.ini b/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Server.ini b/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Server.ini index 97976a0f0e..f31dd638ff 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Server.ini +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Server.ini @@ -142,23 +142,6 @@ UrgentPacketThreadCoreSize = 40 ThreadsForLoading = False -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Dead Lock Detector (separate thread for detecting deadlocks) # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/login/config/Interface.ini b/L2J_Mobius_Classic_2.1_Zaken/dist/login/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/login/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/login/config/LoginServer.ini b/L2J_Mobius_Classic_2.1_Zaken/dist/login/config/LoginServer.ini index 5dc32c62d9..7ce0641617 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/login/config/LoginServer.ini @@ -54,23 +54,6 @@ Password = MaximumDbConnections = 5 -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Automatic Database Backup Settings # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/Config.java index 7826924295..b0218340a6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/Config.java @@ -86,6 +86,7 @@ public class Config // Config File Definitions // -------------------------------------------------- public static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini"; + public static final String INTERFACE_CONFIG_FILE = "./config/Interface.ini"; public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini"; public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini"; public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini"; @@ -97,11 +98,11 @@ public class Config private static final String GENERAL_CONFIG_FILE = "./config/General.ini"; private static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini"; private static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini"; - public static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; + private static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; private static final String NPC_CONFIG_FILE = "./config/NPC.ini"; private static final String PVP_CONFIG_FILE = "./config/PVP.ini"; private static final String RATES_CONFIG_FILE = "./config/Rates.ini"; - public static final String SERVER_CONFIG_FILE = "./config/Server.ini"; + private static final String SERVER_CONFIG_FILE = "./config/Server.ini"; private static final String TELNET_CONFIG_FILE = "./config/Telnet.ini"; private static final String TRAINING_CAMP_CONFIG_FILE = "./config/TrainingCamp.ini"; private static final String CHAT_FILTER_FILE = "./config/chatfilter.txt"; @@ -466,8 +467,6 @@ public class Config public static int INSTANT_THREAD_POOL_COUNT; public static int IO_PACKET_THREAD_CORE_SIZE; public static boolean THREADS_FOR_LOADING; - public static boolean ENABLE_GUI; - public static boolean DARK_THEME; public static boolean DEADLOCK_DETECTOR; public static int DEADLOCK_CHECK_INTERVAL; public static boolean RESTART_ON_DEADLOCK; @@ -1296,6 +1295,9 @@ public class Config public static int L2JBRASIL_DUALBOXES_ALLOWED; public static boolean ALLOW_L2JBRASIL_GAME_SERVER_REPORT; + public static boolean ENABLE_GUI; + public static boolean DARK_THEME; + /** * This class initializes all global variables for configuration.
* If the key doesn't appear in properties file, a default value is set by this class. {@link #SERVER_CONFIG_FILE} (properties file) for configuring your server. diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java index e5baab79ce..2250579108 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java @@ -185,11 +185,11 @@ public class GameServer final long serverLoadStart = Chronos.currentTimeMillis(); // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.SERVER_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("GameServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/LoginServer.java index 04aa4c55ee..d8280ba76d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/LoginServer.java @@ -64,11 +64,11 @@ public class LoginServer private LoginServer() throws Exception { // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.LOGIN_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("LoginServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Interface.ini b/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Server.ini b/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Server.ini index 6d08ed56ac..fd19902600 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Server.ini +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Server.ini @@ -142,23 +142,6 @@ UrgentPacketThreadCoreSize = 40 ThreadsForLoading = False -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Dead Lock Detector (separate thread for detecting deadlocks) # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/login/config/Interface.ini b/L2J_Mobius_Classic_2.2_Antharas/dist/login/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/login/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/login/config/LoginServer.ini b/L2J_Mobius_Classic_2.2_Antharas/dist/login/config/LoginServer.ini index 5dc32c62d9..7ce0641617 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/login/config/LoginServer.ini @@ -54,23 +54,6 @@ Password = MaximumDbConnections = 5 -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Automatic Database Backup Settings # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/Config.java index 7826924295..b0218340a6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/Config.java @@ -86,6 +86,7 @@ public class Config // Config File Definitions // -------------------------------------------------- public static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini"; + public static final String INTERFACE_CONFIG_FILE = "./config/Interface.ini"; public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini"; public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini"; public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini"; @@ -97,11 +98,11 @@ public class Config private static final String GENERAL_CONFIG_FILE = "./config/General.ini"; private static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini"; private static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini"; - public static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; + private static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; private static final String NPC_CONFIG_FILE = "./config/NPC.ini"; private static final String PVP_CONFIG_FILE = "./config/PVP.ini"; private static final String RATES_CONFIG_FILE = "./config/Rates.ini"; - public static final String SERVER_CONFIG_FILE = "./config/Server.ini"; + private static final String SERVER_CONFIG_FILE = "./config/Server.ini"; private static final String TELNET_CONFIG_FILE = "./config/Telnet.ini"; private static final String TRAINING_CAMP_CONFIG_FILE = "./config/TrainingCamp.ini"; private static final String CHAT_FILTER_FILE = "./config/chatfilter.txt"; @@ -466,8 +467,6 @@ public class Config public static int INSTANT_THREAD_POOL_COUNT; public static int IO_PACKET_THREAD_CORE_SIZE; public static boolean THREADS_FOR_LOADING; - public static boolean ENABLE_GUI; - public static boolean DARK_THEME; public static boolean DEADLOCK_DETECTOR; public static int DEADLOCK_CHECK_INTERVAL; public static boolean RESTART_ON_DEADLOCK; @@ -1296,6 +1295,9 @@ public class Config public static int L2JBRASIL_DUALBOXES_ALLOWED; public static boolean ALLOW_L2JBRASIL_GAME_SERVER_REPORT; + public static boolean ENABLE_GUI; + public static boolean DARK_THEME; + /** * This class initializes all global variables for configuration.
* If the key doesn't appear in properties file, a default value is set by this class. {@link #SERVER_CONFIG_FILE} (properties file) for configuring your server. diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java index 224916a41e..d26d52b519 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java @@ -186,11 +186,11 @@ public class GameServer final long serverLoadStart = Chronos.currentTimeMillis(); // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.SERVER_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("GameServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/LoginServer.java index 04aa4c55ee..d8280ba76d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/LoginServer.java @@ -64,11 +64,11 @@ public class LoginServer private LoginServer() throws Exception { // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.LOGIN_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("LoginServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/Interface.ini b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/Server.ini b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/Server.ini index d4484f6fb0..a07c6414bb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/Server.ini +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/Server.ini @@ -142,23 +142,6 @@ UrgentPacketThreadCoreSize = 40 ThreadsForLoading = False -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Dead Lock Detector (separate thread for detecting deadlocks) # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/login/config/Interface.ini b/L2J_Mobius_Classic_2.3_SevenSigns/dist/login/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/login/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/login/config/LoginServer.ini b/L2J_Mobius_Classic_2.3_SevenSigns/dist/login/config/LoginServer.ini index 5dc32c62d9..7ce0641617 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/login/config/LoginServer.ini @@ -54,23 +54,6 @@ Password = MaximumDbConnections = 5 -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Automatic Database Backup Settings # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/Config.java index 87122f6345..aee4bb5f73 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/Config.java @@ -86,6 +86,7 @@ public class Config // Config File Definitions // -------------------------------------------------- public static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini"; + public static final String INTERFACE_CONFIG_FILE = "./config/Interface.ini"; public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini"; public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini"; public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini"; @@ -97,11 +98,11 @@ public class Config private static final String GENERAL_CONFIG_FILE = "./config/General.ini"; private static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini"; private static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini"; - public static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; + private static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; private static final String NPC_CONFIG_FILE = "./config/NPC.ini"; private static final String PVP_CONFIG_FILE = "./config/PVP.ini"; private static final String RATES_CONFIG_FILE = "./config/Rates.ini"; - public static final String SERVER_CONFIG_FILE = "./config/Server.ini"; + private static final String SERVER_CONFIG_FILE = "./config/Server.ini"; private static final String TELNET_CONFIG_FILE = "./config/Telnet.ini"; private static final String TRAINING_CAMP_CONFIG_FILE = "./config/TrainingCamp.ini"; private static final String CHAT_FILTER_FILE = "./config/chatfilter.txt"; @@ -466,8 +467,6 @@ public class Config public static int INSTANT_THREAD_POOL_COUNT; public static int IO_PACKET_THREAD_CORE_SIZE; public static boolean THREADS_FOR_LOADING; - public static boolean ENABLE_GUI; - public static boolean DARK_THEME; public static boolean DEADLOCK_DETECTOR; public static int DEADLOCK_CHECK_INTERVAL; public static boolean RESTART_ON_DEADLOCK; @@ -1296,6 +1295,9 @@ public class Config public static int L2JBRASIL_DUALBOXES_ALLOWED; public static boolean ALLOW_L2JBRASIL_GAME_SERVER_REPORT; + public static boolean ENABLE_GUI; + public static boolean DARK_THEME; + /** * This class initializes all global variables for configuration.
* If the key doesn't appear in properties file, a default value is set by this class. {@link #SERVER_CONFIG_FILE} (properties file) for configuring your server. diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java index 90d8c9fb4e..3b58d9fd47 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java @@ -187,11 +187,11 @@ public class GameServer final long serverLoadStart = Chronos.currentTimeMillis(); // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.SERVER_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("GameServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/LoginServer.java index 04aa4c55ee..d8280ba76d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/LoginServer.java @@ -64,11 +64,11 @@ public class LoginServer private LoginServer() throws Exception { // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.LOGIN_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("LoginServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/config/Interface.ini b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/config/Server.ini b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/config/Server.ini index 3ca98d49f8..29958b5736 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/config/Server.ini +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/config/Server.ini @@ -142,23 +142,6 @@ UrgentPacketThreadCoreSize = 40 ThreadsForLoading = False -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Dead Lock Detector (separate thread for detecting deadlocks) # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/login/config/Interface.ini b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/login/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/login/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/login/config/LoginServer.ini b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/login/config/LoginServer.ini index 5dc32c62d9..7ce0641617 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/login/config/LoginServer.ini @@ -54,23 +54,6 @@ Password = MaximumDbConnections = 5 -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Automatic Database Backup Settings # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/Config.java index f78b02bed2..1d84ab3d54 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/Config.java @@ -86,6 +86,7 @@ public class Config // Config File Definitions // -------------------------------------------------- public static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini"; + public static final String INTERFACE_CONFIG_FILE = "./config/Interface.ini"; public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini"; public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini"; public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini"; @@ -97,11 +98,11 @@ public class Config private static final String GENERAL_CONFIG_FILE = "./config/General.ini"; private static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini"; private static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini"; - public static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; + private static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; private static final String NPC_CONFIG_FILE = "./config/NPC.ini"; private static final String PVP_CONFIG_FILE = "./config/PVP.ini"; private static final String RATES_CONFIG_FILE = "./config/Rates.ini"; - public static final String SERVER_CONFIG_FILE = "./config/Server.ini"; + private static final String SERVER_CONFIG_FILE = "./config/Server.ini"; private static final String TELNET_CONFIG_FILE = "./config/Telnet.ini"; private static final String TRAINING_CAMP_CONFIG_FILE = "./config/TrainingCamp.ini"; private static final String CHAT_FILTER_FILE = "./config/chatfilter.txt"; @@ -466,8 +467,6 @@ public class Config public static int INSTANT_THREAD_POOL_COUNT; public static int IO_PACKET_THREAD_CORE_SIZE; public static boolean THREADS_FOR_LOADING; - public static boolean ENABLE_GUI; - public static boolean DARK_THEME; public static boolean DEADLOCK_DETECTOR; public static int DEADLOCK_CHECK_INTERVAL; public static boolean RESTART_ON_DEADLOCK; @@ -1301,6 +1300,9 @@ public class Config public static int L2JBRASIL_DUALBOXES_ALLOWED; public static boolean ALLOW_L2JBRASIL_GAME_SERVER_REPORT; + public static boolean ENABLE_GUI; + public static boolean DARK_THEME; + /** * This class initializes all global variables for configuration.
* If the key doesn't appear in properties file, a default value is set by this class. {@link #SERVER_CONFIG_FILE} (properties file) for configuring your server. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java index 2d0d739f2c..98098b97cf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java @@ -188,11 +188,11 @@ public class GameServer final long serverLoadStart = Chronos.currentTimeMillis(); // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.SERVER_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("GameServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/LoginServer.java index 04aa4c55ee..d8280ba76d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/LoginServer.java @@ -64,11 +64,11 @@ public class LoginServer private LoginServer() throws Exception { // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.LOGIN_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("LoginServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Interface.ini b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Server.ini b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Server.ini index c2891468fd..4ce8c2859d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Server.ini +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Server.ini @@ -142,23 +142,6 @@ UrgentPacketThreadCoreSize = 40 ThreadsForLoading = False -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Dead Lock Detector (separate thread for detecting deadlocks) # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/login/config/Interface.ini b/L2J_Mobius_Classic_3.0_TheKamael/dist/login/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/login/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/login/config/LoginServer.ini b/L2J_Mobius_Classic_3.0_TheKamael/dist/login/config/LoginServer.ini index 5dc32c62d9..7ce0641617 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/login/config/LoginServer.ini @@ -54,23 +54,6 @@ Password = MaximumDbConnections = 5 -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Automatic Database Backup Settings # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java index 0ec617ba55..2c7aea0581 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java @@ -86,6 +86,7 @@ public class Config // Config File Definitions // -------------------------------------------------- public static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini"; + public static final String INTERFACE_CONFIG_FILE = "./config/Interface.ini"; public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini"; public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini"; public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini"; @@ -97,11 +98,11 @@ public class Config private static final String GENERAL_CONFIG_FILE = "./config/General.ini"; private static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini"; private static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini"; - public static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; + private static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; private static final String NPC_CONFIG_FILE = "./config/NPC.ini"; private static final String PVP_CONFIG_FILE = "./config/PVP.ini"; private static final String RATES_CONFIG_FILE = "./config/Rates.ini"; - public static final String SERVER_CONFIG_FILE = "./config/Server.ini"; + private static final String SERVER_CONFIG_FILE = "./config/Server.ini"; private static final String TELNET_CONFIG_FILE = "./config/Telnet.ini"; private static final String TRAINING_CAMP_CONFIG_FILE = "./config/TrainingCamp.ini"; private static final String CHAT_FILTER_FILE = "./config/chatfilter.txt"; @@ -465,8 +466,6 @@ public class Config public static int INSTANT_THREAD_POOL_COUNT; public static int IO_PACKET_THREAD_CORE_SIZE; public static boolean THREADS_FOR_LOADING; - public static boolean ENABLE_GUI; - public static boolean DARK_THEME; public static boolean DEADLOCK_DETECTOR; public static int DEADLOCK_CHECK_INTERVAL; public static boolean RESTART_ON_DEADLOCK; @@ -1304,6 +1303,9 @@ public class Config public static int L2JBRASIL_DUALBOXES_ALLOWED; public static boolean ALLOW_L2JBRASIL_GAME_SERVER_REPORT; + public static boolean ENABLE_GUI; + public static boolean DARK_THEME; + /** * This class initializes all global variables for configuration.
* If the key doesn't appear in properties file, a default value is set by this class. {@link #SERVER_CONFIG_FILE} (properties file) for configuring your server. diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/GameServer.java index 8ad135a147..c063b10c13 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/GameServer.java @@ -191,11 +191,11 @@ public class GameServer final long serverLoadStart = Chronos.currentTimeMillis(); // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.SERVER_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("GameServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/LoginServer.java index 04aa4c55ee..d8280ba76d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/LoginServer.java @@ -64,11 +64,11 @@ public class LoginServer private LoginServer() throws Exception { // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.LOGIN_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("LoginServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/config/Interface.ini b/L2J_Mobius_Classic_Interlude/dist/game/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/dist/game/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_Classic_Interlude/dist/game/config/Server.ini b/L2J_Mobius_Classic_Interlude/dist/game/config/Server.ini index 51cddc17f5..3253273fed 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/config/Server.ini +++ b/L2J_Mobius_Classic_Interlude/dist/game/config/Server.ini @@ -142,23 +142,6 @@ UrgentPacketThreadCoreSize = 40 ThreadsForLoading = False -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Dead Lock Detector (separate thread for detecting deadlocks) # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_Classic_Interlude/dist/login/config/Interface.ini b/L2J_Mobius_Classic_Interlude/dist/login/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/dist/login/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_Classic_Interlude/dist/login/config/LoginServer.ini b/L2J_Mobius_Classic_Interlude/dist/login/config/LoginServer.ini index 6c1e444403..a1627e5d7d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_Classic_Interlude/dist/login/config/LoginServer.ini @@ -54,23 +54,6 @@ Password = MaximumDbConnections = 5 -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Automatic Database Backup Settings # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java index df7b54965a..b51a321964 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java @@ -87,6 +87,7 @@ public class Config // Config File Definitions // -------------------------------------------------- public static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini"; + public static final String INTERFACE_CONFIG_FILE = "./config/Interface.ini"; public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini"; public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini"; public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini"; @@ -98,11 +99,11 @@ public class Config private static final String GENERAL_CONFIG_FILE = "./config/General.ini"; private static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini"; private static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini"; - public static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; + private static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; private static final String NPC_CONFIG_FILE = "./config/NPC.ini"; private static final String PVP_CONFIG_FILE = "./config/PVP.ini"; private static final String RATES_CONFIG_FILE = "./config/Rates.ini"; - public static final String SERVER_CONFIG_FILE = "./config/Server.ini"; + private static final String SERVER_CONFIG_FILE = "./config/Server.ini"; private static final String TELNET_CONFIG_FILE = "./config/Telnet.ini"; private static final String TRAINING_CAMP_CONFIG_FILE = "./config/TrainingCamp.ini"; private static final String CHAT_FILTER_FILE = "./config/chatfilter.txt"; @@ -466,8 +467,6 @@ public class Config public static int INSTANT_THREAD_POOL_COUNT; public static int IO_PACKET_THREAD_CORE_SIZE; public static boolean THREADS_FOR_LOADING; - public static boolean ENABLE_GUI; - public static boolean DARK_THEME; public static boolean DEADLOCK_DETECTOR; public static int DEADLOCK_CHECK_INTERVAL; public static boolean RESTART_ON_DEADLOCK; @@ -1300,6 +1299,9 @@ public class Config public static int L2JBRASIL_DUALBOXES_ALLOWED; public static boolean ALLOW_L2JBRASIL_GAME_SERVER_REPORT; + public static boolean ENABLE_GUI; + public static boolean DARK_THEME; + /** * This class initializes all global variables for configuration.
* If the key doesn't appear in properties file, a default value is set by this class. {@link #SERVER_CONFIG_FILE} (properties file) for configuring your server. diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/GameServer.java index 991eb093ee..11190810c0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/GameServer.java @@ -183,11 +183,11 @@ public class GameServer final long serverLoadStart = Chronos.currentTimeMillis(); // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.SERVER_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("GameServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/LoginServer.java index 04aa4c55ee..d8280ba76d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/LoginServer.java @@ -64,11 +64,11 @@ public class LoginServer private LoginServer() throws Exception { // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.LOGIN_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("LoginServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/config/Interface.ini b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/config/Server.ini b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/config/Server.ini index f45328337e..c520efa6c4 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/config/Server.ini +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/config/Server.ini @@ -142,23 +142,6 @@ UrgentPacketThreadCoreSize = 40 ThreadsForLoading = False -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Dead Lock Detector (separate thread for detecting deadlocks) # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/login/config/Interface.ini b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/login/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/login/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/login/config/LoginServer.ini b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/login/config/LoginServer.ini index cb96e9368f..0b1653ba1a 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/login/config/LoginServer.ini @@ -54,23 +54,6 @@ Password = MaximumDbConnections = 5 -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Automatic Database Backup Settings # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/Config.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/Config.java index 63d4e21e0e..d5ecc98518 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/Config.java @@ -86,6 +86,7 @@ public class Config // Config File Definitions // -------------------------------------------------- public static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini"; + public static final String INTERFACE_CONFIG_FILE = "./config/Interface.ini"; public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini"; public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini"; public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini"; @@ -97,11 +98,11 @@ public class Config private static final String GENERAL_CONFIG_FILE = "./config/General.ini"; private static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini"; private static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini"; - public static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; + private static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; private static final String NPC_CONFIG_FILE = "./config/NPC.ini"; private static final String PVP_CONFIG_FILE = "./config/PVP.ini"; private static final String RATES_CONFIG_FILE = "./config/Rates.ini"; - public static final String SERVER_CONFIG_FILE = "./config/Server.ini"; + private static final String SERVER_CONFIG_FILE = "./config/Server.ini"; private static final String TELNET_CONFIG_FILE = "./config/Telnet.ini"; private static final String TRAINING_CAMP_CONFIG_FILE = "./config/TrainingCamp.ini"; private static final String CHAT_FILTER_FILE = "./config/chatfilter.txt"; @@ -467,8 +468,6 @@ public class Config public static int INSTANT_THREAD_POOL_COUNT; public static int IO_PACKET_THREAD_CORE_SIZE; public static boolean THREADS_FOR_LOADING; - public static boolean ENABLE_GUI; - public static boolean DARK_THEME; public static boolean DEADLOCK_DETECTOR; public static int DEADLOCK_CHECK_INTERVAL; public static boolean RESTART_ON_DEADLOCK; @@ -1319,6 +1318,9 @@ public class Config public static int L2JBRASIL_DUALBOXES_ALLOWED; public static boolean ALLOW_L2JBRASIL_GAME_SERVER_REPORT; + public static boolean ENABLE_GUI; + public static boolean DARK_THEME; + /** * This class initializes all global variables for configuration.
* If the key doesn't appear in properties file, a default value is set by this class. {@link #SERVER_CONFIG_FILE} (properties file) for configuring your server. diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/GameServer.java index c15c91445e..1c17d8010a 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/GameServer.java @@ -195,11 +195,11 @@ public class GameServer final long serverLoadStart = Chronos.currentTimeMillis(); // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.SERVER_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("GameServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/loginserver/LoginServer.java index 04aa4c55ee..d8280ba76d 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/loginserver/LoginServer.java @@ -64,11 +64,11 @@ public class LoginServer private LoginServer() throws Exception { // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.LOGIN_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("LoginServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/config/Interface.ini b/L2J_Mobius_Essence_5.0_Sylph/dist/game/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/config/Server.ini b/L2J_Mobius_Essence_5.0_Sylph/dist/game/config/Server.ini index 98b8d62253..4c0973b3b9 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/config/Server.ini +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/config/Server.ini @@ -142,23 +142,6 @@ UrgentPacketThreadCoreSize = 40 ThreadsForLoading = False -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Dead Lock Detector (separate thread for detecting deadlocks) # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/login/config/Interface.ini b/L2J_Mobius_Essence_5.0_Sylph/dist/login/config/Interface.ini new file mode 100644 index 0000000000..fd825f49f6 --- /dev/null +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/login/config/Interface.ini @@ -0,0 +1,15 @@ +# --------------------------------------------------------------------------- +# Interface Settings +# --------------------------------------------------------------------------- + +# Enable L2jMobius GUI when OS supports it. +# Provides access to admin commands without the need to be online. +# Warning! Do not disable if you use Gameserver.exe +# because server will run in the background! +# Default: True +EnableGUI = True + +# Dark theme. +# Use a dark version of the Nimbus theme. +# Default: True +DarkTheme = True diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/login/config/LoginServer.ini b/L2J_Mobius_Essence_5.0_Sylph/dist/login/config/LoginServer.ini index cb96e9368f..0b1653ba1a 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/login/config/LoginServer.ini @@ -54,23 +54,6 @@ Password = MaximumDbConnections = 5 -# --------------------------------------------------------------------------- -# Look and feel -# --------------------------------------------------------------------------- - -# Enable L2jMobius GUI when OS supports it. -# Provides access to admin commands without the need to be online. -# Warning! Do not disable if you use Gameserver.exe -# because server will run in the background! -# Default: True -EnableGUI = True - -# Dark theme. -# Use a dark version of the Nimbus theme. -# Default: True -DarkTheme = True - - # --------------------------------------------------------------------------- # Automatic Database Backup Settings # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/Config.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/Config.java index 1e10d28647..54b079369a 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/Config.java @@ -86,6 +86,7 @@ public class Config // Config File Definitions // -------------------------------------------------- public static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini"; + public static final String INTERFACE_CONFIG_FILE = "./config/Interface.ini"; public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini"; public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini"; public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini"; @@ -97,11 +98,11 @@ public class Config private static final String GENERAL_CONFIG_FILE = "./config/General.ini"; private static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini"; private static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini"; - public static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; + private static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; private static final String NPC_CONFIG_FILE = "./config/NPC.ini"; private static final String PVP_CONFIG_FILE = "./config/PVP.ini"; private static final String RATES_CONFIG_FILE = "./config/Rates.ini"; - public static final String SERVER_CONFIG_FILE = "./config/Server.ini"; + private static final String SERVER_CONFIG_FILE = "./config/Server.ini"; private static final String TELNET_CONFIG_FILE = "./config/Telnet.ini"; private static final String TRAINING_CAMP_CONFIG_FILE = "./config/TrainingCamp.ini"; private static final String CHAT_FILTER_FILE = "./config/chatfilter.txt"; @@ -467,8 +468,6 @@ public class Config public static int INSTANT_THREAD_POOL_COUNT; public static int IO_PACKET_THREAD_CORE_SIZE; public static boolean THREADS_FOR_LOADING; - public static boolean ENABLE_GUI; - public static boolean DARK_THEME; public static boolean DEADLOCK_DETECTOR; public static int DEADLOCK_CHECK_INTERVAL; public static boolean RESTART_ON_DEADLOCK; @@ -1319,6 +1318,9 @@ public class Config public static int L2JBRASIL_DUALBOXES_ALLOWED; public static boolean ALLOW_L2JBRASIL_GAME_SERVER_REPORT; + public static boolean ENABLE_GUI; + public static boolean DARK_THEME; + /** * This class initializes all global variables for configuration.
* If the key doesn't appear in properties file, a default value is set by this class. {@link #SERVER_CONFIG_FILE} (properties file) for configuring your server. diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/GameServer.java index 8d969bf373..760a4191e2 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/GameServer.java @@ -196,11 +196,11 @@ public class GameServer final long serverLoadStart = Chronos.currentTimeMillis(); // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.SERVER_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("GameServer: Running in GUI mode."); new Gui(); } diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/loginserver/LoginServer.java index 04aa4c55ee..d8280ba76d 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/loginserver/LoginServer.java @@ -64,11 +64,11 @@ public class LoginServer private LoginServer() throws Exception { // GUI - final PropertiesParser serverSettings = new PropertiesParser(Config.LOGIN_CONFIG_FILE); - Config.ENABLE_GUI = serverSettings.getBoolean("EnableGUI", true); + final PropertiesParser interfaceSettings = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); + Config.ENABLE_GUI = interfaceSettings.getBoolean("EnableGUI", true); if (Config.ENABLE_GUI && !GraphicsEnvironment.isHeadless()) { - Config.DARK_THEME = serverSettings.getBoolean("DarkTheme", true); + Config.DARK_THEME = interfaceSettings.getBoolean("DarkTheme", true); System.out.println("LoginServer: Running in GUI mode."); new Gui(); }