14 files changed, 83 insertions, 47 deletions
diff --git a/libraries/README.md b/libraries/README.md
index 7e7e740d..49879a26 100644
--- a/libraries/README.md
+++ b/libraries/README.md
@@ -125,7 +125,7 @@ cp /home/peterix/minecraft/FTB/versions/1.7.10/1.7.10.jar
 launcher onesix
 ```
 
-Available under the Apache 2.0 license.
+Available under `GPL-3.0-only` (with classpath exception), sublicensed from its original `Apache-2.0` codebase
 
 ## libnbtplusplus
 libnbt++ is a free C++ library for Minecraft's file format Named Binary Tag (NBT). It can read and write compressed and uncompressed NBT files and provides a code interface for working with NBT data.
diff --git a/libraries/javacheck/CMakeLists.txt b/libraries/javacheck/CMakeLists.txt
index 735de443..fd545d2b 100644
--- a/libraries/javacheck/CMakeLists.txt
+++ b/libraries/javacheck/CMakeLists.txt
@@ -4,7 +4,7 @@ find_package(Java 1.7 REQUIRED COMPONENTS Development)
 
 include(UseJava)
 set(CMAKE_JAVA_JAR_ENTRY_POINT JavaCheck)
-set(CMAKE_JAVA_COMPILE_FLAGS -target 8 -source 8 -Xlint:deprecation -Xlint:unchecked)
+set(CMAKE_JAVA_COMPILE_FLAGS -target 7 -source 7 -Xlint:deprecation -Xlint:unchecked)
 
 set(SRC
     JavaCheck.java
diff --git a/libraries/javacheck/JavaCheck.java b/libraries/javacheck/JavaCheck.java
index 560abbc0..4bf43a54 100644
--- a/libraries/javacheck/JavaCheck.java
+++ b/libraries/javacheck/JavaCheck.java
@@ -1,24 +1,25 @@
-import java.lang.Integer;
+public final class JavaCheck {
 
-public class JavaCheck
-{
-    private static final String[] keys = {"os.arch", "java.version", "java.vendor"};
-    public static void main (String [] args)
-    {
-        int ret = 0;
-        for(String key : keys)
-        {
+    private static final String[] CHECKED_PROPERTIES = new String[] {
+            "os.arch",
+            "java.version",
+            "java.vendor"
+    };
+
+    public static void main(String[] args) {
+        int returnCode = 0;
+
+        for (String key : CHECKED_PROPERTIES) {
             String property = System.getProperty(key);
-            if(property != null)
-            {
+
+            if (property != null) {
                 System.out.println(key + "=" + property);
-            }
-            else
-            {
-                ret = 1;
+            } else {
+                returnCode = 1;
             }
         }
-        
-        System.exit(ret);
+
+        System.exit(returnCode);
     }
+
 }
diff --git a/libraries/launcher/CMakeLists.txt b/libraries/launcher/CMakeLists.txt
index 2c859499..c4dfa5b7 100644
--- a/libraries/launcher/CMakeLists.txt
+++ b/libraries/launcher/CMakeLists.txt
@@ -3,19 +3,19 @@ project(launcher Java)
 find_package(Java 1.7 REQUIRED COMPONENTS Development)
 
 include(UseJava)
-set(CMAKE_JAVA_JAR_ENTRY_POINT org.multimc.EntryPoint)
+set(CMAKE_JAVA_JAR_ENTRY_POINT org.polymc.EntryPoint)
 set(CMAKE_JAVA_COMPILE_FLAGS -target 7 -source 7 -Xlint:deprecation -Xlint:unchecked)
 
 set(SRC
-    org/multimc/EntryPoint.java
-    org/multimc/Launcher.java
-    org/multimc/LauncherFactory.java
-    org/multimc/impl/OneSixLauncher.java
-    org/multimc/applet/LegacyFrame.java
-    org/multimc/exception/ParameterNotFoundException.java
-    org/multimc/exception/ParseException.java
-    org/multimc/utils/Parameters.java
-    org/multimc/utils/Utils.java
+    org/polymc/EntryPoint.java
+    org/polymc/Launcher.java
+    org/polymc/LauncherFactory.java
+    org/polymc/impl/OneSixLauncher.java
+    org/polymc/applet/LegacyFrame.java
+    org/polymc/exception/ParameterNotFoundException.java
+    org/polymc/exception/ParseException.java
+    org/polymc/utils/Parameters.java
+    org/polymc/utils/Utils.java
     net/minecraft/Launcher.java
 )
 add_jar(NewLaunch ${SRC})
diff --git a/libraries/launcher/LICENSE b/libraries/launcher/LICENSE
new file mode 120000
index 00000000..30cff740
--- /dev/null
+++ b/libraries/launcher/LICENSE
@@ -0,0 +1 @@
+../../LICENSE
+\ No newline at end of file
diff --git a/libraries/launcher/org/multimc/EntryPoint.java b/libraries/launcher/org/polymc/EntryPoint.java
index c0500bbe..20f418eb 100644
--- a/libraries/launcher/org/multimc/EntryPoint.java
+++ b/libraries/launcher/org/polymc/EntryPoint.java
@@ -12,6 +12,23 @@
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
+ *  Linking this library statically or dynamically with other modules is
+ *  making a combined work based on this library. Thus, the terms and
+ *  conditions of the GNU General Public License cover the whole
+ *  combination.
+ *
+ *  As a special exception, the copyright holders of this library give
+ *  you permission to link this library with independent modules to
+ *  produce an executable, regardless of the license terms of these
+ *  independent modules, and to copy and distribute the resulting
+ *  executable under terms of your choice, provided that you also meet,
+ *  for each linked independent module, the terms and conditions of the
+ *  license of that module. An independent module is a module which is
+ *  not derived from or based on this library. If you modify this
+ *  library, you may extend this exception to your version of the
+ *  library, but you are not obliged to do so. If you do not wish to do
+ *  so, delete this exception statement from your version.
+ *
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
@@ -33,10 +50,10 @@
  *      limitations under the License.
  */
 
-package org.multimc;
+package org.polymc;
 
-import org.multimc.exception.ParseException;
-import org.multimc.utils.Parameters;
+import org.polymc.exception.ParseException;
+import org.polymc.utils.Parameters;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/libraries/launcher/org/multimc/Launcher.java b/libraries/launcher/org/polymc/Launcher.java
index bc0b525e..5bff123e 100644
--- a/libraries/launcher/org/multimc/Launcher.java
+++ b/libraries/launcher/org/polymc/Launcher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.multimc;
+package org.polymc;
 
 public interface Launcher {
 
diff --git a/libraries/launcher/org/multimc/LauncherFactory.java b/libraries/launcher/org/polymc/LauncherFactory.java
index a2af8581..86862929 100644
--- a/libraries/launcher/org/multimc/LauncherFactory.java
+++ b/libraries/launcher/org/polymc/LauncherFactory.java
@@ -12,14 +12,31 @@
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
+ *  Linking this library statically or dynamically with other modules is
+ *  making a combined work based on this library. Thus, the terms and
+ *  conditions of the GNU General Public License cover the whole
+ *  combination.
+ *
+ *  As a special exception, the copyright holders of this library give
+ *  you permission to link this library with independent modules to
+ *  produce an executable, regardless of the license terms of these
+ *  independent modules, and to copy and distribute the resulting
+ *  executable under terms of your choice, provided that you also meet,
+ *  for each linked independent module, the terms and conditions of the
+ *  license of that module. An independent module is a module which is
+ *  not derived from or based on this library. If you modify this
+ *  library, you may extend this exception to your version of the
+ *  library, but you are not obliged to do so. If you do not wish to do
+ *  so, delete this exception statement from your version.
+ *
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.multimc;
+package org.polymc;
 
-import org.multimc.impl.OneSixLauncher;
-import org.multimc.utils.Parameters;
+import org.polymc.impl.OneSixLauncher;
+import org.polymc.utils.Parameters;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/libraries/launcher/org/multimc/applet/LegacyFrame.java b/libraries/launcher/org/polymc/applet/LegacyFrame.java
index caec079c..2cdd17d7 100644
--- a/libraries/launcher/org/multimc/applet/LegacyFrame.java
+++ b/libraries/launcher/org/polymc/applet/LegacyFrame.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.multimc.applet;
+package org.polymc.applet;
 
 import net.minecraft.Launcher;
 
diff --git a/libraries/launcher/org/multimc/exception/ParameterNotFoundException.java b/libraries/launcher/org/polymc/exception/ParameterNotFoundException.java
index 9edbb826..2044814e 100644
--- a/libraries/launcher/org/multimc/exception/ParameterNotFoundException.java
+++ b/libraries/launcher/org/polymc/exception/ParameterNotFoundException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.multimc.exception;
+package org.polymc.exception;
 
 public final class ParameterNotFoundException extends IllegalArgumentException {
 
diff --git a/libraries/launcher/org/multimc/exception/ParseException.java b/libraries/launcher/org/polymc/exception/ParseException.java
index 848b395d..2f2f8294 100644
--- a/libraries/launcher/org/multimc/exception/ParseException.java
+++ b/libraries/launcher/org/polymc/exception/ParseException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.multimc.exception;
+package org.polymc.exception;
 
 public final class ParseException extends IllegalArgumentException {
 
diff --git a/libraries/launcher/org/multimc/impl/OneSixLauncher.java b/libraries/launcher/org/polymc/impl/OneSixLauncher.java
index b981e4ff..362ff8d6 100644
--- a/libraries/launcher/org/multimc/impl/OneSixLauncher.java
+++ b/libraries/launcher/org/polymc/impl/OneSixLauncher.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package org.multimc.impl;
+package org.polymc.impl;
 
-import org.multimc.Launcher;
-import org.multimc.applet.LegacyFrame;
-import org.multimc.utils.Parameters;
-import org.multimc.utils.Utils;
+import org.polymc.Launcher;
+import org.polymc.applet.LegacyFrame;
+import org.polymc.utils.Parameters;
+import org.polymc.utils.Utils;
 
 import java.applet.Applet;
 import java.io.File;
diff --git a/libraries/launcher/org/multimc/utils/Parameters.java b/libraries/launcher/org/polymc/utils/Parameters.java
index 7be790c2..864d3cd2 100644
--- a/libraries/launcher/org/multimc/utils/Parameters.java
+++ b/libraries/launcher/org/polymc/utils/Parameters.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.multimc.utils;
+package org.polymc.utils;
 
-import org.multimc.exception.ParameterNotFoundException;
+import org.polymc.exception.ParameterNotFoundException;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/libraries/launcher/org/multimc/utils/Utils.java b/libraries/launcher/org/polymc/utils/Utils.java
index 416eff26..12d6e1aa 100644
--- a/libraries/launcher/org/multimc/utils/Utils.java
+++ b/libraries/launcher/org/polymc/utils/Utils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.multimc.utils;
+package org.polymc.utils;
 
 import java.io.File;
 import java.lang.reflect.Field;