From d24a6cedb9e3313ca69134d70fb431a29de32874 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Wed, 3 Apr 2024 18:47:00 +1300 Subject: [PATCH] Clean up some messages, warn about modded servers --- .../java/me/libraryaddict/disguise/LibsDisguises.java | 10 ++++++++++ .../libraryaddict/disguise/utilities/LibsPremium.java | 8 ++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/plugin/src/main/java/me/libraryaddict/disguise/LibsDisguises.java b/plugin/src/main/java/me/libraryaddict/disguise/LibsDisguises.java index e735cc9f..d61b4f03 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/LibsDisguises.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/LibsDisguises.java @@ -133,6 +133,16 @@ public class LibsDisguises extends JavaPlugin { "plugin will continue to load, but it will look like a mugging victim"); } + // Note that Forge/Hybrid is unsupported + // Previously was supported but changes in both LD and nms has made it unsustainable + // The time and complexibility it would take is far too high for the amount of usage it would receive. + // Any extra income from sales would never cover the time spent implementing this. + if (Bukkit.getVersion().toLowerCase().matches(".*(arclight|mohist|magma).*")) { + getLogger().severe( + "Lib's Disguises will not work correctly on Forge/Hybrid servers, due to complexibility and time commitment there is " + + "no support for this. Do not report any issues to Lib's Disguises."); + } + commandConfig = new DisguiseCommandConfig(); if (!reloaded) { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/LibsPremium.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/LibsPremium.java index c63001eb..930e57fa 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/LibsPremium.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/LibsPremium.java @@ -305,25 +305,25 @@ public class LibsPremium { if (info.getBuildNumber() == null || !info.getBuildNumber().matches("#\\d+")) { f.delete(); - DisguiseUtilities.getLogger().info("Ew, I don't recognize " + f.getName()); + DisguiseUtilities.getLogger().info("Unknown file detected and deleted: LibsDisguises/" + f.getName()); continue; } else if (Integer.parseInt(info.getBuildNumber().replace("#", "")) < Integer.parseInt(LibsDisguises.getInstance().getBuildNo().replace("#", ""))) { f.delete(); - DisguiseUtilities.getLogger().info("Ew, " + f.getName() + " is so old"); + DisguiseUtilities.getLogger().info("Outdated file deleted: LibsDisguises/" + f.getName()); continue; } if (!info.isLegit()) { f.delete(); - DisguiseUtilities.getLogger().info("Ew, I saw something nasty in " + f.getName()); + DisguiseUtilities.getLogger().info("Potential virus was deleted: LibsDisguises/" + f.getName()); continue; } foundBetter = true; break; } catch (ClassNotFoundException | NoClassDefFoundError e) { - DisguiseUtilities.getLogger().info("Ew, error about invalid Libs Disguises jar. Deleting " + f.getName()); + DisguiseUtilities.getLogger().info("Invalid Lib's Disguises jar has errored, deleting LibsDisguises/" + f.getName()); f.delete(); } catch (Throwable e) { e.printStackTrace();