Add 1.14 compatibility

src/main/java/fr/xephi/authme/listener/PlayerListener.java

@@ -36,7 +36,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryOpenEvent;
 import org.bukkit.event.player.*;
-import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
 
 import javax.inject.Inject;
 import java.util.HashSet;
@@ -391,12 +391,12 @@ public class PlayerListener implements Listener {
         }
     }
 
-    private boolean isInventoryWhitelisted(Inventory inventory) {
+    private boolean isInventoryWhitelisted(InventoryView inventory) {
         if (inventory == null) {
             return false;
         }
         Set<String> whitelist = settings.getProperty(RestrictionSettings.UNRESTRICTED_INVENTORIES);
-        return whitelist.contains(ChatColor.stripColor(inventory.getName()));
+        return whitelist.contains(ChatColor.stripColor(inventory.getTitle()));
     }
 
     @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
@@ -404,7 +404,7 @@ public class PlayerListener implements Listener {
         final HumanEntity player = event.getPlayer();
 
         if (listenerService.shouldCancelEvent(player)
-            && !isInventoryWhitelisted(event.getInventory())) {
+            && !isInventoryWhitelisted(event.getView())) {
             event.setCancelled(true);
 
             /*
@@ -418,7 +418,7 @@ public class PlayerListener implements Listener {
     @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
     public void onPlayerInventoryClick(InventoryClickEvent event) {
         if (listenerService.shouldCancelEvent(event.getWhoClicked())
-            && !isInventoryWhitelisted(event.getClickedInventory())) {
+            && !isInventoryWhitelisted(event.getView())) {
             event.setCancelled(true);
         }
     }

src/main/java/fr/xephi/authme/mail/EmailService.java

@@ -4,11 +4,11 @@ import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.initialization.DataFolder;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.EmailSettings;
+import fr.xephi.authme.settings.properties.PluginSettings;
 import fr.xephi.authme.settings.properties.SecuritySettings;
 import fr.xephi.authme.util.FileUtils;
 import org.apache.commons.mail.EmailException;
 import org.apache.commons.mail.HtmlEmail;
-import org.bukkit.Server;
 
 import javax.activation.DataSource;
 import javax.activation.FileDataSource;
@@ -23,14 +23,12 @@ import java.io.IOException;
 public class EmailService {
 
     private final File dataFolder;
-    private final String serverName;
     private final Settings settings;
     private final SendMailSsl sendMailSsl;
 
     @Inject
-    EmailService(@DataFolder File dataFolder, Server server, Settings settings, SendMailSsl sendMailSsl) {
+    EmailService(@DataFolder File dataFolder, Settings settings, SendMailSsl sendMailSsl) {
         this.dataFolder = dataFolder;
-        this.serverName = server.getServerName();
         this.settings = settings;
         this.sendMailSsl = sendMailSsl;
     }
@@ -146,14 +144,14 @@ public class EmailService {
     private String replaceTagsForPasswordMail(String mailText, String name, String newPass) {
         return mailText
             .replace("<playername />", name)
-            .replace("<servername />", serverName)
+            .replace("<servername />", settings.getProperty(PluginSettings.SERVER_NAME))
             .replace("<generatedpass />", newPass);
     }
 
     private String replaceTagsForVerificationEmail(String mailText, String name, String code, int minutesValid) {
         return mailText
             .replace("<playername />", name)
-            .replace("<servername />", serverName)
+            .replace("<servername />", settings.getProperty(PluginSettings.SERVER_NAME))
             .replace("<generatedcode />", code)
             .replace("<minutesvalid />", String.valueOf(minutesValid));
     }
@@ -161,7 +159,7 @@ public class EmailService {
     private String replaceTagsForRecoveryCodeMail(String mailText, String name, String code, int hoursValid) {
         return mailText
             .replace("<playername />", name)
-            .replace("<servername />", serverName)
+            .replace("<servername />", settings.getProperty(PluginSettings.SERVER_NAME))
             .replace("<recoverycode />", code)
             .replace("<hoursvalid />", String.valueOf(hoursValid));
     }

src/main/java/fr/xephi/authme/service/BukkitService.java

@@ -19,7 +19,6 @@ import org.bukkit.scheduler.BukkitScheduler;
 import org.bukkit.scheduler.BukkitTask;
 
 import javax.inject.Inject;
-import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.Date;
 import java.util.Optional;
@@ -37,7 +36,6 @@ public class BukkitService implements SettingsDependent {
     public static final int TICKS_PER_MINUTE = 60 * TICKS_PER_SECOND;
 
     private final AuthMe authMe;
-    private Method getOnlinePlayers;
     private boolean useAsyncTasks;
 
     @Inject

src/main/java/fr/xephi/authme/settings/WelcomeMessageConfiguration.java

@@ -7,6 +7,7 @@ import fr.xephi.authme.initialization.Reloadable;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.service.CommonService;
 import fr.xephi.authme.service.GeoIpService;
+import fr.xephi.authme.settings.properties.PluginSettings;
 import fr.xephi.authme.settings.properties.RegistrationSettings;
 import fr.xephi.authme.util.PlayerUtils;
 import fr.xephi.authme.util.lazytags.Tag;
@@ -65,7 +66,7 @@ public class WelcomeMessageConfiguration implements Reloadable {
         createTag("{IP}",          PlayerUtils::getPlayerIp),
         createTag("{LOGINS}",      () -> Integer.toString(playerCache.getLogged())),
         createTag("{WORLD}",       pl -> pl.getWorld().getName()),
-        createTag("{SERVER}",      () -> server.getServerName()),
+        createTag("{SERVER}",      () -> service.getProperty(PluginSettings.SERVER_NAME)),
         createTag("{VERSION}",     () -> server.getBukkitVersion()),
         createTag("{COUNTRY}",     pl -> geoIpService.getCountryName(PlayerUtils.getPlayerIp(pl))));
 

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

@@ -90,6 +90,9 @@ public final class PluginSettings implements SettingsHolder {
     public static final Property<Boolean> USE_ASYNC_PRE_LOGIN_EVENT =
         newProperty("settings.useAsyncPreLoginEvent", true);
 
+    @Comment("The name of the server, used in some placeholders.")
+    public static final Property<String> SERVER_NAME = newProperty("settings.serverName", "Your Minecraft Server");
+
     private PluginSettings() {
     }
 

src/main/resources/plugin.yml

@@ -4,7 +4,7 @@ website: ${project.url}
 description: ${project.description}
 main: ${pluginDescription.main}
 version: ${pluginDescription.version}
-api-version: 1.13
+api-version: 1.14
 softdepend:
     - Vault
     - LuckPerms