Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2025-01-10 01:29:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

Очень странный Баг с NPE

Browse source
This commit is contained in:
Gravit 2018-11-29 00:16:38 +07:00
parent b175388465
commit 637867dbc8
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
5 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -123,8 +123,7 @@ public JARLauncherBinary(LaunchServer server) throws IOException {
runtimeDir = server.dir.resolve(Launcher.RUNTIME_DIR); runtimeDir = server.dir.resolve(Launcher.RUNTIME_DIR);
guardDir = server.dir.resolve("guard"); guardDir = server.dir.resolve("guard");
initScriptFile = runtimeDir.resolve(Launcher.INIT_SCRIPT_FILE); initScriptFile = runtimeDir.resolve(Launcher.INIT_SCRIPT_FILE);
obfJar = server.config.buildPostTransform.enabled ? server.dir.resolve(server.config.binaryName + "-obf.jar") obfJar = syncBinaryFile;
: syncBinaryFile;
tryUnpackRuntime(); tryUnpackRuntime();
} }
@ -179,8 +178,8 @@ public void build() throws IOException {
} }
} }
} }
if (server.config.buildPostTransform.enabled) //if (server.config.buildPostTransform.enabled)
transformedBuild(); // transformedBuild();
} }
private void transformedBuild() throws IOException { private void transformedBuild() throws IOException {

1
Launcher/runtime/dialog/overlay/settings/settings.js
View file

@ -169,6 +169,7 @@ var settingsOverlay = {
settingsOverlay.dirLabel.setText(IOHelper.toString(settings.updatesDir)); settingsOverlay.dirLabel.setText(IOHelper.toString(settings.updatesDir));
} }
}; };
LogHelper.debug("Dir: %s", DirBridge.dir);
var settings = new settingsClass; var settings = new settingsClass;
/* ====================== CLI PARAMS ===================== */ /* ====================== CLI PARAMS ===================== */
var cliParams = { var cliParams = {

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

@ -2,7 +2,7 @@ var Launcher = LauncherClass.static;
var LauncherConfig = LauncherConfigClass.static; var LauncherConfig = LauncherConfigClass.static;
var HTTPRequest = HTTPRequestClass.static; var HTTPRequest = HTTPRequestClass.static;
var DirBridge = DirBridgeClass.static; var DirBridge = DirBridgeClass.static;
var FunctionalBridge = FunctionalBridgeClass.class; var FunctionalBridge = FunctionalBridgeClass.static;
// Hasher class API imports // Hasher class API imports
var PlayerProfile = PlayerProfileClass.static; var PlayerProfile = PlayerProfileClass.static;

1
Launcher/src/main/java/ru/gravit/launcher/JSApplication.java
View file

@ -3,7 +3,6 @@
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import javafx.application.Application; import javafx.application.Application;
import ru.gravit.launcher.LauncherAPI;
@SuppressWarnings("AbstractClassNeverImplemented") @SuppressWarnings("AbstractClassNeverImplemented")
public abstract class JSApplication extends Application { public abstract class JSApplication extends Application {

2
Launcher/src/main/java/ru/gravit/launcher/LauncherEngine.java
View file

@ -204,6 +204,7 @@ private void setScriptBindings() {
@LauncherAPI @LauncherAPI
public void start(String... args) throws Throwable { public void start(String... args) throws Throwable {
LogHelper.debug("%d", LauncherSettings.settingsMagic);
Launcher.modulesManager = new ClientModuleManager(this); Launcher.modulesManager = new ClientModuleManager(this);
LauncherConfig.getAutogenConfig().initModules(); //INIT LauncherConfig.getAutogenConfig().initModules(); //INIT
Launcher.modulesManager.preInitModules(); Launcher.modulesManager.preInitModules();
@ -216,6 +217,7 @@ public void start(String... args) throws Throwable {
CommonHelper.newThread("FX Task Worker", true, FunctionalBridge.worker); CommonHelper.newThread("FX Task Worker", true, FunctionalBridge.worker);
loadScript(Launcher.API_SCRIPT_FILE); loadScript(Launcher.API_SCRIPT_FILE);
loadScript(Launcher.CONFIG_SCRIPT_FILE); loadScript(Launcher.CONFIG_SCRIPT_FILE);
LogHelper.debug("Dir: %s", DirBridge.dir);
loadScript(Launcher.INIT_SCRIPT_FILE); loadScript(Launcher.INIT_SCRIPT_FILE);
LogHelper.info("Invoking start() function"); LogHelper.info("Invoking start() function");
Invocable invoker = (Invocable) engine; Invocable invoker = (Invocable) engine;