diff --git a/build.gradle b/build.gradle index dd2022a..061ef46 100644 --- a/build.gradle +++ b/build.gradle @@ -7,8 +7,8 @@ plugins { } group 'tech.nevets.jaml' -version '0.7.0' -def build = 'stable' +version '0.7.1' +def build = 'dev' repositories { mavenCentral() diff --git a/jaml-installer.iss b/jaml-installer.iss new file mode 100644 index 0000000..ff2bc74 --- /dev/null +++ b/jaml-installer.iss @@ -0,0 +1,60 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! + +#define MyAppName "JAML" +#define MyAppPublisher "SteveO718" +#define MyAppURL "https://git.nevets.tech/Steven/JAML" +#define MyAppExeName "JAML.exe" +#define MyAppAssocName MyAppName + " File" +#define MyAppAssocExt ".jml" +#define MyAppAssocKey StringChange(MyAppAssocName, " ", "") + MyAppAssocExt + +[Setup] +; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications. +; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) +AppId={{E0FCA533-713D-42DB-884C-94A856D9E220} +AppName={#MyAppName} +AppVersion={#MyAppVersion} +AppPublisher={#MyAppPublisher} +AppPublisherURL={#MyAppURL} +AppSupportURL={#MyAppURL} +AppUpdatesURL={#MyAppURL} +DefaultDirName={userappdata}\.jaml +ChangesAssociations=yes +DisableProgramGroupPage=yes +LicenseFile=/opt/Licenses/GPL.txt +; Remove the following line to run in administrative install mode (install for all users.) +PrivilegesRequired=lowest +PrivilegesRequiredOverridesAllowed=dialog +OutputDir=./installer +OutputBaseFilename=JAML-Installer +SetupIconFile=./src/main/resources/assets/icon.ico +Compression=lzma +SolidCompression=yes +WizardStyle=modern + +[Languages] +Name: "english"; MessagesFile: "compiler:Default.isl" + +[Tasks] +Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked + +[Files] +Source: "./build/launch4j/{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion +Source: "./jre/*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +; NOTE: Don't use "Flags: ignoreversion" on any shared system files + +[Registry] +Root: HKA; Subkey: "Software\Classes\{#MyAppAssocExt}\OpenWithProgids"; ValueType: string; ValueName: "{#MyAppAssocKey}"; ValueData: ""; Flags: uninsdeletevalue +Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}"; ValueType: string; ValueName: ""; ValueData: "{#MyAppAssocName}"; Flags: uninsdeletekey +Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#MyAppExeName},0" +Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1""" +Root: HKA; Subkey: "Software\Classes\Applications\{#MyAppExeName}\SupportedTypes"; ValueType: string; ValueName: ".jml"; ValueData: "" + +[Icons] +Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" +Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon + +[Run] +Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent + diff --git a/src/main/java/tech/nevets/jaml/gui/FirstLoginGui.java b/src/main/java/tech/nevets/jaml/gui/FirstLoginGui.java index aea3461..0269e03 100644 --- a/src/main/java/tech/nevets/jaml/gui/FirstLoginGui.java +++ b/src/main/java/tech/nevets/jaml/gui/FirstLoginGui.java @@ -66,7 +66,7 @@ public class FirstLoginGui extends JFrame { loaderLabel.setBounds(10, 140, 84, 31); contentPane.add(loaderLabel); - JComboBox loaderDropdown = new JComboBox(LoaderUtils.loaders); + JComboBox loaderDropdown = new JComboBox<>(LoaderUtils.getLoaders()); loaderDropdown.setBounds(94, 144, 231, 23); contentPane.add(loaderDropdown); diff --git a/src/main/java/tech/nevets/jaml/gui/NewProfileGui.java b/src/main/java/tech/nevets/jaml/gui/NewProfileGui.java index 8b9bfbf..3d82a23 100644 --- a/src/main/java/tech/nevets/jaml/gui/NewProfileGui.java +++ b/src/main/java/tech/nevets/jaml/gui/NewProfileGui.java @@ -69,7 +69,7 @@ public class NewProfileGui extends JFrame { loaderLabel.setBounds(10, 140, 84, 31); contentPane.add(loaderLabel); - JComboBox loaderDropdown = new JComboBox(LoaderUtils.loaders); + JComboBox loaderDropdown = new JComboBox<>(LoaderUtils.getLoaders()); loaderDropdown.setBounds(94, 144, 231, 23); contentPane.add(loaderDropdown); diff --git a/src/main/java/tech/nevets/jaml/gui/StartupGui.java b/src/main/java/tech/nevets/jaml/gui/StartupGui.java index d9d4cc6..18af643 100644 --- a/src/main/java/tech/nevets/jaml/gui/StartupGui.java +++ b/src/main/java/tech/nevets/jaml/gui/StartupGui.java @@ -62,7 +62,6 @@ public class StartupGui extends JFrame { makeDirs(); smoothIncrease(progressBar, 20); currentTaskLabel.setText("Loading Config..."); - currentTaskLabel.repaint(); Config.loadConfig(); smoothIncrease(progressBar, 40); currentTaskLabel.setText("Loading Profiles..."); diff --git a/src/main/java/tech/nevets/jaml/util/LoaderUtils.java b/src/main/java/tech/nevets/jaml/util/LoaderUtils.java index 8733310..2e5429e 100644 --- a/src/main/java/tech/nevets/jaml/util/LoaderUtils.java +++ b/src/main/java/tech/nevets/jaml/util/LoaderUtils.java @@ -13,7 +13,6 @@ import java.net.URL; import java.nio.charset.StandardCharsets; public class LoaderUtils { - public static String[] loaders; public static String[] getLoaders() { try { @@ -28,7 +27,6 @@ public class LoaderUtils { loadersArrayList[i] = loadersArray[i].getId(); } - loaders = loadersArrayList; return loadersArrayList; } catch (IOException e) {