Kaynağa Gözat

Damage control pass 2

Daniel Scalzi 8 yıl önce
ebeveyn
işleme
c83809b0dc

+ 0 - 48
app/assets/css/nav.css

@@ -1,48 +0,0 @@
-ul {
-    list-style-type: none;
-    margin: 0;
-    padding: 0;
-}
-
-li {
-    float: left;
-    display: block;
-    padding: 12px;
-    padding-top: 5px;
-    text-align: center;
-}
-
-
-li:hover {
-    background-color: #a02d2a;
-}
-
-a{
-    font-size: 20px;
-    font-family: 'ringbearer';
-}
-.player_icon{
-    margin-top: 120px;
-    margin-left: -15px;
-    width: 100%;
-}
-
-
-.input_text{
-    font-size: 20px;
-    font-family: 'bitter', italic;
-    color: black;
-    text-align: center;
-    padding-top: 40px;
-}
-
-.input{
-    width: 100%;
-    margin: 0 auto;
-    border: none;
-    border-bottom: 3px solid #bdc3c7;
-    outline: none;
-    font-size: 20px;
-    
-}
-

+ 65 - 16
app/assets/css/styles.css

@@ -86,15 +86,69 @@ html {
     margin-right: 5px;
 }
 
+/*******************************************************************************
+ *                                                                             *
+ * Toggle Buttons                                                              *
+ *                                                                             *
+ ******************************************************************************/
+
+.toggle-btn { 
+    color: #000000;
+    font-size: 15px;
+    font-family: 'ringbearer';
+    user-select: none;
+    background-color: transparent; 
+    display: inline-flex; 
+    cursor: pointer;
+    width: 90px;
+    height: 35px;
+}
+
+.toggle-btn-grp .toggle-btn { 
+    border-radius: 0;
+    align-items: center;
+    justify-content: center;
+}
+
+.toggle-btn:not(.success):hover { 
+    box-shadow: inset 0 -4.5px 0 0 #000000;
+}
+
+.toggle-btn.success { 
+    background: #a02d2a;
+    color: #ffffff;
+    cursor: default;
+}
+
+.visuallyhidden { 
+    border: 0; 
+    clip: rect(0 0 0 0); 
+    height: 1px; 
+    margin: -1px; 
+    overflow: hidden; 
+    padding: 0; 
+    position: absolute; 
+    width: 1px; 
+}
+
+.visuallyhidden.focusable:active, .visuallyhidden.focusable:focus { 
+    clip: auto; 
+    height: auto; 
+    margin: 0; 
+    overflow: visible; 
+    position: static; 
+    width: auto; 
+}
+
 /*******************************************************************************
  *                                                                             *
  * Left Body Container                                                         *
  *                                                                             *
  ******************************************************************************/
 
-#body_left_container {
-    width: 25%;
-    display: inline-block;
+#left_pane {
+    float: left;
+    width: 30%;
 }
 
 /*******************************************************************************
@@ -103,19 +157,14 @@ html {
  *                                                                             *
  ******************************************************************************/
 
-#body_right_container {
-    width: 75%;
-    display: inline-block;
+#right_pane {
+    float: right;
+    width: 70%;
 }
 
-.mtoggle_button {
-    text-align:centre; 
-    margin:5px 2px;
-    padding:0.4em 3em; 
-    color:#000; 
-    background-color:#FFF; 
-    border-radius:10px; 
-    display:inline-block; 
-    border:solid 1px #CCC; 
-    cursor:pointer;
+#content_container {
+    border: 3px solid #a02d2a;
+    height: 98%;
+    width: 98%;
+    min-height: 325px;
 }

+ 11 - 0
app/assets/js/assetguard.js

@@ -146,6 +146,7 @@ class AssetGuard extends EventEmitter{
         this.assets = new DLTracker([], 0)
         this.libraries = new DLTracker([], 0)
         this.files = new DLTracker([], 0)
+        this.forge = new DLTracker([], 0)
     }
 }
 
