Minor fixes

Author: Explv

osbot_manager/src/bot_parameters/configuration/Configuration.java

@@ -2,6 +2,7 @@
 
 import bot_parameters.account.OSBotAccount;
 import bot_parameters.account.RunescapeAccount;
+import bot_parameters.bot.Bot;
 import bot_parameters.interfaces.BotParameter;
 import bot_parameters.interfaces.Copyable;
 import bot_parameters.proxy.Proxy;
@@ -362,7 +363,7 @@ public Configuration createCopy() {
         return configurationCopy;
     }
 
-    public void run(final String osbotPath, final OSBotAccount osBotAccount) throws IOException {
+    public void run(final Bot bot, final OSBotAccount osBotAccount) throws IOException {
 
         File logFile = new File(logFileName);
 
@@ -378,7 +379,7 @@ public void run(final String osbotPath, final OSBotAccount osBotAccount) throws
 
             try (BufferedWriter br = new BufferedWriter(new FileWriter(logFile))) {
 
-                for (final List<String> command : getCommands(osbotPath, osBotAccount)) {
+                for (final List<String> command : getCommands(bot, osBotAccount)) {
 
                     final ProcessBuilder processBuilder = new ProcessBuilder(command);
                     processBuilder.redirectErrorStream(true);
@@ -443,14 +444,14 @@ public void run(final String osbotPath, final OSBotAccount osBotAccount) throws
         runThread.start();
     }
 
-    public List<List<String>> getCommands(final String osbotPath, final OSBotAccount osBotAccount) {
+    public List<List<String>> getCommands(final Bot bot, final OSBotAccount osBotAccount) {
 
         List<List<String>> commands = new ArrayList<>();
 
         for (final Script script : scripts.get()) {
             List<String> command = new ArrayList<>();
 
-            Collections.addAll(command, "java", "-jar", osbotPath);
+            Collections.addAll(command, bot.toParameterString().split(" "));
             Collections.addAll(command, osBotAccount.toParameterString().split(" "));
             Collections.addAll(command, this.toParameterString().split(" "));
             Collections.addAll(command, script.toParameterString().split(" "));

osbot_manager/src/gui/tabs/ConfigurationTab.java

@@ -196,7 +196,7 @@ private void showCommand() {
 
         dialog.getDialogPane().setContent(anchorPane);
 
-        List<List<String>> configCommands = configuration.getCommands(botSettingsTab.getBot().getOsbotPath(), botSettingsTab.getOsBotAccount());
+        List<List<String>> configCommands = configuration.getCommands(botSettingsTab.getBot(), botSettingsTab.getOsBotAccount());
 
         for (List<String> command : configCommands) {
             textArea.appendText(String.join(" ", command) + "\n");
@@ -211,7 +211,7 @@ private void runConfigurations(final List<Configuration> configurations) {
         new Thread(() -> {
             for (final Configuration configuration : configurations) {
                 try {
-                    configuration.run(botSettingsTab.getBot().getOsbotPath(), botSettingsTab.getOsBotAccount());
+                    configuration.run(botSettingsTab.getBot(), botSettingsTab.getOsBotAccount());
                     Thread.sleep(delay * 1000);
                 } catch (InterruptedException e) {
                     e.printStackTrace();

osbot_manager/src/main/Version.java

@@ -8,7 +8,7 @@
 
 public class Version {
 
-    private final static float currentVersion = 7.7f;
+    private final static float currentVersion = 7.8f;
 
     public static boolean isLatestVersion() {
         try {

version

@@ -1 +1 @@
-7.7
+7.8