From 8a3b0b98662ecfa25a4d99f1b6c498642abdfbe8 Mon Sep 17 00:00:00 2001 From: Vidal Date: Thu, 12 Feb 2026 13:48:15 -0300 Subject: [PATCH] why... --- src/main/java/kamkeel/npcs/util/Register.java | 43 +++++-------------- 1 file changed, 11 insertions(+), 32 deletions(-) diff --git a/src/main/java/kamkeel/npcs/util/Register.java b/src/main/java/kamkeel/npcs/util/Register.java index c343a9f03..af944ed59 100644 --- a/src/main/java/kamkeel/npcs/util/Register.java +++ b/src/main/java/kamkeel/npcs/util/Register.java @@ -12,7 +12,7 @@ import java.util.function.Supplier; public class Register { public static final Map> REGISTERED_NAMESPACES = new LinkedHashMap<>(); public static final Map NAMESPACE_DISPLAY_NAMES = new LinkedHashMap<>(); - private final String registryKey; + protected final String registryKey; protected final String namespace; protected final Map> entries = new LinkedHashMap<>(); @@ -35,45 +35,24 @@ public class Register { return false; } - public List catalogue() { - List list = new ArrayList<>(); - for (String regKey : REGISTERED_NAMESPACES.keySet()) { - List nameSp = REGISTERED_NAMESPACES.get(regKey); - for (String name : nameSp) { - List nameSpContent = catalogue(regKey, name); - list.addAll(nameSpContent); - } - } - - return list; - } - - public List catalogue(String namespace) { - return catalogue(registryKey, namespace); - } - - public List catalogue(String registryKey, String namespace) { - List list = new ArrayList<>(); - for (Map.Entry> entry : entries.entrySet()) { - if (entry.getKey().startsWith(registryKey + "." + namespace + ":")) - list.add(entry.getValue().get()); - } - - return list; - } - - public static class Abilities extends Register { + public static class Abilities extends Register { private Abilities(String namespace) { super("ability", namespace); } + @Override + public T register(String factoryName, Supplier factory) { + entries.put(registryKey + "." + namespace + "." + factoryName.trim().toLowerCase().replaceAll(" ", "_"), factory); + return factory.get(); + } + public void register() { - for (Map.Entry> entry : entries.entrySet()) { + for (Map.Entry> entry : entries.entrySet()) { AbilityController.Instance.registerAbility(entry.getKey(), entry.getValue().get()); } } - public static Register.Abilities create(String namespace, String displayName) { + public static Register.Abilities create(String namespace, String displayName) { if (!REGISTERED_NAMESPACES.containsKey("ability")) REGISTERED_NAMESPACES.put("ability", new ArrayList<>()); @@ -84,7 +63,7 @@ public class Register { REGISTERED_NAMESPACES.get("ability").add(namespace); NAMESPACE_DISPLAY_NAMES.put(namespace, displayName); - return new Register.Abilities(namespace); + return new Register.Abilities<>(namespace); } }