diff --git a/src/api b/src/api index db6a68e43..bf650319d 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit db6a68e43073b2828ec05a3c2ede660453c4544e +Subproject commit bf650319da422790bff294d570dd879143fe8d4c diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/BuiltInAbility.java b/src/main/java/kamkeel/npcs/controllers/data/ability/BuiltInAbility.java index 69151291f..904fad0b9 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/BuiltInAbility.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/BuiltInAbility.java @@ -31,14 +31,6 @@ public abstract class BuiltInAbility extends Ability { return registryKey; } - /** - * Built-in abilities are not customizable. - */ - @Override - public boolean isCustomizable() { - return false; - } - /** * Built-in abilities do not write type-specific NBT (they have fixed configs). */ diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java index 26f7a1ba7..f534f9dbc 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java @@ -5,6 +5,7 @@ import net.minecraft.item.ItemStack; import noppes.npcs.NoppesUtilServer; import noppes.npcs.api.IPos; import noppes.npcs.api.ITimers; +import noppes.npcs.api.ability.IDataAbilities; import noppes.npcs.api.entity.ICustomNpc; import noppes.npcs.api.entity.IEntityLivingBase; import noppes.npcs.api.entity.IPlayer; @@ -51,6 +52,7 @@ import noppes.npcs.scripted.roles.ScriptRoleInterface; import noppes.npcs.scripted.roles.ScriptRoleMailman; import noppes.npcs.scripted.roles.ScriptRoleTrader; import noppes.npcs.scripted.roles.ScriptRoleTransporter; +import noppes.npcs.scripted.wrapper.ScriptDataAbilities; import noppes.npcs.util.ValueUtil; import java.util.ArrayList; @@ -1458,7 +1460,7 @@ public class ScriptNpc extends ScriptLiving imp return npc.stats.magicData; } - public noppes.npcs.api.ability.IDataAbilities getAbilityData() { - return new noppes.npcs.scripted.wrapper.ScriptDataAbilities(npc); + public IDataAbilities getAbilityData() { + return new ScriptDataAbilities(npc); } }