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

Server uses data folder as datapack base folder, plus more fixes for previous commit.

Browse Source
This commit is contained in:
MobiusDev
2016-10-21 14:02:37 +00:00
parent 4df1abce3f
commit 6107624b59
231 changed files with 311 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_Test/java/com/l2jmobius/gameserver/GameServer.java
View File

@@ -147,7 +147,7 @@ import com.l2jmobius.gameserver.model.olympiad.Olympiad;
import com.l2jmobius.gameserver.network.L2GameClient;
import com.l2jmobius.gameserver.network.L2GamePacketHandler;
import com.l2jmobius.gameserver.pathfinding.PathFinding;
import com.l2jmobius.gameserver.scripting.L2ScriptEngineManager;
import com.l2jmobius.gameserver.scripting.ScriptEngineManager;
import com.l2jmobius.gameserver.taskmanager.KnownListUpdateTaskManager;
import com.l2jmobius.gameserver.taskmanager.TaskManager;
import com.l2jmobius.status.Status;
@@ -185,7 +185,7 @@ public final class GameServer
// load script engines
printSection("Scripting Engines");
L2ScriptEngineManager.getInstance();
ScriptEngineManager.getInstance();
printSection("World");
// start game time control early
@@ -330,7 +330,7 @@ public final class GameServer
try
{
_log.info("Loading server scripts...");
L2ScriptEngineManager.getInstance().executeScriptList();
ScriptEngineManager.getInstance().executeScriptList();
}
catch (Exception e)
{

4
L2J_Mobius_Test/java/com/l2jmobius/gameserver/handler/EffectHandler.java
View File

@@ -20,7 +20,7 @@ import java.util.HashMap;
import java.util.Map;
import com.l2jmobius.gameserver.model.effects.AbstractEffect;
import com.l2jmobius.gameserver.scripting.L2ScriptEngineManager;
import com.l2jmobius.gameserver.scripting.ScriptEngineManager;
/**
* @author BiggBoss, UnAfraid
@@ -62,7 +62,7 @@ public final class EffectHandler implements IHandler<Class<? extends AbstractEff
{
try
{
L2ScriptEngineManager.getInstance().executeEffectMasterHandler();
ScriptEngineManager.getInstance().executeEffectMasterHandler();
}
catch (Exception e)
{

4
L2J_Mobius_Test/java/com/l2jmobius/gameserver/instancemanager/QuestManager.java
View File

@@ -23,7 +23,7 @@ import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.model.quest.Quest;
import com.l2jmobius.gameserver.scripting.L2ScriptEngineManager;
import com.l2jmobius.gameserver.scripting.ScriptEngineManager;
import com.l2jmobius.util.Util;
/**
@@ -90,7 +90,7 @@ public final class QuestManager
try
{
L2ScriptEngineManager.getInstance().executeScriptList();
ScriptEngineManager.getInstance().executeScriptList();
}
catch (Exception e)
{

4
L2J_Mobius_Test/java/com/l2jmobius/gameserver/scripting/ManagedScript.java
View File

@@ -34,7 +34,7 @@ public abstract class ManagedScript
public ManagedScript()
{
_scriptFile = L2ScriptEngineManager.getInstance().getCurrentLoadingScript();
_scriptFile = ScriptEngineManager.getInstance().getCurrentLoadingScript();
setLastLoadTime(System.currentTimeMillis());
}
@@ -47,7 +47,7 @@ public abstract class ManagedScript
{
try
{
L2ScriptEngineManager.getInstance().executeScript(getScriptFile());
ScriptEngineManager.getInstance().executeScript(getScriptFile());
return true;
}
catch (Exception e)

160
L2J_Mobius_Test/java/com/l2jmobius/gameserver/scripting/L2ScriptEngineManager.java → L2J_Mobius_Test/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
View File

@@ -17,8 +17,6 @@
package com.l2jmobius.gameserver.scripting;
import java.io.FileInputStream;
import java.io.FileReader;
import java.io.LineNumberReader;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -27,6 +25,7 @@ import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Properties;
import java.util.ServiceLoader;
import java.util.logging.Level;
@@ -39,32 +38,26 @@ import com.l2jmobius.gameserver.scripting.java.JavaScriptingEngine;
* Caches script engines and provides functionality for executing and managing scripts.
* @author KenM, HorridoJoho
*/
public final class L2ScriptEngineManager
public final class ScriptEngineManager
{
private static final Logger _log = Logger.getLogger(L2ScriptEngineManager.class.getName());
public static final Path SCRIPT_LIST_FILE = Paths.get(Config.DATAPACK_ROOT.getAbsolutePath(), "data", "scripts.cfg");
public static final Path SCRIPT_FOLDER = Paths.get(Config.DATAPACK_ROOT.getAbsolutePath(), "data", "scripts");
private static final Logger _log = Logger.getLogger(ScriptEngineManager.class.getName());
public static final Path SCRIPT_LIST_FILE = Paths.get(Config.DATAPACK_ROOT.getAbsolutePath(), "scripts.cfg");
public static final Path SCRIPT_FOLDER = Paths.get(Config.DATAPACK_ROOT.getAbsolutePath(), "scripts");
public static final Path MASTER_HANDLER_FILE = Paths.get(SCRIPT_FOLDER.toString(), "handlers", "MasterHandler.java");
public static final Path EFFECT_MASTER_HANDLER_FILE = Paths.get(SCRIPT_FOLDER.toString(), "handlers", "EffectMasterHandler.java");
private final Map<String, IExecutionContext> _extEngines = new HashMap<>();
private IExecutionContext _currentExecutionContext = null;
protected L2ScriptEngineManager()
protected ScriptEngineManager()
{
final Properties props = loadProperties();
// Load external script engines
ServiceLoader.load(IScriptingEngine.class).forEach(engine ->
{
registerEngine(engine, props);
});
// Default java engine implementation
registerEngine(new JavaScriptingEngine(), props);
// No external script engines
if (_extEngines.isEmpty())
{
registerEngine(new JavaScriptingEngine(), props);
}
// Load external script engines
ServiceLoader.load(IScriptingEngine.class).forEach(engine -> registerEngine(engine, props));
}
private Properties loadProperties()
@@ -175,84 +168,77 @@ public final class L2ScriptEngineManager
// throws exception if not exists or not file
checkExistingFile("ScriptList", SCRIPT_LIST_FILE);
try (final LineNumberReader lnr = new LineNumberReader(new FileReader(SCRIPT_LIST_FILE.toString())))
final LinkedHashMap<IExecutionContext, LinkedList<Path>> files = new LinkedHashMap<>();
final LinkedList<String> extWithoutEngine = new LinkedList<>();
Files.lines(SCRIPT_LIST_FILE).forEach(line ->
{
final LinkedHashMap<IExecutionContext, LinkedList<Path>> files = new LinkedHashMap<>();
final LinkedList<String> extWithoutEngine = new LinkedList<>();
String line;
while ((line = lnr.readLine()) != null)
line = line.trim();
if (line.isEmpty() || (line.charAt(0) == '#'))
{
line = line.trim();
if (line.isEmpty() || (line.charAt(0) == '#'))
{
continue;
}
Path sourceFile = SCRIPT_FOLDER.resolve(line);
try
{
checkExistingFile("ScriptFile", sourceFile);
}
catch (Exception e)
{
_log.warning(e.getMessage());
continue;
}
sourceFile = sourceFile.toAbsolutePath();
final String ext = getFileExtension(sourceFile);
if (ext == null)
{
_log.warning("ScriptFile: " + sourceFile + " does not have an extension to determine the script engine!");
continue;
}
final IExecutionContext engine = getEngineByExtension(ext);
if (engine == null)
{
if (!extWithoutEngine.contains(ext))
{
extWithoutEngine.add(ext);
_log.warning("ScriptEngine: No engine registered for extension " + ext + "!");
}
continue;
}
LinkedList<Path> ll = files.get(engine);
if (ll == null)
{
ll = new LinkedList<>();
files.put(engine, ll);
}
ll.add(sourceFile);
return;
}
for (Entry<IExecutionContext, LinkedList<Path>> entry : files.entrySet())
Path sourceFile = SCRIPT_FOLDER.resolve(line);
try
{
_currentExecutionContext = entry.getKey();
try
checkExistingFile("ScriptFile", sourceFile);
}
catch (Exception e)
{
_log.warning(e.getMessage());
return;
}
sourceFile = sourceFile.toAbsolutePath();
final String ext = getFileExtension(sourceFile);
if (ext == null)
{
_log.warning("ScriptFile: " + sourceFile + " does not have an extension to determine the script engine!");
return;
}
final IExecutionContext engine = getEngineByExtension(ext);
if (engine == null)
{
if (!extWithoutEngine.contains(ext))
{
Map<Path, Throwable> invokationErrors = entry.getKey().executeScripts(entry.getValue());
for (Entry<Path, Throwable> entry2 : invokationErrors.entrySet())
{
_log.log(Level.WARNING, "ScriptEngine: " + entry2.getKey() + " failed execution!", entry2.getValue());
}
extWithoutEngine.add(ext);
_log.warning("ScriptEngine: No engine registered for extension " + ext + "!");
}
finally
return;
}
LinkedList<Path> ll = files.get(engine);
if (ll == null)
{
ll = new LinkedList<>();
files.put(engine, ll);
}
ll.add(sourceFile);
});
for (Entry<IExecutionContext, LinkedList<Path>> entry : files.entrySet())
{
_currentExecutionContext = entry.getKey();
try
{
Map<Path, Throwable> invokationErrors = entry.getKey().executeScripts(entry.getValue());
for (Entry<Path, Throwable> entry2 : invokationErrors.entrySet())
{
_currentExecutionContext = null;
_log.log(Level.WARNING, "ScriptEngine: " + entry2.getKey() + " failed execution!", entry2.getValue());
}
}
finally
{
_currentExecutionContext = null;
}
}
}
public void executeScript(Path sourceFile) throws Exception
{
if (sourceFile == null)
{
throw new NullPointerException();
}
Objects.requireNonNull(sourceFile);
if (!sourceFile.isAbsolute())
{
@@ -264,16 +250,10 @@ public final class L2ScriptEngineManager
sourceFile = sourceFile.toAbsolutePath();
String ext = getFileExtension(sourceFile);
if (ext == null)
{
throw new Exception("ScriptFile: " + sourceFile + " does not have an extension to determine the script engine!");
}
Objects.requireNonNull(sourceFile, "ScriptFile: " + sourceFile + " does not have an extension to determine the script engine!");
IExecutionContext engine = getEngineByExtension(ext);
if (engine == null)
{
throw new Exception("ScriptEngine: No engine registered for extension " + ext + "!");
}
Objects.requireNonNull(engine, "ScriptEngine: No engine registered for extension " + ext + "!");
_currentExecutionContext = engine;
try
@@ -295,13 +275,13 @@ public final class L2ScriptEngineManager
return _currentExecutionContext.getCurrentExecutingScript();
}
public static L2ScriptEngineManager getInstance()
public static ScriptEngineManager getInstance()
{
return SingletonHolder._instance;
}
private static class SingletonHolder
{
protected static final L2ScriptEngineManager _instance = new L2ScriptEngineManager();
protected static final ScriptEngineManager _instance = new ScriptEngineManager();
}
}

4
L2J_Mobius_Test/java/com/l2jmobius/gameserver/taskmanager/tasks/TaskScript.java
View File

@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.taskmanager.tasks;
import java.nio.file.Paths;
import java.util.logging.Level;
import com.l2jmobius.gameserver.scripting.L2ScriptEngineManager;
import com.l2jmobius.gameserver.scripting.ScriptEngineManager;
import com.l2jmobius.gameserver.taskmanager.Task;
import com.l2jmobius.gameserver.taskmanager.TaskManager.ExecutedTask;
@@ -41,7 +41,7 @@ public class TaskScript extends Task
{
try
{
L2ScriptEngineManager.getInstance().executeScript(Paths.get("cron", task.getParams()[2]));
ScriptEngineManager.getInstance().executeScript(Paths.get("cron", task.getParams()[2]));
}
catch (Exception e)
{