diff --git a/.gitignore b/.gitignore index 8cde92a..1631aca 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ build/mapping.pro build/production/* build/test/* -buildnumber +!buildnumber Launcher.jar LaunchServer.jar diff --git a/LaunchServer/resources/launchserver/defaults/profile1.16.cfg b/LaunchServer/resources/launchserver/defaults/profile1.16.cfg new file mode 100644 index 0000000..bd19480 --- /dev/null +++ b/LaunchServer/resources/launchserver/defaults/profile1.16.cfg @@ -0,0 +1,43 @@ +version: "1.16"; +assetIndex: "1.16"; + +# Runtime-dependent params +dir: "XXXXX"; +assetDir: "asset1.16"; + +# Client params +sortIndex: 0; +title: "XXXXX"; +serverAddress: "server.tld"; +serverPort: 25565; + +# Updater and client watch service +updateFastCheck: true; +update: [ + "servers\\.dat" +]; +updateVerify: [ + "libraries", "natives", + "minecraft\\.jar" +]; +updateExclusions: []; + +# Client launcher params +mainClass: "net.minecraft.client.main.Main"; +classPath: [ "minecraft.jar", "libraries" ]; +jvmArgs: [ + # Some options from Mojang's launcher + "-XX:+UseG1GC", + "-XX:+UnlockExperimentalVMOptions", + "-XX:G1NewSizePercent=20", + "-XX:G1ReservePercent=20", + "-XX:MaxGCPauseMillis=50", + "-XX:G1HeapRegionSize=32M", + + # Some options from me + "-XX:+AlwaysPreTouch", + "-XX:-TieredCompilation", + "-XX:+DisableAttachMechanism" +]; +clientArgs: [ +]; diff --git a/build.sh b/build.sh index 62e2e4c..c5ce5fd 100644 --- a/build.sh +++ b/build.sh @@ -1,8 +1,8 @@ #!/bin/sh # История одного buildnumber -echo -n $(($(cat buildnumber | cut -d ',' -f 1)+1)), $(date +'%d.%m.%Y') > buildnumber.txt -mv buildnumber.txt buildnumber +#echo -n $(($(cat buildnumber | cut -d ',' -f 1)+1)), $(date +'%d.%m.%Y') > buildnumber.txt +#mv buildnumber.txt buildnumber # Build Launcher.jar echo Building Launcher.jar... diff --git a/buildnumber b/buildnumber new file mode 100644 index 0000000..8cc39e2 --- /dev/null +++ b/buildnumber @@ -0,0 +1 @@ +1.3.0, 23.06.2020 \ No newline at end of file