Fix Instance Scripts

This commit is contained in:
Kam committed 2026-03-09 01:21:39 -04:00
1 parent 42e27a873b
commit 7712b21faa
7 files changed
+34 -6

No files matched your search

@@ -46,7 +46,7 @@ import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig;
import noppes.npcs.client.gui.builder.FieldDef;
import noppes.npcs.client.gui.util.IAbilityConfigCallback;
import noppes.npcs.controllers.AnimationController;
import noppes.npcs.controllers.ScriptContainer;
import noppes.npcs.controllers.data.IScriptUnit;
import noppes.npcs.controllers.TagController;
import noppes.npcs.controllers.data.Animation;
import noppes.npcs.controllers.data.Frame;
@@ -2910,7 +2910,7 @@ public abstract class Ability implements IAbility, IAbilityAction {
instanceScript.setLanguage(template.getLanguage());
instanceScript.setEnabled(true);
ScriptContainer clone = ((ScriptContainer) template.container).createInstanceScope(instanceScript);
IScriptUnit clone = template.container.createInstanceScope(instanceScript);
instanceScript.addScriptUnit(clone);
return instanceScript;
@@ -10,7 +10,7 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import noppes.npcs.api.ability.IChainedAbility;
import noppes.npcs.controllers.ScriptContainer;
import noppes.npcs.controllers.data.IScriptUnit;
import kamkeel.npcs.util.FileNameHelper;
import java.util.ArrayList;
@@ -516,7 +516,7 @@ public class ChainedAbility implements IChainedAbility, IAbilityAction {
instanceScript.setLanguage(template.getLanguage());
instanceScript.setEnabled(true);
ScriptContainer clone = ((ScriptContainer) template.container).createInstanceScope(instanceScript);
IScriptUnit clone = template.container.createInstanceScope(instanceScript);
instanceScript.addScriptUnit(clone);
return instanceScript;
@@ -315,7 +315,7 @@ public class ConfigClient {
7.0,
"Distance in blocks at which owner's energy projectiles reach full alpha."
);
ProximityAlphaDistance = (float) Math.max(1.0, ProximityAlphaDistanceProperty.getDouble(7.0));
ProximityAlphaDistance = (float) Math.max(1.0, ProximityAlphaDistanceProperty.getDouble(10.0));
ProximityAlphaAgeTicksProperty = config.get(
RENDERING,
@@ -71,7 +71,8 @@ public class ScriptContainer implements IScriptUnit {
*
* @param instanceHandler the script handler for the instance
*/
public ScriptContainer createInstanceScope(IScriptHandler instanceHandler) {
@Override
public IScriptUnit createInstanceScope(IScriptHandler instanceHandler) {
if (this.engine == null) {
this.setEngine(this.getLanguage());
}
@@ -3,6 +3,7 @@ package noppes.npcs.controllers.data;
import kamkeel.npcs.network.packets.request.script.ChainedAbilityScriptPacket;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.constants.ScriptContext;
import noppes.npcs.janino.EventJaninoScript;
/**
* Script handler for chained ability scripts.
@@ -30,6 +31,11 @@ public class ChainedAbilityScript extends SingleScriptHandler implements IScript
this.chainId = chainId != null ? chainId : "";
}
@Override
public IScriptUnit createJaninoScriptUnit() {
return new EventJaninoScript(ScriptContext.CHAINED_ABILITY);
}
@Override
public ScriptContext getContext() {
return ScriptContext.CHAINED_ABILITY;
@@ -157,6 +157,17 @@ public interface IScriptUnit {
*/
void setErrored(boolean errored);
// ==================== INSTANCE SCOPE ====================
/**
* Create an instance-scoped copy of this script unit for isolated execution.
* The instance shares compiled code with the template but has isolated state.
*
* @param instanceHandler the script handler for the new instance
* @return a new IScriptUnit with isolated variable state
*/
IScriptUnit createInstanceScope(IScriptHandler instanceHandler);
// ==================== EXECUTION ====================
/**
@@ -11,6 +11,7 @@ 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.IScriptHandler;
import noppes.npcs.controllers.data.IScriptUnit;
import noppes.npcs.janino.annotations.ParamName;
import org.codehaus.commons.compiler.InternalCompilerException;
@@ -123,6 +124,15 @@ public abstract class JaninoScript<T> implements IScriptUnit {
public void unload() {
}
@Override
public IScriptUnit createInstanceScope(IScriptHandler instanceHandler) {
IScriptUnit instance = instanceHandler.createJaninoScriptUnit();
if (instance == null) return null;
instance.setScript(this.script);
instance.setExternalScripts(new ArrayList<>(this.externalScripts));
return instance;
}
// ==================== COMPILATION ====================