Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into 1128-camel-case-rename

src/main/java/fr/xephi/authme/security/crypts/SeparateSaltMethod.java

@@ -8,15 +8,15 @@ public abstract class SeparateSaltMethod implements EncryptionMethod {
     @Override
     public abstract String computeHash(String password, String salt, String name);
 
-    @Override
-    public abstract String generateSalt();
-
     @Override
     public HashedPassword computeHash(String password, String name) {
         String salt = generateSalt();
         return new HashedPassword(computeHash(password, salt, name), salt);
     }
 
+    @Override
+    public abstract String generateSalt();
+
     @Override
     public boolean comparePassword(String password, HashedPassword hashedPassword, String name) {
         return hashedPassword.getHash().equals(computeHash(password, hashedPassword.getSalt(), null));

src/main/java/fr/xephi/authme/security/crypts/UsernameSaltMethod.java

@@ -17,13 +17,13 @@ public abstract class UsernameSaltMethod implements EncryptionMethod {
     public abstract HashedPassword computeHash(String password, String name);
 
     @Override
-    public boolean comparePassword(String password, HashedPassword hashedPassword, String name) {
-        return hashedPassword.getHash().equals(computeHash(password, name).getHash());
+    public String computeHash(String password, String salt, String name) {
+        return computeHash(password, name).getHash();
     }
 
     @Override
-    public String computeHash(String password, String salt, String name) {
-        return computeHash(password, name).getHash();
+    public boolean comparePassword(String password, HashedPassword hashedPassword, String name) {
+        return hashedPassword.getHash().equals(computeHash(password, name).getHash());
     }
 
     @Override