Dropped IGameXmlReader.

ScriptEngineManager class cleanup.
Use of ThreadPool to decrease startup time.
This commit is contained in:
MobiusDevelopment
2019-04-05 04:14:32 +00:00
parent e5fd371ae8
commit eed915b9dc
1036 changed files with 4975 additions and 6228 deletions

View File

@@ -2,8 +2,7 @@
<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" />
<exclude file="MasterHandler.java" />
<exclude file="EffectMasterHandler.java" />
<exclude file="handlers" />
<!--
With this file you can exclude/include specific folders/files from within the scripts directory.

View File

@@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.commons.util.IGameXmlReader;
import com.l2jmobius.commons.util.IXmlReader;
import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.gameserver.geoengine.GeoEngine;
import com.l2jmobius.gameserver.model.Location;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.model.actor.Npc;
* Tar Beetle zone spawn
* @author malyelfik
*/
public class TarBeetleSpawn implements IGameXmlReader
public class TarBeetleSpawn implements IXmlReader
{
private final List<SpawnZone> zones = new ArrayList<>();
private ScheduledFuture<?> spawnTask;

View File

@@ -24,13 +24,13 @@ import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import com.l2jmobius.commons.util.IGameXmlReader;
import com.l2jmobius.commons.util.IXmlReader;
/**
* Point data parser.
* @author Zoey76
*/
public final class HellboundPointData implements IGameXmlReader
public final class HellboundPointData implements IXmlReader
{
private final Map<Integer, int[]> _pointsInfo = new HashMap<>();

View File

@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import com.l2jmobius.commons.util.IGameXmlReader;
import com.l2jmobius.commons.util.IXmlReader;
import com.l2jmobius.gameserver.datatables.SpawnTable;
import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.Spawn;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.Spawn;
* Hellbound Spawns parser.
* @author Zoey76
*/
public final class HellboundSpawns implements IGameXmlReader
public final class HellboundSpawns implements IXmlReader
{
private final List<Spawn> _spawns = new ArrayList<>();
private final Map<Integer, int[]> _spawnLevels = new HashMap<>();

View File

@@ -27,13 +27,13 @@ import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import com.l2jmobius.commons.util.IGameXmlReader;
import com.l2jmobius.commons.util.IXmlReader;
import com.l2jmobius.gameserver.model.StatsSet;
/**
* @author UnAfraid
*/
public class NpcBuffersData implements IGameXmlReader
public class NpcBuffersData implements IXmlReader
{
private final Map<Integer, NpcBufferData> _npcBuffers = new HashMap<>();

View File

@@ -214,7 +214,7 @@ public class AdminReload implements IAdminCommandHandler
{
try
{
ScriptEngineManager.getInstance().executeEffectMasterHandler();
ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded effect master handler.");
}
catch (Exception e)
@@ -228,7 +228,7 @@ public class AdminReload implements IAdminCommandHandler
{
try
{
ScriptEngineManager.getInstance().executeMasterHandler();
ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded master handler.");
}
catch (Exception e)

View File

@@ -165,7 +165,7 @@ public class Reload implements ITelnetCommand
{
try
{
ScriptEngineManager.getInstance().executeEffectMasterHandler();
ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
return "Telnet Admin: Reloaded effect master handler.";
}
catch (Exception e)
@@ -178,7 +178,7 @@ public class Reload implements ITelnetCommand
{
try
{
ScriptEngineManager.getInstance().executeMasterHandler();
ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
return "Telnet Admin: Reloaded master handler.";
}
catch (Exception e)

View File

@@ -31,7 +31,7 @@ import org.w3c.dom.Node;
import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.commons.util.CommonUtil;
import com.l2jmobius.commons.util.IGameXmlReader;
import com.l2jmobius.commons.util.IXmlReader;
import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.enums.InstanceType;
import com.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -72,7 +72,7 @@ import instances.AbstractInstance;
* Use proper zone spawn system.
* @author Gigiikun
*/
public final class FinalEmperialTomb extends AbstractInstance implements IGameXmlReader
public final class FinalEmperialTomb extends AbstractInstance implements IXmlReader
{
Logger LOGGER = Logger.getLogger(FinalEmperialTomb.class.getName());