diff --git a/galaxy/build.gradle.kts b/galaxy/build.gradle.kts index 45ea5cc..5223b1a 100644 --- a/galaxy/build.gradle.kts +++ b/galaxy/build.gradle.kts @@ -13,7 +13,7 @@ dependencies { compileOnly("com.gitlab.ruany:LiteBansAPI:0.3.5") // move to proxy compileOnly("org.apache.commons:commons-lang3:3.12.0") // needs an alternative, already removed from upstream api and will be removed in server compileOnly("net.luckperms:api:5.3") // Luckperms - compileOnly(files("../libs/CMI.jar")) +// compileOnly(files("../libs/CMI.jar")) } tasks { diff --git a/galaxy/src/main/java/com/alttd/chat/nicknames/Nicknames.java b/galaxy/src/main/java/com/alttd/chat/nicknames/Nicknames.java index 21e1563..2105cb8 100644 --- a/galaxy/src/main/java/com/alttd/chat/nicknames/Nicknames.java +++ b/galaxy/src/main/java/com/alttd/chat/nicknames/Nicknames.java @@ -1,7 +1,5 @@ package com.alttd.chat.nicknames; -import com.Zrips.CMI.CMI; -import com.Zrips.CMI.Containers.CMIUser; import com.alttd.chat.ChatAPI; import com.alttd.chat.ChatPlugin; import com.alttd.chat.config.Config; @@ -13,7 +11,6 @@ import com.alttd.chat.objects.Nick; import com.alttd.chat.util.Utility; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; -import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; import net.luckperms.api.LuckPerms; @@ -384,7 +381,7 @@ public class Nicknames implements CommandExecutor, TabCompleter { ChatUser user = ChatUserManager.getChatUser(player.getUniqueId()); user.setDisplayName(player.getName()); player.displayName(user.getDisplayName()); - updateCMIUser(player, null); +// updateCMIUser(player, null); } public String getNick(final Player player) { @@ -399,25 +396,25 @@ public class Nicknames implements CommandExecutor, TabCompleter { ChatUser user = ChatUserManager.getChatUser(player.getUniqueId()); user.setDisplayName(nickName); player.displayName(user.getDisplayName()); - updateCMIUser(player, nickName); +// updateCMIUser(player, nickName); } // public static String format(final String m) { // return NickUtilities.applyColor(m); // } - public void updateCMIUser(Player player, String nickName) { - if (!isCMIEnabled()) - return; - - CMIUser cmiUser = CMI.getInstance().getPlayerManager().getUser(player); - if (nickName == null){ - cmiUser.setNickName(null, true); - } else { - cmiUser.setNickName(NickUtilities.applyColor(nickName), true); - } - cmiUser.updateDisplayName(); - } +// public void updateCMIUser(Player player, String nickName) { +// if (!isCMIEnabled()) +// return; +// +// CMIUser cmiUser = CMI.getInstance().getPlayerManager().getUser(player); +// if (nickName == null){ +// cmiUser.setNickName(null, true); +// } else { +// cmiUser.setNickName(NickUtilities.applyColor(nickName), true); +// } +// cmiUser.updateDisplayName(); +// } private Boolean isCMIEnabled = null; private Boolean isCMIEnabled() { diff --git a/galaxy/src/main/java/com/alttd/chat/nicknames/NicknamesEvents.java b/galaxy/src/main/java/com/alttd/chat/nicknames/NicknamesEvents.java index ff72e9f..537177a 100644 --- a/galaxy/src/main/java/com/alttd/chat/nicknames/NicknamesEvents.java +++ b/galaxy/src/main/java/com/alttd/chat/nicknames/NicknamesEvents.java @@ -1,12 +1,8 @@ package com.alttd.chat.nicknames; -import com.Zrips.CMI.commands.list.colorlimits; -import com.Zrips.CMI.utils.Util; import com.alttd.chat.ChatPlugin; import com.alttd.chat.config.Config; import com.alttd.chat.database.Queries; -import com.alttd.chat.managers.ChatUserManager; -import com.alttd.chat.objects.ChatUser; import com.alttd.chat.objects.Nick; import com.alttd.chat.util.ALogger; import com.google.common.io.ByteArrayDataInput; diff --git a/libs/CMI.jar b/libs/CMI.jar deleted file mode 100755 index 529b37c..0000000 Binary files a/libs/CMI.jar and /dev/null differ