Skip to content

Commit 17a98c4

Browse files
RothesRothes
committed
Rename Nested events
1 parent a44c73f commit 17a98c4

File tree

8 files changed

+37
-37
lines changed

8 files changed

+37
-37
lines changed

‎bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/event/UserChatEvent.kt‎ renamed to ‎bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/event/RawUserChatEvent.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import org.bukkit.entity.Player
1010
import org.bukkit.event.*
1111
import org.bukkit.event.player.PlayerEvent
1212

13-
class UserChatEvent(
13+
class RawUserChatEvent(
1414
async: Boolean,
1515
player: Player,
1616
message: Component,
@@ -39,9 +39,9 @@ class UserChatEvent(
3939
event: T,
4040
message: Component,
4141
priority: EventPriority
42-
): UserChatEvent where T : PlayerEvent, T : Cancellable {
42+
): RawUserChatEvent where T : PlayerEvent, T : Cancellable {
4343
val esuEvent =
44-
UserChatEvent(event.isAsynchronous, event.player, message, event.isCancelled, priority)
44+
RawUserChatEvent(event.isAsynchronous, event.player, message, event.isCancelled, priority)
4545
esuEvent.callNested()
4646

4747
event.isCancelled = esuEvent.isCancelled

‎bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/event/UserEmoteCommandEvent.kt‎ renamed to ‎bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/event/RawUserEmoteEvent.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import org.bukkit.entity.Player
44
import org.bukkit.event.EventPriority
55
import org.bukkit.event.HandlerList
66

7-
class UserEmoteCommandEvent(
7+
class RawUserEmoteEvent(
88
player: Player,
99
message: String,
1010
override var cancelledKt: Boolean,

‎bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/event/UserReplyCommandEvent.kt‎ renamed to ‎bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/event/RawUserReplyEvent.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import org.bukkit.entity.Player
44
import org.bukkit.event.EventPriority
55
import org.bukkit.event.HandlerList
66

7-
class UserReplyCommandEvent(
7+
class RawUserReplyEvent(
88
player: Player,
99
message: String,
1010
override var cancelledKt: Boolean,

‎bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/event/UserWhisperCommandEvent.kt‎ renamed to ‎bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/event/RawUserWhisperEvent.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import org.bukkit.entity.Player
55
import org.bukkit.event.EventPriority
66
import org.bukkit.event.HandlerList
77

8-
class UserWhisperCommandEvent(
8+
class RawUserWhisperEvent(
99
player: Player,
1010
val target: String,
1111
message: String,

‎bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/event/internal/InternalListeners.kt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package io.github.rothes.esu.bukkit.event.internal
22

3-
import io.github.rothes.esu.bukkit.event.UserEmoteCommandEvent
4-
import io.github.rothes.esu.bukkit.event.UserEmoteCommandEvent.Companion.EMOTE_COMMANDS
5-
import io.github.rothes.esu.bukkit.event.UserReplyCommandEvent
6-
import io.github.rothes.esu.bukkit.event.UserReplyCommandEvent.Companion.REPLY_COMMANDS
7-
import io.github.rothes.esu.bukkit.event.UserWhisperCommandEvent
8-
import io.github.rothes.esu.bukkit.event.UserWhisperCommandEvent.Companion.WHISPER_COMMANDS
3+
import io.github.rothes.esu.bukkit.event.RawUserEmoteEvent
4+
import io.github.rothes.esu.bukkit.event.RawUserEmoteEvent.Companion.EMOTE_COMMANDS
5+
import io.github.rothes.esu.bukkit.event.RawUserReplyEvent
6+
import io.github.rothes.esu.bukkit.event.RawUserReplyEvent.Companion.REPLY_COMMANDS
7+
import io.github.rothes.esu.bukkit.event.RawUserWhisperEvent
8+
import io.github.rothes.esu.bukkit.event.RawUserWhisperEvent.Companion.WHISPER_COMMANDS
99
import io.github.rothes.esu.bukkit.util.extension.ListenerExt.register
1010
import org.bukkit.event.EventHandler
1111
import org.bukkit.event.EventPriority
@@ -48,8 +48,8 @@ internal object InternalListeners : Listener {
4848
val split = message.split(' ', limit = 3)
4949
val command = split[0].substring(1).split(':').last().lowercase()
5050
if (emoteCommands.contains(command)) {
51-
if (split.size >= 2 && UserEmoteCommandEvent.getHandlerList().registeredListeners.isNotEmpty()) {
52-
val event = UserEmoteCommandEvent(
51+
if (split.size >= 2 && RawUserEmoteEvent.getHandlerList().registeredListeners.isNotEmpty()) {
52+
val event = RawUserEmoteEvent(
5353
e.player,
5454
split.drop(1).joinToString(separator = " "),
5555
e.isCancelled,
@@ -59,8 +59,8 @@ internal object InternalListeners : Listener {
5959
e.isCancelled = event.isCancelled
6060
}
6161
} else if (whisperCommands.contains(command)) {
62-
if (split.size >= 3 && UserWhisperCommandEvent.getHandlerList().registeredListeners.isNotEmpty()) {
63-
val event = UserWhisperCommandEvent(
62+
if (split.size >= 3 && RawUserWhisperEvent.getHandlerList().registeredListeners.isNotEmpty()) {
63+
val event = RawUserWhisperEvent(
6464
e.player,
6565
split[1],
6666
split[2],
@@ -71,8 +71,8 @@ internal object InternalListeners : Listener {
7171
e.isCancelled = event.isCancelled
7272
}
7373
} else if (replyCommands.contains(command)) {
74-
if (split.size >= 2 && UserReplyCommandEvent.getHandlerList().registeredListeners.isNotEmpty()) {
75-
val event = UserReplyCommandEvent(
74+
if (split.size >= 2 && RawUserReplyEvent.getHandlerList().registeredListeners.isNotEmpty()) {
75+
val event = RawUserReplyEvent(
7676
e.player,
7777
split.drop(1).joinToString(separator = " "),
7878
e.isCancelled,

‎bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/module/EsuChatModule.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package io.github.rothes.esu.bukkit.module
22

33
import com.google.common.cache.CacheBuilder
44
import io.github.rothes.esu.bukkit.event.*
5-
import io.github.rothes.esu.bukkit.event.UserEmoteCommandEvent.Companion.EMOTE_COMMANDS
6-
import io.github.rothes.esu.bukkit.event.UserReplyCommandEvent.Companion.REPLY_COMMANDS
7-
import io.github.rothes.esu.bukkit.event.UserWhisperCommandEvent.Companion.WHISPER_COMMANDS
5+
import io.github.rothes.esu.bukkit.event.RawUserEmoteEvent.Companion.EMOTE_COMMANDS
6+
import io.github.rothes.esu.bukkit.event.RawUserReplyEvent.Companion.REPLY_COMMANDS
7+
import io.github.rothes.esu.bukkit.event.RawUserWhisperEvent.Companion.WHISPER_COMMANDS
88
import io.github.rothes.esu.bukkit.module.EsuChatModule.ModuleConfig.PrefixedMessageModifier
99
import io.github.rothes.esu.bukkit.user
1010
import io.github.rothes.esu.bukkit.user.ConsoleUser
@@ -294,7 +294,7 @@ object EsuChatModule: BukkitModule<EsuChatModule.ModuleConfig, EsuChatModule.Mod
294294
}
295295

296296
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
297-
fun onChat(e: UserChatEvent) {
297+
fun onChat(e: RawUserChatEvent) {
298298
if (!config.chat.enabled)
299299
return
300300

@@ -304,15 +304,15 @@ object EsuChatModule: BukkitModule<EsuChatModule.ModuleConfig, EsuChatModule.Mod
304304
}
305305

306306
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
307-
fun onEmote(e: UserEmoteCommandEvent) {
307+
fun onEmote(e: RawUserEmoteEvent) {
308308
if (config.emote.interceptNamespaces) {
309309
ChatHandler.Emote.emote(e.user, e.message)
310310
e.isCancelled = true
311311
}
312312
}
313313

314314
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
315-
fun onWhisper(e: UserWhisperCommandEvent) {
315+
fun onWhisper(e: RawUserWhisperEvent) {
316316
if (config.whisper.interceptNamespaces) {
317317
val target = e.targetPlayer?.user ?: return
318318
ChatHandler.Whisper.whisper(e.user, target, e.message)
@@ -321,7 +321,7 @@ object EsuChatModule: BukkitModule<EsuChatModule.ModuleConfig, EsuChatModule.Mod
321321
}
322322

323323
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
324-
fun onReply(e: UserReplyCommandEvent) {
324+
fun onReply(e: RawUserReplyEvent) {
325325
if (config.whisper.interceptNamespaces) {
326326
ChatHandler.Whisper.reply(e.user, e.message)
327327
e.isCancelled = true

‎bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/module/SocialFilterModule.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package io.github.rothes.esu.bukkit.module
22

33
import com.hankcs.algorithm.AhoCorasickDoubleArrayTrie
4-
import io.github.rothes.esu.bukkit.event.UserChatEvent
5-
import io.github.rothes.esu.bukkit.event.UserEmoteCommandEvent
6-
import io.github.rothes.esu.bukkit.event.UserWhisperCommandEvent
4+
import io.github.rothes.esu.bukkit.event.RawUserChatEvent
5+
import io.github.rothes.esu.bukkit.event.RawUserEmoteEvent
6+
import io.github.rothes.esu.bukkit.event.RawUserWhisperEvent
77
import io.github.rothes.esu.bukkit.user
88
import io.github.rothes.esu.bukkit.util.extension.ListenerExt.register
99
import io.github.rothes.esu.bukkit.util.extension.ListenerExt.unregister
@@ -70,7 +70,7 @@ object SocialFilterModule: BukkitModule<BaseModuleConfiguration, SocialFilterMod
7070
}
7171

7272
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
73-
fun onChat(e: UserChatEvent) {
73+
fun onChat(e: RawUserChatEvent) {
7474
val message = e.message.plainText
7575
val find = filters.configs.values.find {
7676
it.enabled && it.blockChat && it.contains(message)
@@ -81,7 +81,7 @@ object SocialFilterModule: BukkitModule<BaseModuleConfiguration, SocialFilterMod
8181
}
8282

8383
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
84-
fun onEmote(e: UserEmoteCommandEvent) {
84+
fun onEmote(e: RawUserEmoteEvent) {
8585
val message = e.message
8686
val find = filters.configs.values.find {
8787
it.enabled && it.blockChat && it.contains(message)
@@ -92,7 +92,7 @@ object SocialFilterModule: BukkitModule<BaseModuleConfiguration, SocialFilterMod
9292
}
9393

9494
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
95-
fun onWhisper(e: UserWhisperCommandEvent) {
95+
fun onWhisper(e: RawUserWhisperEvent) {
9696
val message = e.message
9797
val find = filters.configs.values.find {
9898
it.enabled && it.blockChat && it.contains(message)

‎bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/module/chatantispam/CasListeners.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package io.github.rothes.esu.bukkit.module.chatantispam
22

3-
import io.github.rothes.esu.bukkit.event.UserChatEvent
4-
import io.github.rothes.esu.bukkit.event.UserEmoteCommandEvent
3+
import io.github.rothes.esu.bukkit.event.RawUserChatEvent
4+
import io.github.rothes.esu.bukkit.event.RawUserEmoteEvent
5+
import io.github.rothes.esu.bukkit.event.RawUserWhisperEvent
56
import io.github.rothes.esu.bukkit.event.UserLoginEvent
6-
import io.github.rothes.esu.bukkit.event.UserWhisperCommandEvent
77
import io.github.rothes.esu.bukkit.module.ChatAntiSpamModule.config
88
import io.github.rothes.esu.bukkit.module.ChatAntiSpamModule.hasPerm
99
import io.github.rothes.esu.bukkit.module.ChatAntiSpamModule.locale
@@ -47,21 +47,21 @@ object CasListeners: Listener {
4747
}
4848

4949
@EventHandler
50-
fun onChat(e: UserChatEvent) {
50+
fun onChat(e: RawUserChatEvent) {
5151
if (checkBlocked(e.player, e.message.legacy, Chat)) {
5252
e.isCancelled = true
5353
}
5454
}
5555

5656
@EventHandler
57-
fun onEmote(e: UserEmoteCommandEvent) {
57+
fun onEmote(e: RawUserEmoteEvent) {
5858
if (checkBlocked(e.player, e.message, Emote)) {
5959
e.isCancelled = true
6060
}
6161
}
6262

6363
@EventHandler
64-
fun onWhisper(e: UserWhisperCommandEvent) {
64+
fun onWhisper(e: RawUserWhisperEvent) {
6565
if (checkBlocked(e.player, e.message, Whisper(e.target))) {
6666
e.isCancelled = true
6767
}

0 commit comments

Comments
 (0)