From b66769eccd7338103a13d25bdb7c2267bdd39f0f Mon Sep 17 00:00:00 2001 From: sirjonasxx <36828922+sirjonasxx@users.noreply.github.com> Date: Thu, 19 Aug 2021 05:17:00 +0200 Subject: [PATCH 1/2] Update README.md --- README.md | 48 +++++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index b163ed8..236ad9c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # G-Earth -Habbo packet logger & manipulator for Windows, Linux and Mac. +Feature-rich habbo packet logger & manipulator for Windows, Linux and Mac. - Requires Java 8 @@ -9,35 +9,41 @@ Join the G-Earth [Discord server](https://discord.gg/AVkcF8y) **Download the [chrome extension](https://chrome.google.com/webstore/detail/g-chrome/cdjgbghobmfmfcenhoahgfnfpcadddag) if you're using Unity** -# Windows execution -Double click G-Earth.exe, which will be delivered in the release. Double clicking the .jar file might work as well. - -# Linux execution -Execution command: -> $ java -jar G-Earth.jar - -Additionally, you can add the -t flag to log the packets in your terminal instead of opening a new window for it. - -# Mac execution -[MacOs Installation guide](https://github.com/sirjonasxx/G-Earth/wiki/macOs-Installation-guide) (flash only) +# Execution +* **Windows:** Double click G-Earth.exe, which will be delivered in the release. Double clicking the .jar file might work as well. +* **Linux** Execute `sudo java -jar G-Earth.jar` on the command line. You can include the `t` flag to log packets in your terminal +* **Mac** Follow the [MacOs Installation guide](https://github.com/sirjonasxx/G-Earth/wiki/macOs-Installation-guide) (flash only) # Features * Log outgoing and incoming packets -* Injection, both directions -* Blocking & replacing packets functionality -* Packet expressions -* Encoding/decoding +* Inject, block & replace packets on the fly +* Automatic packet expression prediction * Auto detect hotel * Retro support - enter game host & port manually (only the first time) * Advanced scheduler * Advanced extension support * Python scripting on the fly * SOCKS proxy -* 2 included extensions on-release +* Identify packets through [Harble API](https://api.harble.net/messages/) and [sulek.dev](https://www.sulek.dev) +* Supports both Unity (browser) and Flash -Interested in creating an extension? -* If you're not experienced with Java but have written extensions before in C#/VB, you could have a look at [Geode](https://github.com/LilithRainbows/Geode) or [Xabbo.GEarth](https://github.com/b7c/Xabbo.GEarth). -* If you are experienced with Java, read this [wiki page](https://github.com/sirjonasxx/G-Earth/wiki/Extensions) carefully. -* The easiest way to create extensions is using [G-Python](https://github.com/sirjonasxx/G-Python). (can also be done inside G-Earth with a [live scripting console](https://github.com/sirjonasxx/G-Earth/wiki/G-Python-qtConsole)) + +# Extensions + +Interested in creating your own extension? Check one of the frameworks: + +Name | Language | Developers | Github +--- | --- | --- | --- | +G-Earth (Native) | Java | sirjonasxx | https://github.com/sirjonasxx/G-Earth +G-Python1 | Python | sirjonasxx | https://github.com/sirjonasxx/G-Python +Geode | C# & Visual Basic | ArachisH, LilithRainbows | https://github.com/LilithRainbows/Geode +Xabbo | C# | b7 | https://github.com/b7c/Xabbo.Scripter +G-Node | Node.js | WiredSpast | https://github.com/WiredSpast/G-Node +GProgrammer2 | Node.js | at15four2020 | https://github.com/at15four2020/GProgrammer/wiki + +1: built-in in G-Earth through the [live scripting console](https://github.com/sirjonasxx/G-Earth/wiki/G-Python-qtConsole) +2: not an implementation of the extension API, but allows for Node.js scripting, also check [G-WiredFly](https://github.com/at15four2020/G-Wiredfy) + +Release your extensions in the [G-ExtensionStore](https://github.com/sirjonasxx/G-ExtensionStore) For the memorysearcher that extracts the RC4 table, go to [G-Mem](https://github.com/sirjonasxx/G-Mem). From 2f61ac8fb65b5a999c92785c99b6e8570d3bbd19 Mon Sep 17 00:00:00 2001 From: sirjonasxx <36828922+sirjonasxx@users.noreply.github.com> Date: Thu, 19 Aug 2021 20:14:39 +0200 Subject: [PATCH 2/2] better version checking --- G-Earth/src/main/java/gearth/Main.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/G-Earth/src/main/java/gearth/Main.java b/G-Earth/src/main/java/gearth/Main.java index eea5579..7eebfe9 100644 --- a/G-Earth/src/main/java/gearth/Main.java +++ b/G-Earth/src/main/java/gearth/Main.java @@ -17,6 +17,7 @@ import javafx.scene.layout.Region; import javafx.scene.web.WebView; import javafx.stage.Stage; import org.apache.commons.io.IOUtils; +import org.apache.maven.artifact.versioning.ComparableVersion; import org.json.JSONObject; import java.io.IOException; @@ -78,7 +79,7 @@ public class Main extends Application { new URL(gitApi).openStream(), StandardCharsets.UTF_8)); String gitv = (String)object.get("tag_name"); - if (!gitv.equals(version)) { + if (new ComparableVersion(version).compareTo(new ComparableVersion(gitv)) < 0) { Platform.runLater(() -> { String body = (String)object.get("body"); boolean isForcedUpdate = body.contains("(!)");