diff --git a/libs/Notifications.jar b/libs/Notifications.jar
deleted file mode 100644
index 0a862e66..00000000
Binary files a/libs/Notifications.jar and /dev/null differ
diff --git a/pom.xml b/pom.xml
index fc3e1555..38b8a873 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,12 +155,6 @@
http://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