From 9c487215d9b891a2e7c1425a23e301bc2fb99237 Mon Sep 17 00:00:00 2001
From: Andrew Molchanov <mr.catmanrus@gmail.com>
Date: Thu, 9 Jan 2020 15:56:19 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6?=
 =?UTF-8?q?=D0=BA=D0=B0=201.15.1=20=D0=B4=D0=BB=D1=8F=205.0.11=20(#351)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [ANY] Поддержка пинга 1.15 и 1.15.1

* [FIX] удалил ненужные флаги

* [ANY] Добавлен профиль для 1.15.1
---
 .../launchserver/defaults/profile1.14.4.cfg   |  2 -
 .../launchserver/defaults/profile1.15.1.cfg   | 38 +++++++++++++++++++
 .../launcher/profiles/ClientProfile.java      |  4 +-
 3 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.15.1.cfg

diff --git a/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.14.4.cfg b/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.14.4.cfg
index e5ca1b4b..0fac6e8b 100644
--- a/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.14.4.cfg
+++ b/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.14.4.cfg
@@ -23,8 +23,6 @@
   "useWhitelist": false,
   "mainClass": "net.minecraft.client.main.Main",
   "jvmArgs": [
-    "-Dfml.ignorePatchDiscrepancies=true",
-    "-Dfml.ignoreInvalidMinecraftCertificates=rue",
     "-XX:+UseConcMarkSweepGC",
     "-XX:+CMSIncrementalMode",
     "-XX:-UseAdaptiveSizePolicy",
diff --git a/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.15.1.cfg b/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.15.1.cfg
new file mode 100644
index 00000000..c570e16f
--- /dev/null
+++ b/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.15.1.cfg
@@ -0,0 +1,38 @@
+{
+  "version": "1.15.1",
+  "assetIndex": "1.15.1",
+  "assetDir": "asset1.15.1",
+  "dir": "HiTech",
+  "info": "Информация о сервере",
+  "sortIndex": 0,
+  "title": "xxxxxxxx",
+  "serverAddress": "localhost",
+  "serverPort": 25565,
+  "update": [
+    "servers.dat"
+  ],
+  "updateExclusions": [],
+  "updateShared": [],
+  "updateVerify": [
+    "libraries",
+    "natives",
+    "minecraft.jar"
+  ],
+  "updateOptional": [],
+  "updateFastCheck": true,
+  "useWhitelist": false,
+  "mainClass": "net.minecraft.client.main.Main",
+  "jvmArgs": [
+    "-XX:+UseConcMarkSweepGC",
+    "-XX:+CMSIncrementalMode",
+    "-XX:-UseAdaptiveSizePolicy",
+    "-Xmn128M",
+    "-XX:+DisableAttachMechanism"
+  ],
+  "classPath": [
+    "minecraft.jar",
+    "libraries"
+  ],
+  "clientArgs": [],
+  "whitelist": []
+}
diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java
index 3bb4c443..24d115ed 100644
--- a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java
+++ b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java
@@ -46,7 +46,9 @@ public enum Version {
         MC1141("1.14.1", 480),
         MC1142("1.14.2", 485),
         MC1143("1.14.3", 490),
-        MC1144("1.14.4", 498);
+        MC1144("1.14.4", 498),
+        MC115("1.15", 573),
+        MC1151("1.15.1", 575);
         private static final Map<String, Version> VERSIONS;
 
         static {