Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2025-04-03 23:11:57 +03:00
Code Issues Projects Releases Packages Wiki Activity

Final fixes.

Browse source
This commit is contained in:
zaxar163 2019-01-06 21:27:13 +04:00
parent 6fec76c07f
commit 9286fed583
No known key found for this signature in database
GPG key ID: CEE900027AE098E0
2 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/UnpackBuildTask.java
View file

@ -11,9 +11,11 @@
public class UnpackBuildTask implements LauncherBuildTask { public class UnpackBuildTask implements LauncherBuildTask {
private final LaunchServer server; private final LaunchServer server;
private final Path result;
public UnpackBuildTask(LaunchServer server) { public UnpackBuildTask(LaunchServer server) {
this.server = server; this.server = server;
result = server.dir.resolve(server.config.binaryName + "-clean.jar");
} }
@Override @Override
@ -23,9 +25,8 @@ public String getName() {
@Override @Override
public Path process(Path inputFile) throws IOException { public Path process(Path inputFile) throws IOException {
Path result = server.dir.resolve(server.config.binaryName + "-clean.jar"); UnpackHelper.unpack(IOHelper.getResourceURL("Launcher.jar"), result);
URL url = IOHelper.getResourceURL("Launcher.jar"); tryUnpack();
UnpackHelper.unpack(url, result);
return result; return result;
} }

34
LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/config.cfg
View file

@ -1,14 +1,22 @@
{ {
"port": 7240, "port": 7240,
"authHandler": { "address": "xx.xx",
"type": "memory" "bindAddress": "0.0.0.0",
}, "projectName": "XXX",
"mirrors": [
"http://mirror.gravitlauncher.ml/"
],
"binaryName": "Launcher",
"env": "STD",
"authProvider": [ "authProvider": [
{ {
"message": "Настройте authProvider", "message": "Настройте authProvider",
"type": "reject" "type": "reject"
} }
], ],
"authHandler": {
"type": "memory"
},
"permissionsHandler": { "permissionsHandler": {
"filename": "permissions.json", "filename": "permissions.json",
"type": "json" "type": "json"
@ -21,12 +29,14 @@
"hwidHandler": { "hwidHandler": {
"type": "accept" "type": "accept"
}, },
"threadCount": 0, "threadCount": 2,
"threadCoreCount": 0, "threadCoreCount": 0,
"launch4j": { "launch4j": {
"enabled": false, "enabled": false,
"fileDesc": "GravitLauncher 4.1.0", "productName": "GravitLauncher",
"fileVer": "4.1.0", "productVer": "4.2.0.0",
"fileDesc": "GravitLauncher 4.2.0",
"fileVer": "4.2.0.0",
"internalName": "Launcher", "internalName": "Launcher",
"copyright": "© GravitLauncher Team", "copyright": "© GravitLauncher Team",
"trademarks": "This product is licensed under GPLv3", "trademarks": "This product is licensed under GPLv3",
@ -44,12 +54,8 @@
"genMappings": false, "genMappings": false,
"isUsingWrapper": false, "isUsingWrapper": false,
"isDownloadJava": false, "isDownloadJava": false,
"mirrors": [ "isWarningMissArchJava": false,
"http://mirror.gravitlauncher.ml/" "enabledProGuard": true,
], "stripLineNumbers": true,
"binaryName": "Launcher", "startScript": ".\\start.sh"
"address": "localhost",
"bindAddress": "0.0.0.0",
"env": "STD",
"isWarningMissArchJava": false
} }