Upstream/ViaFabricPlus
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabricPlus.git synced 2025-01-05 19:09:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move BetaCraft loading sequence into screen

Browse Source
This commit is contained in:
FlorianMichael 2024-10-11 15:28:55 +02:00
parent 9ed44d681f
commit 6a144d9290
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
2 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/de/florianmichael/viafabricplus/screen/base/ServerListScreen.java
View File

@ -35,8 +35,6 @@ public class ServerListScreen extends VFPScreen {
public static final ServerListScreen INSTANCE = new ServerListScreen(); public static final ServerListScreen INSTANCE = new ServerListScreen();
private ButtonWidget betaCraftButton;
public ServerListScreen() { public ServerListScreen() {
super(Text.translatable("screen.viafabricplus.server_list"), true); super(Text.translatable("screen.viafabricplus.server_list"), true);
} }
@ -62,18 +60,7 @@ public class ServerListScreen extends VFPScreen {
this.addDrawableChild(classiCubeBuilder.build()); this.addDrawableChild(classiCubeBuilder.build());
ButtonWidget.Builder betaCraftBuilder = ButtonWidget.builder(BetaCraftScreen.INSTANCE.getTitle(), button -> { ButtonWidget.Builder betaCraftBuilder = ButtonWidget.builder(BetaCraftScreen.INSTANCE.getTitle(), button -> {
if (BetaCraftScreen.SERVER_LIST == null) { BetaCraftScreen.INSTANCE.open(this);
betaCraftButton = button;
BetaCraftHandler.requestV2ServerList(serverList -> {
BetaCraftScreen.SERVER_LIST = serverList;
BetaCraftScreen.INSTANCE.open(this);
}, throwable -> showErrorScreen(BetaCraftScreen.INSTANCE.getTitle(), throwable, this));
} else {
BetaCraftScreen.INSTANCE.open(this);
}
}).position(this.width / 2 - 50, this.height / 2 - 25 + 20 + 3).size(98, 20); }).position(this.width / 2 - 50, this.height / 2 - 25 + 20 + 3).size(98, 20);
if (BetaCraftScreen.SERVER_LIST == null) { if (BetaCraftScreen.SERVER_LIST == null) {
betaCraftBuilder = betaCraftBuilder.tooltip(Tooltip.of(Text.translatable("betacraft.viafabricplus.warning"))); betaCraftBuilder = betaCraftBuilder.tooltip(Tooltip.of(Text.translatable("betacraft.viafabricplus.warning")));
@ -95,13 +82,6 @@ public class ServerListScreen extends VFPScreen {
} }
} }
@Override
public void tick() {
if (betaCraftButton != null) {
betaCraftButton.setMessage(Text.translatable("betacraft.viafabricplus.loading"));
}
}
@Override @Override
public void render(DrawContext context, int mouseX, int mouseY, float delta) { public void render(DrawContext context, int mouseX, int mouseY, float delta) {
super.render(context, mouseX, mouseY, delta); super.render(context, mouseX, mouseY, delta);

19
src/main/java/de/florianmichael/viafabricplus/screen/classic4j/BetaCraftScreen.java
View File

@ -19,6 +19,7 @@
package de.florianmichael.viafabricplus.screen.classic4j; package de.florianmichael.viafabricplus.screen.classic4j;
import de.florianmichael.classic4j.BetaCraftHandler;
import de.florianmichael.classic4j.model.betacraft.BCServerInfoSpec; import de.florianmichael.classic4j.model.betacraft.BCServerInfoSpec;
import de.florianmichael.classic4j.model.betacraft.BCServerList; import de.florianmichael.classic4j.model.betacraft.BCServerList;
import de.florianmichael.classic4j.model.betacraft.BCVersionCategory; import de.florianmichael.classic4j.model.betacraft.BCVersionCategory;
@ -51,6 +52,19 @@ public class BetaCraftScreen extends VFPScreen {
@Override @Override
protected void init() { protected void init() {
super.init();
if (SERVER_LIST != null) {
createView();
return;
}
setupSubtitle(Text.translatable("betacraft.viafabricplus.loading"));
BetaCraftHandler.requestV2ServerList(serverList -> {
BetaCraftScreen.SERVER_LIST = serverList;
createView();
}, throwable -> showErrorScreen(BetaCraftScreen.INSTANCE.getTitle(), throwable, this));
}
private void createView() {
this.setupSubtitle(Text.of(BETA_CRAFT_SERVER_LIST_URL), ConfirmLinkScreen.opening(this, BETA_CRAFT_SERVER_LIST_URL)); this.setupSubtitle(Text.of(BETA_CRAFT_SERVER_LIST_URL), ConfirmLinkScreen.opening(this, BETA_CRAFT_SERVER_LIST_URL));
this.addDrawableChild(new SlotList(this.client, width, height, 3 + 3 /* start offset */ + (textRenderer.fontHeight + 2) * 3 /* title is 2 */, -5, (textRenderer.fontHeight + 2) * 3)); this.addDrawableChild(new SlotList(this.client, width, height, 3 + 3 /* start offset */ + (textRenderer.fontHeight + 2) * 3 /* title is 2 */, -5, (textRenderer.fontHeight + 2) * 3));
@ -58,8 +72,11 @@ public class BetaCraftScreen extends VFPScreen {
SERVER_LIST = null; SERVER_LIST = null;
client.setScreen(prevScreen); client.setScreen(prevScreen);
}).position(width - 98 - 5, 5).size(98, 20).build()); }).position(width - 98 - 5, 5).size(98, 20).build());
}
super.init(); @Override
protected boolean subtitleCentered() {
return SERVER_LIST == null;
} }
@Override @Override