diff --git a/src/main/protocol/memory/FlashClient.java b/src/main/protocol/memory/HabboClient.java similarity index 97% rename from src/main/protocol/memory/FlashClient.java rename to src/main/protocol/memory/HabboClient.java index 9d7bf61..8b172a1 100644 --- a/src/main/protocol/memory/FlashClient.java +++ b/src/main/protocol/memory/HabboClient.java @@ -4,7 +4,7 @@ import java.io.*; import java.nio.file.Files; import java.util.*; -public class FlashClient { +public class HabboClient { private static final String[] potentialProcessNames = {"--ppapi-flash-args", "plugin-container"}; @@ -14,9 +14,9 @@ public class FlashClient { private static final boolean DEBUG = false; - public static FlashClient create() { + public static HabboClient create() { File folder = new File("/proc"); - FlashClient client = null; + HabboClient client = null; do { File[] fileList = folder.listFiles(); @@ -31,7 +31,7 @@ public class FlashClient { } } if (isHabboProcess) { - client = new FlashClient(); + client = new HabboClient(); client.PID = Integer.parseInt(file.getName()); client.maps = new ArrayList<>(); } diff --git a/src/main/protocol/memory/Rc4Obtainer.java b/src/main/protocol/memory/Rc4Obtainer.java index 6d84c89..fe83c96 100644 --- a/src/main/protocol/memory/Rc4Obtainer.java +++ b/src/main/protocol/memory/Rc4Obtainer.java @@ -1,14 +1,10 @@ package main.protocol.memory; -import javafx.application.Platform; import main.protocol.HPacket; import main.protocol.crypto.RC4; -import main.protocol.packethandler.BufferListener; import main.protocol.packethandler.IncomingHandler; import main.protocol.packethandler.OutgoingHandler; -import main.protocol.memory.FlashClient; -import java.util.Arrays; import java.util.List; import java.util.Random; @@ -16,12 +12,12 @@ public class Rc4Obtainer { public static final boolean DEBUG = false; - FlashClient client = null; + HabboClient client = null; OutgoingHandler outgoingHandler = null; IncomingHandler incomingHandler = null; public Rc4Obtainer() { - client = FlashClient.create(); + client = HabboClient.create(); } @@ -187,7 +183,6 @@ public class Rc4Obtainer { }).start(); } - private List searchForPossibleRC4Tables(List snippets) { List result; result = client.differentiate2(snippets, ((addedBytes * 2) / 3), addedBytes * 2, 1028); @@ -196,13 +191,6 @@ public class Rc4Obtainer { return result; } - private void printBooleanArray(boolean[] booleans) { - StringBuilder builder = new StringBuilder(); - for (boolean bool : booleans) { - builder.append(bool ? "1" : "0"); - } - System.out.println(builder); - } private void printByteArray(byte[] booleans) { StringBuilder builder = new StringBuilder(); for (byte bool : booleans) { @@ -226,65 +214,4 @@ public class Rc4Obtainer { } } - - // System.out.println("[+] receive pubkey"); -// incomingHandler.block(); -// client.pauseProcess(); -// fullmemorybeforekey = client.createMemorySnippetList(); -// client.fetchMemory(fullmemorybeforekey); -// System.out.println("[-] receive pubkey"); -// incomingHandler.unblock(); -// client.resumeProcess(); - - // client.pauseProcess(); -// -// client.refreshMemoryMaps(); -// List result = client.findSharedKey2(); -// System.out.println("result size: "+ result); -// -// client.resumeProcess(); - -// System.out.println("[+] send encrypted"); -// client.pauseProcess(); -// client.updateMapLocationsSnippetList(fullmemorybeforekey); -// -// List diff = client.differentiate(fullmemorybeforekey, true, 54); -// -// List results = client.findSharedKey(diff); -// System.out.println("results: " +results.size()); -// for (String s : results) { -// System.out.println(s); -// } -// System.out.println("[-] send encrypted"); -// client.resumeProcess(); - -// payloadBuffer.push(buffer); -// buffer = new byte[]{}; -// tempBlockIncoming = true; -// client = FlashClient.create(); -// client.pauseProcess(); -// fullmemoryb4publickey = client.createMemorySnippetList(); -// client.fetchMemory(fullmemoryb4publickey); -// client.resumeProcess(); - - - -// if (!doneFlash) { -// tempBlockEncrypted = true; -// FlashClient client = IncomingHandler.client; -// List mem = IncomingHandler.fullmemoryb4publickey; -// client.pauseProcess(); -// client.updateMapLocationsSnippetList(mem); -// List diff = client.differentiate(mem, true, 54); -// IncomingHandler.fullmemoryb4publickey = null; -// List results = client.findSharedKey(diff); -// System.out.println("results: " +results.size()); -// for (String s : results) { -// System.out.println(s); -// } -// client.resumeProcess(); -// tempBlockEncrypted = false; -// IncomingHandler.tempBlockIncoming = false; -// doneFlash = true; -// } } diff --git a/src/main/ui/GEarthController.java b/src/main/ui/GEarthController.java index 1c210f8..68a5ffb 100644 --- a/src/main/ui/GEarthController.java +++ b/src/main/ui/GEarthController.java @@ -1,28 +1,22 @@ package main.ui; -import javafx.event.EventHandler; -import javafx.fxml.FXML; -import javafx.scene.input.KeyEvent; -import javafx.scene.input.MouseEvent; import javafx.scene.layout.Pane; import javafx.stage.Stage; import main.protocol.HConnection; -import main.ui.connection.ConnectionForm; -import main.ui.injection.InjectionForm; -import main.ui.logger.LoggerForm; -import main.ui.tools.ToolsForm; - -import java.awt.*; +import main.ui.connection.Connection; +import main.ui.injection.Injection; +import main.ui.logger.Logger; +import main.ui.tools.Tools; public class GEarthController { private Stage stage = null; private volatile HConnection hConnection; - public ConnectionForm connectionController; - public InjectionForm injectionController; - public LoggerForm loggerController; - public ToolsForm toolsController; + public Connection connectionController; + public Injection injectionController; + public Logger loggerController; + public Tools toolsController; public Pane mover; public GEarthController() { diff --git a/src/main/ui/connection/Connection.fxml b/src/main/ui/connection/Connection.fxml index d4590b8..ccfbc3c 100644 --- a/src/main/ui/connection/Connection.fxml +++ b/src/main/ui/connection/Connection.fxml @@ -10,7 +10,7 @@ - + diff --git a/src/main/ui/connection/ConnectionForm.java b/src/main/ui/connection/Connection.java similarity index 98% rename from src/main/ui/connection/ConnectionForm.java rename to src/main/ui/connection/Connection.java index 6c331b5..8199f86 100644 --- a/src/main/ui/connection/ConnectionForm.java +++ b/src/main/ui/connection/Connection.java @@ -16,7 +16,7 @@ import main.ui.SubForm; import java.io.IOException; -public class ConnectionForm extends SubForm { +public class Connection extends SubForm { public ComboBox inpPort; public ComboBox inpHost; diff --git a/src/main/ui/injection/Injection.fxml b/src/main/ui/injection/Injection.fxml index fda9bd9..7828fd1 100644 --- a/src/main/ui/injection/Injection.fxml +++ b/src/main/ui/injection/Injection.fxml @@ -9,7 +9,7 @@ - + diff --git a/src/main/ui/injection/InjectionForm.java b/src/main/ui/injection/Injection.java similarity index 98% rename from src/main/ui/injection/InjectionForm.java rename to src/main/ui/injection/Injection.java index 7975515..7071c36 100644 --- a/src/main/ui/injection/InjectionForm.java +++ b/src/main/ui/injection/Injection.java @@ -11,7 +11,7 @@ import main.protocol.HConnection; import main.protocol.HPacket; import main.ui.SubForm; -public class InjectionForm extends SubForm { +public class Injection extends SubForm { public TextArea inputPacket; public Text lbl_corrruption; public Text lbl_pcktInfo; diff --git a/src/main/ui/logger/Logger.fxml b/src/main/ui/logger/Logger.fxml index d96cbcc..175f6cb 100644 --- a/src/main/ui/logger/Logger.fxml +++ b/src/main/ui/logger/Logger.fxml @@ -12,7 +12,7 @@ - + diff --git a/src/main/ui/logger/LoggerForm.java b/src/main/ui/logger/Logger.java similarity index 99% rename from src/main/ui/logger/LoggerForm.java rename to src/main/ui/logger/Logger.java index abfd249..6dff117 100644 --- a/src/main/ui/logger/LoggerForm.java +++ b/src/main/ui/logger/Logger.java @@ -17,7 +17,7 @@ import java.util.Calendar; import java.util.HashMap; import java.util.Map; -public class LoggerForm extends SubForm { +public class Logger extends SubForm { public TextField txtPacketLimit; diff --git a/src/main/ui/tools/Tools.fxml b/src/main/ui/tools/Tools.fxml index 362b480..e2184fe 100644 --- a/src/main/ui/tools/Tools.fxml +++ b/src/main/ui/tools/Tools.fxml @@ -10,7 +10,7 @@ - + diff --git a/src/main/ui/tools/ToolsForm.java b/src/main/ui/tools/Tools.java similarity index 98% rename from src/main/ui/tools/ToolsForm.java rename to src/main/ui/tools/Tools.java index 9242e43..6eaeaca 100644 --- a/src/main/ui/tools/ToolsForm.java +++ b/src/main/ui/tools/Tools.java @@ -13,7 +13,7 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; -public class ToolsForm extends SubForm { +public class Tools extends SubForm { public TextField txt_intDecoded; public TextField txt_intEncoded; public TextField txt_ushortDecoded;