Skip to content

Commit 82284bc

Browse files
committed
Fix exentmanagers
- Add eventWaiter property - Add toEventManager() method
1 parent 17c7032 commit 82284bc

9 files changed

Lines changed: 142 additions & 2 deletions

File tree

common/build.gradle.kts

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
import com.jfrog.bintray.gradle.BintrayExtension
2+
import groovy.lang.GroovyObject
23
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
4+
import org.jfrog.gradle.plugin.artifactory.dsl.PublisherConfig
5+
import org.jfrog.gradle.plugin.artifactory.dsl.ResolverConfig
36

47
plugins {
58
id("org.jetbrains.dokka") version "0.9.18"
69
id("com.jfrog.bintray") version "1.8.4"
10+
id("com.jfrog.artifactory") version "4.9.6"
711
kotlin("jvm") version "1.3.11"
812
`maven-publish`
913
java
1014
}
1115

1216
group = "me.schlaubi.regnumutils"
13-
version = "1.0-SNAPSHOT"
17+
version = "1.0.1-SNAPSHOT"
1418

1519
repositories {
1620
mavenCentral()
@@ -50,6 +54,24 @@ bintray {
5054
})
5155
}
5256

57+
artifactory {
58+
setContextUrl("https://oss.jfrog.org/artifactory")
59+
publish(delegateClosureOf<PublisherConfig> {
60+
repository(delegateClosureOf<GroovyObject> {
61+
setProperty("repoKey", "oss-snapshot-local")
62+
setProperty("username", System.getenv("BINTRAY_USER"))
63+
setProperty("password", System.getenv("BINTRAY_KEY"))
64+
setProperty("maven", true)
65+
})
66+
defaults(delegateClosureOf<GroovyObject> {
67+
invokeMethod("publications", "mavenJava")
68+
})
69+
})
70+
resolve(delegateClosureOf<ResolverConfig> {
71+
setProperty("repoKey", "repo")
72+
})
73+
}
74+
5375
publishing {
5476
publications {
5577
create<MavenPublication>("mavenJava") {

common/docs/common/index-outline.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,9 +240,11 @@
240240
<link rel="stylesheet" href="../style.css">
241241
</HEAD>
242242
<BODY>
243+
<a href="C:\Users\ttv013\Documents\Michael Stick\WORK\hawkbot\regnumutils\common\docs\common\index"><a href="me.schlaubi.regnumutils.common.event/-j-d-a-event-manager-adapter/event-waiter.html"><span class="keyword">val </span><span class="identifier">eventWaiter</span><span class="symbol">: </span><a href="https://pages.hawkbot.cc/client/cc.hawkbot.regnum.client.core/-client-event-waiter/index.html"><span class="identifier">ClientEventWaiter</span></a></a></a><br/>
243244
<a href="C:\Users\ttv013\Documents\Michael Stick\WORK\hawkbot\regnumutils\common\docs\common\index"><a href="me.schlaubi.regnumutils.common.event/-j-d-a-event-manager-adapter/get-registered-listeners.html"><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">getRegisteredListeners</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.collections/-list/index.html"><span class="identifier">List</span></a><span class="symbol">&lt;</span><span class="identifier">*</span><span class="symbol">&gt;</span></a></a><br/>
244245
<a href="C:\Users\ttv013\Documents\Michael Stick\WORK\hawkbot\regnumutils\common\docs\common\index"><a href="me.schlaubi.regnumutils.common.event/-j-d-a-event-manager-adapter/handle.html"><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">handle</span><span class="symbol">(</span><span class="identifier" id="me.schlaubi.regnumutils.common.event.JDAEventManagerAdapter$handle(net.dv8tion.jda.api.events.GenericEvent)/event">event</span><span class="symbol">:</span>&nbsp;<span class="identifier">GenericEvent</span><span class="symbol">)</span><span class="symbol">: </span><a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html"><span class="identifier">Unit</span></a></a></a><br/>
245246
<a href="C:\Users\ttv013\Documents\Michael Stick\WORK\hawkbot\regnumutils\common\docs\common\index"><a href="me.schlaubi.regnumutils.common.event/-j-d-a-event-manager-adapter/register.html"><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">register</span><span class="symbol">(</span><span class="identifier" id="me.schlaubi.regnumutils.common.event.JDAEventManagerAdapter$register(kotlin.Any)/listener">listener</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-any/index.html"><span class="identifier">Any</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html"><span class="identifier">Unit</span></a></a></a><br/>
247+
<a href="C:\Users\ttv013\Documents\Michael Stick\WORK\hawkbot\regnumutils\common\docs\common\index"><a href="me.schlaubi.regnumutils.common.event/-j-d-a-event-manager-adapter/to-event-manager.html"><span class="keyword">fun </span><span class="identifier">toEventManager</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><a href="https://pages.hawkbot.cc/client/cc.hawkbot.regnum.client.event/-event-manager/index.html"><span class="identifier">EventManager</span></a></a></a><br/>
246248
<a href="C:\Users\ttv013\Documents\Michael Stick\WORK\hawkbot\regnumutils\common\docs\common\index"><a href="me.schlaubi.regnumutils.common.event/-j-d-a-event-manager-adapter/unregister.html"><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">unregister</span><span class="symbol">(</span><span class="identifier" id="me.schlaubi.regnumutils.common.event.JDAEventManagerAdapter$unregister(kotlin.Any)/listener">listener</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-any/index.html"><span class="identifier">Any</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html"><span class="identifier">Unit</span></a></a></a><br/>
247249
</BODY>
248250
</HTML>
@@ -577,9 +579,11 @@
577579
<link rel="stylesheet" href="../style.css">
578580
</HEAD>
579581
<BODY>
582+
<a href="C:\Users\ttv013\Documents\Michael Stick\WORK\hawkbot\regnumutils\common\docs\common\index"><a href="me.schlaubi.regnumutils.common.event/-j-d-a-event-manager-adapter/event-waiter.html"><span class="keyword">val </span><span class="identifier">eventWaiter</span><span class="symbol">: </span><a href="https://pages.hawkbot.cc/client/cc.hawkbot.regnum.client.core/-client-event-waiter/index.html"><span class="identifier">ClientEventWaiter</span></a></a></a><br/>
580583
<a href="C:\Users\ttv013\Documents\Michael Stick\WORK\hawkbot\regnumutils\common\docs\common\index"><a href="me.schlaubi.regnumutils.common.event/-j-d-a-event-manager-adapter/get-registered-listeners.html"><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">getRegisteredListeners</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.collections/-list/index.html"><span class="identifier">List</span></a><span class="symbol">&lt;</span><span class="identifier">*</span><span class="symbol">&gt;</span></a></a><br/>
581584
<a href="C:\Users\ttv013\Documents\Michael Stick\WORK\hawkbot\regnumutils\common\docs\common\index"><a href="me.schlaubi.regnumutils.common.event/-j-d-a-event-manager-adapter/handle.html"><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">handle</span><span class="symbol">(</span><span class="identifier" id="me.schlaubi.regnumutils.common.event.JDAEventManagerAdapter$handle(net.dv8tion.jda.api.events.GenericEvent)/event">event</span><span class="symbol">:</span>&nbsp;<span class="identifier">GenericEvent</span><span class="symbol">)</span><span class="symbol">: </span><a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html"><span class="identifier">Unit</span></a></a></a><br/>
582585
<a href="C:\Users\ttv013\Documents\Michael Stick\WORK\hawkbot\regnumutils\common\docs\common\index"><a href="me.schlaubi.regnumutils.common.event/-j-d-a-event-manager-adapter/register.html"><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">register</span><span class="symbol">(</span><span class="identifier" id="me.schlaubi.regnumutils.common.event.JDAEventManagerAdapter$register(kotlin.Any)/listener">listener</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-any/index.html"><span class="identifier">Any</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html"><span class="identifier">Unit</span></a></a></a><br/>
586+
<a href="C:\Users\ttv013\Documents\Michael Stick\WORK\hawkbot\regnumutils\common\docs\common\index"><a href="me.schlaubi.regnumutils.common.event/-j-d-a-event-manager-adapter/to-event-manager.html"><span class="keyword">fun </span><span class="identifier">toEventManager</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><a href="https://pages.hawkbot.cc/client/cc.hawkbot.regnum.client.event/-event-manager/index.html"><span class="identifier">EventManager</span></a></a></a><br/>
583587
<a href="C:\Users\ttv013\Documents\Michael Stick\WORK\hawkbot\regnumutils\common\docs\common\index"><a href="me.schlaubi.regnumutils.common.event/-j-d-a-event-manager-adapter/unregister.html"><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">unregister</span><span class="symbol">(</span><span class="identifier" id="me.schlaubi.regnumutils.common.event.JDAEventManagerAdapter$unregister(kotlin.Any)/listener">listener</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-any/index.html"><span class="identifier">Any</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html"><span class="identifier">Unit</span></a></a></a><br/>
584588
</BODY>
585589
</HTML>

common/docs/common/me.schlaubi.regnumutils.common.event/-annotated-event-manager/index.html

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,20 @@ <h3>Constructors</h3>
2828
</tr>
2929
</tbody>
3030
</table>
31+
<h3>Inherited Properties</h3>
32+
<table>
33+
<tbody>
34+
<tr>
35+
<td>
36+
<p><a href="../-j-d-a-event-manager-adapter/event-waiter.html">eventWaiter</a></p>
37+
</td>
38+
<td>
39+
<code><span class="keyword">val </span><span class="identifier">eventWaiter</span><span class="symbol">: </span><a href="https://pages.hawkbot.cc/client/cc.hawkbot.regnum.client.core/-client-event-waiter/index.html"><span class="identifier">ClientEventWaiter</span></a></code>
40+
<p>An <a href="https://pages.hawkbot.cc/client/cc.hawkbot.regnum.client.core/-client-event-waiter/index.html">ClientEventWaiter</a> based on this <a href="https://ci.dv8tion.net/job/JDA4-Alpha/javadoc/net/dv8tion/jda/api/hooks/IEventManager.html">IEventManager</a>.</p>
41+
</td>
42+
</tr>
43+
</tbody>
44+
</table>
3145
<h3>Inherited Functions</h3>
3246
<table>
3347
<tbody>
@@ -54,6 +68,15 @@ <h3>Inherited Functions</h3>
5468
</tr>
5569
<tr>
5670
<td>
71+
<p><a href="../-j-d-a-event-manager-adapter/to-event-manager.html">toEventManager</a></p>
72+
</td>
73+
<td>
74+
<code><span class="keyword">fun </span><span class="identifier">toEventManager</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><a href="https://pages.hawkbot.cc/client/cc.hawkbot.regnum.client.event/-event-manager/index.html"><span class="identifier">EventManager</span></a></code>
75+
<p>Converts this <a href="https://ci.dv8tion.net/job/JDA4-Alpha/javadoc/net/dv8tion/jda/api/hooks/IEventManager.html">IEventManager</a> to an <a href="https://pages.hawkbot.cc/client/cc.hawkbot.regnum.client.event/-event-manager/index.html">EventManager</a>.</p>
76+
</td>
77+
</tr>
78+
<tr>
79+
<td>
5780
<p><a href="../-j-d-a-event-manager-adapter/unregister.html">unregister</a></p>
5881
</td>
5982
<td>

common/docs/common/me.schlaubi.regnumutils.common.event/-interfaced-event-manager/index.html

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,20 @@ <h3>Constructors</h3>
2828
</tr>
2929
</tbody>
3030
</table>
31+
<h3>Inherited Properties</h3>
32+
<table>
33+
<tbody>
34+
<tr>
35+
<td>
36+
<p><a href="../-j-d-a-event-manager-adapter/event-waiter.html">eventWaiter</a></p>
37+
</td>
38+
<td>
39+
<code><span class="keyword">val </span><span class="identifier">eventWaiter</span><span class="symbol">: </span><a href="https://pages.hawkbot.cc/client/cc.hawkbot.regnum.client.core/-client-event-waiter/index.html"><span class="identifier">ClientEventWaiter</span></a></code>
40+
<p>An <a href="https://pages.hawkbot.cc/client/cc.hawkbot.regnum.client.core/-client-event-waiter/index.html">ClientEventWaiter</a> based on this <a href="https://ci.dv8tion.net/job/JDA4-Alpha/javadoc/net/dv8tion/jda/api/hooks/IEventManager.html">IEventManager</a>.</p>
41+
</td>
42+
</tr>
43+
</tbody>
44+
</table>
3145
<h3>Inherited Functions</h3>
3246
<table>
3347
<tbody>
@@ -54,6 +68,15 @@ <h3>Inherited Functions</h3>
5468
</tr>
5569
<tr>
5670
<td>
71+
<p><a href="../-j-d-a-event-manager-adapter/to-event-manager.html">toEventManager</a></p>
72+
</td>
73+
<td>
74+
<code><span class="keyword">fun </span><span class="identifier">toEventManager</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><a href="https://pages.hawkbot.cc/client/cc.hawkbot.regnum.client.event/-event-manager/index.html"><span class="identifier">EventManager</span></a></code>
75+
<p>Converts this <a href="https://ci.dv8tion.net/job/JDA4-Alpha/javadoc/net/dv8tion/jda/api/hooks/IEventManager.html">IEventManager</a> to an <a href="https://pages.hawkbot.cc/client/cc.hawkbot.regnum.client.event/-event-manager/index.html">EventManager</a>.</p>
76+
</td>
77+
</tr>
78+
<tr>
79+
<td>
5780
<p><a href="../-j-d-a-event-manager-adapter/unregister.html">unregister</a></p>
5881
</td>
5982
<td>
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<HTML>
2+
<HEAD>
3+
<meta charset="UTF-8">
4+
<title>JDAEventManagerAdapter.eventWaiter - common</title>
5+
<link rel="stylesheet" href="../../../style.css">
6+
</HEAD>
7+
<BODY>
8+
<a href="../../index.html">common</a>&nbsp;/&nbsp;<a href="../index.html">me.schlaubi.regnumutils.common.event</a>&nbsp;/&nbsp;<a href="index.html">JDAEventManagerAdapter</a>&nbsp;/&nbsp;<a href="./event-waiter.html">eventWaiter</a><br/>
9+
<br/>
10+
<h1>eventWaiter</h1>
11+
<a name="me.schlaubi.regnumutils.common.event.JDAEventManagerAdapter$eventWaiter"></a>
12+
<code><span class="keyword">val </span><span class="identifier">eventWaiter</span><span class="symbol">: </span><a href="https://pages.hawkbot.cc/client/cc.hawkbot.regnum.client.core/-client-event-waiter/index.html"><span class="identifier">ClientEventWaiter</span></a></code>
13+
<p>An <a href="https://pages.hawkbot.cc/client/cc.hawkbot.regnum.client.core/-client-event-waiter/index.html">ClientEventWaiter</a> based on this <a href="https://ci.dv8tion.net/job/JDA4-Alpha/javadoc/net/dv8tion/jda/api/hooks/IEventManager.html">IEventManager</a>.</p>
14+
<p><strong>Getter</strong><br/>
15+
<p>An <a href="https://pages.hawkbot.cc/client/cc.hawkbot.regnum.client.core/-client-event-waiter/index.html">ClientEventWaiter</a> based on this <a href="https://ci.dv8tion.net/job/JDA4-Alpha/javadoc/net/dv8tion/jda/api/hooks/IEventManager.html">IEventManager</a>.</p>
16+
</p>
17+
</BODY>
18+
</HTML>

common/docs/common/me.schlaubi.regnumutils.common.event/-j-d-a-event-manager-adapter/index.html

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,20 @@ <h1>JDAEventManagerAdapter</h1>
1313
<h3>Parameters</h3>
1414
<p><a name="manager"></a>
1515
<code>manager</code> - the <a href="https://pages.hawkbot.cc/client/cc.hawkbot.regnum.client.event/-event-manager/index.html">EventManager</a> that is supposed to be adapted</p>
16+
<h3>Properties</h3>
17+
<table>
18+
<tbody>
19+
<tr>
20+
<td>
21+
<p><a href="event-waiter.html">eventWaiter</a></p>
22+
</td>
23+
<td>
24+
<code><span class="keyword">val </span><span class="identifier">eventWaiter</span><span class="symbol">: </span><a href="https://pages.hawkbot.cc/client/cc.hawkbot.regnum.client.core/-client-event-waiter/index.html"><span class="identifier">ClientEventWaiter</span></a></code>
25+
<p>An <a href="https://pages.hawkbot.cc/client/cc.hawkbot.regnum.client.core/-client-event-waiter/index.html">ClientEventWaiter</a> based on this <a href="https://ci.dv8tion.net/job/JDA4-Alpha/javadoc/net/dv8tion/jda/api/hooks/IEventManager.html">IEventManager</a>.</p>
26+
</td>
27+
</tr>
28+
</tbody>
29+
</table>
1630
<h3>Functions</h3>
1731
<table>
1832
<tbody>
@@ -39,6 +53,15 @@ <h3>Functions</h3>
3953
</tr>
4054
<tr>
4155
<td>
56+
<p><a href="to-event-manager.html">toEventManager</a></p>
57+
</td>
58+
<td>
59+
<code><span class="keyword">fun </span><span class="identifier">toEventManager</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><a href="https://pages.hawkbot.cc/client/cc.hawkbot.regnum.client.event/-event-manager/index.html"><span class="identifier">EventManager</span></a></code>
60+
<p>Converts this <a href="https://ci.dv8tion.net/job/JDA4-Alpha/javadoc/net/dv8tion/jda/api/hooks/IEventManager.html">IEventManager</a> to an <a href="https://pages.hawkbot.cc/client/cc.hawkbot.regnum.client.event/-event-manager/index.html">EventManager</a>.</p>
61+
</td>
62+
</tr>
63+
<tr>
64+
<td>
4265
<p><a href="unregister.html">unregister</a></p>
4366
</td>
4467
<td>
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<HTML>
2+
<HEAD>
3+
<meta charset="UTF-8">
4+
<title>JDAEventManagerAdapter.toEventManager - common</title>
5+
<link rel="stylesheet" href="../../../style.css">
6+
</HEAD>
7+
<BODY>
8+
<a href="../../index.html">common</a>&nbsp;/&nbsp;<a href="../index.html">me.schlaubi.regnumutils.common.event</a>&nbsp;/&nbsp;<a href="index.html">JDAEventManagerAdapter</a>&nbsp;/&nbsp;<a href="./to-event-manager.html">toEventManager</a><br/>
9+
<br/>
10+
<h1>toEventManager</h1>
11+
<a name="me.schlaubi.regnumutils.common.event.JDAEventManagerAdapter$toEventManager()"></a>
12+
<code><span class="keyword">fun </span><span class="identifier">toEventManager</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><a href="https://pages.hawkbot.cc/client/cc.hawkbot.regnum.client.event/-event-manager/index.html"><span class="identifier">EventManager</span></a></code>
13+
<p>Converts this <a href="https://ci.dv8tion.net/job/JDA4-Alpha/javadoc/net/dv8tion/jda/api/hooks/IEventManager.html">IEventManager</a> to an <a href="https://pages.hawkbot.cc/client/cc.hawkbot.regnum.client.event/-event-manager/index.html">EventManager</a>.</p>
14+
</BODY>
15+
</HTML>

common/src/main/java/me/schlaubi/regnumutils/common/constants/RegnumUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class RegnumUtils {
2727

2828
public static final String AUTHOR = "Michael \"Schlaubi\" Rittmeister";
2929

30-
public static final String VERSION = "1.0.0-SNAPSHOT";
30+
public static final String VERSION = "1.0.1-SNAPSHOT";
3131

3232
public static final String GITHUB = "https://github.com/HawkDiscord/regnum-utils.git";
3333
}

common/src/main/kotlin/me/schlaubi/regnumutils/common/event/_JDAEventManagers.kt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
package me.schlaubi.regnumutils.common.event
2323

24+
import cc.hawkbot.regnum.client.core.ClientEventWaiter
2425
import cc.hawkbot.regnum.client.event.EventManager
2526
import cc.hawkbot.regnum.client.event.ListenerAdapter
2627
import net.dv8tion.jda.api.hooks.IEventManager
@@ -40,13 +41,24 @@ sealed class JDAEventManagerAdapter(
4041
private val manager: EventManager
4142
) : IEventManager {
4243

44+
/**
45+
* An [ClientEventWaiter] based on this [IEventManager].
46+
*/
47+
val eventWaiter by lazy { ClientEventWaiter(toEventManager()) }
48+
4349
override fun handle(event: GenericEvent) = manager.fireEvent(event)
4450

4551
override fun register(listener: Any) = manager.register(listener)
4652

4753
override fun getRegisteredListeners() = manager.registeredListeners
4854

4955
override fun unregister(listener: Any) = manager.unregister(listener)
56+
57+
/**
58+
* Converts this [IEventManager] to an [EventManager].
59+
*/
60+
fun toEventManager(): EventManager = manager
61+
5062
}
5163

5264
/**

0 commit comments

Comments
 (0)