Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-02 01:21:17 +08:00
Code Issues Projects Releases Wiki Activity

Format code [skip actions]

Browse Source
This commit is contained in:
github-actions
2023-09-02 00:33:12 +00:00
Unverified
parent 0db69882a3
commit 717a358636
584 changed files with 1252 additions and 1507 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/emu/grasscutter/scripts/EntityControllerScriptManager.java
+3 -4
View File
@@ -1,15 +1,14 @@
package emu.grasscutter.scripts;
import static emu.grasscutter.utils.FileUtils.getScriptPath;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.scripts.data.controller.EntityController;
import lombok.val;
import java.io.IOException;
import java.nio.file.Files;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import static emu.grasscutter.utils.FileUtils.getScriptPath;
import lombok.val;
public class EntityControllerScriptManager {
private static final Map<String, EntityController> gadgetController = new ConcurrentHashMap<>();
src/main/java/emu/grasscutter/scripts/SceneIndexManager.java
-1
View File
@@ -2,7 +2,6 @@ package emu.grasscutter.scripts;
import com.github.davidmoten.rtreemulti.*;
import com.github.davidmoten.rtreemulti.geometry.*;
import java.util.*;
import java.util.function.Function;
src/main/java/emu/grasscutter/scripts/SceneScriptManager.java
+7 -8
View File
@@ -1,5 +1,7 @@
package emu.grasscutter.scripts;
import static emu.grasscutter.scripts.constants.EventType.EVENT_TIMER_EVENT;
import com.github.davidmoten.rtreemulti.RTree;
import com.github.davidmoten.rtreemulti.geometry.Geometry;
import emu.grasscutter.Grasscutter;
@@ -19,20 +21,17 @@ import emu.grasscutter.server.packet.send.PacketGroupSuiteNotify;
import emu.grasscutter.utils.*;
import io.netty.util.concurrent.FastThreadLocalThread;
import it.unimi.dsi.fastutil.ints.*;
import kotlin.Pair;
import lombok.val;
import org.luaj.vm2.*;
import org.luaj.vm2.lib.jse.CoerceJavaToLua;
import javax.annotation.*;
import java.io.*;
import java.nio.file.Files;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import static emu.grasscutter.scripts.constants.EventType.EVENT_TIMER_EVENT;
import javax.annotation.*;
import kotlin.Pair;
import lombok.val;
import org.luaj.vm2.*;
import org.luaj.vm2.lib.jse.CoerceJavaToLua;
public class SceneScriptManager {
private final Scene scene;
src/main/java/emu/grasscutter/scripts/SceneTimeAxis.java
+1 -2
View File
@@ -2,9 +2,8 @@ package emu.grasscutter.scripts;
import emu.grasscutter.scripts.constants.EventType;
import emu.grasscutter.scripts.data.ScriptArgs;
import lombok.*;
import java.util.*;
import lombok.*;
@Getter
@RequiredArgsConstructor
src/main/java/emu/grasscutter/scripts/ScriptLoader.java
+12 -18
View File
@@ -9,19 +9,18 @@ import emu.grasscutter.scripts.constants.*;
import emu.grasscutter.scripts.data.SceneMeta;
import emu.grasscutter.scripts.serializer.*;
import emu.grasscutter.utils.FileUtils;
import lombok.Getter;
import org.luaj.vm2.*;
import org.luaj.vm2.lib.OneArgFunction;
import org.luaj.vm2.lib.jse.CoerceJavaToLua;
import org.luaj.vm2.script.*;
import javax.script.*;
import java.io.IOException;
import java.lang.ref.SoftReference;
import java.nio.file.Files;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicReference;
import javax.script.*;
import lombok.Getter;
import org.luaj.vm2.*;
import org.luaj.vm2.lib.OneArgFunction;
import org.luaj.vm2.lib.jse.CoerceJavaToLua;
import org.luaj.vm2.script.*;
public class ScriptLoader {
private static ScriptEngineManager sm;
@@ -30,8 +29,8 @@ public class ScriptLoader {
@Getter private static ScriptLib scriptLib;
@Getter private static LuaValue scriptLibLua;
/** suggest GC to remove it if the memory is less */
private static Map<String, SoftReference<String>> scriptSources =
new ConcurrentHashMap<>();
private static Map<String, SoftReference<String>> scriptSources = new ConcurrentHashMap<>();
private static Map<String, SoftReference<CompiledScript>> scriptsCache =
new ConcurrentHashMap<>();
/** sceneId - SceneMeta */
@@ -40,9 +39,7 @@ public class ScriptLoader {
private static final AtomicReference<Bindings> currentBindings = new AtomicReference<>(null);
private static final AtomicReference<ScriptContext> currentContext = new AtomicReference<>(null);
/**
* Initializes the script engine.
*/
/** Initializes the script engine. */
public static synchronized void init() throws Exception {
if (sm != null) {
throw new Exception("Script loader already initialized");
@@ -176,8 +173,7 @@ public class ScriptLoader {
*/
public static String readScript(String path) {
// Check if the path is cached.
var cached = ScriptLoader.tryGet(
ScriptLoader.scriptSources.get(path));
var cached = ScriptLoader.tryGet(ScriptLoader.scriptSources.get(path));
if (cached.isPresent()) {
return cached.get();
}
@@ -188,8 +184,7 @@ public class ScriptLoader {
try {
var source = Files.readString(scriptPath);
ScriptLoader.scriptSources.put(
path, new SoftReference<>(source));
ScriptLoader.scriptSources.put(path, new SoftReference<>(source));
return source;
} catch (IOException exception) {
@@ -207,8 +202,7 @@ public class ScriptLoader {
*/
public static CompiledScript getScript(String path) {
// Check if the script is cached.
var sc = ScriptLoader.tryGet(
ScriptLoader.scriptsCache.get(path));
var sc = ScriptLoader.tryGet(ScriptLoader.scriptsCache.get(path));
if (sc.isPresent()) {
return sc.get();
}
src/main/java/emu/grasscutter/scripts/ScriptUtils.java
+1 -2
View File
@@ -2,9 +2,8 @@ package emu.grasscutter.scripts;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.game.world.Position;
import org.luaj.vm2.*;
import java.util.HashMap;
import org.luaj.vm2.*;
public interface ScriptUtils {
static HashMap<Object, Object> toMap(LuaTable table) {
src/main/java/emu/grasscutter/scripts/data/SceneBlock.java
+2 -3
View File
@@ -5,11 +5,10 @@ import com.github.davidmoten.rtreemulti.geometry.*;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.game.world.Position;
import emu.grasscutter.scripts.*;
import lombok.*;
import javax.script.*;
import java.util.Map;
import java.util.stream.Collectors;
import javax.script.*;
import lombok.*;
@ToString
@Setter
src/main/java/emu/grasscutter/scripts/data/SceneGarbage.java
+1 -2
View File
@@ -1,8 +1,7 @@
package emu.grasscutter.scripts.data;
import lombok.*;
import java.util.List;
import lombok.*;
@ToString
@Setter
src/main/java/emu/grasscutter/scripts/data/SceneGroup.java
+3 -4
View File
@@ -3,12 +3,11 @@ package emu.grasscutter.scripts.data;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.game.world.Position;
import emu.grasscutter.scripts.ScriptLoader;
import lombok.*;
import org.luaj.vm2.*;
import javax.script.*;
import java.util.*;
import java.util.stream.Collectors;
import javax.script.*;
import lombok.*;
import org.luaj.vm2.*;
@ToString
@Setter
src/main/java/emu/grasscutter/scripts/data/SceneMeta.java
+2 -3
View File
@@ -4,11 +4,10 @@ import com.github.davidmoten.rtreemulti.RTree;
import com.github.davidmoten.rtreemulti.geometry.Geometry;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.scripts.*;
import lombok.*;
import javax.script.*;
import java.util.*;
import java.util.stream.Collectors;
import javax.script.*;
import lombok.*;
@ToString
@Setter
src/main/java/emu/grasscutter/scripts/data/SceneMonster.java
+1 -2
View File
@@ -1,8 +1,7 @@
package emu.grasscutter.scripts.data;
import lombok.*;
import java.util.List;
import lombok.*;
@ToString
@Setter
src/main/java/emu/grasscutter/scripts/data/SceneRegion.java
+1 -2
View File
@@ -2,9 +2,8 @@ package emu.grasscutter.scripts.data;
import emu.grasscutter.game.world.Position;
import emu.grasscutter.scripts.constants.ScriptRegionShape;
import lombok.*;
import java.util.List;
import lombok.*;
@Setter
@EqualsAndHashCode
src/main/java/emu/grasscutter/scripts/data/SceneSuite.java
+1 -2
View File
@@ -1,8 +1,7 @@
package emu.grasscutter.scripts.data;
import lombok.*;
import java.util.*;
import lombok.*;
@ToString
@Setter
src/main/java/emu/grasscutter/scripts/data/controller/EntityController.java
+2 -3
View File
@@ -4,10 +4,9 @@ import emu.grasscutter.*;
import emu.grasscutter.game.entity.GameEntity;
import emu.grasscutter.game.props.ElementType;
import emu.grasscutter.scripts.*;
import org.luaj.vm2.*;
import javax.script.*;
import java.util.Set;
import javax.script.*;
import org.luaj.vm2.*;
public class EntityController {
private static final Set<String> SERVER_CALLED = Set.of("OnBeHurt", "OnDie", "OnTimer");
src/main/java/emu/grasscutter/scripts/serializer/LuaSerializer.java
+3 -4
View File
@@ -3,15 +3,14 @@ package emu.grasscutter.scripts.serializer;
import com.esotericsoftware.reflectasm.*;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.scripts.ScriptUtils;
import java.lang.reflect.*;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import lombok.*;
import lombok.experimental.FieldDefaults;
import org.jetbrains.annotations.Nullable;
import org.luaj.vm2.*;
import java.lang.reflect.*;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
public class LuaSerializer implements Serializer {
private static final Map<Class<?>, MethodAccess> methodAccessCache = new ConcurrentHashMap<>();
src/main/java/emu/grasscutter/scripts/serializer/LuaTableJacksonSerializer.java
+1 -2
View File
@@ -7,10 +7,9 @@ import com.fasterxml.jackson.databind.json.JsonMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.type.*;
import emu.grasscutter.Grasscutter;
import org.luaj.vm2.*;
import java.io.IOException;
import java.util.*;
import org.luaj.vm2.*;
public class LuaTableJacksonSerializer extends JsonSerializer<LuaTable> implements Serializer {
src/main/java/emu/grasscutter/scripts/service/ScriptMonsterSpawnService.java
-1
View File
@@ -3,7 +3,6 @@ package emu.grasscutter.scripts.service;
import emu.grasscutter.game.entity.EntityMonster;
import emu.grasscutter.scripts.SceneScriptManager;
import emu.grasscutter.scripts.listener.ScriptMonsterListener;
import java.util.*;
public class ScriptMonsterSpawnService {
src/main/java/emu/grasscutter/scripts/service/ScriptMonsterTideService.java
-1
View File
@@ -5,7 +5,6 @@ import emu.grasscutter.scripts.SceneScriptManager;
import emu.grasscutter.scripts.constants.EventType;
import emu.grasscutter.scripts.data.*;
import emu.grasscutter.scripts.listener.ScriptMonsterListener;
import java.util.List;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicInteger;