From 5e30d243229af0fc4c1a4ef9fca805e2d06478a0 Mon Sep 17 00:00:00 2001 From: Ruan Gustavo Date: Thu, 17 Feb 2022 14:46:34 -0300 Subject: [PATCH 1/4] Fix black border due to display theme picker minimum width --- .../src/main/java/gearth/ui/titlebar/TitleBarController.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java b/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java index aeefe0d..1e4bf0b 100644 --- a/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java +++ b/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java @@ -93,6 +93,10 @@ public class TitleBarController { if (!config.displayMinimizeButton()) { ((GridPane) controller.minimizeBtn.getParent()).getChildren().remove(controller.minimizeBtn); } + + if (!config.displayThemePicker()) { + ((GridPane) controller.themeBtn.getParent()).getChildren().remove(controller.themeBtn); + } }); return controller; } From 067a21444518fc33c249f58c55709e867164d225 Mon Sep 17 00:00:00 2001 From: Ruan Gustavo Date: Thu, 17 Feb 2022 17:21:04 -0300 Subject: [PATCH 2/4] Fix black border due to display picker theme minimum width --- .../src/main/java/gearth/ui/titlebar/TitleBarController.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java b/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java index 1e4bf0b..ed9c87f 100644 --- a/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java +++ b/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java @@ -89,7 +89,6 @@ public class TitleBarController { stage.getScene().setFill(Color.TRANSPARENT); stage.getScene().getRoot().getStyleClass().add("root-node"); - controller.themeBtn.setVisible(config.displayThemePicker()); if (!config.displayMinimizeButton()) { ((GridPane) controller.minimizeBtn.getParent()).getChildren().remove(controller.minimizeBtn); } @@ -111,7 +110,6 @@ public class TitleBarController { Platform.runLater(() -> titleLabel.setText(title)); } - public void handleCloseAction(MouseEvent event) { config.onCloseClicked(); } From b1f86aa80bf145e4a4d7fbb1690465e9cdcd015b Mon Sep 17 00:00:00 2001 From: sirjonasxx <36828922+sirjonasxx@users.noreply.github.com> Date: Fri, 8 Apr 2022 07:30:55 +0200 Subject: [PATCH 3/4] fix air for lilith's linux launcher --- .../protocol/memory/habboclient/linux/LinuxHabboClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/G-Earth/src/main/java/gearth/protocol/memory/habboclient/linux/LinuxHabboClient.java b/G-Earth/src/main/java/gearth/protocol/memory/habboclient/linux/LinuxHabboClient.java index cab3d91..827ecda 100644 --- a/G-Earth/src/main/java/gearth/protocol/memory/habboclient/linux/LinuxHabboClient.java +++ b/G-Earth/src/main/java/gearth/protocol/memory/habboclient/linux/LinuxHabboClient.java @@ -10,7 +10,7 @@ import java.util.*; public class LinuxHabboClient extends HabboClient { - private static final String[] potentialProcessNames = {"--ppapi-flash-args", "plugin-container", "Habbo.exe"}; + private static final String[] potentialProcessNames = {"--ppapi-flash-args", "plugin-container", "Habbo"}; List potentialProcesses = new ArrayList<>(); From 3d6e7d5b322bb67fac4e3e2933c13fc4aa68609d Mon Sep 17 00:00:00 2001 From: WiredSpast <74211155+WiredSpast@users.noreply.github.com> Date: Sun, 10 Apr 2022 13:57:20 +0200 Subject: [PATCH 4/4] Fix for certificatePath which includes spaces --- .../connection/proxy/nitro/os/windows/NitroWindows.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/os/windows/NitroWindows.java b/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/os/windows/NitroWindows.java index c5f4655..ec55105 100644 --- a/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/os/windows/NitroWindows.java +++ b/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/os/windows/NitroWindows.java @@ -25,7 +25,7 @@ public class NitroWindows implements NitroOsFunctions { @Override public boolean isRootCertificateTrusted(File certificate) { try { - final String output = RuntimeUtil.getCommandOutput(new String[] {"cmd", "/c", " certutil.exe -f -verify " + certificate.getAbsolutePath()}); + final String output = RuntimeUtil.getCommandOutput(new String[] {"cmd", "/c", " certutil.exe -f -verify \"" + certificate.getAbsolutePath() + "\""}); return !output.contains("CERT_TRUST_IS_UNTRUSTED_ROOT") && output.contains("dwInfoStatus=10c dwErrorStatus=0"); @@ -41,7 +41,7 @@ public class NitroWindows implements NitroOsFunctions { final String certificatePath = certificate.getAbsolutePath(); // Prompt UAC elevation. - WinDef.HINSTANCE result = NitroWindowsShell32.INSTANCE.ShellExecuteA(null, "runas", "cmd.exe", "/S /C \"certutil -addstore root " + certificatePath + "\"", null, 1); + WinDef.HINSTANCE result = NitroWindowsShell32.INSTANCE.ShellExecuteA(null, "runas", "cmd.exe", "/S /C 'certutil -addstore root \"" + certificatePath + "\"'", null, 1); // Wait for exit. Kernel32.INSTANCE.WaitForSingleObject(result, WinBase.INFINITE);