Merge branch 'hotfix/1.2.2'

rzblue · Apr 11, 2016 · f692edf · f692edf
2 parents c0b6c95 + f05a4ca
commit f692edf
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
 app_name=TechnicAssembler
 package_group=com.github.firecrafty.technicassembler
-app_version=1.2.1
+app_version=1.2.2
 main_class=com.github.firecrafty.technicassembler.TechnicAssembler
diff --git a/src/main/java/com/github/firecrafty/technicassembler/TechnicAssembler.java b/src/main/java/com/github/firecrafty/technicassembler/TechnicAssembler.java
@@ -12,7 +12,7 @@ public class TechnicAssembler {
     /**
      * Name of the modpack
      */
-    private static String output = "Modpack";
+    private static String modpack = "Modpack";
     /**
      * Version of the modpack
      */
@@ -59,7 +59,7 @@ public static void main(String[] args) {
                     packDir = getPackFolder(arg.split("=")[1]);
                 }
                 if (arg.startsWith("-o=")) {
-                    output = arg.split("=")[1];
+                    modpack = arg.split("=")[1];
                 }
                 if (arg.startsWith("-v=")) {
                     version = arg.split("=")[1];
@@ -133,8 +133,21 @@ public static String getZipName(Side side) {
         if (useCustomName) {
             return customFileName + "-" + side.toString();
         } else {
-            return output + "-" + version + "-" + side.toString();
+            return modpack + "-" + version + "-" + side.toString();
         }
     }
+    public static void setModpackName(String modpackName) {
+        modpack = modpackName;
+    }
+    public static void setModpackVersion(String modpackVersion) {
+        version = modpackVersion;
+    }
+    public static void setCustomName(String name) {
+        useCustomName = true;
+        customFileName = name;
+    }
+    public static void setPackDir(File dir) {
+        packDir = dir;
+    }
 
 }
diff --git a/src/main/java/com/github/firecrafty/technicassembler/ZipFile.java b/src/main/java/com/github/firecrafty/technicassembler/ZipFile.java
@@ -43,9 +43,6 @@ public class ZipFile {
      */
     public ZipFile(Side side) {
         this.side = side;
-        if (side == Side.CLIENT) {
-            parent = "";
-        }
         this.outputZip = TechnicAssembler.getZipName(side) + ".zip";
     }