From 06c94316dda5c8462dae7cb0b6552639d964b1e0 Mon Sep 17 00:00:00 2001
From: Gravit <gravit.min@ya.ru>
Date: Thu, 8 Nov 2018 17:41:16 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=BF=D1=86=D0=B8=D0=BE=D0=BD=D0=B0?=
 =?UTF-8?q?=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5=20=D0=BC=D0=BE=D0=B4=D1=8B=20?=
 =?UTF-8?q?=D0=B2=20runtime?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Launcher/runtime/dialog/dialog.js             |  1 +
 .../dialog/overlay/options/options.fxml       | 20 +++++-----
 .../runtime/dialog/overlay/options/options.js | 38 ++++++++++++++++++-
 .../launcher/profiles/ClientProfile.java      |  2 +
 4 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/Launcher/runtime/dialog/dialog.js b/Launcher/runtime/dialog/dialog.js
index fa657f75..05a3cf12 100644
--- a/Launcher/runtime/dialog/dialog.js
+++ b/Launcher/runtime/dialog/dialog.js
@@ -172,6 +172,7 @@ function goSettings(event) {
     }
 
     // Show settings overlay
+    updateOptional();
     overlay.show(settingsOverlay.overlay, null);
 }
 
diff --git a/Launcher/runtime/dialog/overlay/options/options.fxml b/Launcher/runtime/dialog/overlay/options/options.fxml
index 5eeaf696..44ea8b93 100644
--- a/Launcher/runtime/dialog/overlay/options/options.fxml
+++ b/Launcher/runtime/dialog/overlay/options/options.fxml
@@ -4,24 +4,22 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.text.Text?>
 
 <!-- DrLeonardo Design -->
 
 <Pane fx:id="overlay" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/10.0.1" xmlns:fx="http://javafx.com/fxml/1">
    <children>
-     <Pane id="holder" layoutX="171.0" layoutY="28.0" prefHeight="372.0" prefWidth="429.0">
+       <Pane id="holder" layoutX="171.0" layoutY="28.0" prefHeight="372.0" prefWidth="429.0">
        <children>
-         <CheckBox fx:id="modid_0" layoutX="14.0" layoutY="14.0" text="NEI" />
-         <Button fx:id="apply" defaultButton="true" layoutX="315.0" layoutY="333.0" prefHeight="25.0" prefWidth="100.0" text="Применить" />
-         <Text fill="#8c8c8c" layoutX="38.0" layoutY="29.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Включение авто-входа означает что вы сразу после загрузки клиента попадете на сервер" wrappingWidth="379.00000374019146" y="15.0" />
-            <CheckBox fx:id="modid_1" layoutX="14.0" layoutY="108.0" text="BetterFoliage" />
-            <CheckBox fx:id="modid_2" layoutX="14.0" layoutY="166.0" text="Schematica" />
-            <CheckBox fx:id="modid_3" layoutX="39.0" layoutY="73.0" text="NEI Addons" />
-            <Text fill="#8c8c8c" layoutX="38.0" layoutY="121.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Мод довольно сильно преобразит игру, мир обзаведется густой растительностью: изменится трава и листья" wrappingWidth="379.00000374019146" y="15.0" />
-            <Text fill="#8c8c8c" layoutX="38.0" layoutY="180.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Позволит вам смотреть файлы с расширением schematic прямо в вашем игровом мире" wrappingWidth="379.00000374019146" y="15.0" />
-       </children>
-     </Pane>
+            <Button fx:id="apply" defaultButton="true" layoutX="315.0" layoutY="333.0" prefHeight="25.0" prefWidth="100.0" text="Применить" />
+            <FlowPane id="holderpane" orientation="HORIZONTAL">
+                <children>
+                </children>
+            </FlowPane>
+        </children>
+        </Pane>
    </children>
   <stylesheets>
     <URL value="@options.css" />
diff --git a/Launcher/runtime/dialog/overlay/options/options.js b/Launcher/runtime/dialog/overlay/options/options.js
index d2f770de..0d530327 100644
--- a/Launcher/runtime/dialog/overlay/options/options.js
+++ b/Launcher/runtime/dialog/overlay/options/options.js
@@ -42,9 +42,45 @@ var options = {
 
         // Lookup autoEnter checkbox
         var holder = options.overlay.lookup("#holder");
-
         // Lookup apply settings button
         holder.lookup("#apply").setOnAction(function(event) overlay.hide(0, null));
     },
 
 };
+function updateOptional()
+{
+    var holder = options.overlay.lookup("#holderpane");
+    var nodelist = new java.util.ArrayList;
+    
+    holder.getChildren().forEach(function(node,i,arr) {
+        if(node instanceof javafx.scene.control.CheckBox)
+            nodelist.add(node);
+    });
+    nodelist.forEach(function(node,i,arr) {
+        holder.getChildren().remove(node);
+    });
+    var profile = profilesList[serverHolder.old].object;
+    var list = profile.getOptional();
+    var checkboxlist = new java.util.ArrayList;
+    list.forEach(function(modfile,i,arr) {
+         var testMod = new javafx.scene.control.CheckBox(modfile.string);
+         testMod.setSelected(modfile.mark);
+         //testMod.setLayoutY(2+3*i);
+         //testMod.setLayoutX(2);
+         testMod.setOnAction(function(event) {
+             var isSelected = event.getSource().isSelected();
+             if(isSelected)
+             {
+                 profile.markOptional(modfile.string);
+                 LogHelper.debug("Selected mod %s", modfile.string);
+             }
+             else
+             {
+                 profile.unmarkOptional(modfile.string);
+                 LogHelper.debug("Unselected mod %s", modfile.string);
+             }
+         });
+         checkboxlist.add(testMod);
+    });
+    holder.getChildren().addAll(checkboxlist);
+}
diff --git a/libLauncher/src/main/java/ru/gravit/launcher/profiles/ClientProfile.java b/libLauncher/src/main/java/ru/gravit/launcher/profiles/ClientProfile.java
index f157553d..5d371457 100644
--- a/libLauncher/src/main/java/ru/gravit/launcher/profiles/ClientProfile.java
+++ b/libLauncher/src/main/java/ru/gravit/launcher/profiles/ClientProfile.java
@@ -76,7 +76,9 @@ public String toString() {
 
     private final IntegerConfigEntry serverPort;
     public static class MarkedString {
+        @LauncherAPI
         public String string;
+        @LauncherAPI
         public boolean mark;
 
         public MarkedString(String string, boolean mark) {