From 75af2726db8d81fde3167403f51e5efa59ff879b Mon Sep 17 00:00:00 2001 From: Daniel Scalzi Date: Wed, 17 May 2017 03:31:42 -0400 Subject: [PATCH] Damage control pass 1 --- app/assets/js/launchindex.json | 97 +++++++++-------- app/index.html | 185 +++++++++++++-------------------- package.json | 1 + 3 files changed, 124 insertions(+), 159 deletions(-) diff --git a/app/assets/js/launchindex.json b/app/assets/js/launchindex.json index b895ce7f..db029d53 100644 --- a/app/assets/js/launchindex.json +++ b/app/assets/js/launchindex.json @@ -9,65 +9,74 @@ "revision": "0.0.1", "server-ip": "mc.westeroscraft.com", "mc-version": "1.11.2", - "main-class": "TBD", - "libraries": [ + "modules": [ { - "name": "net.minecraftforge.forge.forge-universal:1.11.2-13.20.0.2228", - "required": true, + "id": "MODNAME", + "name": "Mod Name version 1.11.2", + "type": "forgemod", + "_comment": "If no required is given, it will default to true. If a def(ault) is not give, it will default to true. If required is present it always expects a value.", + "required": { + "value": false, + "def": false + }, + "artifact": { + "size": 1234, + "MD5": "e71e88c744588fdad48d3b3beb4935fc", + "path": "forgemod path is appended to {basepath}/mods", + "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/somemod.jar" + } + }, + { + "_comment": "Forge is a special instance of library.", + "id": "net.minecraftforge.forge.forge-universal:1.11.2-13.20.0.2228", + "name": "Minecraft Forge 1.11.2-13.20.0.2228", + "type": "forge", "artifact": { "size": 4123353, "MD5": "5b9105f1a8552beac0c8228203d994ae", "path": "net/minecraftforge/forge/1.11.2-13.20.0.2228/forge-1.11.2-13.20.0.2228-universal.jar", "url": "http://files.minecraftforge.net/maven/net/minecraftforge/forge/1.11.2-13.20.0.2228/forge-1.11.2-13.20.0.2228-universal.jar" - }, - "launch-args": ["--tweakClass cpw.mods.fml.common.launcher.FMLTweaker"] + } }, { - "name": "net.optifine.optifine:1.11.2_HD_U_B8", - "required": true, + "_comment": "library path is appended to {basepath}/libraries", + "id": "net.optifine.optifine:1.11.2_HD_U_B8", + "name": "Optifine 1.11.2 HD U B8", + "type": "library", "artifact": { "size": 2050307, "MD5": "c18c80f8bfa2a440cc5af4ab8816bc4b", "path": "optifine/OptiFine/1.11.2_HD_U_B8/OptiFine-1.11.2_HD_U_B8.jar", "url": "http://optifine.net/download.php?f=OptiFine_1.11.2_HD_U_B8.jar" + } + }, + { + "id": "chatbubbles", + "name": "Chat Bubbles 1.11.2", + "type": "litemod", + "required": { + "value": false }, - "launch-args": [] - } - ], - "forgemods": [ - { - "name": "MODNAME", - "required": true, "artifact": { - "size": 1234, - "MD5": "e71e88c744588fdad48d3b3beb4935fc", - "path": "/path/to/lib/modname.jar", - "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.7.10/launchwrapper-1.11.jar" - } - } - ], - "litemods": [ - { - "name": "MODNAME", - "required": true, - "artifact": { - "size": 1234, - "MD5": "e71e88c744588fdad48d3b3beb4935fc", - "path": "/path/to/lib/modname.jar", - "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.7.10/launchwrapper-1.11.jar" - } - } - ], - "files": [ - { - "name": "FILENAME", - "required": true, - "artifact": { - "size": 1234, - "MD5": "e71e88c744588fdad48d3b3beb4935fc", - "path": "/path/to/lib/filename.jar", - "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.7.10/launchwrapper-1.11.jar" - } + "size": 37838, + "MD5": "0497a93e5429b43082282e9d9119fcba", + "path": "litemod path is appended to {basepath}/mods/{mc-version}", + "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/mod_chatBubbles-1.0.1_for_1.11.2.litemod" + }, + "_comment": "Any module can declare submodules, even submodules.", + "sub-modules": [ + { + "id": "customRegexes", + "name": "Custom Regexes for Chat Bubbles", + "type": "file", + "artifact": { + "size": 331, + "MD5": "f21b4b325f09238a3d6b2103d54351ef", + "path": "file path is appended to {basepath}", + "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/customRegexes.txt" + } + } + ] } ] } diff --git a/app/index.html b/app/index.html index b2074ac1..ddf88819 100644 --- a/app/index.html +++ b/app/index.html @@ -1,140 +1,96 @@ -<<<<<<< HEAD - + - - + + + + Westeroscraft Launcher + + + + + - - - - - - - - - - - - + + + - - - - - -
-
- -
-
- -
- + + +
+
+
+
+ +
+ +
- -
-
- -
- -
- -
- - - -
- -
- -

Email

- - -

Password

- - -
- + +
+
+
+
+
+
- -
- -
- - - -
-
- -
- -

Post title

- -

Posted by: PERSON 23.4.17

- - 
    Hello WesterosCraft Builders and Honored Guests! As you know, 
-                            progress on Kingslanding had stalled, but no longer -- we want to finish this big, beautiful, city in style and 
-                            are calling all builders to the capital! 
-                            There has been a lot of progress with Kingslanding planning and we are happy to...
-
- +
+

Email

+ +

Password

+
-
- +
+ +
+
+
+

Post title

+

Posted by: PERSON 23.4.17

+ 
    Hello WesterosCraft Builders and Honored Guests! As you know, 
+                        progress on Kingslanding had stalled, but no longer -- we want to finish this big, beautiful, city in style and 
+                        are calling all builders to the capital! 
+                        There has been a lot of progress with Kingslanding planning and we are happy to...
+
+
+
+
+ - - - - - - - - - + diff --git a/package.json b/package.json index 4a3468e1..36c30f9e 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "async": "^2.3.0", "electron": "^1.6.5", "extract-zip": "=1.6.0", + "find-java-home": "^0.1.4", "jQuery": "^1.7.4", "mojang": "^0.4.1", "promise": "^7.1.1",