From 1b76f1ab7e2441c69bfee70a60978c6a7ec08f81 Mon Sep 17 00:00:00 2001 From: Kam Date: Tue, 8 Jul 2025 16:34:34 -0400 Subject: [PATCH] IActionListener Comments --- src/api | 2 +- .../npcs/controllers/data/action/Action.java | 24 ++++----- .../data/action/ActionManager.java | 52 ++++++++++--------- 3 files changed, 40 insertions(+), 38 deletions(-) diff --git a/src/api b/src/api index 20e07bfc5..a58b6383a 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit 20e07bfc5025d5bb613180ea03879b154fcf0a79 +Subproject commit a58b6383aaff639777d7389ccc81083bf179292d diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 852e43ee4..aa24e6710 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -262,18 +262,18 @@ public class Action implements IAction { ////////////////////////////////////////////////// // Listener - public IAction listenTo(String hook, Object object) { - return listenTo(hook, manager.getOrCreateListener(object)); - } - - public IAction listenTo(String hook, IActionListener listener) { - return listenTo(listener.getOrCreateHook(hook)); - } - - public IAction listenTo(ActionListener.Hook hook) { - hook.schedule(this); - return this; - } +// public IAction listenTo(String hook, Object object) { +// return listenTo(hook, manager.getOrCreateListener(object)); +// } +// +// public IAction listenTo(String hook, IActionListener listener) { +// return listenTo(listener.getOrCreateHook(hook)); +// } +// +// public IAction listenTo(ActionListener.Hook hook) { +// hook.schedule(this); +// return this; +// } /////////////////////////////////////////////////// ////////////////////////////////////////////////// diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index e8405c033..f4b7fc430 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -38,8 +38,7 @@ public class ActionManager implements IActionManager { protected boolean debug; protected ScriptContainer reportTo; - public ActionManager() { - } + public ActionManager() {} public ActionManager(String name) { this.name = name; @@ -87,30 +86,32 @@ public class ActionManager implements IActionManager { /////////////////////////////////////////////////// // Listeners - public IActionListener getOrCreateListener(Object obj) { - return listeners.computeIfAbsent(obj, o -> new ActionListener(o)); - } + // IActionListener Comments +// public IActionListener getOrCreateListener(Object obj) { +// return listeners.computeIfAbsent(obj, o -> new ActionListener(o)); +// } - public IActionListener getListener(Object obj) { - return listeners.get(obj); - } +// public IActionListener getListener(Object obj) { +// return listeners.get(obj); +// } - public boolean removeListener(Object obj) { - if (listeners.containsKey(obj)) { - listeners.remove(obj); - return true; - } +// public boolean removeListener(Object obj) { +// if (listeners.containsKey(obj)) { +// listeners.remove(obj); +// return true; +// } +// +// return false; +// } - return false; - } +// public boolean fireListener(String hookName, Object obj) { +// IActionListener listener = getListener(obj); +// if (listener != null) +// return listener.fire(hookName); +// +// return false; +// } - public boolean fireListener(String hookName, Object obj) { - IActionListener listener = getListener(obj); - if (listener != null) - return listener.fire(hookName); - - return false; - } /////////////////////////////////////////////////// /////////////////////////////////////////////////// // Creators @@ -496,9 +497,10 @@ public class ActionManager implements IActionManager { } } // ─── All Listeners ───────────────────────────────────────── - if (this == GLOBAL) { - listeners.forEach((obj, listener) -> ((ActionListener) listener).tick()); - } + // IActionListener Comments +// if (this == GLOBAL) { +// listeners.forEach((obj, listener) -> ((ActionListener) listener).tick()); +// } if (debug && active) LOGGER.finish("Finished Tick Cycle",this);