Altitude/Chat
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more chatcolor usage

Browse Source
This commit is contained in:
len 2021-05-16 17:28:14 +02:00
parent 4a8f98da9f
commit a135900a1c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
velocity/src/main/java/com/alttd/chat/listeners/ChatListener.java
View File

@ -4,6 +4,7 @@ import com.alttd.chat.VelocityChat;
import com.alttd.chat.api.GlobalAdminChatEvent; import com.alttd.chat.api.GlobalAdminChatEvent;
import com.alttd.chat.api.PrivateMessageEvent; import com.alttd.chat.api.PrivateMessageEvent;
import com.alttd.chat.config.Config; import com.alttd.chat.config.Config;
import com.alttd.chat.util.Utility;
import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.command.CommandSource;
import com.velocitypowered.api.event.PostOrder; import com.velocitypowered.api.event.PostOrder;
import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.Subscribe;
@ -30,16 +31,13 @@ public class ChatListener {
@Subscribe(order = PostOrder.FIRST) @Subscribe(order = PostOrder.FIRST)
public void onGlobalStaffChat(GlobalAdminChatEvent event) { public void onGlobalStaffChat(GlobalAdminChatEvent event) {
String senderName; String senderName = Config.CONSOLENAME;
String serverName; String serverName = "Altitude";
CommandSource commandSource = event.getSender(); CommandSource commandSource = event.getSender();
if (commandSource instanceof Player) { if (commandSource instanceof Player) {
Player sender = (Player) event.getSender(); Player sender = (Player) event.getSender();
senderName = sender.getUsername(); senderName = sender.getUsername();
serverName = sender.getCurrentServer().isPresent() ? sender.getCurrentServer().get().getServerInfo().getName() : "Altitude"; serverName = sender.getCurrentServer().isPresent() ? sender.getCurrentServer().get().getServerInfo().getName() : "Altitude";
} else {
senderName = "Console"; // TODO console name from config
serverName = "Proxy";
} }
MiniMessage miniMessage = MiniMessage.get(); MiniMessage miniMessage = MiniMessage.get();
@ -47,7 +45,8 @@ public class ChatListener {
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
map.put("sender", senderName); map.put("sender", senderName);
map.put("message", event.getMessage()); //map.put("message", event.getMessage());
map.put("message", Utility.parseColors(event.getMessage()));
map.put("server", serverName); map.put("server", serverName);
Component message = miniMessage.parse(Config.GACFORMAT, map); Component message = miniMessage.parse(Config.GACFORMAT, map);

1
velocity/src/main/java/com/alttd/chat/util/Regex.java
View File

@ -15,6 +15,7 @@ import java.util.regex.Pattern;
public class Regex { public class Regex {
// todo move this to API!
private static final HashMap<Pattern, ArrayList<String>> cancelRegex = new HashMap<>(); private static final HashMap<Pattern, ArrayList<String>> cancelRegex = new HashMap<>();
private static final HashMap<String, String> replaceRegex = new HashMap<>(); private static final HashMap<String, String> replaceRegex = new HashMap<>();