Small docs cleanup

- NewAPI class will be removed in 5.5, not 5.4
- Add entry for "Deprecated" recommendation in hash algorithms page
- Mention possibility of wildcards for restricted user rules

docs/config.md

@@ -1,5 +1,5 @@
 <!-- AUTO-GENERATED FILE! Do not edit this directly -->
-<!-- File auto-generated on Sat Aug 12 13:49:42 CEST 2017. See docs/config/config.tpl.md -->
+<!-- File auto-generated on Sun Sep 17 11:29:06 CEST 2017. See docs/config/config.tpl.md -->
 
 ## AuthMe Configuration
 The first time you run AuthMe it will create a config.yml file in the plugins/AuthMe folder, 
@@ -156,7 +156,7 @@ settings:
         AllowRestrictedUser: false
         # The restricted user feature will kick players listed below
         # if they don't match the defined IP address. Names are case-insensitive.
-        # Ip addresses support regex expressions (regex:127\.0\.0\..*)
+        # You can use * as wildcard (127.0.0.*), or regex with a "regex:" prefix regex:127\.0\.0\..*
         # Example:
         #     AllowedRestrictedUser:
         #     - playername;127.0.0.1
@@ -374,7 +374,7 @@ Protection:
     # Apply the protection also to registered usernames
     enableProtectionRegistered: true
     # Countries allowed to join the server and register. For country codes, see
-    # https://dev.bukkit.org/projects/authme-reloaded/pages/countries-codes
+    # http://dev.maxmind.com/geoip/legacy/codes/iso3166/
     # PLEASE USE QUOTES!
     countries: 
     - 'US'
@@ -458,7 +458,7 @@ Security:
         # This prevents an attacker from abusing AuthMe's email feature.
         cooldown: 60
     privacy:
-        # The maill shown using /email show will be partially hidden
+        # The mail shown using /email show will be partially hidden
         # E.g. (if enabled)
         #  original email: my.email@example.com
         #  hidden email: my.***@***mple.com
@@ -540,4 +540,4 @@ To change settings on a running server, save your changes to config.yml and use
 
 ---
 
-This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Sat Aug 12 13:49:42 CEST 2017
+This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Sun Sep 17 11:29:06 CEST 2017

docs/hash_algorithms.md

@@ -1,5 +1,5 @@
 <!-- AUTO-GENERATED FILE! Do not edit this directly -->
-<!-- File auto-generated on Sat Mar 25 00:15:27 CET 2017. See docs/hashmethods/hash_algorithms.tpl.md -->
+<!-- File auto-generated on Sun Sep 17 11:29:07 CEST 2017. See docs/hashmethods/hash_algorithms.tpl.md -->
 
 ## Hash Algorithms
 AuthMe supports the following hash algorithms for storing your passwords safely.
@@ -48,6 +48,7 @@ You can change the hashing algorithm in the config.yml: under `security`, locate
 The recommendation lists our usage recommendation in terms of how secure it is (not how _well_ the algorithm works!).
 - Recommended: The hash algorithm appears to be cryptographically secure and is one we recommend.
 - Acceptable: There are safer algorithms that can be chosen but using the algorithm is generally OK.
+- Deprecated: Cannot be used anymore actively or in the near future.
 - Do not use: Hash algorithm isn't sufficiently secure. Use only if required to hook into another system.
 - Does not work: The algorithm does not work properly; do not use.
 
@@ -82,4 +83,4 @@ or bad.
 
 ---
 
-This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Sat Mar 25 00:15:27 CET 2017
+This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Sun Sep 17 11:29:07 CEST 2017

docs/translations.md

@@ -1,5 +1,5 @@
 <!-- AUTO-GENERATED FILE! Do not edit this directly -->
-<!-- File auto-generated on Fri Aug 11 22:32:14 CEST 2017. See docs/translations/translations.tpl.md -->
+<!-- File auto-generated on Sun Sep 17 11:29:08 CEST 2017. See docs/translations/translations.tpl.md -->
 
 # AuthMe Translations
 The following translations are available in AuthMe. Set `messagesLanguage` to the language code
@@ -11,7 +11,7 @@ Code | Language | Translated | &nbsp;
 [bg](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_bg.yml) | Bulgarian | 95% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=77dd44&w=95&h=5&txtpad=1" alt="bar" />
 [br](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_br.yml) | Brazilian | 100% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=66ff66&w=100&h=5&txtpad=1" alt="bar" />
 [cz](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_cz.yml) | Czech | 100% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=66ff66&w=100&h=5&txtpad=1" alt="bar" />
-[de](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_de.yml) | German | 85% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=99bb22&w=85&h=5&txtpad=1" alt="bar" />
+[de](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_de.yml) | German | 100% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=66ff66&w=100&h=5&txtpad=1" alt="bar" />
 [eo](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_eo.yml) | Esperanto | 100% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=66ff66&w=100&h=5&txtpad=1" alt="bar" />
 [es](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_es.yml) | Spanish | 100% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=66ff66&w=100&h=5&txtpad=1" alt="bar" />
 [et](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_et.yml) | Estonian | 100% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=66ff66&w=100&h=5&txtpad=1" alt="bar" />
@@ -41,4 +41,4 @@ Code | Language | Translated | &nbsp;
 
 ---
 
