mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-18 05:45:03 +00:00
Refactor ability handling: replace damage handler with ability extenders for improved lifecycle management and damage routing
This commit is contained in:
1 parent
f8c75dd79b
commit
0f774a68fc
7 files changed
+184
-53
No files matched your search
@@ -2,6 +2,7 @@ package kamkeel.npcs.controllers.data.ability;
|
||||
|
||||
import kamkeel.npcs.controllers.data.ability.type.*;
|
||||
import kamkeel.npcs.controllers.SyncController;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import noppes.npcs.CustomNpcs;
|
||||
import noppes.npcs.LogWriter;
|
||||
@@ -24,7 +25,7 @@ public class AbilityController implements IAbilityHandler {
|
||||
// ── Extension Points ─────────────────────────────────────────────────────
|
||||
private final Map<String, List<AbilityVariant>> externalVariants = new LinkedHashMap<>();
|
||||
private final List<IAbilityFieldProvider> fieldProviders = new ArrayList<>();
|
||||
private IAbilityDamageHandler damageHandler = null;
|
||||
private final List<IAbilityExtender> extenders = new ArrayList<>();
|
||||
|
||||
// ── Derived State ────────────────────────────────────────────────────────
|
||||
private final Set<String> builtInTypeIds = new HashSet<>();
|
||||
@@ -350,14 +351,6 @@ public class AbilityController implements IAbilityHandler {
|
||||
return result;
|
||||
}
|
||||
|
||||
public void registerDamageHandler(IAbilityDamageHandler handler) {
|
||||
this.damageHandler = handler;
|
||||
}
|
||||
|
||||
public IAbilityDamageHandler getDamageHandler() {
|
||||
return damageHandler;
|
||||
}
|
||||
|
||||
public void registerFieldProvider(IAbilityFieldProvider provider) {
|
||||
fieldProviders.add(provider);
|
||||
}
|
||||
@@ -366,6 +359,64 @@ public class AbilityController implements IAbilityHandler {
|
||||
return fieldProviders;
|
||||
}
|
||||
|
||||
public void registerExtender(IAbilityExtender extender) {
|
||||
extenders.add(extender);
|
||||
}
|
||||
|
||||
public List<IAbilityExtender> getExtenders() {
|
||||
return extenders;
|
||||
}
|
||||
|
||||
/**
|
||||
* Fire onAbilityStart on all extenders. Returns false if ANY extender cancels.
|
||||
*/
|
||||
public boolean fireOnAbilityStart(Ability ability, EntityLivingBase caster, EntityLivingBase target) {
|
||||
for (IAbilityExtender ext : extenders) {
|
||||
if (!ext.onAbilityStart(ability, caster, target)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Fire onAbilityTick on all extenders. Returns false if ANY extender says to interrupt.
|
||||
*/
|
||||
public boolean fireOnAbilityTick(Ability ability, EntityLivingBase caster, EntityLivingBase target,
|
||||
AbilityPhase phase, int tick) {
|
||||
for (IAbilityExtender ext : extenders) {
|
||||
if (!ext.onAbilityTick(ability, caster, target, phase, tick)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Fire onAbilityComplete on all extenders.
|
||||
*/
|
||||
public void fireOnAbilityComplete(Ability ability, EntityLivingBase caster, EntityLivingBase target,
|
||||
boolean interrupted) {
|
||||
for (IAbilityExtender ext : extenders) {
|
||||
ext.onAbilityComplete(ability, caster, target, interrupted);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Fire onAbilityDamage on all extenders. Chain of responsibility — first true wins.
|
||||
*/
|
||||
public boolean fireOnAbilityDamage(Ability ability, EntityLivingBase caster, EntityLivingBase target,
|
||||
float damage, float knockback, float knockbackUp,
|
||||
double knockbackDirX, double knockbackDirZ) {
|
||||
for (IAbilityExtender ext : extenders) {
|
||||
if (ext.onAbilityDamage(ability, caster, target, damage, knockback, knockbackUp,
|
||||
knockbackDirX, knockbackDirZ)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
// ═══════════════════════════════════════════════════════════════════════════
|
||||
// IAbilityHandler
|
||||
// ═══════════════════════════════════════════════════════════════════════════
|
||||
|
||||
Reference in new issue
Block a user