From 2b4e58ae160c2c5610e2fe5be538bf79bd0ba54f Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Fri, 30 Apr 2021 00:49:55 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.MD                                        |  10 +++++++++-
 server/build.gradle                              |   4 ++++
 .../resources/{config.yml => config-sample.yml}  |   5 +++--
 server/src/main/resources/favicon.png            | Bin 1675 -> 0 bytes
 .../{logback.xml => logback-sample.xml}          |   0
 5 files changed, 16 insertions(+), 3 deletions(-)
 rename server/src/main/resources/{config.yml => config-sample.yml} (72%)
 delete mode 100644 server/src/main/resources/favicon.png
 rename server/src/main/resources/{logback.xml => logback-sample.xml} (100%)

diff --git a/README.MD b/README.MD
index f0e5040..04e53ca 100644
--- a/README.MD
+++ b/README.MD
@@ -12,6 +12,14 @@
 
 ## Запуск
 
+### Gradle
+
 ```shell
-gradle :server:run
+gradle :server:run --args="--config=config.yml" --project-prop jvmArgs="-Dlogback.configurationFile=logback.xml"
+```
+
+### Jar
+
+```shell
+java -Dlogback.configurationFile=logback.xml -jar server.jar --config=config.yml
 ```
\ No newline at end of file
diff --git a/server/build.gradle b/server/build.gradle
index b4c92f4..4802380 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -13,6 +13,10 @@ apply plugin: 'application'
 
 application {
     mainClassName = 'mc.server.Main'
+
+    if (project.hasProperty('jvmArgs')) {
+        applicationDefaultJvmArgs = List.of((project.jvmArgs as String).split('\\s+'))
+    }
 }
 
 dependencies {
diff --git a/server/src/main/resources/config.yml b/server/src/main/resources/config-sample.yml
similarity index 72%
rename from server/src/main/resources/config.yml
rename to server/src/main/resources/config-sample.yml
index 7bbd46a..c26428c 100644
--- a/server/src/main/resources/config.yml
+++ b/server/src/main/resources/config-sample.yml
@@ -12,6 +12,7 @@ players:
   max-online: 0
   online: 0
 
+# Размер значка: 64x64 px
 icon:
-  enable: true
-  path: src/main/resources/favicon.png
\ No newline at end of file
+  enable: false
+  path: favicon.png
\ No newline at end of file
diff --git a/server/src/main/resources/favicon.png b/server/src/main/resources/favicon.png
deleted file mode 100644
index d512fc5472e1d4b4573ba22b5e3e71587dbd4c9f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1675
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
Vqx`lI%8LL1002ovPDHLkV1m=#{XPHy

diff --git a/server/src/main/resources/logback.xml b/server/src/main/resources/logback-sample.xml
similarity index 100%
rename from server/src/main/resources/logback.xml
rename to server/src/main/resources/logback-sample.xml