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 d512fc5..0000000 Binary files a/server/src/main/resources/favicon.png and /dev/null differ 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