mirror of
https://github.com/CarmJos/UserPrefix.git
synced 2024-09-19 20:15:47 +00:00
[#12] 优化代码格式
This commit is contained in:
parent
ac55fc135c
commit
2e46888019
@ -85,7 +85,7 @@ public class UserManager {
|
|||||||
boolean descOrder = PluginConfig.Functions.NAME_ORDER_DESC.get();
|
boolean descOrder = PluginConfig.Functions.NAME_ORDER_DESC.get();
|
||||||
if (onlinePlayerTag != null) {
|
if (onlinePlayerTag != null) {
|
||||||
onlinePlayerTag.setPrefix(player, playerPrefix.getContent());
|
onlinePlayerTag.setPrefix(player, playerPrefix.getContent());
|
||||||
onlinePlayerTag.setOrder(player, descOrder ? 99999 - playerPrefix.getWeight() : playerPrefix.getWeight());
|
onlinePlayerTag.setOrder(player, descOrder ? 999 - playerPrefix.getWeight() : playerPrefix.getWeight());
|
||||||
Main.debug("为玩家 " + onlinePlayer.getName() + " 设置了 " + player.getName() + "的前缀为 #" + playerPrefix.getWeight() + " " + playerPrefix.getName());
|
Main.debug("为玩家 " + onlinePlayer.getName() + " 设置了 " + player.getName() + "的前缀为 #" + playerPrefix.getWeight() + " " + playerPrefix.getName());
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -93,7 +93,7 @@ public class UserManager {
|
|||||||
if (loadOthers) {
|
if (loadOthers) {
|
||||||
ConfiguredPrefix onlinePlayerPrefix = UserManager.getPrefix(onlinePlayer);
|
ConfiguredPrefix onlinePlayerPrefix = UserManager.getPrefix(onlinePlayer);
|
||||||
tag.setPrefix(onlinePlayer, onlinePlayerPrefix.getContent());
|
tag.setPrefix(onlinePlayer, onlinePlayerPrefix.getContent());
|
||||||
tag.setOrder(onlinePlayer, descOrder ? 99999 - onlinePlayerPrefix.getWeight() : onlinePlayerPrefix.getWeight());
|
tag.setOrder(onlinePlayer, descOrder ? 999 - onlinePlayerPrefix.getWeight() : onlinePlayerPrefix.getWeight());
|
||||||
Main.debug("为玩家 " + player.getName() + " 设置了 " + onlinePlayer.getName() + "的前缀为 #" + onlinePlayerPrefix.getWeight() + " " + onlinePlayerPrefix.getName());
|
Main.debug("为玩家 " + player.getName() + " 设置了 " + onlinePlayer.getName() + "的前缀为 #" + onlinePlayerPrefix.getWeight() + " " + onlinePlayerPrefix.getName());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,6 +4,7 @@ import org.bukkit.Bukkit;
|
|||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.scoreboard.Scoreboard;
|
import org.bukkit.scoreboard.Scoreboard;
|
||||||
import org.bukkit.scoreboard.Team;
|
import org.bukkit.scoreboard.Team;
|
||||||
|
import org.jetbrains.annotations.Range;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@ -12,10 +13,12 @@ import java.util.UUID;
|
|||||||
|
|
||||||
public class UserNameTag {
|
public class UserNameTag {
|
||||||
|
|
||||||
|
public static final int MAX_ORDER = 999;
|
||||||
|
|
||||||
private final Player viewer;
|
private final Player viewer;
|
||||||
private Team team;
|
private Team team;
|
||||||
private final Scoreboard sb;
|
private final Scoreboard sb;
|
||||||
private int order = 99999;
|
private int order = MAX_ORDER;
|
||||||
private final Map<UUID, Integer> targetOrders = new HashMap<>();
|
private final Map<UUID, Integer> targetOrders = new HashMap<>();
|
||||||
private final Map<UUID, String> previousTeamNames = new HashMap<>();
|
private final Map<UUID, String> previousTeamNames = new HashMap<>();
|
||||||
|
|
||||||
@ -63,11 +66,9 @@ public class UserNameTag {
|
|||||||
/**
|
/**
|
||||||
* 设置名字在TabList中的顺序
|
* 设置名字在TabList中的顺序
|
||||||
*
|
*
|
||||||
* @param order 顺序 (0~99999)
|
* @param order 顺序 (0~999)
|
||||||
*/
|
*/
|
||||||
public void setOrder(int order) {
|
public void setOrder(@Range(from = 0, to = 999) int order) {
|
||||||
if (order < 0 || order > 99999)
|
|
||||||
throw new IllegalArgumentException("order must be in 0~99999");
|
|
||||||
this.order = order;
|
this.order = order;
|
||||||
targetOrders.put(viewer.getUniqueId(), order);
|
targetOrders.put(viewer.getUniqueId(), order);
|
||||||
update(viewer);
|
update(viewer);
|
||||||
@ -78,9 +79,7 @@ public class UserNameTag {
|
|||||||
*
|
*
|
||||||
* @param order 顺序
|
* @param order 顺序
|
||||||
*/
|
*/
|
||||||
public void setOrder(Player target, int order) {
|
public void setOrder(Player target, @Range(from = 0, to = 999) int order) {
|
||||||
if (order < 0 || order > 99999) throw new IllegalArgumentException("order must be in 0~99999");
|
|
||||||
|
|
||||||
Team targetTeam = checkTeam(target);
|
Team targetTeam = checkTeam(target);
|
||||||
String teamName = order + UUID.randomUUID().toString().substring(0, 10);
|
String teamName = order + UUID.randomUUID().toString().substring(0, 10);
|
||||||
targetTeam.setDisplayName(teamName);
|
targetTeam.setDisplayName(teamName);
|
||||||
@ -109,7 +108,7 @@ public class UserNameTag {
|
|||||||
team = newTeam;
|
team = newTeam;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
int order = targetOrders.getOrDefault(target.getUniqueId(), 99999);
|
int order = targetOrders.getOrDefault(target.getUniqueId(), 999);
|
||||||
String previousTeamName = previousTeamNames.get(target.getUniqueId());
|
String previousTeamName = previousTeamNames.get(target.getUniqueId());
|
||||||
if (previousTeamName == null) {
|
if (previousTeamName == null) {
|
||||||
return;
|
return;
|
||||||
@ -137,7 +136,7 @@ public class UserNameTag {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private Team checkTeam(Player target) {
|
private Team checkTeam(Player target) {
|
||||||
int order = targetOrders.getOrDefault(target.getUniqueId(), 99999);
|
int order = targetOrders.getOrDefault(target.getUniqueId(), 999);
|
||||||
String name = order + target.getUniqueId().toString().substring(0, 10);
|
String name = order + target.getUniqueId().toString().substring(0, 10);
|
||||||
Team targetTeam = this.sb.getTeam(name);
|
Team targetTeam = this.sb.getTeam(name);
|
||||||
if (targetTeam == null) {
|
if (targetTeam == null) {
|
||||||
|
Loading…
Reference in New Issue
Block a user