From bc336abf9d2e1474707d6c53bce927427ce78b81 Mon Sep 17 00:00:00 2001 From: Vidal Date: Tue, 17 Feb 2026 20:41:07 -0300 Subject: [PATCH] Proper register for ability variants --- src/main/java/kamkeel/npcs/util/Register.java | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/src/main/java/kamkeel/npcs/util/Register.java b/src/main/java/kamkeel/npcs/util/Register.java index 129692997..bd2ef983c 100644 --- a/src/main/java/kamkeel/npcs/util/Register.java +++ b/src/main/java/kamkeel/npcs/util/Register.java @@ -8,6 +8,7 @@ import noppes.npcs.controllers.AnimationController; import noppes.npcs.controllers.data.Animation; import java.util.*; +import java.util.function.Consumer; import java.util.function.Supplier; public class Register { @@ -37,8 +38,7 @@ public class Register { } public static class Abilities extends Register { - protected final Map> variantEntries = new LinkedHashMap<>(); - protected final Map variantNames = new LinkedHashMap<>(); + protected final Map>> variantEntries = new LinkedHashMap<>(); protected final Map uniqueNames = new LinkedHashMap<>(); protected final Set typeOnly = new HashSet<>(); @@ -67,11 +67,21 @@ 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 AbilityVariant registerVariant(String typeId, String variantName, String group, Consumer configurator) { + registerVariant(typeId, variantName, () -> new AbilityVariant(variantName, group, configurator)); + return new AbilityVariant(variantName, group, configurator); + } + + public AbilityVariant registerVariant(String typeId, String factoryName, Supplier factory) { + if (!variantEntries.containsKey(typeId)) { + variantEntries.put(typeId, new HashMap<>()); + } + + Map> type = variantEntries.get(typeId); + + String name = registryKey + "." + namespace + "." + factoryName.trim().toLowerCase().replaceAll(" ", "_"); + type.put(name, factory); + return factory.get(); } public void register() { @@ -82,8 +92,12 @@ public class Register { } } - for (Map.Entry> entry : variantEntries.entrySet()) { - AbilityController.Instance.registerVariant(variantNames.get(entry.getKey()), entry.getValue().get()); + for (Map.Entry>> entry : variantEntries.entrySet()) { + String typeId = entry.getKey(); + Map> map = entry.getValue(); + for (Map.Entry> innerEntry : map.entrySet()) { + AbilityController.Instance.registerVariant(typeId, innerEntry.getValue().get()); + } } }