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

Commit 3cf4698

Browse files
moehreagmoehreag
committed
fix overflowing buttons
1 parent 4e31748 commit 3cf4698

File tree

12 files changed

+62
-26
lines changed

12 files changed

+62
-26
lines changed

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ jobs:
2020
cache-read-only: ${{ github.ref != 'refs/heads/multiversion' }}
2121

2222
- name: Build
23-
run: ./gradlew build
23+
run: ./gradlew build collectBuilds
2424

2525
- name: Upload a Build Artifact
2626
uses: actions/upload-artifact@v4
2727
with:
2828
# Artifact name
2929
name: AxolotlClient-automation
30-
path: 1.*/build/libs/*
30+
path: builds/*.jar

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ jobs:
3131
cache-read-only: true
3232

3333
- name: Build
34-
run: ./gradlew build
34+
run: ./gradlew build collectBuilds
3535

3636
- name: Release
3737
uses: Kir-Antipov/[email protected]
3838
with:
3939
github-token: "${{ secrets.GH_TOKEN }}"
4040
changelog-file: "CHANGELOG.md"
41-
files: 1.*/build/libs/*
41+
files: builds/*.jar

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,5 @@ workspace/
3737
*.jfr
3838
.profileconfig.json
3939

40+
builds/
41+

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
130130
.entry(new TranslatableText("api.friends.chat"), buttonWidget -> {
131131
ChannelRequest.getOrCreateDM(user).whenCompleteAsync(((channel, throwable) ->
132132
client.execute(() -> client.openScreen(new ChatScreen(screen.getParent(), channel)))));
133-
});
133+
}).spacer();
134134
if (!FriendRequest.getInstance().isBlocked(user.getUuid())) {
135135
menu.entry(new TranslatableText("api.users.block"), buttonWidget ->
136136
FriendRequest.getInstance().blockUser(user.getUuid()));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
153153
.entry(Text.translatable("api.friends.chat"), buttonWidget -> {
154154
ChannelRequest.getOrCreateDM(user)
155155
.whenCompleteAsync((channel, throwable) -> client.execute(() -> client.setScreen(new ChatScreen(screen.getParent(), channel))));
156-
});
156+
}).spacer();
157157
if (!FriendRequest.getInstance().isBlocked(user.getUuid())) {
158158
menu.entry(Text.translatable("api.users.block"), buttonWidget ->
159159
FriendRequest.getInstance().blockUser(user.getUuid()));

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,11 @@ public UserListEntry(User user, Channel channel) {
9696
this.channel = channel;
9797
}
9898

99+
public UserListEntry init(ChatScreen screen) {
100+
this.screen = screen;
101+
return this;
102+
}
103+
99104
protected static void drawScrollableText(GuiGraphics graphics, Font textRenderer, Component text, int left, int top, int right, int bottom, int color) {
100105
int i = textRenderer.width(text);
101106
int j = (top + bottom - 9) / 2 + 1;
@@ -114,10 +119,6 @@ protected static void drawScrollableText(GuiGraphics graphics, Font textRenderer
114119
}
115120
}
116121

117-
public UserListEntry init(ChatScreen screen) {
118-
this.screen = screen;
119-
return this;
120-
}
121122

122123
@Override
123124
public Component getNarration() {
@@ -157,7 +158,7 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
157158
}).spacer().entry(Component.translatable("api.friends.chat"), buttonWidget -> {
158159
ChannelRequest.getOrCreateDM(user).whenCompleteAsync((channel, throwable) -> client.execute(
159160
() -> client.setScreen(new ChatScreen(screen.getParent(), channel))));
160-
});
161+
}).spacer();
161162
if (!FriendRequest.getInstance().isBlocked(user.getUuid())) {
162163
menu.entry(Component.translatable("api.users.block"),
163164
buttonWidget -> FriendRequest.getInstance().blockUser(user.getUuid())

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
151151
ContextMenu.Builder menu = ContextMenu.builder().entry(Text.of(user.getName()), buttonWidget -> {
152152
}).spacer().entry(Text.translatable("api.friends.chat"), buttonWidget -> {
153153
ChannelRequest.getOrCreateDM(user).whenCompleteAsync((channel, throwable) -> client.execute(() -> client.setScreen(new ChatScreen(screen.getParent(), channel))));
154-
});
154+
}).spacer();
155155
if (!FriendRequest.getInstance().isBlocked(user.getUuid())) {
156156
menu.entry(Text.translatable("api.users.block"), buttonWidget -> FriendRequest.getInstance().blockUser(user.getUuid()));
157157
} else {

‎1.8.9/src/main/java/io/github/axolotlclient/api/chat/ChatListWidget.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import net.minecraft.client.gui.screen.ConfirmScreen;
3838
import net.minecraft.client.gui.widget.ButtonWidget;
3939
import net.minecraft.client.gui.widget.EntryListWidget;
40+
import net.minecraft.client.render.TextRenderer;
4041
import net.minecraft.client.resource.language.I18n;
4142

4243
public class ChatListWidget extends EntryListWidget {
@@ -101,7 +102,12 @@ public class ChatListEntry implements Entry {
101102

102103
public ChatListEntry(Channel channel) {
103104
this.channel = channel;
104-
widget = new ButtonWidget(-1, 0, 0, getRowWidth(), 20, channel.getName());
105+
widget = new ButtonWidget(-1, 0, 0, getRowWidth(), 20, channel.getName()){
106+
@Override
107+
public void drawCenteredString(TextRenderer textRenderer, String string, int i, int j, int k) {
108+
DrawUtil.drawScrollableText(textRenderer, string, x+2, y, x+width-2, y+height, k);
109+
}
110+
};
105111
}
106112

107113
@Override

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,11 @@
2828
import io.github.axolotlclient.api.handlers.ChatHandler;
2929
import io.github.axolotlclient.api.requests.ChannelRequest;
3030
import io.github.axolotlclient.api.types.Channel;
31+
import io.github.axolotlclient.modules.hud.util.DrawUtil;
3132
import net.minecraft.client.gui.screen.Screen;
3233
import net.minecraft.client.gui.widget.ButtonWidget;
3334
import net.minecraft.client.gui.widget.TextFieldWidget;
35+
import net.minecraft.client.render.TextRenderer;
3436
import net.minecraft.client.resource.language.I18n;
3537
import org.lwjgl.input.Keyboard;
3638

@@ -106,7 +108,12 @@ public void render() {
106108
input.setMaxLength(1024);
107109

108110
if (channel.getOwner().equals(API.getInstance().getSelf())) {
109-
buttons.add(new ButtonWidget(2, width - 60, 5, 50, 20, I18n.translate("api.channel.configure")));
111+
buttons.add(new ButtonWidget(2, width - 60, 5, 50, 20, I18n.translate("api.channel.configure")){
112+
@Override
113+
public void drawCenteredString(TextRenderer textRenderer, String string, int i, int j, int k) {
114+
DrawUtil.drawScrollableText(textRenderer, string, x+2, y, x+width-2, y+height, k);
115+
}
116+
});
110117
}
111118

112119
this.buttons.add(new ButtonWidget(1, this.width / 2 - 75, this.height - 28, 150, 20,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public boolean mouseClicked(int index, int mouseX, int mouseY, int button, int x
152152
.entry("api.friends.chat", buttonWidget -> {
153153
ChannelRequest.getOrCreateDM(user)
154154
.whenCompleteAsync((channel, throwable) -> client.submit(() -> client.openScreen(new ChatScreen(screen.getParent(), channel))));
155-
});
155+
}).spacer();
156156
if (!FriendRequest.getInstance().isBlocked(user.getUuid())) {
157157
menu.entry("api.users.block", buttonWidget ->
158158
FriendRequest.getInstance().blockUser(user.getUuid()));

0 commit comments

Comments
 (0)