From a39476067767947802948c81f8f96c15ca252186 Mon Sep 17 00:00:00 2001
From: Josh Roy <10731363+JRoy@users.noreply.github.com>
Date: Sat, 6 Aug 2022 15:48:26 -0400
Subject: [PATCH] Update VersionUtil and /ess version (#5036)

---
 .../com/earth2me/essentials/Essentials.java     |  3 +++
 .../essentials/commands/Commandessentials.java  | 17 +++++++++++++++--
 .../earth2me/essentials/utils/VersionUtil.java  |  6 ++++++
 .../src/main/resources/messages.properties      |  1 +
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/Essentials/src/main/java/com/earth2me/essentials/Essentials.java b/Essentials/src/main/java/com/earth2me/essentials/Essentials.java
index fc8dce235..2b5584c69 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/Essentials.java
@@ -267,6 +267,9 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
                 case DANGEROUS_FORK:
                     getLogger().severe(tl("serverUnsupportedDangerous"));
                     break;
+                case STUPID_PLUGIN:
+                    getLogger().severe(tl("serverUnsupportedDumbPlugins"));
+                    break;
                 case UNSTABLE:
                     getLogger().severe(tl("serverUnsupportedMods"));
                     break;
diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java
index 5977ea6a7..304473f8c 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java
@@ -76,7 +76,12 @@ public class Commandessentials extends EssentialsCommand {
         "PermissionsEx", // permissions (unsupported)
         "GroupManager", // permissions (unsupported)
         "bPermissions", // permissions (unsupported)
-        "DiscordSRV" // potential for issues if EssentialsXDiscord is installed
+        "DiscordSRV", // potential for issues if EssentialsXDiscord is installed
+
+        // Brain-dead chat signing bypass that break EssentialsChat
+        "AntiPopup",
+        "NoChatReports",
+        "NoEncryption"
     );
     private static final List<String> officialPlugins = Arrays.asList(
         "EssentialsAntiBuild",
@@ -90,7 +95,12 @@ public class Commandessentials extends EssentialsCommand {
     private static final List<String> warnPlugins = Arrays.asList(
         "PermissionsEx",
         "GroupManager",
-        "bPermissions"
+        "bPermissions",
+
+        // Brain-dead chat signing bypass that break EssentialsChat
+        "AntiPopup",
+        "NoChatReports",
+        "NoEncryption"
     );
     private transient TuneRunnable currentTune = null;
 
@@ -683,6 +693,9 @@ public class Commandessentials extends EssentialsCommand {
             case DANGEROUS_FORK:
                 sender.sendMessage(ChatColor.DARK_RED + tl("serverUnsupportedDangerous"));
                 break;
+            case STUPID_PLUGIN:
+                sender.sendMessage(ChatColor.DARK_RED + tl("serverUnsupportedDumbPlugins"));
+                break;
             case UNSTABLE:
                 sender.sendMessage(ChatColor.DARK_RED + tl("serverUnsupportedMods"));
                 break;
diff --git a/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java b/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java
index 411a52db8..60bf67f2c 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java
@@ -61,6 +61,11 @@ public final class VersionUtil {
         // KibblePatcher - Dangerous bytecode editor snakeoil whose only use is to break plugins
         builder.put("net.kibblelands.server.FastMath", SupportStatus.DANGEROUS_FORK);
 
+        // Brain-dead chat signing bypass that break EssentialsChat
+        builder.put("screw.microsoft.antipopup.AntiPopup", SupportStatus.STUPID_PLUGIN);
+        builder.put("ml.tcoded.nochatreports.NoChatReportsSpigot", SupportStatus.STUPID_PLUGIN);
+        builder.put("me.doclic.noencryption.NoEncryption", SupportStatus.STUPID_PLUGIN);
+
         // Akarin - Dangerous patch history;
         //   * Potentially unsafe saving of nms.JsonList
         builder.put("io.akarin.server.Config", SupportStatus.DANGEROUS_FORK);
@@ -324,6 +329,7 @@ public final class VersionUtil {
         FULL(true),
         LIMITED(true),
         DANGEROUS_FORK(false),
+        STUPID_PLUGIN(false),
         NMS_CLEANROOM(false),
         UNSTABLE(false),
         OUTDATED(false)
diff --git a/Essentials/src/main/resources/messages.properties b/Essentials/src/main/resources/messages.properties
index b609b70fc..01ffe27fc 100644
--- a/Essentials/src/main/resources/messages.properties
+++ b/Essentials/src/main/resources/messages.properties
@@ -1079,6 +1079,7 @@ serverUnsupportedClass=Status determining class\: {0}
 serverUnsupportedCleanroom=You are running a server that does not properly support Bukkit plugins that rely on internal Mojang code. Consider using an Essentials replacement for your server software.
 serverUnsupportedDangerous=You are running a server fork that is known to be extremely dangerous and lead to data loss. It is strongly recommended you switch to a more stable server software like Paper.
 serverUnsupportedLimitedApi=You are running a server with limited API functionality. EssentialsX will still work, but certain features may be disabled.
+serverUnsupportedDumbPlugins=You are using plugins known to cause severe issues with EssentialsX and other plugins.
 serverUnsupportedMods=You are running a server that does not properly support Bukkit plugins. Bukkit plugins should not be used with Forge/Fabric mods! For Forge: Consider using ForgeEssentials, or SpongeForge + Nucleus.
 setBal=\u00a7aYour balance was set to {0}.
 setBalOthers=\u00a7aYou set {0}\u00a7a''s balance to {1}.