Skip to content

Commit

Permalink
Differentiate method signatures for registerListeners
Browse files Browse the repository at this point in the history
  • Loading branch information
ME1312 committed Jun 21, 2019
1 parent 57d9f0b commit ba626c9
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 7 deletions.
1 change: 0 additions & 1 deletion GalaxiAPI/global/pom.xml
Expand Up @@ -8,7 +8,6 @@
<artifactId>GalaxiUtil</artifactId>
<version>-PLACEHOLDER</version>
<packaging>jar</packaging>
<url>https://github.com/ME1312/GalaxiEngine</url>

<dependencies>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion GalaxiAPI/pom.xml
Expand Up @@ -8,7 +8,6 @@
<artifactId>GalaxiAPI</artifactId>
<version>-PLACEHOLDER</version>
<packaging>jar</packaging>
<url>https://github.com/ME1312/GalaxiEngine</url>

<dependencies>
<dependency>
Expand Down
Expand Up @@ -11,7 +11,7 @@
* Event Listener Method Annotation<br>
* Methods annotated by this and registered will be called when the event is run
*
* @see net.ME1312.Galaxi.Plugin.PluginManager#registerListener(PluginInfo, Object...)
* @see net.ME1312.Galaxi.Plugin.PluginManager#registerListeners(PluginInfo, Object...)
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
Expand Down
4 changes: 2 additions & 2 deletions GalaxiAPI/src/net/ME1312/Galaxi/Plugin/PluginManager.java
Expand Up @@ -86,7 +86,7 @@ public void removeCommand(String... handles) {
* @param listeners Listeners
*/
@SuppressWarnings("unchecked")
public void registerListener(PluginInfo plugin, Object... listeners) {
public void registerListeners(PluginInfo plugin, Object... listeners) {
for (Object listener : listeners) {
if (Util.isNull(plugin, listener)) throw new NullPointerException();
for (Method method : Arrays.asList(listener.getClass().getMethods())) {
Expand Down Expand Up @@ -172,7 +172,7 @@ private void registerListener(PluginInfo plugin, Class<? extends Event> event, s
* @param plugin PluginInfo
* @param listeners Listeners
*/
public void unregisterListener(PluginInfo plugin, Object... listeners) {
public void unregisterListeners(PluginInfo plugin, Object... listeners) {
for (Object listener : listeners) {
if (Util.isNull(plugin, listener)) throw new NullPointerException();
TreeMap<Short, HashMap<Class<? extends Event>, HashMap<PluginInfo, HashMap<Object, List<Method>>>>> map = new TreeMap<Short, HashMap<Class<? extends Event>, HashMap<PluginInfo, HashMap<Object, List<Method>>>>>(this.listeners);
Expand Down
1 change: 0 additions & 1 deletion GalaxiEngine/UI/pom.xml
Expand Up @@ -8,7 +8,6 @@
<artifactId>GalaxiEngine-UI</artifactId>
<version>-PLACEHOLDER</version>
<packaging>jar</packaging>
<url>https://github.com/ME1312/GalaxiEngine</url>

<dependencies>
<dependency>
Expand Down
Expand Up @@ -283,7 +283,7 @@ public int loadPlugins(File... directories) {
if (load) try {
plugin.removeExtra("galaxi.plugin.loadafter");
plugin.setEnabled(true);
registerListener(plugin, plugin.get());
registerListeners(plugin, plugin.get());
this.plugins.put(plugin.getName().toLowerCase(), plugin);
loaded.add(plugin.getName().toLowerCase());
String a = "";
Expand Down

0 comments on commit ba626c9

Please sign in to comment.