Skip to content

Replaced text tags with icons #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TakenMC wants to merge 1 commit into
base: feat/rewrite
Choose a base branch
from
Open

Replaced text tags with icons #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
256 changes: 224 additions & 32 deletions src/main/java/com/roxiun/mellow/feature/stats/tab/ExtendedStatsTabOverlay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
import com.roxiun.mellow.api.provider.model.StatScope;
import com.roxiun.mellow.api.seraph.SeraphClientType;
import com.roxiun.mellow.api.seraph.SeraphTag;
import com.roxiun.mellow.api.urchin.UrchinTag;
import com.roxiun.mellow.config.MellowOneConfig;
import com.roxiun.mellow.data.TabStats;
import com.roxiun.mellow.util.formatting.FormattingUtils;
import com.roxiun.mellow.util.player.PlayerUtils;
import com.roxiun.mellow.util.render.SeraphClientIconRenderer;
import com.roxiun.mellow.util.render.SeraphTagIconRenderer;
import com.roxiun.mellow.util.render.UrchinTagIconRenderer;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
Expand Down Expand Up @@ -50,6 +51,9 @@ public class ExtendedStatsTabOverlay extends GuiPlayerTabOverlay {
private static final int HEAD_TEXT_GAP = 2;
private static final int TEAM_COLLAPSED_GAP = 1;
private static final int CLIENT_ICON_SIZE = ENTRY_HEIGHT - 1;
private static final int TAG_ICON_SIZE = 8;
private static final int TAG_ICON_GAP = 1;
private static final int TAG_TEXT_GAP = 2;

private final Minecraft mc;
private final MellowOneConfig config;
Expand Down Expand Up @@ -396,6 +400,7 @@ private void drawValues(
int width = columnWidths.get(i);
int textStartX = x + CELL_PADDING_X;
int reservedLeft = CELL_PADDING_X * 2;
TabStats stats = getStatsForInfo(info, scope);

if (column == 2 && shouldShowHeadsInExtendedView()) {
int headX = x + CELL_PADDING_X;
Expand All @@ -405,8 +410,6 @@ private void drawValues(
reservedLeft += HEAD_ICON_SIZE + HEAD_TEXT_GAP;
}

int maxTextWidth = Math.max(1, width - reservedLeft);

if (ExtendedTabStatsColumns.isClientColumn(scope, column)) {
drawClientIcon(info, x, width, baselineY);
x += width;
Expand All @@ -416,11 +419,86 @@ private void drawValues(
continue;
}

if (ExtendedTabStatsColumns.isTagsColumn(scope, column)) {
int urchinIconWidth = getUrchinTagIconWidth(stats);
int seraphIconWidth = getSeraphTagIconWidth(stats);
int totalIconWidth = urchinIconWidth + seraphIconWidth;
if (urchinIconWidth > 0 && seraphIconWidth > 0) {
totalIconWidth += TAG_ICON_GAP;
}

String value = fitToWidth(
getDisplayValue(info, column, scope, i),
Math.max(
1,
width -
reservedLeft -
totalIconWidth -
(totalIconWidth > 0 && !getDisplayValue(info, column, scope, i).isEmpty()
? TAG_TEXT_GAP
: 0)
)
);
int totalWidth = mc.fontRendererObj.getStringWidth(value);
if (totalIconWidth > 0) {
totalWidth += totalIconWidth;
if (!value.isEmpty()) {
totalWidth += TAG_TEXT_GAP;
}
}

int drawX = isCenterAlignedColumn(scope, column)
? x + (width - totalWidth) / 2
: textStartX;

if (!value.isEmpty()) {
mc.fontRendererObj.drawStringWithShadow(value, drawX, baselineY, -1);
}
if (totalIconWidth > 0) {
int iconX = drawX + mc.fontRendererObj.getStringWidth(value);
if (!value.isEmpty()) {
iconX += TAG_TEXT_GAP;
}
int centerY = baselineY + (mc.fontRendererObj.FONT_HEIGHT - TAG_ICON_SIZE) / 2;

if (urchinIconWidth > 0) {
drawUrchinTagIcons(stats, iconX, centerY);
iconX += urchinIconWidth;
}
if (seraphIconWidth > 0) {
if (urchinIconWidth > 0) {
iconX += TAG_ICON_GAP;
}
drawSeraphTagIcons(stats, iconX, centerY);
}
}

x += width;
if (i < columns.size() - 1) {
x += getGapAfterColumn(columns, i);
}
continue;
}

int maxTextWidth = Math.max(1, width - reservedLeft);
if (column == 2 && shouldKeepTagsInName(scope)) {
int urchinIconWidth = getUrchinTagIconWidth(stats);
int seraphIconWidth = getSeraphTagIconWidth(stats);
int totalIconWidth = urchinIconWidth + seraphIconWidth;
if (urchinIconWidth > 0 && seraphIconWidth > 0) {
totalIconWidth += TAG_ICON_GAP;
}
maxTextWidth = Math.max(
1,
maxTextWidth - totalIconWidth - (totalIconWidth > 0 ? TAG_TEXT_GAP : 0)
);
}

String value = fitToWidth(
getDisplayValue(info, column, scope, i),
maxTextWidth
);
if (value != null && !value.isEmpty()) {
if (!value.isEmpty()) {
int drawX;
if (isCenterAlignedColumn(scope, column)) {
drawX = x + (width - mc.fontRendererObj.getStringWidth(value)) / 2;
Expand All @@ -434,6 +512,33 @@ private void drawValues(
drawX = textStartX;
}
mc.fontRendererObj.drawStringWithShadow(value, drawX, baselineY, -1);

if (column == 2 && shouldKeepTagsInName(scope)) {
int urchinIconWidth = getUrchinTagIconWidth(stats);
int seraphIconWidth = getSeraphTagIconWidth(stats);
int totalIconWidth = urchinIconWidth + seraphIconWidth;
if (urchinIconWidth > 0 && seraphIconWidth > 0) {
totalIconWidth += TAG_ICON_GAP;
}
if (totalIconWidth > 0) {
int iconX = drawX + mc.fontRendererObj.getStringWidth(value);
if (!value.isEmpty()) {
iconX += TAG_TEXT_GAP;
}
int centerY = baselineY + (mc.fontRendererObj.FONT_HEIGHT - TAG_ICON_SIZE) / 2;

if (urchinIconWidth > 0) {
drawUrchinTagIcons(stats, iconX, centerY);
iconX += urchinIconWidth;
}
if (seraphIconWidth > 0) {
if (urchinIconWidth > 0) {
iconX += TAG_ICON_GAP;
}
drawSeraphTagIcons(stats, iconX, centerY);
}
}
}
}
x += width;
if (i < columns.size() - 1) {
Expand All @@ -451,9 +556,26 @@ private int getCellContentWidth(
if (ExtendedTabStatsColumns.isClientColumn(scope, column)) {
return getCachedClientType(info) == null ? 0 : CLIENT_ICON_SIZE;
}
return mc.fontRendererObj.getStringWidth(
getDisplayValue(info, column, scope, columnIndex)
);

TabStats stats = getStatsForInfo(info, scope);
String value = getDisplayValue(info, column, scope, columnIndex);
int width = mc.fontRendererObj.getStringWidth(value);
int urchinIconWidth = getUrchinTagIconWidth(stats);
int seraphIconWidth = getSeraphTagIconWidth(stats);
int totalIconWidth = urchinIconWidth + seraphIconWidth;
if (urchinIconWidth > 0 && seraphIconWidth > 0) {
totalIconWidth += TAG_ICON_GAP;
}

if (ExtendedTabStatsColumns.isTagsColumn(scope, column)) {
return width + totalIconWidth + (totalIconWidth > 0 && !value.isEmpty() ? TAG_TEXT_GAP : 0);
}

if (column == 2 && shouldKeepTagsInName(scope)) {
return width + totalIconWidth + (totalIconWidth > 0 && !value.isEmpty() ? TAG_TEXT_GAP : 0);
}

return width;
}

private String fitToWidth(String value, int width) {
Expand Down Expand Up @@ -1207,21 +1329,15 @@ private String appendTagSuffixes(String value, TabStats stats) {
return value;
}

String safe = value == null ? "" : value;

if (Mellow.config.showUrchinTagsInTab && stats.isUrchinTagged()) {
for (UrchinTag tag : stats.getUrchinTags()) {
safe += " " + FormattingUtils.formatUrchinTagIcon(tag);
}
}
StringBuilder safe = new StringBuilder(value == null ? "" : value);

if (Mellow.config.showSeraphTagsInTab && stats.isSeraphTagged()) {
for (SeraphTag tag : stats.getSeraphTags()) {
safe += " " + FormattingUtils.formatSeraphTagIcon(tag);
safe.append(' ').append(FormattingUtils.formatSeraphTagIcon(tag));
}
}

return safe;
return safe.toString();
}

private int getRowBackground(NetworkPlayerInfo info) {
Expand Down Expand Up @@ -1290,27 +1406,103 @@ private String buildTagsColumnValue(NetworkPlayerInfo info, TabStats stats) {
}

if (stats != null && Mellow.config != null) {
if (Mellow.config.showUrchinTagsInTab && stats.isUrchinTagged()) {
for (UrchinTag tag : stats.getUrchinTags()) {
if (builder.length() > 0) {
builder.append(" ");
}
builder.append(FormattingUtils.formatUrchinTagIcon(tag));
}
}
if (Mellow.config.showSeraphTagsInTab && stats.isSeraphTagged()) {
for (SeraphTag tag : stats.getSeraphTags()) {
if (builder.length() > 0) {
builder.append(" ");
}
builder.append(FormattingUtils.formatSeraphTagIcon(tag));
}
}
// Seraph tags are rendered as icons in drawValues(), not as text badges
}

return builder.toString();
}

private TabStats getStatsForInfo(NetworkPlayerInfo info, StatScope scope) {
if (info == null || info.getGameProfile() == null) {
return null;
}

String playerName = info.getGameProfile().getName();
if (playerName == null || playerName.isEmpty()) {
return null;
}

TabStats stats = Mellow.tabStats.get(playerName);
boolean isNicked =
Mellow.nickUtils != null && Mellow.nickUtils.isNicked(playerName);
if (stats == null && isNicked && Mellow.nickUtils != null) {
stats = Mellow.nickUtils.getResolvedTabStatsForNick(playerName, scope);
}
return stats;
}

private int getUrchinTagIconWidth(TabStats stats) {
if (
stats == null ||
Mellow.config == null ||
!Mellow.config.showUrchinTagsInTab ||
!stats.isUrchinTagged()
) {
return 0;
}

return UrchinTagIconRenderer.measureTags(
stats.getUrchinTags(),
TAG_ICON_SIZE,
TAG_ICON_GAP
);
}

private void drawUrchinTagIcons(TabStats stats, int x, int y) {
if (
stats == null ||
Mellow.config == null ||
!Mellow.config.showUrchinTagsInTab ||
!stats.isUrchinTagged()
) {
return;
}

UrchinTagIconRenderer.drawTags(
stats.getUrchinTags(),
x,
y,
TAG_ICON_SIZE,
TAG_ICON_GAP
);
}

private int getSeraphTagIconWidth(TabStats stats) {
if (
stats == null ||
Mellow.config == null ||
!Mellow.config.showSeraphTagsInTab ||
!stats.isSeraphTagged()
) {
return 0;
}

return SeraphTagIconRenderer.measureTags(
stats.getSeraphTags(),
TAG_ICON_SIZE,
TAG_ICON_GAP
);
}

private void drawSeraphTagIcons(TabStats stats, int x, int y) {
if (
stats == null ||
Mellow.config == null ||
!Mellow.config.showSeraphTagsInTab ||
!stats.isSeraphTagged()
) {
return;
}

SeraphTagIconRenderer.drawTags(
stats.getSeraphTags(),
x,
y,
TAG_ICON_SIZE,
TAG_ICON_GAP
);
}

private String buildPingColumnValue(NetworkPlayerInfo info) {
if (
Mellow.config == null ||
Expand Down
Loading
Loading