Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-22 13:15:39 +00:00
Code Issues Projects Releases Wiki Activity

Remove deprecated function

Browse Source
This commit is contained in:
KingRainbow44 2023-08-13 16:22:41 -04:00
parent cfccb2d991
commit f2b81a70c8
No known key found for this signature in database
GPG Key ID: FC2CB64B00D257BE
1 changed files with 10 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/main/java/emu/grasscutter/scripts/ScriptLoader.java
View File

@ -1,33 +1,25 @@
package emu.grasscutter.scripts; package emu.grasscutter.scripts;
import emu.grasscutter.Grasscutter; import emu.grasscutter.Grasscutter;
import emu.grasscutter.game.dungeons.challenge.enums.ChallengeEventMarkType; import emu.grasscutter.game.dungeons.challenge.enums.*;
import emu.grasscutter.game.dungeons.challenge.enums.FatherChallengeProperty; import emu.grasscutter.game.props.*;
import emu.grasscutter.game.props.ElementType;
import emu.grasscutter.game.props.EntityType;
import emu.grasscutter.game.quest.enums.QuestState; import emu.grasscutter.game.quest.enums.QuestState;
import emu.grasscutter.scripts.constants.*; import emu.grasscutter.scripts.constants.*;
import emu.grasscutter.scripts.data.SceneMeta; import emu.grasscutter.scripts.data.SceneMeta;
import emu.grasscutter.scripts.serializer.LuaSerializer; import emu.grasscutter.scripts.serializer.*;
import emu.grasscutter.scripts.serializer.Serializer;
import emu.grasscutter.utils.FileUtils; import emu.grasscutter.utils.FileUtils;
import java.io.File;
import java.io.FileReader;
import java.lang.ref.SoftReference;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import javax.script.*;
import lombok.Getter; import lombok.Getter;
import org.luaj.vm2.LuaTable; import org.luaj.vm2.*;
import org.luaj.vm2.LuaValue;
import org.luaj.vm2.lib.OneArgFunction; import org.luaj.vm2.lib.OneArgFunction;
import org.luaj.vm2.lib.jse.CoerceJavaToLua; import org.luaj.vm2.lib.jse.CoerceJavaToLua;
import org.luaj.vm2.script.LuajContext; import org.luaj.vm2.script.LuajContext;
import javax.script.*;
import java.lang.ref.SoftReference;
import java.nio.file.*;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
public class ScriptLoader { public class ScriptLoader {
private static ScriptEngineManager sm; private static ScriptEngineManager sm;
@Getter private static ScriptEngine engine; @Getter private static ScriptEngine engine;
@ -120,29 +112,6 @@ public class ScriptLoader {
} }
} }
@Deprecated(forRemoval = true)
public static CompiledScript getScriptByPath(String path) {
var sc = tryGet(scriptsCache.get(path));
if (sc.isPresent()) {
return sc.get();
}
// Grasscutter.getLogger().debug("Loading script " + path);
File file = new File(path);
if (!file.exists()) return null;
try (FileReader fr = new FileReader(file)) {
var script = ((Compilable) getEngine()).compile(fr);
scriptsCache.put(path, new SoftReference<>(script));
return script;
} catch (Exception e) {
Grasscutter.getLogger().error("Loading script {} failed!", path, e);
return null;
}
}
public static CompiledScript getScript(String path) { public static CompiledScript getScript(String path) {
var sc = tryGet(scriptsCache.get(path)); var sc = tryGet(scriptsCache.get(path));
if (sc.isPresent()) { if (sc.isPresent()) {