Add Chained Abilities

This commit is contained in:
Kam committed 2026-02-18 04:02:51 -05:00
1 parent 0311dc5806
commit 0512588a7a
51 files changed
+2955 -800

No files matched your search

@@ -1,7 +1,7 @@
package noppes.npcs.scripted.wrapper;
import kamkeel.npcs.controllers.data.ability.Ability;
import kamkeel.npcs.controllers.data.ability.AbilityController;
import kamkeel.npcs.controllers.AbilityController;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.api.ability.IAbility;
import noppes.npcs.api.ability.IPlayerAbilityData;
@@ -43,12 +43,14 @@ public class ScriptPlayerAbilityData implements IPlayerAbilityData {
@Override
public void lockAbility(String key) {
data.lockAbility(key);
String canonicalKey = resolveCanonicalKey(key);
data.lockAbility(canonicalKey);
}
@Override
public boolean hasUnlockedAbility(String key) {
return data.hasUnlockedAbility(key);
String canonicalKey = resolveCanonicalKey(key);
return data.hasUnlockedAbility(canonicalKey);
}
@Override
@@ -131,4 +133,16 @@ public class ScriptPlayerAbilityData implements IPlayerAbilityData {
if (player == null) return false;
return data.activateAbility(player, key);
}
/**
* Resolve a user-provided key to the canonical storage key.
* Uses the same resolution as unlockAbility: registry key for built-in, UUID for custom.
*/
private String resolveCanonicalKey(String key) {
Ability ability = AbilityController.Instance.resolveAbility(key);
if (ability != null && ability.getId() != null) {
return ability.getId();
}
return key;
}
}