Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-12-23 09:01:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

Перевод конфигов на Json часть 5

Browse source 
Правки рантайма
Комплируется, пока не работает
This commit is contained in:
Gravit 2018-12-23 23:47:07 +07:00
parent 123250246c
commit 2c06cdec24
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
2 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java
View file

@ -1,6 +1,7 @@
package ru.gravit.launchserver; package ru.gravit.launchserver;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import com.google.gson.annotations.Expose;
import ru.gravit.launcher.Launcher; import ru.gravit.launcher.Launcher;
import ru.gravit.launcher.LauncherConfig; import ru.gravit.launcher.LauncherConfig;
import ru.gravit.launcher.hasher.HashedDir; import ru.gravit.launcher.hasher.HashedDir;
@ -89,7 +90,9 @@ public static final class Config {
public String[] mirrors; public String[] mirrors;
public String binaryName; public String binaryName;
@Expose
private String address; private String address;
@Expose
private String bindAddress; private String bindAddress;
public LauncherConfig.LauncherEnvironment env; public LauncherConfig.LauncherEnvironment env;
public boolean isWarningMissArchJava; public boolean isWarningMissArchJava;
@ -301,6 +304,7 @@ public LaunchServer(Path dir) throws IOException, InvalidKeySpecException {
modulesManager.autoload(dir.resolve("modules")); modulesManager.autoload(dir.resolve("modules"));
modulesManager.preInitModules(); modulesManager.preInitModules();
initGson(); initGson();
LogHelper.setStacktraceEnabled(true);
// Read LaunchServer config // Read LaunchServer config
generateConfigIfNotExists(); generateConfigIfNotExists();
@ -356,6 +360,7 @@ public static void initGson()
{ {
if(Launcher.gson != null) return; if(Launcher.gson != null) return;
Launcher.gsonBuilder = new GsonBuilder(); Launcher.gsonBuilder = new GsonBuilder();
Launcher.gsonBuilder.setPrettyPrinting();
Launcher.gson = Launcher.gsonBuilder.create(); Launcher.gson = Launcher.gsonBuilder.create();
} }
@ -402,10 +407,14 @@ private void generateConfigIfNotExists() throws IOException {
// Create new config // Create new config
LogHelper.info("Creating LaunchServer config"); LogHelper.info("Creating LaunchServer config");
Config newConfig; Config newConfig = new Config();
try (BufferedReader reader = IOHelper.newReader(IOHelper.getResourceURL("ru/gravit/launchserver/defaults/config.cfg"))) { newConfig.mirrors = new String[]{"http://mirror.gravitlauncher.ml"};
newConfig = Launcher.gson.fromJson(reader,Config.class); newConfig.launch4j = new ExeConf();
} newConfig.buildPostTransform = new PostBuildTransformConf();
newConfig.env = LauncherConfig.LauncherEnvironment.STD;
//try (BufferedReader reader = IOHelper.newReader(IOHelper.getResourceURL("ru/gravit/launchserver/defaults/config.cfg"))) {
// newConfig = Launcher.gson.fromJson(reader,Config.class);
//}
// Set server address // Set server address
LogHelper.println("LaunchServer address: "); LogHelper.println("LaunchServer address: ");

12
Launcher/runtime/engine/api.js
View file

@ -45,18 +45,6 @@ var SignedBytesHolder = SignedBytesHolderClass.static;
var SignedObjectHolder = SignedObjectHolderClass.static; var SignedObjectHolder = SignedObjectHolderClass.static;
var EnumSerializer = EnumSerializerClass.static; var EnumSerializer = EnumSerializerClass.static;
// Config serialization class bindings
var ConfigObject = ConfigObjectClass.static;
var ConfigObjectAdapter = ConfigObjectAdapterClass.static;
var BlockConfigEntry = BlockConfigEntryClass.static;
var BooleanConfigEntry = BooleanConfigEntryClass.static;
var IntegerConfigEntry = IntegerConfigEntryClass.static;
var ListConfigEntry = ListConfigEntryClass.static;
var StringConfigEntry = StringConfigEntryClass.static;
var ConfigEntryType = ConfigEntryTypeClass.static;
var TextConfigReader = TextConfigReaderClass.static;
var TextConfigWriter = TextConfigWriterClass.static;
// Helper class API imports // Helper class API imports
var CommonHelper = CommonHelperClass.static; var CommonHelper = CommonHelperClass.static;
var IOHelper = IOHelperClass.static; var IOHelper = IOHelperClass.static;