From 81d64ecc5a03ed8ad57fdea61ac5fc076822d1f4 Mon Sep 17 00:00:00 2001 From: Sekwah Date: Tue, 31 Aug 2021 23:23:48 +0100 Subject: [PATCH] feat: Allow the ability to disable the proxy warning message --- .../advancedportals/bukkit/AdvancedPortalsPlugin.java | 8 +++++--- .../advancedportals/bukkit/config/ConfigHelper.java | 1 + src/main/resources/config.yml | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/sekwah/advancedportals/bukkit/AdvancedPortalsPlugin.java b/src/main/java/com/sekwah/advancedportals/bukkit/AdvancedPortalsPlugin.java index dfbd10e..719e0a9 100644 --- a/src/main/java/com/sekwah/advancedportals/bukkit/AdvancedPortalsPlugin.java +++ b/src/main/java/com/sekwah/advancedportals/bukkit/AdvancedPortalsPlugin.java @@ -24,6 +24,7 @@ public class AdvancedPortalsPlugin extends JavaPlugin { protected boolean isProxyPluginEnabled = false; protected boolean forceRegisterProxyChannels = false; + protected boolean disableProxyWarning = false; protected static final Map PLAYER_DESTI_MAP = new HashMap<>(); @@ -45,6 +46,7 @@ public class AdvancedPortalsPlugin extends JavaPlugin { FileConfiguration pluginConfig = config.getConfig(); forceRegisterProxyChannels = pluginConfig.getBoolean(ConfigHelper.FORCE_ENABLE_PROXY_SUPPORT, false); + disableProxyWarning = pluginConfig.getBoolean(ConfigHelper.DISABLE_PROXY_WARNING, false); ConfigAccessor portalConfig = new ConfigAccessor(this, "portals.yml"); portalConfig.saveDefaultConfig(); @@ -140,7 +142,7 @@ public class AdvancedPortalsPlugin extends JavaPlugin { return true; } } catch(NoSuchMethodError | NullPointerException e) { - getLogger().info("BungeeCord config not detected, ignoring settings"); + if(!disableProxyWarning) getLogger().info("BungeeCord config not detected, ignoring settings"); } // Will be valid if paperspigot is being used. Otherwise catch. @@ -152,10 +154,10 @@ public class AdvancedPortalsPlugin extends JavaPlugin { return true; } } catch(NoSuchMethodError | NullPointerException e) { - getLogger().info("Paper config not detected, ignoring paper settings"); + if(!disableProxyWarning) getLogger().info("Paper config not detected, ignoring paper settings"); } - getLogger().warning( "Proxy features disabled for Advanced Portals as bungee isn't enabled on the server (spigot.yml) " + + if(!disableProxyWarning) getLogger().warning( "Proxy features disabled for Advanced Portals as bungee isn't enabled on the server (spigot.yml) " + "or if you are using Paper settings.velocity-support.enabled may not be enabled (paper.yml)" ); return false; } diff --git a/src/main/java/com/sekwah/advancedportals/bukkit/config/ConfigHelper.java b/src/main/java/com/sekwah/advancedportals/bukkit/config/ConfigHelper.java index 8c7162e..e9ed7a3 100644 --- a/src/main/java/com/sekwah/advancedportals/bukkit/config/ConfigHelper.java +++ b/src/main/java/com/sekwah/advancedportals/bukkit/config/ConfigHelper.java @@ -9,6 +9,7 @@ public class ConfigHelper { public static final String COMMAND_LOGS = "CommandLogs"; public static final String FORCE_ENABLE_PROXY_SUPPORT = "ForceEnableProxySupport"; + public static final String DISABLE_PROXY_WARNING = "DisableProxyWarning"; public static final String PROXY_TELEPORT_DELAY = "ProxyTeleportDelay"; diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 849668b..9cecfcc 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -95,3 +95,6 @@ ForceEnableProxySupport: false # How many seconds after the proxy event fires should the player be teleported (should help with on spawn plugins and such) # 0 is disabled and anything higher causes a delay. ProxyTeleportDelay: 0 + +# Just in case you are not using the proxy and dont want the warning message +DisableProxyWarning: false