Upstream/SKCraft-Launcher
1
0
Fork 0
mirror of https://github.com/SKCraft/Launcher.git synced 2025-01-21 21:31:32 +01:00
Code Issues Projects Releases Wiki Activity

Fix misspelled field in launcher configuration

Browse Source
This commit is contained in:
Henry Le Grys 2021-01-30 01:46:22 +00:00
parent 52c02edba0
commit 27da4e8e4c
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
launcher/src/main/java/com/skcraft/launcher/Configuration.java
View File

@ -28,7 +28,7 @@ public class Configuration {
private int maxMemory = 0; // Updated in Launcher private int maxMemory = 0; // Updated in Launcher
private int permGen = 256; private int permGen = 256;
private int windowWidth = 854; private int windowWidth = 854;
private int widowHeight = 480; private int windowHeight = 480;
private boolean proxyEnabled = false; private boolean proxyEnabled = false;
private String proxyHost = "localhost"; private String proxyHost = "localhost";
private int proxyPort = 8080; private int proxyPort = 8080;
@ -49,4 +49,10 @@ public class Configuration {
return super.hashCode(); return super.hashCode();
} }
/**
* Backwards compatibility for old configs with the misspelling.
*/
public void setWidowHeight(int height) {
this.windowHeight = height;
}
} }

4
launcher/src/main/java/com/skcraft/launcher/dialog/ConfigurationDialog.java
View File

@ -8,8 +8,8 @@ package com.skcraft.launcher.dialog;
import com.skcraft.launcher.Configuration; import com.skcraft.launcher.Configuration;
import com.skcraft.launcher.Launcher; import com.skcraft.launcher.Launcher;
import com.skcraft.launcher.swing.*;
import com.skcraft.launcher.persistence.Persistence; import com.skcraft.launcher.persistence.Persistence;
import com.skcraft.launcher.swing.*;
import com.skcraft.launcher.util.SharedLocale; import com.skcraft.launcher.util.SharedLocale;
import lombok.NonNull; import lombok.NonNull;
@ -76,7 +76,7 @@ public class ConfigurationDialog extends JDialog {
mapper.map(maxMemorySpinner, "maxMemory"); mapper.map(maxMemorySpinner, "maxMemory");
mapper.map(permGenSpinner, "permGen"); mapper.map(permGenSpinner, "permGen");
mapper.map(widthSpinner, "windowWidth"); mapper.map(widthSpinner, "windowWidth");
mapper.map(heightSpinner, "widowHeight"); mapper.map(heightSpinner, "windowHeight");
mapper.map(useProxyCheck, "proxyEnabled"); mapper.map(useProxyCheck, "proxyEnabled");
mapper.map(proxyHostText, "proxyHost"); mapper.map(proxyHostText, "proxyHost");
mapper.map(proxyPortText, "proxyPort"); mapper.map(proxyPortText, "proxyPort");

4
launcher/src/main/java/com/skcraft/launcher/launch/Runner.java
View File

@ -358,7 +358,7 @@ public class Runner implements Callable<Process>, ProgressObservable {
args.add("--width"); args.add("--width");
args.add(String.valueOf(config.getWindowWidth())); args.add(String.valueOf(config.getWindowWidth()));
args.add("--height"); args.add("--height");
args.add(String.valueOf(config.getWidowHeight())); args.add(String.valueOf(config.getWindowHeight()));
} }
// Add old platform hacks that the new manifests already specify // Add old platform hacks that the new manifests already specify
@ -400,7 +400,7 @@ public class Runner implements Callable<Process>, ProgressObservable {
map.put("assets_index_name", versionManifest.getAssetId()); map.put("assets_index_name", versionManifest.getAssetId());
map.put("resolution_width", String.valueOf(config.getWindowWidth())); map.put("resolution_width", String.valueOf(config.getWindowWidth()));
map.put("resolution_height", String.valueOf(config.getWidowHeight())); map.put("resolution_height", String.valueOf(config.getWindowHeight()));
map.put("launcher_name", launcher.getTitle()); map.put("launcher_name", launcher.getTitle());
map.put("launcher_version", launcher.getVersion()); map.put("launcher_version", launcher.getVersion());