Skip to content
This repository was archived by the owner on Nov 28, 2025. It is now read-only.

Commit 7ecae1d

Browse files
moehreagmoehreag
committed
some translations, bug fixes + cleanups
1 parent 41c3a42 commit 7ecae1d

File tree

34 files changed

+145
-214
lines changed

34 files changed

+145
-214
lines changed

‎1.16_combat-6/src/main/java/io/github/axolotlclient/api/FriendsScreen.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ private void updateButtonActivationStates() {
198198
removeButton.visible = false;
199199
denyButton.visible = true;
200200
acceptButton.visible = true;
201+
denyButton.active = acceptButton.active = entry != null;
201202
} else if (current == Tab.BLOCKED) {
202203
blockedTab.active = false;
203204
onlineTab.active = allTab.active = pendingTab.active = true;

‎1.16_combat-6/src/main/java/io/github/axolotlclient/api/FriendsSidebar.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void render(MatrixStack graphics, int mouseX, int mouseY, float delta) {
7777
}
7878
fill(graphics, sidebarAnimX, 0, sidebarWidth + sidebarAnimX, height, 0x99000000);
7979

80-
textRenderer.drawWithShadow(graphics, I18n.translate("api.friends"), 10 + sidebarAnimX, 10, -1);
80+
textRenderer.drawWithShadow(graphics, I18n.translate("api.chats"), 10 + sidebarAnimX, 10, -1);
8181

8282
if (hasChat) {
8383
fill(graphics, 70 + sidebarAnimX, 0, 70 + sidebarAnimX + 1, height, 0xFF000000);
@@ -103,7 +103,7 @@ protected void init() {
103103

104104
if (parent != null) {
105105
parent.children().stream().filter(element -> element instanceof AbstractButtonWidget)
106-
.map(e -> (AbstractButtonWidget) e).filter(e -> e.getMessage().equals(new TranslatableText("api.friends"))).forEach(e -> e.visible = false);
106+
.map(e -> (AbstractButtonWidget) e).filter(e -> e.getMessage().equals(new TranslatableText("api.chats"))).forEach(e -> e.visible = false);
107107
}
108108

109109
ChannelRequest.getChannelList().whenCompleteAsync((list, t) ->

‎1.16_combat-6/src/main/java/io/github/axolotlclient/api/chat/ChatScreen.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ protected void init() {
7979
if (!channel.isDM()) {
8080
users = new ChatUserListWidget(this, client, 80, height - 20, 30, height - 60, 25);
8181
users.setLeftPos(width - 80);
82-
users.setUsers(channel.getAllUsers());
82+
users.setUsers(channel.getAllUsers(), channel);
8383
addChild(users);
8484
}
8585

‎1.16_combat-6/src/main/java/io/github/axolotlclient/api/chat/ChatUserListWidget.java‎

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,16 @@
3030
import io.github.axolotlclient.api.handlers.ChatHandler;
3131
import io.github.axolotlclient.api.requests.ChannelRequest;
3232
import io.github.axolotlclient.api.requests.FriendRequest;
33+
import io.github.axolotlclient.api.types.Channel;
3334
import io.github.axolotlclient.api.types.User;
3435
import io.github.axolotlclient.modules.auth.Auth;
3536
import io.github.axolotlclient.modules.hud.util.DrawUtil;
3637
import lombok.Getter;
3738
import net.minecraft.client.MinecraftClient;
3839
import net.minecraft.client.gui.widget.AlwaysSelectedEntryListWidget;
3940
import net.minecraft.client.util.math.MatrixStack;
40-
import net.minecraft.text.MutableText;
4141
import net.minecraft.text.Text;
4242
import net.minecraft.text.TranslatableText;
43-
import net.minecraft.util.Formatting;
4443
import net.minecraft.util.Util;
4544

4645
public class ChatUserListWidget extends AlwaysSelectedEntryListWidget<ChatUserListWidget.UserListEntry> {
@@ -52,8 +51,8 @@ public ChatUserListWidget(ChatScreen screen, MinecraftClient client, int width,
5251
this.screen = screen;
5352
}
5453

55-
public void setUsers(List<User> users) {
56-
users.forEach(user -> addEntry(new UserListEntry(user)));
54+
public void setUsers(List<User> users, Channel channel) {
55+
users.forEach(user -> addEntry(new UserListEntry(user, channel)));
5756
}
5857

5958
@Override
@@ -80,18 +79,14 @@ public class UserListEntry extends Entry<UserListEntry> {
8079
@Getter
8180
private final User user;
8281
private final MinecraftClient client;
82+
private final Channel channel;
8383
private long time;
84-
private Text note;
8584
private ChatScreen screen;
8685

87-
public UserListEntry(User user, MutableText note) {
88-
this(user);
89-
this.note = note.formatted(Formatting.ITALIC);
90-
}
91-
92-
public UserListEntry(User user) {
86+
public UserListEntry(User user, Channel channel) {
9387
this.client = MinecraftClient.getInstance();
9488
this.user = user;
89+
this.channel = channel;
9590
}
9691

9792
public UserListEntry init(ChatScreen screen) {
@@ -107,14 +102,8 @@ public void render(MatrixStack graphics, int index, int y, int x, int entryWidth
107102
}
108103
DrawUtil.drawScrollableText(graphics, client.textRenderer, Text.of(user.getName()), x + 3 + entryHeight,
109104
y + 1, x + entryWidth - 6, y + 1 + client.textRenderer.fontHeight + 2, -1);
110-
client.textRenderer.draw(graphics, user.getStatus().getTitle(), x + 3 + entryHeight, y + 12, 8421504);
111-
if (user.getStatus().isOnline()) {
112-
client.textRenderer.draw(graphics, user.getStatus().getDescription(), x + 3 + entryHeight + 7, y + 23, 8421504);
113-
}
114-
115-
if (note != null) {
116-
client.textRenderer.drawWithShadow(graphics, note, x + entryWidth - client.textRenderer.getWidth(note) - 2, y + entryHeight - 10, 8421504);
117-
}
105+
DrawUtil.drawScrollableText(graphics, client.textRenderer, Text.of(user.getStatus().getTitle()), x + 3 + entryHeight,
106+
y + 12, x + entryWidth - 6, y + 12 + client.textRenderer.fontHeight + 2, 8421504);
118107

119108
client.getTextureManager().bindTexture(Auth.getInstance().getSkinTexture(user.getUuid(), user.getName()));
120109
RenderSystem.enableBlend();
@@ -146,13 +135,16 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
146135
.entry(new TranslatableText("api.chat.report.user"), buttonWidget -> {
147136
ChatHandler.getInstance().reportUser(user);
148137
});
149-
if (FriendRequest.getInstance().isBlocked(user.getUuid())) {
138+
if (!FriendRequest.getInstance().isBlocked(user.getUuid())) {
150139
menu.entry(new TranslatableText("api.users.block"), buttonWidget ->
151140
FriendRequest.getInstance().blockUser(user.getUuid()));
152141
} else {
153142
menu.entry(new TranslatableText("api.users.unblock"), buttonWidget ->
154143
FriendRequest.getInstance().unblockUser(user.getUuid()));
155144
}
145+
if (channel.getOwner().equals(API.getInstance().getSelf())) {
146+
menu.entry(new TranslatableText("api.channel.remove_user"), b -> ChannelRequest.removeUserFromChannel(channel, user));
147+
}
156148
screen.setContextMenu(menu.build());
157149
return true;
158150
}

‎1.20/src/main/java/io/github/axolotlclient/api/FriendsScreen.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ private void updateButtonActivationStates() {
196196
removeButton.visible = false;
197197
denyButton.visible = true;
198198
acceptButton.visible = true;
199+
denyButton.active = acceptButton.active = entry != null;
199200
} else if (current == Tab.BLOCKED) {
200201
blockedTab.active = false;
201202
onlineTab.active = allTab.active = pendingTab.active = true;

‎1.20/src/main/java/io/github/axolotlclient/api/FriendsSidebar.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
7272
}
7373
graphics.fill(sidebarAnimX, 0, sidebarWidth + sidebarAnimX, height, 0x99000000);
7474

75-
graphics.drawShadowedText(client.textRenderer, Text.translatable("api.friends"), 10 + sidebarAnimX, 10, -1);
75+
graphics.drawShadowedText(client.textRenderer, Text.translatable("api.chats"), 10 + sidebarAnimX, 10, -1);
7676

7777
if (hasChat) {
7878
graphics.fill(70 + sidebarAnimX, 0, 70 + sidebarAnimX + 1, height, 0xFF000000);
@@ -96,7 +96,7 @@ protected void init() {
9696

9797
if (parent != null) {
9898
parent.children().stream().filter(element -> element instanceof ClickableWidget)
99-
.map(e -> (ClickableWidget) e).filter(e -> e.getMessage().equals(Text.translatable("api.friends"))).forEach(e -> e.visible = false);
99+
.map(e -> (ClickableWidget) e).filter(e -> e.getMessage().equals(Text.translatable("api.chats"))).forEach(e -> e.visible = false);
100100
}
101101

102102
ChannelRequest.getChannelList().whenCompleteAsync((list, t) ->

‎1.20/src/main/java/io/github/axolotlclient/api/chat/ChatScreen.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ protected void init() {
6969
if (!channel.isDM()) {
7070
users = new ChatUserListWidget(this, client, 80, height - 20, 30, height - 60, 25);
7171
users.setLeftPos(width - 80);
72-
users.setUsers(channel.getAllUsers());
72+
users.setUsers(channel.getAllUsers(), channel);
7373
addDrawableChild(users);
7474
}
7575

‎1.20/src/main/java/io/github/axolotlclient/api/chat/ChatUserListWidget.java‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import io.github.axolotlclient.api.handlers.ChatHandler;
3131
import io.github.axolotlclient.api.requests.ChannelRequest;
3232
import io.github.axolotlclient.api.requests.FriendRequest;
33+
import io.github.axolotlclient.api.types.Channel;
3334
import io.github.axolotlclient.api.types.User;
3435
import io.github.axolotlclient.modules.auth.Auth;
3536
import lombok.Getter;
@@ -52,8 +53,8 @@ public ChatUserListWidget(ChatScreen screen, MinecraftClient client, int width,
5253
this.screen = screen;
5354
}
5455

55-
public void setUsers(List<User> users) {
56-
users.forEach(user -> addEntry(new UserListEntry(user)));
56+
public void setUsers(List<User> users, Channel channel) {
57+
users.forEach(user -> addEntry(new UserListEntry(user, channel)));
5758
}
5859

5960
@Override
@@ -80,18 +81,14 @@ public class UserListEntry extends Entry<UserListEntry> {
8081
@Getter
8182
private final User user;
8283
private final MinecraftClient client;
84+
private final Channel channel;
8385
private long time;
84-
private Text note;
8586
private ChatScreen screen;
8687

87-
public UserListEntry(User user, MutableText note) {
88-
this(user);
89-
this.note = note.formatted(Formatting.ITALIC);
90-
}
91-
92-
public UserListEntry(User user) {
88+
public UserListEntry(User user, Channel channel) {
9389
this.client = MinecraftClient.getInstance();
9490
this.user = user;
91+
this.channel = channel;
9592
}
9693

9794
protected static void drawScrollableText(GuiGraphics graphics, TextRenderer textRenderer, Text text, int left, int top, int right, int bottom, int color) {
@@ -129,14 +126,8 @@ public void render(GuiGraphics graphics, int index, int y, int x, int entryWidth
129126
}
130127
drawScrollableText(graphics, client.textRenderer, Text.of(user.getName()), x + 3 + entryHeight,
131128
y + 1, x + entryWidth - 6, y + 1 + client.textRenderer.fontHeight + 2, -1);
132-
graphics.drawText(client.textRenderer, user.getStatus().getTitle(), x + 3 + entryHeight, y + 12, 8421504, false);
133-
if (user.getStatus().isOnline()) {
134-
graphics.drawText(client.textRenderer, user.getStatus().getDescription(), x + 3 + entryHeight + 7, y + 23, 8421504, false);
135-
}
136-
137-
if (note != null) {
138-
graphics.drawText(client.textRenderer, note, x + entryWidth - client.textRenderer.getWidth(note) - 2, y + entryHeight - 10, 8421504, false);
139-
}
129+
drawScrollableText(graphics, client.textRenderer, Text.literal(user.getStatus().getTitle()), x + 3 + entryHeight,
130+
y + 12, x + entryWidth - 6, y + 12 + client.textRenderer.fontHeight + 2, 8421504);
140131

141132
RenderSystem.enableBlend();
142133
graphics.drawTexture(Auth.getInstance().getSkinTexture(user.getUuid(), user.getName()),
@@ -169,13 +160,16 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
169160
.entry(Text.translatable("api.chat.report.user"), buttonWidget -> {
170161
ChatHandler.getInstance().reportUser(user);
171162
});
172-
if (FriendRequest.getInstance().isBlocked(user.getUuid())) {
163+
if (!FriendRequest.getInstance().isBlocked(user.getUuid())) {
173164
menu.entry(Text.translatable("api.users.block"), buttonWidget ->
174165
FriendRequest.getInstance().blockUser(user.getUuid()));
175166
} else {
176167
menu.entry(Text.translatable("api.users.unblock"), buttonWidget ->
177168
FriendRequest.getInstance().unblockUser(user.getUuid()));
178169
}
170+
if (channel.getOwner().equals(API.getInstance().getSelf())) {
171+
menu.entry(Text.translatable("api.channel.remove_user"), b -> ChannelRequest.removeUserFromChannel(channel, user));
172+
}
179173
screen.setContextMenu(menu.build());
180174
return true;
181175
}

‎1.21.3/src/main/java/io/github/axolotlclient/api/FriendsScreen.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ private void updateButtonActivationStates() {
209209
removeButton.visible = false;
210210
denyButton.visible = true;
211211
acceptButton.visible = true;
212+
denyButton.active = acceptButton.active = entry != null;
212213
} else if (current == Tab.BLOCKED) {
213214
blockedTab.active = false;
214215
onlineTab.active = allTab.active = pendingTab.active = true;

‎1.21.3/src/main/java/io/github/axolotlclient/api/FriendsSidebar.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
7676
}
7777
graphics.fill(sidebarAnimX, 0, sidebarWidth + sidebarAnimX, height, 0x99000000);
7878

79-
graphics.drawString(font, Component.translatable("api.friends"), 10 + sidebarAnimX, 10, -1);
79+
graphics.drawString(font, Component.translatable("api.chats"), 10 + sidebarAnimX, 10, -1);
8080

8181
if (hasChat) {
8282
graphics.fill(70 + sidebarAnimX, 0, 70 + sidebarAnimX + 1, height, 0xFF000000);
@@ -100,7 +100,7 @@ protected void init() {
100100

101101
if (parent != null) {
102102
parent.children().stream().filter(element -> element instanceof AbstractButton)
103-
.map(e -> (AbstractButton) e).filter(e -> e.getMessage().equals(Component.translatable("api.friends"))).forEach(e -> e.visible = false);
103+
.map(e -> (AbstractButton) e).filter(e -> e.getMessage().equals(Component.translatable("api.chats"))).forEach(e -> e.visible = false);
104104
}
105105

106106
ChannelRequest.getChannelList().whenCompleteAsync((list, t) ->

0 commit comments

Comments
 (0)