diff --git a/pom.xml b/pom.xml
index 1b30189c7..968e44c6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -304,8 +304,8 @@
fr.xephi.authme.libs.jalu.injector
- com.github.authme.configme
- fr.xephi.authme.libs.authme.configme
+ ch.jalu.configme
+ fr.xephi.authme.libs.jalu.configme
com.zaxxer.hikari
@@ -900,9 +900,9 @@
- com.github.authme
+ ch.jalu
configme
- 0.2.1
+ 0.3
compile
true
@@ -933,7 +933,7 @@
org.mockito
mockito-core
test
- 2.2.27
+ 2.4.1
hamcrest-core
diff --git a/src/main/java/fr/xephi/authme/initialization/SettingsProvider.java b/src/main/java/fr/xephi/authme/initialization/SettingsProvider.java
index f9c8638af..e5e69e667 100644
--- a/src/main/java/fr/xephi/authme/initialization/SettingsProvider.java
+++ b/src/main/java/fr/xephi/authme/initialization/SettingsProvider.java
@@ -1,8 +1,8 @@
package fr.xephi.authme.initialization;
-import com.github.authme.configme.knownproperties.ConfigurationData;
-import com.github.authme.configme.resource.PropertyResource;
-import com.github.authme.configme.resource.YamlFileResource;
+import ch.jalu.configme.configurationdata.ConfigurationData;
+import ch.jalu.configme.resource.PropertyResource;
+import ch.jalu.configme.resource.YamlFileResource;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.settings.SettingsMigrationService;
import fr.xephi.authme.settings.properties.AuthMeSettingsRetriever;
diff --git a/src/main/java/fr/xephi/authme/service/CommonService.java b/src/main/java/fr/xephi/authme/service/CommonService.java
index 1b1d9593b..c181f83b0 100644
--- a/src/main/java/fr/xephi/authme/service/CommonService.java
+++ b/src/main/java/fr/xephi/authme/service/CommonService.java
@@ -1,6 +1,6 @@
package fr.xephi.authme.service;
-import com.github.authme.configme.properties.Property;
+import ch.jalu.configme.properties.Property;
import fr.xephi.authme.message.MessageKey;
import fr.xephi.authme.message.Messages;
import fr.xephi.authme.permission.AuthGroupHandler;
diff --git a/src/main/java/fr/xephi/authme/service/MessageUpdater.java b/src/main/java/fr/xephi/authme/service/MessageUpdater.java
index 036ad9fda..67cfe617e 100644
--- a/src/main/java/fr/xephi/authme/service/MessageUpdater.java
+++ b/src/main/java/fr/xephi/authme/service/MessageUpdater.java
@@ -1,10 +1,10 @@
package fr.xephi.authme.service;
-import com.github.authme.configme.SettingsManager;
-import com.github.authme.configme.knownproperties.ConfigurationData;
-import com.github.authme.configme.properties.Property;
-import com.github.authme.configme.properties.StringProperty;
-import com.github.authme.configme.resource.YamlFileResource;
+import ch.jalu.configme.SettingsManager;
+import ch.jalu.configme.configurationdata.ConfigurationData;
+import ch.jalu.configme.properties.Property;
+import ch.jalu.configme.properties.StringProperty;
+import ch.jalu.configme.resource.YamlFileResource;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.message.MessageKey;
import fr.xephi.authme.util.FileUtils;
diff --git a/src/main/java/fr/xephi/authme/service/ValidationService.java b/src/main/java/fr/xephi/authme/service/ValidationService.java
index c6cdd99a1..8ef7b1daa 100644
--- a/src/main/java/fr/xephi/authme/service/ValidationService.java
+++ b/src/main/java/fr/xephi/authme/service/ValidationService.java
@@ -1,6 +1,6 @@
package fr.xephi.authme.service;
-import com.github.authme.configme.properties.Property;
+import ch.jalu.configme.properties.Property;
import fr.xephi.authme.datasource.DataSource;
import fr.xephi.authme.initialization.Reloadable;
import fr.xephi.authme.message.MessageKey;
diff --git a/src/main/java/fr/xephi/authme/settings/EnumSetProperty.java b/src/main/java/fr/xephi/authme/settings/EnumSetProperty.java
index 8b1fa7893..66def52b4 100644
--- a/src/main/java/fr/xephi/authme/settings/EnumSetProperty.java
+++ b/src/main/java/fr/xephi/authme/settings/EnumSetProperty.java
@@ -1,7 +1,7 @@
package fr.xephi.authme.settings;
-import com.github.authme.configme.SettingsManager;
-import com.github.authme.configme.properties.StringListProperty;
+import ch.jalu.configme.SettingsManager;
+import ch.jalu.configme.properties.StringListProperty;
import java.util.List;
import java.util.Set;
diff --git a/src/main/java/fr/xephi/authme/settings/Settings.java b/src/main/java/fr/xephi/authme/settings/Settings.java
index 5bf9d0030..d287e140c 100644
--- a/src/main/java/fr/xephi/authme/settings/Settings.java
+++ b/src/main/java/fr/xephi/authme/settings/Settings.java
@@ -1,9 +1,9 @@
package fr.xephi.authme.settings;
-import com.github.authme.configme.SettingsManager;
-import com.github.authme.configme.knownproperties.ConfigurationData;
-import com.github.authme.configme.migration.MigrationService;
-import com.github.authme.configme.resource.PropertyResource;
+import ch.jalu.configme.SettingsManager;
+import ch.jalu.configme.configurationdata.ConfigurationData;
+import ch.jalu.configme.migration.MigrationService;
+import ch.jalu.configme.resource.PropertyResource;
import com.google.common.io.Files;
import fr.xephi.authme.ConsoleLogger;
diff --git a/src/main/java/fr/xephi/authme/settings/SettingsMigrationService.java b/src/main/java/fr/xephi/authme/settings/SettingsMigrationService.java
index 2642644f7..cc79440e1 100644
--- a/src/main/java/fr/xephi/authme/settings/SettingsMigrationService.java
+++ b/src/main/java/fr/xephi/authme/settings/SettingsMigrationService.java
@@ -1,16 +1,16 @@
package fr.xephi.authme.settings;
-import com.github.authme.configme.migration.PlainMigrationService;
-import com.github.authme.configme.properties.Property;
-import com.github.authme.configme.properties.StringListProperty;
-import com.github.authme.configme.resource.PropertyResource;
+import ch.jalu.configme.migration.PlainMigrationService;
+import ch.jalu.configme.properties.Property;
+import ch.jalu.configme.properties.StringListProperty;
+import ch.jalu.configme.resource.PropertyResource;
import com.google.common.base.Objects;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.initialization.DataFolder;
import fr.xephi.authme.output.LogLevel;
import fr.xephi.authme.settings.properties.PluginSettings;
-import fr.xephi.authme.settings.properties.RegistrationSettings;
import fr.xephi.authme.settings.properties.RegistrationArgumentType;
+import fr.xephi.authme.settings.properties.RegistrationSettings;
import fr.xephi.authme.settings.properties.SecuritySettings;
import javax.inject.Inject;
@@ -20,8 +20,8 @@ import java.io.IOException;
import java.util.Collections;
import java.util.List;
-import static com.github.authme.configme.properties.PropertyInitializer.newListProperty;
-import static com.github.authme.configme.properties.PropertyInitializer.newProperty;
+import static ch.jalu.configme.properties.PropertyInitializer.newListProperty;
+import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
import static fr.xephi.authme.settings.properties.RegistrationSettings.DELAY_JOIN_MESSAGE;
import static fr.xephi.authme.settings.properties.RegistrationSettings.REMOVE_JOIN_MESSAGE;
import static fr.xephi.authme.settings.properties.RegistrationSettings.REMOVE_LEAVE_MESSAGE;
@@ -100,8 +100,7 @@ public class SettingsMigrationService extends PlainMigrationService {
}
private List getStringList(PropertyResource resource, String path) {
- List entries = new StringListProperty(path).getFromResource(resource);
- return entries == null ? Collections.emptyList() : entries;
+ return new StringListProperty(path).getValue(resource);
}
public List getOnLoginCommands() {
diff --git a/src/main/java/fr/xephi/authme/settings/commandconfig/CommandManager.java b/src/main/java/fr/xephi/authme/settings/commandconfig/CommandManager.java
index f21f7e5cb..bc0abf38a 100644
--- a/src/main/java/fr/xephi/authme/settings/commandconfig/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/settings/commandconfig/CommandManager.java
@@ -1,7 +1,7 @@
package fr.xephi.authme.settings.commandconfig;
-import com.github.authme.configme.SettingsManager;
-import com.github.authme.configme.resource.YamlFileResource;
+import ch.jalu.configme.SettingsManager;
+import ch.jalu.configme.resource.YamlFileResource;
import fr.xephi.authme.initialization.DataFolder;
import fr.xephi.authme.initialization.Reloadable;
import fr.xephi.authme.service.BukkitService;
diff --git a/src/main/java/fr/xephi/authme/settings/commandconfig/CommandMigrationService.java b/src/main/java/fr/xephi/authme/settings/commandconfig/CommandMigrationService.java
index 6b357615f..092d66d2a 100644
--- a/src/main/java/fr/xephi/authme/settings/commandconfig/CommandMigrationService.java
+++ b/src/main/java/fr/xephi/authme/settings/commandconfig/CommandMigrationService.java
@@ -1,8 +1,8 @@
package fr.xephi.authme.settings.commandconfig;
-import com.github.authme.configme.migration.MigrationService;
-import com.github.authme.configme.properties.Property;
-import com.github.authme.configme.resource.PropertyResource;
+import ch.jalu.configme.migration.MigrationService;
+import ch.jalu.configme.properties.Property;
+import ch.jalu.configme.resource.PropertyResource;
import com.google.common.annotations.VisibleForTesting;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.settings.SettingsMigrationService;
diff --git a/src/main/java/fr/xephi/authme/settings/commandconfig/CommandSettingsHolder.java b/src/main/java/fr/xephi/authme/settings/commandconfig/CommandSettingsHolder.java
index 99a1c6e8c..7487d2988 100644
--- a/src/main/java/fr/xephi/authme/settings/commandconfig/CommandSettingsHolder.java
+++ b/src/main/java/fr/xephi/authme/settings/commandconfig/CommandSettingsHolder.java
@@ -1,9 +1,9 @@
package fr.xephi.authme.settings.commandconfig;
-import com.github.authme.configme.SectionComments;
-import com.github.authme.configme.SettingsHolder;
-import com.github.authme.configme.beanmapper.BeanProperty;
-import com.github.authme.configme.properties.Property;
+import ch.jalu.configme.SectionComments;
+import ch.jalu.configme.SettingsHolder;
+import ch.jalu.configme.properties.BeanProperty;
+import ch.jalu.configme.properties.Property;
import java.util.HashMap;
import java.util.Map;
diff --git a/src/main/java/fr/xephi/authme/settings/properties/AuthMeSettingsRetriever.java b/src/main/java/fr/xephi/authme/settings/properties/AuthMeSettingsRetriever.java
index 88b896f6f..8cfb29dc4 100644
--- a/src/main/java/fr/xephi/authme/settings/properties/AuthMeSettingsRetriever.java
+++ b/src/main/java/fr/xephi/authme/settings/properties/AuthMeSettingsRetriever.java
@@ -1,9 +1,9 @@
package fr.xephi.authme.settings.properties;
-import com.github.authme.configme.SettingsHolder;
-import com.github.authme.configme.knownproperties.ConfigurationData;
-import com.github.authme.configme.knownproperties.ConfigurationDataBuilder;
-import com.github.authme.configme.properties.Property;
+import ch.jalu.configme.SettingsHolder;
+import ch.jalu.configme.configurationdata.ConfigurationData;
+import ch.jalu.configme.configurationdata.ConfigurationDataBuilder;
+import ch.jalu.configme.properties.Property;
/**
* Utility class responsible for retrieving all {@link Property} fields from {@link SettingsHolder} classes.
diff --git a/src/main/java/fr/xephi/authme/settings/properties/BackupSettings.java b/src/main/java/fr/xephi/authme/settings/properties/BackupSettings.java
index 42e6e55fb..162bf8aac 100644
--- a/src/main/java/fr/xephi/authme/settings/properties/BackupSettings.java
+++ b/src/main/java/fr/xephi/authme/settings/properties/BackupSettings.java
@@ -1,10 +1,10 @@
package fr.xephi.authme.settings.properties;
-import com.github.authme.configme.Comment;
-import com.github.authme.configme.SettingsHolder;
-import com.github.authme.configme.properties.Property;
+import ch.jalu.configme.Comment;
+import ch.jalu.configme.SettingsHolder;
+import ch.jalu.configme.properties.Property;
-import static com.github.authme.configme.properties.PropertyInitializer.newProperty;
+import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
public class BackupSettings implements SettingsHolder {
diff --git a/src/main/java/fr/xephi/authme/settings/properties/ConverterSettings.java b/src/main/java/fr/xephi/authme/settings/properties/ConverterSettings.java
index fc74dfb45..ae289e546 100644
--- a/src/main/java/fr/xephi/authme/settings/properties/ConverterSettings.java
+++ b/src/main/java/fr/xephi/authme/settings/properties/ConverterSettings.java
@@ -1,10 +1,10 @@
package fr.xephi.authme.settings.properties;
-import com.github.authme.configme.Comment;
-import com.github.authme.configme.SettingsHolder;
-import com.github.authme.configme.properties.Property;
+import ch.jalu.configme.Comment;
+import ch.jalu.configme.SettingsHolder;
+import ch.jalu.configme.properties.Property;
-import static com.github.authme.configme.properties.PropertyInitializer.newProperty;
+import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
public class ConverterSettings implements SettingsHolder {
diff --git a/src/main/java/fr/xephi/authme/settings/properties/DatabaseSettings.java b/src/main/java/fr/xephi/authme/settings/properties/DatabaseSettings.java
index c82a7a81d..e7c0e175d 100644
--- a/src/main/java/fr/xephi/authme/settings/properties/DatabaseSettings.java
+++ b/src/main/java/fr/xephi/authme/settings/properties/DatabaseSettings.java
@@ -1,11 +1,11 @@
package fr.xephi.authme.settings.properties;
-import com.github.authme.configme.Comment;
-import com.github.authme.configme.SettingsHolder;
-import com.github.authme.configme.properties.Property;
+import ch.jalu.configme.Comment;
+import ch.jalu.configme.SettingsHolder;
+import ch.jalu.configme.properties.Property;
import fr.xephi.authme.datasource.DataSourceType;
-import static com.github.authme.configme.properties.PropertyInitializer.newProperty;
+import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
public class DatabaseSettings implements SettingsHolder {
diff --git a/src/main/java/fr/xephi/authme/settings/properties/EmailSettings.java b/src/main/java/fr/xephi/authme/settings/properties/EmailSettings.java
index fbfd7d425..fc5e9fd85 100644
--- a/src/main/java/fr/xephi/authme/settings/properties/EmailSettings.java
+++ b/src/main/java/fr/xephi/authme/settings/properties/EmailSettings.java
@@ -1,13 +1,13 @@
package fr.xephi.authme.settings.properties;
-import com.github.authme.configme.Comment;
-import com.github.authme.configme.SettingsHolder;
-import com.github.authme.configme.properties.Property;
+import ch.jalu.configme.Comment;
+import ch.jalu.configme.SettingsHolder;
+import ch.jalu.configme.properties.Property;
import java.util.List;
-import static com.github.authme.configme.properties.PropertyInitializer.newListProperty;
-import static com.github.authme.configme.properties.PropertyInitializer.newProperty;
+import static ch.jalu.configme.properties.PropertyInitializer.newListProperty;
+import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
public class EmailSettings implements SettingsHolder {
diff --git a/src/main/java/fr/xephi/authme/settings/properties/HooksSettings.java b/src/main/java/fr/xephi/authme/settings/properties/HooksSettings.java
index 68d2ad73d..b1eaa222b 100644
--- a/src/main/java/fr/xephi/authme/settings/properties/HooksSettings.java
+++ b/src/main/java/fr/xephi/authme/settings/properties/HooksSettings.java
@@ -1,13 +1,13 @@
package fr.xephi.authme.settings.properties;
-import com.github.authme.configme.Comment;
-import com.github.authme.configme.SettingsHolder;
-import com.github.authme.configme.properties.Property;
+import ch.jalu.configme.Comment;
+import ch.jalu.configme.SettingsHolder;
+import ch.jalu.configme.properties.Property;
import java.util.List;
-import static com.github.authme.configme.properties.PropertyInitializer.newListProperty;
-import static com.github.authme.configme.properties.PropertyInitializer.newProperty;
+import static ch.jalu.configme.properties.PropertyInitializer.newListProperty;
+import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
public class HooksSettings implements SettingsHolder {
diff --git a/src/main/java/fr/xephi/authme/settings/properties/PluginSettings.java b/src/main/java/fr/xephi/authme/settings/properties/PluginSettings.java
index 91d71d7ff..cfd717ebc 100644
--- a/src/main/java/fr/xephi/authme/settings/properties/PluginSettings.java
+++ b/src/main/java/fr/xephi/authme/settings/properties/PluginSettings.java
@@ -1,11 +1,11 @@
package fr.xephi.authme.settings.properties;
-import com.github.authme.configme.Comment;
-import com.github.authme.configme.SettingsHolder;
-import com.github.authme.configme.properties.Property;
+import ch.jalu.configme.Comment;
+import ch.jalu.configme.SettingsHolder;
+import ch.jalu.configme.properties.Property;
import fr.xephi.authme.output.LogLevel;
-import static com.github.authme.configme.properties.PropertyInitializer.newProperty;
+import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
public class PluginSettings implements SettingsHolder {
diff --git a/src/main/java/fr/xephi/authme/settings/properties/ProtectionSettings.java b/src/main/java/fr/xephi/authme/settings/properties/ProtectionSettings.java
index b725172f0..2361ec6e0 100644
--- a/src/main/java/fr/xephi/authme/settings/properties/ProtectionSettings.java
+++ b/src/main/java/fr/xephi/authme/settings/properties/ProtectionSettings.java
@@ -1,13 +1,13 @@
package fr.xephi.authme.settings.properties;
-import com.github.authme.configme.Comment;
-import com.github.authme.configme.SettingsHolder;
-import com.github.authme.configme.properties.Property;
+import ch.jalu.configme.Comment;
+import ch.jalu.configme.SettingsHolder;
+import ch.jalu.configme.properties.Property;
import java.util.List;
-import static com.github.authme.configme.properties.PropertyInitializer.newListProperty;
-import static com.github.authme.configme.properties.PropertyInitializer.newProperty;
+import static ch.jalu.configme.properties.PropertyInitializer.newListProperty;
+import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
public class ProtectionSettings implements SettingsHolder {
diff --git a/src/main/java/fr/xephi/authme/settings/properties/PurgeSettings.java b/src/main/java/fr/xephi/authme/settings/properties/PurgeSettings.java
index b3733b5ac..0cfa029ac 100644
--- a/src/main/java/fr/xephi/authme/settings/properties/PurgeSettings.java
+++ b/src/main/java/fr/xephi/authme/settings/properties/PurgeSettings.java
@@ -1,10 +1,10 @@
package fr.xephi.authme.settings.properties;
-import com.github.authme.configme.Comment;
-import com.github.authme.configme.SettingsHolder;
-import com.github.authme.configme.properties.Property;
+import ch.jalu.configme.Comment;
+import ch.jalu.configme.SettingsHolder;
+import ch.jalu.configme.properties.Property;
-import static com.github.authme.configme.properties.PropertyInitializer.newProperty;
+import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
public class PurgeSettings implements SettingsHolder {
diff --git a/src/main/java/fr/xephi/authme/settings/properties/RegistrationSettings.java b/src/main/java/fr/xephi/authme/settings/properties/RegistrationSettings.java
index 204c5a19e..5ab4d21a9 100644
--- a/src/main/java/fr/xephi/authme/settings/properties/RegistrationSettings.java
+++ b/src/main/java/fr/xephi/authme/settings/properties/RegistrationSettings.java
@@ -1,10 +1,10 @@
package fr.xephi.authme.settings.properties;
-import com.github.authme.configme.Comment;
-import com.github.authme.configme.SettingsHolder;
-import com.github.authme.configme.properties.Property;
+import ch.jalu.configme.Comment;
+import ch.jalu.configme.SettingsHolder;
+import ch.jalu.configme.properties.Property;
-import static com.github.authme.configme.properties.PropertyInitializer.newProperty;
+import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
public class RegistrationSettings implements SettingsHolder {
diff --git a/src/main/java/fr/xephi/authme/settings/properties/RestrictionSettings.java b/src/main/java/fr/xephi/authme/settings/properties/RestrictionSettings.java
index e5d83e479..4e282728b 100644
--- a/src/main/java/fr/xephi/authme/settings/properties/RestrictionSettings.java
+++ b/src/main/java/fr/xephi/authme/settings/properties/RestrictionSettings.java
@@ -1,14 +1,14 @@
package fr.xephi.authme.settings.properties;
-import com.github.authme.configme.Comment;
-import com.github.authme.configme.SettingsHolder;
-import com.github.authme.configme.properties.Property;
+import ch.jalu.configme.Comment;
+import ch.jalu.configme.SettingsHolder;
+import ch.jalu.configme.properties.Property;
import java.util.List;
-import static com.github.authme.configme.properties.PropertyInitializer.newListProperty;
-import static com.github.authme.configme.properties.PropertyInitializer.newLowercaseListProperty;
-import static com.github.authme.configme.properties.PropertyInitializer.newProperty;
+import static ch.jalu.configme.properties.PropertyInitializer.newListProperty;
+import static ch.jalu.configme.properties.PropertyInitializer.newLowercaseListProperty;
+import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
public class RestrictionSettings implements SettingsHolder {
diff --git a/src/main/java/fr/xephi/authme/settings/properties/SecuritySettings.java b/src/main/java/fr/xephi/authme/settings/properties/SecuritySettings.java
index 5bad44b07..586395cb6 100644
--- a/src/main/java/fr/xephi/authme/settings/properties/SecuritySettings.java
+++ b/src/main/java/fr/xephi/authme/settings/properties/SecuritySettings.java
@@ -1,15 +1,15 @@
package fr.xephi.authme.settings.properties;
-import com.github.authme.configme.Comment;
-import com.github.authme.configme.SettingsHolder;
-import com.github.authme.configme.properties.Property;
+import ch.jalu.configme.Comment;
+import ch.jalu.configme.SettingsHolder;
+import ch.jalu.configme.properties.Property;
import fr.xephi.authme.security.HashAlgorithm;
import fr.xephi.authme.settings.EnumSetProperty;
import java.util.List;
-import static com.github.authme.configme.properties.PropertyInitializer.newLowercaseListProperty;
-import static com.github.authme.configme.properties.PropertyInitializer.newProperty;
+import static ch.jalu.configme.properties.PropertyInitializer.newLowercaseListProperty;
+import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
public class SecuritySettings implements SettingsHolder {
diff --git a/src/test/java/fr/xephi/authme/AuthMeInitializationTest.java b/src/test/java/fr/xephi/authme/AuthMeInitializationTest.java
index 3b5432bf6..aae925b51 100644
--- a/src/test/java/fr/xephi/authme/AuthMeInitializationTest.java
+++ b/src/test/java/fr/xephi/authme/AuthMeInitializationTest.java
@@ -1,8 +1,8 @@
package fr.xephi.authme;
+import ch.jalu.configme.resource.PropertyResource;
import ch.jalu.injector.Injector;
import ch.jalu.injector.InjectorBuilder;
-import com.github.authme.configme.resource.PropertyResource;
import com.google.common.io.Files;
import fr.xephi.authme.api.NewAPI;
import fr.xephi.authme.command.CommandHandler;
diff --git a/src/test/java/fr/xephi/authme/datasource/AbstractResourceClosingTest.java b/src/test/java/fr/xephi/authme/datasource/AbstractResourceClosingTest.java
index 35ea12e3c..40d8ad3bf 100644
--- a/src/test/java/fr/xephi/authme/datasource/AbstractResourceClosingTest.java
+++ b/src/test/java/fr/xephi/authme/datasource/AbstractResourceClosingTest.java
@@ -1,6 +1,6 @@
package fr.xephi.authme.datasource;
-import com.github.authme.configme.properties.Property;
+import ch.jalu.configme.properties.Property;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
diff --git a/src/test/java/fr/xephi/authme/datasource/MySqlIntegrationTest.java b/src/test/java/fr/xephi/authme/datasource/MySqlIntegrationTest.java
index 0edc804f7..1ec75312a 100644
--- a/src/test/java/fr/xephi/authme/datasource/MySqlIntegrationTest.java
+++ b/src/test/java/fr/xephi/authme/datasource/MySqlIntegrationTest.java
@@ -1,6 +1,6 @@
package fr.xephi.authme.datasource;
-import com.github.authme.configme.properties.Property;
+import ch.jalu.configme.properties.Property;
import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;
import fr.xephi.authme.TestHelper;
diff --git a/src/test/java/fr/xephi/authme/datasource/SQLiteIntegrationTest.java b/src/test/java/fr/xephi/authme/datasource/SQLiteIntegrationTest.java
index 6caca39ca..9ef0c2fa8 100644
--- a/src/test/java/fr/xephi/authme/datasource/SQLiteIntegrationTest.java
+++ b/src/test/java/fr/xephi/authme/datasource/SQLiteIntegrationTest.java
@@ -1,6 +1,6 @@
package fr.xephi.authme.datasource;
-import com.github.authme.configme.properties.Property;
+import ch.jalu.configme.properties.Property;
import fr.xephi.authme.TestHelper;
import fr.xephi.authme.data.auth.PlayerAuth;
import fr.xephi.authme.settings.Settings;
diff --git a/src/test/java/fr/xephi/authme/settings/SettingsConsistencyTest.java b/src/test/java/fr/xephi/authme/settings/SettingsConsistencyTest.java
index 7123ac26b..0df17990a 100644
--- a/src/test/java/fr/xephi/authme/settings/SettingsConsistencyTest.java
+++ b/src/test/java/fr/xephi/authme/settings/SettingsConsistencyTest.java
@@ -1,7 +1,7 @@
package fr.xephi.authme.settings;
-import com.github.authme.configme.knownproperties.ConfigurationData;
-import com.github.authme.configme.properties.Property;
+import ch.jalu.configme.configurationdata.ConfigurationData;
+import ch.jalu.configme.properties.Property;
import fr.xephi.authme.settings.properties.AuthMeSettingsRetriever;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/src/test/java/fr/xephi/authme/settings/SettingsIntegrationTest.java b/src/test/java/fr/xephi/authme/settings/SettingsIntegrationTest.java
index d0d2c36a8..705b51f06 100644
--- a/src/test/java/fr/xephi/authme/settings/SettingsIntegrationTest.java
+++ b/src/test/java/fr/xephi/authme/settings/SettingsIntegrationTest.java
@@ -1,11 +1,11 @@
package fr.xephi.authme.settings;
-import com.github.authme.configme.knownproperties.ConfigurationData;
-import com.github.authme.configme.knownproperties.ConfigurationDataBuilder;
-import com.github.authme.configme.migration.PlainMigrationService;
-import com.github.authme.configme.properties.Property;
-import com.github.authme.configme.resource.PropertyResource;
-import com.github.authme.configme.resource.YamlFileResource;
+import ch.jalu.configme.configurationdata.ConfigurationData;
+import ch.jalu.configme.configurationdata.ConfigurationDataBuilder;
+import ch.jalu.configme.migration.PlainMigrationService;
+import ch.jalu.configme.properties.Property;
+import ch.jalu.configme.resource.PropertyResource;
+import ch.jalu.configme.resource.YamlFileResource;
import com.google.common.collect.ImmutableMap;
import com.google.common.io.Files;
import fr.xephi.authme.TestHelper;
diff --git a/src/test/java/fr/xephi/authme/settings/SettingsMigrationServiceTest.java b/src/test/java/fr/xephi/authme/settings/SettingsMigrationServiceTest.java
index a6abf1c35..852f5c3be 100644
--- a/src/test/java/fr/xephi/authme/settings/SettingsMigrationServiceTest.java
+++ b/src/test/java/fr/xephi/authme/settings/SettingsMigrationServiceTest.java
@@ -1,7 +1,7 @@
package fr.xephi.authme.settings;
-import com.github.authme.configme.resource.PropertyResource;
-import com.github.authme.configme.resource.YamlFileResource;
+import ch.jalu.configme.resource.PropertyResource;
+import ch.jalu.configme.resource.YamlFileResource;
import com.google.common.io.Files;
import fr.xephi.authme.TestHelper;
import fr.xephi.authme.output.LogLevel;
diff --git a/src/test/java/fr/xephi/authme/settings/SettingsTest.java b/src/test/java/fr/xephi/authme/settings/SettingsTest.java
index 3480bd0ca..42326771e 100644
--- a/src/test/java/fr/xephi/authme/settings/SettingsTest.java
+++ b/src/test/java/fr/xephi/authme/settings/SettingsTest.java
@@ -1,8 +1,8 @@
package fr.xephi.authme.settings;
-import com.github.authme.configme.knownproperties.ConfigurationData;
-import com.github.authme.configme.knownproperties.ConfigurationDataBuilder;
-import com.github.authme.configme.resource.PropertyResource;
+import ch.jalu.configme.configurationdata.ConfigurationData;
+import ch.jalu.configme.configurationdata.ConfigurationDataBuilder;
+import ch.jalu.configme.resource.PropertyResource;
import fr.xephi.authme.TestHelper;
import fr.xephi.authme.settings.properties.RegistrationSettings;
import fr.xephi.authme.settings.properties.TestConfiguration;
diff --git a/src/test/java/fr/xephi/authme/settings/commandconfig/CommandMigrationServiceTest.java b/src/test/java/fr/xephi/authme/settings/commandconfig/CommandMigrationServiceTest.java
index 1931ff2f2..b03a1c8e4 100644
--- a/src/test/java/fr/xephi/authme/settings/commandconfig/CommandMigrationServiceTest.java
+++ b/src/test/java/fr/xephi/authme/settings/commandconfig/CommandMigrationServiceTest.java
@@ -1,8 +1,8 @@
package fr.xephi.authme.settings.commandconfig;
-import com.github.authme.configme.knownproperties.ConfigurationDataBuilder;
-import com.github.authme.configme.resource.PropertyResource;
-import com.github.authme.configme.resource.YamlFileResource;
+import ch.jalu.configme.configurationdata.ConfigurationDataBuilder;
+import ch.jalu.configme.resource.PropertyResource;
+import ch.jalu.configme.resource.YamlFileResource;
import fr.xephi.authme.TestHelper;
import fr.xephi.authme.settings.SettingsMigrationService;
import org.junit.BeforeClass;
diff --git a/src/test/java/fr/xephi/authme/settings/commandconfig/CommandYmlConsistencyTest.java b/src/test/java/fr/xephi/authme/settings/commandconfig/CommandYmlConsistencyTest.java
index 1ea214899..8c599e929 100644
--- a/src/test/java/fr/xephi/authme/settings/commandconfig/CommandYmlConsistencyTest.java
+++ b/src/test/java/fr/xephi/authme/settings/commandconfig/CommandYmlConsistencyTest.java
@@ -1,8 +1,8 @@
package fr.xephi.authme.settings.commandconfig;
-import com.github.authme.configme.knownproperties.ConfigurationDataBuilder;
-import com.github.authme.configme.resource.PropertyResource;
-import com.github.authme.configme.resource.YamlFileResource;
+import ch.jalu.configme.configurationdata.ConfigurationDataBuilder;
+import ch.jalu.configme.resource.PropertyResource;
+import ch.jalu.configme.resource.YamlFileResource;
import fr.xephi.authme.TestHelper;
import fr.xephi.authme.settings.SettingsMigrationService;
import org.junit.Before;
diff --git a/src/test/java/fr/xephi/authme/settings/properties/AuthMeSettingsRetrieverTest.java b/src/test/java/fr/xephi/authme/settings/properties/AuthMeSettingsRetrieverTest.java
index a5bd8c905..2a1c588e6 100644
--- a/src/test/java/fr/xephi/authme/settings/properties/AuthMeSettingsRetrieverTest.java
+++ b/src/test/java/fr/xephi/authme/settings/properties/AuthMeSettingsRetrieverTest.java
@@ -1,6 +1,6 @@
package fr.xephi.authme.settings.properties;
-import com.github.authme.configme.knownproperties.ConfigurationData;
+import ch.jalu.configme.configurationdata.ConfigurationData;
import fr.xephi.authme.TestHelper;
import org.junit.Test;
diff --git a/src/test/java/fr/xephi/authme/settings/properties/SettingsClassConsistencyTest.java b/src/test/java/fr/xephi/authme/settings/properties/SettingsClassConsistencyTest.java
index f391489f4..a88dbfb9a 100644
--- a/src/test/java/fr/xephi/authme/settings/properties/SettingsClassConsistencyTest.java
+++ b/src/test/java/fr/xephi/authme/settings/properties/SettingsClassConsistencyTest.java
@@ -1,7 +1,7 @@
package fr.xephi.authme.settings.properties;
-import com.github.authme.configme.SettingsHolder;
-import com.github.authme.configme.properties.Property;
+import ch.jalu.configme.SettingsHolder;
+import ch.jalu.configme.properties.Property;
import fr.xephi.authme.ClassCollector;
import fr.xephi.authme.ReflectionTestUtils;
import fr.xephi.authme.TestHelper;
diff --git a/src/test/java/fr/xephi/authme/settings/properties/TestConfiguration.java b/src/test/java/fr/xephi/authme/settings/properties/TestConfiguration.java
index 043a597bb..d964679a2 100644
--- a/src/test/java/fr/xephi/authme/settings/properties/TestConfiguration.java
+++ b/src/test/java/fr/xephi/authme/settings/properties/TestConfiguration.java
@@ -1,12 +1,12 @@
package fr.xephi.authme.settings.properties;
-import com.github.authme.configme.SettingsHolder;
-import com.github.authme.configme.properties.Property;
+import ch.jalu.configme.SettingsHolder;
+import ch.jalu.configme.properties.Property;
import java.util.List;
-import static com.github.authme.configme.properties.PropertyInitializer.newListProperty;
-import static com.github.authme.configme.properties.PropertyInitializer.newProperty;
+import static ch.jalu.configme.properties.PropertyInitializer.newListProperty;
+import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
/**
* Sample properties for testing purposes.
diff --git a/src/test/java/tools/docs/config/UpdateConfigPageTask.java b/src/test/java/tools/docs/config/UpdateConfigPageTask.java
index f9a249a70..15cd50e76 100644
--- a/src/test/java/tools/docs/config/UpdateConfigPageTask.java
+++ b/src/test/java/tools/docs/config/UpdateConfigPageTask.java
@@ -1,7 +1,7 @@
package tools.docs.config;
-import com.github.authme.configme.SettingsManager;
-import com.github.authme.configme.resource.YamlFileResource;
+import ch.jalu.configme.SettingsManager;
+import ch.jalu.configme.resource.YamlFileResource;
import fr.xephi.authme.settings.properties.AuthMeSettingsRetriever;
import fr.xephi.authme.util.FileUtils;
import tools.utils.AutoToolTask;
diff --git a/src/test/java/tools/docs/hashmethods/EncryptionMethodInfoGatherer.java b/src/test/java/tools/docs/hashmethods/EncryptionMethodInfoGatherer.java
index 9cf98f338..e327e4847 100644
--- a/src/test/java/tools/docs/hashmethods/EncryptionMethodInfoGatherer.java
+++ b/src/test/java/tools/docs/hashmethods/EncryptionMethodInfoGatherer.java
@@ -1,8 +1,8 @@
package tools.docs.hashmethods;
+import ch.jalu.configme.properties.Property;
import ch.jalu.injector.Injector;
import ch.jalu.injector.InjectorBuilder;
-import com.github.authme.configme.properties.Property;
import com.google.common.collect.ImmutableSet;
import fr.xephi.authme.security.HashAlgorithm;
import fr.xephi.authme.security.crypts.EncryptionMethod;
diff --git a/src/test/java/tools/filegeneration/GenerateCommandsYml.java b/src/test/java/tools/filegeneration/GenerateCommandsYml.java
index e30fb3d3e..73113ccc4 100644
--- a/src/test/java/tools/filegeneration/GenerateCommandsYml.java
+++ b/src/test/java/tools/filegeneration/GenerateCommandsYml.java
@@ -1,7 +1,7 @@
package tools.filegeneration;
-import com.github.authme.configme.SettingsManager;
-import com.github.authme.configme.resource.YamlFileResource;
+import ch.jalu.configme.SettingsManager;
+import ch.jalu.configme.resource.YamlFileResource;
import com.google.common.collect.ImmutableMap;
import fr.xephi.authme.settings.commandconfig.Command;
import fr.xephi.authme.settings.commandconfig.CommandConfig;