mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-17 19:15:11 +00:00
Event Janino Script
This commit is contained in:
1 parent
9c9bcc8228
commit
0f1a6028f3
6 files changed
+20
-47
No files matched your search
@@ -21,7 +21,7 @@ import noppes.npcs.constants.ScriptContext;
|
||||
import noppes.npcs.controllers.ScriptContainer;
|
||||
import noppes.npcs.controllers.ScriptController;
|
||||
import noppes.npcs.entity.EntityNPCInterface;
|
||||
import noppes.npcs.janino.impl.JaninoNpcScript;
|
||||
import noppes.npcs.janino.EventJaninoScript;
|
||||
import noppes.npcs.scripted.NpcAPI;
|
||||
import noppes.npcs.scripted.ScriptWorld;
|
||||
import noppes.npcs.scripted.constants.EntityType;
|
||||
@@ -314,6 +314,6 @@ public class DataScript implements IScriptHandlerPacket {
|
||||
}
|
||||
@Override
|
||||
public IScriptUnit createJaninoScriptUnit() {
|
||||
return new JaninoNpcScript();
|
||||
return new EventJaninoScript(ScriptContext.NPC);
|
||||
}
|
||||
}
|
||||
@@ -13,7 +13,7 @@ import noppes.npcs.constants.EnumScriptType;
|
||||
import noppes.npcs.constants.ScriptContext;
|
||||
import noppes.npcs.controllers.ScriptContainer;
|
||||
import noppes.npcs.controllers.ScriptController;
|
||||
import noppes.npcs.janino.impl.JaninoPlayerScript;
|
||||
import noppes.npcs.janino.EventJaninoScript;
|
||||
import noppes.npcs.scripted.NpcAPI;
|
||||
import noppes.npcs.scripted.event.player.PlayerEvent;
|
||||
import noppes.npcs.util.ScriptToStringHelper;
|
||||
@@ -201,6 +201,6 @@ public class PlayerDataScript extends MultiScriptHandler {
|
||||
|
||||
@Override
|
||||
public IScriptUnit createJaninoScriptUnit() {
|
||||
return new JaninoPlayerScript();
|
||||
return new EventJaninoScript(ScriptContext.PLAYER);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package noppes.npcs.janino;
|
||||
|
||||
import noppes.npcs.constants.ScriptContext;
|
||||
|
||||
public class EventJaninoScript extends JaninoScript<Object> {
|
||||
|
||||
public EventJaninoScript(ScriptContext context) {
|
||||
super(Object.class, null, false);
|
||||
this.context = context;
|
||||
}
|
||||
}
|
||||
@@ -9,6 +9,7 @@ import noppes.npcs.NBTTags;
|
||||
import noppes.npcs.api.handler.IHookDefinition;
|
||||
import noppes.npcs.config.ConfigScript;
|
||||
import noppes.npcs.constants.EnumScriptType;
|
||||
import noppes.npcs.constants.ScriptContext;
|
||||
import noppes.npcs.controllers.ScriptController;
|
||||
import noppes.npcs.controllers.ScriptHookController;
|
||||
import noppes.npcs.controllers.data.IScriptUnit;
|
||||
@@ -23,6 +24,7 @@ import java.util.function.Supplier;
|
||||
|
||||
public abstract class JaninoScript<T> implements IScriptUnit {
|
||||
|
||||
public ScriptContext context = ScriptContext.GLOBAL;
|
||||
public boolean errored = false;
|
||||
public String script = "";
|
||||
public List<String> externalScripts = new ArrayList<>();
|
||||
@@ -59,7 +61,9 @@ public abstract class JaninoScript<T> implements IScriptUnit {
|
||||
this(type, defaultImports, false);
|
||||
}
|
||||
|
||||
protected abstract String getHookContext();
|
||||
protected String getHookContext(){
|
||||
return this.context.hookContext;
|
||||
}
|
||||
|
||||
// ==================== COMPILATION ====================
|
||||
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
package noppes.npcs.janino.impl;
|
||||
|
||||
import noppes.npcs.janino.JaninoScript;
|
||||
|
||||
/**
|
||||
* Janino (Java) script implementation for NPC events.
|
||||
* Hook methods are resolved dynamically by name - no interface definition required.
|
||||
*/
|
||||
public class JaninoNpcScript extends JaninoScript<JaninoNpcScript.Functions> {
|
||||
|
||||
public JaninoNpcScript() {
|
||||
super(Functions.class, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getHookContext() {
|
||||
return "npc";
|
||||
}
|
||||
|
||||
public interface Functions {}
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
package noppes.npcs.janino.impl;
|
||||
|
||||
import noppes.npcs.janino.JaninoScript;
|
||||
|
||||
/**
|
||||
* Janino (Java) script implementation for player events.
|
||||
* Hook methods are resolved dynamically by name - no interface definition required.
|
||||
*/
|
||||
public class JaninoPlayerScript extends JaninoScript<JaninoPlayerScript.Functions> {
|
||||
|
||||
public JaninoPlayerScript() {
|
||||
super(Functions.class, null, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getHookContext() {
|
||||
return "player";
|
||||
}
|
||||
|
||||
public interface Functions {}
|
||||
}
|
||||
Reference in new issue
Block a user