From b049b39760f099a1081abfeac8d48e91ea4ece57 Mon Sep 17 00:00:00 2001
From: cpw <cpw@weeksfamily.ca>
Date: Mon, 20 Apr 2015 16:14:27 -0400
Subject: [PATCH] Update to use the inherited jar format. Simplifies a lot..

---
 fml/jsons/1.7.10-rel.json | 164 +++-----------------------------------
 1 file changed, 10 insertions(+), 154 deletions(-)

diff --git a/fml/jsons/1.7.10-rel.json b/fml/jsons/1.7.10-rel.json
index b56a8f63c5..cfed477443 100644
--- a/fml/jsons/1.7.10-rel.json
+++ b/fml/jsons/1.7.10-rel.json
@@ -16,8 +16,11 @@
   "releaseTime": "1960-01-01T00:00:00-0700",
   "type": "release",
   "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
-  "minimumLauncherVersion": 13,
-  "assets": "1.7.10",
+  "mainClass": "net.minecraft.launchwrapper.Launch",
+  "minimumLauncherVersion": 14,
+  "assets": "@minecraft_version@",
+  "inheritsFrom": "@minecraft_version@",
+  "jar": "@minecraft_version@",
   "libraries": [
     {
       "name": "@artifact@",
@@ -108,165 +111,18 @@
       "serverreq":true,
       "clientreq":true
     },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5",
-      "serverreq":true
-    },
     {
       "name": "lzma:lzma:0.0.1",
       "serverreq":true
     },
     {
-      "name": "com.mojang:realms:1.3.5"
+      "name": "net.sf.jopt-simple:jopt-simple:4.5",
+      "serverreq":true
     },
     {
-      "name": "org.apache.commons:commons-compress:1.8.1"
-    },
-    {
-      "name": "org.apache.httpcomponents:httpclient:4.3.3"
-    },
-    {
-      "name": "commons-logging:commons-logging:1.1.3"
-    },
-    {
-      "name": "org.apache.httpcomponents:httpcore:4.3.2"
-    },
-    {
-      "name": "java3d:vecmath:1.3.1"
-    },
-    {
-      "name": "net.sf.trove4j:trove4j:3.0.3"
-    },
-    {
-      "name": "com.ibm.icu:icu4j-core-mojang:51.2"
-    },
-    {
-      "name": "com.paulscode:codecjorbis:20101023"
-    },
-    {
-      "name": "com.paulscode:codecwav:20101023"
-    },
-    {
-      "name": "com.paulscode:libraryjavasound:20101123"
-    },
-    {
-      "name": "com.paulscode:librarylwjglopenal:20100824"
-    },
-    {
-      "name": "com.paulscode:soundsystem:20120107"
-    },
-    {
-      "name": "io.netty:netty-all:4.0.10.Final"
-    },
-    {
-      "name": "com.google.guava:guava:16.0"
-    },
-    {
-      "name": "org.apache.commons:commons-lang3:3.2.1"
-    },
-    {
-      "name": "commons-io:commons-io:2.4"
-    },
-    {
-      "name": "commons-codec:commons-codec:1.9"
-    },
-    {
-      "name": "net.java.jinput:jinput:2.0.5"
-    },
-    {
-      "name": "net.java.jutils:jutils:1.0.0"
-    },
-    {
-      "name": "com.google.code.gson:gson:2.2.4"
-    },
-    {
-      "name": "com.mojang:authlib:1.5.16"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "tv.twitch:twitch:5.16"
-    },
-    {
-      "name": "tv.twitch:twitch-platform:5.16",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "linux"
-          }
-        }
-      ],
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows-${arch}",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "tv.twitch:twitch-external-platform:4.5",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "windows"
-          }
-        }
-      ],
-      "natives": {
-        "windows": "natives-windows-${arch}"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
+      "name": "com.google.guava:guava:17.0",
+      "serverreq":true
     }
-  ],
-  "mainClass": "net.minecraft.launchwrapper.Launch"
+  ]
 }
 }