From 7712b21faaef9a88572640110a996b687b7eb4ca Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 9 Mar 2026 01:21:39 -0400 Subject: [PATCH] Fix Instance Scripts --- .../npcs/controllers/data/ability/Ability.java | 4 ++-- .../controllers/data/ability/data/ChainedAbility.java | 4 ++-- src/main/java/noppes/npcs/config/ConfigClient.java | 2 +- .../java/noppes/npcs/controllers/ScriptContainer.java | 3 ++- .../npcs/controllers/data/ChainedAbilityScript.java | 6 ++++++ .../noppes/npcs/controllers/data/IScriptUnit.java | 11 +++++++++++ src/main/java/noppes/npcs/janino/JaninoScript.java | 10 ++++++++++ 7 files changed, 34 insertions(+), 6 deletions(-) diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/Ability.java b/src/main/java/kamkeel/npcs/controllers/data/ability/Ability.java index 002c03511..05049d8bb 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/Ability.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/Ability.java @@ -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; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/data/ChainedAbility.java b/src/main/java/kamkeel/npcs/controllers/data/ability/data/ChainedAbility.java index ccceb7cd4..bdf95508f 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/data/ChainedAbility.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/data/ChainedAbility.java @@ -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; diff --git a/src/main/java/noppes/npcs/config/ConfigClient.java b/src/main/java/noppes/npcs/config/ConfigClient.java index 14afc1548..ea87eeaf9 100644 --- a/src/main/java/noppes/npcs/config/ConfigClient.java +++ b/src/main/java/noppes/npcs/config/ConfigClient.java @@ -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, diff --git a/src/main/java/noppes/npcs/controllers/ScriptContainer.java b/src/main/java/noppes/npcs/controllers/ScriptContainer.java index e8dbe22b1..57c0a0ca1 100644 --- a/src/main/java/noppes/npcs/controllers/ScriptContainer.java +++ b/src/main/java/noppes/npcs/controllers/ScriptContainer.java @@ -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()); } diff --git a/src/main/java/noppes/npcs/controllers/data/ChainedAbilityScript.java b/src/main/java/noppes/npcs/controllers/data/ChainedAbilityScript.java index e15b05d10..eee2308c8 100644 --- a/src/main/java/noppes/npcs/controllers/data/ChainedAbilityScript.java +++ b/src/main/java/noppes/npcs/controllers/data/ChainedAbilityScript.java @@ -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; diff --git a/src/main/java/noppes/npcs/controllers/data/IScriptUnit.java b/src/main/java/noppes/npcs/controllers/data/IScriptUnit.java index b439d7d0a..2e4b25bad 100644 --- a/src/main/java/noppes/npcs/controllers/data/IScriptUnit.java +++ b/src/main/java/noppes/npcs/controllers/data/IScriptUnit.java @@ -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 ==================== /** diff --git a/src/main/java/noppes/npcs/janino/JaninoScript.java b/src/main/java/noppes/npcs/janino/JaninoScript.java index 2afe8052f..453fb16be 100644 --- a/src/main/java/noppes/npcs/janino/JaninoScript.java +++ b/src/main/java/noppes/npcs/janino/JaninoScript.java @@ -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 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 ====================