@@ -548,6 +549,16 @@ function validateLogConfig(versionData, basePath){
     })
 }
 
+function validateForge(){
+
+}
+
+function _validateForgeAssets(forgePath){
+
+}
+
+
+
 /**
  * This function will initiate the download processed for the specified identifiers. If no argument is
  * given, all identifiers will be initiated. Note that in order for files to be processed you need to run

+ 11 - 0
app/assets/js/script.js

@@ -3,6 +3,17 @@ const remote = require('electron').remote
 const shell = require('electron').shell
 const path = require('path')
 
+$(document).on('ready', function(){
+    $(".toggle-btn input[type=radio]").addClass("visuallyhidden");
+    $(".toggle-btn input[type=radio]").change(function() {
+        if($(this).attr("name")) {
+            $(this).parent().addClass("success").siblings().removeClass("success")
+        } else {
+            $(this).parent().toggleClass("success")
+        }
+    })
+})
+
 /* Open web links in the user's default browser. */
 $(document).on('click', 'a[href^="http"]', function(event) {
     event.preventDefault();

+ 281 - 0
app/assets/westeroscraft.json

@@ -0,0 +1,281 @@
+{
+    "version": "1.0",
+    "servers": [
+        {
+            "id": "WesterosCraft-1.11.2",
+            "name": "WesterosCraft Production Client",
+            "news-feed": "http://www.westeroscraft.com/api/rss.php?preset_id=12700544",
+            "icon-url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/server-prod.png",
+            "revision": "0.0.1",
+            "server-ip": "mc.westeroscraft.com:4444",
+            "mc-version": "1.11.2",
+            "autoconnect": true,
+            "modules": [
+                {
+                    "id": "MODNAME",
+                    "name": "Mod Name version 1.11.2",
+                    "type": "forgemod",
+                    "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"
+                    }
+                },
+                {
+                    "id": "net.minecraftforge.forge.forge-universal:1.11.2-13.20.0.2282",
+                    "name": "Minecraft Forge 1.11.2-13.20.0.2282",
+                    "type": "forge-hosted",
+                    "artifact": {
+                        "size": 4123353,
+                        "MD5": "1d0f1b383ec122a993e374771c954be2",
+                        "path": "net/minecraftforge/forge/1.11.2-13.20.0.2282/forge-1.11.2-13.20.0.2282-universal.jar",
+                        "url": "http://files.minecraftforge.net/maven/net/minecraftforge/forge/1.11.2-13.20.0.2282/forge-1.11.2-13.20.0.2282-universal.jar"
+                    },
+                    "sub-modules": [
+                        {
+                            "id": "net.minecraft:launchwrapper:1.12",
+                            "name": "Mojang (LaunchWrapper)",
+                            "type": "library",
+                            "artifact": {
+                                "size": 32999,
+                                "MD5": "934b2d91c7c5be4a49577c9e6b40e8da",
+                                "path": "net/minecraft/launchwrapper/1.12/launchwrapper-1.12.jar",
+                                "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/launchwrapper-1.12.jar"
+                            }
+                        },
+                        {
+                            "id": "org.ow2.asm:asm-all:5.0.3",
+                            "name": "Mojang (ASM)",
+                            "type": "library",
+                            "artifact": {
+                                "size": 241639,
+                                "MD5": "c5cc4613bbdfba3ccf5f0ab85390d0b8",
+                                "path": "org/ow2/asm/asm-all/5.0.3/asm-all-5.0.3.jar",
+                                "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/asm-all-5.0.3.jar"
+                            }
+                        },
+                        {
+                            "id": "org.scala-lang:scala-library:2.11.1",
+                            "name": "Minecraft Forge (scala-library)",
+                            "type": "library",
+                            "artifact": {
+                                "size": 5612286,
+                                "MD5": "f2d0c1ce6ab76531bbd48acbcd3d4ff1",
+                                "path": "org/scala-lang/scala-library/2.11.1/scala-library-2.11.1.jar",
+                                "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/scala-library-2.11.1.jar.pack.xz"
+                            }
+                        },
+                        {
+                            "id": "",
+                            "name": "Minecraft Forge (scala-compiler)",
+                            "type": "",
+                            "artifact": {
+                                "size": 0,
+                                "MD5": "9c88616e35796955e0ff1235b11f1475",
+                                "path": "",
+                                "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/scala-compiler-2.11.1.jar.pack.xz"
+                            }
+                        },
+                        {
+                            "id": "",
+                            "name": "Minecraft Forge (scala-actors-migration)",
+                            "type": "",
+                            "artifact": {
+                                "size": 0,
+                                "MD5": "55e0dc48a2a122353628a463b9499cf0",
+                                "path": "",
+                                "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/scala-actors-migration_2.11-1.1.0.jar.pack.xz"
+                            }
+                        },
+                        {
+                            "id": "",
+                            "name": "Minecraft Forge (scala-continuations-library)",
+                            "type": "",
+                            "artifact": {
+                                "size": 0,
+                                "MD5": "820008ee6df308dafa0a6c478270aa19",
+                                "path": "",
+                                "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/scala-continuations-library_2.11-1.0.2.jar.pack.xz"
+                            }
+                        },
+                        {
+                            "id": "",
+                            "name": "Minecraft Forge (scala-continuations-plugin)",
+                            "type": "",
+                            "artifact": {
+                                "size": 0,
+                                "MD5": "657a7ad23928bf4bee68202c7d7e1d56",
+                                "path": "",
+                                "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/scala-continuations-plugin_2.11.1-1.0.2.jar.pack.xz"
+                            }
+                        },
+                        {
+                            "id": "",
+                            "name": "Minecraft Forge (scala-parser-combinators)",
+                            "type": "",
+                            "artifact": {
+                                "size": 0,
+                                "MD5": "de496467c91610e55e6e711b6bdbf10c",
+                                "path": "",
+                                "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/scala-parser-combinators_2.11-1.0.1.jar.pack.xz"
+                            }
+                        },
+                        {
+                            "id": "",
+                            "name": "Minecraft Forge (scala-reflect)",
+                            "type": "",
+                            "artifact": {
+                                "size": 0,
+                                "MD5": "abbdaf710e856f6e65376706c9505952",
+                                "path": "",
+                                "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/scala-reflect-2.11.1.jar.pack.xz"
+                            }
+                        },
+                        {
+                            "id": "",
+                            "name": "Minecraft Forge (scala-swing)",
+                            "type": "",
+                            "artifact": {
+                                "size": 0,
+                                "MD5": "1d360289e697022a3f57abaad344b28f",
+                                "path": "",
+                                "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/scala-swing_2.11-1.0.1.jar"
+                            }
+                        },
+                        {
+                            "id": "",
+                            "name": "Minecraft Forge (scala-xml)",
+                            "type": "",
+                            "artifact": {
+                                "size": 0,
+                                "MD5": "1c5a20efca1474626e0e0123f9cdd8ce",
+                                "path": "",
+                                "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/scala-xml_2.11-1.0.2.jar.pack.xz"
+                            }
+                        },
+                        {
+                            "id": "",
+                            "name": "Minecraft Forge (akka-actor)",
+                            "type": "",
+                            "artifact": {
+                                "size": 0,
+                                "MD5": "469367f3308e571b1bdf2192d7779807",
+                                "path": "",
+                                "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/akka-actor_2.11-2.3.3.jar.pack.xz"
+                            }
+                        },
+                        {
+                            "id": "",
+                            "name": "Minecraft Forge (typesafe-config)",
+                            "type": "",
+                            "artifact": {
+                                "size": 0,
+                                "MD5": "f24b281c40daef1280d5ef26b11caa63",
+                                "path": "",
+                                "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/config-1.2.1.jar.pack.xz"
+                            }
+                        },
+                        {
+                            "id": "",
+                            "name": "Mojang (LZMA)",
+                            "type": "",
+                            "artifact": {
+                                "size": 0,
+                                "MD5": "a3e3c3186e41c4a1a3027ba2bb23cdc6",
+                                "path": "",
+                                "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/lzma-0.0.1.jar"
+                            }
+                        },
+                        {
+                            "id": "",
+                            "name": "Trove4J 3.0.3",
+                            "type": "",
+                            "artifact": {
+                                "size": 0,
+                                "MD5": "8fc4d4e0129244f9fd39650c5f30feb2",
+                                "path": "",
+                                "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/trove4j-3.0.3.jar"
+                            }
+                        },
+                        {
+                            "id": "",
+                            "name": "Vecmath 1.5.2",
+                            "type": "",
+                            "artifact": {
+                                "size": 0,
+                                "MD5": "e5d2b7f46c4800a32f62ce75676a5710",
+                                "path": "",
+                                "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/vecmath-1.5.2.jar"
+                            }
+                        },
+                        {
+                            "id": "",
+                            "name": "Jopt-simple 4.6",
+                            "type": "",
+                            "artifact": {
+                                "size": 0,
+                                "MD5": "13560a58a79b46b82057686543e8d727",
+                                "path": "",
+                                "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/jopt-simple-4.6.jar"
+                            }
+                        },
+                        {
+                            "id": "",
+                            "name": "MercuriusUpdater 1.11.2",
+                            "type": "library",
+                            "artifact": {
+                                "size": 0,
+                                "MD5": "13560a58a79b46b82057686543e8d727",
+                                "path": "",
+                                "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/MercuriusUpdater-1.11.2.jar"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "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
+                    },
+                    "artifact": {
+                        "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"
+                    },
+                    "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"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

+ 151 - 0
app/assets/westeroscraft.xml

@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ServerPack version="3.0">
+<Server id="WesterosCraftTest-1.11.2" name="WesterosCraft 1.11.2 Test Client" newsUrl="http://www.westeroscraft.com/launcher" iconUrl="http://mc.westeroscraft.com/WesterosCraftLauncher/files/server-test.png" revision="0.0.1" serverAddress="mc.westeroscraft.com:4444" generateList="false" version="1.11.2" autoConnect="false" mainClass="net.minecraft.launchwrapper.Launch"
+    libOverrides="com.google.guava:guava:17.0 org.apache.commons:commons-lang3:3.3.2">
+    <Module id="forge" name="Minecraft Forge 13.20.0.2282">
+        <URL priority="0">http://files.minecraftforge.net/maven/net/minecraftforge/forge/1.11.2-13.20.0.2282/forge-1.11.2-13.20.0.2282-universal.jar</URL>
+        <Required>true</Required>
+        <ModType order="1" jreArgs="-Dfml.ignorePatchDiscrepancies=true -Dfml.ignoreInvalidMinecraftCertificates=true" launchArgs="--tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker">Library</ModType>
+        <MD5>1d0f1b383ec122a993e374771c954be2</MD5>
+        
+        <Submodule id="launchwrapper" name="Mojang (LaunchWrapper)">
+            <URL priority="0">http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/launchwrapper-1.12.jar</URL>
+            <MD5>934b2d91c7c5be4a49577c9e6b40e8da</MD5>
+            <Required>true</Required>
+            <ModType order="2">Library</ModType>
+        </Submodule>
+        <Submodule id="asm" name="Mojang (ASM)">
+            <URL priority="0">http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/asm-all-5.0.3.jar</URL>
+            <MD5>c5cc4613bbdfba3ccf5f0ab85390d0b8</MD5>
+            <Required>true</Required>
+            <ModType order="3">Library</ModType>
+        </Submodule>
+        <Submodule id="scala-lib" name="Minecraft Forge (scala-library)">
+            <URL priority="0">http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/scala-library-2.11.1.jar.pack.xz</URL>
+            <MD5>f2d0c1ce6ab76531bbd48acbcd3d4ff1</MD5>
+            <Required>true</Required>
+            <ModType order="4">Library</ModType>
+        </Submodule>
+        <Submodule id="scala-compiler" name="Minecraft Forge (scala-compiler)">
+            <URL priority="0">http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/scala-compiler-2.11.1.jar.pack.xz</URL>
+            <MD5>9c88616e35796955e0ff1235b11f1475</MD5>
+            <Required>true</Required>
+            <ModType order="5">Library</ModType>
+        </Submodule>
+        <Submodule id="scala-actors-migration" name="Minecraft Forge (scala-actors-migration)">
+            <URL priority="0">http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/scala-actors-migration_2.11-1.1.0.jar.pack.xz</URL>
+            <MD5>55e0dc48a2a122353628a463b9499cf0</MD5>
+            <Required>true</Required>
+            <ModType order="5">Library</ModType>
+        </Submodule>
+        <Submodule id="scala-continuations-library" name="Minecraft Forge (scala-continuations-library)">
+            <URL priority="0">http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/scala-continuations-library_2.11-1.0.2.jar.pack.xz</URL>
+            <MD5>820008ee6df308dafa0a6c478270aa19</MD5>
+            <Required>true</Required>
+            <ModType order="5">Library</ModType>
+        </Submodule>
+        <Submodule id="scala-continuations-plugin" name="Minecraft Forge (scala-continuations-plugin)">
+            <URL priority="0">http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/scala-continuations-plugin_2.11.1-1.0.2.jar.pack.xz</URL>
+            <MD5>657a7ad23928bf4bee68202c7d7e1d56</MD5>
+            <Required>true</Required>
+            <ModType order="5">Library</ModType>
+        </Submodule>
+        <Submodule id="scala-parser-combinators" name="Minecraft Forge (scala-parser-combinators)">
+            <URL priority="0">http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/scala-parser-combinators_2.11-1.0.1.jar.pack.xz</URL>
+            <MD5>de496467c91610e55e6e711b6bdbf10c</MD5>
+            <Required>true</Required>
+            <ModType order="5">Library</ModType>
+        </Submodule>
+        <Submodule id="scala-reflect" name="Minecraft Forge (scala-reflect)">
+            <URL priority="0">http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/scala-reflect-2.11.1.jar.pack.xz</URL>
+            <MD5>abbdaf710e856f6e65376706c9505952</MD5>
+            <Required>true</Required>
+            <ModType order="5">Library</ModType>
+        </Submodule>
+        <Submodule id="scala-swing" name="Minecraft Forge (scala-swing)">
+            <URL priority="0">http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/scala-swing_2.11-1.0.1.jar</URL>
+            <MD5>1d360289e697022a3f57abaad344b28f</MD5>
+            <Required>true</Required>
+            <ModType order="5">Library</ModType>
+        </Submodule>
+        <Submodule id="scala-xml" name="Minecraft Forge (scala-xml)">
+            <URL priority="0">http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/scala-xml_2.11-1.0.2.jar.pack.xz</URL>
+            <MD5>1c5a20efca1474626e0e0123f9cdd8ce</MD5>
+            <Required>true</Required>
+            <ModType order="5">Library</ModType>
+        </Submodule>
+        <Submodule id="akka-actor" name="Minecraft Forge (akka-actor)">
+            <URL priority="0">http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/akka-actor_2.11-2.3.3.jar.pack.xz</URL>
+            <MD5>469367f3308e571b1bdf2192d7779807</MD5>
+            <Required>true</Required>
+            <ModType order="5">Library</ModType>
+        </Submodule>
+        <Submodule id="typesafe-config" name="Minecraft Forge (typesafe-config)">
+            <URL priority="0">http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/config-1.2.1.jar.pack.xz</URL>
+            <MD5>f24b281c40daef1280d5ef26b11caa63</MD5>
+            <Required>true</Required>
+            <ModType order="5">Library</ModType>
+        </Submodule>
+        <Submodule id="lzma" name="Mojang (LZMA)">
+            <URL priority="0">http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/lzma-0.0.1.jar</URL>
+            <MD5>a3e3c3186e41c4a1a3027ba2bb23cdc6</MD5>
+            <Required>true</Required>
+            <ModType order="6">Library</ModType>
+        </Submodule>
+        <Submodule id="trove4j" name="Trove4J 3.0.3">
+            <URL priority="0">http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/trove4j-3.0.3.jar</URL>
+            <MD5>8fc4d4e0129244f9fd39650c5f30feb2</MD5>
+            <Required>true</Required>
+            <ModType order="7">Library</ModType>
+        </Submodule>
+        <Submodule id="vecmath" name="Vecmath 1.5.2">
+            <URL priority="0">http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/vecmath-1.5.2.jar</URL>
+            <MD5>e5d2b7f46c4800a32f62ce75676a5710</MD5>
+            <Required>true</Required>
+            <ModType order="8">Library</ModType>
+        </Submodule>
+        <Submodule id="jopt-simple" name="Jopt-simple 4.6">
+            <URL priority="0">http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/jopt-simple-4.6.jar</URL>
+            <MD5>13560a58a79b46b82057686543e8d727</MD5>
+            <Required>true</Required>
+            <ModType order="9">Library</ModType>
+        </Submodule>
+        <Submodule id="MercuriusUpdater" name="MercuriusUpdater 1.11.2">
+            <URL priority="0">http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/MercuriusUpdater-1.11.2.jar</URL>
+            <MD5>13560a58a79b46b82057686543e8d727</MD5>
+            <Required>true</Required>
+            <ModType order="10">Library</ModType>
+        </Submodule>
+    </Module>
+    <Module name="WesterosBlocks (3.0.0-beta-1)" id="WesterosBlocks">
+        <URL>http://mc.westeroscraft.com/WesterosCraftLauncher/test-1.11.2/mods/WesterosBlocks.jar</URL>
+        <Required>true</Required>
+        <ModType>Regular</ModType>
+        <MD5>2a71c13afd289d15c9f95a23712b095d</MD5>
+    </Module>
+    <Module name="OptiFine (1.11.2_HD_U_B7)" id="OptiFine">
+        <URL>http://mc.westeroscraft.com/WesterosCraftLauncher/test-1.11.2/mods/OptiFine.jar</URL>
+        <Required>true</Required>
+        <ModType>Regular</ModType>
+        <MD5>8c88f3b0e8b62088064814520e9d1c31</MD5>
+    </Module>
+    <Module id="WesterosCraftRP" name="WesterosCraft Resource Pack (2017-03-21)">
+        <URL>http://mc.westeroscraft.com/WesterosCraftLauncher/test-1.11.2/resourcepacks/WesterosCraft.zip</URL>
+        <Required>true</Required>
+        <ModType>Regular</ModType>
+        <ModPath>/resourcepacks/WesterosCraft.zip</ModPath>
+        <MD5>1b5dd219a21bda8cd0fb8f7ee986515a</MD5>
+        <ConfigFile>
+            <URL>http://mc.westeroscraft.com/WesterosCraftLauncher/files/options-1.11.2.txt</URL>
+            <Path>/options.txt</Path>
+            <NoOverwrite>true</NoOverwrite>
+        </ConfigFile>
+        <ConfigFile>
+            <URL>http://mc.westeroscraft.com/WesterosCraftLauncher/test-1.11.2/servers.dat</URL>
+            <Path>/servers.dat</Path>
+            <MD5>594de6063df993b5fde31c7290226ee4</MD5>
+        </ConfigFile>
+    </Module>
+</Server>
+
+</ServerPack>

+ 17 - 82
app/index.html

@@ -7,22 +7,12 @@
     <script src="./assets/js/script.js"></script>
     <link type="text/css" rel="stylesheet" href="./assets/css/styles.css">
 
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+    <!-- <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js"></script>
 
     <link rel="stylesheet" type="text/css" href="assets/css/global.css">
-    <link rel="stylesheet" type="text/css" href="assets/css/header.css">
-    <link rel="stylesheet" type="text/css" href="assets/css/nav.css"> 
-
-    <style>
-        .inner_div{
-            width:100%; 
-            background-color: black;
-            border: 5px solid #a02d2a;
-
-        }
-    </style>
+    <link rel="stylesheet" type="text/css" href="assets/css/header.css"> -->
 
 </head>
 <body>
@@ -46,8 +36,21 @@
         </div>
     </div>
 
+    <div id="main_content">
+        <div id="left_pane">
+
+        </div>
+        <div id="right_pane">
+            <div class="toggle-btn-grp">
+                <label onclick="" class="toggle-btn success"><input type="radio" name="main_group"/>news</label><label onclick="" class="toggle-btn"><input type="radio" name="main_group"/>map</label><label onclick="" class="toggle-btn"><input type="radio" name="main_group"/>mods</label><label onclick="" class="toggle-btn"><input type="radio" name="main_group"/>faq</label><label onclick="" class="toggle-btn"><input type="radio" name="main_group"/>log</label><label onclick="" class="toggle-btn"><input type="radio" name="main_group"/>settings</label>
+            </div>
+            <div id="content_container">
+
+            </div>
+        </div>
+    </div>
     
-    <div class="container">
+    <!-- <div class="container">
         <div class="row">
             <div class="col-md-2 col-sm-2">
                 <div class="row">
@@ -62,74 +65,6 @@
                     </div>
                 </div>
             </div>
-            <div class="col-md-10 col-sm-10">
-                <ul>
-                    <li><a href="" class="">NEWS</a></li>
-                    <li><a href="">MAP</a></li>
-                    <li><a href="">MODS</a></li>
-                    <li><a href="">FAQ</a></li>
-                    <li><a href="">LOG</a></li>
-                    <li><a href="">SETTINGS</a></li>
-                </ul>
-                <br>
-                <br>
-                <div class="inner_div">
-                    <p class="title"> Post title </p>
-                    <p class="subtite">Posted by: PERSON 23.4.17</p>
-                    <pre style="text-align: left; word-break: break-all; overflow-wrap: break-word;">    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...
-                    </pre>
-                </div>
-            </div>
-        </div>
-    </div>
-</body> 
-
-
-
-<!--
-</html>
-<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <meta charset="utf-8" />
-    <title>Westeroscraft Launcher</title>
-    <script src="./assets/js/script.js"></script>
-    <link type="text/css" rel="stylesheet" href="./assets/css/styles.css">
-</head>
-<body>
-    <div id="header_container">
-        <div id="header_seal_container">
-            <img id="header_seal" src="./assets/images/WesterosSealSquare.png"/>
-        </div>
-        <div id="header_img_container">
-            <img id="header_img" src="./assets/images/WCTextCrop.png" />
-        </div>
-        <div id="header_social_container">
-            <a href="http://facebook.com/westeroscraft" class="header_social_link">
-                <img src="./assets/images/facebook.png" class="header_social_img" />
-            </a>
-            <a href="http://reddit.com/r/westeroscraft" class="header_social_link">
-                <img src="./assets/images/reddit.png" class="header_social_img" />
-            </a>
-            <a href="http://twitter.com/westeroscraft" class="header_social_link">
-                <img src="./assets/images/twitter.png" class="header_social_img" />
-            </a>
-        </div>
-    </div>
-    <div id="body_left_container">
-
-    </div>
-    <div id="body_right_container">
-        <div id="main_toggle_group">
-            <div><label><input type="radio" name="main_group" class="mtoggle_button"/>News</label></div>
-            <div><label><input type="radio" name="main_group" class="mtoggle_button"/>Map</label></div>
-            <div><label><input type="radio" name="main_group" class="mtoggle_button"/>Mods</label></div>
-            <div><label><input type="radio" name="main_group" class="mtoggle_button"/>FAQ</label></div>
-            <div><label><input type="radio" name="main_group" class="mtoggle_button"/>Log</label></div>
-            <div><label><input type="radio" name="main_group" class="mtoggle_button"/>Settings</label></div>
         </div>
     </div>
-</body>
-</html>-->
+</body> -->