Changes to workspace copying

Author: Lassebq

src/main/java/org/mcphackers/mcp/tasks/TaskCleanup.java

@@ -29,7 +29,7 @@ public void doTask() throws Exception {
 	    		Paths.get(MCPConfig.BIN),
 	    		Paths.get(MCPConfig.REOBF),
 	    		Paths.get(MCPConfig.BUILD),
-	    		Paths.get("eclipse")
+	    		Paths.get("workspace")
 	    	};
         if (MCP.config.srcCleanup) pathsToDelete = new Path[] {
 	    		Paths.get(MCPConfig.SRC),

src/main/java/org/mcphackers/mcp/tasks/TaskSetup.java

@@ -17,7 +17,6 @@
 import org.mcphackers.mcp.MCPConfig;
 import org.mcphackers.mcp.tasks.info.TaskInfo;
 import org.mcphackers.mcp.tools.FileUtil;
-import org.mcphackers.mcp.tools.ResourceManager;
 import org.mcphackers.mcp.tools.Util;
 import org.mcphackers.mcp.tools.VersionsParser;
 
@@ -83,10 +82,9 @@ public void doTask() throws Exception {
 
         // Create Eclipse workspace
         MCP.logger.info(" Setting up workspace");
-        FileUtil.deleteDirectoryIfExists(Paths.get("eclipse"));
-        ResourceManager.copyResource("/eclipse.zip", "eclipse.zip");
-        FileUtil.unzip(Paths.get("eclipse.zip"), Paths.get("eclipse"));
-        Files.delete(Paths.get("eclipse.zip"));
+        FileUtil.deleteDirectoryIfExists(Paths.get("workspace"));
+        FileUtil.copyResource(MCP.class.getClassLoader().getResourceAsStream("workspace.zip"), Paths.get("workspace.zip"));
+        FileUtil.unzip(Paths.get("workspace.zip"), Paths.get("workspace"), true);
 
         // Create Intellij workspace
         String[] projects = { "Client", "Server" };

src/main/java/org/mcphackers/mcp/tools/FileUtil.java

@@ -188,5 +188,9 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attributes) thro
         });
         outputStream.close();
     }
-
+    
+    public static void copyResource(InputStream is, Path out) throws IOException {
+    	byte[] data = Util.readAllBytes(is);
+    	Files.write(out, data);
+    }
 }

src/main/java/org/mcphackers/mcp/tools/ResourceManager.java

@@ -120,7 +120,7 @@ public static JSONArray parseJSONArray(InputStream stream) throws JSONException,
         return new JSONArray(content);
     }
 
-    private static byte[] readAllBytes(InputStream inputStream) throws IOException {
+    public static byte[] readAllBytes(InputStream inputStream) throws IOException {
         final int bufLen = 4 * 0x400; // 4KB
         byte[] buf = new byte[bufLen];
         int readLen;