v1.1.3

Pull latest core Deobfuscator version Add De/Select all button
pandaninjas · Sep 4, 2022 · 2cd2255 · 2cd2255
1 parent a203347
commit 2cd2255
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,9 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.example</groupId>
+    <groupId>gq.malwarefight</groupId>
     <artifactId>narumi-deobf-gui</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3</version>
     <name>narumi-deobf-gui</name>
 
     <properties>
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>com.github.pandaninjas</groupId>
             <artifactId>Deobfuscator</artifactId>
-            <version>b36adf9</version>
+            <version>bfb27d4</version>
         </dependency>
     </dependencies>
 

diff --git a/src/main/java/gq/malwarefight/narumiideobfgui/DeobfuscatorGUIApp.java b/src/main/java/gq/malwarefight/narumiideobfgui/DeobfuscatorGUIApp.java
@@ -13,7 +13,9 @@ public class DeobfuscatorGUIApp extends Application {
     @Override
     public void start(Stage stage) throws IOException {
         DeobfuscatorGUIApp.stage = stage;
-        FXMLLoader fxmlLoader = new FXMLLoader(DeobfuscatorGUIApp.class.getResource((useRaw) ? "deobfuscator-gui-advanced-view.fxml": "deobfuscator-gui-view.fxml"));
+        FXMLLoader fxmlLoader = new FXMLLoader(DeobfuscatorGUIApp.class.getResource(
+                (useRaw) ? "deobfuscator-gui-advanced-view.fxml": "deobfuscator-gui-view.fxml")
+        );
         Scene scene = new Scene(fxmlLoader.load(), 320, 240);
         stage.setTitle("Narumii Deobfuscator");
         stage.setScene(scene);

diff --git a/src/main/java/gq/malwarefight/narumiideobfgui/DeobfuscatorGUIController.java b/src/main/java/gq/malwarefight/narumiideobfgui/DeobfuscatorGUIController.java
@@ -3,10 +3,7 @@
 import gq.malwarefight.narumiideobfgui.deobfuscatorutils.DeobfuscatorRegistry;
 import javafx.fxml.FXML;
 import javafx.geometry.Pos;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.Label;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.control.TextField;
+import javafx.scene.control.*;
 import javafx.scene.layout.VBox;
 import javafx.stage.FileChooser;
 import org.objectweb.asm.ClassReader;
@@ -23,6 +20,7 @@
 public class DeobfuscatorGUIController {
 
     private final HashMap<CheckBox, Transformer> deobfuscatorHashMap = new HashMap<>();
+    private boolean stateToToggleTo = true;
 
     @FXML
     public TextField inputName;
@@ -115,4 +113,12 @@ protected void deobfuscate() {
         }
         result.setText("Deobfuscation complete");
     }
+
+    @FXML
+    public void toggleAll() {
+        for (CheckBox box: deobfuscatorHashMap.keySet()) {
+            box.setSelected(stateToToggleTo);
+        }
+        stateToToggleTo = !stateToToggleTo;
+    }
 }
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -3,7 +3,7 @@
     requires javafx.graphics;
     requires javafx.controls;
     requires org.objectweb.asm;
-    requires Deobfuscator.b36adf9;
+    requires Deobfuscator.bfb27d4;
     opens gq.malwarefight.narumiideobfgui to javafx.fxml;
     exports gq.malwarefight.narumiideobfgui to javafx.graphics;
 }
diff --git a/src/main/resources/gq/malwarefight/narumiideobfgui/deobfuscator-gui-advanced-view.fxml b/src/main/resources/gq/malwarefight/narumiideobfgui/deobfuscator-gui-advanced-view.fxml
@@ -21,6 +21,7 @@
     </HBox>
     <ScrollPane>
         <VBox alignment="CENTER" fx:id="buttonContainer"/>
+        <CheckBox onAction="#toggleAll">Toggle all</CheckBox>
     </ScrollPane>
     <Button text="Deobfuscate" onAction="#deobfuscate"/>
     <Label fx:id = "result"/>

diff --git a/src/main/resources/gq/malwarefight/narumiideobfgui/deobfuscator-gui-view.fxml b/src/main/resources/gq/malwarefight/narumiideobfgui/deobfuscator-gui-view.fxml
@@ -19,7 +19,9 @@
         <TextField fx:id="outputName"/>
         <Button text="Choose" onAction="#chooseOutputFile"/>
     </HBox>
-    <VBox alignment="CENTER" fx:id="buttonContainer"/>
+    <VBox alignment="CENTER" fx:id="buttonContainer">
+        <CheckBox onAction="#toggleAll">Toggle All</CheckBox>
+    </VBox>
     <Button text="Deobfuscate" onAction="#deobfuscate"/>
     <Label fx:id = "result"/>
 </VBox>