Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-21 16:59:53 +08:00
Code Issues Projects Releases Wiki Activity

Fix Lua require, Fix monster abilities & Fix ServerLuaCall

Browse Source
This commit is contained in:
KingRainbow44
2023-08-27 02:39:56 -04:00
Unverified
parent 49c1daede4
commit 1844cb43f7
15 changed files with 303 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/emu/grasscutter/scripts/data/SceneBlock.java
+6 -10
View File
@@ -1,19 +1,15 @@
package emu.grasscutter.scripts.data;
import com.github.davidmoten.rtreemulti.RTree;
import com.github.davidmoten.rtreemulti.geometry.Geometry;
import com.github.davidmoten.rtreemulti.geometry.Rectangle;
import com.github.davidmoten.rtreemulti.geometry.*;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.game.world.Position;
import emu.grasscutter.scripts.SceneIndexManager;
import emu.grasscutter.scripts.ScriptLoader;
import emu.grasscutter.scripts.*;
import lombok.*;
import javax.script.*;
import java.util.Map;
import java.util.stream.Collectors;
import javax.script.Bindings;
import javax.script.CompiledScript;
import javax.script.ScriptException;
import lombok.Setter;
import lombok.ToString;
@ToString
@Setter
@@ -61,7 +57,7 @@ public class SceneBlock {
// Eval script
try {
cs.eval(bindings);
ScriptLoader.eval(cs, bindings);
// Set groups
this.groups =
src/main/java/emu/grasscutter/scripts/data/SceneGroup.java
+6 -14
View File
@@ -3,20 +3,12 @@ package emu.grasscutter.scripts.data;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.game.world.Position;
import emu.grasscutter.scripts.ScriptLoader;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Random;
import lombok.*;
import org.luaj.vm2.*;
import javax.script.*;
import java.util.*;
import java.util.stream.Collectors;
import javax.script.Bindings;
import javax.script.CompiledScript;
import javax.script.ScriptException;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import org.luaj.vm2.LuaError;
import org.luaj.vm2.LuaValue;
@ToString
@Setter
@@ -105,7 +97,7 @@ public final class SceneGroup {
// Eval script
try {
cs.eval(this.bindings);
ScriptLoader.eval(cs, this.bindings);
// Set
this.monsters =
src/main/java/emu/grasscutter/scripts/data/SceneMeta.java
+6 -10
View File
@@ -3,16 +3,12 @@ package emu.grasscutter.scripts.data;
import com.github.davidmoten.rtreemulti.RTree;
import com.github.davidmoten.rtreemulti.geometry.Geometry;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.scripts.SceneIndexManager;
import emu.grasscutter.scripts.ScriptLoader;
import java.util.List;
import java.util.Map;
import emu.grasscutter.scripts.*;
import lombok.*;
import javax.script.*;
import java.util.*;
import java.util.stream.Collectors;
import javax.script.Bindings;
import javax.script.CompiledScript;
import javax.script.ScriptException;
import lombok.Setter;
import lombok.ToString;
@ToString
@Setter
@@ -43,7 +39,7 @@ public class SceneMeta {
// Eval script
try {
cs.eval(this.context);
ScriptLoader.eval(cs, this.context);
this.config =
ScriptLoader.getSerializer()