Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-19 10:29:50 +08:00
Code Issues Projects Releases Wiki Activity

Run formatter & update protocol

Browse Source
This commit is contained in:
KingRainbow44
2023-08-31 23:46:55 -04:00
Unverified
parent 541433c01b
commit e04df0526a
1175 changed files with 3512 additions and 5070 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/emu/grasscutter/scripts/EntityControllerScriptManager.java
+4 -3
View File
@@ -1,14 +1,15 @@
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 lombok.val;
import static emu.grasscutter.utils.FileUtils.getScriptPath;
public class EntityControllerScriptManager {
private static final Map<String, EntityController> gadgetController = new ConcurrentHashMap<>();
src/main/java/emu/grasscutter/scripts/SceneIndexManager.java
+4 -7
View File
@@ -1,12 +1,9 @@
package emu.grasscutter.scripts;
import com.github.davidmoten.rtreemulti.Entry;
import com.github.davidmoten.rtreemulti.RTree;
import com.github.davidmoten.rtreemulti.geometry.Geometry;
import com.github.davidmoten.rtreemulti.geometry.Rectangle;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import com.github.davidmoten.rtreemulti.*;
import com.github.davidmoten.rtreemulti.geometry.*;
import java.util.*;
import java.util.function.Function;
public class SceneIndexManager {
src/main/java/emu/grasscutter/scripts/SceneScriptManager.java
+8 -7
View File
@@ -1,7 +1,5 @@
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;
@@ -21,17 +19,20 @@ 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 javax.annotation.*;
import kotlin.Pair;
import lombok.val;
import org.luaj.vm2.*;
import org.luaj.vm2.lib.jse.CoerceJavaToLua;
import static emu.grasscutter.scripts.constants.EventType.EVENT_TIMER_EVENT;
public class SceneScriptManager {
private final Scene scene;
src/main/java/emu/grasscutter/scripts/SceneTimeAxis.java
+2 -1
View File
@@ -2,9 +2,10 @@ package emu.grasscutter.scripts;
import emu.grasscutter.scripts.constants.EventType;
import emu.grasscutter.scripts.data.ScriptArgs;
import java.util.*;
import lombok.*;
import java.util.*;
@Getter
@RequiredArgsConstructor
public final class SceneTimeAxis {
src/main/java/emu/grasscutter/scripts/ScriptLoader.java
+2 -2
View File
@@ -11,14 +11,14 @@ import emu.grasscutter.scripts.serializer.*;
import emu.grasscutter.utils.FileUtils;
import lombok.Getter;
import org.luaj.vm2.*;
import org.luaj.vm2.lib.*;
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.*;
import java.nio.file.Files;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicReference;
src/main/java/emu/grasscutter/scripts/ScriptUtils.java
+2 -2
View File
@@ -2,9 +2,9 @@ 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.LuaTable;
import org.luaj.vm2.LuaValue;
public interface ScriptUtils {
static HashMap<Object, Object> toMap(LuaTable table) {
src/main/java/emu/grasscutter/scripts/data/Explore.java
+1 -2
View File
@@ -1,7 +1,6 @@
package emu.grasscutter.scripts.data;
import lombok.Setter;
import lombok.ToString;
import lombok.*;
@ToString
@Setter
src/main/java/emu/grasscutter/scripts/data/SceneBlock.java
+3 -2
View File
@@ -5,10 +5,11 @@ 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/SceneBossChest.java
+1 -2
View File
@@ -1,7 +1,6 @@
package emu.grasscutter.scripts.data;
import lombok.Setter;
import lombok.ToString;
import lombok.*;
@Setter
@ToString
src/main/java/emu/grasscutter/scripts/data/SceneBusiness.java
+1 -2
View File
@@ -1,7 +1,6 @@
package emu.grasscutter.scripts.data;
import lombok.Setter;
import lombok.ToString;
import lombok.*;
@ToString
@Setter
src/main/java/emu/grasscutter/scripts/data/SceneConfig.java
+1 -2
View File
@@ -1,8 +1,7 @@
package emu.grasscutter.scripts.data;
import emu.grasscutter.game.world.Position;
import lombok.Setter;
import lombok.ToString;
import lombok.*;
@ToString
@Setter
src/main/java/emu/grasscutter/scripts/data/SceneGadget.java
+1 -2
View File
@@ -1,7 +1,6 @@
package emu.grasscutter.scripts.data;
import lombok.Setter;
import lombok.ToString;
import lombok.*;
@ToString
@Setter
src/main/java/emu/grasscutter/scripts/data/SceneGarbage.java
+2 -2
View File
@@ -1,8 +1,8 @@
package emu.grasscutter.scripts.data;
import lombok.*;
import java.util.List;
import lombok.Setter;
import lombok.ToString;
@ToString
@Setter
src/main/java/emu/grasscutter/scripts/data/SceneInitConfig.java
+1 -2
View File
@@ -1,7 +1,6 @@
package emu.grasscutter.scripts.data;
import lombok.Setter;
import lombok.ToString;
import lombok.*;
@ToString
@Setter
src/main/java/emu/grasscutter/scripts/data/SceneMeta.java
+3 -2
View File
@@ -4,10 +4,11 @@ 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
+2 -2
View File
@@ -1,8 +1,8 @@
package emu.grasscutter.scripts.data;
import lombok.*;
import java.util.List;
import lombok.Setter;
import lombok.ToString;
@ToString
@Setter
src/main/java/emu/grasscutter/scripts/data/SceneNPC.java
+1 -2
View File
@@ -1,7 +1,6 @@
package emu.grasscutter.scripts.data;
import lombok.Setter;
import lombok.ToString;
import lombok.*;
@ToString
@Setter
src/main/java/emu/grasscutter/scripts/data/SceneObject.java
+1 -2
View File
@@ -1,8 +1,7 @@
package emu.grasscutter.scripts.data;
import emu.grasscutter.game.world.Position;
import lombok.Setter;
import lombok.ToString;
import lombok.*;
@ToString
@Setter
src/main/java/emu/grasscutter/scripts/data/SceneRegion.java
+2 -2
View File
@@ -2,9 +2,9 @@ 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.EqualsAndHashCode;
import lombok.Setter;
@Setter
@EqualsAndHashCode
src/main/java/emu/grasscutter/scripts/data/SceneReplaceable.java
+1 -2
View File
@@ -1,7 +1,6 @@
package emu.grasscutter.scripts.data;
import lombok.Setter;
import lombok.ToString;
import lombok.*;
@ToString
@Setter
src/main/java/emu/grasscutter/scripts/data/SceneSuite.java
+3 -4
View File
@@ -1,9 +1,8 @@
package emu.grasscutter.scripts.data;
import java.util.ArrayList;
import java.util.List;
import lombok.Setter;
import lombok.ToString;
import lombok.*;
import java.util.*;
@ToString
@Setter
src/main/java/emu/grasscutter/scripts/data/SceneVar.java
+1 -2
View File
@@ -1,7 +1,6 @@
package emu.grasscutter.scripts.data;
import lombok.Setter;
import lombok.ToString;
import lombok.*;
@ToString
@Setter
src/main/java/emu/grasscutter/scripts/data/controller/EntityController.java
+3 -2
View File
@@ -4,10 +4,11 @@ import emu.grasscutter.*;
import emu.grasscutter.game.entity.GameEntity;
import emu.grasscutter.game.props.ElementType;
import emu.grasscutter.scripts.*;
import java.util.Set;
import javax.script.*;
import org.luaj.vm2.*;
import javax.script.*;
import java.util.Set;
public class EntityController {
private static final Set<String> SERVER_CALLED = Set.of("OnBeHurt", "OnDie", "OnTimer");
src/main/java/emu/grasscutter/scripts/serializer/LuaSerializer.java
+7 -12
View File
@@ -1,21 +1,16 @@
package emu.grasscutter.scripts.serializer;
import com.esotericsoftware.reflectasm.ConstructorAccess;
import com.esotericsoftware.reflectasm.MethodAccess;
import com.esotericsoftware.reflectasm.*;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.scripts.ScriptUtils;
import java.lang.reflect.Field;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.*;
import lombok.experimental.FieldDefaults;
import org.jetbrains.annotations.Nullable;
import org.luaj.vm2.LuaTable;
import org.luaj.vm2.LuaValue;
import org.luaj.vm2.*;
import java.lang.reflect.*;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
public class LuaSerializer implements Serializer {
src/main/java/emu/grasscutter/scripts/serializer/LuaTableJacksonSerializer.java
+5 -8
View File
@@ -1,19 +1,16 @@
package emu.grasscutter.scripts.serializer;
import com.fasterxml.jackson.annotation.JsonSetter;
import com.fasterxml.jackson.annotation.Nulls;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.annotation.*;
import com.fasterxml.jackson.core.*;
import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.json.JsonMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.type.CollectionType;
import com.fasterxml.jackson.databind.type.MapType;
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.LuaTable;
import org.luaj.vm2.LuaValue;
public class LuaTableJacksonSerializer extends JsonSerializer<LuaTable> implements Serializer {
src/main/java/emu/grasscutter/scripts/serializer/Serializer.java
+1 -2
View File
@@ -1,7 +1,6 @@
package emu.grasscutter.scripts.serializer;
import java.util.List;
import java.util.Map;
import java.util.*;
public interface Serializer {
src/main/java/emu/grasscutter/scripts/service/ScriptMonsterSpawnService.java
+2 -2
View File
@@ -3,8 +3,8 @@ 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.ArrayList;
import java.util.List;
import java.util.*;
public class ScriptMonsterSpawnService {
src/main/java/emu/grasscutter/scripts/service/ScriptMonsterTideService.java
+2 -3
View File
@@ -3,10 +3,9 @@ package emu.grasscutter.scripts.service;
import emu.grasscutter.game.entity.EntityMonster;
import emu.grasscutter.scripts.SceneScriptManager;
import emu.grasscutter.scripts.constants.EventType;
import emu.grasscutter.scripts.data.SceneGroup;
import emu.grasscutter.scripts.data.SceneMonster;
import emu.grasscutter.scripts.data.ScriptArgs;
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;