Add --level option to special logging level. And more attempts to fix corrupt jar creation.

Author: LexManos

src/main/java/de/oceanlabs/mcp/mcinjector/MCInjector.java

@@ -7,6 +7,7 @@
 import java.nio.file.FileSystem;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Locale;
 import java.util.Optional;
 import java.util.logging.FileHandler;
 import java.util.logging.Handler;
@@ -142,6 +143,23 @@ public String valuePattern()
             return null;
         }
     };
+    private static ValueConverter<Level> LEVEL_ARG = new ValueConverter<Level>()
+    {
+        public Level convert( String value )
+        {
+            return Level.parse(value.toUpperCase(Locale.ENGLISH));
+        }
+
+        public Class<Level> valueType()
+        {
+            return Level.class;
+        }
+
+        public String valuePattern()
+        {
+            return null;
+        }
+    };
 
     public static void main(String[] args) throws Exception
     {
@@ -157,6 +175,7 @@ public static void main(String[] args) throws Exception
         OptionSpec<Path>      accOut = parser.accepts("accOut").withRequiredArg().withValuesConvertedBy(PATH_ARG);
         OptionSpec<Path>      ctr    = parser.accepts("ctr")   .withRequiredArg().withValuesConvertedBy(PATH_ARG);
         OptionSpec<Path>      ctrOut = parser.accepts("ctrOut").withRequiredArg().withValuesConvertedBy(PATH_ARG);
+        OptionSpec<Level>     logLvl = parser.accepts("level") .withRequiredArg().withValuesConvertedBy(LEVEL_ARG).defaultsTo(Level.INFO);
         OptionSpec<LVTNaming> lvt    = parser.accepts("lvt").withRequiredArg().ofType(LVTNaming.class).defaultsTo(LVTNaming.STRIP);
 
         try
@@ -175,7 +194,7 @@ else if (o.has(ver))
             }
 
             MCInjector.LOG.setUseParentHandlers(false);
-            MCInjector.LOG.setLevel(Level.ALL);
+            MCInjector.LOG.setLevel(o.valueOf(logLvl));
 
             LOG.info(MCInjector.VERSION);
             LOG.info("Input:        " + o.valueOf(in));

src/main/java/de/oceanlabs/mcp/mcinjector/MCInjectorImpl.java

@@ -12,6 +12,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.jar.JarEntry;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
@@ -83,13 +84,15 @@ private void processJar(Path inFile, Path outFile) throws IOException
         Set<String> entries = new HashSet<>();
         try (ZipInputStream inJar = new ZipInputStream(Files.newInputStream(inFile)))
         {
-            try (ZipOutputStream outJar = new ZipOutputStream(outFile == null ? new ByteArrayOutputStream() : Files.newOutputStream(outFile, StandardOpenOption.CREATE)))
+            try (ZipOutputStream outJar = new ZipOutputStream(outFile == null ? new ByteArrayOutputStream() : Files.newOutputStream(outFile)))
             {
                 for (ZipEntry entry = inJar.getNextEntry(); entry != null; entry = inJar.getNextEntry())
                 {
+                    String entryName = entry.getName();
+
                     if (entry.isDirectory())
                     {
-                        outJar.putNextEntry(entry);
+                        outJar.putNextEntry(new JarEntry(entryName));
                         outJar.closeEntry();
                         continue;
                     }
@@ -109,8 +112,6 @@ private void processJar(Path inFile, Path outFile) throws IOException
 
                     byte[] entryData = entryBuffer.toByteArray();
 
-                    String entryName = entry.getName();
-
                     boolean mojang = entryName.startsWith("net/minecraft/") || entryName.startsWith("com/mojang/");
 
                     if (entryName.endsWith(".class") && mojang) //TODO: Remove this hardcoding? SRG input? process all?
@@ -136,9 +137,9 @@ private void processJar(Path inFile, Path outFile) throws IOException
 
                 if (!abstractParameters.isEmpty() && !entries.contains("fernflower_abstract_parameter_names.txt"))
                 {
-                    ZipEntry entry = new ZipEntry("fernflower_abstract_parameter_names.txt");
-                    entry.setTime(0); //Stabilize time.
-                    outJar.putNextEntry(entry);
+                    ZipEntry newEntry = new ZipEntry("fernflower_abstract_parameter_names.txt");
+                    newEntry.setTime(0); //Stabilize time.
+                    outJar.putNextEntry(newEntry);
                     for (String key : abstractParameters.keySet().stream().sorted().collect(Collectors.toList()))
                     {
                         outJar.write(key.getBytes(StandardCharsets.UTF_8));//class method desc
@@ -148,8 +149,6 @@ private void processJar(Path inFile, Path outFile) throws IOException
                     }
                     outJar.closeEntry();
                 }
-
-                outJar.flush();
             }
         }
     }