mirror of
https://github.com/AuthMe/AuthMeReloaded.git
synced 2024-12-22 16:48:21 +01:00
cleanup + fix test crypts test on windows systems
This commit is contained in:
parent
28108f00f1
commit
c61345fd43
25
pom.xml
25
pom.xml
@ -48,7 +48,9 @@
|
||||
</prerequisites>
|
||||
|
||||
<properties>
|
||||
<!-- Project Encoding -->
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.build.outputEncoding>UTF-8</project.build.outputEncoding>
|
||||
|
||||
<!-- Project Properties -->
|
||||
<pluginName>AuthMe</pluginName>
|
||||
@ -57,9 +59,6 @@
|
||||
<pluginAuthors>Xephi, sgdc3, DNx5, timvisee, games647, ljacqu</pluginAuthors>
|
||||
<buildNumber>Unknown</buildNumber>
|
||||
|
||||
<!-- Change Compiler Version (JDK) HERE! -->
|
||||
<javaVersion>1.7</javaVersion>
|
||||
|
||||
<!-- Change Bukkit Version HERE! -->
|
||||
<bukkitVersion>1.9-pre1-SNAPSHOT</bukkitVersion>
|
||||
</properties>
|
||||
@ -147,14 +146,26 @@
|
||||
</pluginManagement>
|
||||
|
||||
<plugins>
|
||||
<!-- Maven Java Compiler -->
|
||||
<!-- Maven Java Compiler (compile under 1.8 but allow 1.7/1.6 thanks to Retrolambda) -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.5.1</version>
|
||||
<configuration>
|
||||
<source>1.7</source>
|
||||
<target>${javaVersion}</target>
|
||||
<source>1.8</source>
|
||||
<target>1.8</target>
|
||||
<!-- We need to run tests with java 1.7 to avoid errors with retrolambda! -->
|
||||
<testSource>1.7</testSource>
|
||||
<testTarget>1.7</testTarget>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<!-- Test Plugin -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<version>2.15</version>
|
||||
<configuration>
|
||||
<argLine>-Dfile.encoding=UTF-8</argLine>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<!-- Libs Shading and Relocation -->
|
||||
@ -717,7 +728,7 @@
|
||||
<dependency>
|
||||
<groupId>net.minelink</groupId>
|
||||
<artifactId>CombatTagPlus</artifactId>
|
||||
<version>1.2.1-SNAPSHOT</version>
|
||||
<version>1.2.2-SNAPSHOT</version>
|
||||
<scope>provided</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
|
@ -38,7 +38,6 @@ public class ProcessSyncPlayerLogin implements Runnable {
|
||||
private final String name;
|
||||
private final PlayerAuth auth;
|
||||
private final AuthMe plugin;
|
||||
private final DataSource database;
|
||||
private final PluginManager pm;
|
||||
private final JsonCache playerCache;
|
||||
private final NewSetting settings;
|
||||
@ -54,7 +53,6 @@ public class ProcessSyncPlayerLogin implements Runnable {
|
||||
public ProcessSyncPlayerLogin(Player player, AuthMe plugin,
|
||||
DataSource database, NewSetting settings) {
|
||||
this.plugin = plugin;
|
||||
this.database = database;
|
||||
this.pm = plugin.getServer().getPluginManager();
|
||||
this.player = player;
|
||||
this.name = player.getName().toLowerCase();
|
||||
|
@ -84,7 +84,6 @@ public final class Settings {
|
||||
getMaxJoinPerIp;
|
||||
protected static FileConfiguration configFile;
|
||||
private static AuthMe plugin;
|
||||
private static Settings instance;
|
||||
|
||||
/**
|
||||
* Constructor for Settings.
|
||||
@ -92,7 +91,6 @@ public final class Settings {
|
||||
* @param pl AuthMe
|
||||
*/
|
||||
public Settings(AuthMe pl) {
|
||||
instance = this;
|
||||
plugin = pl;
|
||||
configFile = plugin.getConfig();
|
||||
loadVariables();
|
||||
|
@ -2,15 +2,13 @@ package fr.xephi.authme.util;
|
||||
|
||||
import java.text.DecimalFormat;
|
||||
|
||||
/**
|
||||
*/
|
||||
@SuppressWarnings("UnusedDeclaration")
|
||||
public class Profiler {
|
||||
|
||||
/**
|
||||
* Defines the past time in milliseconds.
|
||||
*/
|
||||
private long time = 0;
|
||||
|
||||
/**
|
||||
* Defines the time in milliseconds the profiler last started at.
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user