diff --git a/src/main/java/ru/simsonic/rscPermissions/CommandHelper.java b/src/main/java/ru/simsonic/rscPermissions/CommandHelper.java index 9c81ac0..ef3228f 100644 --- a/src/main/java/ru/simsonic/rscPermissions/CommandHelper.java +++ b/src/main/java/ru/simsonic/rscPermissions/CommandHelper.java @@ -46,17 +46,17 @@ public class CommandHelper final ArrayList help = new ArrayList<>(); if(sender.hasPermission("rscp.admin")) { - help.add("/rscp (user|group|ladder) -- PermissionsEx-like admin commands"); - help.add("/rscp (promote|demote) -- admin promotion/demotion commands"); + help.add("/rscp (user|group|ladder) {_LS}-- PermissionsEx-like admin commands"); + help.add("/rscp (promote|demote) {_LS}-- admin promotion/demotion commands"); } if(sender.hasPermission("rscp.admin.lock")) - help.add("/rscp (lock|unlock) -- maintenance mode control"); + help.add("/rscp (lock|unlock) {_LS}-- maintenance mode control"); if(sender.hasPermission("rscp.admin")) { - help.add("/rscp (examplerows|import) -- possible useful things"); - help.add("/rscp (debug|fetch|reload) -- admin stuff"); + help.add("/rscp (examplerows|import) {_LS}-- possible useful things"); + help.add("/rscp (debug|fetch|reload) {_LS}-- admin stuff"); } - help.add("/rscp (help) -- show these notes"); + help.add("/rscp (help) {_LS}-- show these notes"); if(help.size() > 0) help.add(0, "{MAGENTA}Usage:"); help.add(0, plugin.getDescription().getName() + " v" + plugin.getDescription().getVersion()); @@ -95,8 +95,8 @@ public class CommandHelper { final String mMode = (args.length >= 2) ? args[1] : "default"; String mmon = "Maintenance mode enabled"; - mmon = plugin.getConfig().getString("language.mModes.locked.default.mmon", mmon); - mmon = plugin.getConfig().getString("language.mModes.locked." + mMode + ".mmon", mmon); + mmon = plugin.getConfig().getString("language.maintenance.locked.default.mmon", mmon); + mmon = plugin.getConfig().getString("language.maintenance.locked." + mMode + ".mmon", mmon); plugin.maintenance.setMaintenanceMode(mMode); throw new CommandAnswerException(mmon); } @@ -106,7 +106,7 @@ public class CommandHelper if(sender.hasPermission("rscp.lock")) { String mmoff = "Maintenance mode disabled"; - mmoff = plugin.getConfig().getString("language.mModes.unlocked", mmoff); + mmoff = plugin.getConfig().getString("language.maintenance.unlocked", mmoff); plugin.maintenance.setMaintenanceMode(null); throw new CommandAnswerException(mmoff); } @@ -171,11 +171,6 @@ public class CommandHelper throw new CommandAnswerException("Plugin has been reloaded."); } return; - case "update": - /* rscp update */ - if(sender.hasPermission("rscp.admin")) - throw new CommandAnswerException(plugin.doUpdate(sender)); - return; case "debug": /* rscp debug [yes|on|no|off|toggle] */ if(sender.hasPermission("rscp.admin")) diff --git a/src/main/java/ru/simsonic/rscPermissions/MainPluginClass.java b/src/main/java/ru/simsonic/rscPermissions/MainPluginClass.java index d6b7491..1367f0b 100644 --- a/src/main/java/ru/simsonic/rscPermissions/MainPluginClass.java +++ b/src/main/java/ru/simsonic/rscPermissions/MainPluginClass.java @@ -6,7 +6,6 @@ import java.util.HashMap; import java.util.concurrent.LinkedBlockingQueue; import java.util.logging.Level; import java.util.logging.Logger; -import net.gravitydevelopment.updater.Updater; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -43,7 +42,6 @@ public final class MainPluginClass extends JavaPlugin implements Listener private final MovingPlayersCatcher movedPlayers = new MovingPlayersCatcher(); public ConnectionHelper connectionList; public Thread threadPermissions; - private Updater updater; private MetricsLite metrics; public final HashMap attachments = new HashMap<>(); public final LinkedBlockingQueue recalculatingPlayers = new LinkedBlockingQueue<>(); @@ -79,15 +77,6 @@ public final class MainPluginClass extends JavaPlugin implements Listener StartRecalcThread(); RegionFinderThreadStart(); connectionList.threadFetchTablesData(); - // Automatic updater - if(settings.isUpdatable()) - { - updater = new Updater(this, projectNumberInDBO, this.getFile(), Updater.UpdateType.NO_DOWNLOAD, false); - if(updater.getResult() == Updater.UpdateResult.UPDATE_AVAILABLE) - showAdminUpdateInfo(getServer().getConsoleSender()); - else - updater = null; - } // Metrics if(settings.isUseMetrics()) { @@ -102,21 +91,6 @@ public final class MainPluginClass extends JavaPlugin implements Listener } consoleLog.info("[rscp] rscPermissions has been successfully enabled."); } - private void showAdminUpdateInfo(CommandSender sender) - { - if(updater != null) - { - if(sender instanceof ConsoleCommandSender) - { - consoleLog.info("[rscp] Update is available! Enter /rscp update to update plugin now."); - consoleLog.info("[rscp] Please be noted that after restart updated file will have name including old version."); - } else if(sender.hasPermission("rscp.admin")) { - formattedMessage(sender, "Update is available: {_LB}" + updater.getLatestName() + "{GOLD}!"); - formattedMessage(sender, "Enter {_LG}/rscp update{GOLD} to update plugin now."); - formattedMessage(sender, "Please be noted that after restart updated file will have name including old version."); - } - } - } @Override public void onDisable() { @@ -130,16 +104,6 @@ public final class MainPluginClass extends JavaPlugin implements Listener metrics = null; consoleLog.info("[rscp] rscPermissions has been disabled."); } - public String doUpdate(CommandSender sender) - { - if(updater != null) - { - updater = new Updater(this, projectNumberInDBO, this.getFile(), Updater.UpdateType.DEFAULT, true); - updater = null; - return "Plugin will be updated automatically after restart."; - } - return "No updates available / waiting for server restart."; - } private Thread hThreadRegionFinder = null; private void RegionFinderThreadStart() { @@ -293,11 +257,6 @@ public final class MainPluginClass extends JavaPlugin implements Listener cache.calculatePlayerPermissions(player); } @org.bukkit.event.EventHandler - public void onPlayerJoin(PlayerJoinEvent event) - { - showAdminUpdateInfo(event.getPlayer()); - } - @org.bukkit.event.EventHandler public void onPlayerExp(PlayerLevelChangeEvent event) { cache.calculatePlayerPermissions(event.getPlayer()); diff --git a/src/main/java/ru/simsonic/rscPermissions/MaintenanceMode.java b/src/main/java/ru/simsonic/rscPermissions/MaintenanceMode.java index ef4edfa..b6a0e3d 100644 --- a/src/main/java/ru/simsonic/rscPermissions/MaintenanceMode.java +++ b/src/main/java/ru/simsonic/rscPermissions/MaintenanceMode.java @@ -21,8 +21,8 @@ public class MaintenanceMode implements Listener if(plugin.settings.isInMaintenance()) { String motd = "Server is under maintenance"; - motd = plugin.getConfig().getString("language.mModes.locked.default.motd", motd); - motd = plugin.getConfig().getString("language.mModes.locked." + plugin.settings.getMaintenanceMode() + ".motd", motd); + motd = plugin.getConfig().getString("language.maintenance.locked.default.motd", motd); + motd = plugin.getConfig().getString("language.maintenance.locked." + plugin.settings.getMaintenanceMode() + ".motd", motd); motd = LanguageUtility.processStringStatic(motd); if(!"".equals(motd)) event.setMotd(motd); @@ -61,8 +61,8 @@ public class MaintenanceMode implements Listener return; } String kickMsg = "{_YL}Server is in maintenance mode\nPlease try to connect later..."; - kickMsg = plugin.getConfig().getString("language.mmodes.locked.default.motd", kickMsg); - kickMsg = plugin.getConfig().getString("language.mmodes.locked." + plugin.settings.getMaintenanceMode() + ".motd", kickMsg); + kickMsg = plugin.getConfig().getString("language.maintenance.locked.default.motd", kickMsg); + kickMsg = plugin.getConfig().getString("language.maintenance.locked." + plugin.settings.getMaintenanceMode() + ".motd", kickMsg); kickMsg = LanguageUtility.processStringStatic(kickMsg); event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_WHITELIST, kickMsg); } @@ -84,8 +84,8 @@ public class MaintenanceMode implements Listener if(player.hasPermission("rscp.maintenance." + plugin.settings.getMaintenanceMode())) continue; String kick = "{_YL}Server is going into maintenance mode"; - kick = plugin.getConfig().getString("language.mModes.locked.default.kick", kick); - kick = plugin.getConfig().getString("language.mModes.locked." + plugin.settings.getMaintenanceMode() + ".kick", kick); + kick = plugin.getConfig().getString("language.maintenance.locked.default.kick", kick); + kick = plugin.getConfig().getString("language.maintenance.locked." + plugin.settings.getMaintenanceMode() + ".kick", kick); kick = LanguageUtility.processStringStatic(kick); player.kickPlayer(kick); } diff --git a/src/main/java/ru/simsonic/rscPermissions/Settings.java b/src/main/java/ru/simsonic/rscPermissions/Settings.java index c6d9f8c..cf363df 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Settings.java +++ b/src/main/java/ru/simsonic/rscPermissions/Settings.java @@ -15,7 +15,6 @@ public class Settings private boolean bAlwaysInheritDefault = false; private boolean bTreatAsteriskAsOP = true; private boolean bUseMetrics = true; - private boolean bUseUpdater = true; private boolean bUseWorldGuard = true; private boolean bUseResidence = true; private int nAutoReloadDelayTicks = 20 * 900; @@ -55,6 +54,7 @@ public class Settings private void update_v2_to_v3(FileConfiguration config) { config.set("settings.enable-rewards", null); + config.set("settings.auto-update", null); config.set("internal.version", 3); } public void readSettings() @@ -66,7 +66,6 @@ public class Settings bAlwaysInheritDefault = config.getBoolean("always-inherit-default-group", false); bTreatAsteriskAsOP = config.getBoolean("settings.treat-asterisk-as-op", true); bUseMetrics = config.getBoolean("settings.use-metrics", true); - bUseUpdater = config.getBoolean("settings.auto-update", true); bUseWorldGuard = config.getBoolean("settings.integration.worldguard", true); bUseResidence = config.getBoolean("settings.integration.residence", true); nAutoReloadDelayTicks = config.getInt ("settings.auto-reload-delay-sec", 900) * 20; @@ -102,10 +101,6 @@ public class Settings { return bUseMetrics; } - public boolean isUpdatable() - { - return bUseUpdater; - } public boolean isUseWorldGuard() { return bUseWorldGuard; diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index e4af4c6..0d1064a 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -3,12 +3,10 @@ settings: always-inherit-default-group: false treat-asterisk-as-op: true auto-reload-delay-sec: 900 - enable-rewards: false use-metrics: true - auto-update: true language: en_US - region-finder-thread-granularity-msec: 1000 maintenance-mode: '' + region-finder-thread-granularity-msec: 1000 integration: worldguard: true residence: true @@ -26,7 +24,7 @@ servers: prefixes: rscp_ workmode: none language: - mModes: + maintenance: unlocked: '{_YL}Server left the maintenance mode' locked: default: @@ -38,4 +36,4 @@ language: worldedit: motd: '{_DR}We are editing world with WE.' internal: - version: 1 \ No newline at end of file + version: 1 diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index b483ba9..78ec570 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -3,7 +3,7 @@ main: ${project.groupId}.${project.artifactId}.MainPluginClass version: ${project.version} author: SimSonic website: http://dev.bukkit.org/server-mods/rscPermissions -softdepend: +soft-depend: - Vault - WorldEdit - WorldGuard