Rearrange

grab.py

@@ -37,42 +37,42 @@ def get_file(path, url):
     r.raise_for_status()
     version_json = r.json()
     json.dump(version_json, f, sort_keys=True, indent=4)
-    
+
 def grab_versions(main_json):
   assets = {}
   for version in main_json['versions']:
     url = version["url"]
     version_id = version["id"]
     print("version", version_id, url)
-    assetId, assetUrl = get_version_file( "versions/" + version_id + '.json', url)
+    assetId, assetUrl = get_version_file( "mojang/versions/" + version_id + '.json', url)
     assets[assetId] = assetUrl
 
   for assetId, assetUrl in iter(assets.items()):
     print("assets", assetId, assetUrl)
-    get_file( "assets/" + assetId + '.json', assetUrl)
+    get_file( "mojang/assets/" + assetId + '.json', assetUrl)
 
-Popen(["rm *.json"], shell=True, stdout=PIPE).communicate()
-Popen(["rm versions/*.json"], shell=True, stdout=PIPE).communicate()
+Popen(["rm mojang/*.json"], shell=True, stdout=PIPE).communicate()
+Popen(["rm mojang/versions/*.json"], shell=True, stdout=PIPE).communicate()
 
 r = sess.get('https://launchermeta.mojang.com/mc/game/version_manifest.json')
 r.raise_for_status()
 main_json = r.json()
 
-with open("version_manifest.json", 'w', encoding='utf-8') as f:
+with open("mojang/version_manifest.json", 'w', encoding='utf-8') as f:
   json.dump(main_json, f, sort_keys=True, indent=4)
 
 grab_versions(main_json)
 
-Popen(["git add version_manifest.json versions/* assets/*"], shell=True, stdout=PIPE).communicate()
+Popen(["git add mojang/version_manifest.json mojang/versions/* mojang/assets/*"], shell=True, stdout=PIPE).communicate()
 
 print("Generating new split versions.")
 
-Popen(["rm lwjgl/*.json"], shell=True, stdout=PIPE).communicate()
-Popen(["rm minecraft/*.json"], shell=True, stdout=PIPE).communicate()
+Popen(["rm multimc/org.lwjgl/*.json"], shell=True, stdout=PIPE).communicate()
+Popen(["rm multimc/net.minecraft/*.json"], shell=True, stdout=PIPE).communicate()
 
 Popen(["./separateVersions.py"], shell=True, stdout=PIPE).communicate()
 
-Popen(["git add lwjgl/* minecraft/*"], shell=True, stdout=PIPE).communicate()
+Popen(["git add multimc/org.lwjgl/* multimc/net.minecraft/*"], shell=True, stdout=PIPE).communicate()
 
-Popen(["git commit -a -m \"Update " + strftime("%Y-%m-%d", gmtime()) + "\""], shell=True, stdout=PIPE).communicate()
-Popen(["git push"], shell=True, stdout=PIPE).communicate()
+#Popen(["git commit -a -m \"Update " + strftime("%Y-%m-%d", gmtime()) + "\""], shell=True, stdout=PIPE).communicate()
+#Popen(["git push"], shell=True, stdout=PIPE).communicate()