Merge branch 'dev' into syntax-highlighter-unified

This commit is contained in:
Kam committed 2026-03-02 16:38:44 -05:00
commit c16aae75e2
16 files changed
+184 -52

No files matched your search

@@ -18,6 +18,7 @@ import noppes.npcs.constants.ScriptContext;
import noppes.npcs.controllers.ScriptContainer;
import noppes.npcs.controllers.ScriptController;
import noppes.npcs.controllers.ScriptHookController;
import noppes.npcs.janino.EventJaninoScript;
import org.apache.commons.lang3.StringUtils;
import java.io.IOException;
@@ -161,6 +162,11 @@ public class ForgeDataScript extends MultiScriptHandler {
ForgeScriptPacket.Save(index, totalCount, nbt);
}
@Override
public IScriptUnit createJaninoScriptUnit() {
return new EventJaninoScript(ScriptContext.FORGE);
}
@Override
public boolean isClient() {
return false;
@@ -8,6 +8,7 @@ import noppes.npcs.api.entity.ICustomNpc;
import noppes.npcs.constants.ScriptContext;
import noppes.npcs.controllers.ScriptController;
import noppes.npcs.entity.EntityNPCInterface;
import noppes.npcs.janino.EventJaninoScript;
import noppes.npcs.scripted.NpcAPI;
import noppes.npcs.util.ScriptToStringHelper;
@@ -47,6 +48,11 @@ public class GlobalNPCDataScript extends MultiScriptHandler {
lastNpcUpdate = ScriptController.Instance.lastGlobalNpcUpdate;
}
@Override
public IScriptUnit createJaninoScriptUnit() {
return new EventJaninoScript(ScriptContext.NPC);
}
@Override
public void requestData() {
GlobalNPCScriptPacket.Get();
@@ -167,6 +167,12 @@ public class PlayerDataScript extends MultiScriptHandler {
return ScriptController.Instance.playerScripts.scriptLanguage;
}
@Override
public void setLanguage(String lang) {
ScriptController.Instance.playerScripts.scriptLanguage = lang;
this.scriptLanguage = lang;
}
@Override
public String noticeString() {
if (this.player == null) {