From 0484596a91c7e5d6f01f7ede189b5e151de4e630 Mon Sep 17 00:00:00 2001 From: Vidal Date: Tue, 27 Jan 2026 01:51:49 -0300 Subject: [PATCH] Updated imports and fields --- .../data/ability/AbilityAnimation.java | 28 +++++++++---------- .../data/ability/AbilityController.java | 2 -- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityAnimation.java b/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityAnimation.java index cb27dcd3f..4b7f2ba3e 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityAnimation.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityAnimation.java @@ -14,39 +14,39 @@ import java.util.HashMap; import static kamkeel.npcs.controllers.data.ability.AbilityPhase.*; public enum AbilityAnimation {; - private final HashMap animations = new HashMap<>(); + private final HashMap animationNames = new HashMap<>(); AbilityAnimation(String idle, String windUp, String active, String recovery) { - animations.put(IDLE, idle); - animations.put(WINDUP, windUp); - animations.put(ACTIVE, active); - animations.put(RECOVERY, recovery); + animationNames.put(IDLE, idle); + animationNames.put(WINDUP, windUp); + animationNames.put(ACTIVE, active); + animationNames.put(RECOVERY, recovery); } AbilityAnimation(String idle, String windUp, String active) { - animations.put(IDLE, idle); - animations.put(WINDUP, windUp); - animations.put(ACTIVE, active); + animationNames.put(IDLE, idle); + animationNames.put(WINDUP, windUp); + animationNames.put(ACTIVE, active); } AbilityAnimation(String windUp, String active) { - animations.put(WINDUP, windUp); - animations.put(ACTIVE, active); + animationNames.put(WINDUP, windUp); + animationNames.put(ACTIVE, active); } AbilityAnimation(String anim, AbilityPhase phase) { - animations.put(phase, anim); + animationNames.put(phase, anim); } public String fileName(AbilityPhase phase) { - return animations.get(phase); + return animationNames.get(phase); } public File getFile(AbilityPhase phase) { - if (animations.get(phase).isEmpty() || animations.get(phase).equals("N/A")) + if (animationNames.get(phase).isEmpty() || animationNames.get(phase).equals("N/A")) return null; - return getFileFromName(animations.get(phase)); + return getFileFromName(animationNames.get(phase)); } public IAnimation getAnimation(AbilityPhase phase) { diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityController.java b/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityController.java index 0b88f1a42..a61df06fa 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityController.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityController.java @@ -22,8 +22,6 @@ import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; import noppes.npcs.api.handler.IAbilityHandler; -import noppes.npcs.api.handler.data.IAnimation; -import noppes.npcs.controllers.data.Animation; import noppes.npcs.util.NBTJsonUtil; import java.io.File;