Switch to the MCPHackers launchwrapper

build.gradle

@@ -66,6 +66,9 @@ dependencies {
     provided "org.lwjgl.lwjgl:lwjgl_util:$lwjglVersion"
     provided platform("org.lwjgl.lwjgl:lwjgl-platform:$lwjglVersion-$lwjglNatives")
 
+
+    provided 'org.mcphackers:launchwrapper:1.0'
+
 }
 
 // Apply a specific Java toolchain to ease working on different environments.
@@ -77,10 +80,11 @@ java {
 
 application {
     // Define the main class for the application.
-    mainClass = 'com.mojang.minecraft.Minecraft'
+    mainClass = 'org.mcphackers.launchwrapper.Launch'
 }
 
 jar {
+    duplicatesStrategy = "exclude"
     manifest {
         attributes (
                 'Main-Class': application.mainClass,
@@ -125,6 +129,34 @@ task jarjar(type: Jar) {
     with copyNatives
 }
 
+
+run {
+    jvmArgs ["-Djava.library.path=${project.nativeLibsDir}",]
+}
+
 jar.finalizedBy(jarjar)
 jar.finalizedBy(copyToLib)
-jar.finalizedBy(copyNatives)
+jar.finalizedBy(copyNatives)
+
+
+
+task buildServer(type: Jar){
+    manifest {
+        attributes(
+                'Main-Class': "com.mojang.minecraft.server.MinecraftServer",
+                "Multi-Release": 'true'
+        )
+    } from {
+        configurations.provided.collect { it.isDirectory() ? it : zipTree(it)}
+    }
+    archiveClassifier = "server"
+    duplicatesStrategy = "exclude"
+    from {configurations.provided.collect {it.isDirectory()?it:zipTree(it)}}
+
+    exclude 'META-INF/*'
+
+    with jarjar
+}
+
+
+jar.finalizedBy(buildServer)

src/main/java/com/mojang/minecraft/Minecraft.java

@@ -1078,10 +1078,4 @@ public final class Minecraft implements Runnable {
 
 		System.gc();
 	}
-
-
-	public static void main(String[] args) throws LWJGLException {
-		Minecraft minecraft = new Minecraft((Canvas)null, 854, 480, false);
-		(new Thread(minecraft)).start();
-	}
 }