Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-16 08:56:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement lazy loading of scripts when they enter a new block

Browse Source
This commit is contained in:
Melledy
2022-04-29 02:07:25 -07:00
parent 3af5d20473
commit 1a5d4cf466
3 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/emu/grasscutter/scripts/SceneScriptManager.java
View File

@@ -145,7 +145,7 @@ public class SceneScriptManager {
SceneBlock block = blocks.get(0);
block.id = blockIds.get(i);
loadBlock(block);
loadBlockFromScript(block);
}
this.blocks = blocks;
@@ -162,7 +162,7 @@ public class SceneScriptManager {
return isInit;
}
private void loadBlock(SceneBlock block) {
private void loadBlockFromScript(SceneBlock block) {
CompiledScript cs = ScriptLoader.getScriptByPath(
Grasscutter.getConfig().SCRIPTS_FOLDER + "Scene/" + getScene().getId() + "/scene" + getScene().getId() + "_block" + block.id + "." + ScriptLoader.getScriptType());
@@ -176,13 +176,16 @@ public class SceneScriptManager {
// Set groups
block.groups = ScriptLoader.getSerializer().toList(SceneGroup.class, bindings.get("groups"));
block.groups.forEach(this::loadGroup);
block.groups.forEach(g -> g.block_id = block.id);
} catch (ScriptException e) {
Grasscutter.getLogger().error("Error loading block " + block.id + " in scene " + getScene().getId(), e);
}
}
private void loadGroup(SceneGroup group) {
public void loadGroupFromScript(SceneGroup group) {
// Set flag here so if there is no script, we dont call this function over and over again.
group.setLoaded(true);
CompiledScript cs = ScriptLoader.getScriptByPath(
Grasscutter.getConfig().SCRIPTS_FOLDER + "Scene/" + getScene().getId() + "/scene" + getScene().getId() + "_group" + group.id + "." + ScriptLoader.getScriptType());
@@ -213,13 +216,13 @@ public class SceneScriptManager {
}
public void spawnGadgetsInGroup(SceneBlock block, SceneGroup group) {
public void spawnGadgetsInGroup(SceneGroup group) {
for (SceneGadget g : group.gadgets) {
EntityGadget entity = new EntityGadget(getScene(), g.gadget_id, g.pos);
if (entity.getGadgetData() == null) continue;
entity.setBlockId(block.id);
entity.setBlockId(group.block_id);
entity.setConfigId(g.config_id);
entity.setGroupId(group.id);
entity.getRotation().set(g.rot);