|
1 | 1 | package com.mairwunnx.projectessentials.chat |
2 | 2 |
|
3 | | -import com.mairwunnx.projectessentials.chat.models.ChatModelBase |
4 | 3 | import com.mairwunnx.projectessentialscore.EssBase |
5 | 4 | import com.mairwunnx.projectessentialscore.extensions.sendMsg |
6 | 5 | import com.mairwunnx.projectessentialspermissions.permissions.PermissionsAPI |
7 | 6 | import net.minecraft.util.text.TextComponentUtils |
8 | 7 | import net.minecraft.util.text.event.ClickEvent |
9 | | -import net.minecraft.util.text.event.HoverEvent |
10 | 8 | import net.minecraftforge.common.MinecraftForge |
11 | 9 | import net.minecraftforge.event.ServerChatEvent |
12 | 10 | import net.minecraftforge.eventbus.api.SubscribeEvent |
@@ -72,23 +70,29 @@ class EntryPoint : EssBase() { |
72 | 70 | } |
73 | 71 |
|
74 | 72 | val nicknameComponent = TextComponentUtils.toTextComponent { |
75 | | - ChatModelBase.chatModel.messaging.messagePattern.replace( |
| 73 | + ChatUtils.getMessagePattern(event).replace( |
76 | 74 | "%player", event.username |
77 | 75 | ) |
78 | 76 | }.style.setClickEvent( |
79 | 77 | ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/m ${event.username}") |
80 | | - ).setHoverEvent(HoverEvent(HoverEvent.Action.SHOW_ENTITY, event.component)) |
| 78 | + ) |
81 | 79 |
|
82 | 80 | event.component = TextComponentUtils.toTextComponent { |
83 | | - ChatModelBase.chatModel.messaging.messagePattern.replace( |
84 | | - "%type", "~" |
| 81 | + ChatUtils.getMessagePattern(event).replace( |
| 82 | + "%group", PermissionsAPI.getUserGroup(event.username).name |
85 | 83 | ).replace( |
86 | 84 | "%player", event.username |
87 | 85 | ).replace( |
88 | | - "%message", event.message |
| 86 | + "%message", event.component.formattedText |
89 | 87 | ).replace( |
90 | 88 | "&", "§" |
91 | 89 | ) |
92 | 90 | }.setStyle(nicknameComponent) |
| 91 | + |
| 92 | +// if (!ChatUtils.isGlobalChat(event)) { |
| 93 | +// // get near player and send player messages |
| 94 | +// event.isCanceled = true |
| 95 | +// return |
| 96 | +// } |
93 | 97 | } |
94 | 98 | } |
0 commit comments