Cleanup Damage Handling Logic for CNPC+ and DBC Addon for better readability / context. Added Magic Data Support to Abilities

This commit is contained in:
Kam committed 2026-03-03 14:55:50 -05:00
1 parent c3096b320e
commit d9f100d245
12 files changed
+604 -13

No files matched your search

@@ -12,6 +12,7 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import noppes.npcs.controllers.data.MagicData;
/**
* Universal base class for all energy ability entities (Projectiles, Barriers, Sweeper).
@@ -51,6 +52,9 @@ public abstract class EntityEnergyAbility extends Entity implements IEntityAddit
*/
protected NBTTagCompound customDamageData = null;
/** Magic data for this entity — defines magic types for outgoing damage or barrier defense. */
protected MagicData magicData = new MagicData();
protected boolean ignoreIFrames = false;
protected boolean previewMode = false;
protected EntityLivingBase previewOwner = null;
@@ -159,6 +163,14 @@ public abstract class EntityEnergyAbility extends Entity implements IEntityAddit
this.customDamageData = data;
}
public MagicData getMagicData() {
return magicData;
}
public void setMagicData(MagicData data) {
this.magicData = data != null ? data : new MagicData();
}
public boolean isIgnoreIFrames() {
return ignoreIFrames;
}
@@ -346,6 +358,7 @@ public abstract class EntityEnergyAbility extends Entity implements IEntityAddit
if (customDamageData != null) {
nbt.setTag("CustomDamageData", customDamageData);
}
magicData.writeToNBT(nbt);
}
/**
@@ -360,6 +373,7 @@ public abstract class EntityEnergyAbility extends Entity implements IEntityAddit
if (nbt.hasKey("CustomDamageData")) {
this.customDamageData = nbt.getCompoundTag("CustomDamageData");
}
magicData.readToNBT(nbt);
}
// ==================== SPAWN DATA ====================