Warnings cleanup, and add debuging text to cleanup for jenkins use.

Author: LexManos

src/main/java/net/minecraftforge/gradle/common/BasePlugin.java

@@ -54,7 +54,6 @@
 import com.google.common.base.Charsets;
 import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
-import com.google.common.base.Throwables;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;

src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java

@@ -130,6 +130,7 @@ else if (f.getPath().endsWith(".jar") || f.getPath().endsWith(".zip"))
             throw new IllegalArgumentException("Can only make suppliers out of directories, zips, and SourceDirectorySets right now!");
     }
 
+    @SuppressWarnings("unused")
     private OutputSupplier getOutput(File f) throws IOException
     {
         if (f.isDirectory())

src/main/java/net/minecraftforge/gradle/tasks/CreateStartTask.java

@@ -30,7 +30,6 @@
 import java.util.Set;
 
 import net.minecraftforge.gradle.common.Constants;
-import net.minecraftforge.gradle.util.ThrowableUtil;
 import net.minecraftforge.gradle.util.caching.Cached;
 import net.minecraftforge.gradle.util.caching.CachedTask;
 
@@ -49,7 +48,6 @@
 
 import com.google.common.base.Charsets;
 import com.google.common.base.Joiner;
-import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;

src/main/java/net/minecraftforge/gradle/tasks/Download.java

@@ -37,8 +37,6 @@
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
 
-import com.google.common.io.Closeables;
-
 public class Download extends CachedTask
 {
     @Input

src/main/java/net/minecraftforge/gradle/tasks/SignJar.java

@@ -30,7 +30,6 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import com.google.common.io.Closeables;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.file.FileTreeElement;
 import org.gradle.api.file.FileVisitDetails;

src/main/java/net/minecraftforge/gradle/user/liteloader/LiteModJson.java

@@ -33,7 +33,6 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map.Entry;
 
 public class LiteModJson
 {

src/main/java/net/minecraftforge/gradle/user/patcherUser/forge/ForgeExtension.java

@@ -19,19 +19,16 @@
  */
 package net.minecraftforge.gradle.user.patcherUser.forge;
 
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.gradle.api.logging.Logger;
 import org.gradle.api.logging.Logging;
 
-import com.google.common.base.Strings;
-
 import net.minecraftforge.gradle.common.Constants;
 import net.minecraftforge.gradle.user.UserBaseExtension;
 import net.minecraftforge.gradle.user.UserBasePlugin;
-import net.minecraftforge.gradle.util.GradleConfigurationException;
 
+@SuppressWarnings("unused")
 public class ForgeExtension extends UserBaseExtension
 {
     private String         forgeVersion;

src/main/java/net/minecraftforge/gradle/util/mcp/McpCleanup.java

@@ -41,6 +41,8 @@ enum CommentState
 
     public static String stripComments(String text)
     {
+        System.out.println("Start:");
+        System.out.println(text);
         CommentState state = CommentState.CODE;
         int i = 0;
         try (StringWriter out = new StringWriter(text.length()))
@@ -130,8 +132,12 @@ else if (text.charAt(i) == '/' && text.charAt(i + 1) == '*')
             throw new RuntimeException(e);
         }
 
+        System.out.println("Mid:");
+        System.out.println(text);
         text = COMMENTS_TRAILING.matcher(text).replaceAll("");
         text = COMMENTS_NEWLINES.matcher(text).replaceAll(Constants.NEWLINE);
+        System.out.println("End:");
+        System.out.println(text);
 
         return text;
     }
@@ -262,13 +268,13 @@ public static String cleanup(String text)
         text = CLEANUP_blockends.matcher(text).replaceAll("");
         text = CLEANUP_gl.matcher(text).replaceAll("");
         text = CLEANUP_maxD.matcher(text).replaceAll("Double.MAX_VALUE");
-    
+
         // unicode chars
         {
             Matcher matcher = CLEANUP_unicode.matcher(text);
             int val;
             StringBuffer buffer = new StringBuffer(text.length());
-    
+
             while (matcher.find())
             {
                 val = Integer.parseInt(matcher.group(1), 16);
@@ -281,11 +287,11 @@ public static String cleanup(String text)
             matcher.appendTail(buffer);
             text = buffer.toString();
         }
-    
+
         // charval.. its stupid.
         text = CLEANUP_charval.matcher(text).replaceAll("$1"); // TESTING NEEDED
-    
-        //		 pi?   true
+
+        //         pi?   true
         text = CLEANUP_piD.matcher(text).replaceAll("Math.PI");
         text = CLEANUP_piF.matcher(text).replaceAll("(float)Math.PI");
         text = CLEANUP_2piD.matcher(text).replaceAll("(Math.PI * 2D)");
@@ -310,7 +316,7 @@ public static String cleanup(String text)
         text = CLEANUP_7pi100F.matcher(text).replaceAll("((float)Math.PI * 7F / 100F)");
         text = CLEANUP_185pi100D.matcher(text).replaceAll("(Math.PI * 185D / 100D)");
         text = CLEANUP_185pi100F.matcher(text).replaceAll("((float)Math.PI * 185F / 100F)");
-    
+
         return text;
     }
 

src/test/java/net/minecraftforge/gradle/tasks/TestAbstractEditJarTask.java

@@ -89,7 +89,6 @@ else if (name.endsWith(".java") || name.endsWith(".kt") || name.endsWith(".groov
         Assert.assertEquals("Should have directories", expectedDirectoryCount, directoryCount);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void runTask() throws Throwable
     {

src/test/java/net/minecraftforge/gradle/tasks/TestMergeJars.java

@@ -38,6 +38,8 @@ public class TestMergeJars extends TaskTest<MergeJars>
     private static Closure<File> fileClosure(File f) {
         return new Closure<File>(null)
         {
+            private static final long serialVersionUID = 4890472900855018806L;
+
             @Override
             public File call()
             {