diff --git a/.idea/libraries/Maven__net_ess3_Essentials_2_13_1.xml b/.idea/libraries/Maven__net_ess3_Essentials_2_13_1.xml
deleted file mode 100644
index bbc5141..0000000
--- a/.idea/libraries/Maven__net_ess3_Essentials_2_13_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 808d9b0..1d962ae 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ language: java
jdk:
- oraclejdk8
sudo: true
+dist: trusty # Needed for Java 8, although we might not need Java 8
deploy:
# deploy develop to the staging environment
- provider: script
diff --git a/BuildConfigUpdater/BuildConfigUpdater.iml b/BuildConfigUpdater/BuildConfigUpdater.iml
index 31ba17d..df2c815 100644
--- a/BuildConfigUpdater/BuildConfigUpdater.iml
+++ b/BuildConfigUpdater/BuildConfigUpdater.iml
@@ -12,7 +12,6 @@
-
diff --git a/ButtonCore/ButtonCore (1) (com.github.TBMCPlugins.ButtonCore).iml b/ButtonCore/ButtonCore (1) (com.github.TBMCPlugins.ButtonCore).iml
index fbd4f39..25360d4 100644
--- a/ButtonCore/ButtonCore (1) (com.github.TBMCPlugins.ButtonCore).iml
+++ b/ButtonCore/ButtonCore (1) (com.github.TBMCPlugins.ButtonCore).iml
@@ -28,9 +28,17 @@
-
+
-
+
+
+
+
+
+
+
+
+
diff --git a/ButtonCore/pom.xml b/ButtonCore/pom.xml
index 088389a..8cc0204 100755
--- a/ButtonCore/pom.xml
+++ b/ButtonCore/pom.xml
@@ -165,7 +165,7 @@
org.projectlombok
lombok
- 1.16.16
+ 1.18.8
provided
@@ -176,8 +176,8 @@
net.ess3
- Essentials
- 2.13.1
+ EssentialsX
+ 2.17.1
provided
diff --git a/ButtonCore/src/test/java/buttondevteam/core/PlayerDataTest.java b/ButtonCore/src/test/java/buttondevteam/core/PlayerDataTest.java
index ecfd4ac..1b9c808 100755
--- a/ButtonCore/src/test/java/buttondevteam/core/PlayerDataTest.java
+++ b/ButtonCore/src/test/java/buttondevteam/core/PlayerDataTest.java
@@ -31,26 +31,29 @@ public class PlayerDataTest extends TestCase {
public void testConfig() throws Exception {
TestPrepare.PrepareServer();
//FileUtils.deleteDirectory(new File(ChromaGamerBase.TBMC_PLAYERS_DIR));
- Files.walkFileTree(new File(ChromaGamerBase.TBMC_PLAYERS_DIR).toPath(), new SimpleFileVisitor() {
- @Override
- public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
- throws IOException {
- Files.delete(file);
- return FileVisitResult.CONTINUE;
- }
-
- @Override
- public FileVisitResult postVisitDirectory(Path dir, IOException e)
- throws IOException {
- if (e == null) {
- Files.delete(dir);
+ File file = new File(ChromaGamerBase.TBMC_PLAYERS_DIR);
+ if (file.exists()) {
+ Files.walkFileTree(file.toPath(), new SimpleFileVisitor() {
+ @Override
+ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
+ throws IOException {
+ Files.delete(file);
return FileVisitResult.CONTINUE;
- } else {
- // directory iteration failed
- throw e;
}
- }
- });
+
+ @Override
+ public FileVisitResult postVisitDirectory(Path dir, IOException e)
+ throws IOException {
+ if (e == null) {
+ Files.delete(dir);
+ return FileVisitResult.CONTINUE;
+ } else {
+ // directory iteration failed
+ throw e;
+ }
+ }
+ });
+ }
UUID uuid = new UUID(0L, 0L);
try (TestPlayerClass p = TBMCPlayerBase.getPlayer(uuid, TestPlayerClass.class)) {
p.PlayerName().set("Test");
diff --git a/ButtonProcessor/ButtonProcessor.iml b/ButtonProcessor/ButtonProcessor.iml
index 35bfd14..b606543 100755
--- a/ButtonProcessor/ButtonProcessor.iml
+++ b/ButtonProcessor/ButtonProcessor.iml
@@ -13,6 +13,8 @@
+
+