From d6e0ef4553e5eae785fe61d5b8c93c8454e82777 Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Thu, 9 Jul 2015 00:59:23 +0200 Subject: [PATCH] Drop Spout/Notification support, they are not updated anymore --- libs/Notifications.jar | Bin 57707 -> 0 bytes pom.xml | 32 ------ src/main/java/fr/xephi/authme/AuthMe.java | 24 +---- .../commands/ChangePasswordCommand.java | 7 +- .../authme/commands/UnregisterCommand.java | 7 -- .../java/fr/xephi/authme/gui/Clickable.java | 8 -- .../fr/xephi/authme/gui/CustomButton.java | 24 ----- .../xephi/authme/gui/screens/LoginScreen.java | 96 ------------------ .../authme/listener/AuthMeServerListener.java | 6 -- .../authme/listener/AuthMeSpoutListener.java | 28 ----- .../process/login/AsyncronousLogin.java | 5 - .../logout/ProcessSyncronousPlayerLogout.java | 4 - .../ProcessSyncronousEmailRegister.java | 4 - .../ProcessSyncronousPasswordRegister.java | 4 - .../fr/xephi/authme/settings/Settings.java | 6 +- .../fr/xephi/authme/settings/SpoutCfg.java | 41 -------- src/main/resources/config.yml | 2 - src/main/resources/spout.yml | 12 --- 18 files changed, 5 insertions(+), 305 deletions(-) delete mode 100644 libs/Notifications.jar delete mode 100644 src/main/java/fr/xephi/authme/gui/Clickable.java delete mode 100644 src/main/java/fr/xephi/authme/gui/CustomButton.java delete mode 100644 src/main/java/fr/xephi/authme/gui/screens/LoginScreen.java delete mode 100644 src/main/java/fr/xephi/authme/listener/AuthMeSpoutListener.java delete mode 100644 src/main/java/fr/xephi/authme/settings/SpoutCfg.java delete mode 100644 src/main/resources/spout.yml diff --git a/libs/Notifications.jar b/libs/Notifications.jar deleted file mode 100644 index 0a862e664894d110122c6ebc32056de0bda2280b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 57707 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://repo.luricos.de/content/repositories/releases/ - - - sonatype-nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - comphenix-snapshots @@ -377,23 +371,6 @@ - - - org.spoutcraft - spoutcraftplugin - 1.6.4-SNAPSHOT - - - org.bukkit - bukkit - - - org.bukkit - craftbukkit - - - - @@ -423,14 +400,5 @@ ${project.basedir}/libs/xAuth.jar - - - me.muizers - Notifications - 1.6 - system - ${project.basedir}/libs/Notifications.jar - - diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java index 4761e199..ff2989f4 100644 --- a/src/main/java/fr/xephi/authme/AuthMe.java +++ b/src/main/java/fr/xephi/authme/AuthMe.java @@ -63,7 +63,6 @@ import fr.xephi.authme.listener.AuthMeChestShopListener; import fr.xephi.authme.listener.AuthMeEntityListener; import fr.xephi.authme.listener.AuthMePlayerListener; import fr.xephi.authme.listener.AuthMeServerListener; -import fr.xephi.authme.listener.AuthMeSpoutListener; import fr.xephi.authme.plugin.manager.BungeeCordMessage; import fr.xephi.authme.plugin.manager.CitizensCommunicator; import fr.xephi.authme.plugin.manager.CombatTagComunicator; @@ -74,7 +73,6 @@ import fr.xephi.authme.settings.OtherAccounts; import fr.xephi.authme.settings.PlayersLogs; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.Spawn; -import me.muizers.Notifications.Notifications; import net.citizensnpcs.Citizens; import net.milkbowl.vault.permission.Permission; @@ -98,7 +96,6 @@ public class AuthMe extends JavaPlugin { public double ChestShop = 0; public boolean BungeeCord = false; public Essentials ess; - public Notifications notifications; public API api; public Management management; public HashMap captcha = new HashMap(); @@ -191,9 +188,6 @@ public class AuthMe extends JavaPlugin { // Check Combat Tag Version combatTag(); - // Check Notifications - checkNotifications(); - // Check Multiverse checkMultiverse(); @@ -228,10 +222,7 @@ public class AuthMe extends JavaPlugin { Bukkit.getMessenger().registerOutgoingPluginChannel(this, "BungeeCord"); Bukkit.getMessenger().registerIncomingPluginChannel(this, "BungeeCord", new BungeeCordMessage(this)); } - if (pm.isPluginEnabled("Spout")) { - pm.registerEvents(new AuthMeSpoutListener(database), this); - ConsoleLogger.info("Successfully hook with Spout!"); - } + pm.registerEvents(new AuthMePlayerListener(this, database), this); pm.registerEvents(new AuthMeBlockListener(database, this), this); pm.registerEvents(new AuthMeEntityListener(database, this), this); @@ -397,19 +388,6 @@ public class AuthMe extends JavaPlugin { } } - public void checkNotifications() { - if (!Settings.notifications) { - this.notifications = null; - return; - } - if (this.getServer().getPluginManager().getPlugin("Notifications") != null && this.getServer().getPluginManager().getPlugin("Notifications").isEnabled()) { - this.notifications = (Notifications) this.getServer().getPluginManager().getPlugin("Notifications"); - ConsoleLogger.info("Successfully hook with Notifications"); - } else { - this.notifications = null; - } - } - public void combatTag() { if (this.getServer().getPluginManager().getPlugin("CombatTag") != null && this.getServer().getPluginManager().getPlugin("CombatTag").isEnabled()) { this.CombatTag = 1; diff --git a/src/main/java/fr/xephi/authme/commands/ChangePasswordCommand.java b/src/main/java/fr/xephi/authme/commands/ChangePasswordCommand.java index 14daf27b..c6c5fb5c 100644 --- a/src/main/java/fr/xephi/authme/commands/ChangePasswordCommand.java +++ b/src/main/java/fr/xephi/authme/commands/ChangePasswordCommand.java @@ -2,8 +2,6 @@ package fr.xephi.authme.commands; import java.security.NoSuchAlgorithmException; -import me.muizers.Notifications.Notification; - import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; @@ -58,7 +56,7 @@ public class ChangePasswordCommand implements CommandExecutor { m.send(player, "password_error"); return true; } - if ((lowpass.equalsIgnoreCase(name))){ + if ((lowpass.equalsIgnoreCase(name))) { m.send(player, "password_error_nick"); return true; } @@ -89,9 +87,6 @@ public class ChangePasswordCommand implements CommandExecutor { PlayerCache.getInstance().updatePlayer(auth); m.send(player, "pwd_changed"); ConsoleLogger.info(player.getName() + " changed his password"); - if (plugin.notifications != null) { - plugin.notifications.showNotification(new Notification("[AuthMe] " + player.getName() + " change his password!")); - } } else { m.send(player, "wrong_pwd"); } diff --git a/src/main/java/fr/xephi/authme/commands/UnregisterCommand.java b/src/main/java/fr/xephi/authme/commands/UnregisterCommand.java index 6c370b1e..0b8bf943 100644 --- a/src/main/java/fr/xephi/authme/commands/UnregisterCommand.java +++ b/src/main/java/fr/xephi/authme/commands/UnregisterCommand.java @@ -27,7 +27,6 @@ import fr.xephi.authme.settings.Messages; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.task.MessageTask; import fr.xephi.authme.task.TimeoutTask; -import me.muizers.Notifications.Notification; public class UnregisterCommand implements CommandExecutor { @@ -98,9 +97,6 @@ public class UnregisterCommand implements CommandExecutor { LimboCache.getInstance().getLimboPlayer(name).setMessageTaskId(sched.runTaskAsynchronously(plugin, new MessageTask(plugin, name, m.send("reg_msg"), interval))); m.send(player, "unregistered"); ConsoleLogger.info(player.getDisplayName() + " unregistered himself"); - if (plugin.notifications != null) { - plugin.notifications.showNotification(new Notification("[AuthMe] " + player.getName() + " unregistered himself!")); - } return true; } if (!Settings.unRegisteredGroup.isEmpty()) { @@ -116,9 +112,6 @@ public class UnregisterCommand implements CommandExecutor { player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, Settings.getRegistrationTimeout * 20, 2)); m.send(player, "unregistered"); ConsoleLogger.info(player.getDisplayName() + " unregistered himself"); - if (plugin.notifications != null) { - plugin.notifications.showNotification(new Notification("[AuthMe] " + player.getName() + " unregistered himself!")); - } if (Settings.isTeleportToSpawnEnabled && !Settings.noTeleport) { Location spawn = plugin.getSpawnLocation(player); SpawnTeleportEvent tpEvent = new SpawnTeleportEvent(player, player.getLocation(), spawn, false); diff --git a/src/main/java/fr/xephi/authme/gui/Clickable.java b/src/main/java/fr/xephi/authme/gui/Clickable.java deleted file mode 100644 index 7ff30336..00000000 --- a/src/main/java/fr/xephi/authme/gui/Clickable.java +++ /dev/null @@ -1,8 +0,0 @@ -package fr.xephi.authme.gui; - -import org.getspout.spoutapi.event.screen.ButtonClickEvent; - -public interface Clickable { - - public void handleClick(ButtonClickEvent event); -} diff --git a/src/main/java/fr/xephi/authme/gui/CustomButton.java b/src/main/java/fr/xephi/authme/gui/CustomButton.java deleted file mode 100644 index 06abf145..00000000 --- a/src/main/java/fr/xephi/authme/gui/CustomButton.java +++ /dev/null @@ -1,24 +0,0 @@ -package fr.xephi.authme.gui; - -import org.getspout.spoutapi.event.screen.ButtonClickEvent; -import org.getspout.spoutapi.gui.GenericButton; - -public class CustomButton extends GenericButton { - - public Clickable handleRef = null; - - public CustomButton(Clickable c) { - handleRef = c; - } - - @Override - public void onButtonClick(ButtonClickEvent event) { - handleRef.handleClick(event); - } - - public CustomButton setMidPos(int x, int y) { - this.setX(x).setY(y).shiftXPos(-(width / 2)).shiftYPos(-(height / 2)); - return this; - } - -} diff --git a/src/main/java/fr/xephi/authme/gui/screens/LoginScreen.java b/src/main/java/fr/xephi/authme/gui/screens/LoginScreen.java deleted file mode 100644 index 5137670a..00000000 --- a/src/main/java/fr/xephi/authme/gui/screens/LoginScreen.java +++ /dev/null @@ -1,96 +0,0 @@ -package fr.xephi.authme.gui.screens; - -import java.util.List; - -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.getspout.spoutapi.event.screen.ButtonClickEvent; -import org.getspout.spoutapi.gui.Button; -import org.getspout.spoutapi.gui.Color; -import org.getspout.spoutapi.gui.GenericLabel; -import org.getspout.spoutapi.gui.GenericPopup; -import org.getspout.spoutapi.gui.GenericTextField; -import org.getspout.spoutapi.gui.RenderPriority; -import org.getspout.spoutapi.gui.Widget; -import org.getspout.spoutapi.gui.WidgetAnchor; -import org.getspout.spoutapi.player.SpoutPlayer; - -import fr.xephi.authme.AuthMe; -import fr.xephi.authme.gui.Clickable; -import fr.xephi.authme.gui.CustomButton; -import fr.xephi.authme.settings.SpoutCfg; - -public class LoginScreen extends GenericPopup implements Clickable { - - public AuthMe plugin = AuthMe.getInstance(); - private SpoutCfg spoutCfg = SpoutCfg.getInstance(); - private CustomButton exitBtn; - private CustomButton loginBtn; - private GenericTextField passBox; - private GenericLabel titleLbl; - private GenericLabel textLbl; - private GenericLabel errorLbl; - - String exitTxt = spoutCfg.getString("LoginScreen.exit button"); - String loginTxt = spoutCfg.getString("LoginScreen.login button"); - String exitMsg = spoutCfg.getString("LoginScreen.exit message"); - String title = spoutCfg.getString("LoginScreen.title"); - @SuppressWarnings("unchecked") - List textlines = (List) spoutCfg.getList("LoginScreen.text"); - public SpoutPlayer splayer; - - public LoginScreen(SpoutPlayer player) { - this.splayer = player; - createScreen(); - } - - private void createScreen() { - int objects = textlines.size() + 4; - int part = !(textlines.size() <= 5) ? 195 / objects : 20; - int h = 3 * part / 4, w = 8 * part; - titleLbl = new GenericLabel(); - titleLbl.setText(title).setTextColor(new Color(1.0F, 0, 0, 1.0F)).setAlign(WidgetAnchor.TOP_CENTER).setHeight(h).setWidth(w).setX(maxWidth / 2).setY(25); - this.attachWidget(plugin, titleLbl); - int ystart = 25 + h + part / 2; - for (int x = 0; x < textlines.size(); x++) { - textLbl = new GenericLabel(); - textLbl.setText(textlines.get(x)).setAlign(WidgetAnchor.TOP_CENTER).setHeight(h).setWidth(w).setX(maxWidth / 2).setY(ystart + x * part); - this.attachWidget(plugin, textLbl); - } - passBox = new GenericTextField(); - passBox.setMaximumCharacters(18).setMaximumLines(1).setHeight(h - 2).setWidth(w - 2).setY(220 - h - 2 * part); - passBox.setPasswordField(true); - setXToMid(passBox); - this.attachWidget(plugin, passBox); - errorLbl = new GenericLabel(); - errorLbl.setText("").setTextColor(new Color(1.0F, 0, 0, 1.0F)).setHeight(h).setWidth(w).setX(passBox.getX() + passBox.getWidth() + 2).setY(passBox.getY()); - this.attachWidget(plugin, errorLbl); - loginBtn = new CustomButton(this); - loginBtn.setText(loginTxt).setHeight(h).setWidth(w).setY(220 - h - part); - setXToMid(loginBtn); - this.attachWidget(plugin, loginBtn); - exitBtn = new CustomButton(this); - exitBtn.setText(exitTxt).setHeight(h).setWidth(w).setY(220 - h); - setXToMid(exitBtn); - this.attachWidget(plugin, exitBtn); - this.setPriority(RenderPriority.Highest); - } - - @EventHandler(priority = EventPriority.HIGHEST) - public void handleClick(ButtonClickEvent event) { - Button b = event.getButton(); - SpoutPlayer player = event.getPlayer(); - if (event.isCancelled() || event == null || event.getPlayer() == null) - return; - if (b.equals(loginBtn)) { - plugin.management.performLogin(player, passBox.getText(), false); - } else if (b.equals(exitBtn)) { - event.getPlayer().kickPlayer(exitMsg); - } - } - - private void setXToMid(Widget w) { - w.setX((maxWidth - w.getWidth()) / 2); - } - -} diff --git a/src/main/java/fr/xephi/authme/listener/AuthMeServerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMeServerListener.java index 1766bbe9..4406f67e 100644 --- a/src/main/java/fr/xephi/authme/listener/AuthMeServerListener.java +++ b/src/main/java/fr/xephi/authme/listener/AuthMeServerListener.java @@ -56,10 +56,6 @@ public class AuthMeServerListener implements Listener { ConsoleLogger.info("Multiverse-Core has been disabled, unhook!"); return; } - if (pluginName.equalsIgnoreCase("Notifications")) { - plugin.notifications = null; - ConsoleLogger.info("Notifications has been disabled, unhook!"); - } if (pluginName.equalsIgnoreCase("ChestShop")) { plugin.ChestShop = 0; ConsoleLogger.info("ChestShop has been disabled, unhook!"); @@ -85,8 +81,6 @@ public class AuthMeServerListener implements Listener { plugin.checkEssentials(); if (pluginName.equalsIgnoreCase("Multiverse-Core")) plugin.checkMultiverse(); - if (pluginName.equalsIgnoreCase("Notifications")) - plugin.checkNotifications(); if (pluginName.equalsIgnoreCase("ChestShop")) plugin.checkChestShop(); if (pluginName.equalsIgnoreCase("CombatTag")) diff --git a/src/main/java/fr/xephi/authme/listener/AuthMeSpoutListener.java b/src/main/java/fr/xephi/authme/listener/AuthMeSpoutListener.java deleted file mode 100644 index 0c0ec624..00000000 --- a/src/main/java/fr/xephi/authme/listener/AuthMeSpoutListener.java +++ /dev/null @@ -1,28 +0,0 @@ -package fr.xephi.authme.listener; - -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.getspout.spoutapi.event.spout.SpoutCraftEnableEvent; - -import fr.xephi.authme.cache.auth.PlayerCache; -import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.gui.screens.LoginScreen; -import fr.xephi.authme.settings.SpoutCfg; - -public class AuthMeSpoutListener implements Listener { - - private DataSource data; - - public AuthMeSpoutListener(DataSource data) { - this.data = data; - } - - @EventHandler - public void onSpoutCraftEnable(final SpoutCraftEnableEvent event) { - if (SpoutCfg.getInstance().getBoolean("LoginScreen.enabled")) { - if (data.isAuthAvailable(event.getPlayer().getName().toLowerCase()) && !PlayerCache.getInstance().isAuthenticated(event.getPlayer().getName().toLowerCase())) { - event.getPlayer().getMainScreen().attachPopupScreen(new LoginScreen(event.getPlayer())); - } - } - } -} diff --git a/src/main/java/fr/xephi/authme/process/login/AsyncronousLogin.java b/src/main/java/fr/xephi/authme/process/login/AsyncronousLogin.java index 8a0783ed..b0d5af86 100644 --- a/src/main/java/fr/xephi/authme/process/login/AsyncronousLogin.java +++ b/src/main/java/fr/xephi/authme/process/login/AsyncronousLogin.java @@ -19,7 +19,6 @@ import fr.xephi.authme.security.RandomString; import fr.xephi.authme.settings.Messages; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.task.MessageTask; -import me.muizers.Notifications.Notification; public class AsyncronousLogin { @@ -160,10 +159,6 @@ public class AsyncronousLogin { if (!Settings.noConsoleSpam) ConsoleLogger.info(player.getName() + " logged in!"); - if (plugin.notifications != null) { - plugin.notifications.showNotification(new Notification("[AuthMe] " + player.getName() + " logged in!")); - } - // makes player isLoggedin via API PlayerCache.getInstance().addPlayer(auth); database.setLogged(name); diff --git a/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java b/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java index bc17be8d..1a0ddab6 100644 --- a/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java +++ b/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java @@ -15,7 +15,6 @@ import fr.xephi.authme.settings.Messages; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.task.MessageTask; import fr.xephi.authme.task.TimeoutTask; -import me.muizers.Notifications.Notification; public class ProcessSyncronousPlayerLogout implements Runnable { @@ -64,9 +63,6 @@ public class ProcessSyncronousPlayerLogout implements Runnable { }); m.send(player, "logout"); ConsoleLogger.info(player.getDisplayName() + " logged out"); - if (plugin.notifications != null) { - plugin.notifications.showNotification(new Notification("[AuthMe] " + player.getName() + " logged out!")); - } } } diff --git a/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousEmailRegister.java b/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousEmailRegister.java index c1b3cd86..f90a506d 100644 --- a/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousEmailRegister.java +++ b/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousEmailRegister.java @@ -12,7 +12,6 @@ import fr.xephi.authme.settings.Messages; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.task.MessageTask; import fr.xephi.authme.task.TimeoutTask; -import me.muizers.Notifications.Notification; public class ProcessSyncronousEmailRegister implements Runnable { @@ -47,9 +46,6 @@ public class ProcessSyncronousEmailRegister implements Runnable { player.saveData(); if (!Settings.noConsoleSpam) ConsoleLogger.info(player.getName() + " registered " + plugin.getIP(player)); - if (plugin.notifications != null) { - plugin.notifications.showNotification(new Notification("[AuthMe] " + player.getName() + " has registered by email!")); - } } } diff --git a/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java b/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java index cb3bf1ed..cf054456 100644 --- a/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java +++ b/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java @@ -20,7 +20,6 @@ import fr.xephi.authme.settings.Messages; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.task.MessageTask; import fr.xephi.authme.task.TimeoutTask; -import me.muizers.Notifications.Notification; public class ProcessSyncronousPasswordRegister implements Runnable { @@ -118,9 +117,6 @@ public class ProcessSyncronousPasswordRegister implements Runnable { if (!Settings.noConsoleSpam) ConsoleLogger.info(player.getName() + " registered " + plugin.getIP(player)); - if (plugin.notifications != null) { - plugin.notifications.showNotification(new Notification("[AuthMe] " + player.getName() + " has registered!")); - } // Kick Player after Registration is enabled, kick the player if (Settings.forceRegKick) { diff --git a/src/main/java/fr/xephi/authme/settings/Settings.java b/src/main/java/fr/xephi/authme/settings/Settings.java index 2f6af800..0696c604 100644 --- a/src/main/java/fr/xephi/authme/settings/Settings.java +++ b/src/main/java/fr/xephi/authme/settings/Settings.java @@ -63,7 +63,7 @@ public final class Settings extends YamlConfiguration { isBackupOnStart, isBackupOnStop, enablePasspartu, isStopEnabled, reloadSupport, rakamakUseIp, noConsoleSpam, removePassword, displayOtherAccounts, useCaptcha, emailRegistration, multiverse, - notifications, chestshop, bungee, banUnsafeIp, doubleEmailCheck, + chestshop, bungee, banUnsafeIp, doubleEmailCheck, sessionExpireOnIpChange, disableSocialSpy, forceOnlyAfterLogin, useEssentialsMotd, usePurge, purgePlayerDat, purgeEssentialsFile, supportOldPassword, purgeLimitedCreative, purgeAntiXray, @@ -217,7 +217,6 @@ public final class Settings extends YamlConfiguration { getmaxRegPerEmail = configFile.getInt("Email.maxRegPerEmail", 1); multiverse = configFile.getBoolean("Hooks.multiverse", true); chestshop = configFile.getBoolean("Hooks.chestshop", true); - notifications = configFile.getBoolean("Hooks.notifications", true); bungee = configFile.getBoolean("Hooks.bungeecord", false); getForcedWorlds = (List) configFile.getList("settings.restrictions.ForceSpawnOnTheseWorlds", new ArrayList()); banUnsafeIp = configFile.getBoolean("settings.restrictions.banUnsafedIP", false); @@ -384,7 +383,6 @@ public final class Settings extends YamlConfiguration { getmaxRegPerEmail = configFile.getInt("Email.maxRegPerEmail", 1); multiverse = configFile.getBoolean("Hooks.multiverse", true); chestshop = configFile.getBoolean("Hooks.chestshop", true); - notifications = configFile.getBoolean("Hooks.notifications", true); bungee = configFile.getBoolean("Hooks.bungeecord", false); getForcedWorlds = (List) configFile.getList("settings.restrictions.ForceSpawnOnTheseWorlds"); banUnsafeIp = configFile.getBoolean("settings.restrictions.banUnsafedIP", false); @@ -587,6 +585,8 @@ public final class Settings extends YamlConfiguration { set("Purge.removePermissions", false); changes = true; } + if (contains("Hooks.notifications")) + set("Hooks.notifications", null); if (changes) { plugin.getLogger().warning("Merge new Config Options - I'm not an error, please don't report me"); diff --git a/src/main/java/fr/xephi/authme/settings/SpoutCfg.java b/src/main/java/fr/xephi/authme/settings/SpoutCfg.java deleted file mode 100644 index bc293303..00000000 --- a/src/main/java/fr/xephi/authme/settings/SpoutCfg.java +++ /dev/null @@ -1,41 +0,0 @@ -package fr.xephi.authme.settings; - -import java.io.File; -import java.util.ArrayList; - -public class SpoutCfg extends CustomConfiguration { - - private static SpoutCfg instance = null; - - public SpoutCfg(File file) { - super(file); - loadDefaults(); - load(); - save(); - } - - @SuppressWarnings("serial") - private void loadDefaults() { - this.set("Spout GUI enabled", true); - this.set("LoginScreen.enabled", true); - this.set("LoginScreen.exit button", "Quit"); - this.set("LoginScreen.exit message", "Good Bye"); - this.set("LoginScreen.login button", "Login"); - this.set("LoginScreen.title", "LOGIN"); - this.set("LoginScreen.text", new ArrayList() { - - { - add("Sample text"); - add("Change this at spout.yml"); - add("--- AuthMe Reloaded by ---"); - add("Xephi59"); - } - }); - } - - public static SpoutCfg getInstance() { - if (instance == null) - instance = new SpoutCfg(new File("plugins" + File.separator + "AuthMe", "spout.yml")); - return instance; - } -} diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index be8a41e6..8b9796ce 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -375,8 +375,6 @@ Hooks: chestshop: true # Do we need to hook with BungeeCord for get the real Player ip ? bungeecord: false - # Do we need to hook with Notifications for Notifs sending ? - notifications: true # Do we need to disable Essentials SocialSpy on join ? disableSocialSpy: true # Do we need to force /motd Essentials command on join ? diff --git a/src/main/resources/spout.yml b/src/main/resources/spout.yml deleted file mode 100644 index b8685153..00000000 --- a/src/main/resources/spout.yml +++ /dev/null @@ -1,12 +0,0 @@ -Spout GUI enabled: true -LoginScreen: - enabled: true - exit button: Quit - exit message: Good Bye - login button: Login - title: LOGIN - text: - - Sample text - - Change this at spout.yml - - '--- AuthMe Reloaded by ---' - - Xephi59 \ No newline at end of file