From fe7594667cf6ae2dab42b7d8fd40cf71428ba297 Mon Sep 17 00:00:00 2001 From: CDAGaming Date: Thu, 11 Jan 2018 16:26:13 -0600 Subject: [PATCH] Code Cleanup + Deprecated Method Replacement --- .../mumfrey/liteloader/installer/actions/ClientAction.java | 3 +-- .../liteloader/installer/actions/ClientInstallAction.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/mumfrey/liteloader/installer/actions/ClientAction.java b/src/main/java/com/mumfrey/liteloader/installer/actions/ClientAction.java index 3899469..7f04577 100644 --- a/src/main/java/com/mumfrey/liteloader/installer/actions/ClientAction.java +++ b/src/main/java/com/mumfrey/liteloader/installer/actions/ClientAction.java @@ -82,8 +82,7 @@ protected boolean extractLibraries(File target, IInstallerMonitor monitor) throw { File libraries = new File(target, "libraries"); File targetLibraryFile = VersionInfo.getLibraryPath(libraries); - if (!this.extractLibrary(targetLibraryFile, VersionInfo.getContainedFile())) return false; - return true; + return this.extractLibrary(targetLibraryFile, VersionInfo.getContainedFile()); } protected final boolean extractLibrary(File targetLibraryFile, String containedFile) throws HeadlessException diff --git a/src/main/java/com/mumfrey/liteloader/installer/actions/ClientInstallAction.java b/src/main/java/com/mumfrey/liteloader/installer/actions/ClientInstallAction.java index 600a642..4be52bb 100644 --- a/src/main/java/com/mumfrey/liteloader/installer/actions/ClientInstallAction.java +++ b/src/main/java/com/mumfrey/liteloader/installer/actions/ClientInstallAction.java @@ -334,7 +334,7 @@ private boolean writeVersionFile(List modifiers, File vers return true; } - private JsonNode readLauncherProfiles(File launcherProfiles) throws HeadlessException, RuntimeException + private JsonNode readLauncherProfiles(File launcherProfiles) throws RuntimeException { JdomParser parser = new JdomParser(); JsonNode jsonProfileData; @@ -353,7 +353,7 @@ private JsonNode readLauncherProfiles(File launcherProfiles) throws HeadlessExce } catch (Exception e) { - throw Throwables.propagate(e); + throw new RuntimeException(e); } return jsonProfileData; }