Skip to content

Commit de52dc7

Browse files
committed
credits narration support
1 parent c752f8a commit de52dc7

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

src/main/java/io/github/axolotlclient/config/screen/CreditsScreen.java

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import io.github.axolotlclient.modules.hud.util.Rectangle;
99
import io.github.axolotlclient.util.Util;
1010
import net.minecraft.client.MinecraftClient;
11-
import net.minecraft.client.gui.AbstractParentElement;
1211
import net.minecraft.client.gui.Element;
1312
import net.minecraft.client.gui.Selectable;
1413
import net.minecraft.client.gui.screen.Screen;
@@ -32,7 +31,6 @@
3231
import java.util.ArrayList;
3332
import java.util.HashMap;
3433
import java.util.List;
35-
import java.util.stream.Collectors;
3634

3735
public class CreditsScreen extends Screen {
3836

@@ -191,14 +189,6 @@ public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
191189
return super.mouseScrolled(mouseX, mouseY, amount) || creditsList.mouseScrolled(mouseX, mouseY, amount);
192190
}
193191

194-
@Override
195-
public boolean changeFocus(boolean lookForwards) {
196-
/*if(creditOverlay != null){
197-
setFocused(creditOverlay);
198-
}*/
199-
return super.changeFocus(lookForwards);
200-
}
201-
202192
@Override
203193
public List<? extends Element> children() {
204194
if(CreditsScreen.this.creditOverlay != null){
@@ -228,6 +218,15 @@ public CreditsList(MinecraftClient minecraftClient, int width, int height, int t
228218
@Override
229219
public void appendNarrations(NarrationMessageBuilder builder) {
230220
builder.put(NarrationPart.TITLE, "credits");
221+
super.appendNarrations(builder);
222+
if(creditOverlay != null){
223+
builder.put(NarrationPart.TITLE, creditOverlay.credit.name);
224+
StringBuilder cs = new StringBuilder();
225+
for(String s:creditOverlay.credit.things){
226+
cs.append(s).append(". ");
227+
}
228+
builder.put(NarrationPart.HINT, cs.toString());
229+
}
231230
}
232231

233232
@Override
@@ -258,11 +257,12 @@ private class Credit extends ElementListWidget.Entry<Credit> {
258257

259258
private boolean hovered;
260259

261-
private final ButtonWidget c = new ButtonWidget(-2, -2, 1, 1, Text.empty(), buttonWidget -> creditOverlay = new Overlay(this));
260+
private final ButtonWidget c;
262261

263262
public Credit(String name, String... things){
264263
this.name=name;
265264
this.things=things;
265+
c = new ButtonWidget(-2, -2, 1, 1, Text.of(name), buttonWidget -> creditOverlay = new Overlay(this));
266266
}
267267

268268
@Override
@@ -370,6 +370,10 @@ public void mouseClicked(double mouseX, double mouseY) {
370370
}
371371
});
372372
}
373+
374+
public String[] getThings(){
375+
return credit.things;
376+
}
373377
}
374378

375379
private class SpacerTitle extends Credit {

0 commit comments

Comments
 (0)