mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-19 04:59:05 +00:00
Merge branch 'dev' into syntax-highlighter-unified
This commit is contained in:
commit
45cda3cc90
13 files changed
+167
-25
No files matched your search
@@ -57,6 +57,16 @@ public class ConfigClient {
|
||||
public static Property LowResExplosionProperty;
|
||||
public static boolean LowResExplosion = false;
|
||||
|
||||
// Proximity Alpha (owner-only fade for energy projectiles near camera)
|
||||
public static Property ProximityAlphaMinProperty;
|
||||
public static float ProximityAlphaMin = 0.15f;
|
||||
|
||||
public static Property ProximityAlphaDistanceProperty;
|
||||
public static float ProximityAlphaDistance = 10.0f;
|
||||
|
||||
public static Property ProximityAlphaAgeTicksProperty;
|
||||
public static int ProximityAlphaAgeTicks = 60;
|
||||
|
||||
/**
|
||||
* Questing Properties
|
||||
**/
|
||||
@@ -291,6 +301,30 @@ public class ConfigClient {
|
||||
);
|
||||
LowResExplosion = LowResExplosionProperty.getBoolean(false);
|
||||
|
||||
ProximityAlphaMinProperty = config.get(
|
||||
RENDERING,
|
||||
"Proximity Alpha Min",
|
||||
0.15,
|
||||
"Minimum alpha for owner's energy projectiles when very close to camera. Set to 1.0 to disable proximity fade."
|
||||
);
|
||||
ProximityAlphaMin = (float) Math.max(0.0, Math.min(1.0, ProximityAlphaMinProperty.getDouble(0.15)));
|
||||
|
||||
ProximityAlphaDistanceProperty = config.get(
|
||||
RENDERING,
|
||||
"Proximity Alpha Distance",
|
||||
7.0,
|
||||
"Distance in blocks at which owner's energy projectiles reach full alpha."
|
||||
);
|
||||
ProximityAlphaDistance = (float) Math.max(1.0, ProximityAlphaDistanceProperty.getDouble(10.0));
|
||||
|
||||
ProximityAlphaAgeTicksProperty = config.get(
|
||||
RENDERING,
|
||||
"Proximity Alpha Age Ticks",
|
||||
60,
|
||||
"After this many ticks alive, proximity alpha fade is disabled (projectile always renders at full alpha). Does not apply while charging or to attached beams/lasers."
|
||||
);
|
||||
ProximityAlphaAgeTicks = Math.max(0, ProximityAlphaAgeTicksProperty.getInt(60));
|
||||
|
||||
DialogSpeedProperty = config.get(VISUAL, "Dialog Speed", true, "Only set for gradual dialogs");
|
||||
DialogSpeed = DialogSpeedProperty.getInt(10);
|
||||
|
||||
|
||||
@@ -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;
|
||||
@@ -118,6 +119,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 ====================
|
||||
|
||||
|
||||
Reference in new issue
Block a user