lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Separated interface configuration.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-05-02 23:30:32 +00:00
parent 0a86b20c17
commit 8d263dc0b4
165 changed files with 991 additions and 1164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java
View File

@ -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);

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java
View File

@ -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();
}

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginServer.java
View File

@ -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();
}