feat: applies local version of adb to keep actions within application, still requires keys and certs outside

Author: padraigfl

.gitignore

@@ -1,11 +1,14 @@
-sharedassets0.assets.split194
+
 *.apk
+*.idsig
+*.split194
 public
 decompiled
 dataconsult
 out
-certificate.pem
-key.pk8
-src/sharedassets0.assets.split194
+*.pem
+*.pk8
 .DS_Store
-dropmix_modded_src
+*.DS_Store
+dropmix_modded_src
+moddedFile

.idea/misc.xml

@@ -3,28 +3,11 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library" exported="">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../projects/dropmix-card-swap-utility/electron/external-tools/apksigner.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../projects/dropmix-card-swap-utility/electron/external-tools/apktool_2.9.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="module-library">
       <library name="JUnit4">
         <CLASSES>
@@ -51,26 +34,42 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="library" exported="" name="net.lingala.zip4j" level="project" />
     <orderEntry type="module-library" exported="">
       <library>
         <CLASSES>
-          <root url="jar://$USER_HOME$/Downloads/jadb-1.2.1/out/artifacts/jadb_jar/jadb.jar!/" />
+          <root url="jar://$MODULE_DIR$/external_tools/slf4j-log4j12-1.7.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://$USER_HOME$/Downloads/jadb-1.2.1/src" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library>
         <CLASSES>
-          <root url="jar://$USER_HOME$/Downloads/slf4j-log4j12-1.7.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/external_tools/jadb.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/external_tools/apktool_2.9.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/external_tools/apksigner.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="library" exported="" name="net.lingala.zip4j" level="project" />
   </component>
 </module>

DropmixModdingTool.iml

@@ -1,9 +1,15 @@
 import model.AppState;
 import ui.UIMain;
+import util.UtilAdb;
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -16,14 +22,17 @@ public static void main(String[] args) {
     for (int i = 0; i < args.length; i++) {
       System.out.println(args[i]);
     }
+    UtilAdb.setAdbPath();
 
     new UIMain();
+
+    UtilAdb.startServer();
   }
 
   public static String adbDevice() {
     try {
       List<String> cmd = new LinkedList<>();
-      cmd.add("adb");
+      cmd.add("external_tools/adb");
       cmd.add("devices");
       ProcessBuilder pb = new ProcessBuilder(cmd);
       pb.redirectErrorStream(true);