From 982b3c3fe6d2523d11efd2c71a996bd38ff269c4 Mon Sep 17 00:00:00 2001 From: sirjonasxx <36828922+sirjonasxx@users.noreply.github.com> Date: Tue, 6 Nov 2018 22:20:18 +0100 Subject: [PATCH] filling up a gap --- .../blockreplacepackets/blockreplace.fxml | 2 +- .../java/gearth/protocol/HConnection.java | 3 + .../java/gearth/ui/connection/Connection.java | 2 + .../gearth/ui/connection/Connection.fxml | 164 ++++++++++-------- 4 files changed, 93 insertions(+), 78 deletions(-) diff --git a/Extensions/BlockReplacePackets/src/main/java/extensions/blockreplacepackets/blockreplace.fxml b/Extensions/BlockReplacePackets/src/main/java/extensions/blockreplacepackets/blockreplace.fxml index 6290c54..fb7940c 100644 --- a/Extensions/BlockReplacePackets/src/main/java/extensions/blockreplacepackets/blockreplace.fxml +++ b/Extensions/BlockReplacePackets/src/main/java/extensions/blockreplacepackets/blockreplace.fxml @@ -11,7 +11,7 @@ - + diff --git a/G-Earth/src/main/java/gearth/protocol/HConnection.java b/G-Earth/src/main/java/gearth/protocol/HConnection.java index 091ed15..9c93d08 100644 --- a/G-Earth/src/main/java/gearth/protocol/HConnection.java +++ b/G-Earth/src/main/java/gearth/protocol/HConnection.java @@ -505,4 +505,7 @@ public class HConnection { return clientHostAndPort; } + public String getHotelVersion() { + return hotelVersion; + } } diff --git a/G-Earth/src/main/java/gearth/ui/connection/Connection.java b/G-Earth/src/main/java/gearth/ui/connection/Connection.java index 254075b..768ab02 100644 --- a/G-Earth/src/main/java/gearth/ui/connection/Connection.java +++ b/G-Earth/src/main/java/gearth/ui/connection/Connection.java @@ -21,6 +21,7 @@ public class Connection extends SubForm { public TextField outHost; public TextField outPort; public CheckBox cbx_autodetect; + public TextField txtfield_hotelversion; private boolean isBusy = false; @@ -75,6 +76,7 @@ public class Connection extends SubForm { public void onParentSet(){ getHConnection().addStateChangeListener((oldState, newState) -> Platform.runLater(() -> { + txtfield_hotelversion.setText(getHConnection().getHotelVersion()); if (newState == HConnection.State.NOT_CONNECTED) { updateInputUI(); lblState.setText("Not connected"); diff --git a/G-Earth/src/main/resources/gearth/ui/connection/Connection.fxml b/G-Earth/src/main/resources/gearth/ui/connection/Connection.fxml index 0f60c47..8f5303d 100644 --- a/G-Earth/src/main/resources/gearth/ui/connection/Connection.fxml +++ b/G-Earth/src/main/resources/gearth/ui/connection/Connection.fxml @@ -11,193 +11,203 @@ - + - + - - + + - - + + - + - + - - - - + + + + - + - + - - + + - + - - - + + - + - - - + + - - - - + + + + - + - + - + - - + - + - + + + + + + + + + + + + + + + + + - - + + - + - + - + - - + + - + - - - + + - - + + - + - + - + - + - +