Skip to content
This repository was archived by the owner on Feb 9, 2022. It is now read-only.

Commit cd6b08e

Browse files
ExplvExplv
authored andcommitted
- Use semantic versioning
- Fix bug with OSBot account not being set - Fix bug with incorrect OSBot path
1 parent 4d98acb commit cd6b08e

File tree

5 files changed

+10
-4
lines changed

5 files changed

+10
-4
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>org.explv.explv_osbot_manager</groupId>
88
<artifactId>explv_osbot_manager</artifactId>
9-
<version>8.3</version>
9+
<version>v2.0.0</version>
1010
<repositories>
1111
<repository>
1212
<id>local-repo</id>

src/main/java/bot_parameters/account/Account.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ public abstract class Account implements Serializable {
1313

1414
protected SimpleStringProperty username, password;
1515

16-
public Account() {}
16+
public Account() {
17+
this.username = new SimpleStringProperty();
18+
this.password = new SimpleStringProperty();
19+
}
1720

1821
public Account(final String username, final String password) {
1922
this.username = new SimpleStringProperty(username);

src/main/java/bot_parameters/configuration/Configuration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,8 @@ public List<List<String>> getCommands() {
432432
for (final Script script : scripts.get()) {
433433
List<String> command = new ArrayList<>();
434434

435-
Collections.addAll(command, "java", "-jar", OSBotClient.getLatestLocalVersion().get());
435+
Collections.addAll(command, "java", "-jar");
436+
Collections.addAll(command, Paths.get(Settings.OSBOT_CLIENT_DIR, OSBotClient.getLatestLocalVersion().get()).toString());
436437
Collections.addAll(command, OSBotAccount.getInstance().toParameter());
437438
Collections.addAll(command, this.toParameter());
438439
Collections.addAll(command, script.toParameter());

src/main/java/gui/tabs/BotSettingsTab.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,11 @@ public BotSettingsTab() {
5050

5151
public void setOsbotUsername(final String username) {
5252
usernameField.setText(username);
53+
OSBotAccount.getInstance().setUsername(username);
5354
}
5455

5556
public void setOsbotPassword(final String password) {
5657
passwordField.setText(password);
58+
OSBotAccount.getInstance().setPassword(password);
5759
}
5860
}

version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.3
1+
v2.0.0

0 commit comments

Comments
 (0)