diff options
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker')
3 files changed, 11 insertions, 22 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/IslandSelfWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/IslandSelfWidget.java index 45cad6c3..4b03da6e 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/IslandSelfWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/IslandSelfWidget.java @@ -31,8 +31,7 @@ public class IslandSelfWidget extends Widget { } Text entry = (m.group(1) != null) ? Text.of(m.group(1)) : Text.of(m.group(2)); - PlainTextComponent ptc = new PlainTextComponent(entry); - this.addComponent(ptc); + this.addComponent(new PlainTextComponent(entry)); } this.pack(); } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/PlayerListWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/PlayerListWidget.java index 0f0d1fa9..439fcb56 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/PlayerListWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/PlayerListWidget.java @@ -1,20 +1,18 @@ package me.xmrvizzy.skyblocker.skyblock.tabhud.widget; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; - import me.xmrvizzy.skyblocker.config.SkyblockerConfig; import me.xmrvizzy.skyblocker.skyblock.tabhud.util.PlayerListMgr; import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.component.PlainTextComponent; import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.component.PlayerComponent; import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.component.TableComponent; - import net.minecraft.client.network.PlayerListEntry; import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; +import java.util.ArrayList; +import java.util.Comparator; + // this widget shows a list of players with their skins. // responsible for non-private-island areas @@ -23,7 +21,7 @@ public class PlayerListWidget extends Widget { private static final MutableText TITLE = Text.literal("Players").formatted(Formatting.GREEN, Formatting.BOLD); - private ArrayList<PlayerListEntry> list = new ArrayList<>(); + private final ArrayList<PlayerListEntry> list = new ArrayList<>(); public PlayerListWidget() { super(TITLE, Formatting.GREEN.getColorValue()); @@ -43,20 +41,14 @@ public class PlayerListWidget extends Widget { // https://stackoverflow.com/questions/7139382/java-rounding-up-to-an-int-using-math-ceil#21830188 int tblW = ((listlen - 80) - 1) / 20 + 1; - TableComponent tc = new TableComponent(tblW, (listlen - 80 >= 20) ? 20 : listlen - 80, - Formatting.GREEN.getColorValue()); + TableComponent tc = new TableComponent(tblW, Math.min(listlen - 80, 20), Formatting.GREEN.getColorValue()); for (int i = 80; i < listlen; i++) { list.add(PlayerListMgr.getRaw(i)); } - + if (SkyblockerConfig.get().general.tabHud.nameSorting == SkyblockerConfig.NameSorting.ALPHABETICAL) { - Collections.sort(list, new Comparator<PlayerListEntry>() { - @Override - public int compare(PlayerListEntry o1, PlayerListEntry o2) { - return o1.getProfile().getName().toLowerCase().compareTo(o2.getProfile().getName().toLowerCase()); - } - }); + list.sort(Comparator.comparing(o -> o.getProfile().getName().toLowerCase())); } int x = 0, y = 0; diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/PlayerComponent.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/PlayerComponent.java index 32058e26..1be6adda 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/PlayerComponent.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/PlayerComponent.java @@ -15,17 +15,15 @@ public class PlayerComponent extends Component { private static final int SKIN_ICO_DIM = 8; - private Text name; - private Identifier tex; + private final Text name; + private final Identifier tex; public PlayerComponent(PlayerListEntry ple) { boolean plainNames = SkyblockerConfig.get().general.tabHud.plainPlayerNames; Team team = ple.getScoreboardTeam(); String username = ple.getProfile().getName(); - Text displayName = (team != null && !plainNames) ? Text.empty().append(team.getPrefix()).append(Text.literal(username).formatted(team.getColor())).append(team.getSuffix()) : Text.of(username); - - name = displayName; + name = (team != null && !plainNames) ? Text.empty().append(team.getPrefix()).append(Text.literal(username).formatted(team.getColor())).append(team.getSuffix()) : Text.of(username); tex = ple.getSkinTexture(); this.width = SKIN_ICO_DIM + PAD_S + txtRend.getWidth(name); |