Large Ability changes, cleanup, langs, fixes.

This commit is contained in:
Kam committed 2026-01-10 23:06:13 -05:00
1 parent c7d04cb9d3
commit fdb2ff98d8
37 files changed
+517 -214

No files matched your search

@@ -12,9 +12,10 @@ import net.minecraft.nbt.NBTTagList;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import noppes.npcs.DataAbilities;
import noppes.npcs.NpcDamageSource;
import noppes.npcs.api.INbt;
import noppes.npcs.api.ability.IAbility;
import noppes.npcs.client.gui.advanced.IAbilityConfigCallback;
import noppes.npcs.client.gui.util.IAbilityConfigCallback;
import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig;
import noppes.npcs.entity.EntityNPCInterface;
import noppes.npcs.scripted.NpcAPI;
@@ -31,7 +32,7 @@ public abstract class Ability implements IAbility {
protected String id;
protected String name;
protected String typeId; // e.g., "cnpc:slam", "mymod:custom_ability"
protected String typeId; // e.g., "ability.cnpc.slam" (also used as lang key)
// Selection
protected int weight = 10;
@@ -136,7 +137,7 @@ public abstract class Ability implements IAbility {
// Apply damage
if (finalDamage > 0) {
hitEntity.attackEntityFrom(DamageSource.causeMobDamage(npc), finalDamage);
hitEntity.attackEntityFrom(new NpcDamageSource("mob", npc), finalDamage);
}
// Apply knockback if any
@@ -22,6 +22,7 @@ public class AbilityController implements IAbilityHandler {
public static AbilityController Instance;
private final Map<String, Supplier<Ability>> factories = new LinkedHashMap<>();
private final Map<String, Supplier<Ability>> factoriesByTypeId = new LinkedHashMap<>();
private final Map<String, Ability> savedAbilities = new LinkedHashMap<>();
public AbilityController() {
@@ -177,12 +178,13 @@ public class AbilityController implements IAbilityHandler {
@Override
public String[] getTypes() {
return factories.keySet().toArray(new String[0]);
// Return the ability typeIds (lang keys), not the factory keys
return factoriesByTypeId.keySet().toArray(new String[0]);
}
@Override
public boolean hasType(String typeId) {
return factories.containsKey(typeId);
return factories.containsKey(typeId) || factoriesByTypeId.containsKey(typeId);
}
@Override
@@ -208,14 +210,19 @@ public class AbilityController implements IAbilityHandler {
* Register a new ability type.
* Call during FMLInitializationEvent.
*
* @param typeId The unique type ID (e.g., "cnpc:slam", "mymod:custom_ability")
* @param factoryKey The factory key (e.g., "cnpc:slam", "mymod:custom_ability")
* @param factory Factory lambda that creates a new instance
*/
public void registerType(String typeId, Supplier<Ability> factory) {
if (factories.containsKey(typeId)) {
LogWriter.info("AbilityController: Overwriting existing ability type: " + typeId);
public void registerType(String factoryKey, Supplier<Ability> factory) {
if (factories.containsKey(factoryKey)) {
LogWriter.info("AbilityController: Overwriting existing ability type: " + factoryKey);
}
factories.put(typeId, factory);
factories.put(factoryKey, factory);
// Also register by the ability's actual typeId (lang key)
Ability temp = factory.get();
String abilityTypeId = temp.getTypeId();
factoriesByTypeId.put(abilityTypeId, factory);
}
/**
@@ -229,6 +236,10 @@ public class AbilityController implements IAbilityHandler {
String typeId = nbt.getString("typeId");
Supplier<Ability> factory = factories.get(typeId);
if (factory == null) {
// Try looking up by ability typeId (lang key)
factory = factoriesByTypeId.get(typeId);
}
if (factory == null) {
LogWriter.info("AbilityController: Unknown ability type: " + typeId);
return null;
@@ -241,15 +252,19 @@ public class AbilityController implements IAbilityHandler {
/**
* Create a new empty ability of the given type.
* @param factoryKey The factory key (e.g., "cnpc:slam") or the ability typeId (e.g., "ability.cnpc.slam")
*/
public Ability create(String typeId) {
Supplier<Ability> factory = factories.get(typeId);
public Ability create(String factoryKey) {
// Try direct lookup first (factory key)
Supplier<Ability> factory = factories.get(factoryKey);
if (factory == null) {
// Try looking up by ability typeId
factory = factoriesByTypeId.get(factoryKey);
}
if (factory == null) {
return null;
}
Ability ability = factory.get();
ability.typeId = typeId;
return ability;
return factory.get();
}
/**
@@ -4,7 +4,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import kamkeel.npcs.controllers.data.ability.Ability;
import noppes.npcs.client.gui.advanced.IAbilityConfigCallback;
import noppes.npcs.client.gui.util.IAbilityConfigCallback;
import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig;
import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityBeam;
import kamkeel.npcs.controllers.data.ability.TargetingMode;
@@ -45,7 +45,7 @@ public class AbilityBeam extends Ability {
private transient Set<Integer> hitThisTick = new HashSet<>();
public AbilityBeam() {
this.typeId = "cnpc:beam";
this.typeId = "ability.cnpc.beam";
this.name = "Beam";
this.targetingMode = TargetingMode.AGGRO_TARGET;
this.maxRange = 15.0f;
@@ -14,7 +14,7 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.DamageSource;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import noppes.npcs.client.gui.advanced.IAbilityConfigCallback;
import noppes.npcs.client.gui.util.IAbilityConfigCallback;
import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig;
import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityCharge;
import noppes.npcs.entity.EntityNPCInterface;
@@ -43,7 +43,7 @@ public class AbilityCharge extends Ability {
private transient float lockedYaw;
public AbilityCharge() {
this.typeId = "cnpc:charge";
this.typeId = "ability.cnpc.charge";
this.name = "Charge";
this.targetingMode = TargetingMode.AGGRO_TARGET;
this.maxRange = 20.0f;
@@ -12,7 +12,7 @@ import net.minecraft.potion.PotionEffect;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import noppes.npcs.client.gui.advanced.IAbilityConfigCallback;
import noppes.npcs.client.gui.util.IAbilityConfigCallback;
import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig;
import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityCutter;
import noppes.npcs.entity.EntityNPCInterface;
@@ -58,7 +58,7 @@ public class AbilityCutter extends Ability {
private transient float currentRotation = 0.0f;
public AbilityCutter() {
this.typeId = "cnpc:cutter";
this.typeId = "ability.cnpc.cutter";
this.name = "Cutter";
this.targetingMode = TargetingMode.AOE_SELF;
this.maxRange = 8.0f;
@@ -4,7 +4,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import kamkeel.npcs.controllers.data.ability.Ability;
import noppes.npcs.client.gui.advanced.IAbilityConfigCallback;
import noppes.npcs.client.gui.util.IAbilityConfigCallback;
import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig;
import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityDash;
import kamkeel.npcs.controllers.data.ability.TargetingMode;
@@ -82,7 +82,7 @@ public class AbilityDash extends Ability {
private transient DashDirection chosenDirection;
public AbilityDash() {
this.typeId = "cnpc:dash";
this.typeId = "ability.cnpc.dash";
this.name = "Dash";
this.targetingMode = TargetingMode.AGGRO_TARGET;
this.maxRange = 20.0f;
@@ -4,7 +4,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import kamkeel.npcs.controllers.data.ability.Ability;
import noppes.npcs.client.gui.advanced.IAbilityConfigCallback;
import noppes.npcs.client.gui.util.IAbilityConfigCallback;
import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig;
import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityGuard;
import kamkeel.npcs.controllers.data.ability.TargetingMode;
@@ -36,7 +36,7 @@ public class AbilityGuard extends Ability {
private transient boolean counterTriggered;
public AbilityGuard() {
this.typeId = "cnpc:guard";
this.typeId = "ability.cnpc.guard";
this.name = "Guard";
this.targetingMode = TargetingMode.SELF;
this.lockMovement = true;
@@ -4,7 +4,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import kamkeel.npcs.controllers.data.ability.Ability;
import noppes.npcs.client.gui.advanced.IAbilityConfigCallback;
import noppes.npcs.client.gui.util.IAbilityConfigCallback;
import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig;
import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityHazard;
import kamkeel.npcs.controllers.data.ability.TargetingMode;
@@ -77,7 +77,7 @@ public class AbilityHazard extends Ability {
private transient Set<Integer> damagedThisTick = new HashSet<>();
public AbilityHazard() {
this.typeId = "cnpc:hazard";
this.typeId = "ability.cnpc.hazard";
this.name = "Hazard";
this.targetingMode = TargetingMode.AGGRO_TARGET;
this.maxRange = 15.0f;
@@ -10,7 +10,7 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World;
import noppes.npcs.client.gui.advanced.IAbilityConfigCallback;
import noppes.npcs.client.gui.util.IAbilityConfigCallback;
import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig;
import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityHeal;
import noppes.npcs.entity.EntityNPCInterface;
@@ -36,7 +36,7 @@ public class AbilityHeal extends Ability {
private transient List<EntityLivingBase> healedAllies = new ArrayList<>();
public AbilityHeal() {
this.typeId = "cnpc:heal";
this.typeId = "ability.cnpc.heal";
this.name = "Heal";
this.targetingMode = TargetingMode.SELF;
this.lockMovement = true;
@@ -4,7 +4,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import kamkeel.npcs.controllers.data.ability.Ability;
import noppes.npcs.client.gui.advanced.IAbilityConfigCallback;
import noppes.npcs.client.gui.util.IAbilityConfigCallback;
import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig;
import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityHeavyHit;
import kamkeel.npcs.controllers.data.ability.TargetingMode;
@@ -28,7 +28,7 @@ public class AbilityHeavyHit extends Ability {
private int stunTicks = 40;
public AbilityHeavyHit() {
this.typeId = "cnpc:heavy_hit";
this.typeId = "ability.cnpc.heavy_hit";
this.name = "Heavy Hit";
this.targetingMode = TargetingMode.AGGRO_TARGET;
this.maxRange = 3.0f;
@@ -4,7 +4,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import kamkeel.npcs.controllers.data.ability.Ability;
import noppes.npcs.client.gui.advanced.IAbilityConfigCallback;
import noppes.npcs.client.gui.util.IAbilityConfigCallback;
import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig;
import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityOrb;
import kamkeel.npcs.controllers.data.ability.TargetingMode;
@@ -53,7 +53,7 @@ public class AbilityOrb extends Ability {
private transient int ticksAlive = 0;
public AbilityOrb() {
this.typeId = "cnpc:orb";
this.typeId = "ability.cnpc.orb";
this.name = "Orb";
this.targetingMode = TargetingMode.AGGRO_TARGET;
this.maxRange = 25.0f;
@@ -10,7 +10,7 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import noppes.npcs.client.gui.advanced.IAbilityConfigCallback;
import noppes.npcs.client.gui.util.IAbilityConfigCallback;
import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig;
import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityProjectile;
import noppes.npcs.entity.EntityNPCInterface;
@@ -34,7 +34,7 @@ public class AbilityProjectile extends Ability {
private float homingStrength = 0.1f;
public AbilityProjectile() {
this.typeId = "cnpc:projectile";
this.typeId = "ability.cnpc.projectile";
this.name = "Projectile";
this.targetingMode = TargetingMode.AGGRO_TARGET;
this.minRange = 5.0f;
@@ -12,7 +12,7 @@ import net.minecraft.potion.PotionEffect;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import noppes.npcs.client.gui.advanced.IAbilityConfigCallback;
import noppes.npcs.client.gui.util.IAbilityConfigCallback;
import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig;
import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityShockwave;
import noppes.npcs.entity.EntityNPCInterface;
@@ -37,7 +37,7 @@ public class AbilityShockwave extends Ability {
private transient boolean executed = false;
public AbilityShockwave() {
this.typeId = "cnpc:shockwave";
this.typeId = "ability.cnpc.shockwave";
this.name = "Shockwave";
this.targetingMode = TargetingMode.AOE_SELF;
this.maxRange = 15.0f;
@@ -13,7 +13,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.DamageSource;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import noppes.npcs.client.gui.advanced.IAbilityConfigCallback;
import noppes.npcs.client.gui.util.IAbilityConfigCallback;
import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig;
import noppes.npcs.client.gui.advanced.ability.SubGuiAbilitySlam;
import noppes.npcs.entity.EntityNPCInterface;
@@ -47,7 +47,7 @@ public class AbilitySlam extends Ability {
private transient int maxAirTicks = 60; // Timeout to prevent stuck in air
public AbilitySlam() {
this.typeId = "cnpc:slam";
this.typeId = "ability.cnpc.slam";
this.name = "Slam";
this.targetingMode = TargetingMode.AOE_SELF; // Can also be AOE_TARGET to leap to target
this.windUpTicks = 30;
@@ -127,6 +127,9 @@ public class AbilitySlam extends Ability {
hasLanded = false;
airTicks = 0;
// Reset fall distance to prevent fall damage during slam
npc.fallDistance = 0;
// Calculate and apply leap velocity
launchTowardTarget(npc);
}
@@ -230,6 +233,9 @@ public class AbilitySlam extends Ability {
airTicks++;
// Continuously reset fall distance during slam to prevent fall damage
npc.fallDistance = 0;
// Check for landing
if (npc.onGround && airTicks > 3) {
// Landed!
@@ -258,6 +264,9 @@ public class AbilitySlam extends Ability {
hasLanded = true;
npc.setNpcJumpingState(false);
// Reset fall distance to prevent fall damage on landing
npc.fallDistance = 0;
// Stop horizontal momentum
npc.motionX = 0;
npc.motionZ = 0;
@@ -415,9 +424,9 @@ public class AbilitySlam extends Ability {
@Override
public void readTypeNBT(NBTTagCompound nbt) {
damage = nbt.getFloat("damage");
radius = nbt.getFloat("radius");
knockbackStrength = nbt.getFloat("knockback");
damage = nbt.hasKey("damage") ? nbt.getFloat("damage") : 20.0f;
radius = nbt.hasKey("radius") ? nbt.getFloat("radius") : 5.0f;
knockbackStrength = nbt.hasKey("knockback") ? nbt.getFloat("knockback") : 1.5f;
leapSpeed = nbt.hasKey("leapSpeed") ? nbt.getFloat("leapSpeed") : 1.0f;
minLeapDistance = nbt.hasKey("minLeapDistance") ? nbt.getFloat("minLeapDistance") : 2.0f;
maxLeapDistance = nbt.hasKey("maxLeapDistance") ? nbt.getFloat("maxLeapDistance") : 15.0f;
@@ -4,7 +4,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import kamkeel.npcs.controllers.data.ability.Ability;
import noppes.npcs.client.gui.advanced.IAbilityConfigCallback;
import noppes.npcs.client.gui.util.IAbilityConfigCallback;
import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig;
import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityTeleport;
import kamkeel.npcs.controllers.data.ability.TargetingMode;
@@ -60,7 +60,7 @@ public class AbilityTeleport extends Ability {
private transient int ticksSinceLastBlink = 0;
public AbilityTeleport() {
this.typeId = "cnpc:teleport";
this.typeId = "ability.cnpc.teleport";
this.name = "Teleport";
this.targetingMode = TargetingMode.AGGRO_TARGET;
this.maxRange = 30.0f;
@@ -13,7 +13,7 @@ import net.minecraft.potion.PotionEffect;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import noppes.npcs.client.gui.advanced.IAbilityConfigCallback;
import noppes.npcs.client.gui.util.IAbilityConfigCallback;
import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig;
import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityTrap;
import noppes.npcs.entity.EntityNPCInterface;
@@ -68,7 +68,7 @@ public class AbilityTrap extends Ability {
private transient Set<UUID> triggeredEntities = new HashSet<>();
public AbilityTrap() {
this.typeId = "cnpc:trap";
this.typeId = "ability.cnpc.trap";
this.name = "Trap";
this.targetingMode = TargetingMode.AGGRO_TARGET;
this.maxRange = 15.0f;
@@ -4,7 +4,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import kamkeel.npcs.controllers.data.ability.Ability;
import noppes.npcs.client.gui.advanced.IAbilityConfigCallback;
import noppes.npcs.client.gui.util.IAbilityConfigCallback;
import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig;
import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityVortex;
import kamkeel.npcs.controllers.data.ability.TargetingMode;
@@ -47,7 +47,7 @@ public class AbilityVortex extends Ability {
private transient boolean pullComplete = false;
public AbilityVortex() {
this.typeId = "cnpc:vortex";
this.typeId = "ability.cnpc.vortex";
this.name = "Vortex";
this.targetingMode = TargetingMode.AOE_SELF;
this.maxRange = 15.0f;