diff --git a/Extensions/AdminOnConnect/pom.xml b/Extensions/AdminOnConnect/pom.xml index 2706564..fdacdf7 100644 --- a/Extensions/AdminOnConnect/pom.xml +++ b/Extensions/AdminOnConnect/pom.xml @@ -13,7 +13,7 @@ G-Earth G-Earth-Parent - 0.2 + 0.2.1 @@ -83,7 +83,7 @@ G-Earth G-Earth - 0.2 + 0.2.1 diff --git a/Extensions/BlockReplacePackets/pom.xml b/Extensions/BlockReplacePackets/pom.xml index bc0b31a..cb76684 100644 --- a/Extensions/BlockReplacePackets/pom.xml +++ b/Extensions/BlockReplacePackets/pom.xml @@ -13,7 +13,7 @@ G-Earth G-Earth-Parent - 0.2 + 0.2.1 @@ -82,7 +82,7 @@ G-Earth G-Earth - 0.2 + 0.2.1 diff --git a/Extensions/HappySpeech/pom.xml b/Extensions/HappySpeech/pom.xml index 713daf7..74c7685 100644 --- a/Extensions/HappySpeech/pom.xml +++ b/Extensions/HappySpeech/pom.xml @@ -13,7 +13,7 @@ G-Earth G-Earth-Parent - 0.2 + 0.2.1 @@ -82,7 +82,7 @@ G-Earth G-Earth - 0.2 + 0.2.1 diff --git a/G-Earth/pom.xml b/G-Earth/pom.xml index 5ed3e46..1ff4904 100644 --- a/G-Earth/pom.xml +++ b/G-Earth/pom.xml @@ -8,12 +8,12 @@ jar - 0.2 + 0.2.1 G-Earth G-Earth-Parent - 0.2 + 0.2.1 diff --git a/G-Earth/src/main/java/gearth/Main.java b/G-Earth/src/main/java/gearth/Main.java index 6e2f28e..f5d99c5 100644 --- a/G-Earth/src/main/java/gearth/Main.java +++ b/G-Earth/src/main/java/gearth/Main.java @@ -29,7 +29,7 @@ import java.io.IOException; public class Main extends Application { public static Application main; - public static String version = "0.2"; + public static String version = "0.2.1"; private static String gitApi = "https://api.github.com/repos/sirjonasxx/G-Earth/releases/latest"; @Override diff --git a/G-Earth/src/main/java/gearth/extensions/Extension.java b/G-Earth/src/main/java/gearth/extensions/Extension.java index a74b280..62de7ac 100644 --- a/G-Earth/src/main/java/gearth/extensions/Extension.java +++ b/G-Earth/src/main/java/gearth/extensions/Extension.java @@ -90,6 +90,7 @@ public abstract class Extension implements IExtension{ Socket gEarthExtensionServer = null; try { gEarthExtensionServer = new Socket("127.0.0.1", port); + gEarthExtensionServer.setTcpNoDelay(true); InputStream in = gEarthExtensionServer.getInputStream(); DataInputStream dIn = new DataInputStream(in); out = gEarthExtensionServer.getOutputStream(); diff --git a/G-Earth/src/main/java/gearth/protocol/HConnection.java b/G-Earth/src/main/java/gearth/protocol/HConnection.java index 8f00689..0da69f7 100644 --- a/G-Earth/src/main/java/gearth/protocol/HConnection.java +++ b/G-Earth/src/main/java/gearth/protocol/HConnection.java @@ -260,6 +260,7 @@ public class HConnection { while ((state == State.WAITING_FOR_CLIENT) && !proxy_server.isClosed()) { try { Socket client = proxy_server.accept(); + client.setTcpNoDelay(true); actual_proxy = potentialProxy; closeAllProxies(actual_proxy); if (DEBUG) System.out.println("accepted a proxy"); @@ -293,6 +294,7 @@ public class HConnection { final boolean[] datastream = new boolean[1]; Socket habbo_server = new Socket(proxy.actual_domain, proxy.actual_port); + habbo_server.setTcpNoDelay(true); OutputStream client_out = client.getOutputStream(); InputStream client_in = client.getInputStream(); diff --git a/G-Earth/src/main/java/gearth/ui/info/Info.java b/G-Earth/src/main/java/gearth/ui/info/Info.java index ebf6693..0dd5bb3 100644 --- a/G-Earth/src/main/java/gearth/ui/info/Info.java +++ b/G-Earth/src/main/java/gearth/ui/info/Info.java @@ -43,31 +43,11 @@ public class Info extends SubForm { link_g_gearth.setTooltip(new Tooltip("https://github.com/sirjonasxx/G-Earth")); link_g_tanji.setTooltip(new Tooltip("https://github.com/ArachisH/Tanji")); link_d_harble.setTooltip(new Tooltip("https://discord.gg/Vyc2gFC")); - link_d_bonnie.setTooltip(new Tooltip("https://discord.gg/KZa3rXD")); - activateHyperlink(link_d_harble); - activateHyperlink(link_d_bonnie); +// activateHyperlink(link_d_harble); activateHyperlink(link_g_gearth); activateHyperlink(link_g_tanji); activateHyperlink(link_sng); activateHyperlink(link_darkbox); - -// String[] lines = { -// "G-Earth 0.1.1", -// "Linux Habbo Packet Manipulator", -// "", -// "Made by:", -// "sirjonasxx", -// "", -// "Contributors:", -// "XePeleato (Windows & Mac support)", -// "Scott Stamp", -// "LittleJ", -// "ArachisH", -// "", -// "Check out:", -// "sngforum.info", -// "darkbox.nl" -// }; } } diff --git a/G-Earth/src/main/resources/gearth/ui/info/Info.fxml b/G-Earth/src/main/resources/gearth/ui/info/Info.fxml index fcf0afe..283e83f 100644 --- a/G-Earth/src/main/resources/gearth/ui/info/Info.fxml +++ b/G-Earth/src/main/resources/gearth/ui/info/Info.fxml @@ -74,7 +74,7 @@ - + diff --git a/README.md b/README.md index 68137b0..9d3e2cc 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # G-Earth -Habbo packet logger & manipulator for Windows and Linux devices. +Habbo packet logger & manipulator for Windows, Linux and Mac. - Requires Java 8 @@ -17,6 +17,9 @@ Execute this command if you get the following error: > $ xhost +local: +# Mac execution +This is more complex, will be documented later + # Features * Log outgoing and incoming packets * Injection, both sides @@ -27,7 +30,4 @@ Execute this command if you get the following error: * Retro support - enter game host & port manually (only the first time) * Advanced scheduler * Advanced extension support -* Block/replace packets, replace Strings & ints & .. in all packets, included extension -* Always admin, included extension -* Packetlogger - +* 2 included extensions on-release diff --git a/pom.xml b/pom.xml index 4c9edc7..ea9cb1d 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ G-Earth G-Earth-Parent pom - 0.2 + 0.2.1 1.8