Organized configuration files to match newer branches.
This commit is contained in:
MobiusDevelopment
parent
995c995a76
commit
ac07bd6d8a
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../data/xsd/Scripts.xsd">
|
||||
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../data/xsd/Scripts.xsd">
|
||||
<!-- Skip these filenames from script loading, because they are already loaded using a different way. -->
|
||||
<exclude file="package-info.java" />
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
# Subnets can be defined like 123.45.0.0
|
||||
# Comments after # are ignored
|
||||
# Expiration timestamp can be added after IP for when to disable the ban
|
||||
# Example:
|
||||
# 192.168.0.0 1237618800000 # Bans all address starting with 192.168 and will expire on 21 Mar 2009 07:00:00 GMT
|
||||
10.255.255.255
|
||||
10.254.254.254
|
||||
@ -1,131 +0,0 @@
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<servers_list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="servername.xsd">
|
||||
<!-- server list from c3 (only English names) -->
|
||||
<server id="1" name="Bartz" />
|
||||
<server id="2" name="Sieghardt" />
|
||||
<server id="3" name="Kain" />
|
||||
<server id="4" name="Lionna" />
|
||||
<server id="5" name="Erica" />
|
||||
<server id="6" name="Gustin" />
|
||||
<server id="7" name="Devianne" />
|
||||
<server id="8" name="Hindemith" />
|
||||
<server id="9" name="Teon(Euro)" />
|
||||
<server id="10" name="Franz" />
|
||||
<server id="11" name="Luna" />
|
||||
<server id="12" name="Kastien" />
|
||||
<server id="13" name="Airin" />
|
||||
<server id="14" name="Staris" />
|
||||
<server id="15" name="Ceriel" />
|
||||
<server id="16" name="Fehyshar" />
|
||||
<server id="17" name="Elhwynna" />
|
||||
<server id="18" name="Ellikia" />
|
||||
<server id="19" name="Shikken" />
|
||||
<server id="20" name="Scryde" />
|
||||
<server id="21" name="Frikios" />
|
||||
<server id="22" name="Ophylia" />
|
||||
<server id="23" name="Shakdun" />
|
||||
<server id="24" name="Tarziph" />
|
||||
<server id="25" name="Aria" />
|
||||
<server id="26" name="Esenn" />
|
||||
<server id="27" name="Elcardia" />
|
||||
<server id="28" name="Yiana" />
|
||||
<server id="29" name="Seresin" />
|
||||
<server id="30" name="Tarkai" />
|
||||
<server id="31" name="Khadia" />
|
||||
<server id="32" name="Roien" />
|
||||
<server id="33" name="Gallint" />
|
||||
<server id="34" name="Cedric" />
|
||||
<server id="35" name="Nerufa" />
|
||||
<server id="36" name="Asterios" />
|
||||
<server id="37" name="Orfen" />
|
||||
<server id="38" name="Mitrael" />
|
||||
<server id="39" name="Thifiel" />
|
||||
<server id="40" name="Lithra" />
|
||||
<server id="41" name="Lockirin" />
|
||||
<server id="42" name="Kakai" />
|
||||
<server id="43" name="Cadmus" />
|
||||
<server id="44" name="Athebaldt" />
|
||||
<server id="45" name="Blackbird" />
|
||||
<server id="46" name="Ramsheart" />
|
||||
<server id="47" name="Esthus" />
|
||||
<server id="48" name="Vasper" />
|
||||
<server id="49" name="Lancer" />
|
||||
<server id="50" name="Ashton" />
|
||||
<server id="51" name="Waytrel" />
|
||||
<server id="52" name="Waltner" />
|
||||
<server id="53" name="Tahnford" />
|
||||
<server id="54" name="Hunter" />
|
||||
<server id="55" name="Dewell" />
|
||||
<server id="56" name="Rodemaye" />
|
||||
<server id="57" name="Ken Rauhel" />
|
||||
<server id="58" name="Ken Abigail" />
|
||||
<server id="59" name="Ken Orwen" />
|
||||
<server id="60" name="Van Holter" />
|
||||
<server id="61" name="Desperion" />
|
||||
<server id="62" name="Einhovant" />
|
||||
<server id="63" name="Schuneimann" />
|
||||
<server id="64" name="Faris" />
|
||||
<server id="65" name="Tor" />
|
||||
<server id="66" name="Carneiar" />
|
||||
<server id="67" name="Dwyllios" />
|
||||
<server id="68" name="Baium" />
|
||||
<server id="69" name="Hallate" />
|
||||
<server id="70" name="Zaken" />
|
||||
<server id="71" name="Core" />
|
||||
<server id="72" name="72" />
|
||||
<server id="73" name="73" />
|
||||
<server id="74" name="74" />
|
||||
<server id="75" name="75" />
|
||||
<server id="76" name="76" />
|
||||
<server id="77" name="77" />
|
||||
<server id="78" name="78" />
|
||||
<server id="79" name="79" />
|
||||
<server id="80" name="80" />
|
||||
<server id="81" name="81" />
|
||||
<server id="82" name="82" />
|
||||
<server id="83" name="83" />
|
||||
<server id="84" name="84" />
|
||||
<server id="85" name="85" />
|
||||
<server id="86" name="86" />
|
||||
<server id="87" name="87" />
|
||||
<server id="88" name="88" />
|
||||
<server id="89" name="89" />
|
||||
<server id="90" name="90" />
|
||||
<server id="91" name="91" />
|
||||
<server id="92" name="92" />
|
||||
<server id="93" name="93" />
|
||||
<server id="94" name="94" />
|
||||
<server id="95" name="95" />
|
||||
<server id="96" name="96" />
|
||||
<server id="97" name="97" />
|
||||
<server id="98" name="98" />
|
||||
<server id="99" name="99" />
|
||||
<server id="100" name="100" />
|
||||
<server id="101" name="101" />
|
||||
<server id="102" name="102" />
|
||||
<server id="103" name="103" />
|
||||
<server id="104" name="104" />
|
||||
<server id="105" name="105" />
|
||||
<server id="106" name="106" />
|
||||
<server id="107" name="107" />
|
||||
<server id="108" name="108" />
|
||||
<server id="109" name="109" />
|
||||
<server id="110" name="110" />
|
||||
<server id="111" name="111" />
|
||||
<server id="112" name="112" />
|
||||
<server id="113" name="113" />
|
||||
<server id="114" name="114" />
|
||||
<server id="115" name="115" />
|
||||
<server id="116" name="116" />
|
||||
<server id="117" name="117" />
|
||||
<server id="118" name="118" />
|
||||
<server id="119" name="119" />
|
||||
<server id="120" name="120" />
|
||||
<server id="121" name="121" />
|
||||
<server id="122" name="122" />
|
||||
<server id="123" name="123" />
|
||||
<server id="124" name="124" />
|
||||
<server id="125" name="125" />
|
||||
<server id="126" name="126" />
|
||||
<server id="127" name="??" />
|
||||
</servers_list>
|
||||
@ -1,18 +0,0 @@
|
||||
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
|
||||
<xs:element name="servers_list">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="server" maxOccurs="unbounded" minOccurs="0">
|
||||
<xs:complexType>
|
||||
<xs:simpleContent>
|
||||
<xs:extension base="xs:string">
|
||||
<xs:attribute type="xs:byte" name="id" use="optional"/>
|
||||
<xs:attribute type="xs:string" name="name" use="optional"/>
|
||||
</xs:extension>
|
||||
</xs:simpleContent>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:schema>
|
||||
@ -1,4 +1,4 @@
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<servers_list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="servername.xsd">
|
||||
<!-- server list from c3 (only English names) -->
|
||||
<server id="1" name="Bartz" />
|
||||
@ -18,12 +18,9 @@ package org.l2jmobius;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.FileReader;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.LineNumberReader;
|
||||
import java.io.OutputStream;
|
||||
import java.math.BigInteger;
|
||||
@ -45,7 +42,6 @@ import org.l2jmobius.gameserver.enums.GeoType;
|
||||
import org.l2jmobius.gameserver.model.olympiad.OlympiadPeriod;
|
||||
import org.l2jmobius.gameserver.util.FloodProtectorConfig;
|
||||
import org.l2jmobius.gameserver.util.Util;
|
||||
import org.l2jmobius.loginserver.LoginController;
|
||||
|
||||
public class Config
|
||||
{
|
||||
@ -61,48 +57,43 @@ public class Config
|
||||
// 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";
|
||||
private static final String CLANHALL_CONFIG_FILE = "./config/main/Clanhall.ini";
|
||||
public static final String CLASS_DAMAGE_CONFIG_FILE = "./config/main/ClassDamage.ini";
|
||||
private static final String CONQUERABLE_CLANHALL_CONFIG_FILE = "./config/main/ConquerableClanHalls.ini";
|
||||
private static final String CRAFTING_CONFIG_FILE = "./config/main/Crafting.ini";
|
||||
private static final String ENCHANT_CONFIG_FILE = "./config/main/Enchant.ini";
|
||||
public static final String FORTSIEGE_CONFIG_FILE = "./config/main/Fort.ini";
|
||||
private static final String GENERAL_CONFIG_FILE = "./config/main/General.ini";
|
||||
private static final String GEOENGINE_CONFIG_FILE = "./config/main/GeoEngine.ini";
|
||||
private static final String OLYMP_CONFIG_FILE = "./config/main/Olympiad.ini";
|
||||
private static final String PHYSICS_CONFIG_FILE = "./config/main/Physics.ini";
|
||||
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";
|
||||
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
|
||||
private static final String PROTECT_FLOOD_CONFIG_FILE = "./config/protected/FloodProtector.ini";
|
||||
private static final String PROTECT_OTHER_CONFIG_FILE = "./config/protected/Other.ini";
|
||||
public static final String TELNET_CONFIG_FILE = "./config/protected/Telnet.ini";
|
||||
// events
|
||||
private static final String EVENT_PC_BANG_POINT_CONFIG_FILE = "./config/events/PcBang.ini";
|
||||
private static final String ACCESS_CONFIG_FILE = "./config/Access.ini";
|
||||
private static final String CHARACTER_CONFIG_FILE = "./config/Character.ini";
|
||||
private static final String CLANHALL_CONFIG_FILE = "./config/Clanhall.ini";
|
||||
private static final String CONQUERABLE_CLANHALL_CONFIG_FILE = "./config/ConquerableHallSiege.ini";
|
||||
private static final String CRAFTING_CONFIG_FILE = "./config/Crafting.ini";
|
||||
private static final String ENCHANT_CONFIG_FILE = "./config/Enchant.ini";
|
||||
public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini";
|
||||
private static final String GENERAL_CONFIG_FILE = "./config/General.ini";
|
||||
private static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini";
|
||||
private static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini";
|
||||
private static final String OLYMP_CONFIG_FILE = "./config/Olympiad.ini";
|
||||
private static final String PROTECT_FLOOD_CONFIG_FILE = "./config/FloodProtector.ini";
|
||||
private static final String PROTECT_OTHER_CONFIG_FILE = "./config/Other.ini";
|
||||
private static final String PVP_CONFIG_FILE = "./config/PvP.ini";
|
||||
private static final String RATES_CONFIG_FILE = "./config/Rates.ini";
|
||||
private static final String SERVER_CONFIG_FILE = "./config/Server.ini";
|
||||
private static final String SEVENSIGNS_CONFIG_FILE = "./config/SevenSigns.ini";
|
||||
public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini";
|
||||
public static final String TELNET_CONFIG_FILE = "./config/Telnet.ini";
|
||||
// custom
|
||||
private static final String BANK_CONFIG_FILE = "./config/custom/Bank.ini";
|
||||
private static final String CANCEL_SKILL_RESTORE_BUFFS_CONFIG_FILE = "./config/custom/CancelSkillRestoreBuffs.ini";
|
||||
private static final String CHAMPION_CONFIG_FILE = "./config/custom/Champion.ini";
|
||||
public static final String CLASS_DAMAGE_CONFIG_FILE = "./config/custom/ClassDamage.ini";
|
||||
private static final String CUSTOM_AUTO_POTIONS_CONFIG_FILE = "./config/custom/AutoPotions.ini";
|
||||
private static final String CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE = "./config/custom/CustomMailManager.ini";
|
||||
private static final String MERCHANT_ZERO_SELL_PRICE_CONFIG_FILE = "./config/custom/MerchantZeroSellPrice.ini";
|
||||
private static final String CUSTOM_RANDOM_SPAWNS_CONFIG_FILE = "./config/custom/RandomSpawns.ini";
|
||||
private static final String OFFLINE_CONFIG_FILE = "./config/custom/Offline.ini";
|
||||
private static final String OTHER_CONFIG_FILE = "./config/custom/Other.ini";
|
||||
private static final String PC_BANG_POINT_CONFIG_FILE = "./config/custom/PcBang.ini";
|
||||
private static final String PHYSICS_BALANCE_CONFIG_FILE = "./config/custom/PhysicsBalance.ini";
|
||||
private static final String SCHEME_BUFFER_CONFIG_FILE = "./config/custom/SchemeBuffer.ini";
|
||||
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
|
||||
private static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini";
|
||||
// others
|
||||
private static final String BANNED_IP_FILE = "./config/others/banned_ip.cfg";
|
||||
public static final String SERVER_NAME_FILE = "./config/others/servername.xml";
|
||||
|
||||
// --------------------------------------------------
|
||||
// Variable Definitions
|
||||
@ -1684,7 +1675,7 @@ public class Config
|
||||
|
||||
public static void loadPCBPointConfig()
|
||||
{
|
||||
final PropertiesParser pcBangConfig = new PropertiesParser(EVENT_PC_BANG_POINT_CONFIG_FILE);
|
||||
final PropertiesParser pcBangConfig = new PropertiesParser(PC_BANG_POINT_CONFIG_FILE);
|
||||
PCB_ENABLE = pcBangConfig.getBoolean("PcBangPointEnable", true);
|
||||
PCB_MIN_LEVEL = pcBangConfig.getInt("PcBangPointMinLevel", 20);
|
||||
PCB_POINT_MIN = pcBangConfig.getInt("PcBangPointMinCount", 20);
|
||||
@ -2261,7 +2252,7 @@ public class Config
|
||||
|
||||
public static void loadPhysicsConfig()
|
||||
{
|
||||
final PropertiesParser physicsSetting = new PropertiesParser(PHYSICS_CONFIG_FILE);
|
||||
final PropertiesParser physicsSetting = new PropertiesParser(PHYSICS_BALANCE_CONFIG_FILE);
|
||||
ENABLE_CLASS_DAMAGE_SETTINGS = physicsSetting.getBoolean("EnableClassDamageSettings", true);
|
||||
ENABLE_CLASS_DAMAGE_SETTINGS_IN_OLY = physicsSetting.getBoolean("EnableClassDamageSettingsInOly", true);
|
||||
ENABLE_CLASS_DAMAGE_LOGGER = physicsSetting.getBoolean("EnableClassDamageLogger", false);
|
||||
@ -2355,7 +2346,7 @@ public class Config
|
||||
|
||||
public static void loadBossConfig()
|
||||
{
|
||||
final PropertiesParser bossConfig = new PropertiesParser(RAIDBOSS_CONFIG_FILE);
|
||||
final PropertiesParser bossConfig = new PropertiesParser(GRANDBOSS_CONFIG_FILE);
|
||||
ALT_RAIDS_STATS_BONUS = bossConfig.getBoolean("AltRaidsStatsBonus", true);
|
||||
RBLOCKRAGE = bossConfig.getInt("RBlockRage", 5000);
|
||||
if ((RBLOCKRAGE > 0) && (RBLOCKRAGE < 100))
|
||||
@ -2767,92 +2758,6 @@ public class Config
|
||||
MAX_LOGINSESSIONS = serverSettings.getInt("MaxSessions", 200);
|
||||
}
|
||||
|
||||
public static void loadBanFile()
|
||||
{
|
||||
File file = new File(BANNED_IP_FILE);
|
||||
if (file.exists() && file.isFile())
|
||||
{
|
||||
FileInputStream fis = null;
|
||||
try
|
||||
{
|
||||
fis = new FileInputStream(file);
|
||||
LineNumberReader reader = null;
|
||||
String line;
|
||||
String[] parts;
|
||||
try
|
||||
{
|
||||
reader = new LineNumberReader(new InputStreamReader(fis));
|
||||
while ((line = reader.readLine()) != null)
|
||||
{
|
||||
line = line.trim();
|
||||
// check if this line isnt a comment line
|
||||
if ((line.length() > 0) && (line.charAt(0) != '#'))
|
||||
{
|
||||
// split comments if any
|
||||
parts = line.split("#", 2);
|
||||
|
||||
// discard comments in the line, if any
|
||||
line = parts[0];
|
||||
parts = line.split(" ");
|
||||
|
||||
final String address = parts[0];
|
||||
long duration = 0;
|
||||
if (parts.length > 1)
|
||||
{
|
||||
try
|
||||
{
|
||||
duration = Long.parseLong(parts[1]);
|
||||
}
|
||||
catch (NumberFormatException e)
|
||||
{
|
||||
LOGGER.warning("Skipped: Incorrect ban duration (" + parts[1] + ") on (" + file.getName() + "). Line: " + reader.getLineNumber());
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
LoginController.getInstance().addBanForAddress(address, duration);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
LOGGER.warning("Skipped: Invalid address (" + parts[0] + ") on (" + file.getName() + "). Line: " + reader.getLineNumber());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
LOGGER.warning("Error while reading the bans file (" + file.getName() + "). Details: " + e);
|
||||
}
|
||||
|
||||
LOGGER.info("Loaded " + LoginController.getInstance().getBannedIps().size() + " IP Bans.");
|
||||
}
|
||||
catch (FileNotFoundException e)
|
||||
{
|
||||
LOGGER.warning("Failed to load banned IPs file (" + file.getName() + ") for reading. Reason: " + e);
|
||||
}
|
||||
finally
|
||||
{
|
||||
if (fis != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
fis.close();
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
LOGGER.info("IP Bans file (" + file.getName() + ") is missing or is a directory, skipped.");
|
||||
}
|
||||
}
|
||||
|
||||
public static void saveHexid(int serverId, String string)
|
||||
{
|
||||
saveHexid(serverId, string, HEXID_FILE);
|
||||
|
||||
@ -61,7 +61,7 @@ public class ScriptEngineManager implements IXmlReader
|
||||
public void load()
|
||||
{
|
||||
_exclusions.clear();
|
||||
parseDatapackFile("config/protected/Scripts.xml");
|
||||
parseDatapackFile("config/Scripts.xml");
|
||||
LOGGER.info("Loaded " + _exclusions.size() + " files to exclude.");
|
||||
}
|
||||
|
||||
|
||||
@ -40,7 +40,7 @@ public class JavaScriptingEngine
|
||||
{
|
||||
// Load config.
|
||||
final Properties props = new Properties();
|
||||
try (FileInputStream fis = new FileInputStream("config/protected/ScriptEngine.ini"))
|
||||
try (FileInputStream fis = new FileInputStream("config/ScriptEngine.ini"))
|
||||
{
|
||||
props.load(fis);
|
||||
}
|
||||
|
||||
@ -46,7 +46,6 @@ import org.w3c.dom.Document;
|
||||
import org.w3c.dom.NamedNodeMap;
|
||||
import org.w3c.dom.Node;
|
||||
|
||||
import org.l2jmobius.Config;
|
||||
import org.l2jmobius.commons.database.DatabaseFactory;
|
||||
import org.l2jmobius.commons.util.Rnd;
|
||||
import org.l2jmobius.loginserver.network.LoginClient;
|
||||
@ -141,7 +140,7 @@ public class GameServerTable
|
||||
{
|
||||
final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
|
||||
final DocumentBuilder db = dbf.newDocumentBuilder();
|
||||
final Document doc = db.parse(new File(Config.SERVER_NAME_FILE));
|
||||
final Document doc = db.parse(new File("./data/servername.xml"));
|
||||
final Node n = doc.getFirstChild();
|
||||
for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling())
|
||||
{
|
||||
|
||||
@ -184,9 +184,9 @@ public class LoginServer extends FloodProtectedListener
|
||||
}
|
||||
}
|
||||
|
||||
private void loadBanFile()
|
||||
public void loadBanFile()
|
||||
{
|
||||
final File bannedFile = new File("./config/others/banned_ip.cfg");
|
||||
final File bannedFile = new File("./banned_ip.cfg");
|
||||
if (bannedFile.exists() && bannedFile.isFile())
|
||||
{
|
||||
String line;
|
||||
|
||||
@ -130,7 +130,7 @@ public class Gui
|
||||
mntmBannedIps.addActionListener(arg0 ->
|
||||
{
|
||||
LoginController.getInstance().getBannedIps().clear();
|
||||
Config.loadBanFile();
|
||||
LoginServer.getInstance().loadBanFile();
|
||||
});
|
||||
mnReload.add(mntmBannedIps);
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../data/xsd/Scripts.xsd">
|
||||
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../data/xsd/Scripts.xsd">
|
||||
<!-- Skip these filenames from script loading, because they are already loaded using a different way. -->
|
||||
<exclude file="package-info.java" />
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
# Subnets can be defined like 123.45.0.0
|
||||
# Comments after # are ignored
|
||||
# Expiration timestamp can be added after IP for when to disable the ban
|
||||
# Example:
|
||||
# 192.168.0.0 1237618800000 # Bans all address starting with 192.168 and will expire on 21 Mar 2009 07:00:00 GMT
|
||||
10.255.255.255
|
||||
10.254.254.254
|
||||
@ -1,131 +0,0 @@
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<servers_list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="servername.xsd">
|
||||
<!-- server list from c3 (only English names) -->
|
||||
<server id="1" name="Bartz" />
|
||||
<server id="2" name="Sieghardt" />
|
||||
<server id="3" name="Kain" />
|
||||
<server id="4" name="Lionna" />
|
||||
<server id="5" name="Erica" />
|
||||
<server id="6" name="Gustin" />
|
||||
<server id="7" name="Devianne" />
|
||||
<server id="8" name="Hindemith" />
|
||||
<server id="9" name="Teon(Euro)" />
|
||||
<server id="10" name="Franz" />
|
||||
<server id="11" name="Luna" />
|
||||
<server id="12" name="Kastien" />
|
||||
<server id="13" name="Airin" />
|
||||
<server id="14" name="Staris" />
|
||||
<server id="15" name="Ceriel" />
|
||||
<server id="16" name="Fehyshar" />
|
||||
<server id="17" name="Elhwynna" />
|
||||
<server id="18" name="Ellikia" />
|
||||
<server id="19" name="Shikken" />
|
||||
<server id="20" name="Scryde" />
|
||||
<server id="21" name="Frikios" />
|
||||
<server id="22" name="Ophylia" />
|
||||
<server id="23" name="Shakdun" />
|
||||
<server id="24" name="Tarziph" />
|
||||
<server id="25" name="Aria" />
|
||||
<server id="26" name="Esenn" />
|
||||
<server id="27" name="Elcardia" />
|
||||
<server id="28" name="Yiana" />
|
||||
<server id="29" name="Seresin" />
|
||||
<server id="30" name="Tarkai" />
|
||||
<server id="31" name="Khadia" />
|
||||
<server id="32" name="Roien" />
|
||||
<server id="33" name="Gallint" />
|
||||
<server id="34" name="Cedric" />
|
||||
<server id="35" name="Nerufa" />
|
||||
<server id="36" name="Asterios" />
|
||||
<server id="37" name="Orfen" />
|
||||
<server id="38" name="Mitrael" />
|
||||
<server id="39" name="Thifiel" />
|
||||
<server id="40" name="Lithra" />
|
||||
<server id="41" name="Lockirin" />
|
||||
<server id="42" name="Kakai" />
|
||||
<server id="43" name="Cadmus" />
|
||||
<server id="44" name="Athebaldt" />
|
||||
<server id="45" name="Blackbird" />
|
||||
<server id="46" name="Ramsheart" />
|
||||
<server id="47" name="Esthus" />
|
||||
<server id="48" name="Vasper" />
|
||||
<server id="49" name="Lancer" />
|
||||
<server id="50" name="Ashton" />
|
||||
<server id="51" name="Waytrel" />
|
||||
<server id="52" name="Waltner" />
|
||||
<server id="53" name="Tahnford" />
|
||||
<server id="54" name="Hunter" />
|
||||
<server id="55" name="Dewell" />
|
||||
<server id="56" name="Rodemaye" />
|
||||
<server id="57" name="Ken Rauhel" />
|
||||
<server id="58" name="Ken Abigail" />
|
||||
<server id="59" name="Ken Orwen" />
|
||||
<server id="60" name="Van Holter" />
|
||||
<server id="61" name="Desperion" />
|
||||
<server id="62" name="Einhovant" />
|
||||
<server id="63" name="Schuneimann" />
|
||||
<server id="64" name="Faris" />
|
||||
<server id="65" name="Tor" />
|
||||
<server id="66" name="Carneiar" />
|
||||
<server id="67" name="Dwyllios" />
|
||||
<server id="68" name="Baium" />
|
||||
<server id="69" name="Hallate" />
|
||||
<server id="70" name="Zaken" />
|
||||
<server id="71" name="Core" />
|
||||
<server id="72" name="72" />
|
||||
<server id="73" name="73" />
|
||||
<server id="74" name="74" />
|
||||
<server id="75" name="75" />
|
||||
<server id="76" name="76" />
|
||||
<server id="77" name="77" />
|
||||
<server id="78" name="78" />
|
||||
<server id="79" name="79" />
|
||||
<server id="80" name="80" />
|
||||
<server id="81" name="81" />
|
||||
<server id="82" name="82" />
|
||||
<server id="83" name="83" />
|
||||
<server id="84" name="84" />
|
||||
<server id="85" name="85" />
|
||||
<server id="86" name="86" />
|
||||
<server id="87" name="87" />
|
||||
<server id="88" name="88" />
|
||||
<server id="89" name="89" />
|
||||
<server id="90" name="90" />
|
||||
<server id="91" name="91" />
|
||||
<server id="92" name="92" />
|
||||
<server id="93" name="93" />
|
||||
<server id="94" name="94" />
|
||||
<server id="95" name="95" />
|
||||
<server id="96" name="96" />
|
||||
<server id="97" name="97" />
|
||||
<server id="98" name="98" />
|
||||
<server id="99" name="99" />
|
||||
<server id="100" name="100" />
|
||||
<server id="101" name="101" />
|
||||
<server id="102" name="102" />
|
||||
<server id="103" name="103" />
|
||||
<server id="104" name="104" />
|
||||
<server id="105" name="105" />
|
||||
<server id="106" name="106" />
|
||||
<server id="107" name="107" />
|
||||
<server id="108" name="108" />
|
||||
<server id="109" name="109" />
|
||||
<server id="110" name="110" />
|
||||
<server id="111" name="111" />
|
||||
<server id="112" name="112" />
|
||||
<server id="113" name="113" />
|
||||
<server id="114" name="114" />
|
||||
<server id="115" name="115" />
|
||||
<server id="116" name="116" />
|
||||
<server id="117" name="117" />
|
||||
<server id="118" name="118" />
|
||||
<server id="119" name="119" />
|
||||
<server id="120" name="120" />
|
||||
<server id="121" name="121" />
|
||||
<server id="122" name="122" />
|
||||
<server id="123" name="123" />
|
||||
<server id="124" name="124" />
|
||||
<server id="125" name="125" />
|
||||
<server id="126" name="126" />
|
||||
<server id="127" name="??" />
|
||||
</servers_list>
|
||||
@ -1,18 +0,0 @@
|
||||
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
|
||||
<xs:element name="servers_list">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="server" maxOccurs="unbounded" minOccurs="0">
|
||||
<xs:complexType>
|
||||
<xs:simpleContent>
|
||||
<xs:extension base="xs:string">
|
||||
<xs:attribute type="xs:byte" name="id" use="optional"/>
|
||||
<xs:attribute type="xs:string" name="name" use="optional"/>
|
||||
</xs:extension>
|
||||
</xs:simpleContent>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:schema>
|
||||
@ -72,40 +72,38 @@ public class Config
|
||||
// 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";
|
||||
private static final String CLANHALL_CONFIG_FILE = "./config/main/Clanhall.ini";
|
||||
public static final String CLASS_DAMAGE_CONFIG_FILE = "./config/main/ClassDamage.ini";
|
||||
private static final String CONQUERABLE_CLANHALL_CONFIG_FILE = "./config/main/ConquerableClanHalls.ini";
|
||||
private static final String CRAFTING_CONFIG_FILE = "./config/main/Crafting.ini";
|
||||
private static final String ENCHANT_CONFIG_FILE = "./config/main/Enchant.ini";
|
||||
public static final String FORTSIEGE_CONFIG_FILE = "./config/main/Fort.ini";
|
||||
private static final String GENERAL_CONFIG_FILE = "./config/main/General.ini";
|
||||
private static final String GEOENGINE_CONFIG_FILE = "./config/main/GeoEngine.ini";
|
||||
private static final String OLYMP_CONFIG_FILE = "./config/main/Olympiad.ini";
|
||||
private static final String PHYSICS_CONFIG_FILE = "./config/main/Physics.ini";
|
||||
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";
|
||||
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
|
||||
private static final String PROTECT_FLOOD_CONFIG_FILE = "./config/protected/FloodProtector.ini";
|
||||
private static final String PROTECT_OTHER_CONFIG_FILE = "./config/protected/Other.ini";
|
||||
public static final String TELNET_CONFIG_FILE = "./config/protected/Telnet.ini";
|
||||
// events
|
||||
private static final String EVENT_PC_BANG_POINT_CONFIG_FILE = "./config/events/PcBang.ini";
|
||||
private static final String ACCESS_CONFIG_FILE = "./config/Access.ini";
|
||||
private static final String CHARACTER_CONFIG_FILE = "./config/Character.ini";
|
||||
private static final String CLANHALL_CONFIG_FILE = "./config/Clanhall.ini";
|
||||
private static final String CONQUERABLE_CLANHALL_CONFIG_FILE = "./config/ConquerableHallSiege.ini";
|
||||
private static final String CRAFTING_CONFIG_FILE = "./config/Crafting.ini";
|
||||
private static final String ENCHANT_CONFIG_FILE = "./config/Enchant.ini";
|
||||
public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini";
|
||||
private static final String GENERAL_CONFIG_FILE = "./config/General.ini";
|
||||
private static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini";
|
||||
private static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini";
|
||||
private static final String OLYMP_CONFIG_FILE = "./config/Olympiad.ini";
|
||||
private static final String PROTECT_FLOOD_CONFIG_FILE = "./config/FloodProtector.ini";
|
||||
private static final String PROTECT_OTHER_CONFIG_FILE = "./config/Other.ini";
|
||||
private static final String PVP_CONFIG_FILE = "./config/PvP.ini";
|
||||
private static final String RATES_CONFIG_FILE = "./config/Rates.ini";
|
||||
private static final String SERVER_CONFIG_FILE = "./config/Server.ini";
|
||||
private static final String SEVENSIGNS_CONFIG_FILE = "./config/SevenSigns.ini";
|
||||
public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini";
|
||||
public static final String TELNET_CONFIG_FILE = "./config/Telnet.ini";
|
||||
// custom
|
||||
private static final String BANK_CONFIG_FILE = "./config/custom/Bank.ini";
|
||||
private static final String CANCEL_SKILL_RESTORE_BUFFS_CONFIG_FILE = "./config/custom/CancelSkillRestoreBuffs.ini";
|
||||
private static final String CHAMPION_CONFIG_FILE = "./config/custom/Champion.ini";
|
||||
public static final String CLASS_DAMAGE_CONFIG_FILE = "./config/custom/ClassDamage.ini";
|
||||
private static final String CUSTOM_AUTO_POTIONS_CONFIG_FILE = "./config/custom/AutoPotions.ini";
|
||||
private static final String CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE = "./config/custom/CustomMailManager.ini";
|
||||
private static final String MERCHANT_ZERO_SELL_PRICE_CONFIG_FILE = "./config/custom/MerchantZeroSellPrice.ini";
|
||||
private static final String CUSTOM_RANDOM_SPAWNS_CONFIG_FILE = "./config/custom/RandomSpawns.ini";
|
||||
private static final String OFFLINE_CONFIG_FILE = "./config/custom/Offline.ini";
|
||||
private static final String OTHER_CONFIG_FILE = "./config/custom/Other.ini";
|
||||
private static final String PC_BANG_POINT_CONFIG_FILE = "./config/custom/PcBang.ini";
|
||||
private static final String PHYSICS_BALANCE_CONFIG_FILE = "./config/custom/PhysicsBalance.ini";
|
||||
private static final String SCHEME_BUFFER_CONFIG_FILE = "./config/custom/SchemeBuffer.ini";
|
||||
private static final String EVENT_REBIRTH_CONFIG_FILE = "./config/custom/Rebirth.ini";
|
||||
private static final String EVENT_WEDDING_CONFIG_FILE = "./config/custom/Wedding.ini";
|
||||
@ -1730,7 +1728,7 @@ public class Config
|
||||
|
||||
public static void loadPCBPointConfig()
|
||||
{
|
||||
final PropertiesParser pcBangConfig = new PropertiesParser(EVENT_PC_BANG_POINT_CONFIG_FILE);
|
||||
final PropertiesParser pcBangConfig = new PropertiesParser(PC_BANG_POINT_CONFIG_FILE);
|
||||
PCB_ENABLE = pcBangConfig.getBoolean("PcBangPointEnable", true);
|
||||
PCB_MIN_LEVEL = pcBangConfig.getInt("PcBangPointMinLevel", 20);
|
||||
PCB_POINT_MIN = pcBangConfig.getInt("PcBangPointMinCount", 20);
|
||||
@ -2320,7 +2318,7 @@ public class Config
|
||||
|
||||
public static void loadPhysicsConfig()
|
||||
{
|
||||
final PropertiesParser physicsSetting = new PropertiesParser(PHYSICS_CONFIG_FILE);
|
||||
final PropertiesParser physicsSetting = new PropertiesParser(PHYSICS_BALANCE_CONFIG_FILE);
|
||||
ENABLE_CLASS_DAMAGE_SETTINGS = physicsSetting.getBoolean("EnableClassDamageSettings", true);
|
||||
ENABLE_CLASS_DAMAGE_SETTINGS_IN_OLY = physicsSetting.getBoolean("EnableClassDamageSettingsInOly", true);
|
||||
ENABLE_CLASS_DAMAGE_LOGGER = physicsSetting.getBoolean("EnableClassDamageLogger", false);
|
||||
@ -2414,7 +2412,7 @@ public class Config
|
||||
|
||||
public static void loadBossConfig()
|
||||
{
|
||||
final PropertiesParser bossConfig = new PropertiesParser(RAIDBOSS_CONFIG_FILE);
|
||||
final PropertiesParser bossConfig = new PropertiesParser(GRANDBOSS_CONFIG_FILE);
|
||||
ALT_RAIDS_STATS_BONUS = bossConfig.getBoolean("AltRaidsStatsBonus", true);
|
||||
RBLOCKRAGE = bossConfig.getInt("RBlockRage", 5000);
|
||||
if ((RBLOCKRAGE > 0) && (RBLOCKRAGE < 100))
|
||||
|
||||
@ -61,7 +61,7 @@ public class ScriptEngineManager implements IXmlReader
|
||||
public void load()
|
||||
{
|
||||
_exclusions.clear();
|
||||
parseDatapackFile("config/protected/Scripts.xml");
|
||||
parseDatapackFile("config/Scripts.xml");
|
||||
LOGGER.info("Loaded " + _exclusions.size() + " files to exclude.");
|
||||
}
|
||||
|
||||
|
||||
@ -40,7 +40,7 @@ public class JavaScriptingEngine
|
||||
{
|
||||
// Load config.
|
||||
final Properties props = new Properties();
|
||||
try (FileInputStream fis = new FileInputStream("config/protected/ScriptEngine.ini"))
|
||||
try (FileInputStream fis = new FileInputStream("config/ScriptEngine.ini"))
|
||||
{
|
||||
props.load(fis);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user