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

Removed code that uses Bukkit API from the API

Browse Source
This commit is contained in:
Teriuihi 2021-07-31 23:16:51 +02:00
parent a61399bd71
commit 59a6edd4f6
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/src/main/java/com/alttd/chat/objects/ChatUser.java
View File

@ -3,6 +3,8 @@ package com.alttd.chat.objects;
import com.alttd.chat.database.Queries;
import com.alttd.chat.util.Utility;
import net.kyori.adventure.text.Component;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import java.util.ArrayList;
import java.util.List;
@ -32,7 +34,12 @@ public class ChatUser {
name = Queries.getNickname(uuid);
if (name == null) {
name = Utility.getDisplayName(uuid);
OfflinePlayer player = Bukkit.getPlayer(uuid);
String playerName = "";
if (player != null && player.hasPlayedBefore()) {
playerName = player.getName();
}
name = Utility.getDisplayName(uuid, playerName);
}
setDisplayName(name);

15
api/src/main/java/com/alttd/chat/util/Utility.java
View File

@ -3,20 +3,16 @@ package com.alttd.chat.util;
import com.alttd.chat.ChatAPI;
import com.alttd.chat.config.Config;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.TextColor;
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import net.kyori.adventure.text.serializer.plain.PlainComponentSerializer;
import net.luckperms.api.LuckPerms;
import net.luckperms.api.model.group.Group;
import net.luckperms.api.model.user.User;
import net.luckperms.api.node.Node;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import java.awt.*;
import java.util.*;
public class Utility {
@ -87,11 +83,8 @@ public class Utility {
return applyColor(prefix.toString());
}
public static String getDisplayName(UUID uuid) {
OfflinePlayer player = Bukkit.getPlayer(uuid);
if (player != null && player.hasPlayedBefore()) {
return player.getName();
}
public static String getDisplayName(UUID uuid, String playerName) {
if (!playerName.isBlank()) return playerName;
LuckPerms luckPerms = ChatAPI.get().getLuckPerms();
User user = luckPerms.getUserManager().getUser(uuid);
if(user == null) return "";
@ -195,7 +188,7 @@ public class Utility {
MiniMessage miniMessage = MiniMessage.get();
Bukkit.getOnlinePlayers().forEach(a ->{
Component blockedNotification = miniMessage.parse("<red>[" + prefix + "] "
+ Utility.getDisplayName(player.getUniqueId())
+ Utility.getDisplayName(player.getUniqueId(), player.getName())
+ (target.isEmpty() ? " tried to say: " : " -> " + target + ": ")
+ input + "</red>");
if (a.hasPermission("chat.alert-blocked")) {
@ -210,7 +203,7 @@ public class Utility {
MiniMessage miniMessage = MiniMessage.get();
Bukkit.getOnlinePlayers().forEach(a ->{
Component blockedNotification = miniMessage.parse("<red>[" + prefix + "] "
+ Utility.getDisplayName(player.getUniqueId())
+ Utility.getDisplayName(player.getUniqueId(), player.getName())
+ " tried to say: "
+ input + "</red>");
if (a.hasPermission("chat.alert-blocked")) {