AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-18 11:54:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Launcher: remove double sorting version list

Browse Source
This commit is contained in:
Bixilon 2020-08-29 19:13:19 +02:00
parent 7e4db08043
commit 5cd5fa34b7
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/de/bixilon/minosoft/Launcher.java
View File

@ -30,14 +30,13 @@ import javafx.stage.Stage;
import javafx.util.Callback; import javafx.util.Callback;
import java.io.IOException; import java.io.IOException;
import java.util.Comparator;
import java.util.Map; import java.util.Map;
public class Launcher extends Application { public class Launcher extends Application {
public static void main(String[] args) { public static void main() {
launch(args); launch();
} }
@Override @Override
@ -46,8 +45,7 @@ public class Launcher extends Application {
for (Map.Entry<Integer, Version> version : Versions.getVersionMap().entrySet()) { for (Map.Entry<Integer, Version> version : Versions.getVersionMap().entrySet()) {
GUITools.versions.add(version.getValue()); GUITools.versions.add(version.getValue());
} }
Comparator<Version> comparator = Comparator.comparingInt(Version::getProtocolVersion);
FXCollections.sort(GUITools.versions, comparator);
GUITools.versions.sort((a, b) -> { GUITools.versions.sort((a, b) -> {
if (a.getProtocolVersion() == -1) { if (a.getProtocolVersion() == -1) {
return -Integer.MAX_VALUE; return -Integer.MAX_VALUE;

2
src/main/java/de/bixilon/minosoft/Minosoft.java
View File

@ -84,7 +84,7 @@ public class Minosoft {
} }
serverList = config.getServers(); serverList = config.getServers();
Launcher.main(args); Launcher.main();
} }
/** /**

1
src/main/java/de/bixilon/minosoft/gui/main/ServerListCell.java
View File

@ -110,6 +110,7 @@ public class ServerListCell extends ListCell<Server> implements Initializable {
// Offline // Offline
players.setText(""); players.setText("");
version.setText("Offline"); version.setText("Offline");
motd.setText("Could not connect to server!");
optionsConnect.setDisable(true); optionsConnect.setDisable(true);
canConnect = false; canConnect = false;
return; return;