Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
Mirai
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Mirai
Commits
35f3d0ca
Commit
35f3d0ca
authored
Aug 09, 2019
by
liujiahua123123
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix event
parent
6eaa004b
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
19 additions
and
31 deletions
+19
-31
mirai-core/src/main/java/net/mamoe/mirai/MiraiMain.java
mirai-core/src/main/java/net/mamoe/mirai/MiraiMain.java
+3
-25
mirai-core/src/main/java/net/mamoe/mirai/MiraiServer.java
mirai-core/src/main/java/net/mamoe/mirai/MiraiServer.java
+2
-0
mirai-core/src/main/java/net/mamoe/mirai/event/MiraiEventHook.java
...e/src/main/java/net/mamoe/mirai/event/MiraiEventHook.java
+3
-3
mirai-core/src/main/java/net/mamoe/mirai/event/MiraiEventManager.java
...rc/main/java/net/mamoe/mirai/event/MiraiEventManager.java
+7
-1
mirai-core/src/main/java/net/mamoe/mirai/task/MiraiTaskManager.java
.../src/main/java/net/mamoe/mirai/task/MiraiTaskManager.java
+3
-1
mirai-core/src/main/java/net/mamoe/mirai/util/_TEAEncryption.java
...re/src/main/java/net/mamoe/mirai/util/_TEAEncryption.java
+1
-1
No files found.
mirai-core/src/main/java/net/mamoe/mirai/MiraiMain.java
View file @
35f3d0ca
...
...
@@ -14,31 +14,9 @@ public final class MiraiMain {
Runtime
.
getRuntime
().
addShutdownHook
(
new
Thread
(()
->
{
server
.
shutdown
();
}));
server
.
getEventManager
()
.
onEvent
(
ServerDisableEvent
.
class
)
.
setHandler
(
a
->
{
System
.
out
.
println
(
"?"
);
});
server
.
getEventManager
()
.
onEventOnce
(
ServerDisableEvent
.
class
)
.
setHandler
(
a
->
{
System
.
out
.
println
(
"?"
);
});
server
.
getEventManager
()
.
onEvent
(
ServerDisableEvent
.
class
)
.
setHandler
(
a
->
{
System
.
out
.
println
(
"?"
);
})
.
setValidWhile
((
a
)
->
true
);
server
.
getEventManager
()
.
onEvent
(
ServerDisableEvent
.
class
)
.
setHandler
(
a
->
{
System
.
out
.
println
(
"?"
);
})
.
setValidUntil
((
a
)
->
true
);
server
.
getTaskManager
().
repeatingTask
(()
->
{
System
.
out
.
println
(
3
);
},
1000
,
5
);
}
}
mirai-core/src/main/java/net/mamoe/mirai/MiraiServer.java
View file @
35f3d0ca
...
...
@@ -43,6 +43,7 @@ public class MiraiServer {
this
.
eventManager
=
MiraiEventManager
.
getInstance
();
this
.
taskManager
=
MiraiTaskManager
.
getInstance
();
/*
try {
Network.start(Network.getAvailablePort());
} catch (InterruptedException | IOException e) {
...
...
@@ -50,6 +51,7 @@ public class MiraiServer {
this.shutdown();
}
*/
}
...
...
mirai-core/src/main/java/net/mamoe/mirai/event/MiraiEventHook.java
View file @
35f3d0ca
...
...
@@ -13,13 +13,13 @@ public class MiraiEventHook<T extends MiraiEvent> {
Class
<
T
>
eventClass
;
@Getter
private
Consumer
<
T
>
handler
;
private
volatile
Consumer
<
T
>
handler
;
@Getter
private
int
priority
=
0
;
private
volatile
int
priority
=
0
;
@Getter
private
boolean
ignoreCancelled
=
true
;
private
volatile
boolean
ignoreCancelled
=
true
;
/**
* return true -> this hook need to be removed
...
...
mirai-core/src/main/java/net/mamoe/mirai/event/MiraiEventManager.java
View file @
35f3d0ca
...
...
@@ -29,13 +29,17 @@ public class MiraiEventManager {
private
Map
<
Class
<?
extends
MiraiEvent
>,
List
<
MiraiEventHook
<?
extends
MiraiEvent
>>>
hooks
=
new
HashMap
<>();
public
<
D
extends
MiraiEvent
>
void
registerUntil
(
MiraiEventHook
<
D
>
hook
,
Predicate
<
D
>
toRemove
){
hooksLock
.
lock
();
hooks
.
putIfAbsent
(
hook
.
getEventClass
(),
new
ArrayList
<>());
hooks
.
get
(
hook
.
getEventClass
()).
add
(
hook
.
setValidUntil
(
toRemove
));
hooksLock
.
unlock
();
}
public
<
D
extends
MiraiEvent
>
void
registerWhile
(
MiraiEventHook
<
D
>
hook
,
Predicate
<
D
>
toKeep
){
hooksLock
.
lock
();
hooks
.
putIfAbsent
(
hook
.
getEventClass
(),
new
ArrayList
<>());
hooks
.
get
(
hook
.
getEventClass
()).
add
(
hook
.
setValidWhile
(
toKeep
));
hooksLock
.
unlock
();
}
public
<
D
extends
MiraiEvent
>
void
registerOnce
(
MiraiEventHook
<
D
>
hook
){
...
...
@@ -74,12 +78,14 @@ public class MiraiEventManager {
public
void
boardcastEvent
(
MiraiEvent
event
){
hooksLock
.
lock
();
System
.
out
.
println
(
hooks
);
if
(
hooks
.
containsKey
(
event
.
getClass
())){
System
.
out
.
println
(
hooks
.
get
(
event
.
getClass
()).
size
());
hooks
.
put
(
event
.
getClass
(),
hooks
.
get
(
event
.
getClass
())
.
stream
()
.
sorted
(
Comparator
.
comparingInt
(
MiraiEventHook:
:
getPriority
))
.
dropWhile
(
a
->
a
.
accept
(
event
))
.
filter
(
a
->
!
a
.
accept
(
event
))
.
collect
(
Collectors
.
toList
())
);
}
...
...
mirai-core/src/main/java/net/mamoe/mirai/task/MiraiTaskManager.java
View file @
35f3d0ca
...
...
@@ -25,9 +25,11 @@ public class MiraiTaskManager {
private
MiraiTaskManager
()
{
this
.
pool
=
new
MiraiThreadPool
();
MiraiServer
.
getInstance
().
getEventManager
()
.
onEvent
(
ServerDisableEvent
.
class
)
.
setHandler
(
a
->
this
.
pool
.
close
());
}
/**
...
...
@@ -99,7 +101,7 @@ public class MiraiTaskManager {
}
public
void
repeatingTask
(
Runnable
runnable
,
long
interval
,
int
times
,
MiraiTaskExceptionHandler
handler
){
AtomicInteger
integer
=
new
AtomicInteger
(
times
);
AtomicInteger
integer
=
new
AtomicInteger
(
times
-
1
);
this
.
repeatingTask
(
runnable
,
interval
,
a
->
integer
.
getAndDecrement
()
>
0
,
handler
);
...
...
mirai-core/src/main/java/net/mamoe/mirai/util/_TEAEncryption.java
View file @
35f3d0ca
...
...
@@ -27,7 +27,7 @@ import java.util.Random;
* </code>
* </pre>
*
* @author
https://juejin.im/post/5c5bdf8cf265da2dc706d532
* @author
b
* @author luma
* @author notXX
*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment