Update

build.gradle

@@ -68,7 +68,7 @@ task shrinkJar(type: proguard.gradle.ProGuardTask, dependsOn: jar) {
 task shrinkOutput(type: Jar, dependsOn: shrinkJar) {
     classifier = 'shrunk'
     from zipTree(shrinkJar.obfuscatedJar)
-    manifest { attributes 'Main-Class': 'cpw.mods.fml.installer.SimpleInstaller' }
+    manifest { attributes 'Main-Class': 'net.minecraftforge.installer.SimpleInstaller' }
 }
 
 artifacts {
@@ -80,7 +80,7 @@ artifacts {
 jar {
     classifier = 'thin'
     exclude 'argo/**'
-    manifest { attributes 'Main-Class': 'cpw.mods.fml.installer.SimpleInstaller' }
+    manifest { attributes 'Main-Class': 'net.minecraftforge.installer.SimpleInstaller' }
 }
 
 uploadArchives {

src/main/java/cpw/mods/fml/installer/ActionType.java → src/main/java/net/minecraftforge/installer/ActionType.java

@@ -1,4 +1,4 @@
-package cpw.mods.fml.installer;
+package net.minecraftforge.installer;
 
 import java.io.File;
 

src/main/java/cpw/mods/fml/installer/Artifact.java → src/main/java/net/minecraftforge/installer/Artifact.java

@@ -1,4 +1,4 @@
-package cpw.mods.fml.installer;
+package net.minecraftforge.installer;
 
 import java.io.File;
 
@@ -60,6 +60,7 @@ public File getLocalPath(File base)
     public String getExt()       { return ext;        }
     public String getMemo()      { return memo;       }
     public void setMemo(String v){ memo = v;          }
+    @Override
     public String toString()
     {
         if (getMemo() != null)

src/main/java/cpw/mods/fml/installer/ClientInstall.java → src/main/java/net/minecraftforge/installer/ClientInstall.java

@@ -1,4 +1,4 @@
-package cpw.mods.fml.installer;
+package net.minecraftforge.installer;
 
 import java.io.BufferedOutputStream;
 import java.io.BufferedWriter;
@@ -72,26 +72,26 @@ public boolean run(File target)
         int progress = 3;
 
         File versionJsonFile = new File(versionTarget,VersionInfo.getVersionTarget()+".json");
-        
+
         if (!VersionInfo.isInheritedJson())
         {
             File clientJarFile = new File(versionTarget, VersionInfo.getVersionTarget()+".jar");
             File minecraftJarFile = VersionInfo.getMinecraftFile(versionRootDir);
-            
+
             try
             {
                 boolean delete = false;
                 monitor.setNote("Considering minecraft client jar");
                 monitor.setProgress(1);
-                
+
                 if (!minecraftJarFile.exists())
                 {
                     minecraftJarFile = File.createTempFile("minecraft_client", ".jar");
                     delete = true;
                     monitor.setNote(String.format("Downloading minecraft client version %s", VersionInfo.getMinecraftVersion()));
                     String clientUrl = String.format(DownloadUtils.VERSION_URL_CLIENT.replace("{MCVER}", VersionInfo.getMinecraftVersion()));
                     System.out.println("  Temp File: " + minecraftJarFile.getAbsolutePath());
-                    
+
                     if (!DownloadUtils.downloadFileEtag("minecraft server", minecraftJarFile, clientUrl))
                     {
                         minecraftJarFile.delete();
@@ -103,7 +103,7 @@ public boolean run(File target)
                     }
                     monitor.setProgress(2);
                 }
-                
+
                 if (VersionInfo.getStripMetaInf())
                 {
                     monitor.setNote("Copying and filtering minecraft client jar");
@@ -116,7 +116,7 @@ public boolean run(File target)
                     Files.copy(minecraftJarFile, clientJarFile);
                     monitor.setProgress(3);
                 }
-                
+
                 if (delete)
                 {
                     minecraftJarFile.delete();
@@ -288,6 +288,7 @@ public boolean isPathValid(File targetDir)
     }
 
 
+    @Override
     public String getFileError(File targetDir)
     {
         if (targetDir.exists())

src/main/java/cpw/mods/fml/installer/DownloadUtils.java → src/main/java/net/minecraftforge/installer/DownloadUtils.java

@@ -1,4 +1,4 @@
-package cpw.mods.fml.installer;
+package net.minecraftforge.installer;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -50,6 +50,7 @@ public static int downloadInstalledLibraries(String jsonMarker, File librariesDi
             if (library.isArrayNode("checksums"))
             {
                 checksums = Lists.newArrayList(Lists.transform(library.getArrayNode("checksums"), new Function<JsonNode, String>() {
+                    @Override
                     public String apply(JsonNode node)
                     {
                         return node.getText();

src/main/java/cpw/mods/fml/installer/ExtractAction.java → src/main/java/net/minecraftforge/installer/ExtractAction.java

@@ -1,4 +1,4 @@
-package cpw.mods.fml.installer;
+package net.minecraftforge.installer;
 
 import java.io.File;
 import java.io.IOException;

src/main/java/cpw/mods/fml/installer/IMonitor.java → src/main/java/net/minecraftforge/installer/IMonitor.java

@@ -1,4 +1,4 @@
-package cpw.mods.fml.installer;
+package net.minecraftforge.installer;
 
 public interface IMonitor {
     void setMaximum(int max);

src/main/java/cpw/mods/fml/installer/InstallerAction.java → src/main/java/net/minecraftforge/installer/InstallerAction.java

@@ -1,4 +1,4 @@
-package cpw.mods.fml.installer;
+package net.minecraftforge.installer;
 
 import java.io.File;
 import javax.swing.Icon;

src/main/java/cpw/mods/fml/installer/InstallerPanel.java → src/main/java/net/minecraftforge/installer/InstallerPanel.java

@@ -1,4 +1,4 @@
-package cpw.mods.fml.installer;
+package net.minecraftforge.installer;
 
 import java.awt.Color;
 import java.awt.Desktop;

src/main/java/cpw/mods/fml/installer/LibraryPacker.java → src/main/java/net/minecraftforge/installer/LibraryPacker.java

@@ -1,4 +1,4 @@
-package cpw.mods.fml.installer;
+package net.minecraftforge.installer;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -42,20 +42,21 @@ public void stop() {
             fStop = System.currentTimeMillis();
             fIsRunning = false;
         }
-
+
+        @Override
         public String toString(){ return length() + " ms"; }
         public long length() { return fStop - fStart; }
         private long fStart;
         private long fStop;
 
         private boolean fIsRunning;
     }
-    
+
     public static void main(String[] args) throws IOException
     {
         if (args.length < 1)
         {
-            System.out.println("Usage: java cpw.mods.fml.installer.LibraryPacker <path1> [path2...]");
+            System.out.println("Usage: java net.minecraftforge.installer.LibraryPacker <path1> [path2...]");
             System.out.println("This program will walk the supplied paths recursivly and create compressed versions of any .jar file they find.");
             return;
         }
@@ -65,7 +66,7 @@ public static void main(String[] args) throws IOException
             walk(new File(path));
         }
     }
-    
+
     private static void walk(File path) throws IOException
     {
         if (path.isDirectory())
@@ -108,13 +109,13 @@ private static byte[] compress(File path) throws IOException
         System.out.println("");
         return xzed;
     }
-    
+
     private static byte[] checksum(byte[] raw, File path) throws IOException
     {
         JarInputStream in = new JarInputStream(new ByteArrayInputStream(raw));
-        
+
         StringBuffer checksums = new StringBuffer();
-        
+
         JarEntry entry = in.getNextJarEntry();
         while (entry != null)
         {
@@ -125,15 +126,16 @@ private static byte[] checksum(byte[] raw, File path) throws IOException
             entry = in.getNextJarEntry();
         }
         in.close();
-        
+
         return checksums.toString().getBytes(Charset.forName("UTF-8"));
     }
 
     private static final OutputStream NULL_OUT = new OutputStream()
     {
+        @Override
         public void write(int b) throws IOException{}
     };
-    
+
     private static byte[] pack(byte[] data, File path) throws IOException
     {
         JarInputStream in = new JarInputStream(new ByteArrayInputStream(data))
@@ -150,19 +152,19 @@ public ZipEntry getNextEntry() throws IOException
             }
         };
         ByteArrayOutputStream out = new ByteArrayOutputStream();
-        
+
         Packer packer = Pack200.newPacker();
-        
+
         SortedMap<String, String> props = packer.properties();
         props.put(Packer.EFFORT, "9");
         props.put(Packer.KEEP_FILE_ORDER, Packer.TRUE);
         props.put(Packer.UNKNOWN_ATTRIBUTE, Packer.PASS);
-        
+
         final PrintStream err = new PrintStream(System.err);
         System.setErr(new PrintStream(NULL_OUT));
         packer.pack(in, out);
         System.setErr(err);
-        
+
         in.close();
         out.close();
 
@@ -197,11 +199,11 @@ private static byte[] unpack(byte[] data, File path) throws IOException
 
         return unpacked;
     }
-    
+
     private static byte[] xz(byte[] data, byte[] checksums, File path) throws IOException
     {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
-        
+
         LZMA2Options options = new LZMA2Options();
         options.setPreset(8);
         XZOutputStream xz = new XZOutputStream(out, options);
@@ -230,12 +232,12 @@ private static void decompress(File path, byte[] data, List<String> checksum) th
         File output = new File(path.getAbsolutePath() + ".unpacked.test");
 
         DownloadUtils.unpackLibrary(new File(path.getAbsolutePath() + ".unpacked.test"), data);
-        
+
         DownloadUtils.validateJar(output, Files.toByteArray(output), CHECKSUMS);
-        
+
         t.stop();
         System.out.println("  Decompress: " + t.toString());
     }
-    
-    
+
+
 }

src/main/java/cpw/mods/fml/installer/MirrorData.java → src/main/java/net/minecraftforge/installer/MirrorData.java

@@ -1,4 +1,4 @@
-package cpw.mods.fml.installer;
+package net.minecraftforge.installer;
 
 import java.net.URL;
 import java.util.Collections;

src/main/java/cpw/mods/fml/installer/ServerInstall.java → src/main/java/net/minecraftforge/installer/ServerInstall.java

@@ -1,4 +1,4 @@
-package cpw.mods.fml.installer;
+package net.minecraftforge.installer;
 
 import java.io.File;
 import java.io.IOException;

src/main/java/cpw/mods/fml/installer/SimpleInstaller.java → src/main/java/net/minecraftforge/installer/SimpleInstaller.java

@@ -1,4 +1,4 @@
-package cpw.mods.fml.installer;
+package net.minecraftforge.installer;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileNotFoundException;

src/main/java/cpw/mods/fml/installer/VersionInfo.java → src/main/java/net/minecraftforge/installer/VersionInfo.java

@@ -1,4 +1,4 @@
-package cpw.mods.fml.installer;
+package net.minecraftforge.installer;
 
 import java.io.File;
 import java.io.FileOutputStream;