push release

Applications/Console/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>Applications</artifactId>
         <groupId>com.agentdid127.resourcepack</groupId>
-        <version>2.2.4</version>
+        <version>2.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

Applications/Console/src/main/java/com/agentdid127/resourcepack/Main.java

@@ -5,15 +5,17 @@
 import com.agentdid127.resourcepack.library.utilities.Util;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.Strictness;
 import joptsimple.OptionSet;
 
 import java.io.IOException;
 import java.io.PrintStream;
+import java.nio.file.Path;
 
 public class Main {
     /**
      * Main class. Runs program
-     * 
+     *
      * @param args
      * @throws IOException
      */
@@ -24,20 +26,24 @@ public static void main(String[] args) throws IOException {
             return;
         }
 
-        String from = optionSet.valueOf(Options.FROM);
-        String to = optionSet.valueOf(Options.TO);
+        Path inputPath = optionSet.valueOf(Options.INPUT_DIR);
         String light = optionSet.valueOf(Options.LIGHT);
         boolean minify = optionSet.has(Options.MINIFY);
         boolean debug = optionSet.valueOf(Options.DEBUG);
         PrintStream out = System.out;
-        GsonBuilder gsonBuilder = new GsonBuilder();
+
+        GsonBuilder gsonBuilder = new GsonBuilder().disableHtmlEscaping().setStrictness(Strictness.LENIENT);
+        if (!minify) {
+            gsonBuilder.setPrettyPrinting();
+        }
         Gson gson = gsonBuilder.disableHtmlEscaping().create();
 
-        if (Util.getVersionProtocol(gson, from) > Util.getVersionProtocol(gson, to))
-            new BackwardsPackConverter(from, to, light, minify, optionSet.valueOf(Options.INPUT_DIR), debug, out)
-                    .runDir();
-        else
-            new ForwardsPackConverter(from, to, light, minify, optionSet.valueOf(Options.INPUT_DIR), debug, out)
-                    .runDir();
+        int from = Util.getVersionProtocol(gson, optionSet.valueOf(Options.FROM));
+        int to = Util.getVersionProtocol(gson, optionSet.valueOf(Options.TO));
+        if (from < to) {
+            new ForwardsPackConverter(gson, from, to, light, inputPath, debug, out).runDir();
+        } else {
+            new BackwardsPackConverter(gson, from, to, inputPath, debug, out).runDir();
+        }
     }
 }

Applications/Console/src/main/java/com/agentdid127/resourcepack/Options.java

@@ -16,7 +16,7 @@ public class Options {
 
     public static final OptionSpec<Path> INPUT_DIR = PARSER.acceptsAll(Arrays.asList("i", "input", "input-dir"), "Input directory for the packs").withRequiredArg().withValuesConvertedBy(new PathConverter()).defaultsTo(Paths.get("./"));
 
-    public static final OptionSpec<Boolean> DEBUG = PARSER.accepts("debug", "Displays other output").withRequiredArg().ofType(Boolean.class).defaultsTo(true);
+    public static final OptionSpec<Boolean> DEBUG = PARSER.accepts("debug", "Displays other output").withRequiredArg().ofType(Boolean.class).defaultsTo(false);
 
     public static final OptionSpec<String> TO = PARSER.accepts("to", "Updates to version").withRequiredArg().ofType(String.class).defaultsTo("1.13");
 

Applications/Gui/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>Applications</artifactId>
         <groupId>com.agentdid127.resourcepack</groupId>
-        <version>2.2.4</version>
+        <version>2.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>