Remove deprecated function

KingRainbow44 · Aug 13, 2023 · f2b81a7 · f2b81a7
1 parent cfccb2d
commit f2b81a7
Showing 1 changed file with 10 additions and 41 deletions.
diff --git a/src/main/java/emu/grasscutter/scripts/ScriptLoader.java b/src/main/java/emu/grasscutter/scripts/ScriptLoader.java
@@ -1,33 +1,25 @@
 package emu.grasscutter.scripts;
 
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.game.dungeons.challenge.enums.ChallengeEventMarkType;
-import emu.grasscutter.game.dungeons.challenge.enums.FatherChallengeProperty;
-import emu.grasscutter.game.props.ElementType;
-import emu.grasscutter.game.props.EntityType;
+import emu.grasscutter.game.dungeons.challenge.enums.*;
+import emu.grasscutter.game.props.*;
 import emu.grasscutter.game.quest.enums.QuestState;
 import emu.grasscutter.scripts.constants.*;
 import emu.grasscutter.scripts.data.SceneMeta;
-import emu.grasscutter.scripts.serializer.LuaSerializer;
-import emu.grasscutter.scripts.serializer.Serializer;
+import emu.grasscutter.scripts.serializer.*;
 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 org.luaj.vm2.LuaTable;
-import org.luaj.vm2.LuaValue;
+import org.luaj.vm2.*;
 import org.luaj.vm2.lib.OneArgFunction;
 import org.luaj.vm2.lib.jse.CoerceJavaToLua;
 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 {
     private static ScriptEngineManager sm;
     @Getter private static ScriptEngine engine;
@@ -120,29 +112,6 @@ public static <T> Optional<T> tryGet(SoftReference<T> softReference) {
         }
     }
 
-    @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) {
         var sc = tryGet(scriptsCache.get(path));
         if (sc.isPresent()) {