diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.10.2.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.10.2.cfg index 40e88f7d..6966441f 100644 --- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.10.2.cfg +++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.10.2.cfg @@ -22,6 +22,7 @@ updateVerify: [ ]; updateExclusions: []; updateOptional: []; +enabledOptional: []; useWhitelist: false; whitelist: []; diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.11.2.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.11.2.cfg index f64835f2..5471d263 100644 --- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.11.2.cfg +++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.11.2.cfg @@ -22,6 +22,7 @@ updateVerify: [ ]; updateExclusions: []; updateOptional: []; +enabledOptional: []; useWhitelist: false; whitelist: []; diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.12.2.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.12.2.cfg index 2d76209b..6d0eac31 100644 --- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.12.2.cfg +++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.12.2.cfg @@ -22,6 +22,7 @@ updateVerify: [ ]; updateExclusions: []; updateOptional: []; +enabledOptional: []; useWhitelist: false; whitelist: []; diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.13.1.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.13.1.cfg index d70f8608..f0d71c1b 100644 --- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.13.1.cfg +++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.13.1.cfg @@ -22,6 +22,7 @@ updateVerify: [ ]; updateExclusions: []; updateOptional: []; +enabledOptional: []; # Client launcher params mainClass: "net.minecraft.client.main.Main"; diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.13.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.13.cfg index 5bebe88d..028c757f 100644 --- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.13.cfg +++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.13.cfg @@ -22,6 +22,7 @@ updateVerify: [ ]; updateExclusions: []; updateOptional: []; +enabledOptional: []; # Client launcher params mainClass: "net.minecraft.client.main.Main"; diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.4.7.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.4.7.cfg index 07fbb3fd..a5d252ec 100644 --- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.4.7.cfg +++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.4.7.cfg @@ -21,6 +21,7 @@ updateVerify: [ ]; updateExclusions: []; updateOptional: []; +enabledOptional: []; useWhitelist: false; whitelist: []; diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.5.2.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.5.2.cfg index 1845a625..f60e099e 100644 --- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.5.2.cfg +++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.5.2.cfg @@ -21,6 +21,7 @@ updateVerify: [ ]; updateExclusions: []; updateOptional: []; +enabledOptional: []; useWhitelist: false; whitelist: []; diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.6.4.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.6.4.cfg index f9a09428..c9575409 100644 --- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.6.4.cfg +++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.6.4.cfg @@ -22,6 +22,7 @@ updateVerify: [ ]; updateExclusions: []; updateOptional: []; +enabledOptional: []; useWhitelist: false; whitelist: []; diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.7.10.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.7.10.cfg index 21bdfac4..0d8828b0 100644 --- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.7.10.cfg +++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.7.10.cfg @@ -26,6 +26,7 @@ updateExclusions: [ # "mods/railcraft" ]; updateOptional: []; +enabledOptional: []; useWhitelist: false; whitelist: []; diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.7.2.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.7.2.cfg index ecb7c143..be79167d 100644 --- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.7.2.cfg +++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.7.2.cfg @@ -22,6 +22,7 @@ updateVerify: [ ]; updateExclusions: []; updateOptional: []; +enabledOptional: []; useWhitelist: false; whitelist: []; diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.8.9.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.8.9.cfg index 55194c8e..6f6dfdfb 100644 --- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.8.9.cfg +++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.8.9.cfg @@ -22,6 +22,7 @@ updateVerify: [ ]; updateExclusions: []; updateOptional: []; +enabledOptional: []; useWhitelist: false; whitelist: []; diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.9.4.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.9.4.cfg index 8fc19d14..d9cc68a1 100644 --- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.9.4.cfg +++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.9.4.cfg @@ -22,6 +22,7 @@ updateVerify: [ ]; updateExclusions: []; updateOptional: []; +enabledOptional: []; useWhitelist: false; whitelist: []; 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 39a5dfde..f157553d 100644 --- a/libLauncher/src/main/java/ru/gravit/launcher/profiles/ClientProfile.java +++ b/libLauncher/src/main/java/ru/gravit/launcher/profiles/ClientProfile.java @@ -136,6 +136,7 @@ public ClientProfile(BlockConfigEntry block) { block.getEntry("updateVerify", ListConfigEntry.class).stream(StringConfigEntry.class).forEach(updateVerify::add); block.getEntry("updateOptional", ListConfigEntry.class).stream(StringConfigEntry.class).forEach(e -> updateOptional.add(new MarkedString(e))); block.getEntry("updateExclusions", ListConfigEntry.class).stream(StringConfigEntry.class).forEach(updateExclusions::add); + block.getEntry("enabledOptional", ListConfigEntry.class).stream(StringConfigEntry.class).forEach(e -> updateOptional.stream().anyMatch(e1 -> e.equals(e1.string) && (e1.mark = true))); updateFastCheck = block.getEntry("updateFastCheck", BooleanConfigEntry.class); useWhitelist = block.getEntry("useWhitelist", BooleanConfigEntry.class);