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

Remove CMI

Browse Source
This commit is contained in:
Len 2024-07-27 11:03:55 +02:00
parent c3e27edb7e
commit ba8ba373fd
4 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
galaxy/build.gradle.kts
View File

@ -13,7 +13,7 @@ dependencies {
compileOnly("com.gitlab.ruany:LiteBansAPI:0.3.5") // move to proxy 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("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("net.luckperms:api:5.3") // Luckperms
compileOnly(files("../libs/CMI.jar")) // compileOnly(files("../libs/CMI.jar"))
} }
tasks { tasks {

31
galaxy/src/main/java/com/alttd/chat/nicknames/Nicknames.java
View File

@ -1,7 +1,5 @@
package com.alttd.chat.nicknames; 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.ChatAPI;
import com.alttd.chat.ChatPlugin; import com.alttd.chat.ChatPlugin;
import com.alttd.chat.config.Config; import com.alttd.chat.config.Config;
@ -13,7 +11,6 @@ import com.alttd.chat.objects.Nick;
import com.alttd.chat.util.Utility; import com.alttd.chat.util.Utility;
import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteArrayDataOutput;
import com.google.common.io.ByteStreams; 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.Placeholder;
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import net.luckperms.api.LuckPerms; import net.luckperms.api.LuckPerms;
@ -384,7 +381,7 @@ public class Nicknames implements CommandExecutor, TabCompleter {
ChatUser user = ChatUserManager.getChatUser(player.getUniqueId()); ChatUser user = ChatUserManager.getChatUser(player.getUniqueId());
user.setDisplayName(player.getName()); user.setDisplayName(player.getName());
player.displayName(user.getDisplayName()); player.displayName(user.getDisplayName());
updateCMIUser(player, null); // updateCMIUser(player, null);
} }
public String getNick(final Player player) { public String getNick(final Player player) {
@ -399,25 +396,25 @@ public class Nicknames implements CommandExecutor, TabCompleter {
ChatUser user = ChatUserManager.getChatUser(player.getUniqueId()); ChatUser user = ChatUserManager.getChatUser(player.getUniqueId());
user.setDisplayName(nickName); user.setDisplayName(nickName);
player.displayName(user.getDisplayName()); player.displayName(user.getDisplayName());
updateCMIUser(player, nickName); // updateCMIUser(player, nickName);
} }
// public static String format(final String m) { // public static String format(final String m) {
// return NickUtilities.applyColor(m); // return NickUtilities.applyColor(m);
// } // }
public void updateCMIUser(Player player, String nickName) { // public void updateCMIUser(Player player, String nickName) {
if (!isCMIEnabled()) // if (!isCMIEnabled())
return; // return;
//
CMIUser cmiUser = CMI.getInstance().getPlayerManager().getUser(player); // CMIUser cmiUser = CMI.getInstance().getPlayerManager().getUser(player);
if (nickName == null){ // if (nickName == null){
cmiUser.setNickName(null, true); // cmiUser.setNickName(null, true);
} else { // } else {
cmiUser.setNickName(NickUtilities.applyColor(nickName), true); // cmiUser.setNickName(NickUtilities.applyColor(nickName), true);
} // }
cmiUser.updateDisplayName(); // cmiUser.updateDisplayName();
} // }
private Boolean isCMIEnabled = null; private Boolean isCMIEnabled = null;
private Boolean isCMIEnabled() { private Boolean isCMIEnabled() {

4
galaxy/src/main/java/com/alttd/chat/nicknames/NicknamesEvents.java
View File

@ -1,12 +1,8 @@
package com.alttd.chat.nicknames; 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.ChatPlugin;
import com.alttd.chat.config.Config; import com.alttd.chat.config.Config;
import com.alttd.chat.database.Queries; 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.objects.Nick;
import com.alttd.chat.util.ALogger; import com.alttd.chat.util.ALogger;
import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataInput;

BIN
libs/CMI.jar
View File

Binary file not shown.