Merge remote-tracking branch 'origin/master' into development

Extensions/AdminOnConnect/pom.xml

@@ -13,7 +13,7 @@
     <parent>
         <groupId>G-Earth</groupId>
         <artifactId>G-Earth-Parent</artifactId>
-        <version>0.2</version>
+        <version>0.2.1</version>
     </parent>
 
     <build>
@@ -83,7 +83,7 @@
         <dependency>
             <groupId>G-Earth</groupId>
             <artifactId>G-Earth</artifactId>
-            <version>0.2</version>
+            <version>0.2.1</version>
             <!--<scope>provided</scope>-->
         </dependency>
     </dependencies>

Extensions/BlockReplacePackets/pom.xml

@@ -13,7 +13,7 @@
     <parent>
         <groupId>G-Earth</groupId>
         <artifactId>G-Earth-Parent</artifactId>
-        <version>0.2</version>
+        <version>0.2.1</version>
     </parent>
 
     <build>
@@ -82,7 +82,7 @@
         <dependency>
             <groupId>G-Earth</groupId>
             <artifactId>G-Earth</artifactId>
-            <version>0.2</version>
+            <version>0.2.1</version>
             <!--<scope>provided</scope>-->
         </dependency>
     </dependencies>

Extensions/HappySpeech/pom.xml

@@ -13,7 +13,7 @@
     <parent>
         <groupId>G-Earth</groupId>
         <artifactId>G-Earth-Parent</artifactId>
-        <version>0.2</version>
+        <version>0.2.1</version>
     </parent>
 
     <build>
@@ -82,7 +82,7 @@
         <dependency>
             <groupId>G-Earth</groupId>
             <artifactId>G-Earth</artifactId>
-            <version>0.2</version>
+            <version>0.2.1</version>
             <!--<scope>provided</scope>-->
         </dependency>
     </dependencies>

G-Earth/pom.xml

@@ -8,12 +8,12 @@
 
     <packaging>jar</packaging>
 
-    <version>0.2</version>
+    <version>0.2.1</version>
 
     <parent>
         <groupId>G-Earth</groupId>
         <artifactId>G-Earth-Parent</artifactId>
-        <version>0.2</version>
+        <version>0.2.1</version>
     </parent>
 
     <build>

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

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();

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();

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_harble);
-        activateHyperlink(link_d_bonnie);
         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"
-//        };
     }
 }

G-Earth/src/main/resources/gearth/ui/info/Info.fxml

@@ -74,7 +74,7 @@
          <Hyperlink fx:id="link_d_harble" layoutX="400.0" layoutY="201.0" text="Discord - Harble" />
          <Hyperlink fx:id="link_g_gearth" layoutX="400.0" layoutY="161.0" text="Github - G-Earth" />
          <Hyperlink fx:id="link_g_tanji" layoutX="400.0" layoutY="181.0" text="Github - Tanji" />
-         <Hyperlink fx:id="link_d_bonnie" layoutX="400.0" layoutY="221.0" text="Discord - BonnieScripting (pt/br)" />
+         <!--<Hyperlink fx:id="link_d_bonnie" layoutX="400.0" layoutY="221.0" text="Discord - BonnieScripting (pt/br)" />-->
       </children>
    </AnchorPane>
 </GridPane>

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
+* 2 included extensions on-release
-* Always admin, included extension
-* Packetlogger
-

pom.xml

@@ -7,7 +7,7 @@
     <groupId>G-Earth</groupId>
     <artifactId>G-Earth-Parent</artifactId>
     <packaging>pom</packaging>
-    <version>0.2</version>
+    <version>0.2.1</version>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>