diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6ba3356..6a31101 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,6 +5,7 @@ on: paths: - '.github/workflows/**' - 'G-Earth/**' + - 'pom.xml' jobs: build: diff --git a/G-Earth/assembly/linux.xml b/G-Earth/assembly/linux.xml new file mode 100644 index 0000000..d3f0ac2 --- /dev/null +++ b/G-Earth/assembly/linux.xml @@ -0,0 +1,17 @@ + + zip + + zip + + false + + + ../Build/Linux/ + true + ../G-Earth/ + + + \ No newline at end of file diff --git a/G-Earth/assembly/mac.xml b/G-Earth/assembly/mac.xml new file mode 100644 index 0000000..fffbb20 --- /dev/null +++ b/G-Earth/assembly/mac.xml @@ -0,0 +1,17 @@ + + zip + + zip + + false + + + ../Build/Mac/ + true + ../G-Earth/ + + + \ No newline at end of file diff --git a/G-Earth/assembly/windows_32bit.xml b/G-Earth/assembly/windows_32bit.xml new file mode 100644 index 0000000..19fb493 --- /dev/null +++ b/G-Earth/assembly/windows_32bit.xml @@ -0,0 +1,17 @@ + + zip + + zip + + false + + + ../Build/Windows_32bit/ + true + ../G-Earth/ + + + \ No newline at end of file diff --git a/G-Earth/assembly/windows_64bit.xml b/G-Earth/assembly/windows_64bit.xml new file mode 100644 index 0000000..a666316 --- /dev/null +++ b/G-Earth/assembly/windows_64bit.xml @@ -0,0 +1,17 @@ + + zip + + zip + + false + + + ../Build/Windows_64bit/ + true + ../G-Earth/ + + + \ No newline at end of file diff --git a/G-Earth/pom.xml b/G-Earth/pom.xml index 9164616..bbdf23e 100644 --- a/G-Earth/pom.xml +++ b/G-Earth/pom.xml @@ -8,8 +8,6 @@ jar - 1.5.1 - 1.8 9.4.41.v20210516 @@ -22,55 +20,50 @@ + G-Earth - + + + org.apache.maven.plugins + maven-dependency-plugin + 3.2.0 + + + copy-dependencies + prepare-package + + copy-dependencies + + + ${project.build.directory}/bin/Dependencies + false + false + true + + + + org.apache.maven.plugins maven-jar-plugin - 3.1.2 + 3.2.2 ${project.build.directory}/bin - true true - lib/ - gearth.Main - false + Dependencies/ + gearth.GEarth + true + true - - maven-assembly-plugin - 3.1.1 - - - package - - single - - - - - ${project.build.directory}/bin - - - gearth.Main - - - - jar-with-dependencies - - - G-Earth - false - - - + maven-antrun-plugin 3.0.0 @@ -80,41 +73,26 @@ package - - - - - - - - - - + + + + + - + + + - - - - - - - - - - - - - - - + + + @@ -139,6 +117,75 @@ + + + maven-assembly-plugin + 3.3.0 + + + ziprelease-mac + package + + single + + + false + ../Build + G-Earth-${project.version}-Mac + + ${basedir}/assembly/mac.xml + + + + + ziprelease-linux + package + + single + + + false + ../Build + G-Earth-${project.version}-Linux + + ${basedir}/assembly/linux.xml + + + + + ziprelease-windows_32bit + package + + single + + + false + ../Build + G-Earth-${project.version}-Windows_32bit + + ${basedir}/assembly/windows_32bit.xml + + + + + ziprelease-windows_64bit + package + + single + + + false + ../Build + G-Earth-${project.version}-Windows_64bit + + ${basedir}/assembly/windows_64bit.xml + + + + + + + @@ -235,8 +282,8 @@ G-Earth - G-Wasm - 1.0.1 + G-Wasm-Minimal + 1.0.3 diff --git a/G-Earth/src/META-INF/MANIFEST.MF b/G-Earth/src/META-INF/MANIFEST.MF index c12866f..5aa077d 100644 --- a/G-Earth/src/META-INF/MANIFEST.MF +++ b/G-Earth/src/META-INF/MANIFEST.MF @@ -1,3 +1,3 @@ Manifest-Version: 1.0 -Main-Class: gearth.Main +Main-Class: gearth.GEarth diff --git a/G-Earth/src/main/java/gearth/Main.java b/G-Earth/src/main/java/gearth/GEarth.java similarity index 97% rename from G-Earth/src/main/java/gearth/Main.java rename to G-Earth/src/main/java/gearth/GEarth.java index ee43c31..6cb6041 100644 --- a/G-Earth/src/main/java/gearth/Main.java +++ b/G-Earth/src/main/java/gearth/GEarth.java @@ -17,7 +17,7 @@ import javafx.scene.paint.Color; import javafx.stage.Stage; import javafx.stage.StageStyle; -public class Main extends Application { +public class GEarth extends Application { public static Application main; public static String version = "1.5.1"; @@ -67,7 +67,7 @@ public class Main extends Application { public static String[] args; public static void main(String[] args) { - Main.args = args; + GEarth.args = args; launch(args); } diff --git a/G-Earth/src/main/java/gearth/extensions/InternalExtension.java b/G-Earth/src/main/java/gearth/extensions/InternalExtension.java index 6b97d48..453980d 100644 --- a/G-Earth/src/main/java/gearth/extensions/InternalExtension.java +++ b/G-Earth/src/main/java/gearth/extensions/InternalExtension.java @@ -1,6 +1,6 @@ package gearth.extensions; -import gearth.Main; +import gearth.GEarth; import gearth.protocol.HPacket; @@ -32,7 +32,7 @@ public class InternalExtension extends ExtensionBase { @Override public boolean requestFlags(FlagsCheckListener flagRequestCallback) { - flagRequestCallback.act(Main.args); + flagRequestCallback.act(GEarth.args); return true; } diff --git a/G-Earth/src/main/java/gearth/extensions/InternalExtensionFormBuilder.java b/G-Earth/src/main/java/gearth/extensions/InternalExtensionFormBuilder.java index 95bf432..5db129b 100644 --- a/G-Earth/src/main/java/gearth/extensions/InternalExtensionFormBuilder.java +++ b/G-Earth/src/main/java/gearth/extensions/InternalExtensionFormBuilder.java @@ -1,6 +1,6 @@ package gearth.extensions; -import gearth.Main; +import gearth.GEarth; import gearth.services.extension_handler.extensions.GEarthExtension; import gearth.services.extension_handler.extensions.extensionproducers.ExtensionProducerObserver; import javafx.application.Platform; @@ -51,7 +51,7 @@ public class InternalExtensionFormBuilder { - Main.main.getHostServices().showDocument(link.getText()); + GEarth.main.getHostServices().showDocument(link.getText()); event.consume(); }); diff --git a/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/websocket/NitroWebsocketClient.java b/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/websocket/NitroWebsocketClient.java index ca7e88b..c940962 100644 --- a/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/websocket/NitroWebsocketClient.java +++ b/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/websocket/NitroWebsocketClient.java @@ -5,6 +5,7 @@ import gearth.protocol.HMessage; import gearth.protocol.connection.*; import gearth.protocol.connection.proxy.nitro.NitroConstants; import gearth.protocol.connection.proxy.nitro.NitroProxyProvider; +import gearth.protocol.packethandler.nitro.NitroPacketHandler; import javax.websocket.*; import javax.websocket.server.ServerEndpoint; diff --git a/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/websocket/NitroWebsocketServer.java b/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/websocket/NitroWebsocketServer.java index b54b96c..86c5ad0 100644 --- a/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/websocket/NitroWebsocketServer.java +++ b/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/websocket/NitroWebsocketServer.java @@ -4,6 +4,7 @@ import gearth.protocol.HConnection; import gearth.protocol.HMessage; import gearth.protocol.connection.proxy.nitro.NitroConstants; import gearth.protocol.packethandler.PacketHandler; +import gearth.protocol.packethandler.nitro.NitroPacketHandler; import javax.websocket.*; import java.io.IOException; diff --git a/G-Earth/src/main/java/gearth/protocol/memory/Rc4Obtainer.java b/G-Earth/src/main/java/gearth/protocol/memory/Rc4Obtainer.java index 3f3a198..1066821 100644 --- a/G-Earth/src/main/java/gearth/protocol/memory/Rc4Obtainer.java +++ b/G-Earth/src/main/java/gearth/protocol/memory/Rc4Obtainer.java @@ -1,6 +1,6 @@ package gearth.protocol.memory; -import gearth.Main; +import gearth.GEarth; import gearth.protocol.HConnection; import gearth.protocol.HMessage; import gearth.protocol.HPacket; @@ -83,15 +83,15 @@ public class Rc4Obtainer { Platform.runLater(() -> { Alert alert = new Alert(Alert.AlertType.WARNING, "Something went wrong!", ButtonType.OK); Stage stage = (Stage) alert.getDialogPane().getScene().getWindow(); - stage.getIcons().add(new Image(Main.class.getResourceAsStream(String.format("/gearth/themes/%s/logoSmall.png", Main.theme)))); - stage.getScene().getStylesheets().add(Main.class.getResource(String.format("/gearth/themes/%s/styling.css", Main.theme)).toExternalForm()); + stage.getIcons().add(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/themes/%s/logoSmall.png", GEarth.theme)))); + stage.getScene().getStylesheets().add(GEarth.class.getResource(String.format("/gearth/themes/%s/styling.css", GEarth.theme)).toExternalForm()); FlowPane fp = new FlowPane(); Label lbl = new Label("G-Earth has experienced an issue" + System.lineSeparator()+ System.lineSeparator() + "Head over to our Troubleshooting page to solve the problem:"); Hyperlink link = new Hyperlink("https://github.com/sirjonasxx/G-Earth/wiki/Troubleshooting"); fp.getChildren().addAll( lbl, link); link.setOnAction(event -> { - Main.main.getHostServices().showDocument(link.getText()); + GEarth.main.getHostServices().showDocument(link.getText()); event.consume(); }); @@ -101,7 +101,7 @@ public class Rc4Obtainer { alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE); alert.getDialogPane().setContent(fp); alert.setOnCloseRequest(event -> { - Main.main.getHostServices().showDocument(link.getText()); + GEarth.main.getHostServices().showDocument(link.getText()); }); alert.show(); diff --git a/G-Earth/src/main/java/gearth/protocol/packethandler/PacketHandler.java b/G-Earth/src/main/java/gearth/protocol/packethandler/PacketHandler.java index a0d2677..9748dd3 100644 --- a/G-Earth/src/main/java/gearth/protocol/packethandler/PacketHandler.java +++ b/G-Earth/src/main/java/gearth/protocol/packethandler/PacketHandler.java @@ -32,4 +32,15 @@ public abstract class PacketHandler { message.getPacket().resetReadIndex(); } + protected void awaitListeners(HMessage message, PacketSender packetSender) { + notifyListeners(0, message); + notifyListeners(1, message); + extensionHandler.handle(message, message2 -> { + notifyListeners(2, message2); + if (!message2.isBlocked()) { + packetSender.send(message2); + } + }); + } + } diff --git a/G-Earth/src/main/java/gearth/protocol/packethandler/PacketSender.java b/G-Earth/src/main/java/gearth/protocol/packethandler/PacketSender.java new file mode 100644 index 0000000..62b69ac --- /dev/null +++ b/G-Earth/src/main/java/gearth/protocol/packethandler/PacketSender.java @@ -0,0 +1,9 @@ +package gearth.protocol.packethandler; + +import gearth.protocol.HMessage; + +public interface PacketSender { + + void send(HMessage hMessage); + +} diff --git a/G-Earth/src/main/java/gearth/protocol/packethandler/flash/FlashPacketHandler.java b/G-Earth/src/main/java/gearth/protocol/packethandler/flash/FlashPacketHandler.java index 018bca1..98b7ffe 100644 --- a/G-Earth/src/main/java/gearth/protocol/packethandler/flash/FlashPacketHandler.java +++ b/G-Earth/src/main/java/gearth/protocol/packethandler/flash/FlashPacketHandler.java @@ -8,7 +8,6 @@ import gearth.protocol.crypto.RC4; import gearth.protocol.packethandler.PacketHandler; import gearth.protocol.packethandler.PayloadBuffer; import gearth.services.extension_handler.ExtensionHandler; -import gearth.services.extension_handler.OnHMessageHandled; import java.io.IOException; import java.io.OutputStream; @@ -116,10 +115,14 @@ public abstract class FlashPacketHandler extends PacketHandler { } public boolean sendToStream(byte[] buffer) { + return sendToStream(buffer, isEncryptedStream); + } + + private boolean sendToStream(byte[] buffer, boolean isEncrypted) { synchronized (sendLock) { try { out.write( - (!isEncryptedStream) + (!isEncrypted) ? buffer : encryptcipher.rc4(buffer) ); @@ -139,29 +142,11 @@ public abstract class FlashPacketHandler extends PacketHandler { HMessage hMessage = new HMessage(hpacket, getMessageSide(), currentIndex); boolean isencrypted = isEncryptedStream; - OnHMessageHandled afterExtensionIntercept = hMessage1 -> { - if (isDataStream) { - notifyListeners(2, hMessage1); - } - - if (!hMessage1.isBlocked()) { - synchronized (sendLock) { - out.write( - (!isencrypted) - ? hMessage1.getPacket().toBytes() - : encryptcipher.rc4(hMessage1.getPacket().toBytes()) - ); - } - } - }; - if (isDataStream) { - notifyListeners(0, hMessage); - notifyListeners(1, hMessage); - extensionHandler.handle(hMessage, afterExtensionIntercept); + awaitListeners(hMessage, hMessage1 -> sendToStream(hMessage1.getPacket().toBytes(), isencrypted)); } else { - afterExtensionIntercept.finished(hMessage); + sendToStream(hMessage.getPacket().toBytes(), isencrypted); } currentIndex++; diff --git a/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/websocket/NitroPacketHandler.java b/G-Earth/src/main/java/gearth/protocol/packethandler/nitro/NitroPacketHandler.java similarity index 68% rename from G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/websocket/NitroPacketHandler.java rename to G-Earth/src/main/java/gearth/protocol/packethandler/nitro/NitroPacketHandler.java index 70ed0cb..d8b69b0 100644 --- a/G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/websocket/NitroPacketHandler.java +++ b/G-Earth/src/main/java/gearth/protocol/packethandler/nitro/NitroPacketHandler.java @@ -1,11 +1,11 @@ -package gearth.protocol.connection.proxy.nitro.websocket; +package gearth.protocol.packethandler.nitro; import gearth.protocol.HMessage; import gearth.protocol.HPacket; +import gearth.protocol.connection.proxy.nitro.websocket.NitroSession; import gearth.protocol.packethandler.PacketHandler; import gearth.protocol.packethandler.PayloadBuffer; import gearth.services.extension_handler.ExtensionHandler; -import gearth.services.extension_handler.OnHMessageHandled; import javax.websocket.Session; import java.io.IOException; @@ -18,7 +18,7 @@ public class NitroPacketHandler extends PacketHandler { private final PayloadBuffer payloadBuffer; private final Object payloadLock; - protected NitroPacketHandler(HMessage.Direction direction, NitroSession session, ExtensionHandler extensionHandler, Object[] trafficObservables) { + public NitroPacketHandler(HMessage.Direction direction, NitroSession session, ExtensionHandler extensionHandler, Object[] trafficObservables) { super(extensionHandler, trafficObservables); this.direction = direction; this.session = session; @@ -50,19 +50,7 @@ public class NitroPacketHandler extends PacketHandler { synchronized (payloadLock) { for (HPacket packet : payloadBuffer.receive()) { HMessage hMessage = new HMessage(packet, direction, currentIndex); - - OnHMessageHandled afterExtensionIntercept = hMessage1 -> { - notifyListeners(2, hMessage1); - - if (!hMessage1.isBlocked()) { - sendToStream(hMessage1.getPacket().toBytes()); - } - }; - - notifyListeners(0, hMessage); - notifyListeners(1, hMessage); - extensionHandler.handle(hMessage, afterExtensionIntercept); - + awaitListeners(hMessage, hMessage1 -> sendToStream(hMessage1.getPacket().toBytes())); currentIndex++; } } diff --git a/G-Earth/src/main/java/gearth/protocol/packethandler/unity/UnityPacketHandler.java b/G-Earth/src/main/java/gearth/protocol/packethandler/unity/UnityPacketHandler.java index 6bcca62..f85e55b 100644 --- a/G-Earth/src/main/java/gearth/protocol/packethandler/unity/UnityPacketHandler.java +++ b/G-Earth/src/main/java/gearth/protocol/packethandler/unity/UnityPacketHandler.java @@ -5,7 +5,6 @@ import gearth.protocol.HPacket; import gearth.protocol.packethandler.ByteArrayUtils; import gearth.protocol.packethandler.PacketHandler; import gearth.services.extension_handler.ExtensionHandler; -import gearth.services.extension_handler.OnHMessageHandled; import javax.websocket.Session; import java.io.IOException; @@ -34,19 +33,7 @@ public class UnityPacketHandler extends PacketHandler { @Override public void act(byte[] buffer) throws IOException { HMessage hMessage = new HMessage(new HPacket(buffer), direction, currentIndex); - - OnHMessageHandled afterExtensionIntercept = hMessage1 -> { - notifyListeners(2, hMessage1); - - if (!hMessage1.isBlocked()) { - sendToStream(hMessage1.getPacket().toBytes()); - } - }; - - notifyListeners(0, hMessage); - notifyListeners(1, hMessage); - extensionHandler.handle(hMessage, afterExtensionIntercept); - + awaitListeners(hMessage, hMessage1 -> sendToStream(hMessage1.getPacket().toBytes())); currentIndex++; } } diff --git a/G-Earth/src/main/java/gearth/services/extension_handler/ExtensionHandler.java b/G-Earth/src/main/java/gearth/services/extension_handler/ExtensionHandler.java index 5870c48..3c8c119 100644 --- a/G-Earth/src/main/java/gearth/services/extension_handler/ExtensionHandler.java +++ b/G-Earth/src/main/java/gearth/services/extension_handler/ExtensionHandler.java @@ -1,6 +1,6 @@ package gearth.services.extension_handler; -import gearth.Main; +import gearth.GEarth; import gearth.misc.listenerpattern.Observable; import gearth.protocol.HConnection; import gearth.protocol.HMessage; @@ -184,7 +184,7 @@ public class ExtensionHandler { ExtensionListener listener = new ExtensionListener() { @Override public void flagsRequest() { - extension.provideFlags(Main.args); + extension.provideFlags(GEarth.args); } @Override diff --git a/G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/executer/NormalExtensionRunner.java b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/executer/NormalExtensionRunner.java index 3ac1c29..ba8bc29 100644 --- a/G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/executer/NormalExtensionRunner.java +++ b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/executer/NormalExtensionRunner.java @@ -1,6 +1,6 @@ package gearth.services.extension_handler.extensions.implementations.network.executer; -import gearth.Main; +import gearth.GEarth; import gearth.services.extension_handler.extensions.implementations.network.authentication.Authenticator; import gearth.services.internal_extensions.extensionstore.tools.StoreExtensionTools; @@ -23,9 +23,9 @@ public class NormalExtensionRunner implements ExtensionRunner { static { String value; try { - value = new File(Main.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParent(); + value = new File(GEarth.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParent(); } catch (URISyntaxException e) { - value = new File(Main.class.getProtectionDomain().getCodeSource().getLocation().getPath()).getParent(); + value = new File(GEarth.class.getProtectionDomain().getCodeSource().getLocation().getPath()).getParent(); e.printStackTrace(); } JARPATH = value; @@ -115,7 +115,7 @@ public class NormalExtensionRunner implements ExtensionRunner { } public static void maybeLogExtension(String path, Process proc) { - if (Main.hasFlag(ExtensionRunner.SHOW_EXTENSIONS_LOG)) { + if (GEarth.hasFlag(ExtensionRunner.SHOW_EXTENSIONS_LOG)) { String sep = "" + System.lineSeparator(); synchronized (System.out) { System.out.println(path + sep + "Launching" + sep + "----------" + sep); diff --git a/G-Earth/src/main/java/gearth/services/g_python/GPythonShell.java b/G-Earth/src/main/java/gearth/services/g_python/GPythonShell.java index 97aa1ac..0012ff2 100644 --- a/G-Earth/src/main/java/gearth/services/g_python/GPythonShell.java +++ b/G-Earth/src/main/java/gearth/services/g_python/GPythonShell.java @@ -1,6 +1,6 @@ package gearth.services.g_python; -import gearth.Main; +import gearth.GEarth; import gearth.ui.extra.ExtraController; import javafx.application.Platform; import javafx.scene.control.Alert; @@ -171,8 +171,8 @@ public class GPythonShell { Platform.runLater(() -> { Alert alert = new Alert(Alert.AlertType.ERROR, "G-Python error", ButtonType.OK); Stage stage = (Stage) alert.getDialogPane().getScene().getWindow(); - stage.getIcons().add(new Image(Main.class.getResourceAsStream(String.format("/gearth/themes/%s/logoSmall.png", Main.theme)))); - stage.getScene().getStylesheets().add(Main.class.getResource(String.format("/gearth/themes/%s/styling.css", Main.theme)).toExternalForm()); + stage.getIcons().add(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/themes/%s/logoSmall.png", GEarth.theme)))); + stage.getScene().getStylesheets().add(GEarth.class.getResource(String.format("/gearth/themes/%s/styling.css", GEarth.theme)).toExternalForm()); alert.setTitle("G-Python error"); FlowPane fp = new FlowPane(); @@ -182,7 +182,7 @@ public class GPythonShell { Hyperlink link = new Hyperlink(ExtraController.INFO_URL_GPYTHON); fp.getChildren().addAll(lbl, link); link.setOnAction(event -> { - Main.main.getHostServices().showDocument(link.getText()); + GEarth.main.getHostServices().showDocument(link.getText()); event.consume(); }); diff --git a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/GExtensionStoreLauncher.java b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/GExtensionStoreLauncher.java index 5d78d27..5e94d67 100644 --- a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/GExtensionStoreLauncher.java +++ b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/GExtensionStoreLauncher.java @@ -1,6 +1,6 @@ package gearth.services.internal_extensions.extensionstore; -import gearth.Main; +import gearth.GEarth; import gearth.extensions.InternalExtensionFormLauncher; import gearth.services.internal_extensions.extensionstore.application.GExtensionStoreController; import gearth.ui.GEarthController; @@ -26,8 +26,8 @@ public class GExtensionStoreLauncher extends InternalExtensionFormLauncher> hOverviewSupplier = new HashMap<>(); - hOverviewSupplier.put(by_date_link, () -> new ByDateOverview(null, 0, GExtensionStore.PAGESIZE, getStoreRepository())); + hOverviewSupplier.put(by_update_link, () -> new ByUpdateOverview(null, 0, GExtensionStore.PAGESIZE, getStoreRepository())); hOverviewSupplier.put(by_rating_link, () -> new ByRatingOverview(null, 0, GExtensionStore.PAGESIZE, getStoreRepository())); hOverviewSupplier.put(by_category_link, () -> new CategoryOverview(null, 0, GExtensionStore.PAGESIZE, getStoreRepository())); hOverviewSupplier.put(installed_link, () -> new InstalledOverview(null, 0, GExtensionStore.PAGESIZE, getStoreRepository())); hOverviewSupplier.put(seach_link, () -> new SearchOverview(null, getStoreRepository())); - Arrays.asList(by_date_link, by_rating_link, by_category_link, installed_link, seach_link).forEach(l -> + Arrays.asList(by_update_link, by_rating_link, by_category_link, installed_link, seach_link).forEach(l -> ((EventTarget) l).addEventListener("click", event -> { if (initialized) setRootOverview(hOverviewSupplier.get(l).get()); }, true)); @@ -210,7 +211,7 @@ public class GExtensionStoreController implements Initializable { private void onFullInitialize() { initialized = true; - setRootOverview(new ByDateOverview(null, 0, GExtensionStore.PAGESIZE, getStoreRepository())); + setRootOverview(new ByUpdateOverview(null, 0, GExtensionStore.PAGESIZE, getStoreRepository())); } public void gExtensionStore(GExtensionStore gExtensionStore) { diff --git a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/extensiondetails/StoreExtensionDetailsItem.java b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/extensiondetails/StoreExtensionDetailsItem.java index df581c2..e4a335e 100644 --- a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/extensiondetails/StoreExtensionDetailsItem.java +++ b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/extensiondetails/StoreExtensionDetailsItem.java @@ -49,8 +49,12 @@ public class StoreExtensionDetailsItem implements ContentItem { .append("*Author(s):* ").append(storeExtension.getAuthors().stream().map(StoreExtension.Author::getName).collect(Collectors.joining(", "))).append("\n\n") .append("*Categories:* ").append(storeExtension.getCategories().stream().map(ExtCategory::getName).collect(Collectors.joining(", "))).append("\n\n"); - contentBuilder.append("*Technical information*").append("\n") - .append("> Language: ").append(storeExtension.getLanguage()).append("\n") + contentBuilder.append("*Technical information*").append("\n"); + + if(storeExtension.getReleases() != null) + contentBuilder.append("> Releases: --url:Click Here-").append(storeExtension.getReleases()).append("\n"); + + contentBuilder.append("> Language: ").append(storeExtension.getLanguage()).append("\n") .append("> Source: --url:Click Here-").append(storeExtension.getSource()).append("\n") .append("> Framework: ").append(storeExtension.getFramework().getFramework().getName()).append(" - v").append(storeExtension.getFramework().getVersion()).append("\n") .append("> Systems: ").append(String.join(", ", storeExtension.getCompatibility().getSystems())).append("\n \n"); diff --git a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/queriedoverviews/ByUpdateOverview.java b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/queriedoverviews/ByUpdateOverview.java new file mode 100644 index 0000000..36137ba --- /dev/null +++ b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/queriedoverviews/ByUpdateOverview.java @@ -0,0 +1,54 @@ +package gearth.services.internal_extensions.extensionstore.application.entities.queriedoverviews; + +import gearth.misc.OSValidator; +import gearth.services.internal_extensions.extensionstore.application.entities.HOverview; +import gearth.services.internal_extensions.extensionstore.repository.StoreRepository; +import gearth.services.internal_extensions.extensionstore.repository.models.StoreExtension; +import gearth.services.internal_extensions.extensionstore.repository.querying.ExtensionOrdering; + +import java.util.Collections; +import java.util.List; + +public class ByUpdateOverview extends QueriedExtensionOverview { + + + public ByUpdateOverview(HOverview parent, int startIndex, int size, StoreRepository storeRepository) { + super(parent, startIndex, size, storeRepository); + } + + protected List query(int startIndex, int size) { + return storeRepository.getExtensions(startIndex, size, "", ExtensionOrdering.LAST_UPDATED, + Collections.singletonList(OSValidator.getOSFull()), null, null, null, false, false); + } + + @Override + public Header header() { + return new Header() { + @Override + public String iconUrl() { + return "images/overviews/clock.png"; + } + + @Override + public String title() { + return "Recently Updated"; + } + + @Override + public String description() { + return "Extensions that were recently updated"; + } + + @Override + public String contentTitle() { + return "Recently Updated"; + } + }; + } + + + @Override + public HOverview getNewPage(int startIndex, int size) { + return new ByUpdateOverview(parent, startIndex, size, storeRepository); + } +} diff --git a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/StoreFetch.java b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/StoreFetch.java index a35ae94..08bc3c7 100644 --- a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/StoreFetch.java +++ b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/StoreFetch.java @@ -1,6 +1,6 @@ package gearth.services.internal_extensions.extensionstore.repository; -import gearth.Main; +import gearth.GEarth; import gearth.services.internal_extensions.extensionstore.repository.models.StoreData; import org.apache.commons.io.IOUtils; import org.json.JSONArray; @@ -19,7 +19,7 @@ public class StoreFetch { } public static void fetch(StoreFetchListener storeFetchListener) { - fetch(Main.version, storeFetchListener, "sirjonasxx/G-ExtensionStore"); + fetch(GEarth.version, storeFetchListener, "sirjonasxx/G-ExtensionStore"); } public static void fetch(String version, StoreFetchListener storeFetchListener) { @@ -34,11 +34,11 @@ public class StoreFetch { new URL(String.format("https://raw.githubusercontent.com/%s/repo/%s/store/config.json", source, version)) .openStream(), StandardCharsets.UTF_8)); - JSONArray exensions = new JSONArray(IOUtils.toString( + JSONArray extensions = new JSONArray(IOUtils.toString( new URL(String.format("https://raw.githubusercontent.com/%s/repo/%s/.auto-generated/extensions.json", source, version)) .openStream(), StandardCharsets.UTF_8)); - storeFetchListener.success(new StoreRepository(new StoreData(config, exensions), version, source)); + storeFetchListener.success(new StoreRepository(new StoreData(config, extensions), version, source)); } catch (Exception e) { storeFetchListener.fail(e.getLocalizedMessage()); diff --git a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/StoreRepository.java b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/StoreRepository.java index b3f21f3..3eabb45 100644 --- a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/StoreRepository.java +++ b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/StoreRepository.java @@ -78,7 +78,7 @@ public class StoreRepository { } public List getClients() { - return Arrays.asList("Unity", "Flash"); + return Arrays.asList("Unity", "Flash", "Nitro"); } public List getLanguages() { diff --git a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/models/StoreExtension.java b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/models/StoreExtension.java index d876081..eb33e61 100644 --- a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/models/StoreExtension.java +++ b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/models/StoreExtension.java @@ -10,7 +10,7 @@ import java.util.stream.Collectors; public class StoreExtension { - public StoreExtension(String title, String description, List authors, String version, List categories, String source, String readme, boolean stable, Framework framework, String language, Commands commands, Compatibility compatibility, LocalDateTime submissionDate, LocalDateTime updateDate, boolean isOutdated, int rating) { + public StoreExtension(String title, String description, List authors, String version, List categories, String source, String readme, String releases, boolean stable, Framework framework, String language, Commands commands, Compatibility compatibility, LocalDateTime submissionDate, LocalDateTime updateDate, boolean isOutdated, int rating) { this.title = title; this.description = description; this.authors = authors; @@ -18,6 +18,7 @@ public class StoreExtension { this.categories = categories; this.source = source; this.readme = readme; + this.releases = releases; this.stable = stable; this.framework = framework; this.language = language; @@ -38,6 +39,7 @@ public class StoreExtension { .toList().stream().anyMatch(j -> j.equals(c.getName()))).collect(Collectors.toList()); this.source = object.getString("source"); this.readme = object.has("readme") ? object.getString("readme") : null; + this.releases = object.has("releases") ? object.getString("releases") : null; this.stable = object.getBoolean("stable"); this.framework = new Framework(object.getJSONObject("framework"), storeConfig); this.language = object.getString("language"); @@ -201,6 +203,7 @@ public class StoreExtension { private final String source; private final String readme; + private final String releases; private final boolean stable; @@ -246,6 +249,10 @@ public class StoreExtension { return readme; } + public String getReleases() { + return releases; + } + public boolean isStable() { return stable; } diff --git a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/tools/StoreExtensionTools.java b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/tools/StoreExtensionTools.java index 532460e..eb70240 100644 --- a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/tools/StoreExtensionTools.java +++ b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/tools/StoreExtensionTools.java @@ -1,6 +1,6 @@ package gearth.services.internal_extensions.extensionstore.tools; -import gearth.Main; +import gearth.GEarth; import gearth.misc.OSValidator; import gearth.services.extension_handler.extensions.implementations.network.authentication.Authenticator; import gearth.services.extension_handler.extensions.implementations.network.executer.ExecutionInfo; @@ -242,7 +242,7 @@ public class StoreExtensionTools { } public static void main(String[] args) { - StoreFetch.fetch(Main.version, new StoreFetch.StoreFetchListener() { + StoreFetch.fetch(GEarth.version, new StoreFetch.StoreFetchListener() { @Override public void success(StoreRepository storeRepository) { installExtension("G-BuildTools", storeRepository, new InstallExtListener() { diff --git a/G-Earth/src/main/java/gearth/services/internal_extensions/uilogger/UiLoggerLauncher.java b/G-Earth/src/main/java/gearth/services/internal_extensions/uilogger/UiLoggerLauncher.java index 86f517b..702226c 100644 --- a/G-Earth/src/main/java/gearth/services/internal_extensions/uilogger/UiLoggerLauncher.java +++ b/G-Earth/src/main/java/gearth/services/internal_extensions/uilogger/UiLoggerLauncher.java @@ -1,6 +1,6 @@ package gearth.services.internal_extensions.uilogger; -import gearth.Main; +import gearth.GEarth; import gearth.extensions.InternalExtensionFormLauncher; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; @@ -17,12 +17,12 @@ public class UiLoggerLauncher extends InternalExtensionFormLauncher { FXMLLoader loader = new FXMLLoader(UiLogger.class.getResource("UiLogger.fxml")); Parent root = loader.load(); - stage.setTitle(String.format("%s | Packet Logger", Main.theme)); + stage.setTitle(String.format("%s | Packet Logger", GEarth.theme)); stage.initModality(Modality.NONE); - stage.getIcons().add(new Image(getClass().getResourceAsStream(String.format("/gearth/themes/%s/logoSmall.png", Main.theme)))); + stage.getIcons().add(new Image(getClass().getResourceAsStream(String.format("/gearth/themes/%s/logoSmall.png", GEarth.theme)))); Scene scene = new Scene(root); - scene.getStylesheets().add(String.format("/gearth/themes/%s/styling.css", Main.theme)); + scene.getStylesheets().add(String.format("/gearth/themes/%s/styling.css", GEarth.theme)); scene.getStylesheets().add("/gearth/services/internal_extensions/uilogger/logger.css"); UiLoggerController controller = loader.getController(); diff --git a/G-Earth/src/main/java/gearth/services/packet_info/providers/implementations/GEarthUnityPacketInfoProvider.java b/G-Earth/src/main/java/gearth/services/packet_info/providers/implementations/GEarthUnityPacketInfoProvider.java index 64f3ee6..9d8f2dd 100644 --- a/G-Earth/src/main/java/gearth/services/packet_info/providers/implementations/GEarthUnityPacketInfoProvider.java +++ b/G-Earth/src/main/java/gearth/services/packet_info/providers/implementations/GEarthUnityPacketInfoProvider.java @@ -1,6 +1,6 @@ package gearth.services.packet_info.providers.implementations; -import gearth.Main; +import gearth.GEarth; import gearth.services.packet_info.PacketInfo; import gearth.services.packet_info.providers.PacketInfoProvider; import gearth.protocol.HMessage; @@ -21,7 +21,7 @@ public class GEarthUnityPacketInfoProvider extends PacketInfoProvider { @Override protected File getFile() { try { - return new File(new File(Main.class.getProtectionDomain().getCodeSource().getLocation().toURI()) + return new File(new File(GEarth.class.getProtectionDomain().getCodeSource().getLocation().toURI()) .getParentFile(), "messages.json"); } catch (URISyntaxException e) { e.printStackTrace(); diff --git a/G-Earth/src/main/java/gearth/services/unity_tools/GUnityFileServer.java b/G-Earth/src/main/java/gearth/services/unity_tools/GUnityFileServer.java index 860545e..4a00d9a 100644 --- a/G-Earth/src/main/java/gearth/services/unity_tools/GUnityFileServer.java +++ b/G-Earth/src/main/java/gearth/services/unity_tools/GUnityFileServer.java @@ -1,6 +1,6 @@ package gearth.services.unity_tools; -import gearth.Main; +import gearth.GEarth; import gearth.misc.Cacher; import javax.servlet.ServletOutputStream; @@ -15,6 +15,7 @@ public class GUnityFileServer extends HttpServlet { public final static int FILESERVER_PORT = 9089; + private final static UnityWebModifyer modifyer = new UnityWebModifyer(); @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException @@ -38,11 +39,10 @@ public class GUnityFileServer extends HttpServlet String revision = url.split("/")[4]; - if (path.equals("/prod")) getProd(revision, response); - else if (path.equals("/data")) getData(revision, response); - else if (path.equals("/wasm/code")) getWasmCode(revision, response); - else if (path.equals("/wasm/framework")) getWasmFramework(revision, response); - else if (path.equals("/unityloader")) getUnityLoader(revision, response); + if (path.equals("/data")) getData(revision, response); + else if (path.equals("/wasm")) getWasmCode(revision, response); + else if (path.equals("/framework")) getWasmFramework(revision, response); + else if (path.equals("/loader")) getLoader(revision, response); else if (path.equals("/version")) getVersion(revision, response, url); else if (path.equals("/logo")) getLogo(response); else { @@ -76,10 +76,16 @@ public class GUnityFileServer extends HttpServlet } - private void fileResponse(String file, HttpServletResponse response, String contentType) throws IOException { + private void fileResponse(String file, HttpServletResponse response, String contentType, boolean gzip) throws IOException { ServletOutputStream out = response.getOutputStream(); InputStream in = new FileInputStream(file); -// response.setContentType(contentType); + if (contentType != null) { + response.setContentType(contentType); + } + + if (gzip) { + response.setHeader("Content-Encoding", "gzip"); + } byte[] bytes = new byte[4096]; int bytesRead; @@ -93,31 +99,28 @@ public class GUnityFileServer extends HttpServlet } - private void getProd(String revision, HttpServletResponse response) throws IOException { - UnityWebModifyer unitywebModifyer = new UnityWebModifyer(revision, getDir(revision)); - unitywebModifyer.modifyAllFiles(); - - fileResponse(getDir(revision) + UnityWebModifyer.UNITY_PROD, response, "application/json"); - } - private void getData(String revision, HttpServletResponse response) throws IOException { - // application/vnd.unity - fileResponse(getDir(revision) + UnityWebModifyer.UNITY_DATA, response, "application/vnd.unity"); + modifyer.modifyAllFiles(revision, getDir(revision)); + + fileResponse(getDir(revision) + UnityWebModifyer.UNITY_DATA, response, null, true); } private void getWasmCode(String revision, HttpServletResponse response) throws IOException { - fileResponse(getDir(revision) + UnityWebModifyer.UNITY_CODE, response, "application/vnd.unity"); + modifyer.modifyAllFiles(revision, getDir(revision)); + + fileResponse(getDir(revision) + UnityWebModifyer.UNITY_CODE, response, "application/wasm", true); } private void getWasmFramework(String revision, HttpServletResponse response) throws IOException { - fileResponse(getDir(revision) + UnityWebModifyer.UNITY_FRAMEWORK, response, "application/vnd.unity"); + modifyer.modifyAllFiles(revision, getDir(revision)); + + fileResponse(getDir(revision) + UnityWebModifyer.UNITY_FRAMEWORK, response, "text/javascript", true); } - private void getUnityLoader(String revision, HttpServletResponse response) throws IOException { - UnityWebModifyer unitywebModifyer = new UnityWebModifyer(revision, getDir(revision)); - unitywebModifyer.modifyAllFiles(); + private void getLoader(String revision, HttpServletResponse response) throws IOException { + modifyer.modifyAllFiles(revision, getDir(revision)); - fileResponse(getDir(revision) + UnityWebModifyer.UNITY_LOADER, response, "text/javascript"); + fileResponse(getDir(revision) + UnityWebModifyer.UNITY_LOADER, response, "text/javascript", false); } private void getVersion(String revision, HttpServletResponse response, String url) throws IOException { @@ -132,7 +135,7 @@ public class GUnityFileServer extends HttpServlet private void getLogo(HttpServletResponse response) throws IOException { OutputStream out = response.getOutputStream(); - InputStream in = Main.class.getResourceAsStream(String.format("/gearth/themes/%s/logo.png", Main.theme)); + InputStream in = GEarth.class.getResourceAsStream(String.format("/gearth/themes/%s/logo.png", GEarth.theme)); byte[] bytes = new byte[4096]; int bytesRead; diff --git a/G-Earth/src/main/java/gearth/services/unity_tools/UnityWebModifyer.java b/G-Earth/src/main/java/gearth/services/unity_tools/UnityWebModifyer.java index b1d407f..e0cc5fb 100644 --- a/G-Earth/src/main/java/gearth/services/unity_tools/UnityWebModifyer.java +++ b/G-Earth/src/main/java/gearth/services/unity_tools/UnityWebModifyer.java @@ -1,5 +1,6 @@ package gearth.services.unity_tools; +import org.apache.commons.io.IOUtils; import org.codehaus.plexus.util.FileUtils; import wasm.disassembly.InvalidOpCodeException; @@ -10,36 +11,34 @@ import java.net.URLConnection; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Paths; +import java.util.zip.GZIPInputStream; +import java.util.zip.GZIPOutputStream; public class UnityWebModifyer { - public final static String UNITY_PROD = "habbo2020-global-prod.json"; - public final static String UNITY_DATA = "habbo2020-global-prod.data.unityweb"; - public final static String UNITY_CODE = "habbo2020-global-prod.wasm.code.unityweb"; - public final static String UNITY_FRAMEWORK = "habbo2020-global-prod.wasm.framework.unityweb"; - public final static String UNITY_LOADER = "UnityLoader.js"; + public final static String UNITY_DATA = "habbo2020-global-prod.data.gz"; + public final static String UNITY_CODE = "habbo2020-global-prod.wasm.gz"; + public final static String UNITY_FRAMEWORK = "habbo2020-global-prod.framework.js.gz"; + public final static String UNITY_LOADER = "habbo2020-global-prod.loader.js"; private final static String UNITYFILES_URL = "https://images.habbo.com/habbo-webgl-clients/{revision}/WebGL/habbo2020-global-prod/Build/"; - private final String revision; - private final File saveFolder; - private final String currentUrl; + private String revision; + private File saveFolder; + private String currentUrl; - public UnityWebModifyer(String revision, String saveFolder) { + public synchronized boolean modifyAllFiles(String revision, String saveFolderName) { this.revision = revision; - this.currentUrl = UNITYFILES_URL.replace("{revision}", revision); - this.saveFolder = new File(saveFolder); - } + currentUrl = UNITYFILES_URL.replace("{revision}", revision); + saveFolder = new File(saveFolderName); - public boolean modifyAllFiles() { if (saveFolder.exists()) { return true; } saveFolder.mkdirs(); try { - modifyProdFile(); modifyDataFile(); modifyCodeFile(); modifyFrameworkFile(); @@ -57,27 +56,6 @@ public class UnityWebModifyer { return true; } - // return urls for: data, code & framework file - private void modifyProdFile() throws IOException { - String prodUrl = currentUrl + UNITY_PROD; - - URLConnection connection = new URL(prodUrl).openConnection(); - InputStream is = connection.getInputStream(); - BufferedReader in = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8)); - - FileWriter fileWriter = new FileWriter(new File(saveFolder, UNITY_PROD)); - BufferedWriter bufferedWriter = new BufferedWriter(fileWriter); - - String line; - while ((line = in.readLine()) != null) { - bufferedWriter.write(line); - bufferedWriter.newLine(); - } - - bufferedWriter.close(); - in.close(); - } - private void downloadToFile(URL url, File file) throws IOException { BufferedInputStream in = new BufferedInputStream(url.openStream()); FileOutputStream fileOutputStream = new FileOutputStream(file); @@ -89,7 +67,7 @@ public class UnityWebModifyer { fileOutputStream.close(); in.close(); } - + // private void modifyDataFile() throws IOException { File dataFile = new File(saveFolder, UNITY_DATA); URL dataUrl = new URL(currentUrl + UNITY_DATA); @@ -131,7 +109,7 @@ public class UnityWebModifyer { downloadToFile(frameworkUrl, frameworkFile); - byte[] encoded = Files.readAllBytes(Paths.get(frameworkFile.getAbsolutePath())); + byte[] encoded = IOUtils.toByteArray(new GZIPInputStream(new FileInputStream(frameworkFile))); String contents = new String(encoded, StandardCharsets.UTF_8); contents = insertFrameworkCode(contents, 0, "js_code/unity_code.js"); @@ -147,9 +125,10 @@ public class UnityWebModifyer { contents = contents .replace("var _free", "_free") .replace("var _malloc", "_malloc") + .replace("var Module=typeof Module!==\"undefined\"?Module:{};", "var Module=typeof Module!==\"undefined\"?Module:{}; _module = Module") .replace("{{RevisionName}}", revision); - BufferedWriter writer = new BufferedWriter(new FileWriter(frameworkFile)); + BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new GZIPOutputStream(new FileOutputStream(frameworkFile)))); writer.write(contents); writer.close(); } @@ -162,14 +141,14 @@ public class UnityWebModifyer { byte[] encoded = Files.readAllBytes(Paths.get(loaderFile.getAbsolutePath())); String contents = new String(encoded, StandardCharsets.UTF_8); - contents = contents.replace("o.result.responseHeaders[e]==a.getResponseHeader(e)", "false"); - contents = contents.replace("i.responseHeaders[e]=o.getResponseHeader(e)", + contents = contents.replace("o.result.responseHeaders[e]==s.getResponseHeader(e)", "false"); + contents = contents.replace("a.responseHeaders[e]=o.getResponseHeader(e)", "const genRanHex = size => [...Array(size)].map(() => Math.floor(Math.random() * 16).toString(16)).join('');\n" + " if (e === \"ETag\") {\n" + - " i.responseHeaders[e] = \"W/\\\"\" + genRanHex(6) + \"-\" + genRanHex(13) + \"\\\"\"\n" + + " a.responseHeaders[e] = \"W/\\\"\" + genRanHex(6) + \"-\" + genRanHex(13) + \"\\\"\"\n" + " }\n" + " else {\n" + - " i.responseHeaders[e] = o.getResponseHeader(e)\n" + + " a.responseHeaders[e] = o.getResponseHeader(e)\n" + " }"); BufferedWriter writer = new BufferedWriter(new FileWriter(loaderFile)); diff --git a/G-Earth/src/main/java/gearth/services/unity_tools/WasmCodePatcher.java b/G-Earth/src/main/java/gearth/services/unity_tools/WasmCodePatcher.java index ba2831b..95c87f7 100644 --- a/G-Earth/src/main/java/gearth/services/unity_tools/WasmCodePatcher.java +++ b/G-Earth/src/main/java/gearth/services/unity_tools/WasmCodePatcher.java @@ -19,12 +19,12 @@ public class WasmCodePatcher { } public void patch() throws IOException, InvalidOpCodeException { - Module module = new Module(file, Arrays.asList( + Module module = new Module(file, true, Arrays.asList( new SetKeyPatcher(), new ReturnBytePatcher(), new OutgoingPacketPatcher(), new IncomingPacketPatcher() )); - module.assembleToFile(file); + module.assembleToFile(file, true); } } diff --git a/G-Earth/src/main/java/gearth/services/unity_tools/WasmCodePatcherOld.java b/G-Earth/src/main/java/gearth/services/unity_tools/WasmCodePatcherOld.java deleted file mode 100644 index aaef51b..0000000 --- a/G-Earth/src/main/java/gearth/services/unity_tools/WasmCodePatcherOld.java +++ /dev/null @@ -1,225 +0,0 @@ -//package gearth.services.unity_tools; -// -//import wasm.disassembly.InvalidOpCodeException; -//import wasm.disassembly.instructions.Expression; -//import wasm.disassembly.instructions.Instr; -//import wasm.disassembly.instructions.InstrType; -//import wasm.disassembly.instructions.control.CallInstr; -//import wasm.disassembly.instructions.variable.LocalVariableInstr; -//import wasm.disassembly.modules.Module; -//import wasm.disassembly.modules.indices.FuncIdx; -//import wasm.disassembly.modules.indices.LocalIdx; -//import wasm.disassembly.modules.indices.TypeIdx; -//import wasm.disassembly.modules.sections.code.Func; -//import wasm.disassembly.modules.sections.export.Export; -//import wasm.disassembly.modules.sections.export.ExportDesc; -//import wasm.disassembly.modules.sections.imprt.Import; -//import wasm.disassembly.modules.sections.imprt.ImportDesc; -//import wasm.disassembly.types.FuncType; -//import wasm.disassembly.types.ResultType; -//import wasm.disassembly.types.ValType; -//import wasm.misc.Function; -// -//import java.io.*; -//import java.util.*; -// -//public class WasmCodePatcherOld { -// -// private String file; -// -// public WasmCodePatcherOld(String file) { -// this.file = file; -// } -// -// public void patch() throws IOException, InvalidOpCodeException { -// Module module = new Module(file); -// -// FuncIdx returnByteId = findReturnByteFunc(module); -// FuncIdx setkey = findSetKeyFunc(module); -// FuncIdx outgoingIdx = findOutFunc(module); -// FuncIdx incomingIdx = findInFunc(module); -// -// hook(module, setkey, "g_chacha_setkey"); -// copyEmptyHook(module, returnByteId, "_gearth_returnbyte_copy", "g_chacha_returnbyte"); -// copyEmptyHook(module, outgoingIdx, "_gearth_outgoing_copy", "g_outgoing_packet"); -// copyEmptyHook(module, incomingIdx, "_gearth_incoming_copy", "g_incoming_packet"); -// -// module.assembleToFile(file); -// } -// -// -// private FuncIdx findOutFunc(Module module) { -// TypeIdx expectedTypeIdx = module.getTypeSection().getTypeIdxForFuncType(new FuncType( -// new ResultType(Arrays.asList(ValType.I32, ValType.I32, ValType.I32)), -// new ResultType(Collections.emptyList()) -// )); -// -// outerloop: -// for (int i = 0; i < module.getCodeSection().getCodesEntries().size(); i++) { -// FuncIdx currentIdx = new FuncIdx(i + module.getImportSection().getTotalFuncImports(), module); -// -// Func func = module.getCodeSection().getByIdx(currentIdx); -// if (func.getLocalss().size() != 0) continue; -// if (!module.getFunctionSection().getByIdx(currentIdx).equals(expectedTypeIdx)) continue; -// -// List expression = func.getExpression().getInstructions(); -// -// if (expression.size() != 6) continue; -// -// if (expression.get(0).getInstrType() != InstrType.LOCAL_GET) continue; -// if (expression.get(1).getInstrType() != InstrType.LOCAL_GET) continue; -// if (expression.get(2).getInstrType() != InstrType.LOCAL_GET) continue; -// if (expression.get(3).getInstrType() != InstrType.I32_LOAD) continue; -// if (expression.get(4).getInstrType() != InstrType.I32_CONST) continue; -// if (expression.get(5).getInstrType() != InstrType.CALL) continue; -// -// return currentIdx; -// } -// -// return null; -// } -// private FuncIdx findSetKeyFunc(Module module) { -// FuncType expectedType = new FuncType( -// new ResultType(Arrays.asList(ValType.I32, ValType.I32, ValType.I32, ValType.I32)), -// new ResultType(Collections.emptyList()) -// ); -// -// List expectedExpr = Arrays.asList(InstrType.I32_CONST, InstrType.I32_LOAD8_S, -// InstrType.I32_EQZ, InstrType.IF, InstrType.BLOCK, InstrType.LOCAL_GET, InstrType.I32_CONST, -// InstrType.LOCAL_GET, InstrType.I32_LOAD, InstrType.I32_CONST, InstrType.I32_CONST, InstrType.I32_CONST, -// InstrType.CALL); -// -// outerloop: -// for (int i = 0; i < module.getCodeSection().getCodesEntries().size(); i++) { -// FuncIdx funcIdx = new FuncIdx(i + module.getImportSection().getTotalFuncImports(), module); -// -// Function function = new Function(module, funcIdx); -// if (!function.getFuncType().equals(expectedType)) continue; -// if (!(function.getLocalsFloored().size() == 1 && function.getLocalsFloored().get(0) == ValType.I32)) continue; -// if (function.getCode().getInstructions().size() != expectedExpr.size()) continue; -// -// for (int j = 0; j < function.getCode().getInstructions().size(); j++) { -// Instr instr = function.getCode().getInstructions().get(j); -// if (instr.getInstrType() != expectedExpr.get(j)) continue outerloop; -// } -// -// return funcIdx; -// } -// -// return null; -// } -// private FuncIdx findReturnByteFunc(Module module) { -// FuncType expectedType = new FuncType( -// new ResultType(Arrays.asList(ValType.I32, ValType.I32, ValType.I32)), -// new ResultType(Collections.singletonList(ValType.I32)) -// ); -// -// outerloop: -// for (int i = 0; i < module.getCodeSection().getCodesEntries().size(); i++) { -// FuncIdx funcIdx = new FuncIdx(i + module.getImportSection().getTotalFuncImports(), module); -// -// Function function = new Function(module, funcIdx); -// if (!function.getFuncType().equals(expectedType)) continue; -// if (function.getLocalsFloored().size() != 0) continue; -// if (function.getCode().getInstructions().size() != 30) continue; -// -// List expr = function.getCode().getInstructions(); -// if (expr.get(expr.size() - 1).getInstrType() != InstrType.I32_XOR) continue; -// -// return funcIdx; -// } -// -// return null; -// } -// private FuncIdx findInFunc(Module module) { -// FuncType expectedType = new FuncType( -// new ResultType(Arrays.asList(ValType.I32, ValType.I32, ValType.I32, ValType.I32, ValType.I32)), -// new ResultType(Collections.emptyList()) -// ); -// -// List expectedExpr = Arrays.asList(InstrType.I32_CONST, InstrType.I32_LOAD8_S, -// InstrType.I32_EQZ, InstrType.IF, InstrType.LOCAL_GET, InstrType.I32_LOAD, InstrType.LOCAL_TEE, -// InstrType.IF); -// -// outerloop: -// for (int i = 0; i < module.getCodeSection().getCodesEntries().size(); i++) { -// FuncIdx funcIdx = new FuncIdx(i + module.getImportSection().getTotalFuncImports(), module); -// -// Function function = new Function(module, funcIdx); -// if (!function.getFuncType().equals(expectedType)) continue; -// if (!(function.getLocalsFloored().size() == 1 && function.getLocalsFloored().get(0) == ValType.I32)) continue; -// if (function.getCode().getInstructions().size() != expectedExpr.size()) continue; -// -// for (int j = 0; j < function.getCode().getInstructions().size(); j++) { -// Instr instr = function.getCode().getInstructions().get(j); -// if (instr.getInstrType() != expectedExpr.get(j)) continue outerloop; -// } -// -// return funcIdx; -// } -// -// return null; -// } -// -// private void copyEmptyHook(Module module, FuncIdx orgFuncIdx, String exportName, String hookname) throws InvalidOpCodeException, IOException { -// // copies the method, empties the first one -// // export the copy -// // hooks to the emptied one -// -// Func func = module.getCodeSection().getByIdx(orgFuncIdx); -// FuncType funcType = module.getTypeSection().getByFuncIdx(orgFuncIdx); -// -// // copy the function -// Function copy = new Function(funcType, func.getLocalss(), func.getExpression()); -// FuncIdx copyIdx = copy.addToModule(module); -// -// module.getExportSection().getExports().add(new Export(exportName, new ExportDesc(copyIdx))); -// -// -// // clear & hook original function, let it return whatever JS returns -// Import imp = new Import( -// "env", -// hookname, -// new ImportDesc(module.getTypeSection().getTypeIdxForFuncType(new FuncType( -// funcType.getParameterType(), -// funcType.getResultType() -// ))) -// ); -// FuncIdx hookIdx = module.getImportSection().importFunction(imp); -// -// CallInstr call = new CallInstr(hookIdx); -// List newInstrs = new ArrayList<>(); -// for (int i = 0; i < funcType.getParameterType().typeList().size(); i++) { -// newInstrs.add(new LocalVariableInstr(InstrType.LOCAL_GET, new LocalIdx(i))); -// } -// newInstrs.add(call); -// func.setExpression(new Expression(newInstrs)); -// -// } -// -// private void hook(Module module, FuncIdx funcIdx, String jsFunctionName) throws InvalidOpCodeException, IOException { -// FuncType funcType = module.getTypeSection().getByFuncIdx(funcIdx); -// -// Import imp = new Import( -// "env", -// jsFunctionName, -// new ImportDesc(module.getTypeSection().getTypeIdxForFuncType(new FuncType( -// funcType.getParameterType(), -// new ResultType(Collections.emptyList()) -// ))) -// ); -// FuncIdx hookIdx = module.getImportSection().importFunction(imp); -// -// CallInstr call = new CallInstr(hookIdx); -// -// Func root = module.getCodeSection().getByIdx(funcIdx); -// List newInstrs = new ArrayList<>(); -// for (int i = 0; i < funcType.getParameterType().typeList().size(); i++) { -// newInstrs.add(new LocalVariableInstr(InstrType.LOCAL_GET, new LocalIdx(i))); -// } -// newInstrs.add(call); -// newInstrs.addAll(root.getExpression().getInstructions()); -// root.getExpression().setInstructions(newInstrs); -// } -// -//} diff --git a/G-Earth/src/main/java/gearth/services/unity_tools/codepatcher/IncomingPacketPatcher.java b/G-Earth/src/main/java/gearth/services/unity_tools/codepatcher/IncomingPacketPatcher.java index b3482cd..227fc8a 100644 --- a/G-Earth/src/main/java/gearth/services/unity_tools/codepatcher/IncomingPacketPatcher.java +++ b/G-Earth/src/main/java/gearth/services/unity_tools/codepatcher/IncomingPacketPatcher.java @@ -2,6 +2,10 @@ package gearth.services.unity_tools.codepatcher; import wasm.disassembly.instructions.Instr; import wasm.disassembly.instructions.InstrType; +import wasm.disassembly.instructions.control.IfElseInstr; +import wasm.disassembly.instructions.memory.MemArg; +import wasm.disassembly.instructions.memory.MemInstr; +import wasm.disassembly.instructions.variable.LocalVariableInstr; import wasm.disassembly.modules.sections.code.Func; import wasm.disassembly.modules.sections.code.Locals; import wasm.disassembly.types.FuncType; @@ -52,6 +56,9 @@ public class IncomingPacketPatcher implements StreamReplacement { if (instr.getInstrType() != expectedExpr.get(j)) return false; } + if (((MemInstr)(code.getExpression().getInstructions().get(5))).getMemArg().getAlign() != 2 || + ((MemInstr)(code.getExpression().getInstructions().get(5))).getMemArg().getOffset() != 32) return false; + return true; } diff --git a/G-Earth/src/main/java/gearth/services/unity_tools/codepatcher/OutgoingPacketPatcher.java b/G-Earth/src/main/java/gearth/services/unity_tools/codepatcher/OutgoingPacketPatcher.java index 026fee3..2410f56 100644 --- a/G-Earth/src/main/java/gearth/services/unity_tools/codepatcher/OutgoingPacketPatcher.java +++ b/G-Earth/src/main/java/gearth/services/unity_tools/codepatcher/OutgoingPacketPatcher.java @@ -2,6 +2,7 @@ package gearth.services.unity_tools.codepatcher; import wasm.disassembly.instructions.Instr; import wasm.disassembly.instructions.InstrType; +import wasm.disassembly.instructions.variable.LocalVariableInstr; import wasm.disassembly.modules.sections.code.Func; import wasm.disassembly.types.FuncType; import wasm.disassembly.types.ResultType; @@ -45,6 +46,8 @@ public class OutgoingPacketPatcher implements StreamReplacement { if (expression.get(4).getInstrType() != InstrType.I32_CONST) return false; if (expression.get(5).getInstrType() != InstrType.CALL) return false; + if (((LocalVariableInstr)(expression.get(2))).getLocalIdx().getX() != 1) return false; + return true; } } diff --git a/G-Earth/src/main/java/gearth/services/unity_tools/codepatcher/ReturnBytePatcher.java b/G-Earth/src/main/java/gearth/services/unity_tools/codepatcher/ReturnBytePatcher.java index 6f8040c..c2ac300 100644 --- a/G-Earth/src/main/java/gearth/services/unity_tools/codepatcher/ReturnBytePatcher.java +++ b/G-Earth/src/main/java/gearth/services/unity_tools/codepatcher/ReturnBytePatcher.java @@ -37,7 +37,7 @@ public class ReturnBytePatcher implements StreamReplacement { @Override public boolean codeMatches(Func code) { if (code.getLocalss().size() != 0) return false; - if (code.getExpression().getInstructions().size() != 30) return false; + if (code.getExpression().getInstructions().size() != 26) return false; List expr = code.getExpression().getInstructions(); if (expr.get(expr.size() - 1).getInstrType() != InstrType.I32_XOR) return false; return true; diff --git a/G-Earth/src/main/java/gearth/services/unity_tools/codepatcher/SetKeyPatcher.java b/G-Earth/src/main/java/gearth/services/unity_tools/codepatcher/SetKeyPatcher.java index 41fab8a..e012d15 100644 --- a/G-Earth/src/main/java/gearth/services/unity_tools/codepatcher/SetKeyPatcher.java +++ b/G-Earth/src/main/java/gearth/services/unity_tools/codepatcher/SetKeyPatcher.java @@ -2,6 +2,8 @@ package gearth.services.unity_tools.codepatcher; import wasm.disassembly.instructions.Instr; import wasm.disassembly.instructions.InstrType; +import wasm.disassembly.instructions.numeric.NumericI32ConstInstr; +import wasm.disassembly.instructions.variable.LocalVariableInstr; import wasm.disassembly.modules.sections.code.Func; import wasm.disassembly.modules.sections.code.Locals; import wasm.disassembly.types.FuncType; @@ -40,18 +42,20 @@ public class SetKeyPatcher implements StreamReplacement { public boolean codeMatches(Func code) { if (!(code.getLocalss().equals(Collections.singletonList(new Locals(1, ValType.I32))))) return false; - List expectedExpr = Arrays.asList(InstrType.I32_CONST, InstrType.I32_LOAD8_S, - InstrType.I32_EQZ, InstrType.IF, InstrType.BLOCK, InstrType.LOCAL_GET, InstrType.I32_CONST, - InstrType.LOCAL_GET, InstrType.I32_LOAD, InstrType.I32_CONST, InstrType.I32_CONST, InstrType.I32_CONST, - InstrType.CALL); + List expression = code.getExpression().getInstructions(); + List expectedExpr = Arrays.asList(InstrType.BLOCK, InstrType.LOCAL_GET, + InstrType.I32_CONST, InstrType.LOCAL_GET, InstrType.I32_LOAD, InstrType.I32_CONST, InstrType.I32_CONST, + InstrType.I32_CONST, InstrType.CALL ); - if (code.getExpression().getInstructions().size() != expectedExpr.size()) return false; + if (expression.size() != expectedExpr.size()) return false; - for (int j = 0; j < code.getExpression().getInstructions().size(); j++) { - Instr instr = code.getExpression().getInstructions().get(j); + for (int j = 0; j < expression.size(); j++) { + Instr instr = expression.get(j); if (instr.getInstrType() != expectedExpr.get(j)) return false; } +// if (((NumericI32ConstInstr)(expression.get(5))).getConstValue() != 14) return false; + return true; } } diff --git a/G-Earth/src/main/java/gearth/ui/GEarthController.java b/G-Earth/src/main/java/gearth/ui/GEarthController.java index 4c550c3..4627294 100644 --- a/G-Earth/src/main/java/gearth/ui/GEarthController.java +++ b/G-Earth/src/main/java/gearth/ui/GEarthController.java @@ -1,6 +1,6 @@ package gearth.ui; -import gearth.Main; +import gearth.GEarth; import gearth.protocol.connection.proxy.ProxyProviderFactory; import gearth.protocol.connection.proxy.SocksConfiguration; import gearth.ui.logger.loggerdisplays.PacketLoggerFactory; @@ -8,10 +8,7 @@ import javafx.application.Platform; import javafx.scene.control.*; import javafx.scene.image.Image; import javafx.scene.input.MouseEvent; -import javafx.scene.layout.FlowPane; import javafx.scene.layout.Pane; -import javafx.scene.layout.Region; -import javafx.scene.web.WebView; import javafx.stage.Stage; import gearth.protocol.HConnection; import gearth.ui.connection.ConnectionController; @@ -127,18 +124,18 @@ public class GEarthController { } public void setTheme(String theme) { - Main.theme = theme; + GEarth.theme = theme; getStage().getScene().getStylesheets().clear(); - getStage().getScene().getStylesheets().add(Main.class.getResource(String.format("/gearth/themes/%s/styling.css", theme)).toExternalForm()); + getStage().getScene().getStylesheets().add(GEarth.class.getResource(String.format("/gearth/themes/%s/styling.css", theme)).toExternalForm()); getStage().getIcons().clear(); - getStage().getIcons().add(new Image(Main.class.getResourceAsStream(String.format("/gearth/themes/%s/logoSmall.png", theme)))); + getStage().getIcons().add(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/themes/%s/logoSmall.png", theme)))); - getStage().setTitle(theme.split("_")[0] + " " + Main.version); + getStage().setTitle(theme.split("_")[0] + " " + GEarth.version); titleLabel.setText(getStage().getTitle()); - infoController.img_logo.setImage(new Image(Main.class.getResourceAsStream(String.format("/gearth/themes/%s/logo.png", theme)))); + infoController.img_logo.setImage(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/themes/%s/logo.png", theme)))); infoController.version.setText(getStage().getTitle()); } @@ -173,7 +170,7 @@ public class GEarthController { } public void toggleTheme(MouseEvent event) { - int themeIndex = Arrays.asList(Main.themes).indexOf(Main.theme); - setTheme(Main.themes[(themeIndex + 1) % Main.themes.length]); + int themeIndex = Arrays.asList(GEarth.themes).indexOf(GEarth.theme); + setTheme(GEarth.themes[(themeIndex + 1) % GEarth.themes.length]); } } diff --git a/G-Earth/src/main/java/gearth/ui/connection/ConnectionController.java b/G-Earth/src/main/java/gearth/ui/connection/ConnectionController.java index b908666..4afa7c1 100644 --- a/G-Earth/src/main/java/gearth/ui/connection/ConnectionController.java +++ b/G-Earth/src/main/java/gearth/ui/connection/ConnectionController.java @@ -1,6 +1,6 @@ package gearth.ui.connection; -import gearth.Main; +import gearth.GEarth; import gearth.misc.Cacher; import gearth.protocol.connection.HClient; import gearth.protocol.connection.HState; @@ -221,12 +221,12 @@ public class ConnectionController extends SubForm { } private void maybeConnectOnInit() { - String connectMode = Main.getArgument("--connect", "-c"); + String connectMode = GEarth.getArgument("--connect", "-c"); if (connectMode != null) { if (connectMode.equals("flash")) { Platform.runLater(() -> rd_flash.setSelected(true)); - String host = Main.getArgument("--host"); - String port = Main.getArgument("--port"); + String host = GEarth.getArgument("--host"); + String port = GEarth.getArgument("--port"); if (host != null && port != null) { Platform.runLater(() -> { if (!inpHost.getItems().contains(host)) inpHost.getItems().add(host); diff --git a/G-Earth/src/main/java/gearth/ui/extensions/logger/ExtensionLogger.java b/G-Earth/src/main/java/gearth/ui/extensions/logger/ExtensionLogger.java index b7ad0b0..bd435b2 100644 --- a/G-Earth/src/main/java/gearth/ui/extensions/logger/ExtensionLogger.java +++ b/G-Earth/src/main/java/gearth/ui/extensions/logger/ExtensionLogger.java @@ -1,6 +1,6 @@ package gearth.ui.extensions.logger; -import gearth.Main; +import gearth.GEarth; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.scene.Scene; @@ -35,15 +35,15 @@ public class ExtensionLogger { stage = new Stage(); - stage.setTitle(String.format("%s | Extension Console", Main.theme)); + stage.setTitle(String.format("%s | Extension Console", GEarth.theme)); stage.initModality(Modality.NONE); - stage.getIcons().add(new Image(getClass().getResourceAsStream(String.format("/gearth/themes/%s/logoSmall.png", Main.theme)))); + stage.getIcons().add(new Image(getClass().getResourceAsStream(String.format("/gearth/themes/%s/logoSmall.png", GEarth.theme)))); stage.setAlwaysOnTop(true); stage.setMinHeight(235); stage.setMinWidth(370); Scene scene = new Scene(root); - scene.getStylesheets().add(String.format("/gearth/themes/%s/styling.css", Main.theme)); + scene.getStylesheets().add(String.format("/gearth/themes/%s/styling.css", GEarth.theme)); scene.getStylesheets().add("/gearth/ui/extensions/logger/logger.css"); ExtensionLoggerController controller = loader.getController(); controller.setStage(stage); diff --git a/G-Earth/src/main/java/gearth/ui/extra/ExtraController.java b/G-Earth/src/main/java/gearth/ui/extra/ExtraController.java index 359c61f..0705892 100644 --- a/G-Earth/src/main/java/gearth/ui/extra/ExtraController.java +++ b/G-Earth/src/main/java/gearth/ui/extra/ExtraController.java @@ -1,10 +1,8 @@ package gearth.ui.extra; -import gearth.Main; +import gearth.GEarth; import gearth.misc.Cacher; import gearth.protocol.HConnection; -import gearth.protocol.HMessage; -import gearth.protocol.TrafficListener; import gearth.protocol.connection.HState; import gearth.protocol.connection.proxy.ProxyProviderFactory; import gearth.protocol.connection.proxy.SocksConfiguration; @@ -178,8 +176,8 @@ public class ExtraController extends SubForm implements SocksConfiguration { Platform.runLater(() -> { Alert alert = new Alert(Alert.AlertType.ERROR, "G-Python installation", ButtonType.OK); Stage stage = (Stage) alert.getDialogPane().getScene().getWindow(); - stage.getIcons().add(new Image(Main.class.getResourceAsStream(String.format("/gearth/themes/%s/logoSmall.png", Main.theme)))); - stage.getScene().getStylesheets().add(Main.class.getResource(String.format("/gearth/themes/%s/styling.css", Main.theme)).toExternalForm()); + stage.getIcons().add(new Image(GEarth.class.getResourceAsStream(String.format("/gearth/themes/%s/logoSmall.png", GEarth.theme)))); + stage.getScene().getStylesheets().add(GEarth.class.getResource(String.format("/gearth/themes/%s/styling.css", GEarth.theme)).toExternalForm()); alert.setTitle("G-Python installation"); FlowPane fp = new FlowPane(); @@ -188,7 +186,7 @@ public class ExtraController extends SubForm implements SocksConfiguration { Hyperlink link = new Hyperlink(INFO_URL_GPYTHON); fp.getChildren().addAll( lbl, link); link.setOnAction(event -> { - Main.main.getHostServices().showDocument(link.getText()); + GEarth.main.getHostServices().showDocument(link.getText()); event.consume(); }); diff --git a/G-Earth/src/main/java/gearth/ui/info/InfoController.java b/G-Earth/src/main/java/gearth/ui/info/InfoController.java index cccd7a3..38965c8 100644 --- a/G-Earth/src/main/java/gearth/ui/info/InfoController.java +++ b/G-Earth/src/main/java/gearth/ui/info/InfoController.java @@ -1,6 +1,6 @@ package gearth.ui.info; -import gearth.Main; +import gearth.GEarth; import javafx.event.ActionEvent; import javafx.scene.control.*; import gearth.ui.SubForm; @@ -15,12 +15,12 @@ import javafx.stage.Stage; */ public class InfoController extends SubForm { public ImageView img_logo; - public Hyperlink link_ase; public Hyperlink link_darkbox; - public Hyperlink link_d_harble; public Hyperlink link_g_gearth; public Hyperlink link_g_tanji; public Hyperlink link_d_gearth; + public Hyperlink link_g_store; + public Hyperlink link_t_gearth; public Label version; @@ -28,25 +28,25 @@ public class InfoController extends SubForm { link.setOnAction((ActionEvent event) -> { Hyperlink h = (Hyperlink) event.getTarget(); String s = h.getTooltip().getText(); - Main.main.getHostServices().showDocument(s); + GEarth.main.getHostServices().showDocument(s); event.consume(); }); } public void initialize() { - link_ase.setTooltip(new Tooltip("https://allseeingeye.to")); link_darkbox.setTooltip(new Tooltip("https://darkbox.nl")); - link_d_harble.setTooltip(new Tooltip("https://discord.gg/CzRuHvW")); link_d_gearth.setTooltip(new Tooltip("https://discord.gg/AVkcF8y")); link_g_gearth.setTooltip(new Tooltip("https://github.com/sirjonasxx/G-Earth")); link_g_tanji.setTooltip(new Tooltip("https://github.com/ArachisH/Tanji")); + link_g_store.setTooltip(new Tooltip("https://github.com/sirjonasxx/G-ExtensionStore")); + link_t_gearth.setTooltip(new Tooltip("https://twitter.com/Scripting_Habbo")); - activateHyperlink(link_ase); activateHyperlink(link_darkbox); - activateHyperlink(link_d_harble); activateHyperlink(link_d_gearth); activateHyperlink(link_g_gearth); activateHyperlink(link_g_tanji); + activateHyperlink(link_g_store); + activateHyperlink(link_t_gearth); } public void donate(ActionEvent actionEvent) { diff --git a/G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/PacketLoggerFactory.java b/G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/PacketLoggerFactory.java index 1f12f88..82c8281 100644 --- a/G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/PacketLoggerFactory.java +++ b/G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/PacketLoggerFactory.java @@ -1,6 +1,6 @@ package gearth.ui.logger.loggerdisplays; -import gearth.Main; +import gearth.GEarth; import gearth.extensions.InternalExtensionFormBuilder; import gearth.misc.OSValidator; import gearth.services.extension_handler.ExtensionHandler; @@ -17,7 +17,7 @@ public class PacketLoggerFactory implements ExtensionProducer { private UiLogger uiLogger; public static boolean usesUIlogger() { - return (!Main.hasFlag("-t")); + return (!GEarth.hasFlag("-t")); } public PacketLoggerFactory(ExtensionHandler handler) { diff --git a/G-Earth/src/main/resources/build/cache/cache.json b/G-Earth/src/main/resources/build/cache/cache.json deleted file mode 100644 index 6bb9e30..0000000 --- a/G-Earth/src/main/resources/build/cache/cache.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "theme": "Tanji" -} \ No newline at end of file diff --git a/G-Earth/src/main/resources/build/common/Cache/cache.json b/G-Earth/src/main/resources/build/common/Cache/cache.json new file mode 100644 index 0000000..a62339b --- /dev/null +++ b/G-Earth/src/main/resources/build/common/Cache/cache.json @@ -0,0 +1,3 @@ +{ + "theme": "G-Earth" +} \ No newline at end of file diff --git a/G-Earth/src/main/resources/build/messages.json b/G-Earth/src/main/resources/build/common/messages.json similarity index 100% rename from G-Earth/src/main/resources/build/messages.json rename to G-Earth/src/main/resources/build/common/messages.json diff --git a/G-Earth/src/main/resources/build/windows/32bit/G-Earth.exe b/G-Earth/src/main/resources/build/windows/32bit/G-Earth.exe new file mode 100644 index 0000000..7916bf1 Binary files /dev/null and b/G-Earth/src/main/resources/build/windows/32bit/G-Earth.exe differ diff --git a/G-Earth/src/main/resources/build/windows/32bit/Tanji.exe b/G-Earth/src/main/resources/build/windows/32bit/Tanji.exe deleted file mode 100644 index f17c94c..0000000 Binary files a/G-Earth/src/main/resources/build/windows/32bit/Tanji.exe and /dev/null differ diff --git a/G-Earth/src/main/resources/build/windows/64bit/G-Earth.exe b/G-Earth/src/main/resources/build/windows/64bit/G-Earth.exe new file mode 100644 index 0000000..59ad4ef Binary files /dev/null and b/G-Earth/src/main/resources/build/windows/64bit/G-Earth.exe differ diff --git a/G-Earth/src/main/resources/build/windows/64bit/Tanji.exe b/G-Earth/src/main/resources/build/windows/64bit/Tanji.exe deleted file mode 100644 index f17c94c..0000000 Binary files a/G-Earth/src/main/resources/build/windows/64bit/Tanji.exe and /dev/null differ diff --git a/G-Earth/src/main/resources/gearth/services/internal_extensions/extensionstore/application/webview/index.html b/G-Earth/src/main/resources/gearth/services/internal_extensions/extensionstore/application/webview/index.html index 71a837a..e24148e 100644 --- a/G-Earth/src/main/resources/gearth/services/internal_extensions/extensionstore/application/webview/index.html +++ b/G-Earth/src/main/resources/gearth/services/internal_extensions/extensionstore/application/webview/index.html @@ -36,7 +36,7 @@
Quick Links:
-
New Releases
+
Recent
Popular
Categories
Installed
diff --git a/G-Earth/src/main/resources/gearth/services/unity_tools/js_code/unity_code.js b/G-Earth/src/main/resources/gearth/services/unity_tools/js_code/unity_code.js index b7a8e6e..2c98fe1 100644 --- a/G-Earth/src/main/resources/gearth/services/unity_tools/js_code/unity_code.js +++ b/G-Earth/src/main/resources/gearth/services/unity_tools/js_code/unity_code.js @@ -20,6 +20,7 @@ let _gearth_incoming_copy; let _malloc; let _free; +let _module; var packetBuff = {"out": [], "in": []}; @@ -97,10 +98,10 @@ function inject_out(packet) { let inject_amount = Math.min(_g_packet_split, packet.length - i); let packet_location = _malloc(inject_amount + 16); - unityInstance.Module.HEAPU8.set(out_packet_objid, packet_location); - unityInstance.Module.HEAPU8.fill(0, packet_location + 4, packet_location + 12); - unityInstance.Module.HEAPU8.set(writeLittleEndian(inject_amount), packet_location + 12); - unityInstance.Module.HEAPU8.set(packet.slice(i, i + inject_amount), packet_location + 16); + _module.HEAPU8.set(out_packet_objid, packet_location); + _module.HEAPU8.fill(0, packet_location + 4, packet_location + 12); + _module.HEAPU8.set(writeLittleEndian(inject_amount), packet_location + 12); + _module.HEAPU8.set(packet.slice(i, i + inject_amount), packet_location + 16); _gearth_outgoing_copy(out_send_param1, packet_location, out_send_param3); _free(packet_location); @@ -128,8 +129,8 @@ function inject_in(packet) { let inject_amount = Math.min(_g_packet_split, packet.length - i); let packet_location = _malloc(inject_amount + 16); - unityInstance.Module.HEAPU8.set(in_packet_prefix, packet_location); - unityInstance.Module.HEAPU8.set(packet.slice(i, i + inject_amount), packet_location + 16); + _module.HEAPU8.set(in_packet_prefix, packet_location); + _module.HEAPU8.set(packet.slice(i, i + inject_amount), packet_location + 16); _gearth_incoming_copy(in_recv_param1, packet_location, 0, inject_amount, 0); _free(packet_location); diff --git a/G-Earth/src/main/resources/gearth/services/unity_tools/js_code/unity_imports.js b/G-Earth/src/main/resources/gearth/services/unity_tools/js_code/unity_imports.js index 221d93c..e5da2fb 100644 --- a/G-Earth/src/main/resources/gearth/services/unity_tools/js_code/unity_imports.js +++ b/G-Earth/src/main/resources/gearth/services/unity_tools/js_code/unity_imports.js @@ -1,10 +1,10 @@ function g_outgoing_packet(param1, param2, param3) { out_send_param1 = param1; out_send_param3 = param3; - out_packet_objid = unityInstance.Module.HEAPU8.slice(param2, param2 + 4); + out_packet_objid = Module.HEAPU8.slice(param2, param2 + 4); - let length = readLittleEndian(unityInstance.Module.HEAPU8.subarray(param2 + 12, param2 + 12 + 4)); - let array = [].slice.call(unityInstance.Module.HEAPU8.subarray(param2 + 12 + 4, param2 + 12 + 4 + length)); + let length = readLittleEndian(Module.HEAPU8.subarray(param2 + 12, param2 + 12 + 4)); + let array = [].slice.call(Module.HEAPU8.subarray(param2 + 12 + 4, param2 + 12 + 4 + length)); packetBuff["out"] = packetBuff["out"].concat(array); @@ -15,9 +15,9 @@ function g_outgoing_packet(param1, param2, param3) { function g_incoming_packet(param1, param2, param3, param4, param5) { in_recv_param1 = param1; - in_packet_prefix = unityInstance.Module.HEAPU8.slice(param2, param2 + 16); + in_packet_prefix = Module.HEAPU8.slice(param2, param2 + 16); - let buffer = unityInstance.Module.HEAPU8.slice(param2 + 16, param2 + 16 + param4); + let buffer = Module.HEAPU8.slice(param2 + 16, param2 + 16 + param4); packetBuff["in"] = packetBuff["in"].concat([].slice.call(buffer)); let packets = collect_packets("in"); 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 b78aabc..e19c71d 100644 --- a/G-Earth/src/main/resources/gearth/ui/info/Info.fxml +++ b/G-Earth/src/main/resources/gearth/ui/info/Info.fxml @@ -25,63 +25,68 @@ -