From 6e112ea137d89b0c1349dfe45f7ce3281b339c59 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Tue, 14 Apr 2020 02:27:34 +1200 Subject: [PATCH] Allow plugin to be used as an API on free resource page --- .../java/me/libraryaddict/disguise/LibsDisguises.java | 8 ++++++-- .../me/libraryaddict/disguise/utilities/LibsPremium.java | 8 ++++++-- .../disguise/utilities/plugin/PluginInformation.java | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/java/me/libraryaddict/disguise/LibsDisguises.java b/src/main/java/me/libraryaddict/disguise/LibsDisguises.java index f5c2b36e..e260dc66 100644 --- a/src/main/java/me/libraryaddict/disguise/LibsDisguises.java +++ b/src/main/java/me/libraryaddict/disguise/LibsDisguises.java @@ -111,7 +111,7 @@ public class LibsDisguises extends JavaPlugin { registerCommand("libsdisguises", new LibsDisguisesCommand()); - if (!DisguiseConfig.isDisableCommands()) { + if (!DisguiseConfig.isDisableCommands() && !LibsPremium.isAPIPlugin()) { registerCommand("disguise", new DisguiseCommand()); registerCommand("undisguise", new UndisguiseCommand()); registerCommand("disguiseplayer", new DisguisePlayerCommand()); @@ -132,7 +132,11 @@ public class LibsDisguises extends JavaPlugin { registerCommand("grabskin", new GrabSkinCommand()); registerCommand("savedisguise", new SaveDisguiseCommand()); } else { - getLogger().info("Commands has been disabled, as per config"); + if (LibsPremium.isAPIPlugin()) { + getLogger().info("Commands not enabled in API version of Lib's Disguises!"); + } else { + getLogger().info("Commands has been disabled, as per config"); + } } new MetricsInitalizer(); diff --git a/src/main/java/me/libraryaddict/disguise/utilities/LibsPremium.java b/src/main/java/me/libraryaddict/disguise/utilities/LibsPremium.java index 95f38145..f4559eef 100644 --- a/src/main/java/me/libraryaddict/disguise/utilities/LibsPremium.java +++ b/src/main/java/me/libraryaddict/disguise/utilities/LibsPremium.java @@ -64,7 +64,11 @@ public class LibsPremium { * @return true if userID does not contain __USER__ */ private static Boolean isPremium(String userID) { - return !userID.contains("__USER__"); + return !userID.contains("__USER__") && !getResourceID().equals("81"); + } + + public static Boolean isAPIPlugin() { + return !isPremium() && getResourceID().equals("81"); } /** @@ -85,7 +89,7 @@ public class LibsPremium { return false; } - if (premiumVersion.startsWith("9.")){ + if (premiumVersion.startsWith("9.")) { return false; } diff --git a/src/main/java/me/libraryaddict/disguise/utilities/plugin/PluginInformation.java b/src/main/java/me/libraryaddict/disguise/utilities/plugin/PluginInformation.java index 13c999cf..48b681a2 100644 --- a/src/main/java/me/libraryaddict/disguise/utilities/plugin/PluginInformation.java +++ b/src/main/java/me/libraryaddict/disguise/utilities/plugin/PluginInformation.java @@ -20,7 +20,7 @@ public class PluginInformation { this.userID = userID; this.resourceID = resourceID; this.downloadID = downloadID; - this.premium = premium; + this.premium = premium && !"81".equals(resourceID); this.version = version; this.buildNumber = buildNumber; this.buildDate = buildDate;