From 0735237d48c87ce4810aa62519a3b5dc4ec504c1 Mon Sep 17 00:00:00 2001 From: XiaoMoMi <972454774@qq.com> Date: Fri, 23 Jun 2023 00:34:24 +0800 Subject: [PATCH] 2.2.2.0 --- build.gradle | 16 +++++++------- .../bungeecord/BungeeEventListener.java | 9 ++++++-- .../command/subcmd/ForcePreviewCommand.java | 2 +- .../command/subcmd/PreviewCommand.java | 2 +- .../compatibility/MagicCosmeticsListener.java | 2 +- .../manager/ActionBarManager.java | 4 ---- .../manager/ChatBubblesManager.java | 8 +++---- .../manager/ConfigManager.java | 2 ++ .../customnameplates/manager/DataManager.java | 2 +- .../manager/NameplateManager.java | 2 +- .../manager/PlaceholderManager.java | 3 +-- .../manager/ResourceManager.java | 21 +++++++++++++++---- .../customnameplates/manager/TeamManager.java | 2 +- .../object/carrier/NamedEntityImpl.java | 2 -- .../object/carrier/NamedEntityManager.java | 5 ++++- .../carrier/NamedEntityPacketsHandler.java | 2 -- .../object/carrier/VehicleChecker.java | 1 - .../placeholders/NameplatePlaceholders.java | 5 +++-- .../object/team/name/TABBungeeCordImpl.java | 3 +-- .../object/team/name/TABImpl.java | 10 +++++++-- .../object/team/packet/TeamInfoImpl.java | 1 - src/main/resources/bungee.yml | 2 +- src/main/resources/config.yml | 5 ++++- 23 files changed, 66 insertions(+), 45 deletions(-) diff --git a/build.gradle b/build.gradle index 9c87aa9..80601b3 100644 --- a/build.gradle +++ b/build.gradle @@ -4,32 +4,32 @@ plugins { } group = 'net.momirealms' -version = '2.2.1.0-hotfix' +version = '2.2.2.0' repositories { maven {name = "aliyun-repo"; url = "https://maven.aliyun.com/repository/public/"} - maven {name = 'papermc-repo'; url = 'https://papermc.io/repo/repository/maven-public/'} maven {name = 'sonatype'; url = 'https://oss.sonatype.org/content/groups/public/'} maven {name = "dmulloy2-repo"; url = "https://repo.dmulloy2.net/repository/public/"} maven {name = "clip-repo"; url = 'https://repo.extendedclip.com/content/repositories/placeholderapi/'} maven {name = "jitpack"; url = 'https://jitpack.io'} maven {name = "codecrafter47-repo"; url = 'https://nexus.codecrafter47.de/content/repositories/public/'} maven {name = "opencollab-snapshot-repo"; url = 'https://repo.opencollab.dev/main/'} - mavenCentral() + maven {name = 'papermc-repo'; url = 'https://papermc.io/repo/repository/maven-public/'} + mavenLocal() } dependencies { compileOnly fileTree(dir:'libs',includes:['*.jar']) - compileOnly ('io.papermc.paper:paper-api:1.19.4-R0.1-SNAPSHOT') + compileOnly ('io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT') compileOnly ('me.clip:placeholderapi:2.11.3') compileOnly ('com.zaxxer:HikariCP:5.0.1') compileOnly ('commons-io:commons-io:2.11.0') compileOnly ('dev.dejvokep:boosted-yaml:1.3') - compileOnly ('org.geysermc.geyser:api:2.1.0-SNAPSHOT') - compileOnly ('org.geysermc.floodgate:api:2.0-SNAPSHOT') +// compileOnly ('org.geysermc.geyser:api:2.1.0-SNAPSHOT') +// compileOnly ('org.geysermc.floodgate:api:2.0-SNAPSHOT') compileOnly ('net.md-5:bungeecord-api:1.19-R0.1-SNAPSHOT') - compileOnly ('com.github.LoneDev6:api-itemsadder:3.2.3c') - compileOnly ('com.github.FrancoBM12:API-MagicCosmetics:2.2.0') + compileOnly ('com.github.LoneDev6:api-itemsadder:3.4.1-r4') + compileOnly ('org.apache.commons:commons-lang3:3.12.0') implementation ('net.kyori:adventure-api:4.14.0') implementation ('net.kyori:adventure-platform-bukkit:4.3.0') implementation ('net.kyori:adventure-text-minimessage:4.14.0') diff --git a/src/main/java/net/momirealms/customnameplates/bungeecord/BungeeEventListener.java b/src/main/java/net/momirealms/customnameplates/bungeecord/BungeeEventListener.java index b6219af..a840e08 100644 --- a/src/main/java/net/momirealms/customnameplates/bungeecord/BungeeEventListener.java +++ b/src/main/java/net/momirealms/customnameplates/bungeecord/BungeeEventListener.java @@ -20,6 +20,8 @@ package net.momirealms.customnameplates.bungeecord; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; +import me.neznamy.tab.api.TabPlayer; +import me.neznamy.tab.api.tablist.SortingManager; import me.neznamy.tab.shared.TAB; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.event.PluginMessageEvent; @@ -31,9 +33,11 @@ import java.util.Objects; public class BungeeEventListener implements Listener { private final CustomNameplates plugin; + private final SortingManager sortingManager; public BungeeEventListener (CustomNameplates plugin) { this.plugin = plugin; + this.sortingManager = TAB.getInstance().getSortingManager(); } @EventHandler @@ -52,8 +56,9 @@ public class BungeeEventListener implements Listener { String playerName = dataInput.readUTF(); String teamName = playerName; if (plugin.getBungeeConfig().isTab()) { - teamName = TAB.getInstance().getPlayer(playerName).getTeamName(); - teamName = teamName == null ? playerName : teamName; + TabPlayer tabPlayer = TAB.getInstance().getPlayer(playerName); + if (tabPlayer == null) return; + teamName = sortingManager.getOriginalTeamName(tabPlayer); } ProxiedPlayer proxiedPlayer = plugin.getProxy().getPlayer(playerName); ByteArrayDataOutput byteArrayDataOutput = ByteStreams.newDataOutput(); diff --git a/src/main/java/net/momirealms/customnameplates/command/subcmd/ForcePreviewCommand.java b/src/main/java/net/momirealms/customnameplates/command/subcmd/ForcePreviewCommand.java index 32f8010..650bd9e 100644 --- a/src/main/java/net/momirealms/customnameplates/command/subcmd/ForcePreviewCommand.java +++ b/src/main/java/net/momirealms/customnameplates/command/subcmd/ForcePreviewCommand.java @@ -26,8 +26,8 @@ import net.momirealms.customnameplates.CustomNameplates; import net.momirealms.customnameplates.command.AbstractSubCommand; import net.momirealms.customnameplates.manager.MessageManager; import net.momirealms.customnameplates.manager.NameplateManager; -import net.momirealms.customnameplates.object.nameplate.NameplateConfig; import net.momirealms.customnameplates.object.DisplayMode; +import net.momirealms.customnameplates.object.nameplate.NameplateConfig; import net.momirealms.customnameplates.utils.AdventureUtils; import net.momirealms.customnameplates.utils.ArmorStandUtils; import org.bukkit.Bukkit; diff --git a/src/main/java/net/momirealms/customnameplates/command/subcmd/PreviewCommand.java b/src/main/java/net/momirealms/customnameplates/command/subcmd/PreviewCommand.java index 300b95b..c977df7 100644 --- a/src/main/java/net/momirealms/customnameplates/command/subcmd/PreviewCommand.java +++ b/src/main/java/net/momirealms/customnameplates/command/subcmd/PreviewCommand.java @@ -24,8 +24,8 @@ import net.momirealms.customnameplates.CustomNameplates; import net.momirealms.customnameplates.command.AbstractSubCommand; import net.momirealms.customnameplates.manager.MessageManager; import net.momirealms.customnameplates.manager.NameplateManager; -import net.momirealms.customnameplates.object.nameplate.NameplatesTeam; import net.momirealms.customnameplates.object.DisplayMode; +import net.momirealms.customnameplates.object.nameplate.NameplatesTeam; import net.momirealms.customnameplates.utils.AdventureUtils; import net.momirealms.customnameplates.utils.ArmorStandUtils; import org.bukkit.command.CommandSender; diff --git a/src/main/java/net/momirealms/customnameplates/listener/compatibility/MagicCosmeticsListener.java b/src/main/java/net/momirealms/customnameplates/listener/compatibility/MagicCosmeticsListener.java index 37b474c..7857cdb 100644 --- a/src/main/java/net/momirealms/customnameplates/listener/compatibility/MagicCosmeticsListener.java +++ b/src/main/java/net/momirealms/customnameplates/listener/compatibility/MagicCosmeticsListener.java @@ -7,8 +7,8 @@ import com.francobm.magicosmetics.events.CosmeticChangeEquipEvent; import com.francobm.magicosmetics.events.CosmeticEquipEvent; import com.francobm.magicosmetics.events.CosmeticUnEquipEvent; import com.francobm.magicosmetics.events.PlayerDataLoadEvent; -import net.momirealms.customnameplates.object.carrier.NamedEntityManager; import net.momirealms.customnameplates.object.carrier.NamedEntityCarrier; +import net.momirealms.customnameplates.object.carrier.NamedEntityManager; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/net/momirealms/customnameplates/manager/ActionBarManager.java b/src/main/java/net/momirealms/customnameplates/manager/ActionBarManager.java index e5e9e07..a98d49d 100644 --- a/src/main/java/net/momirealms/customnameplates/manager/ActionBarManager.java +++ b/src/main/java/net/momirealms/customnameplates/manager/ActionBarManager.java @@ -17,17 +17,13 @@ package net.momirealms.customnameplates.manager; -import com.comphenix.protocol.events.InternalStructure; import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.events.PacketEvent; -import com.comphenix.protocol.reflect.FieldAccessException; import com.comphenix.protocol.wrappers.EnumWrappers; import com.comphenix.protocol.wrappers.WrappedChatComponent; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.ScoreComponent; -import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.TranslatableComponent; -import net.kyori.adventure.text.format.TextDecoration; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.momirealms.customnameplates.CustomNameplates; import net.momirealms.customnameplates.listener.JoinQuitListener; diff --git a/src/main/java/net/momirealms/customnameplates/manager/ChatBubblesManager.java b/src/main/java/net/momirealms/customnameplates/manager/ChatBubblesManager.java index 782bf17..ed0c532 100644 --- a/src/main/java/net/momirealms/customnameplates/manager/ChatBubblesManager.java +++ b/src/main/java/net/momirealms/customnameplates/manager/ChatBubblesManager.java @@ -26,15 +26,15 @@ import net.momirealms.customnameplates.listener.*; import net.momirealms.customnameplates.object.DisplayMode; import net.momirealms.customnameplates.object.Function; import net.momirealms.customnameplates.object.SimpleChar; -import net.momirealms.customnameplates.object.carrier.NamedEntityManager; -import net.momirealms.customnameplates.object.carrier.NamedEntityImpl; import net.momirealms.customnameplates.object.bubble.BubbleConfig; +import net.momirealms.customnameplates.object.carrier.NamedEntityCarrier; +import net.momirealms.customnameplates.object.carrier.NamedEntityImpl; +import net.momirealms.customnameplates.object.carrier.NamedEntityManager; import net.momirealms.customnameplates.object.carrier.TextDisplayMeta; +import net.momirealms.customnameplates.object.font.OffsetFont; import net.momirealms.customnameplates.object.img.ImageParser; import net.momirealms.customnameplates.object.img.ItemsAdderImageImpl; import net.momirealms.customnameplates.object.img.OraxenImageImpl; -import net.momirealms.customnameplates.object.font.OffsetFont; -import net.momirealms.customnameplates.object.carrier.NamedEntityCarrier; import net.momirealms.customnameplates.utils.AdventureUtils; import net.momirealms.customnameplates.utils.ConfigUtils; import org.bukkit.Bukkit; diff --git a/src/main/java/net/momirealms/customnameplates/manager/ConfigManager.java b/src/main/java/net/momirealms/customnameplates/manager/ConfigManager.java index d3c2dbc..94a2f8d 100644 --- a/src/main/java/net/momirealms/customnameplates/manager/ConfigManager.java +++ b/src/main/java/net/momirealms/customnameplates/manager/ConfigManager.java @@ -54,6 +54,7 @@ public class ConfigManager extends Function { public static boolean enableBackground; public static boolean enableImages; public static int default_width; + public static boolean enable1_20_Unicode; @Override public void load(){ @@ -93,6 +94,7 @@ public class ConfigManager extends Function { images_folder_path = section.getString("image-path.images","font\\images\\"); extractShader = section.getBoolean("extract-shader",true); extractBars = section.getBoolean("extract-bar-image",true); + enable1_20_Unicode = section.getBoolean("support-1_20-unicodes",false); } } diff --git a/src/main/java/net/momirealms/customnameplates/manager/DataManager.java b/src/main/java/net/momirealms/customnameplates/manager/DataManager.java index 6ef8c36..176053b 100644 --- a/src/main/java/net/momirealms/customnameplates/manager/DataManager.java +++ b/src/main/java/net/momirealms/customnameplates/manager/DataManager.java @@ -20,8 +20,8 @@ package net.momirealms.customnameplates.manager; import net.momirealms.customnameplates.CustomNameplates; import net.momirealms.customnameplates.data.*; import net.momirealms.customnameplates.listener.JoinQuitListener; -import net.momirealms.customnameplates.object.Function; import net.momirealms.customnameplates.object.DisplayMode; +import net.momirealms.customnameplates.object.Function; import net.momirealms.customnameplates.utils.ConfigUtils; import org.bukkit.Bukkit; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/src/main/java/net/momirealms/customnameplates/manager/NameplateManager.java b/src/main/java/net/momirealms/customnameplates/manager/NameplateManager.java index 9832317..5f61653 100644 --- a/src/main/java/net/momirealms/customnameplates/manager/NameplateManager.java +++ b/src/main/java/net/momirealms/customnameplates/manager/NameplateManager.java @@ -20,12 +20,12 @@ package net.momirealms.customnameplates.manager; import net.momirealms.customnameplates.CustomNameplates; import net.momirealms.customnameplates.api.CustomNameplatesAPI; import net.momirealms.customnameplates.object.ConditionalText; +import net.momirealms.customnameplates.object.DisplayMode; import net.momirealms.customnameplates.object.Function; import net.momirealms.customnameplates.object.SimpleChar; import net.momirealms.customnameplates.object.carrier.*; import net.momirealms.customnameplates.object.font.OffsetFont; import net.momirealms.customnameplates.object.nameplate.NameplateConfig; -import net.momirealms.customnameplates.object.DisplayMode; import net.momirealms.customnameplates.object.requirements.Requirement; import net.momirealms.customnameplates.utils.AdventureUtils; import net.momirealms.customnameplates.utils.ConfigUtils; diff --git a/src/main/java/net/momirealms/customnameplates/manager/PlaceholderManager.java b/src/main/java/net/momirealms/customnameplates/manager/PlaceholderManager.java index 96fe7d0..bf4a560 100644 --- a/src/main/java/net/momirealms/customnameplates/manager/PlaceholderManager.java +++ b/src/main/java/net/momirealms/customnameplates/manager/PlaceholderManager.java @@ -21,7 +21,6 @@ import me.clip.placeholderapi.PlaceholderAPI; import net.momirealms.customnameplates.CustomNameplates; import net.momirealms.customnameplates.object.ConditionalText; import net.momirealms.customnameplates.object.Function; -import net.momirealms.customnameplates.object.placeholders.StaticText; import net.momirealms.customnameplates.object.font.OffsetFont; import net.momirealms.customnameplates.object.placeholders.*; import net.momirealms.customnameplates.utils.ConfigUtils; @@ -115,7 +114,7 @@ public class PlaceholderManager extends Function { loadVanillaHud(vanillaHudSection); } - if (plugin.getVersionHelper().isVersionNewerThan1_20()) { + if (plugin.getVersionHelper().isVersionNewerThan1_20() && !ConfigManager.enable1_20_Unicode) { return; } diff --git a/src/main/java/net/momirealms/customnameplates/manager/ResourceManager.java b/src/main/java/net/momirealms/customnameplates/manager/ResourceManager.java index fbe11ee..23e080e 100644 --- a/src/main/java/net/momirealms/customnameplates/manager/ResourceManager.java +++ b/src/main/java/net/momirealms/customnameplates/manager/ResourceManager.java @@ -17,8 +17,9 @@ package net.momirealms.customnameplates.manager; -import com.google.gson.*; -import com.google.gson.stream.JsonReader; +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import com.google.gson.JsonPrimitive; import net.momirealms.customnameplates.CustomNameplates; import net.momirealms.customnameplates.object.SimpleChar; import net.momirealms.customnameplates.object.background.BackGroundConfig; @@ -221,8 +222,8 @@ public class ResourceManager { e.printStackTrace(); } } - if (plugin.getVersionHelper().isVersionNewerThan1_20()) { - AdventureUtils.consoleMessage("[CustomNameplates] For the moment decent unicode is not available on 1.20"); + if (!ConfigManager.enable1_20_Unicode && plugin.getVersionHelper().isVersionNewerThan1_20()) { + AdventureUtils.consoleMessage("[CustomNameplates] For the moment decent unicode is not available on 1.20. You can enable support-1_20-unicodes in config.yml to ignore the limit."); return; } for (int ascent : plugin.getPlaceholderManager().getDescent_unicode_fonts()) { @@ -247,6 +248,18 @@ public class ResourceManager { e.printStackTrace(); } } + if (ConfigManager.enable1_20_Unicode) { + try { + FileUtils.copyDirectory(new File(plugin.getDataFolder(), "unicodes"), new File(plugin.getDataFolder(), + "ResourcePack" + + File.separator + "assets" + + File.separator + "minecraft" + + File.separator + "textures" + + File.separator + "font")); + } catch (IOException e) { + e.printStackTrace(); + } + } } private void deleteDirectory(File file){ diff --git a/src/main/java/net/momirealms/customnameplates/manager/TeamManager.java b/src/main/java/net/momirealms/customnameplates/manager/TeamManager.java index 7acc075..f4579f4 100644 --- a/src/main/java/net/momirealms/customnameplates/manager/TeamManager.java +++ b/src/main/java/net/momirealms/customnameplates/manager/TeamManager.java @@ -19,9 +19,9 @@ package net.momirealms.customnameplates.manager; import net.momirealms.customnameplates.CustomNameplates; import net.momirealms.customnameplates.listener.JoinQuitListener; +import net.momirealms.customnameplates.object.DisplayMode; import net.momirealms.customnameplates.object.Function; import net.momirealms.customnameplates.object.nameplate.NameplatesTeam; -import net.momirealms.customnameplates.object.DisplayMode; import net.momirealms.customnameplates.object.team.TeamNameInterface; import net.momirealms.customnameplates.object.team.TeamPacketInterface; import net.momirealms.customnameplates.object.team.name.PlayerNameTeamImpl; diff --git a/src/main/java/net/momirealms/customnameplates/object/carrier/NamedEntityImpl.java b/src/main/java/net/momirealms/customnameplates/object/carrier/NamedEntityImpl.java index 3ad9b5c..83300b2 100644 --- a/src/main/java/net/momirealms/customnameplates/object/carrier/NamedEntityImpl.java +++ b/src/main/java/net/momirealms/customnameplates/object/carrier/NamedEntityImpl.java @@ -23,8 +23,6 @@ import com.comphenix.protocol.wrappers.WrappedChatComponent; import com.comphenix.protocol.wrappers.WrappedDataValue; import com.comphenix.protocol.wrappers.WrappedDataWatcher; import com.google.common.collect.Lists; -import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.momirealms.customnameplates.CustomNameplates; import net.momirealms.customnameplates.object.DisplayMode; import net.momirealms.customnameplates.object.DynamicText; diff --git a/src/main/java/net/momirealms/customnameplates/object/carrier/NamedEntityManager.java b/src/main/java/net/momirealms/customnameplates/object/carrier/NamedEntityManager.java index b5eb50d..5046b9e 100644 --- a/src/main/java/net/momirealms/customnameplates/object/carrier/NamedEntityManager.java +++ b/src/main/java/net/momirealms/customnameplates/object/carrier/NamedEntityManager.java @@ -22,7 +22,10 @@ import net.momirealms.customnameplates.object.DisplayMode; import net.momirealms.customnameplates.object.DynamicText; import org.bukkit.entity.Player; -import java.util.*; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import java.util.Vector; import java.util.concurrent.ConcurrentHashMap; public class NamedEntityManager { diff --git a/src/main/java/net/momirealms/customnameplates/object/carrier/NamedEntityPacketsHandler.java b/src/main/java/net/momirealms/customnameplates/object/carrier/NamedEntityPacketsHandler.java index 172c137..34f7db9 100644 --- a/src/main/java/net/momirealms/customnameplates/object/carrier/NamedEntityPacketsHandler.java +++ b/src/main/java/net/momirealms/customnameplates/object/carrier/NamedEntityPacketsHandler.java @@ -19,8 +19,6 @@ package net.momirealms.customnameplates.object.carrier; import net.momirealms.customnameplates.CustomNameplates; import net.momirealms.customnameplates.listener.packet.*; -import net.momirealms.customnameplates.object.carrier.NamedEntityCarrier; -import net.momirealms.customnameplates.object.carrier.AbstractPacketsHandler; import org.bukkit.entity.Player; import java.util.List; diff --git a/src/main/java/net/momirealms/customnameplates/object/carrier/VehicleChecker.java b/src/main/java/net/momirealms/customnameplates/object/carrier/VehicleChecker.java index 7d6316a..954eaf9 100644 --- a/src/main/java/net/momirealms/customnameplates/object/carrier/VehicleChecker.java +++ b/src/main/java/net/momirealms/customnameplates/object/carrier/VehicleChecker.java @@ -19,7 +19,6 @@ package net.momirealms.customnameplates.object.carrier; import net.momirealms.customnameplates.CustomNameplates; import net.momirealms.customnameplates.object.Function; -import net.momirealms.customnameplates.object.carrier.NamedEntityCarrier; import org.bukkit.Bukkit; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; diff --git a/src/main/java/net/momirealms/customnameplates/object/placeholders/NameplatePlaceholders.java b/src/main/java/net/momirealms/customnameplates/object/placeholders/NameplatePlaceholders.java index 4ac2021..c22c675 100644 --- a/src/main/java/net/momirealms/customnameplates/object/placeholders/NameplatePlaceholders.java +++ b/src/main/java/net/momirealms/customnameplates/object/placeholders/NameplatePlaceholders.java @@ -145,8 +145,9 @@ public class NameplatePlaceholders extends PlaceholderExpansion { private String getTime(Player player) { long time = player.getWorld().getTime(); String ap = time >= 6000 && time < 18000 ? " PM" : " AM"; - int hours = (int) (time / 1000) + 6; + int hours = (int) (time / 1000) ; int minutes = (int) ((time - hours * 1000 ) * 0.06); + hours += 6; while (hours >= 12) hours -= 12; if (minutes < 10) return hours + ":0" + minutes + ap; else return hours + ":" + minutes + ap; @@ -213,7 +214,7 @@ public class NameplatePlaceholders extends PlaceholderExpansion { } private String getUnicodeDescent(String param, Player player) { - if (plugin.getVersionHelper().isVersionNewerThan1_20()) { + if (!ConfigManager.enable1_20_Unicode && plugin.getVersionHelper().isVersionNewerThan1_20()) { return "Not Available on 1.20"; } DescentText descentText = placeholderManager.getDescentUnicode(param); diff --git a/src/main/java/net/momirealms/customnameplates/object/team/name/TABBungeeCordImpl.java b/src/main/java/net/momirealms/customnameplates/object/team/name/TABBungeeCordImpl.java index 2131b45..4619221 100644 --- a/src/main/java/net/momirealms/customnameplates/object/team/name/TABBungeeCordImpl.java +++ b/src/main/java/net/momirealms/customnameplates/object/team/name/TABBungeeCordImpl.java @@ -59,8 +59,7 @@ public class TABBungeeCordImpl implements TeamNameInterface { if (teamName == null) { sendRequest(player); return player.getName(); - } - else { + } else { return teamName; } } diff --git a/src/main/java/net/momirealms/customnameplates/object/team/name/TABImpl.java b/src/main/java/net/momirealms/customnameplates/object/team/name/TABImpl.java index f292ce3..eddd4de 100644 --- a/src/main/java/net/momirealms/customnameplates/object/team/name/TABImpl.java +++ b/src/main/java/net/momirealms/customnameplates/object/team/name/TABImpl.java @@ -18,18 +18,24 @@ package net.momirealms.customnameplates.object.team.name; import me.neznamy.tab.api.TabPlayer; +import me.neznamy.tab.api.tablist.SortingManager; import me.neznamy.tab.shared.TAB; import net.momirealms.customnameplates.object.team.TeamNameInterface; import org.bukkit.entity.Player; public class TABImpl implements TeamNameInterface { + private final SortingManager sortingManager; + + public TABImpl() { + sortingManager = TAB.getInstance().getSortingManager(); + } + @Override public String getTeamName(Player player) { TabPlayer tabPlayer = TAB.getInstance().getPlayer(player.getUniqueId()); if (tabPlayer == null) return player.getName(); - String teamName = tabPlayer.getTeamName(); - return teamName == null ? player.getName() : teamName; + return sortingManager.getOriginalTeamName(tabPlayer); } @Override diff --git a/src/main/java/net/momirealms/customnameplates/object/team/packet/TeamInfoImpl.java b/src/main/java/net/momirealms/customnameplates/object/team/packet/TeamInfoImpl.java index 04599d5..d3734f0 100644 --- a/src/main/java/net/momirealms/customnameplates/object/team/packet/TeamInfoImpl.java +++ b/src/main/java/net/momirealms/customnameplates/object/team/packet/TeamInfoImpl.java @@ -24,7 +24,6 @@ import com.comphenix.protocol.utility.MinecraftReflection; import com.comphenix.protocol.wrappers.WrappedChatComponent; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.momirealms.customnameplates.CustomNameplates; -import net.momirealms.customnameplates.helper.Log; import net.momirealms.customnameplates.manager.TeamManager; import net.momirealms.customnameplates.object.nameplate.NameplatesTeam; import net.momirealms.customnameplates.object.team.TeamPacketInterface; diff --git a/src/main/resources/bungee.yml b/src/main/resources/bungee.yml index 810bd81..f6f4e9c 100644 --- a/src/main/resources/bungee.yml +++ b/src/main/resources/bungee.yml @@ -1,5 +1,5 @@ name: CustomNameplates main: net.momirealms.customnameplates.bungeecord.CustomNameplates -version: '2.2.0.4' +version: '2.2.1.2' author: XiaoMoMi softDepends: [TAB, BungeeTabListPlus] \ No newline at end of file diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 8b941fd..6b8095a 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,5 +1,5 @@ # Do not change -config-version: '16' +config-version: '17' # bStats metrics: true @@ -62,6 +62,9 @@ resource-pack: # The initial character of a font # 字体的初始字符 initial-char: '뀁' + # Unicode Support for 1.20+ clients + # This would make your resource pack about 900KB bigger + support-1_20-unicodes: false other-settings: # default width