From 2d072920db9cf7505fcc5a90c532cb99d73e9615 Mon Sep 17 00:00:00 2001 From: Emma Stone Date: Mon, 28 Aug 2017 17:42:45 +0100 Subject: [PATCH 1/5] [BUGFIX] Fixed #setAmountOrNameInput Method is currently setting an `int` into a `String` field. This should fix it --- src/main/java/org/rev317/min/api/methods/Interfaces.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/rev317/min/api/methods/Interfaces.java b/src/main/java/org/rev317/min/api/methods/Interfaces.java index 496f0c7..9bbca50 100644 --- a/src/main/java/org/rev317/min/api/methods/Interfaces.java +++ b/src/main/java/org/rev317/min/api/methods/Interfaces.java @@ -45,8 +45,8 @@ public class Interfaces { * * @param amount Amount to set */ - public static void setAmountOrNameInput(int amount) { - Loader.getClient().setAmountOrNameInput(amount); + public static void setAmountOrNameInput(String text) { + Loader.getClient().setAmountOrNameInput(text); } /** From fab489819a3e45b962d00a6451002eb9a8cfa4f2 Mon Sep 17 00:00:00 2001 From: Emma Stone Date: Mon, 28 Aug 2017 17:52:17 +0100 Subject: [PATCH 2/5] [BUGFIX] Fixed accessor --- src/main/java/org/rev317/min/accessors/Client.java | 2 +- src/main/java/org/rev317/min/api/methods/Interfaces.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/rev317/min/accessors/Client.java b/src/main/java/org/rev317/min/accessors/Client.java index 2d61f4c..0e9822b 100644 --- a/src/main/java/org/rev317/min/accessors/Client.java +++ b/src/main/java/org/rev317/min/accessors/Client.java @@ -20,7 +20,7 @@ public interface Client { void setInterface(int id); - void setAmountOrNameInput(int amount); + void setAmountOrNameInput(String text); int[] getCurrentExp(); diff --git a/src/main/java/org/rev317/min/api/methods/Interfaces.java b/src/main/java/org/rev317/min/api/methods/Interfaces.java index 9bbca50..7a0ed16 100644 --- a/src/main/java/org/rev317/min/api/methods/Interfaces.java +++ b/src/main/java/org/rev317/min/api/methods/Interfaces.java @@ -41,9 +41,9 @@ public class Interfaces { } /** - * Sets the int by the given Amount + * Sets the String by the given Amount * - * @param amount Amount to set + * @param text Amount to set */ public static void setAmountOrNameInput(String text) { Loader.getClient().setAmountOrNameInput(text); From 674e222128ba7fff0c8815c557a26ac4970d212b Mon Sep 17 00:00:00 2001 From: Emma Stone Date: Mon, 28 Aug 2017 18:36:48 +0100 Subject: [PATCH 3/5] [TASK] Version Bump --- .travis.yml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cbb80a9..b30e35f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ notifications: env: global: - - PROVIDER_VERSION=1.21.1 + - PROVIDER_VERSION=1.21.2 cache: directories: diff --git a/pom.xml b/pom.xml index d8b5893..dfcfc82 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.parabot 317-api-minified - 1.21.1 + 1.21.2 Parabot 317-API-Minified From e9d37a98cfca97c167975a9d4639e6f659eb239c Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Mon, 28 Aug 2017 22:41:22 +0200 Subject: [PATCH 4/5] [FEATURE] Added automatic deployments to Maven --- .travis.yml | 10 ++++++++++ .travis/.travis.settings.xml | 12 ++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 .travis/.travis.settings.xml diff --git a/.travis.yml b/.travis.yml index b30e35f..718650b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,6 +46,16 @@ deploy: region: us-west-1 detect_encoding: true acl: public_read + on: + repo: Parabot/Parabot-317-API-Minified + branch: + - master + - development + jdk: 'oraclejdk7' + + - provider: script + script: "cp .travis.settings.xml $HOME/.m2/settings.xml && mvn package javadoc:javadoc deploy site:deploy" + skip_cleanup: true on: repo: Parabot/Parabot-317-API-Minified branch: diff --git a/.travis/.travis.settings.xml b/.travis/.travis.settings.xml new file mode 100644 index 0000000..304c7f5 --- /dev/null +++ b/.travis/.travis.settings.xml @@ -0,0 +1,12 @@ + + + + parabot-maven + ${env.FTP_USERNAME} + ${env.FTP_PASSWORD} + + + \ No newline at end of file From 78d28d685f796f0f99b3a26b58cb02024052abb7 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Mon, 28 Aug 2017 22:42:42 +0200 Subject: [PATCH 5/5] [BUGFIX] Only set deployment on master --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 718650b..2434f67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,5 +60,4 @@ deploy: repo: Parabot/Parabot-317-API-Minified branch: - master - - development jdk: 'oraclejdk7' \ No newline at end of file