Enhance ability selection and display: add toggleable ability handling, improve ability name color coding, and update ability selection messaging

This commit is contained in:
Kam committed 2026-02-15 19:21:30 -05:00
1 parent 45d05b9157
commit ce24c0a4ff
7 files changed
+86 -16

No files matched your search

@@ -306,8 +306,8 @@ public class AbilityCommand extends CommandKamkeelBase {
}
/**
* Get list of player-usable ability keys (for tab completion).
* Uses registry keys for built-in abilities (no spaces) and UUIDs for custom.
* Get list of player-usable ability names (for tab completion).
* Uses registry keys for built-in abilities and display names for custom abilities.
* Used by CommandKamkeel for <ability> usage token.
*/
public static List<String> getPlayerAbilityNames() {
@@ -304,7 +304,13 @@ public class AbilityController implements IAbilityHandler {
keys.add(id);
}
}
keys.addAll(customAbilities.keySet());
// Use ability names for custom abilities (instead of UUIDs) for readable tab completion
for (Ability ability : customAbilities.values()) {
String name = ability.getName();
if (name != null && !name.isEmpty()) {
keys.add(name);
}
}
return keys;
}
@@ -318,9 +324,13 @@ public class AbilityController implements IAbilityHandler {
}
}
}
for (Map.Entry<String, Ability> entry : customAbilities.entrySet()) {
if (entry.getValue().getAllowedBy().allowsPlayer()) {
keys.add(entry.getKey());
// Use ability names for custom abilities (instead of UUIDs) for readable tab completion
for (Ability ability : customAbilities.values()) {
if (ability.getAllowedBy().allowsPlayer()) {
String name = ability.getName();
if (name != null && !name.isEmpty()) {
keys.add(name);
}
}
}
return keys;
@@ -14,6 +14,9 @@ public class AbilitySlot {
private Ability inlineAbility;
private String referenceId;
/** Per-slot enabled override for reference slots (null = use master's default). */
private Boolean enabledOverride;
private transient Ability cachedAbility;
private transient int cachedVersion = -1;
@@ -67,10 +70,32 @@ public class AbilitySlot {
}
cachedAbility = controller.resolveAbility(referenceId);
// Apply per-slot enabled override so NPC-specific enable/disable persists
if (cachedAbility != null && enabledOverride != null) {
cachedAbility.setEnabled(enabledOverride);
}
cachedVersion = currentVersion;
return cachedAbility;
}
/**
* Set the per-slot enabled override for reference slots.
* For inline slots, delegates directly to the ability.
*/
public void setEnabled(boolean enabled) {
if (!isReference()) {
if (inlineAbility != null) {
inlineAbility.setEnabled(enabled);
}
} else {
this.enabledOverride = enabled;
// Also update the cached ability immediately if present
if (cachedAbility != null) {
cachedAbility.setEnabled(enabled);
}
}
}
/**
* Get the inline ability directly (null for reference slots).
*/
@@ -104,6 +129,9 @@ public class AbilitySlot {
if (isReference()) {
NBTTagCompound nbt = new NBTTagCompound();
nbt.setString("Reference", referenceId);
if (enabledOverride != null) {
nbt.setBoolean("RefEnabled", enabledOverride);
}
return nbt;
}
return inlineAbility != null ? inlineAbility.writeNBT() : new NBTTagCompound();
@@ -113,7 +141,11 @@ public class AbilitySlot {
if (nbt == null) return null;
if (nbt.hasKey("Reference")) {
return reference(nbt.getString("Reference"));
AbilitySlot slot = reference(nbt.getString("Reference"));
if (nbt.hasKey("RefEnabled")) {
slot.enabledOverride = nbt.getBoolean("RefEnabled");
}
return slot;
}
// Inline ability
@@ -696,6 +696,7 @@ public class EntityAbilityBeam extends EntityAbilityProjectile {
// Read trail points (relative to origin)
trailPoints.clear();
trailPointAges.clear();
if (nbt.hasKey("Trail")) {
NBTTagList trailList = nbt.getTagList("Trail", 10);
for (int i = 0; i < trailList.tagCount(); i++) {
@@ -707,6 +708,18 @@ public class EntityAbilityBeam extends EntityAbilityProjectile {
));
}
}
// Read trail point ages (must match trailPoints size for fading trail)
if (nbt.hasKey("TrailAges")) {
int[] ages = nbt.getIntArray("TrailAges");
for (int age : ages) {
trailPointAges.add(age);
}
}
// If trail points exist but ages don't (legacy data), initialize ages to 0
while (trailPointAges.size() < trailPoints.size()) {
trailPointAges.add(0);
}
}
@Override
@@ -733,5 +746,12 @@ public class EntityAbilityBeam extends EntityAbilityProjectile {
trailList.appendTag(pointNbt);
}
nbt.setTag("Trail", trailList);
// Write trail point ages for fading trail sync
int[] ages = new int[trailPointAges.size()];
for (int i = 0; i < trailPointAges.size(); i++) {
ages[i] = trailPointAges.get(i);
}
nbt.setIntArray("TrailAges", ages);
}
}
@@ -896,10 +896,10 @@ public abstract class EntityAbilityProjectile extends Entity implements IEnergyP
this.motionY = nbt.getDouble("MotionY");
this.motionZ = nbt.getDouble("MotionZ");
if (this.worldObj != null && this.worldObj.isRemote) {
this.renderCurrentSize = this.size;
this.prevRenderSize = this.size;
}
// Always initialize render size from NBT size so entities
// loading in from outside render distance render correctly
this.renderCurrentSize = this.size;
this.prevRenderSize = this.size;
anchorData.readNBT(nbt);
combatData.readNBT(nbt);
@@ -965,7 +965,9 @@ public abstract class EntityAbilityProjectile extends Entity implements IEnergyP
NBTTagCompound compound = new NBTTagCompound();
this.writeEntityToNBT(compound);
cpw.mods.fml.common.network.ByteBufUtils.writeTag(buffer, compound);
} catch (Exception ignored) {}
} catch (Exception e) {
noppes.npcs.LogWriter.error("Error writing ability projectile spawn data", e);
}
}
@Override
@@ -975,7 +977,9 @@ public abstract class EntityAbilityProjectile extends Entity implements IEnergyP
if (compound != null) {
this.readEntityFromNBT(compound);
}
} catch (Exception ignored) {}
} catch (Exception e) {
noppes.npcs.LogWriter.error("Error reading ability projectile spawn data", e);
}
}
// ==================== COLLISION SETTINGS ====================
@@ -63,7 +63,9 @@ public class ClientTickHandler {
if (event.phase == Phase.START) {
EntityPlayer player = mc.thePlayer;
if (player != null) {
boolean specialKeyDown = ClientProxy.SpecialKey != null && Keyboard.isKeyDown(ClientProxy.SpecialKey.getKeyCode());
// Only process special key when no GUI screen is open
boolean specialKeyDown = mc.currentScreen == null
&& ClientProxy.SpecialKey != null && Keyboard.isKeyDown(ClientProxy.SpecialKey.getKeyCode());
if (specialKeyDown != lastSpecialKeyDown) {
PlayerData data = CustomNpcs.proxy.getPlayerData(player);
if (data != null) {
@@ -317,9 +317,11 @@ public class GuiNPCAbilities extends GuiNPCInterface2 implements IScrollData, IC
// Toggle selected ability on/off
if (id == 77) {
if (selectedAbilityIndex >= 0 && selectedAbilityIndex < npcSlots.size()) {
Ability ability = npcSlots.get(selectedAbilityIndex).getAbility();
AbilitySlot slot = npcSlots.get(selectedAbilityIndex);
Ability ability = slot.getAbility();
if (ability != null) {
ability.setEnabled(((GuiNpcButton) guibutton).getValue() == 1);
boolean enabled = ((GuiNpcButton) guibutton).getValue() == 1;
slot.setEnabled(enabled);
updateNpcAbilitiesList();
selectAbilityByIndex(selectedAbilityIndex);
initGui();