Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stuff! + HikariCP Log4J

Browse Source
This commit is contained in:
Gabriele C
2015-09-05 00:45:48 +02:00
parent 6545ad3aea
commit 1f66a7474d
31 changed files with 279 additions and 735 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/fr/xephi/authme/settings/Messages.java
+4 -9
View File
@@ -1,12 +1,9 @@
package fr.xephi.authme.settings;
import java.io.File;
import java.io.InputStream;
import org.bukkit.command.CommandSender;
import org.bukkit.configuration.file.YamlConfiguration;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
public class Messages extends CustomConfiguration {
@@ -29,13 +26,11 @@ public class Messages extends CustomConfiguration {
* @param filename
* The filename to open
*/
@SuppressWarnings("deprecation")
public final void loadDefaults(File file) {
InputStream stream = AuthMe.getInstance().getResource(file.getName());
if (stream == null)
return;
setDefaults(YamlConfiguration.loadConfiguration(stream));
if(file.isFile()){
setDefaults(YamlConfiguration.loadConfiguration(file));
}
return;
}
/**
src/main/java/fr/xephi/authme/settings/Settings.java
+1 -1
View File
@@ -28,7 +28,7 @@ public final class Settings extends YamlConfiguration {
public static String PLUGIN_FOLDER = "." + File.separator + "plugins" + File.separator + "AuthMe";
public static final String CACHE_FOLDER = Settings.PLUGIN_FOLDER + File.separator + "cache";
public static final String AUTH_FILE = Settings.PLUGIN_FOLDER + File.separator + "auths.db";
public static final String MESSAGE_FILE = Settings.PLUGIN_FOLDER + File.separator + "messages";
public static final String MESSAGE_FILE = Settings.PLUGIN_FOLDER + File.separator + "messages" + File.separator + "messages";
public static final String SETTINGS_FILE = Settings.PLUGIN_FOLDER + File.separator + "config.yml";
public static List<String> allowCommands = null;
public static List<String> getJoinPermissions = null;