1.9.4 mdk, extract dir no longer in /mdk/, pom builds to plugin dir

README.md

@@ -18,7 +18,7 @@ The mappings are stored in this jar file, so you don't have to manually find the
 
 The mappings currently work for 1.8, 1.8.9 and 1.9.4
 
-The Forge MDK export works for 1.8.9 currently
+The Forge MDK export works for 1.8.9 and 1.9.4 
 
 ### Example Usage
 
@@ -38,7 +38,7 @@ The Forge MDK export works for 1.8.9 currently
 
 ## TODO
 
-- Add more warnings/notifications
+- Notifications
 - Add support for other versions
 - Add translations?
 

pom.xml

@@ -4,8 +4,32 @@
     <!-- Your personal package -->
     <groupId>dev.fxe</groupId>
     <artifactId>recaf4forge</artifactId>
-    <version>1.0.5</version>
+    <version>1.0.9</version>
     <name>Recaf4Forge</name>
+    <profiles>
+        <profile>
+            <id>Windows</id>
+            <activation>
+                <os>
+                    <family>Windows</family>
+                </os>
+            </activation>
+            <properties>
+                <pluginDir>${user.home}/AppData/Roaming/Recaf/plugins</pluginDir>
+            </properties>
+        </profile>
+        <profile>
+            <id>Linux</id>
+            <activation>
+                <os>
+                    <family>Linux</family>
+                </os>
+            </activation>
+            <properties>
+                <pluginDir>${user.home}/Library/Preferences/Recaf/plugins</pluginDir>
+            </properties>
+        </profile>
+    </profiles>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
@@ -34,6 +58,15 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
+            <!-- Move built jar into plugin dir -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.0</version>
+                <configuration>
+                    <outputDirectory>${pluginDir}</outputDirectory>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>

src/main/java/dev/fxe/recaf_forge/Extractor.java

@@ -84,6 +84,6 @@ public static void saveFile(Path path, byte[] data) {
     private static Path getExportDir() {
         File file = dirChooser.showDialog(null);
         if (file == null) return null;
-        return Paths.get(file.getPath() + "/mdk/");
+        return Paths.get(file.getPath() + "/");
     }
 }

src/main/java/dev/fxe/recaf_forge/Recaf4Forge.java

@@ -32,14 +32,15 @@
 /**
  * @author Filip
  */
+@SuppressWarnings("unused")
 @Plugin(name = "Recaf4Forge")
 public class Recaf4Forge implements ConfigurablePlugin, MenuProviderPlugin, WorkspacePlugin, StartupPlugin {
 
     private final String[] versions = {"1.8", "1.8.9", "1.9.4"};
     private final ExecutorService executor = Executors.newSingleThreadExecutor();
     private Workspace currentWorkspace = null;
-    private Controller controller;
     private String currentVersion = "";
+    private Controller controller;
 
     @Conf(value = "Automatically apply mappings", noTranslate = true)
     private boolean autoApply = false;
@@ -101,15 +102,15 @@ private void exportMDK() {
             CompletableFuture.runAsync(() -> {
                 exportResources(extractedMDK);
                 exportSrc(extractedMDK);
-            }, executor);
+            });
         }
     }
 
 
     private void exportResources(Path extractedMDK) {
         for (Map.Entry<String, byte[]> resources : currentWorkspace.getPrimary().getFiles().entrySet()) {
             String resourcePath =
-                extractedMDK.toString() + File.separator + "src" + File.separator + "main" + File.separator + "resources" + File.separator + resources.getKey();
+                    extractedMDK.toString() + File.separator + "src" + File.separator + "main" + File.separator + "resources" + File.separator + resources.getKey();
             Extractor.saveFile(Paths.get(resourcePath), resources.getValue());
         }
     }
@@ -118,7 +119,7 @@ private void exportSrc(Path extractedMDK) {
         for (Map.Entry<String, byte[]> resources : currentWorkspace.getPrimary().getClasses().entrySet()) {
             final String className = resources.getKey();
             String resourcePath =
-                extractedMDK.toString() + File.separator + "src" + File.separator + "main" + File.separator + "java" + File.separator + className + ".java";
+                    extractedMDK.toString() + File.separator + "src" + File.separator + "main" + File.separator + "java" + File.separator + className + ".java";
             byte[] code = DecompileImpl.CFR.create(this.controller).decompile(className).getBytes(StandardCharsets.UTF_8);
             Extractor.saveFile(Paths.get(resourcePath), code);
         }
@@ -167,5 +168,6 @@ public String getConfigTabTitle() {
     @Override
     public void onStart(Controller controller) {
         this.controller = controller;
+
     }
 }