-This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Fri Aug 11 22:32:14 CEST 2017
+This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Sun Sep 17 11:29:08 CEST 2017

src/main/java/fr/xephi/authme/AuthMe.java

@@ -22,8 +22,6 @@ import fr.xephi.authme.listener.PlayerListener16;
 import fr.xephi.authme.listener.PlayerListener18;
 import fr.xephi.authme.listener.PlayerListener19;
 import fr.xephi.authme.listener.ServerListener;
-import fr.xephi.authme.permission.PermissionsManager;
-import fr.xephi.authme.permission.PermissionsSystemType;
 import fr.xephi.authme.security.HashAlgorithm;
 import fr.xephi.authme.security.crypts.Sha256;
 import fr.xephi.authme.service.BackupService;
@@ -67,7 +65,6 @@ public class AuthMe extends JavaPlugin {
 
     // Private instances
     private CommandHandler commandHandler;
-    private PermissionsManager permsMan;
     private Settings settings;
     private DataSource database;
     private BukkitService bukkitService;
@@ -118,7 +115,7 @@ public class AuthMe extends JavaPlugin {
 
     /**
      * Method used to obtain the v2 plugin's api instance
-     * @deprecated Will be removed in 5.4, use {@link fr.xephi.authme.api.v3.AuthMeApi} instead
+     * @deprecated Will be removed in 5.5, use {@link fr.xephi.authme.api.v3.AuthMeApi} instead
      *
      * @return The plugin's api instance
      */
@@ -248,7 +245,6 @@ public class AuthMe extends JavaPlugin {
      */
     void instantiateServices(Injector injector) {
         database = injector.getSingleton(DataSource.class);
-        permsMan = injector.getSingleton(PermissionsManager.class);
         bukkitService = injector.getSingleton(BukkitService.class);
         commandHandler = injector.getSingleton(CommandHandler.class);
         backupService = injector.getSingleton(BackupService.class);

src/main/java/fr/xephi/authme/api/NewAPI.java

@@ -27,7 +27,7 @@ import java.util.List;
  * NewAPI authmeApi = NewAPI.getInstance();
  * </code>
  *
- * @deprecated Will be removed in 5.4! Use {@link fr.xephi.authme.api.v3.AuthMeApi} instead.
+ * @deprecated Will be removed in 5.5! Use {@link fr.xephi.authme.api.v3.AuthMeApi} instead.
  */
 @SuppressWarnings({"checkstyle:AbbreviationAsWordInName"}) // Justification: Class name cannot be changed anymore
 @Deprecated

src/main/java/fr/xephi/authme/initialization/OnStartupTasks.java

@@ -53,8 +53,10 @@ public class OnStartupTasks {
     public static void sendMetrics(AuthMe plugin, Settings settings) {
         final Metrics metrics = new Metrics(plugin);
 
-        metrics.addCustomChart(new Metrics.SimplePie("messages_language", () -> settings.getProperty(PluginSettings.MESSAGES_LANGUAGE)));
+        metrics.addCustomChart(new Metrics.SimplePie("messages_language",
-        metrics.addCustomChart(new Metrics.SimplePie("database_backend", () -> settings.getProperty(DatabaseSettings.BACKEND).toString()));
+            () -> settings.getProperty(PluginSettings.MESSAGES_LANGUAGE)));
+        metrics.addCustomChart(new Metrics.SimplePie("database_backend",
+            () -> settings.getProperty(DatabaseSettings.BACKEND).toString()));
     }
 
     /**

src/main/java/fr/xephi/authme/settings/properties/RestrictionSettings.java

@@ -78,7 +78,7 @@ public final class RestrictionSettings implements SettingsHolder {
     @Comment({
         "The restricted user feature will kick players listed below",
         "if they don't match the defined IP address. Names are case-insensitive.",
-        "Ip addresses support regex expressions (regex:127\\.0\\.0\\..*)",
+        "You can use * as wildcard (127.0.0.*), or regex with a \"regex:\" prefix regex:127\\.0\\.0\\..*",
         "Example:",
         "    AllowedRestrictedUser:",
         "    - playername;127.0.0.1",

src/main/java/fr/xephi/authme/settings/properties/SecuritySettings.java

@@ -133,7 +133,7 @@ public final class SecuritySettings implements SettingsHolder {
         newProperty("Security.emailRecovery.cooldown", 60);
 
     @Comment({
-        "The maill shown using /email show will be partially hidden",
+        "The mail shown using /email show will be partially hidden",
         "E.g. (if enabled)",
         " original email: my.email@example.com",
         " hidden email: my.***@***mple.com"

src/test/java/tools/docs/hashmethods/hash_algorithms.tpl.md

@@ -22,6 +22,7 @@ You can change the hashing algorithm in the config.yml: under `security`, locate
 The recommendation lists our usage recommendation in terms of how secure it is (not how _well_ the algorithm works!).
 - Recommended: The hash algorithm appears to be cryptographically secure and is one we recommend.
 - Acceptable: There are safer algorithms that can be chosen but using the algorithm is generally OK.
+- Deprecated: Cannot be used anymore actively or in the near future.
 - Do not use: Hash algorithm isn't sufficiently secure. Use only if required to hook into another system.
 - Does not work: The algorithm does not work properly; do not use.