From c6b2797b5de693e3ae73dc15b090fb24a0c6d44a Mon Sep 17 00:00:00 2001 From: Vidal Date: Tue, 17 Feb 2026 20:11:42 -0300 Subject: [PATCH] Attempt at implementing ability variants directly from the register --- src/main/java/kamkeel/npcs/util/Register.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/main/java/kamkeel/npcs/util/Register.java b/src/main/java/kamkeel/npcs/util/Register.java index 5e6a7ba7f..129692997 100644 --- a/src/main/java/kamkeel/npcs/util/Register.java +++ b/src/main/java/kamkeel/npcs/util/Register.java @@ -2,6 +2,7 @@ package kamkeel.npcs.util; import kamkeel.npcs.controllers.data.ability.Ability; import kamkeel.npcs.controllers.data.ability.AbilityController; +import kamkeel.npcs.controllers.data.ability.AbilityVariant; import noppes.npcs.LogWriter; import noppes.npcs.controllers.AnimationController; import noppes.npcs.controllers.data.Animation; @@ -36,6 +37,8 @@ public class Register { } public static class Abilities extends Register { + protected final Map> variantEntries = new LinkedHashMap<>(); + protected final Map variantNames = new LinkedHashMap<>(); protected final Map uniqueNames = new LinkedHashMap<>(); protected final Set typeOnly = new HashSet<>(); @@ -64,6 +67,13 @@ public class Register { return factory.get(); } + public AbilityVariant registerVariant(String variantName, Supplier variantFactory) { + String name = registryKey + "." + namespace + "." + variantName.trim().toLowerCase().replaceAll(" ", "_"); + variantEntries.put(name, variantFactory); + variantNames.put(name, variantName); + return variantFactory.get(); + } + public void register() { for (Map.Entry> entry : entries.entrySet()) { AbilityController.Instance.registerType(entry.getKey(), entry.getValue()); @@ -71,6 +81,10 @@ public class Register { AbilityController.Instance.registerAbility(uniqueNames.get(entry.getKey()), entry.getValue().get()); } } + + for (Map.Entry> entry : variantEntries.entrySet()) { + AbilityController.Instance.registerVariant(variantNames.get(entry.getKey()), entry.getValue().get()); + } } public static Register.Abilities create(String namespace, String displayName) {