diff --git a/G-Earth/pom.xml b/G-Earth/pom.xml
index 59f7505..fc67310 100644
--- a/G-Earth/pom.xml
+++ b/G-Earth/pom.xml
@@ -10,6 +10,10 @@
1.0
+
+ 12
+
+
G-Earth
G-Earth-Parent
@@ -24,7 +28,7 @@
org.apache.maven.plugins
maven-jar-plugin
- 2.5
+ 3.1.2
${project.build.directory}/bin
@@ -32,7 +36,7 @@
true
true
lib/
- gearth.Main
+ gearth.J12Main
false
@@ -41,7 +45,7 @@
maven-assembly-plugin
- 2.5
+ 3.1.1
package
@@ -54,7 +58,7 @@
${project.build.directory}/bin
- gearth.Main
+ gearth.J12Main
@@ -69,20 +73,35 @@
+
+ org.openjfx
+ javafx-fxml
+ ${javafx.version}
+
+
+ org.openjfx
+ javafx-graphics
+ ${javafx.version}
+
+
+ org.openjfx
+ javafx-web
+ ${javafx.version}
+
org.json
json
- 20180813
+ 20190722
org.fxmisc.richtext
richtextfx
- 0.9.1
+ 0.10.2
org.jsoup
jsoup
- 1.11.2
+ 1.12.1
com.github.tulskiy
@@ -92,7 +111,7 @@
org.slf4j
slf4j-jdk14
- 1.7.13
+ 2.0.0-alpha0
diff --git a/G-Earth/src/main/java/gearth/J12Main.java b/G-Earth/src/main/java/gearth/J12Main.java
new file mode 100644
index 0000000..3f17e16
--- /dev/null
+++ b/G-Earth/src/main/java/gearth/J12Main.java
@@ -0,0 +1,7 @@
+package gearth;
+
+public class J12Main {
+ public static void main(String[] args) {
+ Main.main(args);
+ }
+}
diff --git a/G-Earth/src/main/java/gearth/Main.java b/G-Earth/src/main/java/gearth/Main.java
index 82a01f1..6df29a9 100644
--- a/G-Earth/src/main/java/gearth/Main.java
+++ b/G-Earth/src/main/java/gearth/Main.java
@@ -37,10 +37,13 @@ public class Main extends Application {
primaryStage.getIcons().add(new Image(getClass().getResourceAsStream("/gearth/G-EarthLogoSmaller.png")));
- primaryStage.setResizable(false);
+ primaryStage.setResizable(true);
+ primaryStage.onShownProperty().addListener(e -> {
+ Platform.runLater(() -> primaryStage.setResizable(false));
+ });
//primaryStage.initStyle(StageStyle.UNDECORATED);
primaryStage.setTitle("G-Earth " + version);
- primaryStage.setScene(new Scene(root, 620, 295));
+ primaryStage.setScene(new Scene(root, 650, 295));
primaryStage.show();
primaryStage.getScene().getStylesheets().add(getClass().getResource("/gearth/ui/bootstrap3.css").toExternalForm());
@@ -57,6 +60,10 @@ public class Main extends Application {
Platform.runLater(() -> {
Alert alert = new Alert(Alert.AlertType.ERROR, "G-Earth needs admin privileges in order to work properly, please restart G-Earth with admin permissions unless you know what you're doing", ButtonType.OK);
alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
+ alert.setResizable(true);
+ alert.onShownProperty().addListener(e -> {
+ Platform.runLater(() -> alert.setResizable(false));
+ });
alert.show();
});
@@ -90,6 +97,12 @@ public class Main extends Application {
WebView webView = new WebView();
webView.getEngine().loadContent("A new version of G-Earth has been found ("+gitv+")
Update to the latest version:
https://github.com/sirjonasxx/G-Earth/releases");
webView.setPrefSize(500, 200);
+
+ alert.setResizable(true);
+ alert.onShownProperty().addListener(e -> {
+ Platform.runLater(() -> alert.setResizable(false));
+ });
+
alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
alert.getDialogPane().setContent(fp);
if (isForcedUpdate) {
diff --git a/G-Earth/src/main/java/gearth/protocol/memory/habboclient/macOs/MacOsHabboClient.java b/G-Earth/src/main/java/gearth/protocol/memory/habboclient/macOs/MacOsHabboClient.java
index a50c053..02b32e3 100644
--- a/G-Earth/src/main/java/gearth/protocol/memory/habboclient/macOs/MacOsHabboClient.java
+++ b/G-Earth/src/main/java/gearth/protocol/memory/habboclient/macOs/MacOsHabboClient.java
@@ -8,7 +8,6 @@ import org.json.JSONArray;
import org.json.JSONObject;
-import javax.xml.bind.DatatypeConverter;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
diff --git a/G-Earth/src/main/java/gearth/ui/extensions/executer/NormalExtensionRunner.java b/G-Earth/src/main/java/gearth/ui/extensions/executer/NormalExtensionRunner.java
index e738245..bb4bdce 100644
--- a/G-Earth/src/main/java/gearth/ui/extensions/executer/NormalExtensionRunner.java
+++ b/G-Earth/src/main/java/gearth/ui/extensions/executer/NormalExtensionRunner.java
@@ -2,7 +2,6 @@ package gearth.ui.extensions.executer;
import gearth.Main;
import gearth.ui.extensions.authentication.Authenticator;
-import org.omg.CORBA.Environment;
import java.io.BufferedReader;
import java.io.File;
diff --git a/pom.xml b/pom.xml
index 792fb64..825d6d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,8 +10,8 @@
1.0
- 1.8
- 1.8
+ 12
+ 12
G-Earth-Parent
@@ -35,8 +35,8 @@
maven-compiler-plugin
3.7.0
-
- 1.8
+
+ 12
@@ -58,7 +58,7 @@
maven-resources-plugin
- 2.6
+ 3.1.0
copy-resources