Organized config file definitions.
This commit is contained in:
parent
aec0c9dddb
commit
729c08c372
@ -82,27 +82,27 @@ public final class Config
|
|||||||
// Config File Definitions
|
// Config File Definitions
|
||||||
// --------------------------------------------------
|
// --------------------------------------------------
|
||||||
public static final String CHARACTER_CONFIG_FILE = "./config/Character.ini";
|
public static final String CHARACTER_CONFIG_FILE = "./config/Character.ini";
|
||||||
|
public static final String CH_SIEGE_CONFIG_FILE = "./config/ConquerableHallSiege.ini";
|
||||||
public static final String FEATURE_CONFIG_FILE = "./config/Feature.ini";
|
public static final String FEATURE_CONFIG_FILE = "./config/Feature.ini";
|
||||||
public static final String FORTSIEGE_CONFIGURATION_FILE = "./config/FortSiege.ini";
|
public static final String FLOOD_PROTECTOR_CONFIG_FILE = "./config/FloodProtector.ini";
|
||||||
|
public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini";
|
||||||
public static final String GENERAL_CONFIG_FILE = "./config/General.ini";
|
public static final String GENERAL_CONFIG_FILE = "./config/General.ini";
|
||||||
public static final String HEXID_FILE = "./config/hexid.txt";
|
public static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini";
|
||||||
public static final String ID_CONFIG_FILE = "./config/IdFactory.ini";
|
public static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini";
|
||||||
public static final String LOGIN_CONFIGURATION_FILE = "./config/LoginServer.ini";
|
public static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini";
|
||||||
|
public static final String IDFACTORY_CONFIG_FILE = "./config/IdFactory.ini";
|
||||||
|
public static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini";
|
||||||
|
public static final String MMO_CONFIG_FILE = "./config/MMO.ini";
|
||||||
public static final String NPC_CONFIG_FILE = "./config/NPC.ini";
|
public static final String NPC_CONFIG_FILE = "./config/NPC.ini";
|
||||||
|
public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini";
|
||||||
public static final String PVP_CONFIG_FILE = "./config/PVP.ini";
|
public static final String PVP_CONFIG_FILE = "./config/PVP.ini";
|
||||||
public static final String RATES_CONFIG_FILE = "./config/Rates.ini";
|
public static final String RATES_CONFIG_FILE = "./config/Rates.ini";
|
||||||
public static final String CONFIGURATION_FILE = "./config/Server.ini";
|
public static final String SERVER_CONFIG_FILE = "./config/Server.ini";
|
||||||
public static final String IP_CONFIG_FILE = "./config/ipconfig.xml";
|
public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini";
|
||||||
public static final String SIEGE_CONFIGURATION_FILE = "./config/Siege.ini";
|
public static final String TELNET_CONFIG_FILE = "./config/Telnet.ini";
|
||||||
public static final String TELNET_FILE = "./config/Telnet.ini";
|
|
||||||
public static final String FLOOD_PROTECTOR_FILE = "./config/FloodProtector.ini";
|
|
||||||
public static final String MMO_CONFIG_FILE = "./config/MMO.ini";
|
|
||||||
public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini";
|
|
||||||
public static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini";
|
|
||||||
public static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini";
|
|
||||||
public static final String CHAT_FILTER_FILE = "./config/chatfilter.txt";
|
public static final String CHAT_FILTER_FILE = "./config/chatfilter.txt";
|
||||||
public static final String CH_SIEGE_FILE = "./config/ConquerableHallSiege.ini";
|
public static final String HEXID_FILE = "./config/hexid.txt";
|
||||||
public static final String GEODATA_FILE = "./config/GeoEngine.ini";
|
public static final String IPCONFIG_FILE = "./config/ipconfig.xml";
|
||||||
|
|
||||||
// --------------------------------------------------
|
// --------------------------------------------------
|
||||||
// Custom Config File Definitions
|
// Custom Config File Definitions
|
||||||
@ -1126,7 +1126,7 @@ public final class Config
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* This class initializes all global variables for configuration.<br>
|
* This class initializes all global variables for configuration.<br>
|
||||||
* If the key doesn't appear in properties file, a default value is set by this class. {@link #CONFIGURATION_FILE} (properties file) for configuring your server.
|
* 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.
|
||||||
*/
|
*/
|
||||||
public static void load()
|
public static void load()
|
||||||
{
|
{
|
||||||
@ -1149,7 +1149,7 @@ public final class Config
|
|||||||
FLOOD_PROTECTOR_CHARACTER_SELECT = new FloodProtectorConfig("CharacterSelectFloodProtector");
|
FLOOD_PROTECTOR_CHARACTER_SELECT = new FloodProtectorConfig("CharacterSelectFloodProtector");
|
||||||
FLOOD_PROTECTOR_ITEM_AUCTION = new FloodProtectorConfig("ItemAuctionFloodProtector");
|
FLOOD_PROTECTOR_ITEM_AUCTION = new FloodProtectorConfig("ItemAuctionFloodProtector");
|
||||||
|
|
||||||
final PropertiesParser serverSettings = new PropertiesParser(CONFIGURATION_FILE);
|
final PropertiesParser serverSettings = new PropertiesParser(SERVER_CONFIG_FILE);
|
||||||
|
|
||||||
GAMESERVER_HOSTNAME = serverSettings.getString("GameserverHostname", "0.0.0.0");
|
GAMESERVER_HOSTNAME = serverSettings.getString("GameserverHostname", "0.0.0.0");
|
||||||
PORT_GAME = serverSettings.getInt("GameserverPort", 7777);
|
PORT_GAME = serverSettings.getInt("GameserverPort", 7777);
|
||||||
@ -1654,7 +1654,7 @@ public final class Config
|
|||||||
ABILITY_POINTS_RESET_ADENA = Character.getLong("AbilityPointsResetAdena", 10_000_000);
|
ABILITY_POINTS_RESET_ADENA = Character.getLong("AbilityPointsResetAdena", 10_000_000);
|
||||||
|
|
||||||
// Load Telnet config file (if exists)
|
// Load Telnet config file (if exists)
|
||||||
final PropertiesParser telnetSettings = new PropertiesParser(TELNET_FILE);
|
final PropertiesParser telnetSettings = new PropertiesParser(TELNET_CONFIG_FILE);
|
||||||
|
|
||||||
TELNET_ENABLED = telnetSettings.getBoolean("EnableTelnet", false);
|
TELNET_ENABLED = telnetSettings.getBoolean("EnableTelnet", false);
|
||||||
TELNET_PORT = telnetSettings.getInt("Port", 12345);
|
TELNET_PORT = telnetSettings.getInt("Port", 12345);
|
||||||
@ -1672,7 +1672,7 @@ public final class Config
|
|||||||
MMO_TCP_NODELAY = mmoSettings.getBoolean("TcpNoDelay", false);
|
MMO_TCP_NODELAY = mmoSettings.getBoolean("TcpNoDelay", false);
|
||||||
|
|
||||||
// Load IdFactory config file (if exists)
|
// Load IdFactory config file (if exists)
|
||||||
final PropertiesParser IdFactory = new PropertiesParser(ID_CONFIG_FILE);
|
final PropertiesParser IdFactory = new PropertiesParser(IDFACTORY_CONFIG_FILE);
|
||||||
|
|
||||||
IDFACTORY_TYPE = IdFactory.getEnum("IDFactory", IdFactoryType.class, IdFactoryType.BitSet);
|
IDFACTORY_TYPE = IdFactory.getEnum("IDFactory", IdFactoryType.class, IdFactoryType.BitSet);
|
||||||
BAD_ID_CHECKING = IdFactory.getBoolean("BadIdChecking", true);
|
BAD_ID_CHECKING = IdFactory.getBoolean("BadIdChecking", true);
|
||||||
@ -1855,7 +1855,7 @@ public final class Config
|
|||||||
ENABLE_FALLING_DAMAGE = General.getBoolean("EnableFallingDamage", true);
|
ENABLE_FALLING_DAMAGE = General.getBoolean("EnableFallingDamage", true);
|
||||||
|
|
||||||
// Load FloodProtector config file
|
// Load FloodProtector config file
|
||||||
final PropertiesParser FloodProtectors = new PropertiesParser(FLOOD_PROTECTOR_FILE);
|
final PropertiesParser FloodProtectors = new PropertiesParser(FLOOD_PROTECTOR_CONFIG_FILE);
|
||||||
|
|
||||||
loadFloodProtectorConfigs(FloodProtectors);
|
loadFloodProtectorConfigs(FloodProtectors);
|
||||||
|
|
||||||
@ -2247,7 +2247,7 @@ public final class Config
|
|||||||
LOGGER.log(Level.WARNING, "Error while loading chat filter words!", e);
|
LOGGER.log(Level.WARNING, "Error while loading chat filter words!", e);
|
||||||
}
|
}
|
||||||
|
|
||||||
final PropertiesParser ClanHallSiege = new PropertiesParser(CH_SIEGE_FILE);
|
final PropertiesParser ClanHallSiege = new PropertiesParser(CH_SIEGE_CONFIG_FILE);
|
||||||
|
|
||||||
CHS_MAX_ATTACKERS = ClanHallSiege.getInt("MaxAttackers", 500);
|
CHS_MAX_ATTACKERS = ClanHallSiege.getInt("MaxAttackers", 500);
|
||||||
CHS_CLAN_MINLEVEL = ClanHallSiege.getInt("MinClanLevel", 4);
|
CHS_CLAN_MINLEVEL = ClanHallSiege.getInt("MinClanLevel", 4);
|
||||||
@ -2256,7 +2256,7 @@ public final class Config
|
|||||||
CHS_FAME_AMOUNT = ClanHallSiege.getInt("FameAmount", 0);
|
CHS_FAME_AMOUNT = ClanHallSiege.getInt("FameAmount", 0);
|
||||||
CHS_FAME_FREQUENCY = ClanHallSiege.getInt("FameFrequency", 0);
|
CHS_FAME_FREQUENCY = ClanHallSiege.getInt("FameFrequency", 0);
|
||||||
|
|
||||||
final PropertiesParser geoData = new PropertiesParser(GEODATA_FILE);
|
final PropertiesParser geoData = new PropertiesParser(GEOENGINE_CONFIG_FILE);
|
||||||
|
|
||||||
GEODATA_PATH = geoData.getString("GeoDataPath", "./data/geodata/");
|
GEODATA_PATH = geoData.getString("GeoDataPath", "./data/geodata/");
|
||||||
COORD_SYNCHRONIZE = geoData.getInt("CoordSynchronize", -1);
|
COORD_SYNCHRONIZE = geoData.getInt("CoordSynchronize", -1);
|
||||||
@ -2679,7 +2679,7 @@ public final class Config
|
|||||||
}
|
}
|
||||||
else if (Server.serverMode == Server.MODE_LOGINSERVER)
|
else if (Server.serverMode == Server.MODE_LOGINSERVER)
|
||||||
{
|
{
|
||||||
final PropertiesParser ServerSettings = new PropertiesParser(LOGIN_CONFIGURATION_FILE);
|
final PropertiesParser ServerSettings = new PropertiesParser(LOGIN_CONFIG_FILE);
|
||||||
|
|
||||||
GAME_SERVER_LOGIN_HOST = ServerSettings.getString("LoginHostname", "127.0.0.1");
|
GAME_SERVER_LOGIN_HOST = ServerSettings.getString("LoginHostname", "127.0.0.1");
|
||||||
GAME_SERVER_LOGIN_PORT = ServerSettings.getInt("LoginPort", 9013);
|
GAME_SERVER_LOGIN_PORT = ServerSettings.getInt("LoginPort", 9013);
|
||||||
@ -2967,11 +2967,11 @@ public final class Config
|
|||||||
@Override
|
@Override
|
||||||
public void load()
|
public void load()
|
||||||
{
|
{
|
||||||
final File f = new File(IP_CONFIG_FILE);
|
final File f = new File(IPCONFIG_FILE);
|
||||||
if (f.exists())
|
if (f.exists())
|
||||||
{
|
{
|
||||||
LOGGER.info("Network Config: ipconfig.xml exists using manual configuration...");
|
LOGGER.info("Network Config: ipconfig.xml exists using manual configuration...");
|
||||||
parseFile(new File(IP_CONFIG_FILE));
|
parseFile(new File(IPCONFIG_FILE));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
// Auto configuration...
|
// Auto configuration...
|
||||||
@ -2999,7 +2999,7 @@ public final class Config
|
|||||||
|
|
||||||
if (_hosts.size() != _subnets.size())
|
if (_hosts.size() != _subnets.size())
|
||||||
{
|
{
|
||||||
LOGGER.warning("Failed to Load " + IP_CONFIG_FILE + " File - subnets does not match server addresses.");
|
LOGGER.warning("Failed to Load " + IPCONFIG_FILE + " File - subnets does not match server addresses.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -3007,7 +3007,7 @@ public final class Config
|
|||||||
final Node att = n.getAttributes().getNamedItem("address");
|
final Node att = n.getAttributes().getNamedItem("address");
|
||||||
if (att == null)
|
if (att == null)
|
||||||
{
|
{
|
||||||
LOGGER.warning("Failed to load " + IP_CONFIG_FILE + " file - default server address is missing.");
|
LOGGER.warning("Failed to load " + IPCONFIG_FILE + " file - default server address is missing.");
|
||||||
_hosts.add("127.0.0.1");
|
_hosts.add("127.0.0.1");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -115,7 +115,7 @@ public final class FortSiegeManager
|
|||||||
private void load()
|
private void load()
|
||||||
{
|
{
|
||||||
final Properties siegeSettings = new Properties();
|
final Properties siegeSettings = new Properties();
|
||||||
final File file = new File(Config.FORTSIEGE_CONFIGURATION_FILE);
|
final File file = new File(Config.FORTSIEGE_CONFIG_FILE);
|
||||||
try (InputStream is = new FileInputStream(file))
|
try (InputStream is = new FileInputStream(file))
|
||||||
{
|
{
|
||||||
siegeSettings.load(is);
|
siegeSettings.load(is);
|
||||||
|
@ -118,7 +118,7 @@ public final class SiegeManager
|
|||||||
|
|
||||||
private void load()
|
private void load()
|
||||||
{
|
{
|
||||||
final PropertiesParser siegeSettings = new PropertiesParser(Config.SIEGE_CONFIGURATION_FILE);
|
final PropertiesParser siegeSettings = new PropertiesParser(Config.SIEGE_CONFIG_FILE);
|
||||||
|
|
||||||
// Siege setting
|
// Siege setting
|
||||||
_attackerMaxClans = siegeSettings.getInt("AttackerMaxClans", 500);
|
_attackerMaxClans = siegeSettings.getInt("AttackerMaxClans", 500);
|
||||||
|
@ -359,7 +359,7 @@ public final class GeoDataConverter
|
|||||||
|
|
||||||
private static void loadGeoengineConfigs()
|
private static void loadGeoengineConfigs()
|
||||||
{
|
{
|
||||||
final PropertiesParser geoData = new PropertiesParser(Config.GEODATA_FILE);
|
final PropertiesParser geoData = new PropertiesParser(Config.GEOENGINE_CONFIG_FILE);
|
||||||
Config.GEODATA_PATH = geoData.getString("GeoDataPath", "./data/geodata/");
|
Config.GEODATA_PATH = geoData.getString("GeoDataPath", "./data/geodata/");
|
||||||
Config.COORD_SYNCHRONIZE = geoData.getInt("CoordSynchronize", -1);
|
Config.COORD_SYNCHRONIZE = geoData.getInt("CoordSynchronize", -1);
|
||||||
Config.PART_OF_CHARACTER_HEIGHT = geoData.getInt("PartOfCharacterHeight", 75);
|
Config.PART_OF_CHARACTER_HEIGHT = geoData.getInt("PartOfCharacterHeight", 75);
|
||||||
|
@ -82,27 +82,27 @@ public final class Config
|
|||||||
// Config File Definitions
|
// Config File Definitions
|
||||||
// --------------------------------------------------
|
// --------------------------------------------------
|
||||||
public static final String CHARACTER_CONFIG_FILE = "./config/Character.ini";
|
public static final String CHARACTER_CONFIG_FILE = "./config/Character.ini";
|
||||||
|
public static final String CH_SIEGE_CONFIG_FILE = "./config/ConquerableHallSiege.ini";
|
||||||
public static final String FEATURE_CONFIG_FILE = "./config/Feature.ini";
|
public static final String FEATURE_CONFIG_FILE = "./config/Feature.ini";
|
||||||
public static final String FORTSIEGE_CONFIGURATION_FILE = "./config/FortSiege.ini";
|
public static final String FLOOD_PROTECTOR_CONFIG_FILE = "./config/FloodProtector.ini";
|
||||||
|
public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini";
|
||||||
public static final String GENERAL_CONFIG_FILE = "./config/General.ini";
|
public static final String GENERAL_CONFIG_FILE = "./config/General.ini";
|
||||||
public static final String HEXID_FILE = "./config/hexid.txt";
|
public static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini";
|
||||||
public static final String ID_CONFIG_FILE = "./config/IdFactory.ini";
|
public static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini";
|
||||||
public static final String LOGIN_CONFIGURATION_FILE = "./config/LoginServer.ini";
|
public static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini";
|
||||||
|
public static final String IDFACTORY_CONFIG_FILE = "./config/IdFactory.ini";
|
||||||
|
public static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini";
|
||||||
|
public static final String MMO_CONFIG_FILE = "./config/MMO.ini";
|
||||||
public static final String NPC_CONFIG_FILE = "./config/NPC.ini";
|
public static final String NPC_CONFIG_FILE = "./config/NPC.ini";
|
||||||
|
public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini";
|
||||||
public static final String PVP_CONFIG_FILE = "./config/PVP.ini";
|
public static final String PVP_CONFIG_FILE = "./config/PVP.ini";
|
||||||
public static final String RATES_CONFIG_FILE = "./config/Rates.ini";
|
public static final String RATES_CONFIG_FILE = "./config/Rates.ini";
|
||||||
public static final String CONFIGURATION_FILE = "./config/Server.ini";
|
public static final String SERVER_CONFIG_FILE = "./config/Server.ini";
|
||||||
public static final String IP_CONFIG_FILE = "./config/ipconfig.xml";
|
public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini";
|
||||||
public static final String SIEGE_CONFIGURATION_FILE = "./config/Siege.ini";
|
public static final String TELNET_CONFIG_FILE = "./config/Telnet.ini";
|
||||||
public static final String TELNET_FILE = "./config/Telnet.ini";
|
|
||||||
public static final String FLOOD_PROTECTOR_FILE = "./config/FloodProtector.ini";
|
|
||||||
public static final String MMO_CONFIG_FILE = "./config/MMO.ini";
|
|
||||||
public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini";
|
|
||||||
public static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini";
|
|
||||||
public static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini";
|
|
||||||
public static final String CHAT_FILTER_FILE = "./config/chatfilter.txt";
|
public static final String CHAT_FILTER_FILE = "./config/chatfilter.txt";
|
||||||
public static final String CH_SIEGE_FILE = "./config/ConquerableHallSiege.ini";
|
public static final String HEXID_FILE = "./config/hexid.txt";
|
||||||
public static final String GEODATA_FILE = "./config/GeoEngine.ini";
|
public static final String IPCONFIG_FILE = "./config/ipconfig.xml";
|
||||||
|
|
||||||
// --------------------------------------------------
|
// --------------------------------------------------
|
||||||
// Custom Config File Definitions
|
// Custom Config File Definitions
|
||||||
@ -1123,7 +1123,7 @@ public final class Config
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* This class initializes all global variables for configuration.<br>
|
* This class initializes all global variables for configuration.<br>
|
||||||
* If the key doesn't appear in properties file, a default value is set by this class. {@link #CONFIGURATION_FILE} (properties file) for configuring your server.
|
* 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.
|
||||||
*/
|
*/
|
||||||
public static void load()
|
public static void load()
|
||||||
{
|
{
|
||||||
@ -1146,7 +1146,7 @@ public final class Config
|
|||||||
FLOOD_PROTECTOR_CHARACTER_SELECT = new FloodProtectorConfig("CharacterSelectFloodProtector");
|
FLOOD_PROTECTOR_CHARACTER_SELECT = new FloodProtectorConfig("CharacterSelectFloodProtector");
|
||||||
FLOOD_PROTECTOR_ITEM_AUCTION = new FloodProtectorConfig("ItemAuctionFloodProtector");
|
FLOOD_PROTECTOR_ITEM_AUCTION = new FloodProtectorConfig("ItemAuctionFloodProtector");
|
||||||
|
|
||||||
final PropertiesParser serverSettings = new PropertiesParser(CONFIGURATION_FILE);
|
final PropertiesParser serverSettings = new PropertiesParser(SERVER_CONFIG_FILE);
|
||||||
|
|
||||||
GAMESERVER_HOSTNAME = serverSettings.getString("GameserverHostname", "0.0.0.0");
|
GAMESERVER_HOSTNAME = serverSettings.getString("GameserverHostname", "0.0.0.0");
|
||||||
PORT_GAME = serverSettings.getInt("GameserverPort", 7777);
|
PORT_GAME = serverSettings.getInt("GameserverPort", 7777);
|
||||||
@ -1648,7 +1648,7 @@ public final class Config
|
|||||||
ABILITY_POINTS_RESET_ADENA = Character.getLong("AbilityPointsResetAdena", 10_000_000);
|
ABILITY_POINTS_RESET_ADENA = Character.getLong("AbilityPointsResetAdena", 10_000_000);
|
||||||
|
|
||||||
// Load Telnet config file (if exists)
|
// Load Telnet config file (if exists)
|
||||||
final PropertiesParser telnetSettings = new PropertiesParser(TELNET_FILE);
|
final PropertiesParser telnetSettings = new PropertiesParser(TELNET_CONFIG_FILE);
|
||||||
|
|
||||||
TELNET_ENABLED = telnetSettings.getBoolean("EnableTelnet", false);
|
TELNET_ENABLED = telnetSettings.getBoolean("EnableTelnet", false);
|
||||||
TELNET_PORT = telnetSettings.getInt("Port", 12345);
|
TELNET_PORT = telnetSettings.getInt("Port", 12345);
|
||||||
@ -1666,7 +1666,7 @@ public final class Config
|
|||||||
MMO_TCP_NODELAY = mmoSettings.getBoolean("TcpNoDelay", false);
|
MMO_TCP_NODELAY = mmoSettings.getBoolean("TcpNoDelay", false);
|
||||||
|
|
||||||
// Load IdFactory config file (if exists)
|
// Load IdFactory config file (if exists)
|
||||||
final PropertiesParser IdFactory = new PropertiesParser(ID_CONFIG_FILE);
|
final PropertiesParser IdFactory = new PropertiesParser(IDFACTORY_CONFIG_FILE);
|
||||||
|
|
||||||
IDFACTORY_TYPE = IdFactory.getEnum("IDFactory", IdFactoryType.class, IdFactoryType.BitSet);
|
IDFACTORY_TYPE = IdFactory.getEnum("IDFactory", IdFactoryType.class, IdFactoryType.BitSet);
|
||||||
BAD_ID_CHECKING = IdFactory.getBoolean("BadIdChecking", true);
|
BAD_ID_CHECKING = IdFactory.getBoolean("BadIdChecking", true);
|
||||||
@ -1849,7 +1849,7 @@ public final class Config
|
|||||||
ENABLE_FALLING_DAMAGE = General.getBoolean("EnableFallingDamage", true);
|
ENABLE_FALLING_DAMAGE = General.getBoolean("EnableFallingDamage", true);
|
||||||
|
|
||||||
// Load FloodProtector config file
|
// Load FloodProtector config file
|
||||||
final PropertiesParser FloodProtectors = new PropertiesParser(FLOOD_PROTECTOR_FILE);
|
final PropertiesParser FloodProtectors = new PropertiesParser(FLOOD_PROTECTOR_CONFIG_FILE);
|
||||||
|
|
||||||
loadFloodProtectorConfigs(FloodProtectors);
|
loadFloodProtectorConfigs(FloodProtectors);
|
||||||
|
|
||||||
@ -2241,7 +2241,7 @@ public final class Config
|
|||||||
LOGGER.log(Level.WARNING, "Error while loading chat filter words!", e);
|
LOGGER.log(Level.WARNING, "Error while loading chat filter words!", e);
|
||||||
}
|
}
|
||||||
|
|
||||||
final PropertiesParser ClanHallSiege = new PropertiesParser(CH_SIEGE_FILE);
|
final PropertiesParser ClanHallSiege = new PropertiesParser(CH_SIEGE_CONFIG_FILE);
|
||||||
|
|
||||||
CHS_MAX_ATTACKERS = ClanHallSiege.getInt("MaxAttackers", 500);
|
CHS_MAX_ATTACKERS = ClanHallSiege.getInt("MaxAttackers", 500);
|
||||||
CHS_CLAN_MINLEVEL = ClanHallSiege.getInt("MinClanLevel", 4);
|
CHS_CLAN_MINLEVEL = ClanHallSiege.getInt("MinClanLevel", 4);
|
||||||
@ -2250,7 +2250,7 @@ public final class Config
|
|||||||
CHS_FAME_AMOUNT = ClanHallSiege.getInt("FameAmount", 0);
|
CHS_FAME_AMOUNT = ClanHallSiege.getInt("FameAmount", 0);
|
||||||
CHS_FAME_FREQUENCY = ClanHallSiege.getInt("FameFrequency", 0);
|
CHS_FAME_FREQUENCY = ClanHallSiege.getInt("FameFrequency", 0);
|
||||||
|
|
||||||
final PropertiesParser geoData = new PropertiesParser(GEODATA_FILE);
|
final PropertiesParser geoData = new PropertiesParser(GEOENGINE_CONFIG_FILE);
|
||||||
|
|
||||||
GEODATA_PATH = geoData.getString("GeoDataPath", "./data/geodata/");
|
GEODATA_PATH = geoData.getString("GeoDataPath", "./data/geodata/");
|
||||||
COORD_SYNCHRONIZE = geoData.getInt("CoordSynchronize", -1);
|
COORD_SYNCHRONIZE = geoData.getInt("CoordSynchronize", -1);
|
||||||
@ -2673,7 +2673,7 @@ public final class Config
|
|||||||
}
|
}
|
||||||
else if (Server.serverMode == Server.MODE_LOGINSERVER)
|
else if (Server.serverMode == Server.MODE_LOGINSERVER)
|
||||||
{
|
{
|
||||||
final PropertiesParser ServerSettings = new PropertiesParser(LOGIN_CONFIGURATION_FILE);
|
final PropertiesParser ServerSettings = new PropertiesParser(LOGIN_CONFIG_FILE);
|
||||||
|
|
||||||
GAME_SERVER_LOGIN_HOST = ServerSettings.getString("LoginHostname", "127.0.0.1");
|
GAME_SERVER_LOGIN_HOST = ServerSettings.getString("LoginHostname", "127.0.0.1");
|
||||||
GAME_SERVER_LOGIN_PORT = ServerSettings.getInt("LoginPort", 9013);
|
GAME_SERVER_LOGIN_PORT = ServerSettings.getInt("LoginPort", 9013);
|
||||||
@ -2961,11 +2961,11 @@ public final class Config
|
|||||||
@Override
|
@Override
|
||||||
public void load()
|
public void load()
|
||||||
{
|
{
|
||||||
final File f = new File(IP_CONFIG_FILE);
|
final File f = new File(IPCONFIG_FILE);
|
||||||
if (f.exists())
|
if (f.exists())
|
||||||
{
|
{
|
||||||
LOGGER.info("Network Config: ipconfig.xml exists using manual configuration...");
|
LOGGER.info("Network Config: ipconfig.xml exists using manual configuration...");
|
||||||
parseFile(new File(IP_CONFIG_FILE));
|
parseFile(new File(IPCONFIG_FILE));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
// Auto configuration...
|
// Auto configuration...
|
||||||
@ -2993,7 +2993,7 @@ public final class Config
|
|||||||
|
|
||||||
if (_hosts.size() != _subnets.size())
|
if (_hosts.size() != _subnets.size())
|
||||||
{
|
{
|
||||||
LOGGER.warning("Failed to Load " + IP_CONFIG_FILE + " File - subnets does not match server addresses.");
|
LOGGER.warning("Failed to Load " + IPCONFIG_FILE + " File - subnets does not match server addresses.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -3001,7 +3001,7 @@ public final class Config
|
|||||||
final Node att = n.getAttributes().getNamedItem("address");
|
final Node att = n.getAttributes().getNamedItem("address");
|
||||||
if (att == null)
|
if (att == null)
|
||||||
{
|
{
|
||||||
LOGGER.warning("Failed to load " + IP_CONFIG_FILE + " file - default server address is missing.");
|
LOGGER.warning("Failed to load " + IPCONFIG_FILE + " file - default server address is missing.");
|
||||||
_hosts.add("127.0.0.1");
|
_hosts.add("127.0.0.1");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -115,7 +115,7 @@ public final class FortSiegeManager
|
|||||||
private void load()
|
private void load()
|
||||||
{
|
{
|
||||||
final Properties siegeSettings = new Properties();
|
final Properties siegeSettings = new Properties();
|
||||||
final File file = new File(Config.FORTSIEGE_CONFIGURATION_FILE);
|
final File file = new File(Config.FORTSIEGE_CONFIG_FILE);
|
||||||
try (InputStream is = new FileInputStream(file))
|
try (InputStream is = new FileInputStream(file))
|
||||||
{
|
{
|
||||||
siegeSettings.load(is);
|
siegeSettings.load(is);
|
||||||
|
@ -118,7 +118,7 @@ public final class SiegeManager
|
|||||||
|
|
||||||
private void load()
|
private void load()
|
||||||
{
|
{
|
||||||
final PropertiesParser siegeSettings = new PropertiesParser(Config.SIEGE_CONFIGURATION_FILE);
|
final PropertiesParser siegeSettings = new PropertiesParser(Config.SIEGE_CONFIG_FILE);
|
||||||
|
|
||||||
// Siege setting
|
// Siege setting
|
||||||
_attackerMaxClans = siegeSettings.getInt("AttackerMaxClans", 500);
|
_attackerMaxClans = siegeSettings.getInt("AttackerMaxClans", 500);
|
||||||
|
@ -359,7 +359,7 @@ public final class GeoDataConverter
|
|||||||
|
|
||||||
private static void loadGeoengineConfigs()
|
private static void loadGeoengineConfigs()
|
||||||
{
|
{
|
||||||
final PropertiesParser geoData = new PropertiesParser(Config.GEODATA_FILE);
|
final PropertiesParser geoData = new PropertiesParser(Config.GEOENGINE_CONFIG_FILE);
|
||||||
Config.GEODATA_PATH = geoData.getString("GeoDataPath", "./data/geodata/");
|
Config.GEODATA_PATH = geoData.getString("GeoDataPath", "./data/geodata/");
|
||||||
Config.COORD_SYNCHRONIZE = geoData.getInt("CoordSynchronize", -1);
|
Config.COORD_SYNCHRONIZE = geoData.getInt("CoordSynchronize", -1);
|
||||||
Config.PART_OF_CHARACTER_HEIGHT = geoData.getInt("PartOfCharacterHeight", 75);
|
Config.PART_OF_CHARACTER_HEIGHT = geoData.getInt("PartOfCharacterHeight", 75);
|
||||||
|
@ -82,27 +82,27 @@ public final class Config
|
|||||||
// Config File Definitions
|
// Config File Definitions
|
||||||
// --------------------------------------------------
|
// --------------------------------------------------
|
||||||
public static final String CHARACTER_CONFIG_FILE = "./config/Character.ini";
|
public static final String CHARACTER_CONFIG_FILE = "./config/Character.ini";
|
||||||
|
public static final String CH_SIEGE_CONFIG_FILE = "./config/ConquerableHallSiege.ini";
|
||||||
public static final String FEATURE_CONFIG_FILE = "./config/Feature.ini";
|
public static final String FEATURE_CONFIG_FILE = "./config/Feature.ini";
|
||||||
public static final String FORTSIEGE_CONFIGURATION_FILE = "./config/FortSiege.ini";
|
public static final String FLOOD_PROTECTOR_CONFIG_FILE = "./config/FloodProtector.ini";
|
||||||
|
public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini";
|
||||||
public static final String GENERAL_CONFIG_FILE = "./config/General.ini";
|
public static final String GENERAL_CONFIG_FILE = "./config/General.ini";
|
||||||
public static final String HEXID_FILE = "./config/hexid.txt";
|
public static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini";
|
||||||
public static final String ID_CONFIG_FILE = "./config/IdFactory.ini";
|
public static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini";
|
||||||
public static final String LOGIN_CONFIGURATION_FILE = "./config/LoginServer.ini";
|
public static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini";
|
||||||
|
public static final String IDFACTORY_CONFIG_FILE = "./config/IdFactory.ini";
|
||||||
|
public static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini";
|
||||||
|
public static final String MMO_CONFIG_FILE = "./config/MMO.ini";
|
||||||
public static final String NPC_CONFIG_FILE = "./config/NPC.ini";
|
public static final String NPC_CONFIG_FILE = "./config/NPC.ini";
|
||||||
|
public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini";
|
||||||
public static final String PVP_CONFIG_FILE = "./config/PVP.ini";
|
public static final String PVP_CONFIG_FILE = "./config/PVP.ini";
|
||||||
public static final String RATES_CONFIG_FILE = "./config/Rates.ini";
|
public static final String RATES_CONFIG_FILE = "./config/Rates.ini";
|
||||||
public static final String CONFIGURATION_FILE = "./config/Server.ini";
|
public static final String SERVER_CONFIG_FILE = "./config/Server.ini";
|
||||||
public static final String IP_CONFIG_FILE = "./config/ipconfig.xml";
|
public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini";
|
||||||
public static final String SIEGE_CONFIGURATION_FILE = "./config/Siege.ini";
|
public static final String TELNET_CONFIG_FILE = "./config/Telnet.ini";
|
||||||
public static final String TELNET_FILE = "./config/Telnet.ini";
|
|
||||||
public static final String FLOOD_PROTECTOR_FILE = "./config/FloodProtector.ini";
|
|
||||||
public static final String MMO_CONFIG_FILE = "./config/MMO.ini";
|
|
||||||
public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini";
|
|
||||||
public static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini";
|
|
||||||
public static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini";
|
|
||||||
public static final String CHAT_FILTER_FILE = "./config/chatfilter.txt";
|
public static final String CHAT_FILTER_FILE = "./config/chatfilter.txt";
|
||||||
public static final String CH_SIEGE_FILE = "./config/ConquerableHallSiege.ini";
|
public static final String HEXID_FILE = "./config/hexid.txt";
|
||||||
public static final String GEODATA_FILE = "./config/GeoEngine.ini";
|
public static final String IPCONFIG_FILE = "./config/ipconfig.xml";
|
||||||
|
|
||||||
// --------------------------------------------------
|
// --------------------------------------------------
|
||||||
// Custom Config File Definitions
|
// Custom Config File Definitions
|
||||||
@ -1125,7 +1125,7 @@ public final class Config
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* This class initializes all global variables for configuration.<br>
|
* This class initializes all global variables for configuration.<br>
|
||||||
* If the key doesn't appear in properties file, a default value is set by this class. {@link #CONFIGURATION_FILE} (properties file) for configuring your server.
|
* 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.
|
||||||
*/
|
*/
|
||||||
public static void load()
|
public static void load()
|
||||||
{
|
{
|
||||||
@ -1148,7 +1148,7 @@ public final class Config
|
|||||||
FLOOD_PROTECTOR_CHARACTER_SELECT = new FloodProtectorConfig("CharacterSelectFloodProtector");
|
FLOOD_PROTECTOR_CHARACTER_SELECT = new FloodProtectorConfig("CharacterSelectFloodProtector");
|
||||||
FLOOD_PROTECTOR_ITEM_AUCTION = new FloodProtectorConfig("ItemAuctionFloodProtector");
|
FLOOD_PROTECTOR_ITEM_AUCTION = new FloodProtectorConfig("ItemAuctionFloodProtector");
|
||||||
|
|
||||||
final PropertiesParser serverSettings = new PropertiesParser(CONFIGURATION_FILE);
|
final PropertiesParser serverSettings = new PropertiesParser(SERVER_CONFIG_FILE);
|
||||||
|
|
||||||
GAMESERVER_HOSTNAME = serverSettings.getString("GameserverHostname", "0.0.0.0");
|
GAMESERVER_HOSTNAME = serverSettings.getString("GameserverHostname", "0.0.0.0");
|
||||||
PORT_GAME = serverSettings.getInt("GameserverPort", 7777);
|
PORT_GAME = serverSettings.getInt("GameserverPort", 7777);
|
||||||
@ -1651,7 +1651,7 @@ public final class Config
|
|||||||
ABILITY_POINTS_RESET_ADENA = Character.getLong("AbilityPointsResetAdena", 10_000_000);
|
ABILITY_POINTS_RESET_ADENA = Character.getLong("AbilityPointsResetAdena", 10_000_000);
|
||||||
|
|
||||||
// Load Telnet config file (if exists)
|
// Load Telnet config file (if exists)
|
||||||
final PropertiesParser telnetSettings = new PropertiesParser(TELNET_FILE);
|
final PropertiesParser telnetSettings = new PropertiesParser(TELNET_CONFIG_FILE);
|
||||||
|
|
||||||
TELNET_ENABLED = telnetSettings.getBoolean("EnableTelnet", false);
|
TELNET_ENABLED = telnetSettings.getBoolean("EnableTelnet", false);
|
||||||
TELNET_PORT = telnetSettings.getInt("Port", 12345);
|
TELNET_PORT = telnetSettings.getInt("Port", 12345);
|
||||||
@ -1669,7 +1669,7 @@ public final class Config
|
|||||||
MMO_TCP_NODELAY = mmoSettings.getBoolean("TcpNoDelay", false);
|
MMO_TCP_NODELAY = mmoSettings.getBoolean("TcpNoDelay", false);
|
||||||
|
|
||||||
// Load IdFactory config file (if exists)
|
// Load IdFactory config file (if exists)
|
||||||
final PropertiesParser IdFactory = new PropertiesParser(ID_CONFIG_FILE);
|
final PropertiesParser IdFactory = new PropertiesParser(IDFACTORY_CONFIG_FILE);
|
||||||
|
|
||||||
IDFACTORY_TYPE = IdFactory.getEnum("IDFactory", IdFactoryType.class, IdFactoryType.BitSet);
|
IDFACTORY_TYPE = IdFactory.getEnum("IDFactory", IdFactoryType.class, IdFactoryType.BitSet);
|
||||||
BAD_ID_CHECKING = IdFactory.getBoolean("BadIdChecking", true);
|
BAD_ID_CHECKING = IdFactory.getBoolean("BadIdChecking", true);
|
||||||
@ -1853,7 +1853,7 @@ public final class Config
|
|||||||
ENABLE_FALLING_DAMAGE = General.getBoolean("EnableFallingDamage", true);
|
ENABLE_FALLING_DAMAGE = General.getBoolean("EnableFallingDamage", true);
|
||||||
|
|
||||||
// Load FloodProtector config file
|
// Load FloodProtector config file
|
||||||
final PropertiesParser FloodProtectors = new PropertiesParser(FLOOD_PROTECTOR_FILE);
|
final PropertiesParser FloodProtectors = new PropertiesParser(FLOOD_PROTECTOR_CONFIG_FILE);
|
||||||
|
|
||||||
loadFloodProtectorConfigs(FloodProtectors);
|
loadFloodProtectorConfigs(FloodProtectors);
|
||||||
|
|
||||||
@ -2245,7 +2245,7 @@ public final class Config
|
|||||||
LOGGER.log(Level.WARNING, "Error while loading chat filter words!", e);
|
LOGGER.log(Level.WARNING, "Error while loading chat filter words!", e);
|
||||||
}
|
}
|
||||||
|
|
||||||
final PropertiesParser ClanHallSiege = new PropertiesParser(CH_SIEGE_FILE);
|
final PropertiesParser ClanHallSiege = new PropertiesParser(CH_SIEGE_CONFIG_FILE);
|
||||||
|
|
||||||
CHS_MAX_ATTACKERS = ClanHallSiege.getInt("MaxAttackers", 500);
|
CHS_MAX_ATTACKERS = ClanHallSiege.getInt("MaxAttackers", 500);
|
||||||
CHS_CLAN_MINLEVEL = ClanHallSiege.getInt("MinClanLevel", 4);
|
CHS_CLAN_MINLEVEL = ClanHallSiege.getInt("MinClanLevel", 4);
|
||||||
@ -2254,7 +2254,7 @@ public final class Config
|
|||||||
CHS_FAME_AMOUNT = ClanHallSiege.getInt("FameAmount", 0);
|
CHS_FAME_AMOUNT = ClanHallSiege.getInt("FameAmount", 0);
|
||||||
CHS_FAME_FREQUENCY = ClanHallSiege.getInt("FameFrequency", 0);
|
CHS_FAME_FREQUENCY = ClanHallSiege.getInt("FameFrequency", 0);
|
||||||
|
|
||||||
final PropertiesParser geoData = new PropertiesParser(GEODATA_FILE);
|
final PropertiesParser geoData = new PropertiesParser(GEOENGINE_CONFIG_FILE);
|
||||||
|
|
||||||
GEODATA_PATH = geoData.getString("GeoDataPath", "./data/geodata/");
|
GEODATA_PATH = geoData.getString("GeoDataPath", "./data/geodata/");
|
||||||
COORD_SYNCHRONIZE = geoData.getInt("CoordSynchronize", -1);
|
COORD_SYNCHRONIZE = geoData.getInt("CoordSynchronize", -1);
|
||||||
@ -2677,7 +2677,7 @@ public final class Config
|
|||||||
}
|
}
|
||||||
else if (Server.serverMode == Server.MODE_LOGINSERVER)
|
else if (Server.serverMode == Server.MODE_LOGINSERVER)
|
||||||
{
|
{
|
||||||
final PropertiesParser ServerSettings = new PropertiesParser(LOGIN_CONFIGURATION_FILE);
|
final PropertiesParser ServerSettings = new PropertiesParser(LOGIN_CONFIG_FILE);
|
||||||
|
|
||||||
GAME_SERVER_LOGIN_HOST = ServerSettings.getString("LoginHostname", "127.0.0.1");
|
GAME_SERVER_LOGIN_HOST = ServerSettings.getString("LoginHostname", "127.0.0.1");
|
||||||
GAME_SERVER_LOGIN_PORT = ServerSettings.getInt("LoginPort", 9013);
|
GAME_SERVER_LOGIN_PORT = ServerSettings.getInt("LoginPort", 9013);
|
||||||
@ -2965,11 +2965,11 @@ public final class Config
|
|||||||
@Override
|
@Override
|
||||||
public void load()
|
public void load()
|
||||||
{
|
{
|
||||||
final File f = new File(IP_CONFIG_FILE);
|
final File f = new File(IPCONFIG_FILE);
|
||||||
if (f.exists())
|
if (f.exists())
|
||||||
{
|
{
|
||||||
LOGGER.info("Network Config: ipconfig.xml exists using manual configuration...");
|
LOGGER.info("Network Config: ipconfig.xml exists using manual configuration...");
|
||||||
parseFile(new File(IP_CONFIG_FILE));
|
parseFile(new File(IPCONFIG_FILE));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
// Auto configuration...
|
// Auto configuration...
|
||||||
@ -2997,7 +2997,7 @@ public final class Config
|
|||||||
|
|
||||||
if (_hosts.size() != _subnets.size())
|
if (_hosts.size() != _subnets.size())
|
||||||
{
|
{
|
||||||
LOGGER.warning("Failed to Load " + IP_CONFIG_FILE + " File - subnets does not match server addresses.");
|
LOGGER.warning("Failed to Load " + IPCONFIG_FILE + " File - subnets does not match server addresses.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -3005,7 +3005,7 @@ public final class Config
|
|||||||
final Node att = n.getAttributes().getNamedItem("address");
|
final Node att = n.getAttributes().getNamedItem("address");
|
||||||
if (att == null)
|
if (att == null)
|
||||||
{
|
{
|
||||||
LOGGER.warning("Failed to load " + IP_CONFIG_FILE + " file - default server address is missing.");
|
LOGGER.warning("Failed to load " + IPCONFIG_FILE + " file - default server address is missing.");
|
||||||
_hosts.add("127.0.0.1");
|
_hosts.add("127.0.0.1");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -115,7 +115,7 @@ public final class FortSiegeManager
|
|||||||
private void load()
|
private void load()
|
||||||
{
|
{
|
||||||
final Properties siegeSettings = new Properties();
|
final Properties siegeSettings = new Properties();
|
||||||
final File file = new File(Config.FORTSIEGE_CONFIGURATION_FILE);
|
final File file = new File(Config.FORTSIEGE_CONFIG_FILE);
|
||||||
try (InputStream is = new FileInputStream(file))
|
try (InputStream is = new FileInputStream(file))
|
||||||
{
|
{
|
||||||
siegeSettings.load(is);
|
siegeSettings.load(is);
|
||||||
|
@ -118,7 +118,7 @@ public final class SiegeManager
|
|||||||
|
|
||||||
private void load()
|
private void load()
|
||||||
{
|
{
|
||||||
final PropertiesParser siegeSettings = new PropertiesParser(Config.SIEGE_CONFIGURATION_FILE);
|
final PropertiesParser siegeSettings = new PropertiesParser(Config.SIEGE_CONFIG_FILE);
|
||||||
|
|
||||||
// Siege setting
|
// Siege setting
|
||||||
_attackerMaxClans = siegeSettings.getInt("AttackerMaxClans", 500);
|
_attackerMaxClans = siegeSettings.getInt("AttackerMaxClans", 500);
|
||||||
|
@ -359,7 +359,7 @@ public final class GeoDataConverter
|
|||||||
|
|
||||||
private static void loadGeoengineConfigs()
|
private static void loadGeoengineConfigs()
|
||||||
{
|
{
|
||||||
final PropertiesParser geoData = new PropertiesParser(Config.GEODATA_FILE);
|
final PropertiesParser geoData = new PropertiesParser(Config.GEOENGINE_CONFIG_FILE);
|
||||||
Config.GEODATA_PATH = geoData.getString("GeoDataPath", "./data/geodata/");
|
Config.GEODATA_PATH = geoData.getString("GeoDataPath", "./data/geodata/");
|
||||||
Config.COORD_SYNCHRONIZE = geoData.getInt("CoordSynchronize", -1);
|
Config.COORD_SYNCHRONIZE = geoData.getInt("CoordSynchronize", -1);
|
||||||
Config.PART_OF_CHARACTER_HEIGHT = geoData.getInt("PartOfCharacterHeight", 75);
|
Config.PART_OF_CHARACTER_HEIGHT = geoData.getInt("PartOfCharacterHeight", 75);
|
||||||
|
@ -75,35 +75,35 @@ public final class Config
|
|||||||
public static final String EOL = System.lineSeparator();
|
public static final String EOL = System.lineSeparator();
|
||||||
|
|
||||||
// --------------------------------------------------
|
// --------------------------------------------------
|
||||||
// L2J Initialization File Definitions
|
// Config File Definitions
|
||||||
// --------------------------------------------------
|
// --------------------------------------------------
|
||||||
public static final String CHARACTER_CONFIG_FILE = "./config/Character.ini";
|
public static final String CHARACTER_CONFIG_FILE = "./config/Character.ini";
|
||||||
public static final String FEATURE_CONFIG_FILE = "./config/Feature.ini";
|
public static final String CH_SIEGE_CONFIG_FILE = "./config/ConquerableHallSiege.ini";
|
||||||
public static final String FORTSIEGE_CONFIGURATION_FILE = "./config/FortSiege.ini";
|
|
||||||
public static final String GENERAL_CONFIG_FILE = "./config/General.ini";
|
|
||||||
public static final String HEXID_FILE = "./config/hexid.txt";
|
|
||||||
public static final String ID_CONFIG_FILE = "./config/IdFactory.ini";
|
|
||||||
public static final String CUSTOM_CONFIG_FILE = "./config/Custom.ini";
|
public static final String CUSTOM_CONFIG_FILE = "./config/Custom.ini";
|
||||||
public static final String LOGIN_CONFIGURATION_FILE = "./config/LoginServer.ini";
|
public static final String FEATURE_CONFIG_FILE = "./config/Feature.ini";
|
||||||
|
public static final String FLOOD_PROTECTOR_CONFIG_FILE = "./config/FloodProtector.ini";
|
||||||
|
public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini";
|
||||||
|
public static final String GENERAL_CONFIG_FILE = "./config/General.ini";
|
||||||
|
public static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini";
|
||||||
|
public static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini";
|
||||||
|
public static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini";
|
||||||
|
public static final String IDFACTORY_CONFIG_FILE = "./config/IdFactory.ini";
|
||||||
|
public static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini";
|
||||||
|
public static final String MMO_CONFIG_FILE = "./config/MMO.ini";
|
||||||
public static final String NPC_CONFIG_FILE = "./config/NPC.ini";
|
public static final String NPC_CONFIG_FILE = "./config/NPC.ini";
|
||||||
|
public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini";
|
||||||
public static final String PVP_CONFIG_FILE = "./config/PVP.ini";
|
public static final String PVP_CONFIG_FILE = "./config/PVP.ini";
|
||||||
public static final String RATES_CONFIG_FILE = "./config/Rates.ini";
|
public static final String RATES_CONFIG_FILE = "./config/Rates.ini";
|
||||||
public static final String CONFIGURATION_FILE = "./config/Server.ini";
|
public static final String SERVER_CONFIG_FILE = "./config/Server.ini";
|
||||||
public static final String IP_CONFIG_FILE = "./config/ipconfig.xml";
|
public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini";
|
||||||
public static final String SIEGE_CONFIGURATION_FILE = "./config/Siege.ini";
|
public static final String TELNET_CONFIG_FILE = "./config/Telnet.ini";
|
||||||
public static final String TW_CONFIGURATION_FILE = "./config/TerritoryWar.ini";
|
public static final String TW_CONFIG_FILE = "./config/TerritoryWar.ini";
|
||||||
public static final String TELNET_FILE = "./config/Telnet.ini";
|
|
||||||
public static final String FLOOD_PROTECTOR_FILE = "./config/FloodProtector.ini";
|
|
||||||
public static final String MMO_CONFIG_FILE = "./config/MMO.ini";
|
|
||||||
public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini";
|
|
||||||
public static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini";
|
|
||||||
public static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini";
|
|
||||||
public static final String CHAT_FILTER_FILE = "./config/chatfilter.txt";
|
public static final String CHAT_FILTER_FILE = "./config/chatfilter.txt";
|
||||||
public static final String CH_SIEGE_FILE = "./config/ConquerableHallSiege.ini";
|
public static final String HEXID_FILE = "./config/hexid.txt";
|
||||||
public static final String GEODATA_FILE = "./config/GeoEngine.ini";
|
public static final String IPCONFIG_FILE = "./config/ipconfig.xml";
|
||||||
|
|
||||||
// --------------------------------------------------
|
// --------------------------------------------------
|
||||||
// L2J Variable Definitions
|
// Variable Definitions
|
||||||
// --------------------------------------------------
|
// --------------------------------------------------
|
||||||
public static boolean PLAYER_DELEVEL;
|
public static boolean PLAYER_DELEVEL;
|
||||||
public static boolean DECREASE_SKILL_LEVEL;
|
public static boolean DECREASE_SKILL_LEVEL;
|
||||||
@ -1162,7 +1162,7 @@ public final class Config
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* This class initializes all global variables for configuration.<br>
|
* This class initializes all global variables for configuration.<br>
|
||||||
* If the key doesn't appear in properties file, a default value is set by this class. {@link #CONFIGURATION_FILE} (properties file) for configuring your server.
|
* 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.
|
||||||
*/
|
*/
|
||||||
public static void load()
|
public static void load()
|
||||||
{
|
{
|
||||||
@ -1185,7 +1185,7 @@ public final class Config
|
|||||||
FLOOD_PROTECTOR_CHARACTER_SELECT = new FloodProtectorConfig("CharacterSelectFloodProtector");
|
FLOOD_PROTECTOR_CHARACTER_SELECT = new FloodProtectorConfig("CharacterSelectFloodProtector");
|
||||||
FLOOD_PROTECTOR_ITEM_AUCTION = new FloodProtectorConfig("ItemAuctionFloodProtector");
|
FLOOD_PROTECTOR_ITEM_AUCTION = new FloodProtectorConfig("ItemAuctionFloodProtector");
|
||||||
|
|
||||||
final PropertiesParser serverSettings = new PropertiesParser(CONFIGURATION_FILE);
|
final PropertiesParser serverSettings = new PropertiesParser(SERVER_CONFIG_FILE);
|
||||||
|
|
||||||
GAMESERVER_HOSTNAME = serverSettings.getString("GameserverHostname", "*");
|
GAMESERVER_HOSTNAME = serverSettings.getString("GameserverHostname", "*");
|
||||||
PORT_GAME = serverSettings.getInt("GameserverPort", 7777);
|
PORT_GAME = serverSettings.getInt("GameserverPort", 7777);
|
||||||
@ -1754,7 +1754,7 @@ public final class Config
|
|||||||
NEVIT_IGNORE_ADVENT_TIME = character.getBoolean("NevitIgnoreAdventTime", false);
|
NEVIT_IGNORE_ADVENT_TIME = character.getBoolean("NevitIgnoreAdventTime", false);
|
||||||
|
|
||||||
// Load Telnet L2Properties file (if exists)
|
// Load Telnet L2Properties file (if exists)
|
||||||
final PropertiesParser telnetSettings = new PropertiesParser(TELNET_FILE);
|
final PropertiesParser telnetSettings = new PropertiesParser(TELNET_CONFIG_FILE);
|
||||||
|
|
||||||
IS_TELNET_ENABLED = telnetSettings.getBoolean("EnableTelnet", false);
|
IS_TELNET_ENABLED = telnetSettings.getBoolean("EnableTelnet", false);
|
||||||
|
|
||||||
@ -1768,7 +1768,7 @@ public final class Config
|
|||||||
MMO_TCP_NODELAY = mmoSettings.getBoolean("TcpNoDelay", false);
|
MMO_TCP_NODELAY = mmoSettings.getBoolean("TcpNoDelay", false);
|
||||||
|
|
||||||
// Load IdFactory L2Properties file (if exists)
|
// Load IdFactory L2Properties file (if exists)
|
||||||
final PropertiesParser IdFactory = new PropertiesParser(ID_CONFIG_FILE);
|
final PropertiesParser IdFactory = new PropertiesParser(IDFACTORY_CONFIG_FILE);
|
||||||
|
|
||||||
IDFACTORY_TYPE = IdFactory.getEnum("IDFactory", IdFactoryType.class, IdFactoryType.BitSet);
|
IDFACTORY_TYPE = IdFactory.getEnum("IDFactory", IdFactoryType.class, IdFactoryType.BitSet);
|
||||||
BAD_ID_CHECKING = IdFactory.getBoolean("BadIdChecking", true);
|
BAD_ID_CHECKING = IdFactory.getBoolean("BadIdChecking", true);
|
||||||
@ -2018,7 +2018,7 @@ public final class Config
|
|||||||
ENABLE_FALLING_DAMAGE = General.getBoolean("EnableFallingDamage", true);
|
ENABLE_FALLING_DAMAGE = General.getBoolean("EnableFallingDamage", true);
|
||||||
|
|
||||||
// Load FloodProtector L2Properties file
|
// Load FloodProtector L2Properties file
|
||||||
final PropertiesParser FloodProtectors = new PropertiesParser(FLOOD_PROTECTOR_FILE);
|
final PropertiesParser FloodProtectors = new PropertiesParser(FLOOD_PROTECTOR_CONFIG_FILE);
|
||||||
|
|
||||||
loadFloodProtectorConfigs(FloodProtectors);
|
loadFloodProtectorConfigs(FloodProtectors);
|
||||||
|
|
||||||
@ -2838,7 +2838,7 @@ public final class Config
|
|||||||
_log.log(Level.WARNING, "Error while loading chat filter words!", ioe);
|
_log.log(Level.WARNING, "Error while loading chat filter words!", ioe);
|
||||||
}
|
}
|
||||||
|
|
||||||
final PropertiesParser ClanHallSiege = new PropertiesParser(CH_SIEGE_FILE);
|
final PropertiesParser ClanHallSiege = new PropertiesParser(CH_SIEGE_CONFIG_FILE);
|
||||||
|
|
||||||
CHS_MAX_ATTACKERS = ClanHallSiege.getInt("MaxAttackers", 500);
|
CHS_MAX_ATTACKERS = ClanHallSiege.getInt("MaxAttackers", 500);
|
||||||
CHS_CLAN_MINLEVEL = ClanHallSiege.getInt("MinClanLevel", 4);
|
CHS_CLAN_MINLEVEL = ClanHallSiege.getInt("MinClanLevel", 4);
|
||||||
@ -2847,7 +2847,7 @@ public final class Config
|
|||||||
CHS_FAME_AMOUNT = ClanHallSiege.getInt("FameAmount", 0);
|
CHS_FAME_AMOUNT = ClanHallSiege.getInt("FameAmount", 0);
|
||||||
CHS_FAME_FREQUENCY = ClanHallSiege.getInt("FameFrequency", 0);
|
CHS_FAME_FREQUENCY = ClanHallSiege.getInt("FameFrequency", 0);
|
||||||
|
|
||||||
final PropertiesParser geoData = new PropertiesParser(GEODATA_FILE);
|
final PropertiesParser geoData = new PropertiesParser(GEOENGINE_CONFIG_FILE);
|
||||||
|
|
||||||
GEODATA_PATH = geoData.getString("GeoDataPath", "./data/geodata/");
|
GEODATA_PATH = geoData.getString("GeoDataPath", "./data/geodata/");
|
||||||
COORD_SYNCHRONIZE = geoData.getInt("CoordSynchronize", -1);
|
COORD_SYNCHRONIZE = geoData.getInt("CoordSynchronize", -1);
|
||||||
@ -2865,7 +2865,7 @@ public final class Config
|
|||||||
}
|
}
|
||||||
else if (Server.serverMode == Server.MODE_LOGINSERVER)
|
else if (Server.serverMode == Server.MODE_LOGINSERVER)
|
||||||
{
|
{
|
||||||
final PropertiesParser ServerSettings = new PropertiesParser(LOGIN_CONFIGURATION_FILE);
|
final PropertiesParser ServerSettings = new PropertiesParser(LOGIN_CONFIG_FILE);
|
||||||
|
|
||||||
GAME_SERVER_LOGIN_HOST = ServerSettings.getString("LoginHostname", "127.0.0.1");
|
GAME_SERVER_LOGIN_HOST = ServerSettings.getString("LoginHostname", "127.0.0.1");
|
||||||
GAME_SERVER_LOGIN_PORT = ServerSettings.getInt("LoginPort", 9013);
|
GAME_SERVER_LOGIN_PORT = ServerSettings.getInt("LoginPort", 9013);
|
||||||
@ -2920,7 +2920,7 @@ public final class Config
|
|||||||
MMO_TCP_NODELAY = mmoSettings.getBoolean("TcpNoDelay", false);
|
MMO_TCP_NODELAY = mmoSettings.getBoolean("TcpNoDelay", false);
|
||||||
|
|
||||||
// Load Telnet L2Properties file (if exists)
|
// Load Telnet L2Properties file (if exists)
|
||||||
final PropertiesParser telnetSettings = new PropertiesParser(TELNET_FILE);
|
final PropertiesParser telnetSettings = new PropertiesParser(TELNET_CONFIG_FILE);
|
||||||
|
|
||||||
IS_TELNET_ENABLED = telnetSettings.getBoolean("EnableTelnet", false);
|
IS_TELNET_ENABLED = telnetSettings.getBoolean("EnableTelnet", false);
|
||||||
}
|
}
|
||||||
@ -3224,10 +3224,10 @@ public final class Config
|
|||||||
public void load()
|
public void load()
|
||||||
{
|
{
|
||||||
GameServer.printSection("Network Configuration");
|
GameServer.printSection("Network Configuration");
|
||||||
if ((new File(IP_CONFIG_FILE)).exists())
|
if ((new File(IPCONFIG_FILE)).exists())
|
||||||
{
|
{
|
||||||
LOGGER.log(Level.INFO, "Using existing ipconfig.xml.");
|
LOGGER.log(Level.INFO, "Using existing ipconfig.xml.");
|
||||||
parseFile(new File(IP_CONFIG_FILE));
|
parseFile(new File(IPCONFIG_FILE));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
// Auto configuration...
|
// Auto configuration...
|
||||||
@ -3255,7 +3255,7 @@ public final class Config
|
|||||||
|
|
||||||
if (_hosts.size() != _subnets.size())
|
if (_hosts.size() != _subnets.size())
|
||||||
{
|
{
|
||||||
LOGGER.log(Level.WARNING, "Failed to Load " + IP_CONFIG_FILE + " File - subnets does not match server addresses.");
|
LOGGER.log(Level.WARNING, "Failed to Load " + IPCONFIG_FILE + " File - subnets does not match server addresses.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -3263,7 +3263,7 @@ public final class Config
|
|||||||
final Node att = n.getAttributes().getNamedItem("address");
|
final Node att = n.getAttributes().getNamedItem("address");
|
||||||
if (att == null)
|
if (att == null)
|
||||||
{
|
{
|
||||||
LOGGER.log(Level.WARNING, "Failed to load " + IP_CONFIG_FILE + " file - default server address is missing.");
|
LOGGER.log(Level.WARNING, "Failed to load " + IPCONFIG_FILE + " file - default server address is missing.");
|
||||||
_hosts.add("127.0.0.1");
|
_hosts.add("127.0.0.1");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -116,7 +116,7 @@ public final class FortSiegeManager
|
|||||||
private final void load()
|
private final void load()
|
||||||
{
|
{
|
||||||
final Properties siegeSettings = new Properties();
|
final Properties siegeSettings = new Properties();
|
||||||
final File file = new File(Config.FORTSIEGE_CONFIGURATION_FILE);
|
final File file = new File(Config.FORTSIEGE_CONFIG_FILE);
|
||||||
try (InputStream is = new FileInputStream(file))
|
try (InputStream is = new FileInputStream(file))
|
||||||
{
|
{
|
||||||
siegeSettings.load(is);
|
siegeSettings.load(is);
|
||||||
|
@ -118,7 +118,7 @@ public final class SiegeManager
|
|||||||
|
|
||||||
private final void load()
|
private final void load()
|
||||||
{
|
{
|
||||||
final PropertiesParser siegeSettings = new PropertiesParser(Config.SIEGE_CONFIGURATION_FILE);
|
final PropertiesParser siegeSettings = new PropertiesParser(Config.SIEGE_CONFIG_FILE);
|
||||||
|
|
||||||
// Siege setting
|
// Siege setting
|
||||||
_attackerMaxClans = siegeSettings.getInt("AttackerMaxClans", 500);
|
_attackerMaxClans = siegeSettings.getInt("AttackerMaxClans", 500);
|
||||||
|
@ -787,7 +787,7 @@ public final class TerritoryWarManager implements Siegable
|
|||||||
|
|
||||||
private final void load()
|
private final void load()
|
||||||
{
|
{
|
||||||
final PropertiesParser territoryWarSettings = new PropertiesParser(Config.TW_CONFIGURATION_FILE);
|
final PropertiesParser territoryWarSettings = new PropertiesParser(Config.TW_CONFIG_FILE);
|
||||||
|
|
||||||
// Siege setting
|
// Siege setting
|
||||||
DEFENDERMAXCLANS = territoryWarSettings.getInt("DefenderMaxClans", 500);
|
DEFENDERMAXCLANS = territoryWarSettings.getInt("DefenderMaxClans", 500);
|
||||||
|
@ -91,7 +91,7 @@ public final class GameStatusThread extends Thread
|
|||||||
telnetOutput(2, "");
|
telnetOutput(2, "");
|
||||||
}
|
}
|
||||||
|
|
||||||
final File file = new File(Config.TELNET_FILE);
|
final File file = new File(Config.TELNET_CONFIG_FILE);
|
||||||
try (InputStream telnetIS = new FileInputStream(file))
|
try (InputStream telnetIS = new FileInputStream(file))
|
||||||
{
|
{
|
||||||
final Properties telnetSettings = new Properties();
|
final Properties telnetSettings = new Properties();
|
||||||
|
@ -86,7 +86,7 @@ public final class LoginStatusThread extends Thread
|
|||||||
telnetOutput(2, "");
|
telnetOutput(2, "");
|
||||||
}
|
}
|
||||||
|
|
||||||
final File file = new File(Config.TELNET_FILE);
|
final File file = new File(Config.TELNET_CONFIG_FILE);
|
||||||
try (InputStream telnetIS = new FileInputStream(file))
|
try (InputStream telnetIS = new FileInputStream(file))
|
||||||
{
|
{
|
||||||
final Properties telnetSettings = new Properties();
|
final Properties telnetSettings = new Properties();
|
||||||
|
@ -100,7 +100,7 @@ public class Status extends Thread
|
|||||||
super("Status");
|
super("Status");
|
||||||
_mode = mode;
|
_mode = mode;
|
||||||
final Properties telnetSettings = new Properties();
|
final Properties telnetSettings = new Properties();
|
||||||
try (InputStream is = new FileInputStream(new File(Config.TELNET_FILE)))
|
try (InputStream is = new FileInputStream(new File(Config.TELNET_CONFIG_FILE)))
|
||||||
{
|
{
|
||||||
telnetSettings.load(is);
|
telnetSettings.load(is);
|
||||||
}
|
}
|
||||||
|
@ -359,7 +359,7 @@ public final class GeoDataConverter
|
|||||||
|
|
||||||
private static void loadGeoengineConfigs()
|
private static void loadGeoengineConfigs()
|
||||||
{
|
{
|
||||||
final PropertiesParser geoData = new PropertiesParser(Config.GEODATA_FILE);
|
final PropertiesParser geoData = new PropertiesParser(Config.GEOENGINE_CONFIG_FILE);
|
||||||
Config.GEODATA_PATH = geoData.getString("GeoDataPath", "./data/geodata/");
|
Config.GEODATA_PATH = geoData.getString("GeoDataPath", "./data/geodata/");
|
||||||
Config.COORD_SYNCHRONIZE = geoData.getInt("CoordSynchronize", -1);
|
Config.COORD_SYNCHRONIZE = geoData.getInt("CoordSynchronize", -1);
|
||||||
Config.PART_OF_CHARACTER_HEIGHT = geoData.getInt("PartOfCharacterHeight", 75);
|
Config.PART_OF_CHARACTER_HEIGHT = geoData.getInt("PartOfCharacterHeight", 75);
|
||||||
|
@ -82,27 +82,27 @@ public final class Config
|
|||||||
// Config File Definitions
|
// Config File Definitions
|
||||||
// --------------------------------------------------
|
// --------------------------------------------------
|
||||||
public static final String CHARACTER_CONFIG_FILE = "./config/Character.ini";
|
public static final String CHARACTER_CONFIG_FILE = "./config/Character.ini";
|
||||||
|
public static final String CH_SIEGE_CONFIG_FILE = "./config/ConquerableHallSiege.ini";
|
||||||
public static final String FEATURE_CONFIG_FILE = "./config/Feature.ini";
|
public static final String FEATURE_CONFIG_FILE = "./config/Feature.ini";
|
||||||
public static final String FORTSIEGE_CONFIGURATION_FILE = "./config/FortSiege.ini";
|
public static final String FLOOD_PROTECTOR_CONFIG_FILE = "./config/FloodProtector.ini";
|
||||||
|
public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini";
|
||||||
public static final String GENERAL_CONFIG_FILE = "./config/General.ini";
|
public static final String GENERAL_CONFIG_FILE = "./config/General.ini";
|
||||||
public static final String HEXID_FILE = "./config/hexid.txt";
|
public static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini";
|
||||||
public static final String ID_CONFIG_FILE = "./config/IdFactory.ini";
|
public static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini";
|
||||||
public static final String LOGIN_CONFIGURATION_FILE = "./config/LoginServer.ini";
|
public static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini";
|
||||||
|
public static final String IDFACTORY_CONFIG_FILE = "./config/IdFactory.ini";
|
||||||
|
public static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini";
|
||||||
|
public static final String MMO_CONFIG_FILE = "./config/MMO.ini";
|
||||||
public static final String NPC_CONFIG_FILE = "./config/NPC.ini";
|
public static final String NPC_CONFIG_FILE = "./config/NPC.ini";
|
||||||
|
public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini";
|
||||||
public static final String PVP_CONFIG_FILE = "./config/PVP.ini";
|
public static final String PVP_CONFIG_FILE = "./config/PVP.ini";
|
||||||
public static final String RATES_CONFIG_FILE = "./config/Rates.ini";
|
public static final String RATES_CONFIG_FILE = "./config/Rates.ini";
|
||||||
public static final String CONFIGURATION_FILE = "./config/Server.ini";
|
public static final String SERVER_CONFIG_FILE = "./config/Server.ini";
|
||||||
public static final String IP_CONFIG_FILE = "./config/ipconfig.xml";
|
public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini";
|
||||||
public static final String SIEGE_CONFIGURATION_FILE = "./config/Siege.ini";
|
public static final String TELNET_CONFIG_FILE = "./config/Telnet.ini";
|
||||||
public static final String TELNET_FILE = "./config/Telnet.ini";
|
|
||||||
public static final String FLOOD_PROTECTOR_FILE = "./config/FloodProtector.ini";
|
|
||||||
public static final String MMO_CONFIG_FILE = "./config/MMO.ini";
|
|
||||||
public static final String OLYMPIAD_CONFIG_FILE = "./config/Olympiad.ini";
|
|
||||||
public static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini";
|
|
||||||
public static final String GRACIASEEDS_CONFIG_FILE = "./config/GraciaSeeds.ini";
|
|
||||||
public static final String CHAT_FILTER_FILE = "./config/chatfilter.txt";
|
public static final String CHAT_FILTER_FILE = "./config/chatfilter.txt";
|
||||||
public static final String CH_SIEGE_FILE = "./config/ConquerableHallSiege.ini";
|
public static final String HEXID_FILE = "./config/hexid.txt";
|
||||||
public static final String GEODATA_FILE = "./config/GeoEngine.ini";
|
public static final String IPCONFIG_FILE = "./config/ipconfig.xml";
|
||||||
|
|
||||||
// --------------------------------------------------
|
// --------------------------------------------------
|
||||||
// Custom Config File Definitions
|
// Custom Config File Definitions
|
||||||
@ -1125,7 +1125,7 @@ public final class Config
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* This class initializes all global variables for configuration.<br>
|
* This class initializes all global variables for configuration.<br>
|
||||||
* If the key doesn't appear in properties file, a default value is set by this class. {@link #CONFIGURATION_FILE} (properties file) for configuring your server.
|
* 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.
|
||||||
*/
|
*/
|
||||||
public static void load()
|
public static void load()
|
||||||
{
|
{
|
||||||
@ -1148,7 +1148,7 @@ public final class Config
|
|||||||
FLOOD_PROTECTOR_CHARACTER_SELECT = new FloodProtectorConfig("CharacterSelectFloodProtector");
|
FLOOD_PROTECTOR_CHARACTER_SELECT = new FloodProtectorConfig("CharacterSelectFloodProtector");
|
||||||
FLOOD_PROTECTOR_ITEM_AUCTION = new FloodProtectorConfig("ItemAuctionFloodProtector");
|
FLOOD_PROTECTOR_ITEM_AUCTION = new FloodProtectorConfig("ItemAuctionFloodProtector");
|
||||||
|
|
||||||
final PropertiesParser serverSettings = new PropertiesParser(CONFIGURATION_FILE);
|
final PropertiesParser serverSettings = new PropertiesParser(SERVER_CONFIG_FILE);
|
||||||
|
|
||||||
GAMESERVER_HOSTNAME = serverSettings.getString("GameserverHostname", "0.0.0.0");
|
GAMESERVER_HOSTNAME = serverSettings.getString("GameserverHostname", "0.0.0.0");
|
||||||
PORT_GAME = serverSettings.getInt("GameserverPort", 7777);
|
PORT_GAME = serverSettings.getInt("GameserverPort", 7777);
|
||||||
@ -1651,7 +1651,7 @@ public final class Config
|
|||||||
ABILITY_POINTS_RESET_ADENA = Character.getLong("AbilityPointsResetAdena", 10_000_000);
|
ABILITY_POINTS_RESET_ADENA = Character.getLong("AbilityPointsResetAdena", 10_000_000);
|
||||||
|
|
||||||
// Load Telnet config file (if exists)
|
// Load Telnet config file (if exists)
|
||||||
final PropertiesParser telnetSettings = new PropertiesParser(TELNET_FILE);
|
final PropertiesParser telnetSettings = new PropertiesParser(TELNET_CONFIG_FILE);
|
||||||
|
|
||||||
TELNET_ENABLED = telnetSettings.getBoolean("EnableTelnet", false);
|
TELNET_ENABLED = telnetSettings.getBoolean("EnableTelnet", false);
|
||||||
TELNET_PORT = telnetSettings.getInt("Port", 12345);
|
TELNET_PORT = telnetSettings.getInt("Port", 12345);
|
||||||
@ -1669,7 +1669,7 @@ public final class Config
|
|||||||
MMO_TCP_NODELAY = mmoSettings.getBoolean("TcpNoDelay", false);
|
MMO_TCP_NODELAY = mmoSettings.getBoolean("TcpNoDelay", false);
|
||||||
|
|
||||||
// Load IdFactory config file (if exists)
|
// Load IdFactory config file (if exists)
|
||||||
final PropertiesParser IdFactory = new PropertiesParser(ID_CONFIG_FILE);
|
final PropertiesParser IdFactory = new PropertiesParser(IDFACTORY_CONFIG_FILE);
|
||||||
|
|
||||||
IDFACTORY_TYPE = IdFactory.getEnum("IDFactory", IdFactoryType.class, IdFactoryType.BitSet);
|
IDFACTORY_TYPE = IdFactory.getEnum("IDFactory", IdFactoryType.class, IdFactoryType.BitSet);
|
||||||
BAD_ID_CHECKING = IdFactory.getBoolean("BadIdChecking", true);
|
BAD_ID_CHECKING = IdFactory.getBoolean("BadIdChecking", true);
|
||||||
@ -1853,7 +1853,7 @@ public final class Config
|
|||||||
ENABLE_FALLING_DAMAGE = General.getBoolean("EnableFallingDamage", true);
|
ENABLE_FALLING_DAMAGE = General.getBoolean("EnableFallingDamage", true);
|
||||||
|
|
||||||
// Load FloodProtector config file
|
// Load FloodProtector config file
|
||||||
final PropertiesParser FloodProtectors = new PropertiesParser(FLOOD_PROTECTOR_FILE);
|
final PropertiesParser FloodProtectors = new PropertiesParser(FLOOD_PROTECTOR_CONFIG_FILE);
|
||||||
|
|
||||||
loadFloodProtectorConfigs(FloodProtectors);
|
loadFloodProtectorConfigs(FloodProtectors);
|
||||||
|
|
||||||
@ -2245,7 +2245,7 @@ public final class Config
|
|||||||
LOGGER.log(Level.WARNING, "Error while loading chat filter words!", e);
|
LOGGER.log(Level.WARNING, "Error while loading chat filter words!", e);
|
||||||
}
|
}
|
||||||
|
|
||||||
final PropertiesParser ClanHallSiege = new PropertiesParser(CH_SIEGE_FILE);
|
final PropertiesParser ClanHallSiege = new PropertiesParser(CH_SIEGE_CONFIG_FILE);
|
||||||
|
|
||||||
CHS_MAX_ATTACKERS = ClanHallSiege.getInt("MaxAttackers", 500);
|
CHS_MAX_ATTACKERS = ClanHallSiege.getInt("MaxAttackers", 500);
|
||||||
CHS_CLAN_MINLEVEL = ClanHallSiege.getInt("MinClanLevel", 4);
|
CHS_CLAN_MINLEVEL = ClanHallSiege.getInt("MinClanLevel", 4);
|
||||||
@ -2254,7 +2254,7 @@ public final class Config
|
|||||||
CHS_FAME_AMOUNT = ClanHallSiege.getInt("FameAmount", 0);
|
CHS_FAME_AMOUNT = ClanHallSiege.getInt("FameAmount", 0);
|
||||||
CHS_FAME_FREQUENCY = ClanHallSiege.getInt("FameFrequency", 0);
|
CHS_FAME_FREQUENCY = ClanHallSiege.getInt("FameFrequency", 0);
|
||||||
|
|
||||||
final PropertiesParser geoData = new PropertiesParser(GEODATA_FILE);
|
final PropertiesParser geoData = new PropertiesParser(GEOENGINE_CONFIG_FILE);
|
||||||
|
|
||||||
GEODATA_PATH = geoData.getString("GeoDataPath", "./data/geodata/");
|
GEODATA_PATH = geoData.getString("GeoDataPath", "./data/geodata/");
|
||||||
COORD_SYNCHRONIZE = geoData.getInt("CoordSynchronize", -1);
|
COORD_SYNCHRONIZE = geoData.getInt("CoordSynchronize", -1);
|
||||||
@ -2677,7 +2677,7 @@ public final class Config
|
|||||||
}
|
}
|
||||||
else if (Server.serverMode == Server.MODE_LOGINSERVER)
|
else if (Server.serverMode == Server.MODE_LOGINSERVER)
|
||||||
{
|
{
|
||||||
final PropertiesParser ServerSettings = new PropertiesParser(LOGIN_CONFIGURATION_FILE);
|
final PropertiesParser ServerSettings = new PropertiesParser(LOGIN_CONFIG_FILE);
|
||||||
|
|
||||||
GAME_SERVER_LOGIN_HOST = ServerSettings.getString("LoginHostname", "127.0.0.1");
|
GAME_SERVER_LOGIN_HOST = ServerSettings.getString("LoginHostname", "127.0.0.1");
|
||||||
GAME_SERVER_LOGIN_PORT = ServerSettings.getInt("LoginPort", 9013);
|
GAME_SERVER_LOGIN_PORT = ServerSettings.getInt("LoginPort", 9013);
|
||||||
@ -2965,11 +2965,11 @@ public final class Config
|
|||||||
@Override
|
@Override
|
||||||
public void load()
|
public void load()
|
||||||
{
|
{
|
||||||
final File f = new File(IP_CONFIG_FILE);
|
final File f = new File(IPCONFIG_FILE);
|
||||||
if (f.exists())
|
if (f.exists())
|
||||||
{
|
{
|
||||||
LOGGER.info("Network Config: ipconfig.xml exists using manual configuration...");
|
LOGGER.info("Network Config: ipconfig.xml exists using manual configuration...");
|
||||||
parseFile(new File(IP_CONFIG_FILE));
|
parseFile(new File(IPCONFIG_FILE));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
// Auto configuration...
|
// Auto configuration...
|
||||||
@ -2997,7 +2997,7 @@ public final class Config
|
|||||||
|
|
||||||
if (_hosts.size() != _subnets.size())
|
if (_hosts.size() != _subnets.size())
|
||||||
{
|
{
|
||||||
LOGGER.warning("Failed to Load " + IP_CONFIG_FILE + " File - subnets does not match server addresses.");
|
LOGGER.warning("Failed to Load " + IPCONFIG_FILE + " File - subnets does not match server addresses.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -3005,7 +3005,7 @@ public final class Config
|
|||||||
final Node att = n.getAttributes().getNamedItem("address");
|
final Node att = n.getAttributes().getNamedItem("address");
|
||||||
if (att == null)
|
if (att == null)
|
||||||
{
|
{
|
||||||
LOGGER.warning("Failed to load " + IP_CONFIG_FILE + " file - default server address is missing.");
|
LOGGER.warning("Failed to load " + IPCONFIG_FILE + " file - default server address is missing.");
|
||||||
_hosts.add("127.0.0.1");
|
_hosts.add("127.0.0.1");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -115,7 +115,7 @@ public final class FortSiegeManager
|
|||||||
private void load()
|
private void load()
|
||||||
{
|
{
|
||||||
final Properties siegeSettings = new Properties();
|
final Properties siegeSettings = new Properties();
|
||||||
final File file = new File(Config.FORTSIEGE_CONFIGURATION_FILE);
|
final File file = new File(Config.FORTSIEGE_CONFIG_FILE);
|
||||||
try (InputStream is = new FileInputStream(file))
|
try (InputStream is = new FileInputStream(file))
|
||||||
{
|
{
|
||||||
siegeSettings.load(is);
|
siegeSettings.load(is);
|
||||||
|
@ -118,7 +118,7 @@ public final class SiegeManager
|
|||||||
|
|
||||||
private void load()
|
private void load()
|
||||||
{
|
{
|
||||||
final PropertiesParser siegeSettings = new PropertiesParser(Config.SIEGE_CONFIGURATION_FILE);
|
final PropertiesParser siegeSettings = new PropertiesParser(Config.SIEGE_CONFIG_FILE);
|
||||||
|
|
||||||
// Siege setting
|
// Siege setting
|
||||||
_attackerMaxClans = siegeSettings.getInt("AttackerMaxClans", 500);
|
_attackerMaxClans = siegeSettings.getInt("AttackerMaxClans", 500);
|
||||||
|
@ -359,7 +359,7 @@ public final class GeoDataConverter
|
|||||||
|
|
||||||
private static void loadGeoengineConfigs()
|
private static void loadGeoengineConfigs()
|
||||||
{
|
{
|
||||||
final PropertiesParser geoData = new PropertiesParser(Config.GEODATA_FILE);
|
final PropertiesParser geoData = new PropertiesParser(Config.GEOENGINE_CONFIG_FILE);
|
||||||
Config.GEODATA_PATH = geoData.getString("GeoDataPath", "./data/geodata/");
|
Config.GEODATA_PATH = geoData.getString("GeoDataPath", "./data/geodata/");
|
||||||
Config.COORD_SYNCHRONIZE = geoData.getInt("CoordSynchronize", -1);
|
Config.COORD_SYNCHRONIZE = geoData.getInt("CoordSynchronize", -1);
|
||||||
Config.PART_OF_CHARACTER_HEIGHT = geoData.getInt("PartOfCharacterHeight", 75);
|
Config.PART_OF_CHARACTER_HEIGHT = geoData.getInt("PartOfCharacterHeight", 75);
|
||||||
|
Loading…
Reference in New Issue
Block a user